[med-svn] r4153 - in trunk/packages/mustang/trunk/debian: . patches

[Morten Kjeldgaard]

Author: mok0-guest
Date: 2009-10-05 11:40:09 +0000 (Mon, 05 Oct 2009)
New Revision: 4153

Modified:
   trunk/packages/mustang/trunk/debian/changelog
   trunk/packages/mustang/trunk/debian/mustang.manpages
   trunk/packages/mustang/trunk/debian/patches/03-test_zf-cchh.patch
   trunk/packages/mustang/trunk/debian/patches/series
   trunk/packages/mustang/trunk/debian/rules
   trunk/packages/mustang/trunk/debian/watch
Log:
Packaging updated to new upstream version 3.2.0

Modified: trunk/packages/mustang/trunk/debian/changelog
===================================================================
--- trunk/packages/mustang/trunk/debian/changelog	2009-10-05 10:47:10 UTC (rev 4152)
+++ trunk/packages/mustang/trunk/debian/changelog	2009-10-05 11:40:09 UTC (rev 4153)
@@ -1,3 +1,11 @@
+mustang (3.2.0-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+  * Patches 02-main.cpp.patch and 04-gcc-4.3-exit.patch have been 
+    incorporated upstream and are no longer required.
+
+  -- Morten Kjeldgaard <mok0 at ubuntu.com>  Mon, 05 Oct 2009 13:10:26 +0200
+
 mustang (3.0-2) unstable; urgency=low
 
   * Converted to quilt patch system.

Modified: trunk/packages/mustang/trunk/debian/mustang.manpages
===================================================================
--- trunk/packages/mustang/trunk/debian/mustang.manpages	2009-10-05 10:47:10 UTC (rev 4152)
+++ trunk/packages/mustang/trunk/debian/mustang.manpages	2009-10-05 11:40:09 UTC (rev 4153)
@@ -1 +1 @@
-mustang.1
+man/mustang.1

Modified: trunk/packages/mustang/trunk/debian/patches/03-test_zf-cchh.patch
===================================================================
--- trunk/packages/mustang/trunk/debian/patches/03-test_zf-cchh.patch	2009-10-05 10:47:10 UTC (rev 4152)
+++ trunk/packages/mustang/trunk/debian/patches/03-test_zf-cchh.patch	2009-10-05 11:40:09 UTC (rev 4153)
@@ -1,22 +1,11 @@
 --- trunk.orig/data/test/test_zf-CCHH
 +++ trunk/data/test/test_zf-CCHH
-@@ -16,8 +16,7 @@
- ## symbols to show that the whitespaces are ignored                                          ##
- ###############################################################################################
+@@ -20,7 +20,7 @@
+ ################################################################################
  
--
-- >  ./data/test/pdbs    
+ 
+-> ./data/test/pdbs    
 +> /usr/share/doc/mustang-testdata/examples/pdbs
  
  +1ard.pdb
  +1bboN.pdb
-@@ -37,6 +36,7 @@
- +2drp2.pdb
- +3znf.pdb
- 
-+
- +5znf.pdb
--#+test1.pdb
--#+test2.pdb
-++test1.pdb
-++test2.pdb

Modified: trunk/packages/mustang/trunk/debian/patches/series
===================================================================
--- trunk/packages/mustang/trunk/debian/patches/series	2009-10-05 10:47:10 UTC (rev 4152)
+++ trunk/packages/mustang/trunk/debian/patches/series	2009-10-05 11:40:09 UTC (rev 4153)
@@ -1,3 +1 @@
-02-main.cpp.patch
 03-test_zf-cchh.patch
-04-gcc-4.3-exit.patch

Modified: trunk/packages/mustang/trunk/debian/rules
===================================================================
--- trunk/packages/mustang/trunk/debian/rules	2009-10-05 10:47:10 UTC (rev 4152)
+++ trunk/packages/mustang/trunk/debian/rules	2009-10-05 11:40:09 UTC (rev 4153)
@@ -17,10 +17,6 @@
 	CPPFLAGS += -O2
 endif
 
-
-get-orig-source:
-	wget http://www.cs.mu.oz.au/~arun/mustang/mustang_v.3.tgz -O ../mustang_3.0.orig.tar.gz
-
 build: patch build-arch build-indep
 
 build-arch: build-arch-stamp
@@ -29,7 +25,7 @@
 
 	# Compile Mustang:
 	$(MAKE) CPPFLAGS="$(CPPFLAGS)"
-	cp mustang mustang.1
+
 	touch $@
 
 build-indep: build-indep-stamp
@@ -46,8 +42,7 @@
 
 	# Clean up after the build process.
 	rm -f obj/*.o
-	rm -f bin/MUSTANG_v.3
-	rm -f mustang.1
+	rm -f bin/mustang-3.2
 	dh_clean
 
 install: install-indep install-arch
@@ -60,7 +55,7 @@
 	dh_testdir
 	dh_testroot
 	dh_installexamples -s debian/runtest debian/test_zf-CCHH-small
-	install -D -m755 bin/MUSTANG_v.3 debian/mustang/usr/bin/mustang
+	install -D -m755 bin/mustang-3.2 debian/mustang/usr/bin/mustang
 
 binary-common:
 	dh_testdir

Modified: trunk/packages/mustang/trunk/debian/watch
===================================================================
--- trunk/packages/mustang/trunk/debian/watch	2009-10-05 10:47:10 UTC (rev 4152)
+++ trunk/packages/mustang/trunk/debian/watch	2009-10-05 11:40:09 UTC (rev 4153)
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/$/.0/" \
-http://www.cs.mu.oz.au/~arun/mustang/ ./mustang_v\.(.*)\.tgz
+http://www.cs.mu.oz.au/~arun/mustang/ ./mustang_v([.\d]*)\.tgz