SOURCES: monodevelop-desktop.patch, monodevelop-libdir.patch, mono...

[patrys]

Author: patrys                       Date: Sat Feb 16 01:37:16 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 0.19

---- Files affected:
SOURCES:
   monodevelop-desktop.patch (1.5 -> 1.6) , monodevelop-libdir.patch (1.8 -> 1.9) , monodevelop-MOZILLA_FIVE_HOME.patch (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SOURCES/monodevelop-desktop.patch
diff -u SOURCES/monodevelop-desktop.patch:1.5 SOURCES/monodevelop-desktop.patch:1.6
--- SOURCES/monodevelop-desktop.patch:1.5	Mon Apr 24 19:34:17 2006
+++ SOURCES/monodevelop-desktop.patch	Sat Feb 16 02:37:11 2008
@@ -1,7 +1,7 @@
 diff -ur monodevelop-0.10/monodevelop.desktop monodevelop-0.10-desktop_patch/monodevelop.desktop
 --- monodevelop-0.10/monodevelop.desktop	2006-04-04 21:29:37.000000000 +0200
 +++ monodevelop-0.10-desktop_patch/monodevelop.desktop	2006-04-05 18:13:56.000000000 +0200
-@@ -3,15 +3,17 @@
+@@ -3,7 +3,9 @@
  Encoding=UTF-8
  Name=MonoDevelop
  GenericName=Integrated Development Environment
@@ -10,13 +10,12 @@
 +Comment[pl]=Rozwijaj aplikacje .NET w Zintegrowanym Środowisku Programistycznym
  Exec=monodevelop
  TryExec=monodevelop
--Icon=monodevelop.png
-+Icon=monodevelop
- StartupNotify=true
+ Icon=monodevelop
+@@ -11,7 +11,7 @@
  Terminal=false
  Type=Application
- MimeType=text/x-csharp;application/x-mds;application/x-mdp;application/x-cmbx;application/x-prjx;
--Categories=Application;Development;
+ MimeType=text/x-csharp;application/x-mds;application/x-mdp;application/x-cmbx;application/x-prjx;application/x-csproj;application/x-vbproj;application/x-sln;
+-Categories=Development;
 +Categories=GTK;GNOME;Development;IDE;
  X-GNOME-Bugzilla-Bugzilla=Ximian
  X-GNOME-Bugzilla-Product=MonoDevelop

================================================================
Index: SOURCES/monodevelop-libdir.patch
diff -u SOURCES/monodevelop-libdir.patch:1.8 SOURCES/monodevelop-libdir.patch:1.9
--- SOURCES/monodevelop-libdir.patch:1.8	Wed Dec 19 17:52:45 2007
+++ SOURCES/monodevelop-libdir.patch	Sat Feb 16 02:37:11 2008
@@ -22,22 +22,20 @@
  if ENABLE_UPDATE_MIMEDB
 --- monodevelop/mdtool.in~	2007-12-18 20:11:34.000000000 +0100
 +++ monodevelop/mdtool.in	2007-12-19 16:53:48.476849862 +0100
-@@ -16,12 +16,12 @@
+@@ -16,11 +16,10 @@
      echo "$ret"
  }
   
 -MD_BIN_PATH=@prefix@/lib/monodevelop/bin
 +MD_BIN_PATH=@libdir@/monodevelop/bin
  
- if [ -n $PKG_CONFIG_PATH ]; then
--	export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:@gtksharp_prefix@/lib/pkgconfig/
-+	export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:@libdir@/pkgconfig/
- else
--	export PKG_CONFIG_PATH=@gtksharp_prefix@/lib/pkgconfig/
-+	export PKG_CONFIG_PATH=@libdir@/pkgconfig/
- fi
+ ### SYNCH BLOCK: any changes to this block should be kept in sync with the one in Makefile.include and monodevelop.in
+-MD_PKG_CONFIG_PATH=@gtksharp_prefix@/lib/pkgconfig/:/usr/lib/pkgconfig/:/usr/local/lib/pkgconfig/:/usr/share/pkgconfig/:/usr/local/share/pkgconfig/
+-if test -d /usr/lib64; then MD_PKG_CONFIG_PATH=$MD_PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/local/lib64/pkgconfig/; fi
++MD_PKG_CONFIG_PATH=@libdir@/pkgconfig/
+ ### END BLOCK
  
- ARGS=`reWrite "$@"`
+ if [ -n $PKG_CONFIG_PATH ]; then
 --- monodevelop/monodevelop.pc.in~	2007-12-18 20:11:34.000000000 +0100
 +++ monodevelop/monodevelop.pc.in	2007-12-19 16:54:14.475063064 +0100
 @@ -1,6 +1,6 @@

================================================================
Index: SOURCES/monodevelop-MOZILLA_FIVE_HOME.patch
diff -u SOURCES/monodevelop-MOZILLA_FIVE_HOME.patch:1.11 SOURCES/monodevelop-MOZILLA_FIVE_HOME.patch:1.12
--- SOURCES/monodevelop-MOZILLA_FIVE_HOME.patch:1.11	Wed Dec 19 17:52:45 2007
+++ SOURCES/monodevelop-MOZILLA_FIVE_HOME.patch	Sat Feb 16 02:37:11 2008
@@ -1,6 +1,6 @@
 --- monodevelop-0.18/monodevelop.in~	2007-12-19 16:47:09.004304700 +0100
 +++ monodevelop-0.18/monodevelop.in	2007-12-19 16:48:28.498841222 +0100
-@@ -16,41 +16,7 @@
+@@ -16,42 +16,7 @@
      echo "$ret"
  }
  
@@ -18,6 +18,7 @@
 -	mozilla_script=$(which mozilla 2> /dev/null)
 -	firefox_script=$(which firefox 2> /dev/null)
 -	
+-	if [ -z $mozilla_script ] && [ -z $firefox_script ]; then return; fi
 -	for runtime_script in "$firefox_script $mozilla_script"; do
 -		MOZDIR=$(grep "MOZ_DIST_LIB=" $runtime_script 2> /dev/null | cut -d '"' -f 2 | cut -d '=' -f 2)
 -		if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/monodevelop-desktop.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/monodevelop-libdir.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/monodevelop-MOZILLA_FIVE_HOME.patch?r1=1.11&r2=1.12&f=u