rev 5534 - kde-extras/digikam/branches/experimental/debian

[Mark Purcell]

Author: msp
Date: 2007-02-04 12:32:22 +0100 (Sun, 04 Feb 2007)
New Revision: 5534

Modified:
   kde-extras/digikam/branches/experimental/debian/changelog
   kde-extras/digikam/branches/experimental/debian/control
Log:
* Showfoto also Conflicts: digikam (<= 2:0.9.0-1)

Modified: kde-extras/digikam/branches/experimental/debian/changelog
===================================================================
--- kde-extras/digikam/branches/experimental/debian/changelog	2007-02-04 10:58:36 UTC (rev 5533)
+++ kde-extras/digikam/branches/experimental/debian/changelog	2007-02-04 11:32:22 UTC (rev 5534)
@@ -9,14 +9,16 @@
       with these pkgs.
     + Point XS-Vcs-* headers to branches/experimental until 0.9 is moved to sid
       post etch release.
-    + remove runtime dependency on libgpthoto2-2-dev. No longer necessary.
     + Bump kipi-plugins conflict to <= 0.1.3~rc0. So libexiv2-0.12 is used
       for kipi-plugins too.
   * Merging Kubuntu change: split digikam into digikam and showfoto
     packages. Thx to Anthony Mercatante <tonio at ubuntu.com>
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue,  9 Jan 2007 02:00:43 +0100
+  [ Mark Purcell ]
+  * Showfoto also Conflicts: digikam (<= 2:0.9.0-1)
 
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 18 Dec 2006 14:40:34 +0100
+
 digikam (2:0.9.0-1) experimental; urgency=low
 
   * new upstream release

Modified: kde-extras/digikam/branches/experimental/debian/control
===================================================================
--- kde-extras/digikam/branches/experimental/debian/control	2007-02-04 10:58:36 UTC (rev 5533)
+++ kde-extras/digikam/branches/experimental/debian/control	2007-02-04 11:32:22 UTC (rev 5534)
@@ -10,7 +10,7 @@
 
 Package: digikam
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libgphoto2-2-dev
 Recommends: digikamimageplugins (>> 2:0.9), kipi-plugins, kdeprint, konqueror
 Suggests: digikam-doc
 Conflicts: digikamimageplugins (<< 2:0.9.0~rc2), kipi-plugins (<= 0.1.3~rc0)
@@ -38,7 +38,7 @@
 Depends: ${shlibs:Depends}, digikam (>= 2:0.9.0-2)
 Recommends: digikamimageplugins, kipi-plugins, kdeprint, konqueror
 Replaces: digikam (<= 2:0.9.0-1)
-Conflicts: digikamimageplugins (<< 2:0.9.0~rc2)
+Conflicts: digikam (<= 2:0.9.0-1), digikamimageplugins (<< 2:0.9.0~rc2)
 Description: image viewer/editor for KDE
  Showphoto is part of the Digikam project.
  It allows to browse your photo collection and edit them with ease.