r25477 - in /desktop/experimental/gtk+3.0/debian: changelog libgtk3.0-doc.doc-base.gtk-faq libgtk3.0-doc.doc-base.gtk3-tutorial libgtk3.0-doc.install.in libgtk3.0-doc.links.in rules

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Thu Nov  4 23:33:37 2010
New Revision: 25477

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25477
Log:
debian/ruels, libtk3.0-doc.*: Tutorial and FAQ have been removed from the
gtk source as they were updated, stop trying to install them

Removed:
    desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.doc-base.gtk-faq
    desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.doc-base.gtk3-tutorial
Modified:
    desktop/experimental/gtk+3.0/debian/changelog
    desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.install.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.links.in
    desktop/experimental/gtk+3.0/debian/rules

Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=25477&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Thu Nov  4 23:33:37 2010
@@ -24,8 +24,10 @@
   * debian/libgtk3-bin.preinst, debian/libgtk3-bin.postrm:
     + Divert gtk+2.0's update-icon-caches. The format remained the same so this
       is safe to do
-
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 10 Oct 2010 14:06:26 +0100
+  * debian/ruels, libtk3.0-doc.*: Tutorial and FAQ have been removed from the
+    gtk source as they were updated, stop trying to install them
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Thu, 04 Nov 2010 23:32:13 +0000
 
 gtk+2.0 (2.21.5-1) experimental; urgency=low
 

Modified: desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk3.0-doc.install.in?rev=25477&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.install.in [utf-8] Thu Nov  4 23:33:37 2010
@@ -1,10 +1,5 @@
-# from Debian
-debian/gtk3-faq.devhelp usr/share/doc/@DOC_PKG@/faq
-debian/gtk3-tutorial.devhelp usr/share/doc/@DOC_PKG@/tutorial
 # from the shared flavor
 debian/install/shared/usr/share/gtk-doc/html/gtk* usr/share/doc/@DOC_PKG@
 debian/install/shared/usr/share/gtk-doc/html/gdk* usr/share/doc/@DOC_PKG@
 # from the source
-docs/faq/html/* usr/share/doc/@DOC_PKG@/faq
-docs/tutorial/html/* usr/share/doc/@DOC_PKG@/tutorial
 docs/*.txt usr/share/doc/@DOC_PKG@

Modified: desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk3.0-doc.links.in?rev=25477&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.links.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.links.in [utf-8] Thu Nov  4 23:33:37 2010
@@ -1,7 +1,5 @@
 usr/share/doc/@DOC_PKG@/gdk3 usr/share/gtk-doc/html/gdk3
 usr/share/doc/@DOC_PKG@/gtk3 usr/share/gtk-doc/html/gtk3
-usr/share/doc/@DOC_PKG@/faq usr/share/gtk-doc/html/gtk3-faq
-usr/share/doc/@DOC_PKG@/tutorial usr/share/gtk-doc/html/gtk3-tutorial
 usr/share/doc/libatk1.0-doc/atk usr/share/doc/@DOC_PKG@/atk
 usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DOC_PKG@/glib
 usr/share/doc/libglib2.0-doc/gobject usr/share/doc/@DOC_PKG@/gobject

Modified: desktop/experimental/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/rules?rev=25477&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/rules [utf-8] Thu Nov  4 23:33:37 2010
@@ -158,11 +158,6 @@
 # macro computing the list of 'debian/<pkg>.*" files which have a corresponding
 # ".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/gtk3-%.devhelp: docs/%/html/index.html
-	gawk -f debian/gruik2devhelp.awk -v name=gtk3-$* $< > $@
-devhelpfiles: debian/gtk3-faq.devhelp debian/gtk3-tutorial.devhelp
 
 patch: $(STAMP_DIR)/patch-stamp
 
@@ -267,7 +262,7 @@
 
 maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
 
-binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS)) devhelpfiles
+binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS))
 	dh_testdir
 	dh_testroot
 	dh_install -i
@@ -348,4 +343,4 @@
 	    egrep -v '(\.la|$(LIBDIR)/gtk-3.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 devhelpfiles
+.PHONY: patch configure build check install clean binary-indep binary-arch list-missing binary