[med-svn] r1415 - trunk/packages/clustalw/trunk/debian

[charles-guest at alioth.debian.org]

Author: charles-guest
Date: 2008-02-18 01:50:29 +0000 (Mon, 18 Feb 2008)
New Revision: 1415

Removed:
   trunk/packages/clustalw/trunk/debian/compat
Modified:
   trunk/packages/clustalw/trunk/debian/changelog
   trunk/packages/clustalw/trunk/debian/clustalw.docs
   trunk/packages/clustalw/trunk/debian/control
   trunk/packages/clustalw/trunk/debian/rules
Log:
switched to CDBS

Modified: trunk/packages/clustalw/trunk/debian/changelog
===================================================================
--- trunk/packages/clustalw/trunk/debian/changelog	2008-02-17 19:35:35 UTC (rev 1414)
+++ trunk/packages/clustalw/trunk/debian/changelog	2008-02-18 01:50:29 UTC (rev 1415)
@@ -2,28 +2,24 @@
 
   [ Steffen Moeller ]
   * New upstream release
+    - Includes new code for UPGMA guide trees.
+    - Includes iterative alignment facility.
   * updated debian/watch
   * moved clustalw.1 into debian folder (easier to work
     with svn-buildpackage)
   * removed README and LICENSE from svn since these are
     now distributed with the upstream sources
 
- -- Steffen Moeller <moeller at debian.org>  Sun, 17 Feb 2008 15:18:34 +0100
-
-clustalw (2.0-1) UNRELEASED; urgency=low
-
   [ Charles Plessy ]
-  * New upstream release:
-    - Includes new code for UPGMA guide trees.
-    - Includes iterative alignment facility.
   * debian/copyright made machine-readable.
   * Clustal X is now built in a separate source package.
+  * Switched to CDBS.
 
   [ David Paleino ]
   * debian/control:
     - fixed Debian capitalisation (see bug #456582)
 
- -- David Paleino <d.paleino at gmail.com>  Tue, 29 Jan 2008 20:48:21 +0100
+ -- Steffen Moeller <moeller at debian.org>  Sun, 17 Feb 2008 15:18:34 +0100
 
 clustalw (1.83-3) unstable; urgency=low
 

Modified: trunk/packages/clustalw/trunk/debian/clustalw.docs
===================================================================
--- trunk/packages/clustalw/trunk/debian/clustalw.docs	2008-02-17 19:35:35 UTC (rev 1414)
+++ trunk/packages/clustalw/trunk/debian/clustalw.docs	2008-02-18 01:50:29 UTC (rev 1415)
@@ -1 +1,2 @@
 README
+LICENSE

Deleted: trunk/packages/clustalw/trunk/debian/compat
===================================================================
--- trunk/packages/clustalw/trunk/debian/compat	2008-02-17 19:35:35 UTC (rev 1414)
+++ trunk/packages/clustalw/trunk/debian/compat	2008-02-18 01:50:29 UTC (rev 1415)
@@ -1 +0,0 @@
-5

Modified: trunk/packages/clustalw/trunk/debian/control
===================================================================
--- trunk/packages/clustalw/trunk/debian/control	2008-02-17 19:35:35 UTC (rev 1414)
+++ trunk/packages/clustalw/trunk/debian/control	2008-02-18 01:50:29 UTC (rev 1415)
@@ -4,7 +4,7 @@
 Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Steffen Moeller <moeller at debian.org>, Charles Plessy <charles-debian-nospam at plessy.org>
-Build-Depends: debhelper (>= 5), quilt
+Build-Depends: debhelper (>= 5), cdbs, autotools-dev
 Standards-Version: 3.7.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/clustalw/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/clustalw/trunk/

Modified: trunk/packages/clustalw/trunk/debian/rules
===================================================================
--- trunk/packages/clustalw/trunk/debian/rules	2008-02-17 19:35:35 UTC (rev 1414)
+++ trunk/packages/clustalw/trunk/debian/rules	2008-02-18 01:50:29 UTC (rev 1415)
@@ -1,60 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
-configure-stamp: config.status
-config.status:
-	./configure --prefix=/usr
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean build-stamp
-
-install:
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
+install/clustalw::
 	# could anyone fix this and send this to upstream, please?
-	#$(MAKE) PREFIX=$(CURDIR)/debian/clustalw/usr install
-	cp src/clustalw2 $(CURDIR)/debian/clustalw/usr/bin/clustalw
-	dh_install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	@if [ -d tests.clustalw ]; then \
-		dh_installexamples; \
-	else \
-		echo "** Could not find folder with examples - you are just testing, right? **"; \
-	fi
-	dh_installmenu
-	dh_desktop
-	dh_installmime
-	dh_installman
-	dh_installchangelogs
-	dh_strip
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch
-binary-indep: # does nothing
-.PHONY: build clean binary-arch binary install
+	mv $(CURDIR)/debian/clustalw/usr/bin/clustalw2 $(CURDIR)/debian/clustalw/usr/bin/clustalw