[med-svn] r3517 - in trunk/packages/autodocksuite/trunk/debian: . patches

Steffen Möller smoe-guest at alioth.debian.org
Sun Jun 21 19:45:34 UTC 2009


Author: smoe-guest
Date: 2009-06-21 19:45:32 +0000 (Sun, 21 Jun 2009)
New Revision: 3517

Added:
   trunk/packages/autodocksuite/trunk/debian/autodock-test.dirs
   trunk/packages/autodocksuite/trunk/debian/autogrid-test.dirs
   trunk/packages/autodocksuite/trunk/debian/patches/errorMessages.patch
Modified:
   trunk/packages/autodocksuite/trunk/debian/changelog
   trunk/packages/autodocksuite/trunk/debian/control
   trunk/packages/autodocksuite/trunk/debian/patches/series
   trunk/packages/autodocksuite/trunk/debian/rules
Log:
Updates for 4.2.1


Added: trunk/packages/autodocksuite/trunk/debian/autodock-test.dirs
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/autodock-test.dirs	                        (rev 0)
+++ trunk/packages/autodocksuite/trunk/debian/autodock-test.dirs	2009-06-21 19:45:32 UTC (rev 3517)
@@ -0,0 +1 @@
+usr/share/autodock

Added: trunk/packages/autodocksuite/trunk/debian/autogrid-test.dirs
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/autogrid-test.dirs	                        (rev 0)
+++ trunk/packages/autodocksuite/trunk/debian/autogrid-test.dirs	2009-06-21 19:45:32 UTC (rev 3517)
@@ -0,0 +1 @@
+usr/share/autogrid

Modified: trunk/packages/autodocksuite/trunk/debian/changelog
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/changelog	2009-06-21 16:02:52 UTC (rev 3516)
+++ trunk/packages/autodocksuite/trunk/debian/changelog	2009-06-21 19:45:32 UTC (rev 3517)
@@ -1,3 +1,13 @@
+autodocksuite (4.2.1-1) unstable; urgency=low
+
+  * new upstream release
+  * added gcc flag to suppress char* conversion warnings
+  * removed pointless DM-Maintainer-upload permission
+  * bumped Debian policy compliance to 3.8.2 - no changes required
+  * using new dh_prep instead of dh_clean -k, dependency on debhelper > 7
+
+ -- Steffen Moeller <moeller at debian.org>  Sun, 21 Jun 2009 21:41:07 +0200
+
 autodocksuite (4.0.1-5) UNRELEASED; urgency=low
 
   * debian/control: 

Modified: trunk/packages/autodocksuite/trunk/debian/control
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/control	2009-06-21 16:02:52 UTC (rev 3516)
+++ trunk/packages/autodocksuite/trunk/debian/control	2009-06-21 19:45:32 UTC (rev 3517)
@@ -3,11 +3,10 @@
 Priority: optional
 Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <moeller at debian.org>, Charles Plessy <plessy at debian.org>
-Build-Depends: debhelper (>= 5), quilt
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), quilt
+Standards-Version: 3.8.2
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/autodocksuite/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/autodocksuite/trunk/
-DM-Upload-Allowed: yes
 Homepage: http://autodock.scripps.edu/
 
 Package: autodock

Added: trunk/packages/autodocksuite/trunk/debian/patches/errorMessages.patch
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/patches/errorMessages.patch	                        (rev 0)
+++ trunk/packages/autodocksuite/trunk/debian/patches/errorMessages.patch	2009-06-21 19:45:32 UTC (rev 3517)
@@ -0,0 +1,20 @@
+--- a/src/autogrid/Makefile.am	2009-06-21 21:17:31.942562100 +0200
++++ b/src/autogrid/Makefile.am	2009-06-21 21:18:23.862532470 +0200
+@@ -90,6 +90,7 @@
+ AM_CFLAGS = -Wall -O3 # All warnings, Agressive optimization
+ 
+ AM_CPPFLAGS = -Wall -O3 -I$(srcdir)/../autodock # All warnings, Agressive optimization
++AM_CPPFLAGS += -Wno-write-strings # increase compatibility pre 4.x compilers for string handling
+ 
+ # autogrid4_CXXFLAGS = -Wall -O3 -ftree-vectorize # All warnings, Agressive optimization, GCC vectorization in Mac OS X
+ 
+--- a/src/autodock/Makefile.am	2009-06-21 21:22:14.411518881 +0200
++++ b/src/autodock/Makefile.am	2009-06-21 21:22:31.103575546 +0200
+@@ -244,6 +244,7 @@
+ 
+     # if gnu c++ compiler
+ AM_CXXFLAGS += -Wall # All warnings
++AM_CXXFLAGS += -Wno-write-strings # increase compatibility pre 4.x compilers for string handling
+ 
+ #AM_CXXFLAGS = -Wall -O3 # All warnings, Agressive optimization
+ #AM_CXXFLAGS = -Wall -O3 -ftree-vectorize # All warnings, Agressive optimization + GCC vectorization # MacOSX only?

Modified: trunk/packages/autodocksuite/trunk/debian/patches/series
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/patches/series	2009-06-21 16:02:52 UTC (rev 3516)
+++ trunk/packages/autodocksuite/trunk/debian/patches/series	2009-06-21 19:45:32 UTC (rev 3517)
@@ -1,2 +1,3 @@
+errorMessages.patch
 addHelp.patch
 gcc43-compatibility.patch

Modified: trunk/packages/autodocksuite/trunk/debian/rules
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/rules	2009-06-21 16:02:52 UTC (rev 3516)
+++ trunk/packages/autodocksuite/trunk/debian/rules	2009-06-21 19:45:32 UTC (rev 3517)
@@ -1,14 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -30,26 +20,24 @@
 configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	# Add here commands to configure the package.
-	for d in autodock autogrid; do \
-	   (cd src/$$d && ./configure CFLAGS="$(CFLAGS)" --prefix=/usr) ; \
+	for d in src/autogrid src/autodock; do \
+		( cd $$d && autoreconf -i && ./configure CFLAGS="$(CFLAGS)" --prefix=/usr ) \
 	done
 
 	touch configure-stamp
 
-
 #Architecture 
 build: build-arch build-indep
 
 build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp 
 	# Add here commands to compile the arch part of the package.
-	for d in src/autodock src/autogrid; do $(MAKE) -C $$d; done
+	for d in src/autogrid src/autodock; do $(MAKE) -C $$d; done
 	touch $@
 
 build-indep: build-indep-stamp
 build-indep-stamp: configure-stamp 
 	# Add here commands to compile the indep part of the package.
-	#$(MAKE) doc
 	touch $@
 
 clean:  unpatch
@@ -68,17 +56,19 @@
 install-indep:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i 
+	dh_prep -i 
 	dh_installdirs -i
 	dh_install -i
-	rm -r $(CURDIR)/debian/autodock-test/usr/share/autodock/Tests/AutoDockTools
+	rm -rf $(CURDIR)/debian/autodock-test/usr/share/autodock/Tests/AutoDockTools
+	rm -rf $(CURDIR)/debian/autogrid-test/usr/share/autogrid/Tests/CVS/
+	rm -rf $(CURDIR)/debian/autodock-test/usr/share/autodock/Tests/CVS/
 	chmod 644 $(CURDIR)/debian/autodock-test/usr/share/autodock/Tests/*
 	chmod 644 $(CURDIR)/debian/autogrid-test/usr/share/autogrid/Tests/*
 
 install-arch:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -s 
+	dh_prep -s 
 	dh_installdirs -s
 
 	# Add here commands to install the arch part of the package into 
@@ -88,8 +78,9 @@
 		$(MAKE) -C src/$$d DESTDIR=$(CURDIR)/debian/$$d install; \
 	done
 	dh_install -s
-	dh_installchangelogs -pautodock src/autodock/ChangeLog
-	dh_installchangelogs -pautogrid src/autogrid/ChangeLog
+	# The changelogs are non-informative
+	#dh_installchangelogs -pautodock src/autodock/ChangeLog
+	#dh_installchangelogs -pautogrid src/autogrid/ChangeLog
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
@@ -120,6 +111,6 @@
 binary-arch: build-arch install-arch
 	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
-#binary-indep
 binary: binary-arch binary-indep
+
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure




More information about the debian-med-commit mailing list