SOURCES: geany-doc_dir.patch - updated for 0.8

[freetz]

Author: freetz                       Date: Fri Aug 11 23:01:46 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.8

---- Files affected:
SOURCES:
   geany-doc_dir.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/geany-doc_dir.patch
diff -u SOURCES/geany-doc_dir.patch:1.2 SOURCES/geany-doc_dir.patch:1.3
--- SOURCES/geany-doc_dir.patch:1.2	Thu Dec 22 19:11:11 2005
+++ SOURCES/geany-doc_dir.patch	Sat Aug 12 01:01:40 2006
@@ -1,22 +1,35 @@
-diff -aurN geany.orig/doc/Makefile.am geany/doc/Makefile.am
---- geany.orig/doc/Makefile.am	2005-12-11 19:06:07.000000000 +0100
-+++ geany/doc/Makefile.am	2005-12-21 17:45:14.000000000 +0100
+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,5 +1,5 @@
- 
+ man_MANS=geany.1
 -DOCDIR = $(DESTDIR)/$(datadir)/doc/@PACKAGE@
 +DOCDIR = $(DESTDIR)/$(datadir)/@PACKAGE@/doc
  HTML_FILES = html/*.html geany.css
  IMAGE_FILES = images/*.jpg
- EXTRA_DIST = geany.css make_webable.sh geany.txt geany_gpl.docbook geany.1 geany.docbook $(HTML_FILES) $(IMAGE_FILES)
-diff -aurN geany.orig/src/geany.h geany/src/geany.h
---- geany.orig/src/geany.h	2005-12-18 23:38:44.000000000 +0100
-+++ geany/src/geany.h	2005-12-21 17:46:05.000000000 +0100
-@@ -67,7 +67,7 @@
- 
- 
- #ifndef DOCDIR
--# define DOCDIR PACKAGE_DATA_DIR"/doc/"PACKAGE"/html/"
-+# define DOCDIR PACKAGE_DATA_DIR"/"PACKAGE"/doc/html/index.html"
+ EXTRA_DIST = geany.css geany.xsl make_webable.sh geany.txt geany_gpl.docbook geany.1 \
+@@ -45,12 +45,3 @@
+ 	    $(INSTALL_DATA) $(srcdir)/$$file $(DOCDIR)/html/images/$$basefile; \
+ 	  fi \
+ 	done
+-	$(INSTALL_DATA) geany.txt $(DOCDIR)/manual.txt
+-	$(INSTALL_DATA) ../README $(DOCDIR)
+-	$(INSTALL_DATA) ../ChangeLog $(DOCDIR)
+-	$(INSTALL_DATA) ../NEWS $(DOCDIR)
+-	$(INSTALL_DATA) ../COPYING $(DOCDIR)
+-	$(INSTALL_DATA) ../AUTHORS $(DOCDIR)
+-	$(INSTALL_DATA) ../TODO $(DOCDIR)
+-	$(INSTALL_DATA) ../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 @@
+ 	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/");
+ 	locale_dir = g_strdup(PACKAGE_LOCALE_DIR);
  #endif
- 
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/geany-doc_dir.patch?r1=1.2&r2=1.3&f=u