Package: pangomm Version: 2.28.4-2 Severity: wishlist Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu precise ubuntu-patch
Hello - Please find attached a patch to pangomm to transition it 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 libpangomm-1.4-dev contains no build-time-generated include files or arch-dependent scripts/executables, it can be safely marked as Multi-Arch: same, so this patch does so. Because many of its direct and indirect dependencies have not yet been transitioned for multiarch, libpangomm-1.4-dev will not currently be multiarch co-installable. This is fine, though, and if all of the dependencies were ever to be transitioned for multiarch, the pangomm -dev package would immediately become multiarch co-installable. Typically the biggest outstanding blocker to multiarch transitions is .la files with non-empty dependency_libs lines. I don't have access to lintian.debian.org, but I checked all files listed in http://lintian.ubuntuwire.org/tags/non-empty-dependency_libs-in-la-file.html (http://paste.ubuntu.com/766579/) and pangomm isn't listed anywhere, so this transition should be safe now by that metric. Thanks for your consideration, - 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 pangomm-2.28.4/debian/control pangomm-2.28.4/debian/control --- pangomm-2.28.4/debian/control 2011-11-16 16:47:10.000000000 -0800 +++ pangomm-2.28.4/debian/control 2011-12-11 15:17:50.000000000 -0800 @@ -11,8 +11,8 @@ DM-Upload-Allowed: yes Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/pangomm Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/pangomm -Build-Depends: cdbs (>= 0.4.51), - debhelper (>= 8), +Build-Depends: cdbs (>= 0.4.93~), + debhelper (>= 8.1.3~), gnome-pkg-tools (>= 0.11), libcairomm-1.0-dev (>= 1.2.2), libglibmm-2.4-dev (>= 2.22.1-2), @@ -23,10 +23,12 @@ Package: libpangomm-1.4-1 Architecture: any +Pre-Depends: ${misc:Pre-Depends} Replaces: libgtkmm-2.4-1c2a (<< 1:2.13) Conflicts: libgtkmm-2.4-1c2a (<< 1:2.13) Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: C++ Wrapper for pango (shared libraries) Pangomm is a C++ wrapper for the pango library. Originally part of gtkmm, pangomm provides convenient C++ interfaces for handling both @@ -36,6 +38,7 @@ Package: libpangomm-1.4-dev Architecture: any +Pre-Depends: ${misc:Pre-Depends} Replaces: libgtkmm-2.4-dev (<< 1:2.13) Conflicts: libgtkmm-2.4-dev (<< 1:2.13) Section: libdevel @@ -45,6 +48,7 @@ libcairomm-1.0-dev (>= 1.2.2), libglibmm-2.4-dev (>= 2.14.1), libpango1.0-dev (>= 1.23.0) +Multi-Arch: same Description: C++ Wrapper for pango (development files) Pangomm is a C++ wrapper for the pango library. Originally part of gtkmm, pangomm provides convenient C++ interfaces for handling both @@ -71,9 +75,11 @@ Architecture: any Section: debug Priority: extra +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libpangomm-1.4-1 (= ${binary:Version}) +Multi-Arch: same Description: C++ Wrapper for pango (debugging symbols) Pangomm is a C++ wrapper for the pango library. Originally part of gtkmm, pangomm provides convenient C++ interfaces for handling both diff -Nru pangomm-2.28.4/debian/control.in pangomm-2.28.4/debian/control.in --- pangomm-2.28.4/debian/control.in 2011-11-16 16:40:24.000000000 -0800 +++ pangomm-2.28.4/debian/control.in 2011-12-11 15:17:40.000000000 -0800 @@ -6,8 +6,8 @@ DM-Upload-Allowed: yes Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/pangomm Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/pangomm -Build-Depends: cdbs (>= 0.4.51), - debhelper (>= 8), +Build-Depends: cdbs (>= 0.4.93~), + debhelper (>= 8.1.3~), gnome-pkg-tools (>= 0.11), libcairomm-1.0-dev (>= 1.2.2), libglibmm-2.4-dev (>= 2.22.1-2), @@ -18,10 +18,12 @@ Package: libpangomm-1.4-1 Architecture: any +Pre-Depends: ${misc:Pre-Depends} Replaces: libgtkmm-2.4-1c2a (<< 1:2.13) Conflicts: libgtkmm-2.4-1c2a (<< 1:2.13) Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: C++ Wrapper for pango (shared libraries) Pangomm is a C++ wrapper for the pango library. Originally part of gtkmm, pangomm provides convenient C++ interfaces for handling both @@ -31,6 +33,7 @@ Package: libpangomm-1.4-dev Architecture: any +Pre-Depends: ${misc:Pre-Depends} Replaces: libgtkmm-2.4-dev (<< 1:2.13) Conflicts: libgtkmm-2.4-dev (<< 1:2.13) Section: libdevel @@ -40,6 +43,7 @@ libcairomm-1.0-dev (>= 1.2.2), libglibmm-2.4-dev (>= 2.14.1), libpango1.0-dev (>= 1.23.0) +Multi-Arch: same Description: C++ Wrapper for pango (development files) Pangomm is a C++ wrapper for the pango library. Originally part of gtkmm, pangomm provides convenient C++ interfaces for handling both @@ -66,9 +70,11 @@ Architecture: any Section: debug Priority: extra +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libpangomm-1.4-1 (= ${binary:Version}) +Multi-Arch: same Description: C++ Wrapper for pango (debugging symbols) Pangomm is a C++ wrapper for the pango library. Originally part of gtkmm, pangomm provides convenient C++ interfaces for handling both diff -Nru pangomm-2.28.4/debian/libpangomm-1.4-1.install pangomm-2.28.4/debian/libpangomm-1.4-1.install --- pangomm-2.28.4/debian/libpangomm-1.4-1.install 2011-11-16 15:22:38.000000000 -0800 +++ pangomm-2.28.4/debian/libpangomm-1.4-1.install 2011-12-11 13:22:05.000000000 -0800 @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff -Nru pangomm-2.28.4/debian/libpangomm-1.4-dev.install pangomm-2.28.4/debian/libpangomm-1.4-dev.install --- pangomm-2.28.4/debian/libpangomm-1.4-dev.install 2011-11-16 16:41:29.000000000 -0800 +++ pangomm-2.28.4/debian/libpangomm-1.4-dev.install 2011-12-11 13:22:02.000000000 -0800 @@ -1,4 +1,4 @@ usr/include -usr/lib/pangomm-1.4 -usr/lib/lib*.so -usr/lib/pkgconfig +usr/lib/*/pangomm-1.4 +usr/lib/*/lib*.so +usr/lib/*/pkgconfig diff -Nru pangomm-2.28.4/debian/rules pangomm-2.28.4/debian/rules --- pangomm-2.28.4/debian/rules 2011-11-16 16:41:42.000000000 -0800 +++ pangomm-2.28.4/debian/rules 2011-12-11 13:21:49.000000000 -0800 @@ -12,5 +12,5 @@ LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed -DEB_CONFIGURE_EXTRA_FLAGS += --enable-shared --disable-static +DEB_CONFIGURE_EXTRA_FLAGS += --enable-shared --disable-static --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
