[med-svn] r6105 - in trunk/packages/acedb/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2011-02-28 07:35:32 +0000 (Mon, 28 Feb 2011)
New Revision: 6105

Added:
   trunk/packages/acedb/trunk/debian/patches/binutils-gold.patch
Modified:
   trunk/packages/acedb/trunk/debian/changelog
   trunk/packages/acedb/trunk/debian/patches/series
   trunk/packages/acedb/trunk/debian/watch
Log:
Applied Ubuntu patch to fix #615690, dversionmangle in debian/watch


Modified: trunk/packages/acedb/trunk/debian/changelog
===================================================================
--- trunk/packages/acedb/trunk/debian/changelog	2011-02-28 07:14:39 UTC (rev 6104)
+++ trunk/packages/acedb/trunk/debian/changelog	2011-02-28 07:35:32 UTC (rev 6105)
@@ -1,3 +1,19 @@
+acedb (4.9.39+dfsg.01-2) unstable; urgency=low
+
+  * Applied Ubuntu patch to Debian packaging (thanks to
+    Fabrice Coutadeur)
+    Closes: #615690
+  * debian/watch: mangle version with dfsg
+
+ -- Andreas Tille <tille at debian.org>  Mon, 28 Feb 2011 08:25:33 +0100
+
+acedb (4.9.39+dfsg.01-1ubuntu1) natty; urgency=low
+
+  * binutils-gold.patch: patch wmake/LINUX_64_DEF and wmake/LINUX_$_DEF to add
+    explicit link with libX11. This fixes a FTBFS with binutils-gold.
+
+ -- Fabrice Coutadeur <fabricesp at ubuntu.com>  Fri, 05 Nov 2010 06:09:02 +0000
+
 acedb (4.9.39+dfsg.01-1) unstable; urgency=low
 
   * Corrected for rfc files had somehow sneaked into the uploaded

Added: trunk/packages/acedb/trunk/debian/patches/binutils-gold.patch
===================================================================
--- trunk/packages/acedb/trunk/debian/patches/binutils-gold.patch	                        (rev 0)
+++ trunk/packages/acedb/trunk/debian/patches/binutils-gold.patch	2011-02-28 07:35:32 UTC (rev 6105)
@@ -0,0 +1,27 @@
+Description: add explicit link with libX11 as this is required by libgex.a.
+ This fix a FTBFS with binutils-gold with the following error:
+ "./libgex.a(graphgdkremote.o): undefined reference to symbol 'XFree'"
+Author: Fabrice Coutadeur <fabricesp at ubuntu.com>
+
+--- acedb-4.9.39+dfsg.01.orig/wmake/LINUX_4_DEF
++++ acedb-4.9.39+dfsg.01/wmake/LINUX_4_DEF
+@@ -28,7 +28,7 @@ COMPILER = gcc $(COPT) -Wall  -DACEDB4 `
+ LINKER = gcc $(COPT)
+ 
+ # The arg to libs-config is used if our private copy not installed.
+-LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` -lm -lcurses -lreadline
++LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` -lm -lcurses -lreadline -lX11
+ 
+ ### Linux uses flex to emulate the standard 'lex' program
+ LEX_LIBS = -lfl
+--- acedb-4.9.39+dfsg.01.orig/wmake/LINUX_64_DEF
++++ acedb-4.9.39+dfsg.01/wmake/LINUX_64_DEF
+@@ -28,7 +28,7 @@ COMPILER = gcc $(COPT) -Wall  -DACEDB4 `
+ LINKER = gcc $(COPT)
+ 
+ # The arg to libs-config is used if our private copy not installed.
+-LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` -lm -lcurses -lreadline
++LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` -lm -lcurses -lreadline -lX11
+ 
+ ### Linux uses flex to emulate the standard 'lex' program
+ LEX_LIBS = -lfl

Modified: trunk/packages/acedb/trunk/debian/patches/series
===================================================================
--- trunk/packages/acedb/trunk/debian/patches/series	2011-02-28 07:14:39 UTC (rev 6104)
+++ trunk/packages/acedb/trunk/debian/patches/series	2011-02-28 07:35:32 UTC (rev 6105)
@@ -2,3 +2,4 @@
 belvu_help.patch
 efetch_help.patch
 dotter_help.patch
+binutils-gold.patch

Modified: trunk/packages/acedb/trunk/debian/watch
===================================================================
--- trunk/packages/acedb/trunk/debian/watch	2011-02-28 07:14:39 UTC (rev 6104)
+++ trunk/packages/acedb/trunk/debian/watch	2011-02-28 07:35:32 UTC (rev 6105)
@@ -1,2 +1,3 @@
 version=3
-ftp://ftp.sanger.ac.uk/pub/acedb/SUPPORTED/ACEDB-source\.([0-9.]+)\.tar\.gz
+opts=dversionmangle=s/\+dfsg.*$// \
+    ftp://ftp.sanger.ac.uk/pub/acedb/SUPPORTED/ACEDB-source\.([0-9.]+)\.tar\.gz