- up to 0.13

[packages/geany.git] / geany-doc_dir.patch

diff --git a/geany-doc_dir.patch b/geany-doc_dir.patch
index 98e8a250af020fbd201a95b21c98a9ac7080f298..6c2b628f8ab2f764481caaaa273a10ca9d50045b 100644 (file)
--- a/geany-doc_dir.patch
+++ b/geany-doc_dir.patch
@@ -1,22 +1,34 @@
-diff -urN geany-0.3.orig/doc/Makefile.am geany-0.3/doc/Makefile.am
---- geany-0.3.orig/doc/Makefile.am     2005-11-22 20:22:54.956711648 +0100
-+++ geany-0.3/doc/Makefile.am  2005-11-22 20:48:40.736717368 +0100
-@@ -1,5 +1,5 @@
- 
+diff -aurN geany-0.8.orig/doc/Makefile.am geany-0.8/doc/Makefile.am
+--- geany-0.8.orig/doc/Makefile.am     2006-07-18 14:28:04.000000000 +0200
++++ geany-0.8/doc/Makefile.am  2006-08-12 00:46:43.159723018 +0200
+@@ -1,3 +1,3 @@
+ man_MANS=geany.1
 -DOCDIR = $(DESTDIR)/$(datadir)/doc/@PACKAGE@
 +DOCDIR = $(DESTDIR)/$(datadir)/@PACKAGE@/doc
- HTML_FILES = html/*
- IMAGE_FILES = images/*
- EXTRA_DIST = geany.css make_webable.sh geany.txt geany_gpl.docbook geany.1 geany.docbook $(HTML_FILES) $(IMAGE_FILES)
-diff -urN geany-0.3.orig/src/geany.h geany-0.3/src/geany.h
---- geany-0.3.orig/src/geany.h 2005-11-22 20:22:54.891721528 +0100
-+++ geany-0.3/src/geany.h      2005-11-22 21:08:13.413443408 +0100
-@@ -66,7 +66,7 @@
- 
- 
- #ifndef DOCDIR
--# define DOCDIR PACKAGE_DATA_DIR"/doc/"PACKAGE"/html/index.html"
-+# define DOCDIR PACKAGE_DATA_DIR"/"PACKAGE"/doc/html/index.html"
+ IMAGE_FILES = images/*.png
+@@ -45,13 +45,3 @@
+           $(INSTALL_DATA) $$file $(DOCDIR)/html/images/$$basefile; \
+         fi \
+       done
+-      $(INSTALL_DATA) $(srcdir)/geany.html $(DOCDIR)/html/index.html
+-      $(INSTALL_DATA) $(srcdir)/geany.txt $(DOCDIR)/manual.txt
+-      $(INSTALL_DATA) $(top_srcdir)/README $(DOCDIR)
+-      $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DOCDIR)
+-      $(INSTALL_DATA) $(top_srcdir)/NEWS $(DOCDIR)
+-      $(INSTALL_DATA) $(top_srcdir)/COPYING $(DOCDIR)
+-      $(INSTALL_DATA) $(top_srcdir)/AUTHORS $(DOCDIR)
+-      $(INSTALL_DATA) $(top_srcdir)/TODO $(DOCDIR)
+-      $(INSTALL_DATA) $(top_srcdir)/scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt
+-
+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_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