r35781 - in /packages/unstable/libcanberra/debian: changelog patches/undefined_reference.diff

[bigon at users.alioth.debian.org]

Author: bigon
Date: Sat Sep 22 23:35:05 2012
New Revision: 35781

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35781
Log:
Also link the modules against libgmodule-2.0

Modified:
    packages/unstable/libcanberra/debian/changelog
    packages/unstable/libcanberra/debian/patches/undefined_reference.diff

Modified: packages/unstable/libcanberra/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/changelog?rev=35781&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/changelog [utf-8] (original)
+++ packages/unstable/libcanberra/debian/changelog [utf-8] Sat Sep 22 23:35:05 2012
@@ -8,10 +8,10 @@
     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
+  * debian/patches/undefined_reference.diff: Also link the GTK2 flavour
+    against libX11 and the modules against libgmodule-2.0
+
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 23 Sep 2012 01:34:30 +0200
 
 libcanberra (0.28-4) unstable; urgency=low
 

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=35781&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 23:35:05 2012
@@ -12,7 +12,16 @@
  	libcanberra.la
  libcanberra_gtk3_la_LDFLAGS = \
  	-export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO)
-@@ -379,6 +380,7 @@ libcanberra_gtk_la_CFLAGS = \
+@@ -351,6 +352,8 @@ libcanberra_gtk3_module_la_CFLAGS = \
+ 	$(GTK3_CFLAGS)
+ libcanberra_gtk3_module_la_LIBADD = \
+ 	$(GTK3_LIBS) \
++	-lX11 \
++	-lgmodule-2.0 \
+ 	libcanberra.la \
+ 	libcanberra-gtk3.la
+ libcanberra_gtk3_module_la_LDFLAGS = \
+@@ -379,6 +382,7 @@ libcanberra_gtk_la_CFLAGS = \
  	$(GTK_CFLAGS)
  libcanberra_gtk_la_LIBADD = \
  	$(GTK_LIBS) \
@@ -20,3 +29,12 @@
  	libcanberra.la
  libcanberra_gtk_la_LDFLAGS = \
  	-export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO)
+@@ -389,6 +393,8 @@ libcanberra_gtk_module_la_CFLAGS = \
+ 	$(GTK_CFLAGS)
+ libcanberra_gtk_module_la_LIBADD = \
+ 	$(GTK_LIBS) \
++	-lX11 \
++	-lgmodule-2.0 \
+ 	libcanberra.la \
+ 	libcanberra-gtk.la
+ libcanberra_gtk_module_la_LDFLAGS = \