r34227 - /desktop/experimental/gtk+3.0/debian/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sun Apr 15 22:50:17 UTC 2012
Author: biebl
Date: Sun Apr 15 22:50:17 2012
New Revision: 34227
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34227
Log:
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.
Added:
desktop/experimental/gtk+3.0/debian/gir1.2-gtk-3.0.install
- copied, changed from r34225, desktop/experimental/gtk+3.0/debian/gir1.2-gtk-3.0.install.in
desktop/experimental/gtk+3.0/debian/gtk-3-examples.install
- copied, changed from r34225, desktop/experimental/gtk+3.0/debian/gtk-3-examples.install.in
desktop/experimental/gtk+3.0/debian/libgail-3-0.install
- copied, changed from r34225, desktop/experimental/gtk+3.0/debian/libgail-3-0.install.in
desktop/experimental/gtk+3.0/debian/libgail-3-dev.install
- copied, changed from r34225, desktop/experimental/gtk+3.0/debian/libgail-3-dev.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-0-udeb.install
- copied, changed from r34225, desktop/experimental/gtk+3.0/debian/libgtk-3-0-udeb.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install
- copied, changed from r34225, desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-dev.install
- copied, changed from r34225, desktop/experimental/gtk+3.0/debian/libgtk-3-dev.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-doc.docs
Removed:
desktop/experimental/gtk+3.0/debian/gir1.2-gtk-3.0.install.in
desktop/experimental/gtk+3.0/debian/gtk-3-examples.install.in
desktop/experimental/gtk+3.0/debian/libgail-3-0.install.in
desktop/experimental/gtk+3.0/debian/libgail-3-0.opt
desktop/experimental/gtk+3.0/debian/libgail-3-dev.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-0-udeb.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-dev.install.in
Modified:
desktop/experimental/gtk+3.0/debian/changelog
desktop/experimental/gtk+3.0/debian/libgail-3-doc.install
desktop/experimental/gtk+3.0/debian/libgtk-3-0.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-common.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-doc.install.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=34227&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Sun Apr 15 22:50:17 2012
@@ -9,6 +9,9 @@
* 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 <biebl at debian.org> Mon, 16 Apr 2012 00:39:13 +0200
Copied: desktop/experimental/gtk+3.0/debian/gir1.2-gtk-3.0.install (from r34225, desktop/experimental/gtk+3.0/debian/gir1.2-gtk-3.0.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/gir1.2-gtk-3.0.install?rev=34227&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/gir1.2-gtk-3.0.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/gir1.2-gtk-3.0.install [utf-8] Sun Apr 15 22:50:17 2012
@@ -1,1 +1,1 @@
-debian/install/shared/@LIBDIR@/girepository-1.0/ usr/lib/
+usr/lib/*/girepository-1.0/ usr/lib/
Copied: desktop/experimental/gtk+3.0/debian/gtk-3-examples.install (from r34225, desktop/experimental/gtk+3.0/debian/gtk-3-examples.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/gtk-3-examples.install?rev=34227&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/gtk-3-examples.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/gtk-3-examples.install [utf-8] Sun Apr 15 22:50:17 2012
@@ -1,4 +1,4 @@
-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
+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
Copied: desktop/experimental/gtk+3.0/debian/libgail-3-0.install (from r34225, desktop/experimental/gtk+3.0/debian/libgail-3-0.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgail-3-0.install?rev=34227&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgail-3-0.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgail-3-0.install [utf-8] Sun Apr 15 22:50:17 2012
@@ -1,1 +1,1 @@
-debian/install/shared/@LIBDIR@/libgail*.so.* @LIBDIR@
+usr/lib/*/libgail*.so.*
Copied: desktop/experimental/gtk+3.0/debian/libgail-3-dev.install (from r34225, desktop/experimental/gtk+3.0/debian/libgail-3-dev.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgail-3-dev.install?rev=34227&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgail-3-dev.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgail-3-dev.install [utf-8] Sun Apr 15 22:50:17 2012
@@ -1,3 +1,3 @@
-debian/install/shared/usr/include/gail* /usr/include
-debian/install/shared/@LIBDIR@/libgail*.so @LIBDIR@
-debian/install/shared/@LIBDIR@/pkgconfig/gail*.pc @LIBDIR@/pkgconfig
+usr/include/gail*
+usr/lib/*/libgail*.so
+usr/lib/*/pkgconfig/gail*.pc
Modified: desktop/experimental/gtk+3.0/debian/libgail-3-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgail-3-doc.install?rev=34227&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgail-3-doc.install [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgail-3-doc.install [utf-8] Sun Apr 15 22:50:17 2012
@@ -1,1 +1,1 @@
-debian/install/shared/usr/share/gtk-doc/html/gail* usr/share/gtk-doc/html
+usr/share/gtk-doc/html/gail*
Copied: desktop/experimental/gtk+3.0/debian/libgtk-3-0-udeb.install (from r34225, desktop/experimental/gtk+3.0/debian/libgtk-3-0-udeb.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-0-udeb.install?rev=34227&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-0-udeb.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-0-udeb.install [utf-8] Sun Apr 15 22:50:17 2012
@@ -1,1 +1,1 @@
-debian/install/shared_udeb/@LIBDIR@/libg?k*.so.* @LIBDIR@
+usr/lib/*/libg?k*.so.*
Modified: desktop/experimental/gtk+3.0/debian/libgtk-3-0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-0.install.in?rev=34227&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-0.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-0.install.in [utf-8] Sun Apr 15 22:50:17 2012
@@ -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@
+ at MODULES_BASE_PATH@/immodules/*.so
+ at MODULES_BASE_PATH@/printbackends/*.so
+ at LIBDIR@/libgtk*.so.*
+ at LIBDIR@/libgdk*.so.*
Copied: desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install (from r34225, desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-bin.install?rev=34227&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install [utf-8] Sun Apr 15 22:50:17 2012
@@ -1,3 +1,2 @@
-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
+usr/share/man/man1/gtk-update-icon-cache.1
+usr/share/man/man1/gtk-query-immodules-3.0.1
Modified: desktop/experimental/gtk+3.0/debian/libgtk-3-common.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-common.install.in?rev=34227&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-common.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-common.install.in [utf-8] Sun Apr 15 22:50:17 2012
@@ -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
+ at 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
Copied: desktop/experimental/gtk+3.0/debian/libgtk-3-dev.install (from r34225, desktop/experimental/gtk+3.0/debian/libgtk-3-dev.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-dev.install?rev=34227&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-dev.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-dev.install [utf-8] Sun Apr 15 22:50:17 2012
@@ -1,5 +1,5 @@
-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
+usr/include/gtk*
+usr/lib/*/libg?k*.so
+usr/lib/*/pkgconfig/g?k*
+usr/share/aclocal
+usr/share/gir-1.0
Added: desktop/experimental/gtk+3.0/debian/libgtk-3-doc.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-doc.docs?rev=34227&op=file
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-doc.docs (added)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-doc.docs [utf-8] Sun Apr 15 22:50:17 2012
@@ -1,0 +1,1 @@
+docs/*.txt
Modified: desktop/experimental/gtk+3.0/debian/libgtk-3-doc.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-doc.install.in?rev=34227&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-doc.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-doc.install.in [utf-8] Sun Apr 15 22:50:17 2012
@@ -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@
Modified: desktop/experimental/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/rules?rev=34227&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/rules [utf-8] Sun Apr 15 22:50:17 2012
@@ -50,6 +50,8 @@
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 @@
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
More information about the pkg-gnome-commits
mailing list