r49224 - in /desktop/unstable/gnome-bluetooth/debian: changelog control control.in gir1.2-gnomebluetooth-1.0.install libgnome-bluetooth-dev.install libgnome-bluetooth13.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri Jul 1 09:50:00 UTC 2016 

Author: biebl
Date: Fri Jul  1 09:50:00 2016
New Revision: 49224

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49224
Log:
Convert to multiarch. Mark gir, dev and library package as
Multi-Arch: same. (Closes: #813036)

Modified:
    desktop/unstable/gnome-bluetooth/debian/changelog
    desktop/unstable/gnome-bluetooth/debian/control
    desktop/unstable/gnome-bluetooth/debian/control.in
    desktop/unstable/gnome-bluetooth/debian/gir1.2-gnomebluetooth-1.0.install
    desktop/unstable/gnome-bluetooth/debian/libgnome-bluetooth-dev.install
    desktop/unstable/gnome-bluetooth/debian/libgnome-bluetooth13.install
    desktop/unstable/gnome-bluetooth/debian/rules

Modified: desktop/unstable/gnome-bluetooth/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-bluetooth/debian/changelog?rev=49224&op=diff
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-bluetooth/debian/changelog	[utf-8] Fri Jul  1 09:50:00 2016
@@ -11,6 +11,8 @@
   [ Michael Biebl ]
   * New upstream release.
   * Bump debhelper compatibility level to 9.
+  * Convert to multiarch. Mark gir, dev and library package as
+    Multi-Arch: same. (Closes: #813036)
 
  -- Laurent Bigonville <bigon at debian.org>  Mon, 27 Jun 2016 12:48:05 +0200
 

Modified: desktop/unstable/gnome-bluetooth/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-bluetooth/debian/control?rev=49224&op=diff
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-bluetooth/debian/control	[utf-8] Fri Jul  1 09:50:00 2016
@@ -28,6 +28,7 @@
 Homepage: https://wiki.gnome.org/Projects/GnomeBluetooth
 
 Package: gnome-bluetooth
+Architecture: linux-any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: bluez (>= 5.5),
          bluez-obexd,
@@ -39,16 +40,17 @@
 Suggests: gnome-user-share
 Breaks: gnome-shell (<< 3.12),
 Conflicts: bluez-gnome
-Architecture: linux-any
 Description: GNOME Bluetooth tools
  This package contains tools for managing and manipulating Bluetooth
  devices using the GNOME desktop.
 
 Package: libgnome-bluetooth13
 Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Architecture: linux-any
 Description: GNOME Bluetooth tools - support library
  This package contains tools for managing and manipulating Bluetooth
  devices using the GNOME desktop.
@@ -57,6 +59,8 @@
 
 Package: libgnome-bluetooth-dev
 Section: libdevel
+Architecture: linux-any
+Multi-Arch: same
 Depends: gir1.2-gnomebluetooth-1.0 (= ${binary:Version}),
          libgnome-bluetooth13 (= ${binary:Version}),
          libglib2.0-dev,
@@ -65,7 +69,6 @@
          ${misc:Depends}
 Suggests: pkg-config
 Priority: extra
-Architecture: linux-any
 Description: GNOME Bluetooth tools - support library development files
  This package contains tools for managing and manipulating Bluetooth
  devices using the GNOME desktop.
@@ -77,6 +80,7 @@
 Package: gir1.2-gnomebluetooth-1.0
 Section: introspection
 Architecture: linux-any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${misc:Depends},
          ${shlibs:Depends}

Modified: desktop/unstable/gnome-bluetooth/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-bluetooth/debian/control.in?rev=49224&op=diff
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-bluetooth/debian/control.in	[utf-8] Fri Jul  1 09:50:00 2016
@@ -24,6 +24,7 @@
 Homepage: https://wiki.gnome.org/Projects/GnomeBluetooth
 
 Package: gnome-bluetooth
+Architecture: linux-any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: bluez (>= 5.5),
          bluez-obexd,
@@ -35,16 +36,17 @@
 Suggests: gnome-user-share
 Breaks: gnome-shell (<< 3.12),
 Conflicts: bluez-gnome
-Architecture: linux-any
 Description: GNOME Bluetooth tools
  This package contains tools for managing and manipulating Bluetooth
  devices using the GNOME desktop.
 
 Package: libgnome-bluetooth13
 Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Architecture: linux-any
 Description: GNOME Bluetooth tools - support library
  This package contains tools for managing and manipulating Bluetooth
  devices using the GNOME desktop.
@@ -53,6 +55,8 @@
 
 Package: libgnome-bluetooth-dev
 Section: libdevel
+Architecture: linux-any
+Multi-Arch: same
 Depends: gir1.2-gnomebluetooth-1.0 (= ${binary:Version}),
          libgnome-bluetooth13 (= ${binary:Version}),
          libglib2.0-dev,
@@ -61,7 +65,6 @@
          ${misc:Depends}
 Suggests: pkg-config
 Priority: extra
-Architecture: linux-any
 Description: GNOME Bluetooth tools - support library development files
  This package contains tools for managing and manipulating Bluetooth
  devices using the GNOME desktop.
@@ -73,6 +76,7 @@
 Package: gir1.2-gnomebluetooth-1.0
 Section: introspection
 Architecture: linux-any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${misc:Depends},
          ${shlibs:Depends}

Modified: desktop/unstable/gnome-bluetooth/debian/gir1.2-gnomebluetooth-1.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-bluetooth/debian/gir1.2-gnomebluetooth-1.0.install?rev=49224&op=diff
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/gir1.2-gnomebluetooth-1.0.install	[utf-8] (original)
+++ desktop/unstable/gnome-bluetooth/debian/gir1.2-gnomebluetooth-1.0.install	[utf-8] Fri Jul  1 09:50:00 2016
@@ -1 +1 @@
-usr/lib/girepository-1.0/*
+usr/lib/*/girepository-1.0/*

Modified: desktop/unstable/gnome-bluetooth/debian/libgnome-bluetooth-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-bluetooth/debian/libgnome-bluetooth-dev.install?rev=49224&op=diff
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/libgnome-bluetooth-dev.install	[utf-8] (original)
+++ desktop/unstable/gnome-bluetooth/debian/libgnome-bluetooth-dev.install	[utf-8] Fri Jul  1 09:50:00 2016
@@ -1,5 +1,5 @@
 usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
 usr/share/gir-1.0/*
 usr/share/gtk-doc/html/gnome-bluetooth/*

Modified: desktop/unstable/gnome-bluetooth/debian/libgnome-bluetooth13.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-bluetooth/debian/libgnome-bluetooth13.install?rev=49224&op=diff
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/libgnome-bluetooth13.install	[utf-8] (original)
+++ desktop/unstable/gnome-bluetooth/debian/libgnome-bluetooth13.install	[utf-8] Fri Jul  1 09:50:00 2016
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

Modified: desktop/unstable/gnome-bluetooth/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-bluetooth/debian/rules?rev=49224&op=diff
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-bluetooth/debian/rules	[utf-8] Fri Jul  1 09:50:00 2016
@@ -6,7 +6,8 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-desktop-update \
+DEB_CONFIGURE_EXTRA_FLAGS := --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+                             --disable-desktop-update \
                              --disable-icon-update \
                              --enable-introspection
 
@@ -15,6 +16,6 @@
 common-binary-post-install-arch:: list-missing
 
 DEB_DH_MAKESHLIBS_ARGS_gnome-bluetooth = --no-act
-DEB_DH_GIREPOSITORY_ARGS_gnome-bluetooth := -l$(CURDIR)/applet /usr/lib/gnome-bluetooth/
+DEB_DH_GIREPOSITORY_ARGS_gnome-bluetooth := -l$(CURDIR)/applet /usr/lib/$(DEB_HOST_MULTIARCH)/gnome-bluetooth/
 
 DEB_DH_MAKESHLIBS_ARGS_libgnome-bluetooth11 += -V -- -c4

More information about the pkg-gnome-commits mailing list