Source: glibmm2.4 Version: 2.30.0-3 Severity: wishlist Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu precise ubuntu-patch
Hello - Please find attached a patch to glibmm2.4 to transition ot to use multiarch library paths as described at <http://wiki.debian.org/Multiarch/Implementation>. This patch should be safe to apply in Debian now that multiarch has been bootstrapped. Since libglibmm-2.4-dev contains no build-time-generated include files, it can be safely marked as Multi-Arch: same, so this patch does so. Because its dependency libglib2.0-dev has not yet been transitioned for multiarch, libglibmm-2.4-dev will not be multiarch co-installable. This is fine, though, and if libglib2.0-dev were to ever be transitioned for multiarch, the libglibmm -dev package would become immediately co-installble. The most significant blocker to converting packages to multiarch is the presence of .la files which reference a library in its dependency_libs line. Debian has made cleaning up these .la files a release goal, and is tracking the presence of such problematic .la files at <http://release.debian.org/~aba/la/current.txt>. For some reason glibmm2.4 isn't listed in that file. However, as the rest of the gtkmm stack lists python-visual and subtitleeditor, I assume that those reference glibmm2.4 as well. subtitleeditor has actually already been fixed (I don't know why it is still listed). I uploaded a fix for python-visual to DELAYED/10 a few days ago (bug #633273), so once that goes through this upload will be safe. (I'll add the blocking metadata momentarily) Thanks for considering the patch, - Evan -- System Information: Debian Release: wheezy/sid APT prefers oneiric-updates APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 'oneiric'), (100, 'oneiric-backports') Architecture: amd64 (x86_64) Kernel: Linux 3.0.0-13-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru glibmm2.4-2.30.0/debian/changelog glibmm2.4-2.30.0/debian/changelog diff -Nru glibmm2.4-2.30.0/debian/control glibmm2.4-2.30.0/debian/control --- glibmm2.4-2.30.0/debian/control 2011-12-02 16:56:39.000000000 -0800 +++ glibmm2.4-2.30.0/debian/control 2011-12-05 18:09:44.000000000 -0800 @@ -12,7 +12,7 @@ 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), +Build-Depends: cdbs (>= 0.4.93~), debhelper (>= 8), gnome-pkg-tools (>= 0.11), libglib2.0-dev (>= 2.30.0), @@ -23,8 +23,10 @@ Package: libglibmm-2.4-1c2a Section: libs Architecture: any +Pre-Depends: multiarch-support 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. @@ -35,6 +37,7 @@ Package: libglibmm-2.4-dev Section: libdevel Architecture: any +Pre-Depends: multiarch-support Depends: ${misc:Depends}, ${shlibs:Depends}, libglibmm-2.4-1c2a (= ${binary:Version}), @@ -43,6 +46,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. @@ -54,9 +58,11 @@ Section: debug Priority: extra Architecture: any +Pre-Depends: multiarch-support 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.30.0/debian/control.in glibmm2.4-2.30.0/debian/control.in --- glibmm2.4-2.30.0/debian/control.in 2011-12-02 16:18:49.000000000 -0800 +++ glibmm2.4-2.30.0/debian/control.in 2011-12-05 18:07:21.000000000 -0800 @@ -7,7 +7,7 @@ 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), +Build-Depends: cdbs (>= 0.4.93~), debhelper (>= 8), gnome-pkg-tools (>= 0.11), libglib2.0-dev (>= 2.30.0), @@ -18,8 +18,10 @@ Package: libglibmm-2.4-1c2a Section: libs Architecture: any +Pre-Depends: multiarch-support 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. @@ -30,6 +32,7 @@ Package: libglibmm-2.4-dev Section: libdevel Architecture: any +Pre-Depends: multiarch-support Depends: ${misc:Depends}, ${shlibs:Depends}, libglibmm-2.4-1c2a (= ${binary:Version}), @@ -38,6 +41,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. @@ -49,9 +53,11 @@ Section: debug Priority: extra Architecture: any +Pre-Depends: multiarch-support 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.30.0/debian/libglibmm-2.4-1c2a.install glibmm2.4-2.30.0/debian/libglibmm-2.4-1c2a.install --- glibmm2.4-2.30.0/debian/libglibmm-2.4-1c2a.install 2011-11-22 09:46:03.000000000 -0800 +++ glibmm2.4-2.30.0/debian/libglibmm-2.4-1c2a.install 2011-12-05 10:58:46.000000000 -0800 @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff -Nru glibmm2.4-2.30.0/debian/libglibmm-2.4-dev.install glibmm2.4-2.30.0/debian/libglibmm-2.4-dev.install --- glibmm2.4-2.30.0/debian/libglibmm-2.4-dev.install 2011-11-22 09:46:03.000000000 -0800 +++ glibmm2.4-2.30.0/debian/libglibmm-2.4-dev.install 2011-12-05 10:58:44.000000000 -0800 @@ -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.30.0/debian/rules glibmm2.4-2.30.0/debian/rules --- glibmm2.4-2.30.0/debian/rules 2011-11-22 09:46:03.000000000 -0800 +++ glibmm2.4-2.30.0/debian/rules 2011-12-05 10:57:45.000000000 -0800 @@ -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
