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

[Fathi Boudra]

Author: fabo
Date: 2008-01-19 10:46:12 +0000 (Sat, 19 Jan 2008)
New Revision: 9035

Modified:
   kde-extras/exiv2/trunk/debian/changelog
   kde-extras/exiv2/trunk/debian/compat
   kde-extras/exiv2/trunk/debian/control
Log:
* Remove changes from Ubuntu as discussed with Allee and Hobbsee on irc.
* Bump compat and debhelper to 6.


Modified: kde-extras/exiv2/trunk/debian/changelog
===================================================================
--- kde-extras/exiv2/trunk/debian/changelog	2008-01-19 10:16:08 UTC (rev 9034)
+++ kde-extras/exiv2/trunk/debian/changelog	2008-01-19 10:46:12 UTC (rev 9035)
@@ -5,17 +5,15 @@
     * CVE-2007-6353
     * Rev 1124 pull
   * Add 01_gcc4.3.diff patch. Missing std:: removal not merged upstream yet
-  * Bump compat to 5
+  * Bump compat to 6
   * Update copyright file
   * Add myself in Uploaders field
   * Clean up build dependencies:
     * Remove g++ and dpkg-dev
     * Add quilt and libexpat1-dev
+    * Bump debhelper to 6
   * Bump Standard-Version to 3.7.3
   * Use Homepage field
-  * Merge changes from Ubuntu:
-    * Add conflicts and replaces of libexiv2c2a, libexiv2-0.12 on libexiv2-0
-      so that digikam does not get held back on upgrades.
   * Add Conflicts/Replaces libexiv2-0 for libexiv2-2
   * Clean up rules
   * Add clean target (Closes: 442560)

Modified: kde-extras/exiv2/trunk/debian/compat
===================================================================
--- kde-extras/exiv2/trunk/debian/compat	2008-01-19 10:16:08 UTC (rev 9034)
+++ kde-extras/exiv2/trunk/debian/compat	2008-01-19 10:46:12 UTC (rev 9035)
@@ -1 +1 @@
-5
+6

Modified: kde-extras/exiv2/trunk/debian/control
===================================================================
--- kde-extras/exiv2/trunk/debian/control	2008-01-19 10:16:08 UTC (rev 9034)
+++ kde-extras/exiv2/trunk/debian/control	2008-01-19 10:46:12 UTC (rev 9035)
@@ -3,7 +3,7 @@
 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 (>= 5), quilt, chrpath,
+Build-Depends: cdbs, debhelper (>= 6), quilt, chrpath,
  autotools-dev, libexpat1-dev, zlib1g-dev,
  doxygen, graphviz, python, xsltproc
 Standards-Version: 3.7.3
@@ -31,8 +31,8 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libexiv2c2a, libexiv2-0.12, libexiv2-0
-Replaces: libexiv2c2a, libexiv2-0.12, libexiv2-0
+Conflicts: libexiv2-0
+Replaces: libexiv2-0
 Recommends: exiv2
 Description: EXIF/IPTC metadata manipulation library
  Exiv2 library supports: