[med-svn] r16696 - trunk/packages/rostlab/librostlab-blast/trunk/debian

[Andreas Tille]

Author: tille
Date: 2014-04-13 21:44:16 +0000 (Sun, 13 Apr 2014)
New Revision: 16696

Removed:
   trunk/packages/rostlab/librostlab-blast/trunk/debian/librostlab-blast0-dev.install
   trunk/packages/rostlab/librostlab-blast/trunk/debian/librostlab-blast0.install
Modified:
   trunk/packages/rostlab/librostlab-blast/trunk/debian/changelog
   trunk/packages/rostlab/librostlab-blast/trunk/debian/control
   trunk/packages/rostlab/librostlab-blast/trunk/debian/rules
Log:
Use d-shlibs to simplify multiarch handling


Modified: trunk/packages/rostlab/librostlab-blast/trunk/debian/changelog
===================================================================
--- trunk/packages/rostlab/librostlab-blast/trunk/debian/changelog	2014-04-13 20:52:38 UTC (rev 16695)
+++ trunk/packages/rostlab/librostlab-blast/trunk/debian/changelog	2014-04-13 21:44:16 UTC (rev 16696)
@@ -1,9 +1,10 @@
-librostlab-blast (1.0.1-3) UNRELEASED; urgency=medium
+librostlab-blast (1.0.1-3) unstable; urgency=medium
 
   * use dh-autoreconf
     Closes: #744620
   * debhelper 9
   * cme fix dpkg-control
+  * use d-shlibs to cope easily with multiarch
 
  -- Andreas Tille <tille at debian.org>  Sun, 13 Apr 2014 22:47:42 +0200
 

Modified: trunk/packages/rostlab/librostlab-blast/trunk/debian/control
===================================================================
--- trunk/packages/rostlab/librostlab-blast/trunk/debian/control	2014-04-13 20:52:38 UTC (rev 16695)
+++ trunk/packages/rostlab/librostlab-blast/trunk/debian/control	2014-04-13 21:44:16 UTC (rev 16696)
@@ -2,10 +2,11 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Laszlo Kajan <lkajan at rostlab.org>,
            Andreas Tille <tille at debian.org>
-Section: libs
+Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
+               d-shlibs,
                bison,
                doxygen,
                flex,
@@ -21,6 +22,7 @@
 
 Package: librostlab-blast0
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: very fast C++ library for parsing the output of NCBI BLAST programs
@@ -38,10 +40,10 @@
 Architecture: any
 Section: libdevel
 Depends: librostlab-blast0 (= ${binary:Version}),
-         ${misc:Depends},
-         librostlab-dev
+         ${misc:Depends}
 Suggests: librostlab-blast-doc
 Provides: librostlab-blast-dev
+Conflicts: librostlab-blast-dev
 Description: very fast C++ library for parsing the output of NCBI BLAST programs
  This package provides a very fast library for parsing the default output of
  NCBI BLAST programs into a C++ structure.

Deleted: trunk/packages/rostlab/librostlab-blast/trunk/debian/librostlab-blast0-dev.install
===================================================================
--- trunk/packages/rostlab/librostlab-blast/trunk/debian/librostlab-blast0-dev.install	2014-04-13 20:52:38 UTC (rev 16695)
+++ trunk/packages/rostlab/librostlab-blast/trunk/debian/librostlab-blast0-dev.install	2014-04-13 21:44:16 UTC (rev 16696)
@@ -1,4 +0,0 @@
-usr/include/*
-usr/lib/librostlab-blast.a
-usr/lib/librostlab-blast.la
-usr/lib/librostlab-blast.so

Deleted: trunk/packages/rostlab/librostlab-blast/trunk/debian/librostlab-blast0.install
===================================================================
--- trunk/packages/rostlab/librostlab-blast/trunk/debian/librostlab-blast0.install	2014-04-13 20:52:38 UTC (rev 16695)
+++ trunk/packages/rostlab/librostlab-blast/trunk/debian/librostlab-blast0.install	2014-04-13 21:44:16 UTC (rev 16696)
@@ -1 +0,0 @@
-usr/lib/librostlab-blast.so.*

Modified: trunk/packages/rostlab/librostlab-blast/trunk/debian/rules
===================================================================
--- trunk/packages/rostlab/librostlab-blast/trunk/debian/rules	2014-04-13 20:52:38 UTC (rev 16695)
+++ trunk/packages/rostlab/librostlab-blast/trunk/debian/rules	2014-04-13 21:44:16 UTC (rev 16696)
@@ -2,37 +2,33 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-
 %:
 	dh $@ --parallel --with autoreconf
 
-.PHONY: override_dh_auto_configure
+override_dh_install:
+	d-shlibmove --commit \
+		    --multiarch \
+		    --exclude-la \
+		    --movedev debian/tmp/usr/include/* usr/include \
+		    debian/tmp/usr/lib/*/*.so
+
 override_dh_auto_configure:
 	dh_auto_configure --parallel -- --enable-doxygen-dot --enable-doxygen-pdf
 
-.PHONY: override_dh_auto_build
 override_dh_auto_build:
 	dh_auto_build --parallel
 	$(MAKE) -C lib doxygen-doc
 
-.PHONY: override_dh_strip
 override_dh_strip:
 	dh_strip --dbg-package=librostlab-blast0-dbg
 
-.PHONY: override_dh_compress
 override_dh_compress:
 	dh_compress -Xlibrostlab-blast.tag
 
-.PHONY: get-orig-source
 get-orig-source:
 	mkdir -p ../tarballs
 	uscan --verbose --force-download --destdir=../tarballs
 
-.PHONY: override_dh_auto_clean
 override_dh_auto_clean:
 	dh_auto_clean --parallel
 	rm -f lib/librostlab-blast.tag