[med-svn] r3135 - trunk/packages/njplot/trunk/debian

[plessy at alioth.debian.org]

Author: plessy
Date: 2009-02-25 04:49:29 +0000 (Wed, 25 Feb 2009)
New Revision: 3135

Removed:
   trunk/packages/njplot/trunk/debian/get-orig-source
Modified:
   trunk/packages/njplot/trunk/debian/changelog
   trunk/packages/njplot/trunk/debian/control
   trunk/packages/njplot/trunk/debian/rules
Log:
Cosmetic work and minor fixes.

 * debian/control:
   - Mention that the trees are phylogenetic and in Newick format.
     Closes: #517010
   - Added missing comma in the Depends field.
 * debian/get-orig-source: obsolete, removed. (Also in debian/rules).


Modified: trunk/packages/njplot/trunk/debian/changelog
===================================================================
--- trunk/packages/njplot/trunk/debian/changelog	2009-02-23 08:08:23 UTC (rev 3134)
+++ trunk/packages/njplot/trunk/debian/changelog	2009-02-25 04:49:29 UTC (rev 3135)
@@ -1,3 +1,13 @@
+njplot (2.3-2) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Mention that the trees are phylogenetic and in Newick format.
+      Closes: #517010
+    - Added missing comma in the Depends field.
+  * debian/get-orig-source: obsolete, removed. (Also in debian/rules).
+
+ -- Charles Plessy <plessy at debian.org>  Wed, 25 Feb 2009 13:12:50 +0900
+
 njplot (2.3-1) unstable; urgency=low
 
   * New upstream release: NJplot can draw multibranched trees with or without

Modified: trunk/packages/njplot/trunk/debian/control
===================================================================
--- trunk/packages/njplot/trunk/debian/control	2009-02-23 08:08:23 UTC (rev 3134)
+++ trunk/packages/njplot/trunk/debian/control	2009-02-25 04:49:29 UTC (rev 3135)
@@ -12,9 +12,9 @@
 
 Package: njplot
 Architecture: any
-Depends: ${shlibs:Depends} ${misc:Depends}
-Description: A tree drawing program
- NJplot is able to draw any tree expressed  in the standard
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A phylogenetic tree drawing program
+ NJplot is able to draw any dendrogram expressed in the Newick standard
  phylogenetic tree format (e.g., the format used by the Phylip package).
  NJplot is especially convenient for rooting the unrooted trees
  obtained from parsimony, distance or maximum likelihood tree-building

Deleted: trunk/packages/njplot/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/njplot/trunk/debian/get-orig-source	2009-02-23 08:08:23 UTC (rev 3134)
+++ trunk/packages/njplot/trunk/debian/get-orig-source	2009-02-25 04:49:29 UTC (rev 3135)
@@ -1,42 +0,0 @@
-#!/bin/sh -e
-echo This is outdated, because upstream switched to proper version numbering
-exit
-
-NAME=njplot
-UTARBALL="$NAME"-unrooted.tar
-rm -rf tmp
-mkdir -p tmp
-cd tmp
-wget --quiet ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/"$NAME"/"$UTARBALL"
-tar -xf "$UTARBALL"
-rm -f  "$UTARBALL"
-VERSION=`ls -lt | grep '^.rw.r' | sed -e '2,$d' -e 's/^.[-rwxr]\{9\} [0-9] \w\+ \w\+[[:space:]]\+[0-9]\+ \([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/0.\1\2\3/'`
-mkdir "$NAME"-"$VERSION"
-mv *.c makefile "$NAME"-"$VERSION"
-cd "$NAME"-"$VERSION"
-
-MOREFILES="$NAME.help README bigtest.phb multi.phb test.ph"
-for mf in $MOREFILES ; do
-    wget --quiet ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/"$NAME"/$mf
-done
-
-wget --quiet http://pbil.univ-lyon1.fr/software/njplot.html
-wget --quiet http://pbil.univ-lyon1.fr/binaries/njplot.gif
-wget --quiet http://pbil.univ-lyon1.fr/help/helpers.html
-sed -e '/<TABLE BORDER=4 CELLPADDING=8>/,/<\/TABLE>/d' njplot.html \
-    -e 's/"\/binaries\/\(njplot.gif"\)/"\1/' \
-    -e 's/"\/help\/\(helpers.html"\)/"\1/' \
-    -e 's/"\(\/comments.html"\)/"http:\/\/pbil.univ-lyon1.fr\1/' \
-    -e 's/"\(\/pbil.html">\)<IMG SRC="\/binaries\/home.gif">/"http:\/\/pbil.univ-lyon1.fr\1PBIL home page/' \
-    -e '/<I>Back to PBIL home page<\/I>/d' \
- > njplot_.html
-touch -r njplot.html njplot_.html
-mv njplot_.html njplot.html
-
-cd ..
-
-GZIP=-9 tar -czf "$NAME"_"$VERSION".orig.tar.gz "$NAME"-"$VERSION"
-
-mv "$NAME"_"$VERSION".orig.tar.gz ..
-cd ..
-rm -rf tmp

Modified: trunk/packages/njplot/trunk/debian/rules
===================================================================
--- trunk/packages/njplot/trunk/debian/rules	2009-02-23 08:08:23 UTC (rev 3134)
+++ trunk/packages/njplot/trunk/debian/rules	2009-02-25 04:49:29 UTC (rev 3135)
@@ -12,9 +12,6 @@
 
 DEB_OPT_FLAG +=-c -I/usr/include/ncbi -DNO_PDF -DWIN_MOTIF -DHELPFILENAME=\\\"/usr/share/njplot/njplot.help\\\"
 
-get-orig-source:
-	. debian/get-orig-source
-
 # in case the original makefile is in place which has no clean target
 #clean::
 #	rm -f *.o njplot unrooted newicktops newicktotxt add_root