r33942 - /desktop/unstable/glib2.0/debian/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sun Apr 1 11:05:36 UTC 2012
Author: biebl
Date: Sun Apr 1 11:05:35 2012
New Revision: 33942
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33942
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.
Modified:
desktop/unstable/glib2.0/debian/changelog
desktop/unstable/glib2.0/debian/libgio-fam.install.in
desktop/unstable/glib2.0/debian/libglib2.0-0-refdbg.install.in
desktop/unstable/glib2.0/debian/libglib2.0-0.install.in
desktop/unstable/glib2.0/debian/libglib2.0-bin.install
desktop/unstable/glib2.0/debian/libglib2.0-data.install
desktop/unstable/glib2.0/debian/libglib2.0-dbg.install.in
desktop/unstable/glib2.0/debian/libglib2.0-dev.install.in
desktop/unstable/glib2.0/debian/libglib2.0-doc.install
desktop/unstable/glib2.0/debian/libglib2.0-udeb.install.in
desktop/unstable/glib2.0/debian/rules
Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=33942&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Sun Apr 1 11:05:35 2012
@@ -1,3 +1,11 @@
+glib2.0 (2.32.0-4) UNRELEASED; urgency=low
+
+ * 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> Sat, 31 Mar 2012 00:53:47 +0200
+
glib2.0 (2.32.0-3) unstable; urgency=low
[ Martin Pitt ]
Modified: desktop/unstable/glib2.0/debian/libgio-fam.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libgio-fam.install.in?rev=33942&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libgio-fam.install.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libgio-fam.install.in [utf-8] Sun Apr 1 11:05:35 2012
@@ -1,1 +1,1 @@
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/gio usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/gio
Modified: desktop/unstable/glib2.0/debian/libglib2.0-0-refdbg.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-0-refdbg.install.in?rev=33942&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-0-refdbg.install.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-0-refdbg.install.in [utf-8] Sun Apr 1 11:05:35 2012
@@ -1,1 +1,1 @@
-debian/install/refdbg/usr/lib/${DEB_HOST_MULTIARCH}/libgobject*.so* usr/lib/${DEB_HOST_MULTIARCH}/refdbg
+usr/lib/${DEB_HOST_MULTIARCH}/libgobject*.so* usr/lib/${DEB_HOST_MULTIARCH}/refdbg
Modified: desktop/unstable/glib2.0/debian/libglib2.0-0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-0.install.in?rev=33942&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-0.install.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-0.install.in [utf-8] Sun Apr 1 11:05:35 2012
@@ -1,8 +1,8 @@
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libglib*.so.* lib/${DEB_HOST_MULTIARCH}
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgobject*.so.* usr/lib/${DEB_HOST_MULTIARCH}
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgmodule*.so.* usr/lib/${DEB_HOST_MULTIARCH}
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgthread*.so.* usr/lib/${DEB_HOST_MULTIARCH}
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgio*.so.* usr/lib/${DEB_HOST_MULTIARCH}
-debian/install/deb/usr/bin/gio-querymodules usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
-debian/install/deb/usr/bin/glib-compile-schemas usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
-debian/install/deb/usr/bin/glib-compile-resources usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
+usr/lib/${DEB_HOST_MULTIARCH}/libglib*.so.* lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/libgobject*.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libgmodule*.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libgthread*.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libgio*.so.*
+usr/bin/gio-querymodules usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
+usr/bin/glib-compile-schemas usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
+usr/bin/glib-compile-resources usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
Modified: desktop/unstable/glib2.0/debian/libglib2.0-bin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-bin.install?rev=33942&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-bin.install [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-bin.install [utf-8] Sun Apr 1 11:05:35 2012
@@ -1,10 +1,10 @@
-debian/install/deb/etc/bash_completion.d etc
-debian/install/deb/usr/bin/gdbus usr/bin
-debian/install/deb/usr/bin/gresource usr/bin
-debian/install/deb/usr/bin/gsettings usr/bin
-debian/install/deb/usr/share/man/man1/gio-querymodules.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/glib-compile-resources.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/glib-compile-schemas.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/gdbus.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/gresource.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/gsettings.1* usr/share/man/man1
+etc/bash_completion.d
+usr/bin/gdbus
+usr/bin/gresource
+usr/bin/gsettings
+usr/share/man/man1/gio-querymodules.1*
+usr/share/man/man1/glib-compile-resources.1*
+usr/share/man/man1/glib-compile-schemas.1*
+usr/share/man/man1/gdbus.1*
+usr/share/man/man1/gresource.1*
+usr/share/man/man1/gsettings.1*
Modified: desktop/unstable/glib2.0/debian/libglib2.0-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-data.install?rev=33942&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-data.install [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-data.install [utf-8] Sun Apr 1 11:05:35 2012
@@ -1,1 +1,1 @@
-debian/install/deb/usr/share/locale usr/share
+usr/share/locale
Modified: desktop/unstable/glib2.0/debian/libglib2.0-dbg.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-dbg.install.in?rev=33942&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-dbg.install.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-dbg.install.in [utf-8] Sun Apr 1 11:05:35 2012
@@ -1,1 +1,1 @@
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/debug/lib*.so* usr/lib/debug
+usr/lib/${DEB_HOST_MULTIARCH}/debug/lib*.so*
Modified: desktop/unstable/glib2.0/debian/libglib2.0-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-dev.install.in?rev=33942&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-dev.install.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-dev.install.in [utf-8] Sun Apr 1 11:05:35 2012
@@ -1,28 +1,28 @@
-debian/install/deb/usr/include/* usr/include
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/lib*.a usr/lib/${DEB_HOST_MULTIARCH}
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgobject*.so usr/lib/${DEB_HOST_MULTIARCH}
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgmodule*.so usr/lib/${DEB_HOST_MULTIARCH}
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgthread*.so usr/lib/${DEB_HOST_MULTIARCH}
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgio*.so usr/lib/${DEB_HOST_MULTIARCH}
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0 usr/lib/${DEB_HOST_MULTIARCH}
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/gdbus-2.0/codegen/*.py usr/lib/${DEB_HOST_MULTIARCH}/gdbus-2.0/codegen
-debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig usr/lib/${DEB_HOST_MULTIARCH}
-debian/install/deb/usr/share/aclocal usr/share
-debian/install/deb/usr/share/gdb usr/share/gdb
-debian/install/deb/usr/share/glib-2.0/gdb usr/share/glib-2.0
-debian/install/deb/usr/share/glib-2.0/gettext usr/share/glib-2.0
-debian/install/deb/usr/share/glib-2.0/schemas usr/share/glib-2.0
-debian/install/deb/usr/share/man/man1/glib-genmarshal.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/glib-mkenums.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/gobject-query.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/glib-gettextize.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/gtester.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/gtester-report.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/gdbus-codegen.1* usr/share/man/man1
-debian/install/deb/usr/bin/glib-genmarshal usr/bin
-debian/install/deb/usr/bin/gobject-query usr/bin
-debian/install/deb/usr/bin/glib-mkenums usr/bin
-debian/install/deb/usr/bin/gtester-report usr/bin
-debian/install/deb/usr/bin/glib-gettextize usr/bin
-debian/install/deb/usr/bin/gtester usr/bin
-debian/install/deb/usr/bin/gdbus-codegen usr/bin
+usr/include/*
+usr/lib/${DEB_HOST_MULTIARCH}/lib*.a
+usr/lib/${DEB_HOST_MULTIARCH}/libgobject*.so
+usr/lib/${DEB_HOST_MULTIARCH}/libgmodule*.so
+usr/lib/${DEB_HOST_MULTIARCH}/libgthread*.so
+usr/lib/${DEB_HOST_MULTIARCH}/libgio*.so
+usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
+usr/lib/${DEB_HOST_MULTIARCH}/gdbus-2.0/codegen/*.py
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+usr/share/aclocal
+usr/share/gdb
+usr/share/glib-2.0/gdb
+usr/share/glib-2.0/gettext
+usr/share/glib-2.0/schemas
+usr/share/man/man1/glib-genmarshal.1*
+usr/share/man/man1/glib-mkenums.1*
+usr/share/man/man1/gobject-query.1*
+usr/share/man/man1/glib-gettextize.1*
+usr/share/man/man1/gtester.1*
+usr/share/man/man1/gtester-report.1*
+usr/share/man/man1/gdbus-codegen.1*
+usr/bin/glib-genmarshal
+usr/bin/gobject-query
+usr/bin/glib-mkenums
+usr/bin/gtester-report
+usr/bin/glib-gettextize
+usr/bin/gtester
+usr/bin/gdbus-codegen
Modified: desktop/unstable/glib2.0/debian/libglib2.0-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-doc.install?rev=33942&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-doc.install [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-doc.install [utf-8] Sun Apr 1 11:05:35 2012
@@ -1,1 +1,1 @@
-debian/install/deb/usr/share/doc/libglib2.0-doc usr/share/doc
+usr/share/doc/libglib2.0-doc
Modified: desktop/unstable/glib2.0/debian/libglib2.0-udeb.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-udeb.install.in?rev=33942&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-udeb.install.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-udeb.install.in [utf-8] Sun Apr 1 11:05:35 2012
@@ -1,2 +1,2 @@
-debian/install/udeb/usr/lib/${DEB_HOST_MULTIARCH}/lib*.so.* usr/lib
-debian/install/udeb/usr/share/locale usr/share
+usr/lib/${DEB_HOST_MULTIARCH}/lib*.so.* usr/lib
+usr/share/locale
Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=33942&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/rules [utf-8] Sun Apr 1 11:05:35 2012
@@ -39,6 +39,10 @@
REFDBG_PKG := libglib$(APIVER)-$(SONAME)-refdbg
DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/install/@FLAVOR@
+
+DEB_DH_INSTALL_ARGS += --sourcedir=debian/install/deb
+DEB_DH_INSTALL_ARGS_$(UDEB_PKG) += --sourcedir=debian/install/udeb
+DEB_DH_INSTALL_ARGS_$(REFDBG_PKG) += --sourcedir=debian/install/refdbg
DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V --add-udeb=$(UDEB_PKG) -- -c4
DEB_DH_MAKESHLIBS_ARGS_$(REFDBG_PKG) = --no-act
More information about the pkg-gnome-commits
mailing list