diff -pruN 1:2.24.2-1/debian/changelog 1:2.24.2-1ubuntu1/debian/changelog --- 1:2.24.2-1/debian/changelog 2011-08-15 08:09:31.000000000 +0000 +++ 1:2.24.2-1ubuntu1/debian/changelog 2011-12-19 17:31:36.000000000 +0000 @@ -1,3 +1,14 @@ +gtkmm2.4 (1:2.24.2-1ubuntu1) precise; urgency=low + + * Convert to multiarch (LP: #903044): + - Pass --libdir with multiarch paths to configure + - Adjust .install files to refer to /usr/lib subdirs + - Add multiarch Pre-Depends + - Bump debhelper and cdbs build-deps for ${misc:Pre-Depends} and + $(DEB_HOST_MULTIARCH) support, respectively + + -- Evan Broder Sun, 11 Dec 2011 19:14:43 -0800 + gtkmm2.4 (1:2.24.2-1) unstable; urgency=low * New upstream release. diff -pruN 1:2.24.2-1/debian/control 1:2.24.2-1ubuntu1/debian/control --- 1:2.24.2-1/debian/control 2011-08-15 08:27:13.000000000 +0000 +++ 1:2.24.2-1ubuntu1/debian/control 2011-12-20 07:41:04.000000000 +0000 @@ -6,14 +6,15 @@ Source: gtkmm2.4 Section: libs Priority: optional -Maintainer: Deng Xiyue -Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Mario Lang , Sebastian Dröge +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Deng Xiyue +Uploaders: Debian GNOME Maintainers , Deng Xiyue , Emilio Pozuelo Monfort , Mario Lang , Sebastian Dröge DM-Upload-Allowed: yes Homepage: http://www.gtkmm.org/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gtkmm2.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gtkmm2.4 -Build-Depends: cdbs (>= 0.4.51), - debhelper (>= 6), +Build-Depends: cdbs (>= 0.4.93~), + debhelper (>= 8.1.3~), gnome-pkg-tools (>= 0.11), libgtk2.0-dev (>= 2.24.0), libglibmm-2.4-dev (>= 2.27.93), @@ -26,6 +27,7 @@ Standards-Version: 3.9.2 Package: libgtkmm-2.4-dev Section: libdevel Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libgtkmm-2.4-1c2a (= ${binary:Version}), @@ -36,6 +38,7 @@ Depends: ${misc:Depends}, libpangomm-1.4-dev (>= 2.26.0), libatkmm-1.6-dev (>= 2.22.0) Suggests: libgtkmm-2.4-doc +Multi-Arch: same Description: C++ wrappers for GTK+ (development files) Gtkmm is a C++ interface for the popular GUI library GTK+, with API version 2.4. Gtkmm provides a convenient interface for C++ programmers to create @@ -49,12 +52,14 @@ Description: C++ wrappers for GTK+ (deve Package: libgtkmm-2.4-1c2a Section: libs Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: libgtkmm-2.4-1, libgtkmm-2.4-1c2 Replaces: libgtkmm-2.4-1, libgtkmm-2.4-1c2 +Multi-Arch: same Description: C++ wrappers for GTK+ (shared libraries) Gtkmm is a C++ interface for the popular GUI library GTK+, with API version 2.4. Gtkmm provides a convenient interface for C++ programmers to create @@ -68,9 +73,11 @@ Package: libgtkmm-2.4-dbg Section: debug Priority: extra Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libgtkmm-2.4-1c2a (= ${binary:Version}) +Multi-Arch: same Description: C++ wrappers for GTK+ (debug symbols) Gtkmm is a C++ interface for the popular GUI library GTK+, with API version 2.4. Gtkmm provides a convenient interface for C++ programmers to create diff -pruN 1:2.24.2-1/debian/control.in 1:2.24.2-1ubuntu1/debian/control.in --- 1:2.24.2-1/debian/control.in 2011-08-15 08:09:31.000000000 +0000 +++ 1:2.24.2-1ubuntu1/debian/control.in 2011-12-19 17:31:36.000000000 +0000 @@ -1,14 +1,15 @@ Source: gtkmm2.4 Section: libs Priority: optional -Maintainer: Deng Xiyue +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Deng Xiyue Uploaders: @GNOME_TEAM@ DM-Upload-Allowed: yes Homepage: http://www.gtkmm.org/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gtkmm2.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gtkmm2.4 -Build-Depends: cdbs (>= 0.4.51), - debhelper (>= 6), +Build-Depends: cdbs (>= 0.4.93~), + debhelper (>= 8.1.3~), gnome-pkg-tools (>= 0.11), libgtk2.0-dev (>= 2.24.0), libglibmm-2.4-dev (>= 2.27.93), @@ -21,6 +22,7 @@ Standards-Version: 3.9.2 Package: libgtkmm-2.4-dev Section: libdevel Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libgtkmm-2.4-1c2a (= ${binary:Version}), @@ -31,6 +33,7 @@ Depends: ${misc:Depends}, libpangomm-1.4-dev (>= 2.26.0), libatkmm-1.6-dev (>= 2.22.0) Suggests: libgtkmm-2.4-doc +Multi-Arch: same Description: C++ wrappers for GTK+ (development files) Gtkmm is a C++ interface for the popular GUI library GTK+, with API version 2.4. Gtkmm provides a convenient interface for C++ programmers to create @@ -44,12 +47,14 @@ Description: C++ wrappers for GTK+ (deve Package: libgtkmm-2.4-1c2a Section: libs Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: libgtkmm-2.4-1, libgtkmm-2.4-1c2 Replaces: libgtkmm-2.4-1, libgtkmm-2.4-1c2 +Multi-Arch: same Description: C++ wrappers for GTK+ (shared libraries) Gtkmm is a C++ interface for the popular GUI library GTK+, with API version 2.4. Gtkmm provides a convenient interface for C++ programmers to create @@ -63,9 +68,11 @@ Package: libgtkmm-2.4-dbg Section: debug Priority: extra Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libgtkmm-2.4-1c2a (= ${binary:Version}) +Multi-Arch: same Description: C++ wrappers for GTK+ (debug symbols) Gtkmm is a C++ interface for the popular GUI library GTK+, with API version 2.4. Gtkmm provides a convenient interface for C++ programmers to create diff -pruN 1:2.24.2-1/debian/libgtkmm-2.4-1c2a.install 1:2.24.2-1ubuntu1/debian/libgtkmm-2.4-1c2a.install --- 1:2.24.2-1/debian/libgtkmm-2.4-1c2a.install 2011-04-27 01:12:42.000000000 +0000 +++ 1:2.24.2-1ubuntu1/debian/libgtkmm-2.4-1c2a.install 2011-12-19 17:31:36.000000000 +0000 @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff -pruN 1:2.24.2-1/debian/libgtkmm-2.4-dev.install 1:2.24.2-1ubuntu1/debian/libgtkmm-2.4-dev.install --- 1:2.24.2-1/debian/libgtkmm-2.4-dev.install 2011-04-27 01:12:42.000000000 +0000 +++ 1:2.24.2-1ubuntu1/debian/libgtkmm-2.4-dev.install 2011-12-19 17:31:36.000000000 +0000 @@ -1,6 +1,6 @@ usr/include -usr/lib/gtkmm-2.4 -usr/lib/gdkmm-2.4 -usr/lib/lib*.so -usr/lib/pkgconfig -usr/lib/*.la +usr/lib/*/gtkmm-2.4 +usr/lib/*/gdkmm-2.4 +usr/lib/*/lib*.so +usr/lib/*/pkgconfig +usr/lib/*/*.la diff -pruN 1:2.24.2-1/debian/rules 1:2.24.2-1ubuntu1/debian/rules --- 1:2.24.2-1/debian/rules 2011-04-27 01:12:42.000000000 +0000 +++ 1:2.24.2-1ubuntu1/debian/rules 2011-12-19 17:31:36.000000000 +0000 @@ -15,6 +15,8 @@ SHVER := 1:2.24.0 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed +DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) + DEB_COMPRESS_EXCLUDE_libgtkmm-2.4-doc = examples DEB_DH_INSTALL_SOURCEDIR := debian/tmp DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"