[Pkg-xfce-commits] r4657 - in desktop/trunk/xfprint4/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-12-09 10:59:03 +0000 (Thu, 09 Dec 2010)
New Revision: 4657

Added:
   desktop/trunk/xfprint4/debian/patches/04_fix-implicit-dso-linking.patch
Modified:
   desktop/trunk/xfprint4/debian/changelog
   desktop/trunk/xfprint4/debian/control
   desktop/trunk/xfprint4/debian/patches/series
Log:
* debian/patches:
  - 04_fix-implicit-dso-linking.patch: add missing -lX11, fixes FTBFS with
    binutils-gold.
  - series: refreshed.
* debian/control: add myself to Uploaders.

Modified: desktop/trunk/xfprint4/debian/changelog
===================================================================
--- desktop/trunk/xfprint4/debian/changelog	2010-12-09 10:09:27 UTC (rev 4656)
+++ desktop/trunk/xfprint4/debian/changelog	2010-12-09 10:59:03 UTC (rev 4657)
@@ -1,7 +1,15 @@
 xfprint4 (4.6.1-2) UNRELEASED; urgency=low
 
+  [ Stefan Ott ]
   * debian/watch edited to track Xfce archive reorganisation.
 
+  [ Lionel Le Folgoc ]
+  * debian/patches:
+    - 04_fix-implicit-dso-linking.patch: add missing -lX11, fixes FTBFS with
+      binutils-gold.
+    - series: refreshed.
+  * debian/control: add myself to Uploaders.
+
  -- Stefan Ott <stefan at ott.net>  Thu, 11 Mar 2010 20:04:06 +0100
 
 xfprint4 (4.6.1-1) unstable; urgency=low

Modified: desktop/trunk/xfprint4/debian/control
===================================================================
--- desktop/trunk/xfprint4/debian/control	2010-12-09 10:09:27 UTC (rev 4656)
+++ desktop/trunk/xfprint4/debian/control	2010-12-09 10:59:03 UTC (rev 4657)
@@ -2,7 +2,8 @@
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7), libgtk2.0-dev (>= 2.10.6), libxft-dev,
  a2ps, lpr, libcups2-dev, chrpath, sharutils, quilt, 
  libxfcegui4-dev (>= 4.6.0), libxfconf-0-dev, intltool

Added: desktop/trunk/xfprint4/debian/patches/04_fix-implicit-dso-linking.patch
===================================================================
--- desktop/trunk/xfprint4/debian/patches/04_fix-implicit-dso-linking.patch	                        (rev 0)
+++ desktop/trunk/xfprint4/debian/patches/04_fix-implicit-dso-linking.patch	2010-12-09 10:59:03 UTC (rev 4657)
@@ -0,0 +1,27 @@
+Description: Add missing -lX11
+ This is a slightly updated version of the patch submitted upstream, in order
+ to avoid regenerating autotools files.
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=5997
+Origin: other, http://bugzilla.xfce.org/attachment.cgi?id=2679
+--- xfprint4-4.6.1.orig/xfprint-manager/Makefile.in
++++ xfprint4-4.6.1/xfprint-manager/Makefile.in
+@@ -165,7 +165,7 @@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lX11
+ LIBTOOL = @LIBTOOL@
+ LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@
+ LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@
+--- xfprint4-4.6.1.orig/xfprint/Makefile.in
++++ xfprint4-4.6.1/xfprint/Makefile.in
+@@ -170,7 +170,7 @@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lX11
+ LIBTOOL = @LIBTOOL@
+ LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@
+ LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@

Modified: desktop/trunk/xfprint4/debian/patches/series
===================================================================
--- desktop/trunk/xfprint4/debian/patches/series	2010-12-09 10:09:27 UTC (rev 4656)
+++ desktop/trunk/xfprint4/debian/patches/series	2010-12-09 10:59:03 UTC (rev 4657)
@@ -1,3 +1,4 @@
 01_debug-lpr-command.patch
 02_refresh-new-settings.patch
 03_fix-wl-as-needed.patch
+04_fix-implicit-dso-linking.patch