rev 11870 - kde-extras/digikam/branches/kde4/debian

[Mark Purcell]

Author: msp
Date: 2008-08-08 06:20:08 +0000 (Fri, 08 Aug 2008)
New Revision: 11870

Modified:
   kde-extras/digikam/branches/kde4/debian/changelog
   kde-extras/digikam/branches/kde4/debian/control
   kde-extras/digikam/branches/kde4/debian/digikam.install
Log:
* Include usr/share/kde4 in digikam.install
  - Digikam (experimental) doesn't work at all (Closes: #491458)
* Cleanup Depends:/ Recommends:/ COnflicts:
  - please remove the recommand line that mostly recommaneds kde3
  pakcakge (Closes: #491741)

Modified: kde-extras/digikam/branches/kde4/debian/changelog
===================================================================
--- kde-extras/digikam/branches/kde4/debian/changelog	2008-08-08 05:14:22 UTC (rev 11869)
+++ kde-extras/digikam/branches/kde4/debian/changelog	2008-08-08 06:20:08 UTC (rev 11870)
@@ -1,8 +1,13 @@
 digikam (2:0.10.0~beta1-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Include usr/share/kde4 in digikam.install
+    - Digikam (experimental) doesn't work at all (Closes: #491458)
+  * Cleanup Depends:/ Recommends:/ COnflicts:
+    - please remove the recommand line that mostly recommaneds kde3
+    pakcakge (Closes: #491741)
 
- -- Mark Purcell <msp at debian.org>  Fri, 18 Jul 2008 18:12:37 +1000
+ -- Mark Purcell <msp at debian.org>  Fri, 08 Aug 2008 16:16:36 +1000
 
 digikam (2:0.9.4-1) unstable; urgency=low
 

Modified: kde-extras/digikam/branches/kde4/debian/control
===================================================================
--- kde-extras/digikam/branches/kde4/debian/control	2008-08-08 05:14:22 UTC (rev 11869)
+++ kde-extras/digikam/branches/kde4/debian/control	2008-08-08 06:20:08 UTC (rev 11870)
@@ -9,11 +9,10 @@
  libkipi5-dev, libkexiv2-6-dev, libkdcraw5-dev,
  liblcms1-dev, libtiff4-dev, libpng12-dev,
  libjasper-dev,
- kdepimlibs5-dev, 
+ kdepimlibs5-dev, libmarble-dev,
  libsqlite3-dev,
  libltdl3-dev
 # liblensfun (ITP needed)
-Build-Conflicts: libmarble-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/digikam/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/digikam/?op=log
@@ -22,10 +21,8 @@
 Package: digikam
 Architecture: any
 Depends: ${shlibs:Depends}, libqt4-sql-sqlite
-Recommends: kipi-plugins, kdeprint, konqueror
+Recommends: konqueror
 Suggests: digikam-doc
-Conflicts: digikamimageplugins, kipi-plugins (<= 0.1.3~rc0), libkexiv2-0, libexiv2-0.12
-Replaces: digikamimageplugins
 Description: digital photo management application for KDE
  An easy to use and powerful digital photo management
  application, which makes importing, organizing and manipulating
@@ -49,10 +46,8 @@
 Package: showfoto
 Architecture: any
 Section: graphics
-Depends: ${shlibs:Depends}, digikam (>= 2:0.9.1~rc2)
-Recommends: kipi-plugins, kdeprint, konqueror
-Replaces: digikam (<= 2:0.9.0-1)
-Conflicts: digikam (<= 2:0.9.0-1), digikamimageplugins (<< 2:0.9.0~rc2)
+Depends: ${shlibs:Depends}, digikam (= ${binary:Version})
+Recommends: konqueror
 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.

Modified: kde-extras/digikam/branches/kde4/debian/digikam.install
===================================================================
--- kde-extras/digikam/branches/kde4/debian/digikam.install	2008-08-08 05:14:22 UTC (rev 11869)
+++ kde-extras/digikam/branches/kde4/debian/digikam.install	2008-08-08 06:20:08 UTC (rev 11870)
@@ -2,7 +2,6 @@
 usr/include
 usr/lib
 usr/share/applications/kde4/digikam.desktop
-usr/share/apps/digikam
 usr/share/icons/hicolor/*/apps/digikam.png
 usr/share/locale
 usr/share/kde4