[med-svn] r9634 - trunk/packages/arb/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-02-09 18:13:01 +0000 (Thu, 09 Feb 2012)
New Revision: 9634

Added:
   trunk/packages/arb/trunk/debian/arb.prerm
Modified:
   trunk/packages/arb/trunk/debian/README.source
   trunk/packages/arb/trunk/debian/changelog
   trunk/packages/arb/trunk/debian/control
   trunk/packages/arb/trunk/debian/rules
Log:
Make sure arb can be properly purged; make sure will be able to "dh build-arch" which seems to be default sbuild behaviour.


Modified: trunk/packages/arb/trunk/debian/README.source
===================================================================
--- trunk/packages/arb/trunk/debian/README.source	2012-02-09 12:24:41 UTC (rev 9633)
+++ trunk/packages/arb/trunk/debian/README.source	2012-02-09 18:13:01 UTC (rev 9634)
@@ -1,4 +1,11 @@
-This packages uses the quilt patch system. Please read
-/usr/share/doc/quilt/README.source for more information.
+Remark:  The Build could profit from a Build-Depends if this
+         Module would be packaged for Debian
 
- -- Andreas Tille <tille at debian.org>  Mon, 31 Aug 2009 14:50:19 +0200
+   http://search.cpan.org/~pevans/B-LintSubs-0.04/lib/B/LintSubs.pm
+
+This would prevent the following warning:
+
+   You either lack S::LintSubs and/or Bio::TreeIO or the perl scripts are buggy. We continue anyway..
+
+
+ -- Andreas Tille <tille at debian.org>  Thu, 09 Feb 2012 13:44:22 +0100

Added: trunk/packages/arb/trunk/debian/arb.prerm
===================================================================
--- trunk/packages/arb/trunk/debian/arb.prerm	                        (rev 0)
+++ trunk/packages/arb/trunk/debian/arb.prerm	2012-02-09 18:13:01 UTC (rev 9634)
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+PROG=arb
+CONFFILE=${PROG}_tcp.dat
+ARBLIBDIR=/usr/lib/${PROG}/lib
+
+rm -rf ${ARBLIBDIR}/${CONFFILE}
+
+#DEBHELPER#

Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog	2012-02-09 12:24:41 UTC (rev 9633)
+++ trunk/packages/arb/trunk/debian/changelog	2012-02-09 18:13:01 UTC (rev 9634)
@@ -1,3 +1,23 @@
+arb (5.3-3) unstable; urgency=low
+
+  * debian/control:
+     - Build-Depends: time 
+       Strangely enough this is not needed in local pbnuilder/sbuild
+       environments but on autobuilders this seems to be a problem
+       according to comparing the build logs
+     - Build-Depends: libbio-perl-perl
+       Otherwise some not-critical checks will fail
+  * debian/arb.prerm: Care for removal of conffile link created in postinst
+    Closes: #656035
+  * debian/rules:
+     - clean up some manual handling of files and dirs which is not
+       needed any more with recent versions
+     - insert check which verifies that binary-indep target is really
+       builded and changed files and dirs are previousely created
+       Closes: #658691
+
+ -- Andreas Tille <tille at debian.org>  Thu, 09 Feb 2012 13:44:22 +0100
+
 arb (5.3-2) unstable; urgency=low
 
   * debian/arb.README.Debian: Dropped molphy related notice

Modified: trunk/packages/arb/trunk/debian/control
===================================================================
--- trunk/packages/arb/trunk/debian/control	2012-02-09 12:24:41 UTC (rev 9633)
+++ trunk/packages/arb/trunk/debian/control	2012-02-09 18:13:01 UTC (rev 9634)
@@ -8,6 +8,7 @@
                debhelper (>= 8),
                dpkg-dev (>= 1.15.4),
                freeglut3-dev | libglu-dev,
+               libbio-perl-perl,
                libglew1.5-dev,
                libglw1-mesa-dev,
                libmotif-dev,
@@ -17,6 +18,7 @@
                libxml2-utils,
                libxpm-dev,
                lynx,
+               time,
                openjdk-6-jdk | default-jdk,
                perl-doc,
                xsltproc,

Modified: trunk/packages/arb/trunk/debian/rules
===================================================================
--- trunk/packages/arb/trunk/debian/rules	2012-02-09 12:24:41 UTC (rev 9633)
+++ trunk/packages/arb/trunk/debian/rules	2012-02-09 18:13:01 UTC (rev 9634)
@@ -57,9 +57,9 @@
 	[ ! -f config.makefile ] || $(MAKE) DEBIAN=1 ARBHOME=$(ARBHOME) clean
 	
 	# fix broken clean process
-	find . -type f -name "*.a"  -exec rm -f \{\} \;
-	find . -type f -name "*.o"  -exec rm -f \{\} \;
-	find . -type f -name "*.so" -exec rm -f \{\} \;
+	find . -type f -name "*.a"  -delete
+	find . -type f -name "*.o"  -delete
+	find . -type f -name "*.so" -delete
 	rm -f `find bin -name "arb*" | grep -v ".pl$$"`
 	rm -f `find $(DIRSTOREMOVELINKS) -type l`
 	rm -f `find . -type f -name ".depends"`
@@ -83,12 +83,14 @@
 	    done ; \
 	fi
 
-	# Move SH/README to docs
-	cp -a SH/README debian/$(pkgcom)/usr/share/doc/arb/README_SH
-	
-	# Fix permission of scripts
-	chmod a+x debian/$(pkgcom)/usr/lib/arb/SH/arb_create_debian_conffile
-	chmod a+x debian/$(pkgcom)/usr/lib/arb/lib/macro.head
+	# the check is needed to make sure it will not fail when doing binary-arch only builds
+	if [ -e debian/$(pkgcom)/usr/lib/arb/SH/arb_create_debian_conffile ] ; then \
+	    # Move SH/README to docs \
+	    cp -a SH/README debian/$(pkgcom)/usr/share/doc/arb/README_SH ; \
+	    # Fix permission of scripts \
+	    chmod a+x debian/$(pkgcom)/usr/lib/arb/SH/arb_create_debian_conffile ; \
+	    chmod a+x debian/$(pkgcom)/usr/lib/arb/lib/macro.head ; \
+	fi
 
 	# Man page is not really needed and throws just a lintian warning
 	# mkdir `pwd`/debian/$(pkg)/usr/share/man/man3