[Pkg-xfce-commits] r3744 - in goodies/trunk/xfce4-dict/debian: . patches source

[Yves-Alexis Perez]

Author: corsac
Date: 2009-12-31 11:06:48 +0000 (Thu, 31 Dec 2009)
New Revision: 3744

Added:
   goodies/trunk/xfce4-dict/debian/patches/
   goodies/trunk/xfce4-dict/debian/patches/01_fix-ftbfs-gold.patch
   goodies/trunk/xfce4-dict/debian/source/
   goodies/trunk/xfce4-dict/debian/source/format
Modified:
   goodies/trunk/xfce4-dict/debian/changelog
   goodies/trunk/xfce4-dict/debian/control
Log:
* new upstream release.
* debian/patches:
  - 01_fix-ftbfs-gold added, fix FTBFS with binutils-gold.    closes: #556697
* debian/control:
  - update standards version to 3.8.3.
* switch to 3.0 (quilt) format.

Modified: goodies/trunk/xfce4-dict/debian/changelog
===================================================================
--- goodies/trunk/xfce4-dict/debian/changelog	2009-12-30 19:24:03 UTC (rev 3743)
+++ goodies/trunk/xfce4-dict/debian/changelog	2009-12-31 11:06:48 UTC (rev 3744)
@@ -1,12 +1,18 @@
-xfce4-dict (0.5.3-2) UNRELEASED; urgency=low
+xfce4-dict (0.6.0-1) UNRELEASED; urgency=low
 
   [ Evgeni Golov ]
   * Fix Vcs-* fields, they were missing 'trunk' in the path.
 
   [ Yves-Alexis Perez ]
+  * new upstream release.
   * debian/watch edited to track Xfce archive reorganisation.
+  * debian/patches:
+    - 01_fix-ftbfs-gold added, fix FTBFS with binutils-gold.    closes: #556697
+  * debian/control:
+    - update standards version to 3.8.3.
+  * switch to 3.0 (quilt) format.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 03 Aug 2009 18:35:32 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 22 Nov 2009 12:30:07 +0100
 
 xfce4-dict (0.5.3-1) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-dict/debian/control
===================================================================
--- goodies/trunk/xfce4-dict/debian/control	2009-12-30 19:24:03 UTC (rev 3743)
+++ goodies/trunk/xfce4-dict/debian/control	2009-12-31 11:06:48 UTC (rev 3744)
@@ -4,8 +4,9 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li> 
 Build-Depends: debhelper (>= 7.0.13), libexo-0.3-dev (>= 0.3.100), 
- xfce4-panel-dev (>= 4.6.0), libxml-parser-perl, intltool, libgtk2.0-dev
-Standards-Version: 3.8.1
+ xfce4-panel-dev (>= 4.6.0), libxml-parser-perl, intltool, libgtk2.0-dev,
+ binutils-gold
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-dict/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-dict/
 Homepage: http://goodies.xfce.org/projects/applications/xfce4-dict

Added: goodies/trunk/xfce4-dict/debian/patches/01_fix-ftbfs-gold.patch
===================================================================
--- goodies/trunk/xfce4-dict/debian/patches/01_fix-ftbfs-gold.patch	                        (rev 0)
+++ goodies/trunk/xfce4-dict/debian/patches/01_fix-ftbfs-gold.patch	2009-12-31 11:06:48 UTC (rev 3744)
@@ -0,0 +1,42 @@
+commit f957ce8afab37b0616d79d1333be4bd596d23adb
+Author: Enrico Tröger <enrico.troeger at uvena.de>
+Date:   Tue Nov 17 20:45:47 2009 +0100
+
+    Explicitly check for and link against libX11
+
+diff --git a/configure.in b/configure.in
+index 44935cc..ab20027 100644
+--- a/configure.in
++++ b/configure.in
+@@ -35,6 +35,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0.0])
++XDT_CHECK_PACKAGE([X11], [x11])
+ 
+ dnl check for debugging support
+ XDT_FEATURE_DEBUG()
+diff --git a/panel-plugin/Makefile.in b/panel-plugin/Makefile.in
+index b32f89e..9b83fc9 100644
+--- a/panel-plugin/Makefile.in
++++ b/panel-plugin/Makefile.in
+@@ -17,6 +17,7 @@ xfce4_dict_plugin_LDADD =						\
+ 	$(LIBXFCE4PANEL_LIBS)						\
+ 	$(LIBXFCEGUI4_LIBS)							\
+ 	@GTHREAD_LIBS@								\
++	@X11_LIBS@								\
+ 	$(top_builddir)/lib/libdict.la
+ 
+ 
+diff --git a/src/Makefile.in b/src/Makefile.in
+index b9af15f..50d2510 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -19,6 +19,7 @@ xfce4_dict_LDADD =								\
+ 	$(LIBXFCE4UTIL_LIBS)						\
+ 	$(LIBXFCEGUI4_LIBS)							\
+ 	@GTHREAD_LIBS@								\
++	@X11_LIBS@								\
+ 	$(top_builddir)/lib/libdict.la
+ 
+ 

Added: goodies/trunk/xfce4-dict/debian/source/format
===================================================================
--- goodies/trunk/xfce4-dict/debian/source/format	                        (rev 0)
+++ goodies/trunk/xfce4-dict/debian/source/format	2009-12-31 11:06:48 UTC (rev 3744)
@@ -0,0 +1 @@
+3.0 (quilt)