r46781 - in /packages/unstable/libdmapsharing/debian: changelog control control.in libdmapsharing-3.0-2.install libdmapsharing-3.0-dev.install rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Oct 21 16:05:35 2015
New Revision: 46781

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46781
Log:
Convert to multiarch. (Closes: #770269)

Modified:
    packages/unstable/libdmapsharing/debian/changelog
    packages/unstable/libdmapsharing/debian/control
    packages/unstable/libdmapsharing/debian/control.in
    packages/unstable/libdmapsharing/debian/libdmapsharing-3.0-2.install
    packages/unstable/libdmapsharing/debian/libdmapsharing-3.0-dev.install
    packages/unstable/libdmapsharing/debian/rules

Modified: packages/unstable/libdmapsharing/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libdmapsharing/debian/changelog?rev=46781&op=diff
==============================================================================
--- packages/unstable/libdmapsharing/debian/changelog	[utf-8] (original)
+++ packages/unstable/libdmapsharing/debian/changelog	[utf-8] Wed Oct 21 16:05:35 2015
@@ -1,6 +1,7 @@
 libdmapsharing (2.9.32-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Convert to multiarch. (Closes: #770269)
 
  -- Michael Biebl <biebl at debian.org>  Wed, 21 Oct 2015 16:37:56 +0200
 

Modified: packages/unstable/libdmapsharing/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libdmapsharing/debian/control?rev=46781&op=diff
==============================================================================
--- packages/unstable/libdmapsharing/debian/control	[utf-8] (original)
+++ packages/unstable/libdmapsharing/debian/control	[utf-8] Wed Oct 21 16:05:35 2015
@@ -9,7 +9,7 @@
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Jordi Mallach <jordi at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
-               cdbs (>= 0.4.73),
+               cdbs (>= 0.4.93),
                gnome-pkg-tools,
                gtk-doc-tools (>= 1.0),
                pkg-config,
@@ -30,6 +30,8 @@
 Package: libdmapsharing-3.0-2
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: DMAP client and server library - runtime
@@ -43,6 +45,7 @@
 Package: libdmapsharing-3.0-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libdmapsharing-3.0-2 (= ${binary:Version}),
          ${misc:Depends},
          libglib2.0-dev,

Modified: packages/unstable/libdmapsharing/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libdmapsharing/debian/control.in?rev=46781&op=diff
==============================================================================
--- packages/unstable/libdmapsharing/debian/control.in	[utf-8] (original)
+++ packages/unstable/libdmapsharing/debian/control.in	[utf-8] Wed Oct 21 16:05:35 2015
@@ -5,7 +5,7 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
-               cdbs (>= 0.4.73),
+               cdbs (>= 0.4.93),
                gnome-pkg-tools,
                gtk-doc-tools (>= 1.0),
                pkg-config,
@@ -26,6 +26,8 @@
 Package: libdmapsharing-3.0-2
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: DMAP client and server library - runtime
@@ -39,6 +41,7 @@
 Package: libdmapsharing-3.0-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libdmapsharing-3.0-2 (= ${binary:Version}),
          ${misc:Depends},
          libglib2.0-dev,

Modified: packages/unstable/libdmapsharing/debian/libdmapsharing-3.0-2.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libdmapsharing/debian/libdmapsharing-3.0-2.install?rev=46781&op=diff
==============================================================================
--- packages/unstable/libdmapsharing/debian/libdmapsharing-3.0-2.install	[utf-8] (original)
+++ packages/unstable/libdmapsharing/debian/libdmapsharing-3.0-2.install	[utf-8] Wed Oct 21 16:05:35 2015
@@ -1 +1 @@
-usr/lib/libdmapsharing-3.0.so.*
+usr/lib/*/libdmapsharing-3.0.so.*

Modified: packages/unstable/libdmapsharing/debian/libdmapsharing-3.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libdmapsharing/debian/libdmapsharing-3.0-dev.install?rev=46781&op=diff
==============================================================================
--- packages/unstable/libdmapsharing/debian/libdmapsharing-3.0-dev.install	[utf-8] (original)
+++ packages/unstable/libdmapsharing/debian/libdmapsharing-3.0-dev.install	[utf-8] Wed Oct 21 16:05:35 2015
@@ -1,4 +1,4 @@
-usr/lib/pkgconfig
+usr/lib/*/pkgconfig
 usr/share/gtk-doc
 usr/include
-usr/lib/libdmapsharing-3.0.so
+usr/lib/*/libdmapsharing-3.0.so

Modified: packages/unstable/libdmapsharing/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libdmapsharing/debian/rules?rev=46781&op=diff
==============================================================================
--- packages/unstable/libdmapsharing/debian/rules	[utf-8] (original)
+++ packages/unstable/libdmapsharing/debian/rules	[utf-8] Wed Oct 21 16:05:35 2015
@@ -10,7 +10,8 @@
 TARBALL_EXT = tar.gz
 GNOME_DOWNLOAD_URL = http://www.flyn.org/projects/libdmapsharing/$(GNOME_TARBALL)
 
-DEB_CONFIGURE_EXTRA_FLAGS += --with-mdns=avahi
+DEB_CONFIGURE_EXTRA_FLAGS += --with-mdns=avahi \
+                             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 DEB_DH_MAKESHLIBS_ARGS_libdmapsharing-3.0-2 += -- -c4