r44684 - in /desktop/unstable/gnome-desktop3/debian: changelog control control.in gir1.2-gnomedesktop-3.0.install libgnome-desktop-3-10.install libgnome-desktop-3-dev.install rules
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Tue May 26 00:04:48 UTC 2015
Author: biebl
Date: Tue May 26 00:04:48 2015
New Revision: 44684
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44684
Log:
Convert to multiarch. This includes moving the gnome-rr-debug tool into an
architecture qualified path.
Modified:
desktop/unstable/gnome-desktop3/debian/changelog
desktop/unstable/gnome-desktop3/debian/control
desktop/unstable/gnome-desktop3/debian/control.in
desktop/unstable/gnome-desktop3/debian/gir1.2-gnomedesktop-3.0.install
desktop/unstable/gnome-desktop3/debian/libgnome-desktop-3-10.install
desktop/unstable/gnome-desktop3/debian/libgnome-desktop-3-dev.install
desktop/unstable/gnome-desktop3/debian/rules
Modified: desktop/unstable/gnome-desktop3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/changelog?rev=44684&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/changelog [utf-8] Tue May 26 00:04:48 2015
@@ -6,6 +6,8 @@
* Drop obsolete Breaks/Replaces from pre-wheezy.
* Drop explicit Build-Depends on dpkg-dev, even the version from wheezy
provides dpkg-vendor.
+ * Convert to multiarch. This includes moving the gnome-rr-debug tool into an
+ architecture qualified path.
-- Michael Biebl <biebl at debian.org> Tue, 26 May 2015 01:39:37 +0200
Modified: desktop/unstable/gnome-desktop3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/control?rev=44684&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/control [utf-8] Tue May 26 00:04:48 2015
@@ -10,12 +10,12 @@
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-desktop3
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-desktop3
Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
dh-autoreconf,
libglib2.0-dev (>= 2.38.0),
intltool (>= 0.40.6),
iso-codes,
- cdbs (>= 0.4.41),
+ cdbs (>= 0.4.93),
gnome-pkg-tools (>= 0.10),
gtk-doc-tools (>= 1.4),
docbook-xml,
Modified: desktop/unstable/gnome-desktop3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/control.in?rev=44684&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/control.in [utf-8] Tue May 26 00:04:48 2015
@@ -6,12 +6,12 @@
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-desktop3
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-desktop3
Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
dh-autoreconf,
libglib2.0-dev (>= 2.38.0),
intltool (>= 0.40.6),
iso-codes,
- cdbs (>= 0.4.41),
+ cdbs (>= 0.4.93),
gnome-pkg-tools (>= 0.10),
gtk-doc-tools (>= 1.4),
docbook-xml,
Modified: desktop/unstable/gnome-desktop3/debian/gir1.2-gnomedesktop-3.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/gir1.2-gnomedesktop-3.0.install?rev=44684&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/gir1.2-gnomedesktop-3.0.install [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/gir1.2-gnomedesktop-3.0.install [utf-8] Tue May 26 00:04:48 2015
@@ -1 +1 @@
-usr/lib/girepository-1.0
+usr/lib/*/girepository-1.0
Modified: desktop/unstable/gnome-desktop3/debian/libgnome-desktop-3-10.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/libgnome-desktop-3-10.install?rev=44684&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/libgnome-desktop-3-10.install [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/libgnome-desktop-3-10.install [utf-8] Tue May 26 00:04:48 2015
@@ -1,2 +1,2 @@
-usr/lib/lib*.so.*
-usr/lib/libgnome-desktop-3-10
+usr/lib/*/lib*.so.*
+usr/lib/*/libgnome-desktop-3-10
Modified: desktop/unstable/gnome-desktop3/debian/libgnome-desktop-3-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/libgnome-desktop-3-dev.install?rev=44684&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/libgnome-desktop-3-dev.install [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/libgnome-desktop-3-dev.install [utf-8] Tue May 26 00:04:48 2015
@@ -1,5 +1,5 @@
usr/include
-usr/lib/pkgconfig
-usr/lib/libgnome-desktop-3.so
+usr/lib/*/pkgconfig
+usr/lib/*/libgnome-desktop-3.so
usr/share/gir-1.0
usr/share/gtk-doc
Modified: desktop/unstable/gnome-desktop3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/rules?rev=44684&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/rules [utf-8] Tue May 26 00:04:48 2015
@@ -13,15 +13,18 @@
DEB_DH_AUTORECONF_ARGS = --as-needed
-DEB_CONFIGURE_LIBEXECDIR := /usr/lib/libgnome-desktop-3-10/
+LIB_PKG := libgnome-desktop-3-10
+
+DEB_CONFIGURE_LIBEXECDIR := \$${prefix}/lib/$(DEB_HOST_MULTIARCH)/$(LIB_PKG)
DEB_CONFIGURE_EXTRA_FLAGS += \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
--with-gnome-distributor=$(shell dpkg-vendor --query vendor) \
--with-pnp-ids-path=/usr/share/hwdata/pnp.ids \
--enable-gtk-doc \
--enable-desktop-docs \
--enable-introspection
-DEB_DH_MAKESHLIBS_ARGS_libgnome-desktop-3-10 += -- -c4
+DEB_DH_MAKESHLIBS_ARGS_$(LIB_PKG) += -- -c4
common-binary-post-install-arch:: list-missing
More information about the pkg-gnome-commits
mailing list