r35780 - in /packages/unstable/libcanberra/debian: changelog control control.in gnome-session-canberra.manpages libcanberra-gtk0.manpages patches/undefined_reference.diff rules
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Sat Sep 22 22:54:13 UTC 2012
Author: bigon
Date: Sat Sep 22 22:54:12 2012
New Revision: 35780
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35780
Log:
* Move canberra-gtk-play manpage from libcanberra-gtk0 to
gnome-session-canberra to follow the executable (Closes: #684676)
* Fix libcanberra-gstreamer-dbg long description (Closes: #675693)
* debian/rules: Drop update-patch-series target, this was when the package
was maintained in git.
* Call dh_autoreconf during build to update m4/libtool.m4 and prevent
hurd-i386 to be built with rpath (Closes: #677343)
* debian/patches/undefined_reference.diff: Also link the GTK3 flavour
against libX11 too
Added:
packages/unstable/libcanberra/debian/gnome-session-canberra.manpages
- copied unchanged from r35779, packages/unstable/libcanberra/debian/libcanberra-gtk0.manpages
Removed:
packages/unstable/libcanberra/debian/libcanberra-gtk0.manpages
Modified:
packages/unstable/libcanberra/debian/changelog
packages/unstable/libcanberra/debian/control
packages/unstable/libcanberra/debian/control.in
packages/unstable/libcanberra/debian/patches/undefined_reference.diff
packages/unstable/libcanberra/debian/rules
Modified: packages/unstable/libcanberra/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/changelog?rev=35780&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/changelog [utf-8] (original)
+++ packages/unstable/libcanberra/debian/changelog [utf-8] Sat Sep 22 22:54:12 2012
@@ -1,8 +1,17 @@
libcanberra (0.28-5) UNRELEASED; urgency=low
* debian/watch: Switch to .xz tarballs
-
- -- Laurent Bigonville <bigon at debian.org> Wed, 22 Aug 2012 10:19:16 +0200
+ * Move canberra-gtk-play manpage from libcanberra-gtk0 to
+ gnome-session-canberra to follow the executable (Closes: #684676)
+ * Fix libcanberra-gstreamer-dbg long description (Closes: #675693)
+ * debian/rules: Drop update-patch-series target, this was when the package
+ was maintained in git.
+ * Call dh_autoreconf during build to update m4/libtool.m4 and prevent
+ hurd-i386 to be built with rpath (Closes: #677343)
+ * debian/patches/undefined_reference.diff: Also link the GTK3 flavour
+ against libX11 too
+
+ -- Laurent Bigonville <bigon at debian.org> Sun, 23 Sep 2012 00:52:58 +0200
libcanberra (0.28-4) unstable; urgency=low
Modified: packages/unstable/libcanberra/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/control?rev=35780&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/control [utf-8] (original)
+++ packages/unstable/libcanberra/debian/control [utf-8] Sat Sep 22 22:54:12 2012
@@ -10,6 +10,7 @@
Uploaders: Laurent Bigonville <bigon at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 8.1.3~),
cdbs (>= 0.4.93~),
+ dh-autoreconf,
gnome-pkg-tools,
m4,
libltdl-dev | libltdl7-dev (>= 2.2.6),
@@ -120,7 +121,7 @@
libcanberra defines a simple abstract interface for playing event
sounds.
.
- This package contains the pulseaudio backend for libcanberra.
+ This package contains the GStreamer backend debugging symbols.
Package: libcanberra-gtk0
Architecture: any
@@ -272,8 +273,8 @@
Architecture: any
Section: gnome
Depends: ${misc:Depends}, ${shlibs:Depends}, libcanberra-gtk0
-Breaks: libcanberra-gtk0 (<< 0.28-4)
-Replaces: libcanberra-gtk0 (<< 0.28-4)
+Breaks: libcanberra-gtk0 (<< 0.28-5)
+Replaces: libcanberra-gtk0 (<< 0.28-5)
Description: GNOME session log in and log out sound events
Produce sound events on GNOME session log in and log out.
.
Modified: packages/unstable/libcanberra/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/control.in?rev=35780&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/control.in [utf-8] (original)
+++ packages/unstable/libcanberra/debian/control.in [utf-8] Sat Sep 22 22:54:12 2012
@@ -5,6 +5,7 @@
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 8.1.3~),
cdbs (>= 0.4.93~),
+ dh-autoreconf,
gnome-pkg-tools,
m4,
libltdl-dev | libltdl7-dev (>= 2.2.6),
@@ -115,7 +116,7 @@
libcanberra defines a simple abstract interface for playing event
sounds.
.
- This package contains the pulseaudio backend for libcanberra.
+ This package contains the GStreamer backend debugging symbols.
Package: libcanberra-gtk0
Architecture: any
@@ -267,8 +268,8 @@
Architecture: any
Section: gnome
Depends: ${misc:Depends}, ${shlibs:Depends}, libcanberra-gtk0
-Breaks: libcanberra-gtk0 (<< 0.28-4)
-Replaces: libcanberra-gtk0 (<< 0.28-4)
+Breaks: libcanberra-gtk0 (<< 0.28-5)
+Replaces: libcanberra-gtk0 (<< 0.28-5)
Description: GNOME session log in and log out sound events
Produce sound events on GNOME session log in and log out.
.
Modified: packages/unstable/libcanberra/debian/patches/undefined_reference.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/patches/undefined_reference.diff?rev=35780&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/patches/undefined_reference.diff [utf-8] (original)
+++ packages/unstable/libcanberra/debian/patches/undefined_reference.diff [utf-8] Sat Sep 22 22:54:12 2012
@@ -2,14 +2,21 @@
Author: Bart Martens <bartm at debian.org>
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555081
---- ../orig/libcanberra-0.28/src/Makefile.in 2011-06-07 05:02:18.000000000 +0200
-+++ ./src/Makefile.in 2011-10-09 09:30:09.000000000 +0200
-@@ -510,7 +510,7 @@
- GST_CFLAGS = @GST_CFLAGS@
- GST_LIBS = @GST_LIBS@
- GTK3_CFLAGS = @GTK3_CFLAGS@
--GTK3_LIBS = @GTK3_LIBS@
-+GTK3_LIBS = @GTK3_LIBS@ -lX11
- GTK3_MODULES_DIR = @GTK3_MODULES_DIR@
- GTKDOC_CHECK = @GTKDOC_CHECK@
- GTKDOC_MKPDF = @GTKDOC_MKPDF@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -341,6 +341,7 @@ libcanberra_gtk3_la_CFLAGS = \
+ $(GTK3_CFLAGS)
+ libcanberra_gtk3_la_LIBADD = \
+ $(GTK3_LIBS) \
++ -lX11 \
+ libcanberra.la
+ libcanberra_gtk3_la_LDFLAGS = \
+ -export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO)
+@@ -379,6 +380,7 @@ libcanberra_gtk_la_CFLAGS = \
+ $(GTK_CFLAGS)
+ libcanberra_gtk_la_LIBADD = \
+ $(GTK_LIBS) \
++ -lX11 \
+ libcanberra.la
+ libcanberra_gtk_la_LDFLAGS = \
+ -export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO)
Modified: packages/unstable/libcanberra/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/rules?rev=35780&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/rules [utf-8] (original)
+++ packages/unstable/libcanberra/debian/rules [utf-8] Sat Sep 22 22:54:12 2012
@@ -4,6 +4,7 @@
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
@@ -11,13 +12,6 @@
find $(DEB_DESTDIR) -name "*.la" | xargs rm -f
common-binary-post-install-arch:: list-missing
-
-update-patch-series:
- git rm -r -f $(CURDIR)/debian/patches
- mkdir -p $(CURDIR)/debian/patches
- git format-patch -o $(CURDIR)/debian/patches patches ^upstream | \
- xargs -n 1 basename > $(CURDIR)/debian/patches/series
- git add $(CURDIR)/debian/patches
DEB_CONFIGURE_EXTRA_FLAGS = \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
More information about the pkg-gnome-commits
mailing list