r45097 - in /desktop/experimental/libgtop2/debian: changelog compat control.in gir1.2-gtop-2.0.install libgtop2-10.install libgtop2-dev.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sun Jun 14 10:54:12 UTC 2015


Author: biebl
Date: Sun Jun 14 10:54:12 2015
New Revision: 45097

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45097
Log:
Convert to multiarch.

Modified:
    desktop/experimental/libgtop2/debian/changelog
    desktop/experimental/libgtop2/debian/compat
    desktop/experimental/libgtop2/debian/control.in
    desktop/experimental/libgtop2/debian/gir1.2-gtop-2.0.install
    desktop/experimental/libgtop2/debian/libgtop2-10.install
    desktop/experimental/libgtop2/debian/libgtop2-dev.install
    desktop/experimental/libgtop2/debian/rules

Modified: desktop/experimental/libgtop2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgtop2/debian/changelog?rev=45097&op=diff
==============================================================================
--- desktop/experimental/libgtop2/debian/changelog	[utf-8] (original)
+++ desktop/experimental/libgtop2/debian/changelog	[utf-8] Sun Jun 14 10:54:12 2015
@@ -8,6 +8,7 @@
 
   [ Michael Biebl ]
   * Drop obsolete Replaces from pre-wheezy.
+  * Convert to multiarch.
 
  -- Jackson Doak <noskcaj at ubuntu.com>  Wed, 02 Jul 2014 08:45:13 +1000
 

Modified: desktop/experimental/libgtop2/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgtop2/debian/compat?rev=45097&op=diff
==============================================================================
--- desktop/experimental/libgtop2/debian/compat	[utf-8] (original)
+++ desktop/experimental/libgtop2/debian/compat	[utf-8] Sun Jun 14 10:54:12 2015
@@ -1 +1 @@
-8
+9

Modified: desktop/experimental/libgtop2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgtop2/debian/control.in?rev=45097&op=diff
==============================================================================
--- desktop/experimental/libgtop2/debian/control.in	[utf-8] (original)
+++ desktop/experimental/libgtop2/debian/control.in	[utf-8] Sun Jun 14 10:54:12 2015
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
                gettext,
                pkg-config,
                libxau-dev,
                libglib2.0-dev (>= 2.6.0),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
-               cdbs,
+               cdbs (>= 0.4.93),
                texinfo,
                intltool (>= 0.35.0),
                libxt-dev,
@@ -27,6 +27,8 @@
 
 Package: libgtop2-10
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgtop2-common (>= ${source:Version})
@@ -38,6 +40,7 @@
 
 Package: libgtop2-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libgtop2-10 (= ${binary:Version}),
@@ -51,6 +54,7 @@
 
 Package: libgtop2-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Description: gtop system monitoring library (common)
  The gtop library reads information about processes and the state of the
@@ -60,6 +64,7 @@
 
 Package: libgtop2-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends},
 Description: gtop system monitoring library (documentation)
@@ -70,6 +75,7 @@
 
 Package: gir1.2-gtop-2.0
 Architecture: any
+Multi-Arch: same
 Section: introspection
 Depends: ${misc:Depends},
          ${gir:Depends}

Modified: desktop/experimental/libgtop2/debian/gir1.2-gtop-2.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgtop2/debian/gir1.2-gtop-2.0.install?rev=45097&op=diff
==============================================================================
--- desktop/experimental/libgtop2/debian/gir1.2-gtop-2.0.install	[utf-8] (original)
+++ desktop/experimental/libgtop2/debian/gir1.2-gtop-2.0.install	[utf-8] Sun Jun 14 10:54:12 2015
@@ -1 +1 @@
-usr/lib/girepository-*
+usr/lib/*/girepository-*

Modified: desktop/experimental/libgtop2/debian/libgtop2-10.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgtop2/debian/libgtop2-10.install?rev=45097&op=diff
==============================================================================
--- desktop/experimental/libgtop2/debian/libgtop2-10.install	[utf-8] (original)
+++ desktop/experimental/libgtop2/debian/libgtop2-10.install	[utf-8] Sun Jun 14 10:54:12 2015
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*

Modified: desktop/experimental/libgtop2/debian/libgtop2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgtop2/debian/libgtop2-dev.install?rev=45097&op=diff
==============================================================================
--- desktop/experimental/libgtop2/debian/libgtop2-dev.install	[utf-8] (original)
+++ desktop/experimental/libgtop2/debian/libgtop2-dev.install	[utf-8] Sun Jun 14 10:54:12 2015
@@ -1,5 +1,5 @@
 usr/include/libgtop-2.0
-usr/lib/libgtop-2.0.a
-usr/lib/libgtop-2.0.so
-usr/lib/pkgconfig
+usr/lib/*/libgtop-2.0.a
+usr/lib/*/libgtop-2.0.so
+usr/lib/*/pkgconfig
 usr/share/gir-*

Modified: desktop/experimental/libgtop2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgtop2/debian/rules?rev=45097&op=diff
==============================================================================
--- desktop/experimental/libgtop2/debian/rules	[utf-8] (original)
+++ desktop/experimental/libgtop2/debian/rules	[utf-8] Sun Jun 14 10:54:12 2015
@@ -21,7 +21,8 @@
 
 DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.24.0)'
 
-DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/$(SHARED_PKG)
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+                             --libexecdir=\$${libdir}/$(SHARED_PKG)
 
 DEB_FIXPERMS_EXCLUDE += libgtop_server2
 
@@ -30,5 +31,5 @@
 	# The server is only necessary on kFreeBSD
 	dh_install --autodest -p$(SHARED_PKG) \
 		--ignore=debian/$(SHARED_PKG).install \
-		debian/tmp/usr/lib/*/libgtop_server2
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$(SHARED_PKG)/libgtop_server2
 endif




More information about the pkg-gnome-commits mailing list