rev 15244 - in kde-extras/exiv2/trunk/debian: . patches

Mon Jul 13 08:11:40 UTC 2009

Author: fabo
Date: 2009-07-13 08:11:38 +0000 (Mon, 13 Jul 2009)
New Revision: 15244

Added:
   kde-extras/exiv2/trunk/debian/patches/series
Removed:
   kde-extras/exiv2/trunk/debian/README.Debian
Modified:
   kde-extras/exiv2/trunk/debian/changelog
   kde-extras/exiv2/trunk/debian/control
   kde-extras/exiv2/trunk/debian/patches/00_hyphens_used_as_minus.diff
   kde-extras/exiv2/trunk/debian/rules
Log:
* Bump Standards-Version from 3.8.1 to 3.8.2 (no changes needed)
* Add quilt build dependency
* Remove cdbs build dependency - use dh and rewrite debian/rules


Modified: kde-extras/exiv2/trunk/debian/changelog
===================================================================

--- kde-extras/exiv2/trunk/debian/changelog	2009-07-13 00:31:10 UTC (rev 15243)
+++ kde-extras/exiv2/trunk/debian/changelog	2009-07-13 08:11:38 UTC (rev 15244)
@@ -1,13 +1,22 @@
 exiv2 (0.18.2-1) unstable; urgency=low
 
   * New upstream release
-  * Added lintian overrides:
+
+  [Ryan Kavanagh]
+
+  * Add lintian overrides:
     - libexiv2-dev: extended-description-is-probably-too-short
-  * Fixed a typo in README.Debian (s/enviroment/environment/)
-  * Fixed hyphens as minus signs in the manpage, 00_hyphens_used_as_minus.diff
+  * Fix a typo in README.Debian (s/enviroment/environment/)
+  * Fix hyphens as minus signs in the manpage, 00_hyphens_used_as_minus.diff
 
- -- Ryan Kavanagh <ryanakca at kubuntu.org>  Thu, 09 Jul 2009 18:50:32 -0400
+  [Fathi Boudra]
 
+  * Bump Standards-Version from 3.8.1 to 3.8.2 (no changes needed)
+  * Add quilt build dependency
+  * Remove cdbs build dependency - use dh and rewrite debian/rules
+
+ -- Fathi Boudra <fabo at debian.org>  Thu, 09 Jul 2009 18:50:32 -0400
+
 exiv2 (0.18.1-1) unstable; urgency=low
 
   * New upstream release

Modified: kde-extras/exiv2/trunk/debian/control
===================================================================
--- kde-extras/exiv2/trunk/debian/control	2009-07-13 00:31:10 UTC (rev 15243)
+++ kde-extras/exiv2/trunk/debian/control	2009-07-13 08:11:38 UTC (rev 15244)
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: KELEMEN Peter <fuji at debian.org>, Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), chrpath,
+Build-Depends: debhelper (>= 7), quilt, chrpath,
  autotools-dev, libexpat1-dev, zlib1g-dev,
  libexpat1-dev,
  doxygen, graphviz, python, xsltproc
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://www.exiv2.org
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/exiv2/trunk
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/exiv2/trunk

Modified: kde-extras/exiv2/trunk/debian/patches/00_hyphens_used_as_minus.diff
===================================================================
--- kde-extras/exiv2/trunk/debian/patches/00_hyphens_used_as_minus.diff	2009-07-13 00:31:10 UTC (rev 15243)
+++ kde-extras/exiv2/trunk/debian/patches/00_hyphens_used_as_minus.diff	2009-07-13 08:11:38 UTC (rev 15244)
@@ -1,7 +1,6 @@
-diff -Nur -x '*.orig' -x '*~' exiv2-0.18.2/src/exiv2.1 exiv2-0.18.2.new/src/exiv2.1
---- exiv2-0.18.2/src/exiv2.1	2009-04-05 11:27:11.000000000 -0400
-+++ exiv2-0.18.2.new/src/exiv2.1	2009-07-07 19:23:36.337387142 -0400
-@@ -171,17 +171,17 @@
+--- a/src/exiv2.1
++++ b/src/exiv2.1
+@@ -171,17 +171,17 @@ Print mode for the 'print' action. Possi
  .br
  s : print a summary of the Exif metadata (the default)
  .br
@@ -25,7 +24,7 @@
  .br
  c : JPEG comment
  .br
-@@ -256,7 +256,7 @@
+@@ -256,7 +256,7 @@ images and a modifier to generate an XMP
  p[<n>[,<m> ...]] : Extract preview images. The optional comma separated
  list of preview image numbers is used to determine which preview images
  to extract. The available preview images and their numbers are displayed
@@ -34,7 +33,7 @@
  .br
  X : Extract metadata to an XMP sidecar file <file>.xmp. The remaining
  extract targets determine what metadata to extract to the sidecar
-@@ -393,13 +393,13 @@
+@@ -393,13 +393,13 @@ ignored (comments). Remaining lines are 
  exiv2 *.jpg
  Prints a summary of the Exif information for all JPEG files in the directory.
  .TP
@@ -50,7 +49,7 @@
  Renames img_1234.jpg to img_1234_200511.jpg
  .TP
  exiv2 \-et img1.jpg img2.jpg
-@@ -441,7 +441,7 @@
+@@ -441,7 +441,7 @@ and GPSLatitudeRef contains either 'N' o
  latitude respectively.
  .TP
  .nf

Added: kde-extras/exiv2/trunk/debian/patches/series
===================================================================
--- kde-extras/exiv2/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/exiv2/trunk/debian/patches/series	2009-07-13 08:11:38 UTC (rev 15244)
@@ -0,0 +1 @@
+00_hyphens_used_as_minus.diff

Modified: kde-extras/exiv2/trunk/debian/rules
===================================================================
--- kde-extras/exiv2/trunk/debian/rules	2009-07-13 00:31:10 UTC (rev 15243)
+++ kde-extras/exiv2/trunk/debian/rules	2009-07-13 08:11:38 UTC (rev 15244)
@@ -4,26 +4,30 @@
 UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz
 URL = http://www.exiv2.org/$(UPFILENAME)
 
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/utils.mk
+%:
+	dh --with quilt $@
 
-DEB_INSTALL_CHANGELOGS_ALL := doc/ChangeLog
-DEB_COMPRESS_EXCLUDE := .xls .js .idx .xml .php
-DEB_INSTALL_DOCS_ALL := -Xcmd.txt -XMakefile -Xtemplates -XChangeLog
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed"
+override_dh_auto_configure:
+	dh_auto_configure -- --disable-rpath
 
-build/libexiv2-doc::
+override_dh_clean:
+	dh_clean
+	rm -rf doc/html
+
+override_dh_install:
 	[ ! -f Makefile ] || $(MAKE) doc
+	dh_install --list-missing
+	find $(CURDIR)/debian -type f -name exiv2 | xargs /usr/bin/chrpath -d
 
-install/exiv2::
-	/usr/bin/chrpath -d $(CURDIR)/debian/tmp/usr/bin/exiv2
+override_dh_installdocs:
+	dh_installdocs -A -Xcmd.txt -XMakefile -Xtemplates -XChangeLog
 
-clean::
-	rm -rf doc/html
+override_dh_installchangelogs:
+	dh_installchangelogs -A doc/ChangeLog
 
+override_dh_compress:
+	dh_compress -X.xls -X.js -X.idx -X.xml -X.php
+
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@ -37,4 +41,3 @@
 	@@echo DEB_UPSTREAM_VERSION: $(DEB_UPSTREAM_VERSION)
 	@@echo FILENAME: $(FILENAME)
 	@@echo URL: $(URL)
-


