rev 14908 - kde-extras/digikam/trunk/debian

[Mark Purcell]

Author: msp
Date: 2009-06-10 13:48:37 +0000 (Wed, 10 Jun 2009)
New Revision: 14908

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/digikam.install
   kde-extras/digikam/trunk/debian/showfoto.install
Log:
* Update Standards Version 3.8.1 - no changes necessary
* Move shofoto data directory to showfoto package. Conflicts/Replaces
  added. Thks ubuntu

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2009-06-10 11:31:18 UTC (rev 14907)
+++ kde-extras/digikam/trunk/debian/changelog	2009-06-10 13:48:37 UTC (rev 14908)
@@ -1,11 +1,14 @@
-digikam (2:1.0.0~beta1-1) UNRELEASED; urgency=low
+digikam (2:1.0.0~beta1-1) unstable; urgency=low
 
   * New upstream release
   * Removed NEWS warning about digikam 0.10 beta
     - (Closes: #524067): "please remove NEWS entry"
   * Add Build-Depends:  liblqr-1-0-dev
+  * Update Standards Version 3.8.1 - no changes necessary
+  * Move shofoto data directory to showfoto package. Conflicts/Replaces
+    added. Thks ubuntu
 
- -- Mark Purcell <msp at debian.org>  Tue, 09 Jun 2009 08:12:49 +1000
+ -- Mark Purcell <msp at debian.org>  Wed, 10 Jun 2009 22:17:30 +1000
 
 digikam (2:0.10.0-2) unstable; urgency=low
 

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2009-06-10 11:31:18 UTC (rev 14907)
+++ kde-extras/digikam/trunk/debian/control	2009-06-10 13:48:37 UTC (rev 14908)
@@ -14,7 +14,7 @@
  libmarble-dev, 
  libsqlite3-dev,
  libltdl3-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/digikam/branches/kde4
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/digikam/branches/kde4?op=log
 Homepage: http://www.digikam.org
@@ -58,6 +58,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, digikam (= ${binary:Version})
 Recommends: dolphin, kipi-plugins
+Conflicts: digikam (<= 2:0.10.0-1ubuntu1)
+Replaces: digikam (<= 2:0.10.0-1ubuntu1)
 Description: image viewer/editor for KDE
  Showphoto is the standalone image editor of the  digiKam project.
  .

Modified: kde-extras/digikam/trunk/debian/digikam.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.install	2009-06-10 11:31:18 UTC (rev 14907)
+++ kde-extras/digikam/trunk/debian/digikam.install	2009-06-10 13:48:37 UTC (rev 14908)
@@ -8,6 +8,9 @@
 #usr/share/icons/oxygen/*/apps/digikam.*
 
 usr/share/locale
-usr/share/kde4
+usr/share/kde4/apps/solid
+usr/share/kde4/apps/digikam
+usr/share/kde4/servicetypes
+usr/share/kde4/services
 debian/xpm.d/digikam.xpm usr/share/pixmaps/
 debian/xpm.d/digikam-16.xpm usr/share/pixmaps/

Modified: kde-extras/digikam/trunk/debian/showfoto.install
===================================================================
--- kde-extras/digikam/trunk/debian/showfoto.install	2009-06-10 11:31:18 UTC (rev 14907)
+++ kde-extras/digikam/trunk/debian/showfoto.install	2009-06-10 13:48:37 UTC (rev 14908)
@@ -3,5 +3,7 @@
 
 # Oxygen allready in KDE
 #usr/share/icons/oxygen/*/apps/showfoto.*
+
+usr/share/kde4/apps/showfoto
 debian/xpm.d/showfoto.xpm usr/share/pixmaps/
 debian/xpm.d/showfoto-16.xpm usr/share/pixmaps/