[med-svn] r1364 - in trunk/packages/phylip/trunk/debian: . patches
tille at alioth.debian.org
tille at alioth.debian.org
Tue Feb 12 17:36:30 UTC 2008
Author: tille
Date: 2008-02-12 17:36:29 +0000 (Tue, 12 Feb 2008)
New Revision: 1364
Added:
trunk/packages/phylip/trunk/debian/patches/01_Makefile.patch
trunk/packages/phylip/trunk/debian/patches/01_src_Makefile.patch
trunk/packages/phylip/trunk/debian/patches/01_src_phylip_h
trunk/packages/phylip/trunk/debian/patches/series
Removed:
trunk/packages/phylip/trunk/debian/patches/Makefile.diff
trunk/packages/phylip/trunk/debian/patches/src_Makefile.diff
trunk/packages/phylip/trunk/debian/patches/src_phylip_h.diff
Modified:
trunk/packages/phylip/trunk/debian/changelog
trunk/packages/phylip/trunk/debian/control
trunk/packages/phylip/trunk/debian/rules
Log:
Switched to quilt
Modified: trunk/packages/phylip/trunk/debian/changelog
===================================================================
--- trunk/packages/phylip/trunk/debian/changelog 2008-02-12 16:33:53 UTC (rev 1363)
+++ trunk/packages/phylip/trunk/debian/changelog 2008-02-12 17:36:29 UTC (rev 1364)
@@ -10,8 +10,9 @@
* Standards-Version: 3.7.3 (no changes needed)
* Homepage: http://evolution.genetics.washington.edu/phylip.html
* Conversion of debian/copyright to UTF8
+ * Make use of quilt instead of simplepatchsys
- -- Andreas Tille <tille at debian.org> Mon, 28 Jan 2008 07:38:51 +0100
+ -- Andreas Tille <tille at debian.org> Tue, 12 Feb 2008 18:29:32 +0100
phylip (1:3.67-1) unstable; urgency=low
Modified: trunk/packages/phylip/trunk/debian/control
===================================================================
--- trunk/packages/phylip/trunk/debian/control 2008-02-12 16:33:53 UTC (rev 1363)
+++ trunk/packages/phylip/trunk/debian/control 2008-02-12 17:36:29 UTC (rev 1364)
@@ -2,13 +2,14 @@
Section: non-free/science
Priority: optional
Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
+XS-DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), patchutils (>= 0.2.25), debhelper (>= 5), libx11-dev, libxt-dev, libxaw7-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), patchutils (>= 0.2.25), debhelper (>= 5),
+ quilt, libx11-dev, libxt-dev, libxaw7-dev
Standards-Version: 3.7.3
Homepage: http://evolution.genetics.washington.edu/phylip.html
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/phylip/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/phylip/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/phylip
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/phylip
Package: phylip
Section: non-free/science
Added: trunk/packages/phylip/trunk/debian/patches/01_Makefile.patch
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/01_Makefile.patch (rev 0)
+++ trunk/packages/phylip/trunk/debian/patches/01_Makefile.patch 2008-02-12 17:36:29 UTC (rev 1364)
@@ -0,0 +1,28 @@
+--- /dev/null
++++ phylip-3.67/Makefile
+@@ -0,0 +1,25 @@
++# Wrapper Makefile to simplify use of cdbs
++# Copyright: Andreas Tille <tille at debian.org>; GPL
++
++all:
++ cd src; make all
++
++install:
++ cd src; make install CFLAGS="-g -O3 -fomit-frame-pointer" DATADIR=../fonts
++
++put:
++ cd src; make put
++
++clean:
++ cd src; make clean
++
++# Does not help for cdbs because patches are reverted before calling dh_clean
++# So exe/* is removed in debian/rules
++#distclean:
++# make clean
++# rm -f exe/*
++
++test:
++
++dnaml:
++ cd src; make dnaml
Added: trunk/packages/phylip/trunk/debian/patches/01_src_Makefile.patch
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/01_src_Makefile.patch (rev 0)
+++ trunk/packages/phylip/trunk/debian/patches/01_src_Makefile.patch 2008-02-12 17:36:29 UTC (rev 1364)
@@ -0,0 +1,37 @@
+--- phylip-3.67.orig/src/Makefile
++++ phylip-3.67/src/Makefile
+@@ -45,6 +45,7 @@
+ #
+ # the following specifies the directory where the executables will be placed
+ EXEDIR = ../exe
++DATADIR = ../exe
+ #
+ # ----------------------------------------------------------------------------
+ #
+@@ -189,8 +190,10 @@
+ @echo "Installing PHYLIP v3.6 binaries in $(EXEDIR)"
+ @mkdir -p $(EXEDIR)
+ @cp $(PROGS) $(EXEDIR)
+- @echo "Installing font files in $(EXEDIR)"
+- @cp font* $(EXEDIR)
++ @echo "Installing font files in $(DATADIR)"
++ @mkdir -p $(DATADIR)
++ @cp font* $(DATADIR)
++ @cd $(DATADIR) && ln -s font1 fontfile
+ @echo "Finished installation."
+ @echo ""
+
+@@ -207,6 +210,13 @@
+ @echo "Finished cleanup."
+ @echo ""
+
++distclean:
++ @make clean
++ @echo "Removing executables"
++ @rm -rf $(EXEDIR) $(DATADIR)
++ @echo "Finaly removed all executable files."
++ @echo ""
++
+ #
+ # compile object files shared between programs
+ # (make's implicit rule for %.o will take care of these)
Added: trunk/packages/phylip/trunk/debian/patches/01_src_phylip_h
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/01_src_phylip_h (rev 0)
+++ trunk/packages/phylip/trunk/debian/patches/01_src_phylip_h 2008-02-12 17:36:29 UTC (rev 1364)
@@ -0,0 +1,11 @@
+--- phylip-3.67.orig/src/phylip.h
++++ phylip-3.67/src/phylip.h
+@@ -72,7 +72,7 @@
+ #define EBCDIC false
+ #define INFILE "infile"
+ #define OUTFILE "outfile"
+-#define FONTFILE "fontfile" /* on unix this might be /usr/local/lib/fontfile */
++#define FONTFILE "/usr/share/phylip/fontfile" /* on unix this might be /usr/local/lib/fontfile */
+ #define PLOTFILE "plotfile"
+ #define INTREE "intree"
+ #define INTREE2 "intree2"
Deleted: trunk/packages/phylip/trunk/debian/patches/Makefile.diff
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/Makefile.diff 2008-02-12 16:33:53 UTC (rev 1363)
+++ trunk/packages/phylip/trunk/debian/patches/Makefile.diff 2008-02-12 17:36:29 UTC (rev 1364)
@@ -1,28 +0,0 @@
---- Makefile.orig 2006-08-04 08:39:03.000000000 +0200
-+++ Makefile 2006-08-04 08:52:32.000000000 +0200
-@@ -0,0 +1,25 @@
-+# Wrapper Makefile to simplify use of cdbs
-+# Copyright: Andreas Tille <tille at debian.org>; GPL
-+
-+all:
-+ cd src; make all
-+
-+install:
-+ cd src; make install CFLAGS="-g -O3 -fomit-frame-pointer" DATADIR=../fonts
-+
-+put:
-+ cd src; make put
-+
-+clean:
-+ cd src; make clean
-+
-+# Does not help for cdbs because patches are reverted before calling dh_clean
-+# So exe/* is removed in debian/rules
-+#distclean:
-+# make clean
-+# rm -f exe/*
-+
-+test:
-+
-+dnaml:
-+ cd src; make dnaml
Added: trunk/packages/phylip/trunk/debian/patches/series
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/series (rev 0)
+++ trunk/packages/phylip/trunk/debian/patches/series 2008-02-12 17:36:29 UTC (rev 1364)
@@ -0,0 +1,3 @@
+01_Makefile.patch
+01_src_Makefile.patch
+01_src_phylip_h
Deleted: trunk/packages/phylip/trunk/debian/patches/src_Makefile.diff
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/src_Makefile.diff 2008-02-12 16:33:53 UTC (rev 1363)
+++ trunk/packages/phylip/trunk/debian/patches/src_Makefile.diff 2008-02-12 17:36:29 UTC (rev 1364)
@@ -1,37 +0,0 @@
---- src/Makefile.orig 2007-07-24 00:12:22.000000000 +0200
-+++ src/Makefile 2007-09-03 09:59:23.000000000 +0200
-@@ -45,6 +45,7 @@
- #
- # the following specifies the directory where the executables will be placed
- EXEDIR = ../exe
-+DATADIR = ../exe
- #
- # ----------------------------------------------------------------------------
- #
-@@ -189,8 +190,10 @@
- @echo "Installing PHYLIP v3.6 binaries in $(EXEDIR)"
- @mkdir -p $(EXEDIR)
- @cp $(PROGS) $(EXEDIR)
-- @echo "Installing font files in $(EXEDIR)"
-- @cp font* $(EXEDIR)
-+ @echo "Installing font files in $(DATADIR)"
-+ @mkdir -p $(DATADIR)
-+ @cp font* $(DATADIR)
-+ @cd $(DATADIR) && ln -s font1 fontfile
- @echo "Finished installation."
- @echo ""
-
-@@ -207,6 +210,13 @@
- @echo "Finished cleanup."
- @echo ""
-
-+distclean:
-+ @make clean
-+ @echo "Removing executables"
-+ @rm -rf $(EXEDIR) $(DATADIR)
-+ @echo "Finaly removed all executable files."
-+ @echo ""
-+
- #
- # compile object files shared between programs
- # (make's implicit rule for %.o will take care of these)
Deleted: trunk/packages/phylip/trunk/debian/patches/src_phylip_h.diff
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/src_phylip_h.diff 2008-02-12 16:33:53 UTC (rev 1363)
+++ trunk/packages/phylip/trunk/debian/patches/src_phylip_h.diff 2008-02-12 17:36:29 UTC (rev 1364)
@@ -1,11 +0,0 @@
---- src/phylip.h.orig 2005-08-25 23:48:38.000000000 +0200
-+++ src/phylip.h 2006-08-05 23:00:22.000000000 +0200
-@@ -64,7 +64,7 @@
- #define EBCDIC false
- #define INFILE "infile"
- #define OUTFILE "outfile"
--#define FONTFILE "fontfile" /* on unix this might be /usr/local/lib/fontfile */
-+#define FONTFILE "/usr/share/phylip/fontfile" /* on unix this might be /usr/local/lib/fontfile */
- #define PLOTFILE "plotfile"
- #define INTREE "intree"
- #define INTREE2 "intree2"
Modified: trunk/packages/phylip/trunk/debian/rules
===================================================================
--- trunk/packages/phylip/trunk/debian/rules 2008-02-12 16:33:53 UTC (rev 1363)
+++ trunk/packages/phylip/trunk/debian/rules 2008-02-12 17:36:29 UTC (rev 1364)
@@ -2,7 +2,7 @@
# debian/rules for phylip using cdbs
# Andreas Tille <tille at debian.org>, GPL
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/perlmodule.mk
More information about the debian-med-commit
mailing list