r33328 - in /desktop/unstable/glibmm2.4/debian: changelog control control.in libglibmm-2.4-1c2a.install libglibmm-2.4-dev.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Mon Mar 19 03:50:53 UTC 2012 

Author: biebl
Date: Mon Mar 19 03:50:52 2012
New Revision: 33328

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

Modified:
    desktop/unstable/glibmm2.4/debian/changelog
    desktop/unstable/glibmm2.4/debian/control
    desktop/unstable/glibmm2.4/debian/control.in
    desktop/unstable/glibmm2.4/debian/libglibmm-2.4-1c2a.install
    desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.install
    desktop/unstable/glibmm2.4/debian/rules

Modified: desktop/unstable/glibmm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/changelog?rev=33328&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/changelog [utf-8] (original)
+++ desktop/unstable/glibmm2.4/debian/changelog [utf-8] Mon Mar 19 03:50:52 2012
@@ -2,8 +2,9 @@
 
   * New upstream release.
   * Bump (Build-)Depends on libsigc++-2.0-dev to (>= 2.2.10).
-
- -- Michael Biebl <biebl at debian.org>  Sun, 18 Mar 2012 22:48:37 +0100
+  * Convert to multiarch. Closes: #651134
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 18 Mar 2012 22:59:24 +0100
 
 glibmm2.4 (2.30.0-2) unstable; urgency=low
 

Modified: desktop/unstable/glibmm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/control?rev=33328&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/control [utf-8] (original)
+++ desktop/unstable/glibmm2.4/debian/control [utf-8] Mon Mar 19 03:50:52 2012
@@ -12,8 +12,8 @@
 Homepage: http://www.gtkmm.org/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/glibmm2.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glibmm2.4
-Build-Depends: cdbs (>= 0.4.51),
-               debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93),
+               debhelper (>= 8.1.3),
                gnome-pkg-tools (>= 0.11),
                libglib2.0-dev (>= 2.30.0),
                libsigc++-2.0-dev (>= 2.2.10),
@@ -23,6 +23,8 @@
 Package: libglibmm-2.4-1c2a
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: C++ wrapper for the GLib toolkit (shared libraries)
@@ -35,6 +37,7 @@
 Package: libglibmm-2.4-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libglibmm-2.4-1c2a (= ${binary:Version}),
@@ -54,6 +57,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libglibmm-2.4-1c2a (= ${binary:Version})
@@ -67,6 +71,7 @@
 Package: libglibmm-2.4-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          doc-base,

Modified: desktop/unstable/glibmm2.4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/control.in?rev=33328&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/control.in [utf-8] (original)
+++ desktop/unstable/glibmm2.4/debian/control.in [utf-8] Mon Mar 19 03:50:52 2012
@@ -7,8 +7,8 @@
 Homepage: http://www.gtkmm.org/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/glibmm2.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glibmm2.4
-Build-Depends: cdbs (>= 0.4.51),
-               debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93),
+               debhelper (>= 8.1.3),
                gnome-pkg-tools (>= 0.11),
                libglib2.0-dev (>= 2.30.0),
                libsigc++-2.0-dev (>= 2.2.10),
@@ -18,6 +18,8 @@
 Package: libglibmm-2.4-1c2a
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: C++ wrapper for the GLib toolkit (shared libraries)
@@ -30,6 +32,7 @@
 Package: libglibmm-2.4-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libglibmm-2.4-1c2a (= ${binary:Version}),
@@ -49,6 +52,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libglibmm-2.4-1c2a (= ${binary:Version})
@@ -62,6 +66,7 @@
 Package: libglibmm-2.4-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          doc-base,

Modified: desktop/unstable/glibmm2.4/debian/libglibmm-2.4-1c2a.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/libglibmm-2.4-1c2a.install?rev=33328&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/libglibmm-2.4-1c2a.install [utf-8] (original)
+++ desktop/unstable/glibmm2.4/debian/libglibmm-2.4-1c2a.install [utf-8] Mon Mar 19 03:50:52 2012
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

Modified: desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.install?rev=33328&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.install [utf-8] (original)
+++ desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.install [utf-8] Mon Mar 19 03:50:52 2012
@@ -1,6 +1,6 @@
 usr/include
-usr/lib/glibmm-2.4
-usr/lib/giomm-2.4
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig
+usr/lib/*/glibmm-2.4
+usr/lib/*/giomm-2.4
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig

Modified: desktop/unstable/glibmm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/rules?rev=33328&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/rules [utf-8] (original)
+++ desktop/unstable/glibmm2.4/debian/rules [utf-8] Mon Mar 19 03:50:52 2012
@@ -14,7 +14,8 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-static
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-static \
+                             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 DEB_MAKE_CHECK_TARGET := check
 DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
 DEB_INSTALL_EXAMPLES_$(DOC_PKG) += -XMakefile -X.deps -X.libs -X.o

More information about the pkg-gnome-commits mailing list