r17481 - in /desktop/experimental/gtk+2.0/debian: changelog control control.in gruik2devhelp.awk gtk-faq.devhelp gtk-tutorial.devhelp libgtk2.0-doc.doc-base.gtk-faq libgtk2.0-doc.doc-base.gtk2-tutorial rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Nov 12 12:16:17 UTC 2008 

Author: joss
Date: Wed Nov 12 12:16:17 2008
New Revision: 17481

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17481
Log:
  devhelp file is read.
* Update doc-base files accordingly.
* gruik2devhelp.awk: new script to generate the devhelp files 
  automatically for the FAQ and tutorial, based on the HTML doc.
* Build-depend on gawk, run the script appropriately.

Added:
    desktop/experimental/gtk+2.0/debian/gruik2devhelp.awk
Removed:
    desktop/experimental/gtk+2.0/debian/gtk-faq.devhelp
    desktop/experimental/gtk+2.0/debian/gtk-tutorial.devhelp
Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/control
    desktop/experimental/gtk+2.0/debian/control.in
    desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.doc-base.gtk-faq
    desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.doc-base.gtk2-tutorial
    desktop/experimental/gtk+2.0/debian/rules

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=17481&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Wed Nov 12 12:16:17 2008
@@ -1,8 +1,11 @@
 gtk+2.0 (2.14.4-4) UNRELEASED; urgency=low
 
   * Really install the faq and tutorial files correctly so that the 
-    devhelp file is read. (The devhelp files need updating but I have no 
-    idea how to do.)
+    devhelp file is read.
+  * Update doc-base files accordingly.
+  * gruik2devhelp.awk: new script to generate the devhelp files 
+    automatically for the FAQ and tutorial, based on the HTML doc.
+  * Build-depend on gawk, run the script appropriately.
 
  -- Josselin Mouette <joss at debian.org>  Wed, 12 Nov 2008 01:01:29 +0100
 

Modified: desktop/experimental/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control?rev=17481&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control (original)
+++ desktop/experimental/gtk+2.0/debian/control Wed Nov 12 12:16:17 2008
@@ -33,7 +33,8 @@
                x11proto-xext-dev,
                libdirectfb-dev (>= 0.9.26),
                libcups2-dev (>= 1.2),
-               quilt
+               quilt,
+               gawk
 Build-Depends-Indep: gtk-doc-tools (>= 1.8),
                      docbook-xml
 Standards-Version: 3.8.0

Modified: desktop/experimental/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control.in?rev=17481&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control.in (original)
+++ desktop/experimental/gtk+2.0/debian/control.in Wed Nov 12 12:16:17 2008
@@ -33,7 +33,8 @@
                x11proto-xext-dev,
                libdirectfb-dev (>= 0.9.26),
                libcups2-dev (>= 1.2),
-               quilt
+               quilt,
+               gawk
 Build-Depends-Indep: gtk-doc-tools (>= 1.8),
                      docbook-xml
 Standards-Version: 3.8.0

Added: desktop/experimental/gtk+2.0/debian/gruik2devhelp.awk
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/gruik2devhelp.awk?rev=17481&op=file
==============================================================================
--- desktop/experimental/gtk+2.0/debian/gruik2devhelp.awk (added)
+++ desktop/experimental/gtk+2.0/debian/gruik2devhelp.awk Wed Nov 12 12:16:17 2008
@@ -1,0 +1,29 @@
+#! /usr/bin/awk -f
+
+BEGIN { print "<?xml version=\"1.0\"?>";
+        level=1 }
+
+title == 1 { print "<book title=\"" gensub("^>(.*)</TITLE$","\\1",1) "\" name =\"" name "\" link=\"book1.html\">";
+             print "<chapters>";
+             title=0 }
+/^><TITLE/ { title=1 }
+
+/^><DD$/ { level++ }
+/^><\/DD$/ { level-- }
+
+intext == 0 && href != "" && /^>([^<>]*)<.*$/  { n=n gensub("^>(.*)<.*$", "\\1",1); }
+intext == 1 && href != "" && /^([^<>]*)$/  { n=n $0 " "; }
+intext == 0 && href != "" && /^>([^<>]*)$/  { n=n gensub("^>(.*)$", "\\1",1) " "; intext=1 }
+intext == 1 && href != "" && /^([^<>]*)<.*$/  { n=n gensub("^([^<>]*)<.*$", "\\1",1); intext=0 }
+href != "" && /<\/A$/ { for (i=level; i<lastlevel+1; i++) print "</sub>";
+                        print "<sub name=\"" n "\" link=\"" href "\">";
+                        href = "";
+                        lastlevel = level }
+ending != 1 && /^HREF=".*"$/ { href=gensub("^HREF=\"(.*)\"$","\\1",1);
+                               n = "";
+                               intext = 0 }
+/^CLASS="NAVFOOTER"$/ { ending = 1 }
+
+END { for (i=0; i<lastlevel; i++) print "</sub>";
+      print "</chapters>";
+      print "</book>" }

Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.doc-base.gtk-faq
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-doc.doc-base.gtk-faq?rev=17481&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.doc-base.gtk-faq (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.doc-base.gtk-faq Wed Nov 12 12:16:17 2008
@@ -8,5 +8,5 @@
 Section: Programming/C
 
 Format: HTML
-Index: /usr/share/doc/libgtk2.0-doc/faq/html/book1.html
-Files: /usr/share/doc/libgtk2.0-doc/faq/html/*.html
+Index: /usr/share/doc/libgtk2.0-doc/faq/book1.html
+Files: /usr/share/doc/libgtk2.0-doc/faq/*.html

Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.doc-base.gtk2-tutorial
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-doc.doc-base.gtk2-tutorial?rev=17481&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.doc-base.gtk2-tutorial (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.doc-base.gtk2-tutorial Wed Nov 12 12:16:17 2008
@@ -14,5 +14,5 @@
 Section: Programming/C
 
 Format: HTML
-Index: /usr/share/doc/libgtk2.0-doc/tutorial/html/book1.html
-Files: /usr/share/doc/libgtk2.0-doc/tutorial/html/*.html
+Index: /usr/share/doc/libgtk2.0-doc/tutorial/book1.html
+Files: /usr/share/doc/libgtk2.0-doc/tutorial/*.html

Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=17481&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Wed Nov 12 12:16:17 2008
@@ -147,6 +147,11 @@
 # ".in" file; pass the list of packages in $(1)
 dh_subst_files = $(patsubst %.in,%,$(wildcard $(addprefix debian/, $(addsuffix *.in, $(1)))))
 
+# Gruik gruik generation of .devhelp files for the FAQ and tutorial
+debian/gtk-%.devhelp: docs/%/html/book1.html
+	gawk -f debian/gruik2devhelp.awk -v name=gtk-$* $< > $@
+devhelpfiles: debian/gtk-faq.devhelp debian/gtk-tutorial.devhelp
+
 debian/dh_gtkmodules.1: debian/dh_gtkmodules
 	cd debian && pod2man -c "Gtk" -r "$(DEBVERSION)" dh_gtkmodules dh_gtkmodules.1
 
@@ -248,6 +253,7 @@
 	# unapply patches, if any
 	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2
 	-rm -rf .pc
+	rm -f debian/*.devhelp
 	-rm -rf $(STAMP_DIR)
 	-rm -f $(call dh_subst_files,$(ALL_PKGS))
 	-rm -f debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1
@@ -255,7 +261,7 @@
 
 maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
 
-binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS))
+binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS)) devhelpfiles
 	dh_testdir
 	dh_testroot
 	dh_install -i
@@ -354,4 +360,4 @@
 	    egrep -v '(\.la|$(LIBDIR)/gtk-2.0/$(GTK_BINARY_VERSION)/[^/]+/[^/]+\.a) has been installed' >&2
 
 binary: binary-indep binary-arch
-.PHONY: patch configure build check install clean binary-indep binary-arch list-missing binary
+.PHONY: patch configure build check install clean binary-indep binary-arch list-missing binary devhelpfiles

More information about the pkg-gnome-commits mailing list