[Pkg-xfce-commits] r4683 - in goodies/branches/experimental/xfce4-wmdock-plugin/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-12-10 22:41:07 +0000 (Fri, 10 Dec 2010)
New Revision: 4683

Added:
   goodies/branches/experimental/xfce4-wmdock-plugin/debian/patches/02_fix-indirect-dso-linking.patch
Modified:
   goodies/branches/experimental/xfce4-wmdock-plugin/debian/changelog
   goodies/branches/experimental/xfce4-wmdock-plugin/debian/control
   goodies/branches/experimental/xfce4-wmdock-plugin/debian/patches/series
Log:
* debian/patches:
  - 02_fix-indirect-dso-linking.patch: pass missing -lX11, fixes FTBFS
    with binutils-gold.
  - series: refreshed.
* debian/control: add myself to Uploaders.

Modified: goodies/branches/experimental/xfce4-wmdock-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-wmdock-plugin/debian/changelog	2010-12-10 22:18:58 UTC (rev 4682)
+++ goodies/branches/experimental/xfce4-wmdock-plugin/debian/changelog	2010-12-10 22:41:07 UTC (rev 4683)
@@ -13,6 +13,13 @@
   * debian/patches:
     - 01_port-xfce4-panel-47 added, port plugin to xfce4-panel 4.7.
 
+  [ Lionel Le Folgoc ]
+  * debian/patches:
+    - 02_fix-indirect-dso-linking.patch: pass missing -lX11, fixes FTBFS
+      with binutils-gold.
+    - series: refreshed.
+  * debian/control: add myself to Uploaders.
+
  -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 21:45:34 +0100
 
 xfce4-wmdock-plugin (0.3.2-1) unstable; urgency=low

Modified: goodies/branches/experimental/xfce4-wmdock-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-wmdock-plugin/debian/control	2010-12-10 22:18:58 UTC (rev 4682)
+++ goodies/branches/experimental/xfce4-wmdock-plugin/debian/control	2010-12-10 22:41:07 UTC (rev 4683)
@@ -2,7 +2,9 @@
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Enrique Monge <emonge at debian.org.sv>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
+Uploaders: Enrique Monge <emonge at debian.org.sv>, 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 (>= 6), autotools-dev, cdbs, xfce4-panel-dev,
  libwnck-dev, intltool, libxfcegui4-dev
 Standards-Version: 3.9.1

Added: goodies/branches/experimental/xfce4-wmdock-plugin/debian/patches/02_fix-indirect-dso-linking.patch
===================================================================
--- goodies/branches/experimental/xfce4-wmdock-plugin/debian/patches/02_fix-indirect-dso-linking.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-wmdock-plugin/debian/patches/02_fix-indirect-dso-linking.patch	2010-12-10 22:41:07 UTC (rev 4683)
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with binutils-gold (missing -lX11)
+ Pass directly -lX11 in Makefile.in instead of @X11_LIBS@ in Makefile.am as
+ in the upstream commit to avoid regenerating autotools' files.
+Origin: backport, http://git.xfce.org/panel-plugins/xfce4-wmdock-plugin/commit/?id=ee869a6de786b00010a3061982784aa445eb9efd
+--- xfce4-wmdock-plugin-0.3.2.orig/panel-plugin/Makefile.in
++++ xfce4-wmdock-plugin-0.3.2/panel-plugin/Makefile.in
+@@ -156,7 +156,7 @@ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XM
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lX11
+ LIBTOOL = @LIBTOOL@
+ LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@
+ LIBWNCK_LIBS = @LIBWNCK_LIBS@

Modified: goodies/branches/experimental/xfce4-wmdock-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-wmdock-plugin/debian/patches/series	2010-12-10 22:18:58 UTC (rev 4682)
+++ goodies/branches/experimental/xfce4-wmdock-plugin/debian/patches/series	2010-12-10 22:41:07 UTC (rev 4683)
@@ -1 +1,2 @@
 01_port-xfce4-panel-47.patch
+02_fix-indirect-dso-linking.patch