- up to 0.13

Changed files:
    geany-desktop.patch -> 1.4
    geany-doc_dir.patch -> 1.7

diff --git a/geany-desktop.patch b/geany-desktop.patch
index 62de7ad33d5c3bed3c8518f32934f9a855b49719..cb03b7e1f48cdbc9c5b5b3323f782ec623ee4384 100644 (file)
--- a/geany-desktop.patch
+++ b/geany-desktop.patch
@@ -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 @@ diff -aurN geany-0.5.orig/geany.desktop.in geany-0.5/geany.desktop.in
 +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

diff --git a/geany-doc_dir.patch b/geany-doc_dir.patch
index db7ac621e0271d0c24c0bbd21fff91c74e62459d..6c2b628f8ab2f764481caaaa273a10ca9d50045b 100644 (file)
--- a/geany-doc_dir.patch
+++ b/geany-doc_dir.patch
@@ -20,15 +20,15 @@ diff -aurN geany-0.8.orig/doc/Makefile.am geany-0.8/doc/Makefile.am
 -      $(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