r40371 - in /attic/libgnomecanvas/debian: changelog control control.in libgnomecanvas2-0.install libgnomecanvas2-dev.install patches/02_link.patch patches/99_ltmain_as-needed.patch patches/series rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Dec 27 13:44:49 UTC 2013
Author: joss
Date: Fri Dec 27 13:44:49 2013
New Revision: 40371
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40371
Log:
* Switch to multiarch. Closes: #695556.
+ Require a MA libglade.
+ Update build-dependencies.
+ Make library and devel packages MA: same, make -common MA:
foreign.
+ Update installation paths.
* Drop gnome:Version.
* Move to section oldlibs.
* Use dh-autoreconf.
* 99_ltmain_as-needed.patch: dropped, obsolete.
* 02_link.patch: new patch. Correctly link the demos.
Added:
attic/libgnomecanvas/debian/patches/02_link.patch
Removed:
attic/libgnomecanvas/debian/patches/99_ltmain_as-needed.patch
Modified:
attic/libgnomecanvas/debian/changelog
attic/libgnomecanvas/debian/control
attic/libgnomecanvas/debian/control.in
attic/libgnomecanvas/debian/libgnomecanvas2-0.install
attic/libgnomecanvas/debian/libgnomecanvas2-dev.install
attic/libgnomecanvas/debian/patches/series
attic/libgnomecanvas/debian/rules
Modified: attic/libgnomecanvas/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomecanvas/debian/changelog?rev=40371&op=diff
==============================================================================
--- attic/libgnomecanvas/debian/changelog [utf-8] (original)
+++ attic/libgnomecanvas/debian/changelog [utf-8] Fri Dec 27 13:44:49 2013
@@ -1,3 +1,19 @@
+libgnomecanvas (2.30.3-2) unstable; urgency=low
+
+ * Switch to multiarch. Closes: #695556.
+ + Require a MA libglade.
+ + Update build-dependencies.
+ + Make library and devel packages MA: same, make -common MA:
+ foreign.
+ + Update installation paths.
+ * Drop gnome:Version.
+ * Move to section oldlibs.
+ * Use dh-autoreconf.
+ * 99_ltmain_as-needed.patch: dropped, obsolete.
+ * 02_link.patch: new patch. Correctly link the demos.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 27 Dec 2013 14:31:10 +0100
+
libgnomecanvas (2.30.3-1) unstable; urgency=low
[ Josselin Mouette ]
Modified: attic/libgnomecanvas/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomecanvas/debian/control?rev=40371&op=diff
==============================================================================
--- attic/libgnomecanvas/debian/control [utf-8] (original)
+++ attic/libgnomecanvas/debian/control [utf-8] Fri Dec 27 13:44:49 2013
@@ -9,13 +9,14 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: David Weinehall <tao at debian.org>, Josselin Mouette <joss at debian.org>, Marc 'HE' Brockschmidt <he at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3),
+ dh-autoreconf,
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.41),
+ libglade2-dev (>= 1:2.6.4-2~),
+ cdbs (>= 0.4.93~),
gnome-pkg-tools (>= 0.7),
gtk-doc-tools,
docbook-xml
@@ -24,11 +25,12 @@
Package: libgnomecanvas2-0
Architecture: any
-Section: libs
+Multi-Arch: same
+Section: oldlibs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
- libgnomecanvas2-common (>= ${gnome:Version}),
- libgnomecanvas2-common (<< ${gnome:NextVersion})
+ libgnomecanvas2-common (= ${source:Version})
Description: powerful object-oriented display engine - runtime files
The canvas widget is a powerful and extensible object-oriented display
engine. A GnomeCanvasItem is a GtkObject representing some element of the
@@ -39,6 +41,7 @@
Package: libgnomecanvas2-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: libgnomecanvas2-0 (= ${binary:Version}),
${misc:Depends},
@@ -56,7 +59,8 @@
Package: libgnomecanvas2-common
Architecture: all
-Section: x11
+Multi-Arch: foreign
+Section: oldlibs
Depends: ${misc:Depends}
Description: powerful object-oriented display engine - common files
The canvas widget is a powerful and extensible object-oriented display
Modified: attic/libgnomecanvas/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomecanvas/debian/control.in?rev=40371&op=diff
==============================================================================
--- attic/libgnomecanvas/debian/control.in [utf-8] (original)
+++ attic/libgnomecanvas/debian/control.in [utf-8] Fri Dec 27 13:44:49 2013
@@ -4,13 +4,14 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3),
+ dh-autoreconf,
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.41),
+ libglade2-dev (>= 1:2.6.4-2~),
+ cdbs (>= 0.4.93~),
gnome-pkg-tools (>= 0.7),
gtk-doc-tools,
docbook-xml
@@ -19,11 +20,12 @@
Package: libgnomecanvas2-0
Architecture: any
-Section: libs
+Multi-Arch: same
+Section: oldlibs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
- libgnomecanvas2-common (>= ${gnome:Version}),
- libgnomecanvas2-common (<< ${gnome:NextVersion})
+ libgnomecanvas2-common (= ${source:Version})
Description: powerful object-oriented display engine - runtime files
The canvas widget is a powerful and extensible object-oriented display
engine. A GnomeCanvasItem is a GtkObject representing some element of the
@@ -34,6 +36,7 @@
Package: libgnomecanvas2-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: libgnomecanvas2-0 (= ${binary:Version}),
${misc:Depends},
@@ -51,7 +54,8 @@
Package: libgnomecanvas2-common
Architecture: all
-Section: x11
+Multi-Arch: foreign
+Section: oldlibs
Depends: ${misc:Depends}
Description: powerful object-oriented display engine - common files
The canvas widget is a powerful and extensible object-oriented display
Modified: attic/libgnomecanvas/debian/libgnomecanvas2-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomecanvas/debian/libgnomecanvas2-0.install?rev=40371&op=diff
==============================================================================
--- attic/libgnomecanvas/debian/libgnomecanvas2-0.install [utf-8] (original)
+++ attic/libgnomecanvas/debian/libgnomecanvas2-0.install [utf-8] Fri Dec 27 13:44:49 2013
@@ -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
Modified: attic/libgnomecanvas/debian/libgnomecanvas2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomecanvas/debian/libgnomecanvas2-dev.install?rev=40371&op=diff
==============================================================================
--- attic/libgnomecanvas/debian/libgnomecanvas2-dev.install [utf-8] (original)
+++ attic/libgnomecanvas/debian/libgnomecanvas2-dev.install [utf-8] Fri Dec 27 13:44:49 2013
@@ -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
Added: attic/libgnomecanvas/debian/patches/02_link.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomecanvas/debian/patches/02_link.patch?rev=40371&op=file
==============================================================================
--- attic/libgnomecanvas/debian/patches/02_link.patch (added)
+++ attic/libgnomecanvas/debian/patches/02_link.patch [utf-8] Fri Dec 27 13:44:49 2013
@@ -0,0 +1,12 @@
+Index: libgnomecanvas-2.30.3/demos/Makefile.am
+===================================================================
+--- libgnomecanvas-2.30.3.orig/demos/Makefile.am 2011-01-31 13:19:30.000000000 +0100
++++ libgnomecanvas-2.30.3/demos/Makefile.am 2013-12-27 14:36:33.084895344 +0100
+@@ -12,6 +12,7 @@ INCLUDES = \
+ -DG_LOG_DOMAIN=\"GnomeCanvas\"
+
+ LDADD = \
++ $(LIBGNOMECANVAS_LIBS) \
+ $(top_builddir)/libgnomecanvas/libgnomecanvas-2.la \
+ $(INTLLIBS)
+
Modified: attic/libgnomecanvas/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomecanvas/debian/patches/series?rev=40371&op=diff
==============================================================================
--- attic/libgnomecanvas/debian/patches/series [utf-8] (original)
+++ attic/libgnomecanvas/debian/patches/series [utf-8] Fri Dec 27 13:44:49 2013
@@ -1,2 +1,2 @@
01_canvasassert.patch
-99_ltmain_as-needed.patch
+02_link.patch
Modified: attic/libgnomecanvas/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnomecanvas/debian/rules?rev=40371&op=diff
==============================================================================
--- attic/libgnomecanvas/debian/rules [utf-8] (original)
+++ attic/libgnomecanvas/debian/rules [utf-8] Fri Dec 27 13:44:49 2013
@@ -1,12 +1,14 @@
#!/usr/bin/make -f
+TARBALL_EXT = tar.bz2
+
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-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
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --enable-glade --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
More information about the pkg-gnome-commits
mailing list