r34128 - in /desktop/experimental/gtkmm3.0/debian: changelog compat control control.in libgtkmm-3.0-1.install libgtkmm-3.0-dev.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue Apr 3 21:37:59 UTC 2012 

Author: biebl
Date: Tue Apr  3 21:37:59 2012
New Revision: 34128

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

Modified:
    desktop/experimental/gtkmm3.0/debian/changelog
    desktop/experimental/gtkmm3.0/debian/compat
    desktop/experimental/gtkmm3.0/debian/control
    desktop/experimental/gtkmm3.0/debian/control.in
    desktop/experimental/gtkmm3.0/debian/libgtkmm-3.0-1.install
    desktop/experimental/gtkmm3.0/debian/libgtkmm-3.0-dev.install
    desktop/experimental/gtkmm3.0/debian/rules

Modified: desktop/experimental/gtkmm3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtkmm3.0/debian/changelog?rev=34128&op=diff
==============================================================================
--- desktop/experimental/gtkmm3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtkmm3.0/debian/changelog [utf-8] Tue Apr  3 21:37:59 2012
@@ -4,8 +4,9 @@
   * Bump Build-Depends on libgtk-3-dev to (>= 3.3.18).
   * Bump Build-Depends on libglibmm-2.4-dev to (>= 2.31.22).
   * Update debian/copyright to the final copyright format 1.0 spec.
-
- -- Michael Biebl <biebl at debian.org>  Tue, 03 Apr 2012 23:16:00 +0200
+  * Convert to multiarch.
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 03 Apr 2012 23:37:50 +0200
 
 gtkmm3.0 (3.2.0-1) unstable; urgency=low
 

Modified: desktop/experimental/gtkmm3.0/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtkmm3.0/debian/compat?rev=34128&op=diff
==============================================================================
--- desktop/experimental/gtkmm3.0/debian/compat [utf-8] (original)
+++ desktop/experimental/gtkmm3.0/debian/compat [utf-8] Tue Apr  3 21:37:59 2012
@@ -1,1 +1,1 @@
-7
+8

Modified: desktop/experimental/gtkmm3.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtkmm3.0/debian/control?rev=34128&op=diff
==============================================================================
--- desktop/experimental/gtkmm3.0/debian/control [utf-8] (original)
+++ desktop/experimental/gtkmm3.0/debian/control [utf-8] Tue Apr  3 21:37:59 2012
@@ -13,7 +13,7 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gtkmm3.0
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gtkmm3.0
 Build-Depends: cdbs (>= 0.4.51),
-               debhelper (>= 7),
+               debhelper (>= 8.1.3),
                gnome-pkg-tools (>= 0.11),
                libgtk-3-dev (>= 3.3.18),
                libglibmm-2.4-dev (>= 2.31.22),
@@ -27,6 +27,7 @@
 Package: libgtkmm-3.0-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libgtkmm-3.0-1 (= ${binary:Version}),
@@ -51,6 +52,8 @@
 Package: libgtkmm-3.0-1
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: {misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: C++ wrappers for GTK+ (shared libraries)
@@ -67,6 +70,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libgtkmm-3.0-1 (= ${binary:Version})
@@ -83,6 +87,7 @@
 Package: libgtkmm-3.0-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          lynx | www-browser,

Modified: desktop/experimental/gtkmm3.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtkmm3.0/debian/control.in?rev=34128&op=diff
==============================================================================
--- desktop/experimental/gtkmm3.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/gtkmm3.0/debian/control.in [utf-8] Tue Apr  3 21:37:59 2012
@@ -8,7 +8,7 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gtkmm3.0
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gtkmm3.0
 Build-Depends: cdbs (>= 0.4.51),
-               debhelper (>= 7),
+               debhelper (>= 8.1.3),
                gnome-pkg-tools (>= 0.11),
                libgtk-3-dev (>= 3.3.18),
                libglibmm-2.4-dev (>= 2.31.22),
@@ -22,6 +22,7 @@
 Package: libgtkmm-3.0-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libgtkmm-3.0-1 (= ${binary:Version}),
@@ -46,6 +47,8 @@
 Package: libgtkmm-3.0-1
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: C++ wrappers for GTK+ (shared libraries)
@@ -62,6 +65,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libgtkmm-3.0-1 (= ${binary:Version})
@@ -78,6 +82,7 @@
 Package: libgtkmm-3.0-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          lynx | www-browser,

Modified: desktop/experimental/gtkmm3.0/debian/libgtkmm-3.0-1.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtkmm3.0/debian/libgtkmm-3.0-1.install?rev=34128&op=diff
==============================================================================
--- desktop/experimental/gtkmm3.0/debian/libgtkmm-3.0-1.install [utf-8] (original)
+++ desktop/experimental/gtkmm3.0/debian/libgtkmm-3.0-1.install [utf-8] Tue Apr  3 21:37:59 2012
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

Modified: desktop/experimental/gtkmm3.0/debian/libgtkmm-3.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtkmm3.0/debian/libgtkmm-3.0-dev.install?rev=34128&op=diff
==============================================================================
--- desktop/experimental/gtkmm3.0/debian/libgtkmm-3.0-dev.install [utf-8] (original)
+++ desktop/experimental/gtkmm3.0/debian/libgtkmm-3.0-dev.install [utf-8] Tue Apr  3 21:37:59 2012
@@ -1,5 +1,5 @@
 usr/include
-usr/lib/gtkmm-3.0
-usr/lib/gdkmm-3.0
-usr/lib/lib*.so
-usr/lib/pkgconfig
+usr/lib/*/gtkmm-3.0
+usr/lib/*/gdkmm-3.0
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig

Modified: desktop/experimental/gtkmm3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtkmm3.0/debian/rules?rev=34128&op=diff
==============================================================================
--- desktop/experimental/gtkmm3.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtkmm3.0/debian/rules [utf-8] Tue Apr  3 21:37:59 2012
@@ -14,5 +14,7 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
 DEB_COMPRESS_EXCLUDE_libgtkmm-3-doc = examples
 DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"

More information about the pkg-gnome-commits mailing list