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

[manuel at alioth.debian.org]

Author: manuel
Date: 2008-10-31 14:53:39 +0000 (Fri, 31 Oct 2008)
New Revision: 2602

Removed:
   trunk/packages/phylip/trunk/debian/patches/01_Makefile.patch
Modified:
   trunk/packages/phylip/trunk/debian/patches/series
   trunk/packages/phylip/trunk/debian/rules
Log:
Removed wrapper Makefile patch, CDBS can handle that


Deleted: trunk/packages/phylip/trunk/debian/patches/01_Makefile.patch
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/01_Makefile.patch	2008-10-31 11:41:59 UTC (rev 2601)
+++ trunk/packages/phylip/trunk/debian/patches/01_Makefile.patch	2008-10-31 14:53:39 UTC (rev 2602)
@@ -1,28 +0,0 @@
---- /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

Modified: trunk/packages/phylip/trunk/debian/patches/series
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/series	2008-10-31 11:41:59 UTC (rev 2601)
+++ trunk/packages/phylip/trunk/debian/patches/series	2008-10-31 14:53:39 UTC (rev 2602)
@@ -1,4 +1,3 @@
-01_Makefile.patch
-01_src_Makefile.patch
+01_src_Makefile.patch 
 01_src_phylip_h
 02_src_cons_h

Modified: trunk/packages/phylip/trunk/debian/rules
===================================================================
--- trunk/packages/phylip/trunk/debian/rules	2008-10-31 11:41:59 UTC (rev 2601)
+++ trunk/packages/phylip/trunk/debian/rules	2008-10-31 14:53:39 UTC (rev 2602)
@@ -4,14 +4,12 @@
 
 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
+include /usr/share/cdbs/1/class/makefile.mk
 
-# dh_clean expects a Makefile which was just removed by redoing the patches ...
-# This hack circumvents the problem
-clean::
-	rm -fr exe/* fonts
+DEB_MAKE_BUILD_TARGET   := all
+DEB_MAKE_INSTALL_TARGET := install
 
-#	cd src; $(MAKE) install CFLAGS="-g -O3 -fomit-frame-pointer" DATADIR=../fonts
-#	cd src; $(MAKE) distclean DATADIR=../fonts
-#	dh_install -i --exclude $(pkg).html
-#	sed 's?"doc/?"html/?g' doc/$(pkg).html > debian/$(pkg)/usr/share/doc/$(pkg)/$(pkg).html
+DEB_BUILDDIR := src
+
+clean::
+	rm -fr exe/* fonts/