[med-svn] r18059 - in trunk/packages/phylip/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-09-17 18:07:51 +0000 (Wed, 17 Sep 2014)
New Revision: 18059

Modified:
   trunk/packages/phylip/trunk/debian/changelog
   trunk/packages/phylip/trunk/debian/control
   trunk/packages/phylip/trunk/debian/patches/01_src_phylip_h
   trunk/packages/phylip/trunk/debian/patches/hardening.patch
   trunk/packages/phylip/trunk/debian/patches/install_fonts_data.patch
Log:
New upstream version now with ***free*** ***license*** (finally)


Modified: trunk/packages/phylip/trunk/debian/changelog
===================================================================
--- trunk/packages/phylip/trunk/debian/changelog	2014-09-17 11:58:10 UTC (rev 18058)
+++ trunk/packages/phylip/trunk/debian/changelog	2014-09-17 18:07:51 UTC (rev 18059)
@@ -1,3 +1,9 @@
+phylip (1:3.696-1) UNRELEASED; urgency=medium
+
+  * New upstream version now with free license
+
+ -- Andreas Tille <tille at debian.org>  Wed, 17 Sep 2014 19:35:06 +0200
+
 phylip (1:3.695-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/phylip/trunk/debian/control
===================================================================
--- trunk/packages/phylip/trunk/debian/control	2014-09-17 11:58:10 UTC (rev 18058)
+++ trunk/packages/phylip/trunk/debian/control	2014-09-17 18:07:51 UTC (rev 18059)
@@ -2,7 +2,7 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>,
            Manuel Prinz <manuel at debian.org>
-Section: non-free/science
+Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
                libx11-dev,
@@ -30,7 +30,7 @@
 
 Package: phylip-doc
 Architecture: all
-Section: non-free/doc
+Section: doc
 Depends: ${misc:Depends}
 Suggests: phylip
 Description: package of programs for inferring phylogenies (documentation)

Modified: trunk/packages/phylip/trunk/debian/patches/01_src_phylip_h
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/01_src_phylip_h	2014-09-17 11:58:10 UTC (rev 18058)
+++ trunk/packages/phylip/trunk/debian/patches/01_src_phylip_h	2014-09-17 18:07:51 UTC (rev 18059)
@@ -2,9 +2,9 @@
 Forwarded: No
 Description: Debian keeps the font files in a different location than normal installer
 License: see debian/copyright 
---- a/src/phylip.h
-+++ b/src/phylip.h
-@@ -72,7 +72,7 @@ void phyFillScreenColor(void);
+--- phylip-3.696.orig/src/phylip.h
++++ phylip-3.696/src/phylip.h
+@@ -96,7 +96,7 @@
  #define EBCDIC false
  #define INFILE "infile"
  #define OUTFILE "outfile"

Modified: trunk/packages/phylip/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/hardening.patch	2014-09-17 11:58:10 UTC (rev 18058)
+++ trunk/packages/phylip/trunk/debian/patches/hardening.patch	2014-09-17 18:07:51 UTC (rev 18059)
@@ -2,9 +2,9 @@
 LastChanged: Wed, 07 Aug 2013 22:17:03 +0200
 Description: Let hardening flags sneek in
 
---- a/src/Makefile.unx
-+++ b/src/Makefile.unx
-@@ -126,7 +126,7 @@ DFLAGS = $(CFLAGS)
+--- phylip-3.696.orig/src/Makefile.unx
++++ phylip-3.696/src/Makefile.unx
+@@ -126,7 +126,7 @@
  #
  # Most of the programs need only the math libraries, specified like this;
  #
@@ -13,7 +13,7 @@
  #
  # The drawing programs may also need access to the graphics libraries. This is
  # specified with the DLIBS variable.
-@@ -380,7 +380,7 @@ drawgram:     drawgram.o draw.o draw2.o
+@@ -367,7 +367,7 @@
  	
  # needed by java	
  libdrawgram.so:   drawgram.o draw.o draw2.o phylip.o
@@ -22,7 +22,7 @@
  
  drawtree.o:     drawtree.c draw.h phylip.h
  	$(CC) $(DFLAGS)  -shared -fPIC -c drawtree.c
-@@ -390,7 +390,7 @@ drawtree:     drawtree.o draw.o draw2.o
+@@ -377,7 +377,7 @@
  
  # needed by java	
  libdrawtree.so:     drawtree.o draw.o draw2.o phylip.o

Modified: trunk/packages/phylip/trunk/debian/patches/install_fonts_data.patch
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/install_fonts_data.patch	2014-09-17 11:58:10 UTC (rev 18058)
+++ trunk/packages/phylip/trunk/debian/patches/install_fonts_data.patch	2014-09-17 18:07:51 UTC (rev 18059)
@@ -3,9 +3,9 @@
 Description: Debian keeps the font files in a different location than normal installer;
  distclean target makes sure everything will be cleaned up
 
---- a/src/Makefile.unx
-+++ b/src/Makefile.unx
-@@ -51,6 +51,7 @@ VERSION=3.695
+--- phylip-3.696.orig/src/Makefile.unx
++++ phylip-3.696/src/Makefile.unx
+@@ -51,6 +51,7 @@
  #
  # the following specifies the directory where the executables will be placed
  EXEDIR  = ../exe
@@ -13,7 +13,7 @@
  #
  # ----------------------------------------------------------------------------
  #
-@@ -235,8 +236,10 @@ put:
+@@ -228,8 +229,10 @@
  	@cp $(DYLIBS) $(EXEDIR)
  	@echo "Installing jar files in $(EXEDIR)"
  	@cp $(JARS) $(EXEDIR)
@@ -23,10 +23,10 @@
 +	@mkdir -p $(DATADIR)
 +	@cp font* $(DATADIR)
 +	@cd $(DATADIR) && ln -s font1 fontfile
- 	@echo "Copying testdata files to $(EXEDIR)/testdata/..."
- 	mkdir $(EXEDIR)/testdata
- 	for i in $(TESTDIR); do \
-@@ -259,6 +262,12 @@ clean:
+ 	@echo "Finished installation."
+ 	@echo ""
+ 
+@@ -246,6 +249,12 @@
  	@echo "Finished cleanup."
  	@echo ""