[med-svn] r6059 - in trunk/packages/njplot/trunk/debian: . patches source

[Andreas Tille]

Author: tille
Date: 2011-02-22 12:41:48 +0000 (Tue, 22 Feb 2011)
New Revision: 6059

Added:
   trunk/packages/njplot/trunk/debian/patches/
   trunk/packages/njplot/trunk/debian/patches/no_unneded_libs.patch
   trunk/packages/njplot/trunk/debian/patches/series
   trunk/packages/njplot/trunk/debian/source/
   trunk/packages/njplot/trunk/debian/source/format
Modified:
   trunk/packages/njplot/trunk/debian/changelog
   trunk/packages/njplot/trunk/debian/control
   trunk/packages/njplot/trunk/debian/rules
Log:
Fix FTBFS bug:

    WARNING: cdbs variable DEB_OPT_FLAG is deprecated and this also caused the bug in epcr (I just noticed to late)

Some polishing of package (source version, standards-version)


Modified: trunk/packages/njplot/trunk/debian/changelog
===================================================================
--- trunk/packages/njplot/trunk/debian/changelog	2011-02-22 11:01:53 UTC (rev 6058)
+++ trunk/packages/njplot/trunk/debian/changelog	2011-02-22 12:41:48 UTC (rev 6059)
@@ -1,3 +1,14 @@
+njplot (2.3-3) unstable; urgency=low
+
+  * Standards-Version: 3.9.1 (no changes needed)
+  * debian/source/format: 3.0 (quilt)
+  * debian/rules: Do not use deprecated variable DEB_OPT_FLAG any
+    more but use CFLAGS instead
+    Closes: #614432
+  * debian/patches: Do not link against unused libs (X11, Xmu)
+
+ -- Andreas Tille <tille at debian.org>  Tue, 22 Feb 2011 13:15:08 +0100
+
 njplot (2.3-2) unstable; urgency=low
 
   * debian/control:

Modified: trunk/packages/njplot/trunk/debian/control
===================================================================
--- trunk/packages/njplot/trunk/debian/control	2011-02-22 11:01:53 UTC (rev 6058)
+++ trunk/packages/njplot/trunk/debian/control	2011-02-22 12:41:48 UTC (rev 6059)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>, Charles Plessy <plessy at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), libncbi6-dev, libvibrant6-dev, lesstif2-dev, libxt-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.9.1
 Homepage: http://pbil.univ-lyon1.fr/software/njplot.html
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/njplot/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/njplot/trunk/

Added: trunk/packages/njplot/trunk/debian/patches/no_unneded_libs.patch
===================================================================
--- trunk/packages/njplot/trunk/debian/patches/no_unneded_libs.patch	                        (rev 0)
+++ trunk/packages/njplot/trunk/debian/patches/no_unneded_libs.patch	2011-02-22 12:41:48 UTC (rev 6059)
@@ -0,0 +1,18 @@
+--- njplot-2.3.orig/makefile
++++ njplot-2.3/makefile
+@@ -37,13 +37,13 @@
+         -lvibrant -lncbi \
+         $(PDFLIB)   \
+         -L$(MOTIFLIB) -lXm  \
+-        -L/usr/X11R6/lib -lXmu -lXt -lX11 -lm
++        -L/usr/X11R6/lib -lXt -lm
+         
+ unrooted : $(OBJUNROOTED)
+ 	$(CC) -g -o unrooted $(OBJUNROOTED) \
+         -L$(VIBRANT)/lib -lvibrant -lncbi \
+         -L$(MOTIFLIB) -lXm \
+-        -L/usr/X11R6/lib -lXmu -lXt -lX11  -lm
++        -L/usr/X11R6/lib -lXt -lm
+ 
+ newicktops: njplot-vib.c
+ 	$(CC) -DNO_GUI  -DNO_PDF -o $@ njplot-vib.c -lm

Added: trunk/packages/njplot/trunk/debian/patches/series
===================================================================
--- trunk/packages/njplot/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/njplot/trunk/debian/patches/series	2011-02-22 12:41:48 UTC (rev 6059)
@@ -0,0 +1 @@
+no_unneded_libs.patch

Modified: trunk/packages/njplot/trunk/debian/rules
===================================================================
--- trunk/packages/njplot/trunk/debian/rules	2011-02-22 11:01:53 UTC (rev 6058)
+++ trunk/packages/njplot/trunk/debian/rules	2011-02-22 12:41:48 UTC (rev 6059)
@@ -10,8 +10,5 @@
 # so force distclean
 DEB_MAKE_CLEAN_TARGET = distclean
 
-DEB_OPT_FLAG +=-c -I/usr/include/ncbi -DNO_PDF -DWIN_MOTIF -DHELPFILENAME=\\\"/usr/share/njplot/njplot.help\\\"
+CFLAGS +=-c -I/usr/include/ncbi -DNO_PDF -DWIN_MOTIF -DHELPFILENAME=\\\"/usr/share/njplot/njplot.help\\\"
 
-# in case the original makefile is in place which has no clean target
-#clean::
-#	rm -f *.o njplot unrooted newicktops newicktotxt add_root

Added: trunk/packages/njplot/trunk/debian/source/format
===================================================================
--- trunk/packages/njplot/trunk/debian/source/format	                        (rev 0)
+++ trunk/packages/njplot/trunk/debian/source/format	2011-02-22 12:41:48 UTC (rev 6059)
@@ -0,0 +1 @@
+3.0 (quilt)