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

[Mark Purcell]

Author: msp
Date: 2013-12-15 00:05:36 +0000 (Sun, 15 Dec 2013)
New Revision: 19761

Added:
   kde-extras/exiv2/trunk/debian/libexiv2-13.install
Removed:
   kde-extras/exiv2/trunk/debian/libexiv2-12.install
Modified:
   kde-extras/exiv2/trunk/debian/changelog
   kde-extras/exiv2/trunk/debian/control
   kde-extras/exiv2/trunk/debian/rules
Log:
* NEW package libexiv2-13 - match soname
* debian/rules suspend make doc (FTBFS) 
* Add specific +override_dh_auto_build-indep: target for doxygen build

Modified: kde-extras/exiv2/trunk/debian/changelog
===================================================================
--- kde-extras/exiv2/trunk/debian/changelog	2013-12-14 01:12:32 UTC (rev 19760)
+++ kde-extras/exiv2/trunk/debian/changelog	2013-12-15 00:05:36 UTC (rev 19761)
@@ -6,10 +6,13 @@
     -  support for Video metadata
     - more cameras and accessories now recognised
     - Numerous bugs fixes, build and test improvments
+  * NEW package libexiv2-13 - match soname
   * Fix "libexiv2-doc documentation package seems to be lacking in
     content" include patch from ~dancer (Closes: #687278)
   * Fix "config.{guess,sub} for AArch64" --with autotools_dev (Closes: #727295)
   * Drop 00_hyphens_used_as_minus.diff - included upstream
+  * debian/rules suspend make doc (FTBFS) 
+  * Add specific +override_dh_auto_build-indep: target for doxygen build
 
  -- Mark Purcell <msp at debian.org>  Thu, 12 Dec 2013 06:10:13 +1100
 

Modified: kde-extras/exiv2/trunk/debian/control
===================================================================
--- kde-extras/exiv2/trunk/debian/control	2013-12-14 01:12:32 UTC (rev 19760)
+++ kde-extras/exiv2/trunk/debian/control	2013-12-15 00:05:36 UTC (rev 19761)
@@ -34,7 +34,7 @@
   * print, set and delete the JPEG comment of JPEG images
   * fix the Exif ISO setting of picture taken with Canon and Nikon cameras
 
-Package: libexiv2-12
+Package: libexiv2-13
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -60,7 +60,7 @@
 Package: libexiv2-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libexiv2-12 (= ${binary:Version}), pkg-config
+Depends: ${misc:Depends}, libexiv2-13 (= ${binary:Version}), pkg-config
 Suggests: libexiv2-doc
 Description: EXIF/IPTC metadata manipulation library - development files
  Exiv2 is a C++ library and a command line utility to manage image metadata.
@@ -81,7 +81,7 @@
  This package provides the Exiv2 HTML documentation.
 
 Package: libexiv2-dbg
-Depends: ${misc:Depends}, libexiv2-12 (= ${binary:Version})
+Depends: ${misc:Depends}, libexiv2-13 (= ${binary:Version})
 Section: debug
 Architecture: any
 Priority: extra

Copied: kde-extras/exiv2/trunk/debian/libexiv2-13.install (from rev 19760, kde-extras/exiv2/trunk/debian/libexiv2-12.install)
===================================================================
--- kde-extras/exiv2/trunk/debian/libexiv2-13.install	                        (rev 0)
+++ kde-extras/exiv2/trunk/debian/libexiv2-13.install	2013-12-15 00:05:36 UTC (rev 19761)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*

Modified: kde-extras/exiv2/trunk/debian/rules
===================================================================
--- kde-extras/exiv2/trunk/debian/rules	2013-12-14 01:12:32 UTC (rev 19760)
+++ kde-extras/exiv2/trunk/debian/rules	2013-12-15 00:05:36 UTC (rev 19761)
@@ -15,7 +15,6 @@
 	dh_strip -a --dbg-package=libexiv2-dbg
 
 override_dh_install:
-	[ ! -f Makefile ] || $(MAKE) doc
 	dh_install --list-missing
 	find $(CURDIR)/debian -type f -name exiv2 | xargs /usr/bin/chrpath -d
 	# Drop content of dependency_libs to avoid having to recompile exiv2
@@ -24,6 +23,9 @@
 		sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
 	done
 
+override_dh_auto_build-indep:
+	$(MAKE) -C doc doxygen
+
 override_dh_installdocs:
 	dh_installdocs -A -Xcmd.txt -XMakefile -Xtemplates -XChangeLog
 
@@ -32,6 +34,3 @@
 
 override_dh_compress:
 	dh_compress -X.xls -X.js -X.idx -X.xml -X.php
-
-get-orig-source:
-	uscan --force-download