[Pkg-xfce-commits] r4695 - in goodies/trunk/parole/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-12-11 13:40:01 +0000 (Sat, 11 Dec 2010)
New Revision: 4695

Added:
   goodies/trunk/parole/debian/patches/
   goodies/trunk/parole/debian/patches/01_fix-implicit-dso-linking.patch
   goodies/trunk/parole/debian/patches/series
Modified:
   goodies/trunk/parole/debian/changelog
   goodies/trunk/parole/debian/control
   goodies/trunk/parole/debian/rules
Log:
  - build-depends on quilt.
* debian/patches:
  - 01_fix-implicit-dso-linking.patch: added, fixes FTBFS with binutils-gold.
  - series: added.
* debian/rules: pass --with quilt to dh.

Modified: goodies/trunk/parole/debian/changelog
===================================================================
--- goodies/trunk/parole/debian/changelog	2010-12-11 13:19:10 UTC (rev 4694)
+++ goodies/trunk/parole/debian/changelog	2010-12-11 13:40:01 UTC (rev 4695)
@@ -3,6 +3,11 @@
   * debian/control:
     - drop unneeded build-dep on xulrunner-dev.   closes: #594073
     - suggests a few useful gstreamer0.10 plugins.
+    - build-depends on quilt.
+  * debian/patches:
+    - 01_fix-implicit-dso-linking.patch: added, fixes FTBFS with binutils-gold.
+    - series: added.
+  * debian/rules: pass --with quilt to dh.
 
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 23 Aug 2010 20:06:03 +0200
 

Modified: goodies/trunk/parole/debian/control
===================================================================
--- goodies/trunk/parole/debian/control	2010-12-11 13:19:10 UTC (rev 4694)
+++ goodies/trunk/parole/debian/control	2010-12-11 13:40:01 UTC (rev 4695)
@@ -7,7 +7,7 @@
 Build-Depends: debhelper (>= 7.0.50~), intltool, pkg-config, 
  libgtk2.0-dev (>= 2.16), libgstreamer0.10-dev, 
  libgstreamer-plugins-base0.10-dev, libdbus-1-dev, libdbus-glib-1-dev,
- libxfcegui4-dev (>= 4.6.0), libnotify-dev, libtagc0-dev
+ libxfcegui4-dev (>= 4.6.0), libnotify-dev, libtagc0-dev, quilt (>= 0.46-7)
 Standards-Version: 3.8.4
 Homepage: http://goodies.xfce.org/projects/applications/parole
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/parole/

Added: goodies/trunk/parole/debian/patches/01_fix-implicit-dso-linking.patch
===================================================================
--- goodies/trunk/parole/debian/patches/01_fix-implicit-dso-linking.patch	                        (rev 0)
+++ goodies/trunk/parole/debian/patches/01_fix-implicit-dso-linking.patch	2010-12-11 13:40:01 UTC (rev 4695)
@@ -0,0 +1,29 @@
+Description: fix FTBFS with gold
+Author: Kevin Fenzi <kevin at tummy.com>
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6244
+=== modified file 'src/Makefile.in'
+--- old/src/Makefile.in	2010-04-28 21:42:11 +0000
++++ new/src/Makefile.in	2010-10-28 19:19:02 +0000
+@@ -205,7 +205,7 @@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lX11
+ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
+ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
+ LIBNOTIFY_REQUIRED_VERSION = @LIBNOTIFY_REQUIRED_VERSION@
+
+=== modified file 'common/Makefile.in'
+--- old/common/Makefile.in	2010-04-28 21:42:11 +0000
++++ new/common/Makefile.in	2010-10-28 19:30:58 +0000
+@@ -199,7 +199,7 @@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lX11
+ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
+ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
+ LIBNOTIFY_REQUIRED_VERSION = @LIBNOTIFY_REQUIRED_VERSION@
+

Added: goodies/trunk/parole/debian/patches/series
===================================================================
--- goodies/trunk/parole/debian/patches/series	                        (rev 0)
+++ goodies/trunk/parole/debian/patches/series	2010-12-11 13:40:01 UTC (rev 4695)
@@ -0,0 +1 @@
+01_fix-implicit-dso-linking.patch

Modified: goodies/trunk/parole/debian/rules
===================================================================
--- goodies/trunk/parole/debian/rules	2010-12-11 13:19:10 UTC (rev 4694)
+++ goodies/trunk/parole/debian/rules	2010-12-11 13:40:01 UTC (rev 4695)
@@ -5,7 +5,7 @@
 export CONFIG_SHELL=/bin/bash
 
 %:
-	dh $@
+	dh $@ --with quilt
 
 override_dh_makeshlibs:
 	dh_makeshlibs -X usr/lib/parole-0