r34996 - in /packages/unstable/libproxy/debian: changelog control control.in libproxy-dev.install libproxy0.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri May 18 18:46:58 UTC 2012 

Author: biebl
Date: Fri May 18 18:46:57 2012
New Revision: 34996

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34996
Log:
debian/{control,rules,*.install}: Convert to Multi-Arch. Closes: #651491

Modified:
    packages/unstable/libproxy/debian/changelog
    packages/unstable/libproxy/debian/control
    packages/unstable/libproxy/debian/control.in
    packages/unstable/libproxy/debian/libproxy-dev.install
    packages/unstable/libproxy/debian/libproxy0.install
    packages/unstable/libproxy/debian/rules

Modified: packages/unstable/libproxy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/changelog?rev=34996&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/changelog [utf-8] (original)
+++ packages/unstable/libproxy/debian/changelog [utf-8] Fri May 18 18:46:57 2012
@@ -1,3 +1,9 @@
+libproxy (0.3.1-5) UNRELEASED; urgency=low
+
+  * debian/{control,rules,*.install}: Convert to Multi-Arch. Closes: #651491
+
+ -- Kees Cook <kees at debian.org>  Thu, 15 Dec 2011 15:16:41 -0800
+
 libproxy (0.3.1-4) unstable; urgency=low
 
   * debian/patches/03_format-security.patch:

Modified: packages/unstable/libproxy/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control?rev=34996&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control [utf-8] (original)
+++ packages/unstable/libproxy/debian/control [utf-8] Fri May 18 18:46:57 2012
@@ -8,8 +8,8 @@
 Priority: optional
 Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 8.1.3~),
                gnome-pkg-tools,
                autotools-dev,
                python-all-dev (>= 2.6.6-3~),
@@ -30,6 +30,8 @@
 
 Package: libproxy0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Recommends: ${webkit:Recommends} | ${moz:Recommends}
@@ -41,6 +43,7 @@
 
 Package: libproxy-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -54,6 +57,7 @@
 Package: libproxy-tools
 Section: utils
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: automatic proxy configuration management library (tools)

Modified: packages/unstable/libproxy/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control.in?rev=34996&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control.in [utf-8] (original)
+++ packages/unstable/libproxy/debian/control.in [utf-8] Fri May 18 18:46:57 2012
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
-               debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 8.1.3~),
                gnome-pkg-tools,
                autotools-dev,
                python-all-dev (>= 2.6.6-3~),
@@ -25,6 +25,8 @@
 
 Package: libproxy0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Recommends: ${webkit:Recommends} | ${moz:Recommends}
@@ -36,6 +38,7 @@
 
 Package: libproxy-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -49,6 +52,7 @@
 Package: libproxy-tools
 Section: utils
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: automatic proxy configuration management library (tools)

Modified: packages/unstable/libproxy/debian/libproxy-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/libproxy-dev.install?rev=34996&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/libproxy-dev.install [utf-8] (original)
+++ packages/unstable/libproxy/debian/libproxy-dev.install [utf-8] Fri May 18 18:46:57 2012
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/pkgconfig
-usr/lib/libproxy.so
+usr/lib/*/pkgconfig
+usr/lib/*/libproxy.so

Modified: packages/unstable/libproxy/debian/libproxy0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/libproxy0.install?rev=34996&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/libproxy0.install [utf-8] (original)
+++ packages/unstable/libproxy/debian/libproxy0.install [utf-8] Fri May 18 18:46:57 2012
@@ -1,2 +1,2 @@
-usr/lib/libproxy.so.*
-usr/lib/libproxy/*/modules
+usr/lib/*/libproxy.so.*
+usr/lib/*/libproxy/*/modules

Modified: packages/unstable/libproxy/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/rules?rev=34996&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/rules [utf-8] (original)
+++ packages/unstable/libproxy/debian/rules [utf-8] Fri May 18 18:46:57 2012
@@ -11,13 +11,14 @@
 
 DEB_DH_MAKESHLIBS_ARGS_$(libproxy) = -V '$(libproxy) (>= $(SHLIBVER))'
 DEB_DH_SHLIBDEPS_ARGS_$(libproxy) := -Xmodules
-DEB_DH_GENCONTROL_ARGS_libproxy0 = -- \
+DEB_DH_GENCONTROL_ARGS_$(libproxy) = -- \
 	-Vmoz:Recommends=$(shell grep -o "libmoz[a-z0-9]*" debian/libproxy0.substvars) \
 	-Vwebkit:Recommends=$(shell grep -o "libwebkit[a-z0-9.-]*" debian/libproxy0.substvars)
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 binary-install/python-libproxy::
 	dh_python2 -p$(cdbs_curpkg)
 
 binary-install/$(libproxy)::
 	dh_shlibdeps -plibproxy0 -- -pmodules
-	rm debian/$(libproxy)/usr/lib/libproxy/*/modules/wpad_dnsdevolution.so
+	rm debian/$(libproxy)/usr/lib/*/libproxy/*/modules/wpad_dnsdevolution.so

More information about the pkg-gnome-commits mailing list