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

[Mark Purcell]

Author: msp
Date: 2009-01-24 06:56:42 +0000 (Sat, 24 Jan 2009)
New Revision: 13492

Modified:
   kde-extras/digikam/branches/kde4/debian/changelog
   kde-extras/digikam/branches/kde4/debian/control
   kde-extras/digikam/branches/kde4/debian/digikam.install
   kde-extras/digikam/branches/kde4/debian/showfoto.install
Log:
* Do not ship oxygen icons - Depend kde-icons-oxygen
* Update Vcs for KDE4

Modified: kde-extras/digikam/branches/kde4/debian/changelog
===================================================================
--- kde-extras/digikam/branches/kde4/debian/changelog	2009-01-24 04:25:15 UTC (rev 13491)
+++ kde-extras/digikam/branches/kde4/debian/changelog	2009-01-24 06:56:42 UTC (rev 13492)
@@ -2,8 +2,10 @@
 
   * (NOT RELEASED YET) New upstream release
   * Rework debian/*.install
+  * Do not ship oxygen icons - Depend kde-icons-oxygen
+  * Update Vcs for KDE4
 
- -- Mark Purcell <msp at debian.org>  Sat, 24 Jan 2009 11:13:42 +1100
+ -- Mark Purcell <msp at debian.org>  Sat, 24 Jan 2009 17:56:31 +1100
 
 digikam (2:0.10.0~beta8-0r1) UNRELEASED; urgency=low
 

Modified: kde-extras/digikam/branches/kde4/debian/control
===================================================================
--- kde-extras/digikam/branches/kde4/debian/control	2009-01-24 04:25:15 UTC (rev 13491)
+++ kde-extras/digikam/branches/kde4/debian/control	2009-01-24 06:56:42 UTC (rev 13492)
@@ -15,13 +15,13 @@
  libltdl3-dev,
  liblensfun-dev
 Standards-Version: 3.8.0
-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
+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
 
 Package: digikam
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite, marble-data (>= 4:4.1.85)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite, marble-data (>= 4:4.1.85), kde-icons-oxygen
 Recommends: konqueror
 Suggests: digikam-doc
 Description: digital photo management application for KDE

Modified: kde-extras/digikam/branches/kde4/debian/digikam.install
===================================================================
--- kde-extras/digikam/branches/kde4/debian/digikam.install	2009-01-24 04:25:15 UTC (rev 13491)
+++ kde-extras/digikam/branches/kde4/debian/digikam.install	2009-01-24 06:56:42 UTC (rev 13492)
@@ -3,8 +3,11 @@
 usr/lib
 usr/share/applications/kde4/digikam.desktop
 usr/share/icons/hicolor
-usr/share/icons/oxygen/*/actions
-usr/share/icons/oxygen/*/apps/digikam.*
+
+# Oxygen Icons allready in kde-icons-oxygen
+#usr/share/icons/oxygen/*/actions
+#usr/share/icons/oxygen/*/apps/digikam.*
+
 usr/share/locale
 usr/share/kde4
 debian/xpm.d/digikam.xpm usr/share/pixmaps/

Modified: kde-extras/digikam/branches/kde4/debian/showfoto.install
===================================================================
--- kde-extras/digikam/branches/kde4/debian/showfoto.install	2009-01-24 04:25:15 UTC (rev 13491)
+++ kde-extras/digikam/branches/kde4/debian/showfoto.install	2009-01-24 06:56:42 UTC (rev 13492)
@@ -1,5 +1,7 @@
 usr/bin/showfoto
 usr/share/applications/kde4/showfoto.desktop
-usr/share/icons/oxygen/*/apps/showfoto.*
+
+# Oxygen allready in KDE
+#usr/share/icons/oxygen/*/apps/showfoto.*
 debian/xpm.d/showfoto.xpm usr/share/pixmaps/
 debian/xpm.d/showfoto-16.xpm usr/share/pixmaps/