From 38c548d0404d1010c7ab2213fcfce57b414d6d06 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Thu, 4 Nov 2010 23:33:37 +0000 Subject: [PATCH] debian/ruels, libtk3.0-doc.*: Tutorial and FAQ have been removed from the gtk source as they were updated, stop trying to install them --- debian/changelog | 4 +++- debian/libgtk3.0-doc.doc-base.gtk-faq | 12 ------------ debian/libgtk3.0-doc.doc-base.gtk3-tutorial | 18 ------------------ debian/libgtk3.0-doc.install.in | 5 ----- debian/libgtk3.0-doc.links.in | 2 -- debian/rules | 9 ++------- 6 files changed, 5 insertions(+), 45 deletions(-) delete mode 100644 debian/libgtk3.0-doc.doc-base.gtk-faq delete mode 100644 debian/libgtk3.0-doc.doc-base.gtk3-tutorial diff --git a/debian/changelog b/debian/changelog index 698114140d..dd3d44ee38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,8 +24,10 @@ gtk+3.0 (2.91.3-1) UNRELEASED; urgency=low * 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 + * 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 Sun, 10 Oct 2010 14:06:26 +0100 + -- Sjoerd Simons Thu, 04 Nov 2010 23:32:13 +0000 gtk+2.0 (2.21.5-1) experimental; urgency=low diff --git a/debian/libgtk3.0-doc.doc-base.gtk-faq b/debian/libgtk3.0-doc.doc-base.gtk-faq deleted file mode 100644 index 30242a572f..0000000000 --- a/debian/libgtk3.0-doc.doc-base.gtk-faq +++ /dev/null @@ -1,12 +0,0 @@ -Document: gtk3-faq -Title: GTK+3.0 Frequently Asked Questions -Author: Tony Gale, Shawn Amundson, and Emmanuel Deloget -Abstract: This document is intended to answer questions that are - likely to be frequently asked by programmers using the GTK+ - graphical user interface library, or people who are just looking at - using GTK+, GNOME, or GIMP. -Section: Programming/C - -Format: HTML -Index: /usr/share/doc/libgtk3.0-doc/faq/index.html -Files: /usr/share/doc/libgtk3.0-doc/faq/*.html diff --git a/debian/libgtk3.0-doc.doc-base.gtk3-tutorial b/debian/libgtk3.0-doc.doc-base.gtk3-tutorial deleted file mode 100644 index 815d19fa6b..0000000000 --- a/debian/libgtk3.0-doc.doc-base.gtk3-tutorial +++ /dev/null @@ -1,18 +0,0 @@ -Document: gtk3-tutorial -Title: GTK+3.0 Tutorial -Author: Tony Gale and Ian Main -Abstract: GTK+ (GIMP Toolkit) is a library for creating graphical user - interfaces. It is licensed using the LGPL license, so you can develop - open software, free software, or even commercial non-free software - using GTK+ without having to spend anything for licenses or royalties. - . - This tutorial is an attempt to document as much as possible of GTK+, - but it is by no means complete. This tutorial assumes a good - understanding of C, and how to create C programs. It would be a great - benefit for the reader to have previous X programming experience, but - it shouldn't be necessary. -Section: Programming/C - -Format: HTML -Index: /usr/share/doc/libgtk3.0-doc/tutorial/index.html -Files: /usr/share/doc/libgtk3.0-doc/tutorial/*.html diff --git a/debian/libgtk3.0-doc.install.in b/debian/libgtk3.0-doc.install.in index 423b9cbc6d..9587b4344c 100644 --- a/debian/libgtk3.0-doc.install.in +++ b/debian/libgtk3.0-doc.install.in @@ -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@ diff --git a/debian/libgtk3.0-doc.links.in b/debian/libgtk3.0-doc.links.in index 333b01309f..441d08c6c5 100644 --- a/debian/libgtk3.0-doc.links.in +++ b/debian/libgtk3.0-doc.links.in @@ -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 diff --git a/debian/rules b/debian/rules index cb7bfdbf23..23dc33057d 100644 --- a/debian/rules +++ b/debian/rules @@ -159,11 +159,6 @@ DH_INSTALLDOCS_FILES := NEWS README ChangeLog # ".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 $(STAMP_DIR)/patch-stamp: @@ -267,7 +262,7 @@ clean:: debian/control 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 @@ list-missing: 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