From ce34580537601c30f4c550c721766ed81f6ae2bb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 15 Apr 2012 22:50:17 +0000 Subject: [PATCH] Set --sourcedir for the different flavors when running dh_install. This way the .install files can be simplified a lot which makes them much more readable. --- debian/changelog | 3 +++ debian/gir1.2-gtk-3.0.install | 1 + debian/gir1.2-gtk-3.0.install.in | 1 - debian/gtk-3-examples.install | 4 ++++ debian/gtk-3-examples.install.in | 4 ---- debian/libgail-3-0.install | 2 +- debian/libgail-3-0.install.in | 1 - debian/libgail-3-0.opt | 2 -- debian/libgail-3-dev.install | 7 +++---- debian/libgail-3-dev.install.in | 3 --- debian/libgail-3-doc.install | 2 +- debian/libgtk-3-0-udeb.install | 1 + debian/libgtk-3-0-udeb.install.in | 1 - debian/libgtk-3-0.install.in | 12 ++++++------ debian/libgtk-3-bin.install | 2 ++ debian/libgtk-3-bin.install.in | 3 --- debian/libgtk-3-common.install.in | 10 +++++----- debian/libgtk-3-dev.install | 5 +++++ debian/libgtk-3-dev.install.in | 5 ----- debian/libgtk-3-doc.docs | 1 + debian/libgtk-3-doc.install.in | 6 ++---- debian/rules | 8 ++++++-- 22 files changed, 41 insertions(+), 43 deletions(-) create mode 100644 debian/gir1.2-gtk-3.0.install delete mode 100644 debian/gir1.2-gtk-3.0.install.in create mode 100644 debian/gtk-3-examples.install delete mode 100644 debian/gtk-3-examples.install.in delete mode 100644 debian/libgail-3-0.install.in delete mode 100644 debian/libgail-3-0.opt delete mode 100644 debian/libgail-3-dev.install.in create mode 100644 debian/libgtk-3-0-udeb.install delete mode 100644 debian/libgtk-3-0-udeb.install.in create mode 100644 debian/libgtk-3-bin.install delete mode 100644 debian/libgtk-3-bin.install.in create mode 100644 debian/libgtk-3-dev.install delete mode 100644 debian/libgtk-3-dev.install.in create mode 100644 debian/libgtk-3-doc.docs diff --git a/debian/changelog b/debian/changelog index 294ca0e4e4..46b1f4f771 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ gtk+3.0 (3.4.1-1) UNRELEASED; urgency=low * Drop explicit Build-Depends on gir1.2-glib-2.0 and gir1.2-freedesktop. * Refresh patches. * Remove leftovers from the opt flavor. + * Set --sourcedir for the different flavors when running dh_install. This + way the .install files can be simplified a lot which makes them much more + readable. -- Michael Biebl Mon, 16 Apr 2012 00:39:13 +0200 diff --git a/debian/gir1.2-gtk-3.0.install b/debian/gir1.2-gtk-3.0.install new file mode 100644 index 0000000000..03255f6073 --- /dev/null +++ b/debian/gir1.2-gtk-3.0.install @@ -0,0 +1 @@ +usr/lib/*/girepository-1.0/ usr/lib/ diff --git a/debian/gir1.2-gtk-3.0.install.in b/debian/gir1.2-gtk-3.0.install.in deleted file mode 100644 index 50b6e2b8fc..0000000000 --- a/debian/gir1.2-gtk-3.0.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/install/shared/@LIBDIR@/girepository-1.0/ usr/lib/ diff --git a/debian/gtk-3-examples.install b/debian/gtk-3-examples.install new file mode 100644 index 0000000000..a837ee61c0 --- /dev/null +++ b/debian/gtk-3-examples.install @@ -0,0 +1,4 @@ +usr/bin/gtk3-demo +usr/bin/gtk3-widget-factory +usr/share/gtk-3.0/demo +usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml diff --git a/debian/gtk-3-examples.install.in b/debian/gtk-3-examples.install.in deleted file mode 100644 index 951bc787e4..0000000000 --- a/debian/gtk-3-examples.install.in +++ /dev/null @@ -1,4 +0,0 @@ -debian/install/shared/usr/bin/gtk3-demo usr/bin -debian/install/shared/usr/bin/gtk3-widget-factory usr/bin -debian/install/shared/usr/share/gtk-3.0/demo usr/share/gtk-3.0 -debian/install/shared/usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml usr/share/glib-2.0/schemas diff --git a/debian/libgail-3-0.install b/debian/libgail-3-0.install index e852704ac0..8550f77859 100644 --- a/debian/libgail-3-0.install +++ b/debian/libgail-3-0.install @@ -1 +1 @@ -debian/install/shared/usr/lib/libgail*.so.* /usr/lib +usr/lib/*/libgail*.so.* diff --git a/debian/libgail-3-0.install.in b/debian/libgail-3-0.install.in deleted file mode 100644 index 964f72eaec..0000000000 --- a/debian/libgail-3-0.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/install/shared/@LIBDIR@/libgail*.so.* @LIBDIR@ diff --git a/debian/libgail-3-0.opt b/debian/libgail-3-0.opt deleted file mode 100644 index 791319d9f6..0000000000 --- a/debian/libgail-3-0.opt +++ /dev/null @@ -1,2 +0,0 @@ -# from the optimised flavor -debian/install/opt/@LIBDIR@/libgail*.so.* @OPTLIBDIR@ diff --git a/debian/libgail-3-dev.install b/debian/libgail-3-dev.install index cfa36e82e2..ed55ce7af4 100644 --- a/debian/libgail-3-dev.install +++ b/debian/libgail-3-dev.install @@ -1,4 +1,3 @@ -debian/install/shared/usr/include/gail* /usr/include -debian/install/shared/usr/lib/libgail*.so /usr/lib -debian/install/static/usr/lib/libgail*.a /usr/lib -debian/install/shared/usr/lib/pkgconfig/gail*.pc /usr/lib/pkgconfig +usr/include/gail* +usr/lib/*/libgail*.so +usr/lib/*/pkgconfig/gail*.pc diff --git a/debian/libgail-3-dev.install.in b/debian/libgail-3-dev.install.in deleted file mode 100644 index 90da8a5b0e..0000000000 --- a/debian/libgail-3-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -debian/install/shared/usr/include/gail* /usr/include -debian/install/shared/@LIBDIR@/libgail*.so @LIBDIR@ -debian/install/shared/@LIBDIR@/pkgconfig/gail*.pc @LIBDIR@/pkgconfig diff --git a/debian/libgail-3-doc.install b/debian/libgail-3-doc.install index 69c7f65e50..9760670641 100644 --- a/debian/libgail-3-doc.install +++ b/debian/libgail-3-doc.install @@ -1 +1 @@ -debian/install/shared/usr/share/gtk-doc/html/gail* usr/share/gtk-doc/html +usr/share/gtk-doc/html/gail* diff --git a/debian/libgtk-3-0-udeb.install b/debian/libgtk-3-0-udeb.install new file mode 100644 index 0000000000..62e7ea4de8 --- /dev/null +++ b/debian/libgtk-3-0-udeb.install @@ -0,0 +1 @@ +usr/lib/*/libg?k*.so.* diff --git a/debian/libgtk-3-0-udeb.install.in b/debian/libgtk-3-0-udeb.install.in deleted file mode 100644 index 0e4749024e..0000000000 --- a/debian/libgtk-3-0-udeb.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/install/shared_udeb/@LIBDIR@/libg?k*.so.* @LIBDIR@ diff --git a/debian/libgtk-3-0.install.in b/debian/libgtk-3-0.install.in index 94e800a955..27e9ab23c5 100644 --- a/debian/libgtk-3-0.install.in +++ b/debian/libgtk-3-0.install.in @@ -1,6 +1,6 @@ -debian/install/shared/usr/bin/gtk-query-immodules-3.0 @LIBDIR@/@SHARED_PKG@ -debian/install/shared/usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@ -debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules -debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends -debian/install/shared/@LIBDIR@/libgtk*.so.* @LIBDIR@ -debian/install/shared/@LIBDIR@/libgdk*.so.* @LIBDIR@ +usr/bin/gtk-query-immodules-3.0 @LIBDIR@/@SHARED_PKG@ +usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@ +@MODULES_BASE_PATH@/immodules/*.so +@MODULES_BASE_PATH@/printbackends/*.so +@LIBDIR@/libgtk*.so.* +@LIBDIR@/libgdk*.so.* diff --git a/debian/libgtk-3-bin.install b/debian/libgtk-3-bin.install new file mode 100644 index 0000000000..6188080630 --- /dev/null +++ b/debian/libgtk-3-bin.install @@ -0,0 +1,2 @@ +usr/share/man/man1/gtk-update-icon-cache.1 +usr/share/man/man1/gtk-query-immodules-3.0.1 diff --git a/debian/libgtk-3-bin.install.in b/debian/libgtk-3-bin.install.in deleted file mode 100644 index 0262a73ac5..0000000000 --- a/debian/libgtk-3-bin.install.in +++ /dev/null @@ -1,3 +0,0 @@ -debian/install/shared/usr/share/man/man1/gtk-update-icon-cache.1 usr/share/man/man1 -debian/install/shared/usr/share/man/man1/gtk-query-immodules-3.0.1 usr/share/man/man1 -debian/update-icon-caches usr/sbin diff --git a/debian/libgtk-3-common.install.in b/debian/libgtk-3-common.install.in index c8054133ea..0b8c13d351 100644 --- a/debian/libgtk-3-common.install.in +++ b/debian/libgtk-3-common.install.in @@ -1,5 +1,5 @@ -debian/install/shared/@CONFDIR@/im-multipress.conf @CONFDIR@ -debian/install/shared/usr/share/locale usr/share -debian/install/shared/usr/share/themes usr/share -debian/install/shared/usr/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml usr/share/glib-2.0/schemas -debian/install/shared/usr/share/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml usr/share/glib-2.0/schemas +@CONFDIR@/im-multipress.conf +usr/share/locale +usr/share/themes +usr/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml +usr/share/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml diff --git a/debian/libgtk-3-dev.install b/debian/libgtk-3-dev.install new file mode 100644 index 0000000000..4a72da84e4 --- /dev/null +++ b/debian/libgtk-3-dev.install @@ -0,0 +1,5 @@ +usr/include/gtk* +usr/lib/*/libg?k*.so +usr/lib/*/pkgconfig/g?k* +usr/share/aclocal +usr/share/gir-1.0 diff --git a/debian/libgtk-3-dev.install.in b/debian/libgtk-3-dev.install.in deleted file mode 100644 index aa03058662..0000000000 --- a/debian/libgtk-3-dev.install.in +++ /dev/null @@ -1,5 +0,0 @@ -debian/install/shared/usr/include/gtk* usr/include -debian/install/shared/@LIBDIR@/libg?k*.so @LIBDIR@ -debian/install/shared/@LIBDIR@/pkgconfig/g?k* @LIBDIR@/pkgconfig -debian/install/shared/usr/share/aclocal usr/share -debian/install/shared/usr/share/gir-1.0 usr/share diff --git a/debian/libgtk-3-doc.docs b/debian/libgtk-3-doc.docs new file mode 100644 index 0000000000..bf4cbd5a4e --- /dev/null +++ b/debian/libgtk-3-doc.docs @@ -0,0 +1 @@ +docs/*.txt diff --git a/debian/libgtk-3-doc.install.in b/debian/libgtk-3-doc.install.in index 7fc5052c7f..1811c0857e 100644 --- a/debian/libgtk-3-doc.install.in +++ b/debian/libgtk-3-doc.install.in @@ -1,4 +1,2 @@ -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/*.txt usr/share/doc/@DOC_PKG@ +usr/share/gtk-doc/html/gtk* usr/share/doc/@DOC_PKG@ +usr/share/gtk-doc/html/gdk* usr/share/doc/@DOC_PKG@ diff --git a/debian/rules b/debian/rules index 0fb6886be8..d6751588e4 100644 --- a/debian/rules +++ b/debian/rules @@ -50,6 +50,8 @@ BIN_PKG := libgtk-$(APIVER)-bin DEBUG_PKG := $(SHARED_PKG)-dbg EXAMPLES_PKG := gtk-$(APIVER)-examples +DEB_DH_INSTALL_ARGS += --sourcedir=debian/install/shared +DEB_DH_INSTALL_ARGS_$(UDEB_PKG) += --sourcedir=debian/install/shared_udeb DEB_CONFIGURE_EXTRA_FLAGS = \ --libdir=/$(LIBDIR) \ @@ -121,12 +123,14 @@ build-arch: $(call dh_subst_files,$(DEB_ARCH_PACKAGES)) binary-install/$(SHARED_PKG):: # Install the binaries with a -3.0 suffix mv debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/gtk-update-icon-cache \ - debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/gtk-update-icon-cache-3.0 + debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/gtk-update-icon-cache-3.0 binary-install/$(BIN_PKG):: # Install the binaries with a -3.0 suffix mv debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache.1 \ - debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache-3.0.1 + debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache-3.0.1 + install -m 0755 -D debian/update-icon-caches \ + debian/$(BIN_PKG)/usr/sbin/update-icon-caches list-missing: # FIXME: remove this when CDBS' list-missing works with multiple flavors