[med-svn] r4264 - trunk/packages/mustang/trunk/debian

Andreas Tille tille at alioth.debian.org
Wed Oct 28 20:27:13 UTC 2009


Author: tille
Date: 2009-10-28 20:27:13 +0000 (Wed, 28 Oct 2009)
New Revision: 4264

Added:
   trunk/packages/mustang/trunk/debian/mustang-testdata.install
   trunk/packages/mustang/trunk/debian/mustang.examples
Modified:
   trunk/packages/mustang/trunk/debian/changelog
   trunk/packages/mustang/trunk/debian/compat
   trunk/packages/mustang/trunk/debian/control
   trunk/packages/mustang/trunk/debian/rules
   trunk/packages/mustang/trunk/debian/watch
Log:
New upstream version, changed Uploader because of conflict between Morten and agressive upstream


Modified: trunk/packages/mustang/trunk/debian/changelog
===================================================================
--- trunk/packages/mustang/trunk/debian/changelog	2009-10-28 20:25:59 UTC (rev 4263)
+++ trunk/packages/mustang/trunk/debian/changelog	2009-10-28 20:27:13 UTC (rev 4264)
@@ -1,3 +1,17 @@
+mustang (3.2.1-1) unstable; urgency=low
+
+  * New upstream version
+  * Morten Kjeldgaard lost interest in this package because of
+    agressive upstream so I removed him from uploaders and added myself
+  * debhelper 7
+  * prefer single debhelper files in debian/ instead of using
+    arguments do debhelper scripts in the rules file which simplifies
+    transition to short rules file
+  * debian/watch: no uversionmangle which leads to wrong version
+    number
+
+ -- Andreas Tille <tille at debian.org>  Wed, 28 Oct 2009 19:59:33 +0100
+
 mustang (3.2.0-1) unstable; urgency=low
 
   * New upstream version.

Modified: trunk/packages/mustang/trunk/debian/compat
===================================================================
--- trunk/packages/mustang/trunk/debian/compat	2009-10-28 20:25:59 UTC (rev 4263)
+++ trunk/packages/mustang/trunk/debian/compat	2009-10-28 20:27:13 UTC (rev 4264)
@@ -1 +1 @@
-5
+7

Modified: trunk/packages/mustang/trunk/debian/control
===================================================================
--- trunk/packages/mustang/trunk/debian/control	2009-10-28 20:25:59 UTC (rev 4263)
+++ trunk/packages/mustang/trunk/debian/control	2009-10-28 20:27:13 UTC (rev 4264)
@@ -2,10 +2,10 @@
 Section: science
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Morten Kjeldgaard <mok0 at ubuntu.com>
+Uploaders: Andreas Tille <tille at debian.org>
 DM-Upload-Allowed: yes
 Homepage: http://www.cs.mu.oz.au/~arun/mustang/
-Build-Depends: debhelper (>= 5), quilt
+Build-Depends: debhelper (>= 7.1), quilt
 Standards-Version: 3.8.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mustang/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/mustang/trunk/
@@ -29,6 +29,7 @@
 Package: mustang-testdata
 Architecture: all
 Enhances: mustang
+Depends: ${misc:Depends}
 Description: multiple structural alignment of proteins, test data
  This package contains a larger set of test data than what
  comes with the binary package. 

Added: trunk/packages/mustang/trunk/debian/mustang-testdata.install
===================================================================
--- trunk/packages/mustang/trunk/debian/mustang-testdata.install	                        (rev 0)
+++ trunk/packages/mustang/trunk/debian/mustang-testdata.install	2009-10-28 20:27:13 UTC (rev 4264)
@@ -0,0 +1,2 @@
+data/test/pdbs/[0-9]*     usr/share/doc/mustang-testdata/examples/pdbs
+data/test/test_zf-CCHH    usr/share/doc/mustang-testdata/examples

Added: trunk/packages/mustang/trunk/debian/mustang.examples
===================================================================
--- trunk/packages/mustang/trunk/debian/mustang.examples	                        (rev 0)
+++ trunk/packages/mustang/trunk/debian/mustang.examples	2009-10-28 20:27:13 UTC (rev 4264)
@@ -0,0 +1,2 @@
+debian/runtest
+debian/test_zf-CCHH-small

Modified: trunk/packages/mustang/trunk/debian/rules
===================================================================
--- trunk/packages/mustang/trunk/debian/rules	2009-10-28 20:25:59 UTC (rev 4263)
+++ trunk/packages/mustang/trunk/debian/rules	2009-10-28 20:27:13 UTC (rev 4264)
@@ -1,86 +1,16 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; mode: font-lock  -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh --with quilt $@
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+override_dh_compress:
+	dh_compress -X.pdb
 
-include /usr/share/quilt/quilt.make
-
-CPPFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CPPFLAGS += -O0
-else
-	CPPFLAGS += -O2
-endif
-
-build: patch build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp:
-	dh_testdir
-
-	# Compile Mustang:
-	$(MAKE) CPPFLAGS="$(CPPFLAGS)"
-
-	touch $@
-
-build-indep: build-indep-stamp
-	# get rid of the test?.pdf files, they are not used
-	# in the example
-	rm -f test/data/pdbs/test*.pdb
-
-build-indep-stamp:
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp
-
-	# Clean up after the build process.
+override_dh_auto_clean:
 	rm -f obj/*.o
-	rm -f bin/mustang-3.2
-	dh_clean
+	rm -f bin/mustang-3.2*
+#	dh_clean
 
-install: install-indep install-arch
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_installexamples -i data/test/pdbs data/test/test_zf-CCHH
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_installexamples -s debian/runtest debian/test_zf-CCHH-small
-	install -D -m755 bin/mustang-3.2 debian/mustang/usr/bin/mustang
-
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installman
-	dh_strip
-	dh_compress -X.pdb
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
-
-####
+override_dh_auto_install:
+	install -D -m755 bin/mustang-3.2* debian/mustang/usr/bin/mustang

Modified: trunk/packages/mustang/trunk/debian/watch
===================================================================
--- trunk/packages/mustang/trunk/debian/watch	2009-10-28 20:25:59 UTC (rev 4263)
+++ trunk/packages/mustang/trunk/debian/watch	2009-10-28 20:27:13 UTC (rev 4264)
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/$/.0/" \
+# opts="uversionmangle=s/$/.0/" \
 http://www.cs.mu.oz.au/~arun/mustang/ ./mustang_v([.\d]*)\.tgz




More information about the debian-med-commit mailing list