Hi,
As discussed on IRC, this needs to coincide with changes to libglade2
which we cannot be making now. (At lest for now) I've reverted the
complete MA-ifying changes and left only the marking as multi-arch:
foreign which was the original request in the bug.
Attached the diff for the new NMU, and a convenience diffs of the net
result of the two NMU's of today.
Sorry for the inconvenience.
Cheers,
Thijs
diff -Nru libgnomecanvas-2.30.3/debian/changelog libgnomecanvas-2.30.3/debian/changelog
--- libgnomecanvas-2.30.3/debian/changelog 2012-10-14 13:14:41.000000000 +0200
+++ libgnomecanvas-2.30.3/debian/changelog 2012-10-14 19:41:21.000000000 +0200
@@ -1,3 +1,12 @@
+libgnomecanvas (2.30.3-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Revert conversion to Multi-Arch: same done in 2.30.3-1.1.
+ This needs to be done coordinated with changes to libglade2.
+ * Keep the Multi-Arch: foreign change for libgnomecanvas-common.
+
+ -- Thijs Kinkhorst <[email protected]> Sun, 14 Oct 2012 17:39:04 +0000
+
libgnomecanvas (2.30.3-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru libgnomecanvas-2.30.3/debian/control libgnomecanvas-2.30.3/debian/control
--- libgnomecanvas-2.30.3/debian/control 2012-10-14 13:25:47.000000000 +0200
+++ libgnomecanvas-2.30.3/debian/control 2012-10-14 19:42:37.000000000 +0200
@@ -9,13 +9,13 @@
Maintainer: Debian GNOME Maintainers <[email protected]>
Uploaders: David Weinehall <[email protected]>, Josselin Mouette <[email protected]>, Marc 'HE' Brockschmidt <[email protected]>, Michael Biebl <[email protected]>, Sebastian Dröge <[email protected]>
Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8.1.3),
+Build-Depends: debhelper (>= 8),
libgtk2.0-dev (>= 2.8.17),
libgail-dev (>= 1.9.0),
gettext,
libart-2.0-dev (>= 2.3.16),
libglade2-dev (>= 2.4.0),
- cdbs (>= 0.4.93~),
+ cdbs (>= 0.4.41),
gnome-pkg-tools (>= 0.7),
gtk-doc-tools,
docbook-xml
@@ -24,9 +24,7 @@
Package: libgnomecanvas2-0
Architecture: any
-Multi-Arch: same
Section: libs
-Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
libgnomecanvas2-common (>= ${gnome:Version}),
@@ -41,9 +39,7 @@
Package: libgnomecanvas2-dev
Architecture: any
-Multi-Arch: same
Section: libdevel
-Pre-Depends: ${misc:Pre-Depends}
Depends: libgnomecanvas2-0 (= ${binary:Version}),
${misc:Depends},
libart-2.0-dev (>= 2.3.16),
diff -Nru libgnomecanvas-2.30.3/debian/control.in libgnomecanvas-2.30.3/debian/control.in
--- libgnomecanvas-2.30.3/debian/control.in 2012-10-14 13:25:43.000000000 +0200
+++ libgnomecanvas-2.30.3/debian/control.in 2012-10-14 19:42:31.000000000 +0200
@@ -4,13 +4,13 @@
Maintainer: Debian GNOME Maintainers <[email protected]>
Uploaders: @GNOME_TEAM@
Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8.1.3),
+Build-Depends: debhelper (>= 8),
libgtk2.0-dev (>= 2.8.17),
libgail-dev (>= 1.9.0),
gettext,
libart-2.0-dev (>= 2.3.16),
libglade2-dev (>= 2.4.0),
- cdbs (>= 0.4.93~),
+ cdbs (>= 0.4.41),
gnome-pkg-tools (>= 0.7),
gtk-doc-tools,
docbook-xml
@@ -19,9 +19,7 @@
Package: libgnomecanvas2-0
Architecture: any
-Multi-Arch: same
Section: libs
-Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
libgnomecanvas2-common (>= ${gnome:Version}),
@@ -36,9 +34,7 @@
Package: libgnomecanvas2-dev
Architecture: any
-Multi-Arch: same
Section: libdevel
-Pre-Depends: ${misc:Pre-Depends}
Depends: libgnomecanvas2-0 (= ${binary:Version}),
${misc:Depends},
libart-2.0-dev (>= 2.3.16),
diff -Nru libgnomecanvas-2.30.3/debian/libgnomecanvas2-0.install libgnomecanvas-2.30.3/debian/libgnomecanvas2-0.install
--- libgnomecanvas-2.30.3/debian/libgnomecanvas2-0.install 2012-10-14 13:10:10.000000000 +0200
+++ libgnomecanvas-2.30.3/debian/libgnomecanvas2-0.install 2012-10-14 19:42:31.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/*/libgnomecanvas-2.so.*
-usr/lib/*/libglade/2.0/libcanvas.so
+usr/lib/libgnomecanvas-2.so.*
+usr/lib/libglade/2.0/libcanvas.so
diff -Nru libgnomecanvas-2.30.3/debian/libgnomecanvas2-dev.install libgnomecanvas-2.30.3/debian/libgnomecanvas2-dev.install
--- libgnomecanvas-2.30.3/debian/libgnomecanvas2-dev.install 2012-10-14 13:10:10.000000000 +0200
+++ libgnomecanvas-2.30.3/debian/libgnomecanvas2-dev.install 2012-10-14 19:42:31.000000000 +0200
@@ -1,4 +1,4 @@
usr/include
-usr/lib/*/pkgconfig
-usr/lib/*/libgnomecanvas-2.a
-usr/lib/*/libgnomecanvas-2.so
+usr/lib/pkgconfig
+usr/lib/libgnomecanvas-2.a
+usr/lib/libgnomecanvas-2.so
diff -Nru libgnomecanvas-2.30.3/debian/rules libgnomecanvas-2.30.3/debian/rules
--- libgnomecanvas-2.30.3/debian/rules 2012-10-14 13:10:10.000000000 +0200
+++ libgnomecanvas-2.30.3/debian/rules 2012-10-14 19:42:31.000000000 +0200
@@ -6,7 +6,7 @@
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --enable-glade --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --enable-glade
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
diff -Nru libgnomecanvas-2.30.3/debian/changelog libgnomecanvas-2.30.3/debian/changelog
--- libgnomecanvas-2.30.3/debian/changelog 2011-07-30 17:24:07.000000000 +0200
+++ libgnomecanvas-2.30.3/debian/changelog 2012-10-14 19:41:21.000000000 +0200
@@ -1,3 +1,20 @@
+libgnomecanvas (2.30.3-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Revert conversion to Multi-Arch: same done in 2.30.3-1.1.
+ This needs to be done coordinated with changes to libglade2.
+ * Keep the Multi-Arch: foreign change for libgnomecanvas-common.
+
+ -- Thijs Kinkhorst <[email protected]> Sun, 14 Oct 2012 17:39:04 +0000
+
+libgnomecanvas (2.30.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Convert package to Multiarch by applying patches from
+ Adam Stokes and Steve Langasek (closes: #650777).
+
+ -- Thijs Kinkhorst <[email protected]> Sun, 14 Oct 2012 11:10:26 +0000
+
libgnomecanvas (2.30.3-1) unstable; urgency=low
[ Josselin Mouette ]
diff -Nru libgnomecanvas-2.30.3/debian/control libgnomecanvas-2.30.3/debian/control
--- libgnomecanvas-2.30.3/debian/control 2011-07-30 17:30:21.000000000 +0200
+++ libgnomecanvas-2.30.3/debian/control 2012-10-14 19:42:37.000000000 +0200
@@ -56,6 +56,7 @@
Package: libgnomecanvas2-common
Architecture: all
+Multi-Arch: foreign
Section: x11
Depends: ${misc:Depends}
Description: powerful object-oriented display engine - common files
diff -Nru libgnomecanvas-2.30.3/debian/control.in libgnomecanvas-2.30.3/debian/control.in
--- libgnomecanvas-2.30.3/debian/control.in 2011-07-30 17:15:45.000000000 +0200
+++ libgnomecanvas-2.30.3/debian/control.in 2012-10-14 19:42:31.000000000 +0200
@@ -51,6 +51,7 @@
Package: libgnomecanvas2-common
Architecture: all
+Multi-Arch: foreign
Section: x11
Depends: ${misc:Depends}
Description: powerful object-oriented display engine - common files
