SOURCES: geany-doc_dir.patch, geany-desktop.patch - up to 0.13

[alucard]

Author: alucard                      Date: Fri Apr 11 13:04:34 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 0.13

---- Files affected:
SOURCES:
   geany-doc_dir.patch (1.6 -> 1.7) , geany-desktop.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/geany-doc_dir.patch
diff -u SOURCES/geany-doc_dir.patch:1.6 SOURCES/geany-doc_dir.patch:1.7
--- SOURCES/geany-doc_dir.patch:1.6	Thu Oct 11 00:50:19 2007
+++ SOURCES/geany-doc_dir.patch	Fri Apr 11 15:04:28 2008
@@ -20,15 +20,15 @@
 -	$(INSTALL_DATA) $(top_srcdir)/TODO $(DOCDIR)
 -	$(INSTALL_DATA) $(top_srcdir)/scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt
 -
-diff -aurN geany-0.8.orig/src/main.c geany-0.8/src/main.c
---- geany-0.8.orig/src/main.c	2006-08-09 13:06:51.000000000 +0200
-+++ geany-0.8/src/main.c	2006-08-12 00:52:04.532866874 +0200
-@@ -480,7 +480,7 @@
+diff -aurN geany-0.13.orig/src/main.c geany-0.13/src/main.c
+--- geany-0.13.orig/src/main.c	2008-04-11 14:09:34.396089080 +0200
++++ geany-0.13/src/main.c	2008-04-11 14:10:06.920977289 +0200
+@@ -382,7 +382,7 @@ static void setup_paths()
  	g_free(install_dir);
  #else
- 	data_dir = g_strdup(PACKAGE_DATA_DIR "/" PACKAGE "/"); // e.g. /usr/share/geany
--	doc_dir = g_strdup(PACKAGE_DATA_DIR "/doc/" PACKAGE "/html/");
-+	doc_dir = g_strdup(PACKAGE_DATA_DIR "/" PACKAGE "/doc/html/");
+ 	data_dir = g_strconcat(GEANY_DATADIR, "/geany/", NULL); // e.g. /usr/share/geany
+-	doc_dir = g_strconcat(GEANY_DATADIR, "/doc/geany/html/", NULL);
++	doc_dir = g_strconcat(GEANY_DATADIR, "/doc/geany-", VERSION, "/html/", NULL);
  #endif
  
- 
+ 	// convert path names to locale encoding

================================================================
Index: SOURCES/geany-desktop.patch
diff -u SOURCES/geany-desktop.patch:1.3 SOURCES/geany-desktop.patch:1.4
--- SOURCES/geany-desktop.patch:1.3	Thu Oct 11 00:50:18 2007
+++ SOURCES/geany-desktop.patch	Fri Apr 11 15:04:29 2008
@@ -1,7 +1,7 @@
 diff -aurN geany-0.5.orig/geany.desktop.in geany-0.5/geany.desktop.in
 --- geany-0.5.orig/geany.desktop.in.in	2006-01-16 17:39:19.000000000 +0100
 +++ geany-0.5/geany.desktop.in.in	2006-02-02 15:53:35.144276000 +0100
-@@ -3,10 +3,12 @@
+@@ -3,5 +3,7 @@
  _Name=Geany
  _GenericName=Integrated Development Environment
 -_Comment=A fast and lightweight IDE using GTK2
@@ -9,11 +9,4 @@
 +GenericName[pl]=Zintegrowane środowisko programistyczne (IDE)
 +Comment[pl]=Szybkie i lekkie IDE używające GTK+2
  Exec=geany %F
--Icon=@GEANY_PIXMAPS_DIR@/geany.png
-+Icon=geany
- Terminal=false
- Type=Application
--Categories=Application;GTK;Development;IDE;
-+Categories=GTK;Development;IDE;
- Encoding=UTF-8
- MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php*;application/xml;text/html;text/css;text/x-sql;text/x-diff;
+ Icon=geany
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/geany-doc_dir.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/geany-desktop.patch?r1=1.3&r2=1.4&f=u