I've been informed by Steve Langasek that he prefers the substvar
${misc:Pre-Depends} over explicitly pre-depending on multiarch-support
so that we can easily phase out the pre-dependency when it's no longer
needed for transitional purposes.Therefore, here is a patch which uses the substvar instead. It also requires a debhelper build-dep bump, because 8.1.3 was the version debhelper version to support that substvar. Thanks, - Evan
diff -Nru glibmm2.4-2.31.2/debian/control glibmm2.4-2.31.2/debian/control --- glibmm2.4-2.31.2/debian/control 2011-12-07 15:19:15.000000000 +0000 +++ glibmm2.4-2.31.2/debian/control 2011-12-10 01:20:44.000000000 +0000 @@ -13,8 +13,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.31.0), libsigc++-2.0-dev (>= 2.0.10), @@ -24,8 +24,10 @@ Package: libglibmm-2.4-1c2a Section: libs Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same Description: C++ wrapper for the GLib toolkit (shared libraries) GLib is a low-level general-purpose library used mainly by GTK+/GNOME applications, but is useful for other programs as well. @@ -36,6 +38,7 @@ Package: libglibmm-2.4-dev Section: libdevel Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libglibmm-2.4-1c2a (= ${binary:Version}), @@ -44,6 +47,7 @@ pkg-config Suggests: libglibmm-2.4-doc, libgtkmm-3.0-dev +Multi-Arch: same Description: C++ wrapper for the GLib toolkit (development files) GLib is a low-level general-purpose library used mainly by GTK+/GNOME applications, but is useful for other programs as well. @@ -55,9 +59,11 @@ Section: debug Priority: extra Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libglibmm-2.4-1c2a (= ${binary:Version}) +Multi-Arch: same Description: C++ wrapper for the GLib toolkit (debug symbols) GLib is a low-level general-purpose library used mainly by GTK+/GNOME applications, but is useful for other programs as well. diff -Nru glibmm2.4-2.31.2/debian/control.in glibmm2.4-2.31.2/debian/control.in --- glibmm2.4-2.31.2/debian/control.in 2011-12-07 15:04:27.000000000 +0000 +++ glibmm2.4-2.31.2/debian/control.in 2011-12-10 01:19:13.000000000 +0000 @@ -8,8 +8,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.31.0), libsigc++-2.0-dev (>= 2.0.10), @@ -19,8 +19,10 @@ Package: libglibmm-2.4-1c2a Section: libs Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same Description: C++ wrapper for the GLib toolkit (shared libraries) GLib is a low-level general-purpose library used mainly by GTK+/GNOME applications, but is useful for other programs as well. @@ -31,6 +33,7 @@ Package: libglibmm-2.4-dev Section: libdevel Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libglibmm-2.4-1c2a (= ${binary:Version}), @@ -39,6 +42,7 @@ pkg-config Suggests: libglibmm-2.4-doc, libgtkmm-3.0-dev +Multi-Arch: same Description: C++ wrapper for the GLib toolkit (development files) GLib is a low-level general-purpose library used mainly by GTK+/GNOME applications, but is useful for other programs as well. @@ -50,9 +54,11 @@ Section: debug Priority: extra Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libglibmm-2.4-1c2a (= ${binary:Version}) +Multi-Arch: same Description: C++ wrapper for the GLib toolkit (debug symbols) GLib is a low-level general-purpose library used mainly by GTK+/GNOME applications, but is useful for other programs as well. diff -Nru glibmm2.4-2.31.2/debian/libglibmm-2.4-1c2a.install glibmm2.4-2.31.2/debian/libglibmm-2.4-1c2a.install --- glibmm2.4-2.31.2/debian/libglibmm-2.4-1c2a.install 2011-12-07 15:02:46.000000000 +0000 +++ glibmm2.4-2.31.2/debian/libglibmm-2.4-1c2a.install 2011-12-10 01:19:13.000000000 +0000 @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff -Nru glibmm2.4-2.31.2/debian/libglibmm-2.4-dev.install glibmm2.4-2.31.2/debian/libglibmm-2.4-dev.install --- glibmm2.4-2.31.2/debian/libglibmm-2.4-dev.install 2011-12-07 15:02:46.000000000 +0000 +++ glibmm2.4-2.31.2/debian/libglibmm-2.4-dev.install 2011-12-10 01:19:13.000000000 +0000 @@ -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 diff -Nru glibmm2.4-2.31.2/debian/rules glibmm2.4-2.31.2/debian/rules --- glibmm2.4-2.31.2/debian/rules 2011-12-07 15:02:46.000000000 +0000 +++ glibmm2.4-2.31.2/debian/rules 2011-12-10 01:19:13.000000000 +0000 @@ -14,7 +14,7 @@ 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
