[pkg-kde-commits] rev 2912 - kde-extras/digikam/branches/kubuntu/0.8.1/debian

[Achim Bohnet]

Author: ach-guest
Date: 2006-01-16 20:44:13 +0000 (Mon, 16 Jan 2006)
New Revision: 2912

Modified:
   kde-extras/digikam/branches/kubuntu/0.8.1/debian/changelog
   kde-extras/digikam/branches/kubuntu/0.8.1/debian/control
Log:
debian/kubuntu: merge digikam-0.8.1-1ubuntu1 changes

Modified: kde-extras/digikam/branches/kubuntu/0.8.1/debian/changelog
===================================================================
--- kde-extras/digikam/branches/kubuntu/0.8.1/debian/changelog	2006-01-16 20:30:11 UTC (rev 2911)
+++ kde-extras/digikam/branches/kubuntu/0.8.1/debian/changelog	2006-01-16 20:44:13 UTC (rev 2912)
@@ -1,3 +1,9 @@
+digikam (0.8.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * sync with debian: changelog, control
+
+ -- Achim Bohnet <ach at mpe.mpg.de>  Mon, 16 Jan 2006 20:28:35 +0100
+
 digikam (0.8.1-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET.
@@ -16,6 +22,13 @@
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Thu, 12 Jan 2006 22:31:18 +0100
 
+digikam (0.8.0-1-1ubuntu1) dapper; urgency=low
+
+  * Sync with Debian
+  * Tighten libkexif and libkipi build-deps for c++ transition
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue,  6 Dec 2005 19:57:49 +0000
+
 digikam (0.8.0-1-1) unstable; urgency=low
 
   * new upstream release
@@ -62,6 +75,12 @@
 
  -- Mark Purcell <msp at debian.org>  Fri,  2 Sep 2005 22:06:04 +0100
 
+digikam (0.7.4-5ubuntu1) dapper; urgency=low
+
+  * Tighten build-deps to kipi 0.1.2-1 to bring in libkipi0c2 not libkipi0
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 29 Oct 2005 02:22:11 +0000
+
 digikam (0.7.4-5) unstable; urgency=low
 
   [ Debian KDE Extras Team ]

Modified: kde-extras/digikam/branches/kubuntu/0.8.1/debian/control
===================================================================
--- kde-extras/digikam/branches/kubuntu/0.8.1/debian/control	2006-01-16 20:30:11 UTC (rev 2911)
+++ kde-extras/digikam/branches/kubuntu/0.8.1/debian/control	2006-01-16 20:44:13 UTC (rev 2912)
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach at mpe.mpg.de>, Mark Purcell <msp at debian.org>, Paul Telford <pxt at debian.org>
-Build-Depends: debhelper (>> 4.1), cdbs, kdelibs4-dev, libimlib2-dev, libexif-dev (>> 0.6.9), libtiff4-dev, libgphoto2-2-dev, libkexif1-dev, libkipi0-dev, automake1.9, libsqlite3-dev
+Build-Depends: debhelper (>> 4.1), cdbs (>= 0.4.32ubuntu8), kdelibs4-dev, libimlib2-dev, libexif-dev (>> 0.6.9), libtiff4-dev, libgphoto2-2-dev, libkexif1-dev (>= 0.2.2-2ubuntu1), libkipi0-dev (>= 0.1.2-2ubuntu2), automake1.9, libsqlite3-dev
 Standards-Version: 3.6.2
 
 Package: digikam