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

[Achim Bohnet]

Author: ach-guest
Date: 2007-01-10 02:18:49 +0100 (Wed, 10 Jan 2007)
New Revision: 5282

Added:
   kde-extras/digikam/branches/experimental/debian/digikam.manpages
   kde-extras/digikam/branches/experimental/debian/digikam.menu
   kde-extras/digikam/branches/experimental/debian/showfoto.install
   kde-extras/digikam/branches/experimental/debian/showfoto.manpages
   kde-extras/digikam/branches/experimental/debian/showfoto.menu
Removed:
   kde-extras/digikam/branches/experimental/debian/menu
Modified:
   kde-extras/digikam/branches/experimental/debian/changelog
   kde-extras/digikam/branches/experimental/debian/control
   kde-extras/digikam/branches/experimental/debian/digikam.install
   kde-extras/digikam/branches/experimental/debian/rules
Log:
digikam 0.9
  * 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>

Modified: kde-extras/digikam/branches/experimental/debian/changelog
===================================================================
--- kde-extras/digikam/branches/experimental/debian/changelog	2007-01-09 07:44:54 UTC (rev 5281)
+++ kde-extras/digikam/branches/experimental/debian/changelog	2007-01-10 01:18:49 UTC (rev 5282)
@@ -1,5 +1,7 @@
-digikam (2:0.9.0-2) experimental; urgency=low
+digikam (2:0.9.0-2) UNRELEASED; urgency=low
 
+  * NOT YET RELEASED
+
   [ Achim Bohnet ]
   * debian/control:
     + libdigikam0 and libdigikam-dev existed only for a very short period
@@ -8,6 +10,10 @@
     + 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
 

Modified: kde-extras/digikam/branches/experimental/debian/control
===================================================================
--- kde-extras/digikam/branches/experimental/debian/control	2007-01-09 07:44:54 UTC (rev 5281)
+++ kde-extras/digikam/branches/experimental/debian/control	2007-01-10 01:18:49 UTC (rev 5282)
@@ -13,7 +13,7 @@
 Depends: ${shlibs:Depends}
 Recommends: digikamimageplugins (>> 2:0.9), kipi-plugins, kdeprint, konqueror
 Suggests: digikam-doc
-Conflicts: digikamimageplugins (<< 2:0.9.0~rc2), kipi-plugins (<< 0.1+beta2-20)
+Conflicts: digikamimageplugins (<< 2:0.9.0~rc2), kipi-plugins (<= 0.1.3~rc0)
 Description: digital photo management application for KDE
  Digikam is an easy to use and powerful digital photo management
  application, which makes importing, organizing and manipulating,
@@ -31,3 +31,16 @@
  very useful extensions.
  .
  Homepage: http://www.digikam.org
+
+Package: showfoto
+Architecture: any
+Section: graphics
+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)
+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.
+ .
+ Homepage: http://www.digikam.org

Modified: kde-extras/digikam/branches/experimental/debian/digikam.install
===================================================================
--- kde-extras/digikam/branches/experimental/debian/digikam.install	2007-01-09 07:44:54 UTC (rev 5281)
+++ kde-extras/digikam/branches/experimental/debian/digikam.install	2007-01-10 01:18:49 UTC (rev 5282)
@@ -1 +1,18 @@
-debian/xpm.d/* usr/share/pixmaps
+debian/tmp/usr/include/kde/*
+debian/tmp/usr/share/apps/digikam/*
+debian/tmp/usr/share/servicetypes/digikamimageplugin.desktop
+debian/tmp/usr/share/apps/konqueror/servicemenus/digikam*.desktop
+debian/tmp/usr/share/icons/hicolor/64x64/apps/digikam.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/digikam.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/digikam.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/digikam.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/digikam.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/digikam.png
+debian/tmp/usr/share/applications/kde/digikam.desktop
+debian/tmp/usr/share/services/*
+debian/tmp/usr/share/locale/*
+debian/tmp/usr/lib/*
+debian/tmp/usr/lib/kde3/*
+debian/tmp/usr/bin/digi*
+debian/xpm.d/digikam.xpm usr/share/pixmaps/
+debian/xpm.d/digikam-16.xpm usr/share/pixmaps/

Added: kde-extras/digikam/branches/experimental/debian/digikam.manpages
===================================================================
--- kde-extras/digikam/branches/experimental/debian/digikam.manpages	2007-01-09 07:44:54 UTC (rev 5281)
+++ kde-extras/digikam/branches/experimental/debian/digikam.manpages	2007-01-10 01:18:49 UTC (rev 5282)
@@ -0,0 +1,2 @@
+debian/digikam.manpage
+debian/tmp/usr/share/man/man1/digitaglinktree.1

Copied: kde-extras/digikam/branches/experimental/debian/digikam.menu (from rev 5130, kde-extras/digikam/branches/experimental/debian/menu)
===================================================================
--- kde-extras/digikam/branches/experimental/debian/menu	2006-12-12 18:33:17 UTC (rev 5130)
+++ kde-extras/digikam/branches/experimental/debian/digikam.menu	2007-01-10 01:18:49 UTC (rev 5282)
@@ -0,0 +1,11 @@
+?package(digikam):\
+	needs="X11"\
+	section="Apps/Viewers"\
+	title="digikam"\
+	icon32x32="/usr/share/pixmaps/digikam.xpm"\
+	icon16x16="/usr/share/pixmaps/digikam-16.xpm"\
+	command="/usr/bin/digikam"
+
+# Icon 32x32 digikam/digikam/pics/cr32-app-digikam.png digikam.xpm
+# Icon 16x16 digikam/digikam/pics/cr16-app-digikam.png digikam-16.xpm
+

Deleted: kde-extras/digikam/branches/experimental/debian/menu

Modified: kde-extras/digikam/branches/experimental/debian/rules
===================================================================
--- kde-extras/digikam/branches/experimental/debian/rules	2007-01-09 07:44:54 UTC (rev 5281)
+++ kde-extras/digikam/branches/experimental/debian/rules	2007-01-10 01:18:49 UTC (rev 5282)
@@ -4,10 +4,9 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/kde.mk
 
-DEB_INSTALL_MANPAGES_digikam = debian/digikam.manpage debian/showfoto.manpage
-
 install/digikam::
 	install -D -o root -g root -m 0644 debian/lintian $(CURDIR)/debian/digikam/usr/share/lintian/overrides/digikam
 	# remove empty API-docs dirs tree

Added: kde-extras/digikam/branches/experimental/debian/showfoto.install
===================================================================
--- kde-extras/digikam/branches/experimental/debian/showfoto.install	2007-01-09 07:44:54 UTC (rev 5281)
+++ kde-extras/digikam/branches/experimental/debian/showfoto.install	2007-01-10 01:18:49 UTC (rev 5282)
@@ -0,0 +1,11 @@
+debian/tmp/usr/share/apps/showfoto/*
+debian/tmp/usr/bin/showfoto
+debian/tmp/usr/share/applications/kde/showfoto.desktop
+debian/tmp/usr/share/icons/hicolor/64x64/apps/showfoto.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/showfoto.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/showfoto.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/showfoto.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/showfoto.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/showfoto.png
+debian/xpm.d/showfoto.xpm usr/share/pixmaps/
+debian/xpm.d/showfoto-16.xpm usr/share/pixmaps/

Added: kde-extras/digikam/branches/experimental/debian/showfoto.manpages
===================================================================
--- kde-extras/digikam/branches/experimental/debian/showfoto.manpages	2007-01-09 07:44:54 UTC (rev 5281)
+++ kde-extras/digikam/branches/experimental/debian/showfoto.manpages	2007-01-10 01:18:49 UTC (rev 5282)
@@ -0,0 +1 @@
+debian/showfoto.manpage

Added: kde-extras/digikam/branches/experimental/debian/showfoto.menu
===================================================================
--- kde-extras/digikam/branches/experimental/debian/showfoto.menu	2007-01-09 07:44:54 UTC (rev 5281)
+++ kde-extras/digikam/branches/experimental/debian/showfoto.menu	2007-01-10 01:18:49 UTC (rev 5282)
@@ -0,0 +1,11 @@
+?package(showfoto):\
+	needs="X11"\
+	section="Apps/Viewers"\
+	title="showfoto"\
+	icon32x32="/usr/share/pixmaps/showfoto.xpm"\
+	icon16x16="/usr/share/pixmaps/showfoto-16.xpm"\
+	command="/usr/bin/showfoto"
+
+# Icon 32x32 digikam/showfoto/cr32-app-showfoto.png showfoto.xpm
+# Icon 16x16 digikam/showfoto/cr16-app-showfoto.png showfoto-16.xpm
+