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

[Mark Purcell]

Author: msp
Date: 2011-12-06 23:37:07 +0000 (Tue, 06 Dec 2011)
New Revision: 19016

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/digikam-data.install
   kde-extras/digikam/trunk/debian/digikam.install
   kde-extras/digikam/trunk/debian/kipi-plugins-common.install
Log:
* New upstream release
* Build with KDE SC 4.7 from experimental (epoc 4:)

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2011-12-03 02:19:01 UTC (rev 19015)
+++ kde-extras/digikam/trunk/debian/changelog	2011-12-06 23:37:07 UTC (rev 19016)
@@ -1,3 +1,10 @@
+digikam (4:2.3.0-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Build with KDE SC 4.7 from experimental (epoc 4:)
+
+ -- Mark Purcell <msp at debian.org>  Tue, 08 Nov 2011 21:05:29 +1100
+
 digikam (2:2.2.0-2) experimental; urgency=low
 
   * Fix override disparties: Section: doc & kde

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2011-12-03 02:19:01 UTC (rev 19015)
+++ kde-extras/digikam/trunk/debian/control	2011-12-06 23:37:07 UTC (rev 19016)
@@ -5,7 +5,9 @@
 Uploaders: Achim Bohnet <ach at mpe.mpg.de>, Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>
 Build-Depends: debhelper (>= 8), pkg-kde-tools (>= 0.9), pkg-config, cmake (>= 2.6.2), autotools-dev, chrpath,
  doxygen,
- kdelibs5-dev (>= 4:4.4.4), kdepimlibs5-dev,
+ kdelibs5-dev (>= 4:4.7), kdepimlibs5-dev (>= 4:4.7),
+ libmarble-dev (>= 4:4.7),
+ libkipi-dev (>= 4:4.7), libkexiv2-dev (>= 4:4.7), libkdcraw-dev (>= 4:4.7), libksane-dev (>= 4:4.7),
  libqt4-dev, libqt4-opengl-dev, libgl1-mesa-dev, libglu1-mesa-dev,
  libqtwebkit-dev,
  libgphoto2-2-dev,
@@ -19,7 +21,6 @@
  shared-desktop-ontologies,
  mysql-server-5.1 | mysql-server,
  libglib2.0-dev, libgphoto2-2-dev (>= 2.4),
- libmarble-dev (>= 4:4.5),
  liblcms1-dev, libtiff4-dev, libpng12-dev, liblqr-1-0-dev,
  libcv-dev (>= 2.2), libcvaux-dev (>= 2.2), libopencv-contrib-dev (>= 2.2), libopencv-gpu-dev (>= 2.2),
  libjasper-dev,
@@ -28,8 +29,6 @@
  libsqlite3-dev,
  libboost-graph-dev,
  libx11-dev, libxrandr-dev, libexpat1-dev | libexpat-dev
-# Digikam 2.x ships kdegraphics as a private library as it uses KDE SC 4.7 components
-Build-Conflicts: libkipi-dev, libkexiv2-dev (>= 4:4.5), libkdcraw-dev (>= 4:4.5), libksane-dev
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/digikam/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/digikam/trunk?op=log
@@ -39,7 +38,6 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite, digikam-data (= ${source:Version})
 Recommends: www-browser, kipi-plugins, mplayerthumbs
-Conflicts: libkexiv2-dev, libkdcraw-dev, libkipi-dev, kdegraphics-libs-data
 Suggests: digikam-doc
 Section: doc
 Description: digital photo management application for KDE
@@ -141,7 +139,6 @@
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}, kipi-plugins-common (= ${source:Version})
-Conflicts: libkipi8
 Recommends: graphicsmagick-imagemagick-compat (>= 1.1.7) | imagemagick (>= 5.4.8), konqueror, hugin, enblend, enfuse
 Suggests: gallery, gimp, kmail, vorbis-tools
 Enhances: digikam, gwenview, kphotoalbum, showimg

Modified: kde-extras/digikam/trunk/debian/digikam-data.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam-data.install	2011-12-03 02:19:01 UTC (rev 19015)
+++ kde-extras/digikam/trunk/debian/digikam-data.install	2011-12-06 23:37:07 UTC (rev 19016)
@@ -1,7 +1,6 @@
 usr/share/kde4/apps/[a-j,l-r]*
 usr/share/kde4/apps/solid
 usr/share/kde4/services/digikam*
-usr/share/kde4/services/photolayoutseditorborderplugin*
 usr/share/kde4/servicetypes
 usr/share/locale/*/LC_MESSAGES/digikam.mo
 usr/share/locale/*/LC_MESSAGES/libkgeomap.mo

Modified: kde-extras/digikam/trunk/debian/digikam.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.install	2011-12-03 02:19:01 UTC (rev 19015)
+++ kde-extras/digikam/trunk/debian/digikam.install	2011-12-06 23:37:07 UTC (rev 19016)
@@ -12,13 +12,9 @@
 usr/lib/kde4/digikam*
 usr/lib/kde4/kio*
 usr/lib/kde4/libexec
-usr/lib/kde4/photolayoutseditorborderplugin*
 usr/lib/pkgconfig
 usr/share/applications/kde4/[a-r]*
 usr/share/applications/kde4/scangui.desktop
 usr/share/kde4/config.kcfg/PLEConfigSkeleton.kcfgc
 usr/share/man/man1
-usr/lib/libkexiv2*
-usr/lib/libksane*
-usr/lib/libkdcraw*
 usr/lib/cmake

Modified: kde-extras/digikam/trunk/debian/kipi-plugins-common.install
===================================================================
--- kde-extras/digikam/trunk/debian/kipi-plugins-common.install	2011-12-03 02:19:01 UTC (rev 19015)
+++ kde-extras/digikam/trunk/debian/kipi-plugins-common.install	2011-12-06 23:37:07 UTC (rev 19016)
@@ -3,4 +3,4 @@
 usr/share/kde4/apps/kipiplugin_*
 usr/share/kde4/services/kipiplugin_*
 usr/share/locale/*/LC_MESSAGES/kipiplugin*
-usr/share/kde4/apps/kipi
+usr/share/kde4/apps/kipi*