r51226 - /desktop/unstable/glib2.0/debian/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sat Oct 1 19:35:38 UTC 2016
Author: biebl
Date: Sat Oct 1 19:35:38 2016
New Revision: 51226
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51226
Log:
Use dh-exec to substitute ${DEB_HOST_MULTIARCH} in .install, .links and
.dirs files.
Added:
desktop/unstable/glib2.0/debian/libgio-fam.install
- copied, changed from r51225, desktop/unstable/glib2.0/debian/libgio-fam.install.in
desktop/unstable/glib2.0/debian/libglib2.0-0-dbg.install
- copied unchanged from r51225, desktop/unstable/glib2.0/debian/libglib2.0-0-dbg.install.in
desktop/unstable/glib2.0/debian/libglib2.0-0.dirs (contents, props changed)
- copied, changed from r51225, desktop/unstable/glib2.0/debian/libglib2.0-0.dirs.in
desktop/unstable/glib2.0/debian/libglib2.0-0.install (contents, props changed)
- copied, changed from r51225, desktop/unstable/glib2.0/debian/libglib2.0-0.install.in
desktop/unstable/glib2.0/debian/libglib2.0-bin.links (contents, props changed)
- copied, changed from r51225, desktop/unstable/glib2.0/debian/libglib2.0-bin.links.in
desktop/unstable/glib2.0/debian/libglib2.0-dev.install
- copied, changed from r51225, desktop/unstable/glib2.0/debian/libglib2.0-dev.install.in
desktop/unstable/glib2.0/debian/libglib2.0-dev.links (contents, props changed)
- copied, changed from r51225, desktop/unstable/glib2.0/debian/libglib2.0-dev.links.in
desktop/unstable/glib2.0/debian/libglib2.0-udeb.install
- copied, changed from r51225, desktop/unstable/glib2.0/debian/libglib2.0-udeb.install.in
Removed:
desktop/unstable/glib2.0/debian/libgio-fam.install.in
desktop/unstable/glib2.0/debian/libglib2.0-0-dbg.install.in
desktop/unstable/glib2.0/debian/libglib2.0-0.dirs.in
desktop/unstable/glib2.0/debian/libglib2.0-0.install.in
desktop/unstable/glib2.0/debian/libglib2.0-bin.links.in
desktop/unstable/glib2.0/debian/libglib2.0-dev.install.in
desktop/unstable/glib2.0/debian/libglib2.0-dev.links.in
desktop/unstable/glib2.0/debian/libglib2.0-udeb.install.in
Modified:
desktop/unstable/glib2.0/debian/changelog
desktop/unstable/glib2.0/debian/clean
desktop/unstable/glib2.0/debian/control.in
desktop/unstable/glib2.0/debian/libglib2.0-0.triggers.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=51226&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Sat Oct 1 19:35:38 2016
@@ -13,6 +13,8 @@
* Drop Build-Depends on dbus-x11. The test-suite uses a mock version of
dbus-launch nowadays, so this dependency is no longer needed.
(Closes: #835884)
+ * Use dh-exec to substitute ${DEB_HOST_MULTIARCH} in .install, .links and
+ .dirs files.
-- Simon McVittie <smcv at debian.org> Sat, 01 Oct 2016 16:40:46 +0100
Modified: desktop/unstable/glib2.0/debian/clean
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/clean?rev=51226&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/clean [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/clean [utf-8] Sat Oct 1 19:35:38 2016
@@ -1,11 +1,3 @@
-debian/libgio-fam.install
-debian/libglib2.0-0.install
-debian/libglib2.0-0-dbg.install
-debian/libglib2.0-dev.install
-debian/libglib2.0-udeb.install
-debian/libglib2.0-bin.links
-debian/libglib2.0-dev.links
-debian/libglib2.0-0.dirs
debian/libglib2.0-0.triggers
debian/libglib2.0-0.postinst
debian/libglib2.0-0.postrm
Modified: desktop/unstable/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/control.in?rev=51226&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/control.in [utf-8] Sat Oct 1 19:35:38 2016
@@ -6,6 +6,7 @@
Build-Depends: debhelper (>= 9.20141010),
cdbs (>= 0.4.93),
dh-autoreconf,
+ dh-exec,
pkg-config (>= 0.16.0),
gettext,
autotools-dev,
Copied: desktop/unstable/glib2.0/debian/libgio-fam.install (from r51225, 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?rev=51226&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libgio-fam.install.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libgio-fam.install [utf-8] Sat Oct 1 19:35:38 2016
@@ -1 +1 @@
-usr/lib/${DEB_HOST_MULTIARCH}/gio
+usr/lib/*/gio
Copied: desktop/unstable/glib2.0/debian/libglib2.0-0.dirs (from r51225, desktop/unstable/glib2.0/debian/libglib2.0-0.dirs.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-0.dirs?rev=51226&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-0.dirs.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-0.dirs [utf-8] Sat Oct 1 19:35:38 2016
@@ -1,2 +1,3 @@
+#!/usr/bin/dh-exec
/usr/lib/${DEB_HOST_MULTIARCH}/gio/modules
/usr/share/glib-2.0/schemas
Propchange: desktop/unstable/glib2.0/debian/libglib2.0-0.dirs
------------------------------------------------------------------------------
svn:executable = *
Copied: desktop/unstable/glib2.0/debian/libglib2.0-0.install (from r51225, 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?rev=51226&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-0.install.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-0.install [utf-8] Sat Oct 1 19:35:38 2016
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
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.*
Propchange: desktop/unstable/glib2.0/debian/libglib2.0-0.install
------------------------------------------------------------------------------
svn:executable = *
Modified: desktop/unstable/glib2.0/debian/libglib2.0-0.triggers.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-0.triggers.in?rev=51226&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-0.triggers.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-0.triggers.in [utf-8] Sat Oct 1 19:35:38 2016
@@ -1,3 +1,3 @@
-interest /usr/lib/${DEB_HOST_MULTIARCH}/gio/modules
+interest /usr/lib/#MULTIARCH#/gio/modules
interest /usr/lib/gio/modules
interest /usr/share/glib-2.0/schemas
Copied: desktop/unstable/glib2.0/debian/libglib2.0-bin.links (from r51225, desktop/unstable/glib2.0/debian/libglib2.0-bin.links.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-bin.links?rev=51226&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-bin.links.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-bin.links [utf-8] Sat Oct 1 19:35:38 2016
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
/usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0/gio-querymodules /usr/bin/gio-querymodules
/usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0/glib-compile-schemas /usr/bin/glib-compile-schemas
/usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0/glib-compile-resources /usr/bin/glib-compile-resources
Propchange: desktop/unstable/glib2.0/debian/libglib2.0-bin.links
------------------------------------------------------------------------------
svn:executable = *
Copied: desktop/unstable/glib2.0/debian/libglib2.0-dev.install (from r51225, 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?rev=51226&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-dev.install.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-dev.install [utf-8] Sat Oct 1 19:35:38 2016
@@ -1,11 +1,11 @@
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}/pkgconfig
+usr/lib/*/lib*.a
+usr/lib/*/libgobject*.so
+usr/lib/*/libgmodule*.so
+usr/lib/*/libgthread*.so
+usr/lib/*/libgio*.so
+usr/lib/*/glib-2.0
+usr/lib/*/pkgconfig
usr/share/aclocal
usr/share/glib-2.0/codegen/*.py
usr/share/glib-2.0/gettext
Copied: desktop/unstable/glib2.0/debian/libglib2.0-dev.links (from r51225, desktop/unstable/glib2.0/debian/libglib2.0-dev.links.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-dev.links?rev=51226&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-dev.links.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-dev.links [utf-8] Sat Oct 1 19:35:38 2016
@@ -1 +1,2 @@
+#!/usr/bin/dh-exec
lib/${DEB_HOST_MULTIARCH}/libglib-2.0.so.0 usr/lib/${DEB_HOST_MULTIARCH}/libglib-2.0.so
Propchange: desktop/unstable/glib2.0/debian/libglib2.0-dev.links
------------------------------------------------------------------------------
svn:executable = *
Copied: desktop/unstable/glib2.0/debian/libglib2.0-udeb.install (from r51225, 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?rev=51226&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-udeb.install.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-udeb.install [utf-8] Sat Oct 1 19:35:38 2016
@@ -1,2 +1,2 @@
-usr/lib/${DEB_HOST_MULTIARCH}/lib*.so.* usr/lib
+usr/lib/*/lib*.so.*
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=51226&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/rules [utf-8] Sat Oct 1 19:35:38 2016
@@ -116,7 +116,7 @@
debian/tmp-xdg-runtime-dir
binary-install/libglib2.0-0::
- set -e; for script in postinst postrm; do \
+ set -e; for script in postinst postrm triggers; do \
sed -e"s/#MULTIARCH#/$(DEB_HOST_MULTIARCH)/g" \
-e"s/#ARCH#/$(DEB_HOST_ARCH)/g" \
debian/$(cdbs_curpkg).$$script.in \
@@ -125,17 +125,6 @@
binary-install/libglib2.0-dev::
dh_python3 -plibglib2.0-dev /usr/share/glib-2.0/codegen
-
-common-install-arch::
- set -e; for file in libgio-fam.install libglib2.0-0.install \
- libglib2.0-0-dbg.install \
- libglib2.0-dev.install libglib2.0-udeb.install \
- libglib2.0-bin.links libglib2.0-dev.links \
- libglib2.0-0.dirs libglib2.0-0.triggers; \
- do \
- sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \
- debian/$${file}.in > debian/$$file; \
- done
clean::
sed \
More information about the pkg-gnome-commits
mailing list