[med-svn] r18087 - trunk/packages/phylip/trunk/debian

[Andreas Tille]

Author: tille
Date: 2014-09-22 13:22:55 +0000 (Mon, 22 Sep 2014)
New Revision: 18087

Modified:
   trunk/packages/phylip/trunk/debian/phylip.install
   trunk/packages/phylip/trunk/debian/phylip.lintian-overrides
   trunk/packages/phylip/trunk/debian/rules
Log:
Simplify installation of libraries (multi-arch does not really make sense)


Modified: trunk/packages/phylip/trunk/debian/phylip.install
===================================================================
--- trunk/packages/phylip/trunk/debian/phylip.install	2014-09-22 12:57:19 UTC (rev 18086)
+++ trunk/packages/phylip/trunk/debian/phylip.install	2014-09-22 13:22:55 UTC (rev 18087)
@@ -1,4 +1,4 @@
-exe/[a-km-su-z]*	usr/lib/phylip/bin
-exe/t[a-df-z]*		usr/lib/phylip/bin
+exe/*			usr/lib/phylip/bin
+src/lib*.so*		usr/lib
 fonts/*			usr/share/phylip
 debian/bin/*		usr/bin

Modified: trunk/packages/phylip/trunk/debian/phylip.lintian-overrides
===================================================================
--- trunk/packages/phylip/trunk/debian/phylip.lintian-overrides	2014-09-22 12:57:19 UTC (rev 18086)
+++ trunk/packages/phylip/trunk/debian/phylip.lintian-overrides	2014-09-22 13:22:55 UTC (rev 18087)
@@ -1,38 +1,6 @@
 # Seems to be false positives - options are properly set
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/clique
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/consense
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/contml
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/contrast
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/dnacomp
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/dnadist
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/dnainvar
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/dnaml
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/dnamlk
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/dnamove
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/dnapars
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/dnapenny
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/dollop
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/dolmove
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/dolpenny
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/drawgram
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/drawtree
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/factor
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/fitch
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/gendist
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/kitsch
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/libdrawgram.so
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/libdrawtree.so
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/mix
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/move
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/neighbor
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/pars
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/penny
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/proml
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/promlk
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/protdist
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/protpars
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/restdist
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/restml
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/retree
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/seqboot
-phylip: hardening-no-fortify-functions usr/lib/phylip/bin/treedist
+phylip: hardening-no-fortify-functions usr/lib/phylip/bin/*
+phylip: hardening-no-fortify-functions usr/lib/libdraw*.so
+phylip: package-name-doesnt-match-sonames libdrawgram libdrawtree
+phylip: shlib-without-versioned-soname usr/lib/libdraw*.so libdraw*.so
+phylip: no-symbols-control-file usr/lib/libdraw*.so

Modified: trunk/packages/phylip/trunk/debian/rules
===================================================================
--- trunk/packages/phylip/trunk/debian/rules	2014-09-22 12:57:19 UTC (rev 18086)
+++ trunk/packages/phylip/trunk/debian/rules	2014-09-22 13:22:55 UTC (rev 18087)
@@ -4,7 +4,7 @@
 
 DEBPKGNAME		:= $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-LIBDIR			:= $(CURDIR)/debian/$(DEBPKGNAME)/usr/lib/$(DEB_HOST_MULTIARCH)
+LIBDIR			:= $(CURDIR)/debian/$(DEBPKGNAME)/usr/lib/ # $(DEB_HOST_MULTIARCH)
 
 export JAVA_HOME=/usr/lib/jvm/default-java
 
@@ -18,8 +18,8 @@
 
 override_dh_auto_install:
 	dh_auto_install --sourcedirectory=src --buildsystem=makefile -- -f Makefile.unx install DATADIR=../fonts
-	mkdir -p $(LIBDIR)
-	cp -a exe/lib*.so $(LIBDIR)
+#	mkdir -p $(LIBDIR)
+#	cp -a src/lib*.so* $(LIBDIR)
 
 override_dh_installexamples:
 	dh_installexamples
@@ -27,7 +27,7 @@
 
 override_dh_auto_clean:
 	dh_auto_clean --sourcedirectory=src --buildsystem=makefile -- -f Makefile.unx clean
-	rm -fr exe/* fonts/ src/*.so
+	rm -fr exe/* fonts/ src/*.so*
 	if [ -e build.xml ] ; then \
 	    ant clean ; \
 	    rm -rf dist build.xml ; \