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

[Mark Purcell]

Author: msp
Date: 2009-01-29 08:31:29 +0000 (Thu, 29 Jan 2009)
New Revision: 13650

Modified:
   kde-extras/digikam/branches/kde4/debian/changelog
   kde-extras/digikam/branches/kde4/debian/control
   kde-extras/digikam/branches/kde4/debian/rules
Log:
* New upstream release
* Depends: pkg-kde-tools
* Build without lensfuns support while we await NEW

Modified: kde-extras/digikam/branches/kde4/debian/changelog
===================================================================
--- kde-extras/digikam/branches/kde4/debian/changelog	2009-01-29 00:55:05 UTC (rev 13649)
+++ kde-extras/digikam/branches/kde4/debian/changelog	2009-01-29 08:31:29 UTC (rev 13650)
@@ -1,18 +1,14 @@
-digikam (2:0.10.0-rc1-0r1) UNRELEASED; urgency=low
+digikam (2:0.10.0~rc1-1) UNRELEASED; urgency=low
 
-  * (NOT RELEASED YET) New upstream release
+  * New upstream release
   * Rework debian/*.install
   * Do not ship oxygen icons - Depend kde-icons-oxygen
   * Update Vcs for KDE4
+  * Depends: pkg-kde-tools
+  * Build without lensfuns support while we await NEW
 
  -- Mark Purcell <msp at debian.org>  Sat, 24 Jan 2009 17:56:31 +1100
 
-digikam (2:0.10.0~beta8-0r1) UNRELEASED; urgency=low
-
-  * (NOT RELEASED YET) New upstream release
-
- -- Mark Purcell <msp at debian.org>  Wed, 07 Jan 2009 11:41:42 +1100
-
 digikam (2:0.10.0~beta7-0r2) UNRELEASED; urgency=low
 
   * New upstream release

Modified: kde-extras/digikam/branches/kde4/debian/control
===================================================================
--- kde-extras/digikam/branches/kde4/debian/control	2009-01-29 00:55:05 UTC (rev 13649)
+++ kde-extras/digikam/branches/kde4/debian/control	2009-01-29 08:31:29 UTC (rev 13650)
@@ -3,17 +3,17 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach at mpe.mpg.de>, Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), cmake (>= 2.6.2),
+Build-Depends: cdbs, debhelper (>= 7), pkg-kde-tools, cmake (>= 2.6.2),
  libqt4-dev (>= 4.4), kdelibs5-dev, 
  libgphoto2-2-dev (>= 2.4),
  libkipi6-dev, libkexiv2-7-dev, libkdcraw7-dev,
  liblcms1-dev, libtiff4-dev, libpng12-dev,
  libjasper-dev,
  kdepimlibs5-dev,
+# liblensfun-dev, awaiting NEW
  libmarble-dev, 
  libsqlite3-dev,
- libltdl3-dev,
- liblensfun-dev
+ libltdl3-dev
 Standards-Version: 3.8.0
 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

Modified: kde-extras/digikam/branches/kde4/debian/rules
===================================================================
--- kde-extras/digikam/branches/kde4/debian/rules	2009-01-29 00:55:05 UTC (rev 13649)
+++ kde-extras/digikam/branches/kde4/debian/rules	2009-01-29 08:31:29 UTC (rev 13650)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk