rev 19794 - kde-extras/exiv2/trunk/debian

[Pino Toscano]

Author: pino
Date: 2013-12-15 20:18:46 +0000 (Sun, 15 Dec 2013)
New Revision: 19794

Modified:
   kde-extras/exiv2/trunk/debian/changelog
   kde-extras/exiv2/trunk/debian/compat
   kde-extras/exiv2/trunk/debian/control
   kde-extras/exiv2/trunk/debian/libexiv2-13.install
   kde-extras/exiv2/trunk/debian/libexiv2-dev.install
   kde-extras/exiv2/trunk/debian/rules
Log:
bump to the debhelper compatibility 9

- bump compat to 9
- bump the debhelper build dependency to >= 9~
- stop manually specifying the build flags, they are handled
  automatically
- adjust the library paths in .install files and rules to the multiarch
  paths
- add Pre-Depends: ${misc:Pre-Depends} in libexiv2-13


Modified: kde-extras/exiv2/trunk/debian/changelog
===================================================================
--- kde-extras/exiv2/trunk/debian/changelog	2013-12-15 19:23:21 UTC (rev 19793)
+++ kde-extras/exiv2/trunk/debian/changelog	2013-12-15 20:18:46 UTC (rev 19794)
@@ -18,6 +18,13 @@
   * Remove the doxygen-generated *.map and *.md5 files from the -doc package.
   * Add a lintian override in libexiv2-doc for the duplicated files
     (image graphs, basically) generated by doxygen.
+  * Bump to the debhelper compatibility 9:
+    - bump compat to 9
+    - bump the debhelper build dependency to >= 9~
+    - stop manually specifying the build flags, they are handled automatically
+    - adjust the library paths in .install files and rules to the multiarch
+      paths
+    - add Pre-Depends: ${misc:Pre-Depends} in libexiv2-13
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 15 Dec 2013 19:22:59 +0100
 

Modified: kde-extras/exiv2/trunk/debian/compat
===================================================================
--- kde-extras/exiv2/trunk/debian/compat	2013-12-15 19:23:21 UTC (rev 19793)
+++ kde-extras/exiv2/trunk/debian/compat	2013-12-15 20:18:46 UTC (rev 19794)
@@ -1 +1 @@
-7
+9

Modified: kde-extras/exiv2/trunk/debian/control
===================================================================
--- kde-extras/exiv2/trunk/debian/control	2013-12-15 19:23:21 UTC (rev 19793)
+++ kde-extras/exiv2/trunk/debian/control	2013-12-15 20:18:46 UTC (rev 19794)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), chrpath,
+Build-Depends: debhelper (>= 9~), chrpath,
  autotools-dev, libexpat1-dev, zlib1g-dev,
  libjs-jquery,
  doxygen, graphviz, python, xsltproc
@@ -37,6 +37,7 @@
 Package: libexiv2-13
 Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: exiv2
 Description: EXIF/IPTC metadata manipulation library

Modified: kde-extras/exiv2/trunk/debian/libexiv2-13.install
===================================================================
--- kde-extras/exiv2/trunk/debian/libexiv2-13.install	2013-12-15 19:23:21 UTC (rev 19793)
+++ kde-extras/exiv2/trunk/debian/libexiv2-13.install	2013-12-15 20:18:46 UTC (rev 19794)
@@ -1,2 +1,2 @@
-usr/lib/libexiv2.so.13
-usr/lib/libexiv2.so.13.*
+usr/lib/*/libexiv2.so.13
+usr/lib/*/libexiv2.so.13.*

Modified: kde-extras/exiv2/trunk/debian/libexiv2-dev.install
===================================================================
--- kde-extras/exiv2/trunk/debian/libexiv2-dev.install	2013-12-15 19:23:21 UTC (rev 19793)
+++ kde-extras/exiv2/trunk/debian/libexiv2-dev.install	2013-12-15 20:18:46 UTC (rev 19794)
@@ -1,5 +1,5 @@
 usr/include/exiv2/*
-usr/lib/libexiv2.a
-usr/lib/libexiv2.so
-usr/lib/pkgconfig/exiv2.pc
+usr/lib/*/libexiv2.a
+usr/lib/*/libexiv2.so
+usr/lib/*/pkgconfig/exiv2.pc
 usr/share/locale/*

Modified: kde-extras/exiv2/trunk/debian/rules
===================================================================
--- kde-extras/exiv2/trunk/debian/rules	2013-12-15 19:23:21 UTC (rev 19793)
+++ kde-extras/exiv2/trunk/debian/rules	2013-12-15 20:18:46 UTC (rev 19794)
@@ -1,10 +1,12 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@ --parallel --with autotools_dev
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-rpath  $(shell dpkg-buildflags --export=configure)
+	dh_auto_configure -- --disable-rpath
 
 override_dh_clean:
 	dh_clean
@@ -16,7 +18,7 @@
 
 override_dh_install:
 	# no need for libtool .la files
-	rm -f $(CURDIR)/debian/tmp/usr/lib/*.la
+	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 	dh_install --list-missing
 	find $(CURDIR)/debian -type f -name exiv2 | xargs /usr/bin/chrpath -d