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

[Mark Purcell]

Author: msp
Date: 2010-11-28 00:50:50 +0000 (Sun, 28 Nov 2010)
New Revision: 18732

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/rules
   kde-extras/digikam/trunk/debian/watch
Log:
  - Add Build-Depends: shared-desktop-ontologies & mysql-server-5.1
  - Requires packages from http://qt-kde.debian.net/
* New watch file for sf.net
* dh_installchangelogs NEWS

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2010-11-27 16:41:24 UTC (rev 18731)
+++ kde-extras/digikam/trunk/debian/changelog	2010-11-28 00:50:50 UTC (rev 18732)
@@ -1,10 +1,14 @@
-digikam (2:1.4.0-0rc1) UNRELEASED; urgency=low
+digikam (2:1.6.0-1) experimental; urgency=low
 
   * New upstream release (Closes: #585081)
   * Remove debian/patches included upstream
   * Update Build-Depends for KDE SC 4.5
+    - Add Build-Depends: shared-desktop-ontologies & mysql-server-5.1
+    - Requires packages from http://qt-kde.debian.net/
+  * New watch file for sf.net
+  * dh_installchangelogs NEWS
 
- -- Mark Purcell <msp at debian.org>  Sat, 11 Sep 2010 08:45:04 +1000
+ -- Mark Purcell <msp at debian.org>  Sun, 28 Nov 2010 11:50:13 +1100
 
 digikam (2:1.2.0-7) unstable; urgency=medium
 

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2010-11-27 16:41:24 UTC (rev 18731)
+++ kde-extras/digikam/trunk/debian/control	2010-11-28 00:50:50 UTC (rev 18732)
@@ -4,9 +4,12 @@
 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: debhelper (>= 7.2), pkg-kde-tools (>= 0.9), cmake (>= 2.6.2), autotools-dev,
+ doxygen,
  kdelibs5-dev (>= 4:4.4.4), kdepimlibs5-dev,
+ shared-desktop-ontologies,
+ mysql-server-5.1 | mysql-server,
  libglib2.0-dev, libgphoto2-2-dev (>= 2.4),
- libkipi-dev, libkexiv2-dev (>= 4:4.5), libkdcraw-dev (>= 4:4.5, libmarble-dev (>= 4:4.5),
+ libkipi-dev, libkexiv2-dev (>= 4:4.5), libkdcraw-dev (>= 4:4.5), libmarble-dev (>= 4:4.5),
  liblcms1-dev, libtiff4-dev, libpng12-dev, liblqr-1-0-dev,
  libjasper-dev,
  liblensfun-dev,

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2010-11-27 16:41:24 UTC (rev 18731)
+++ kde-extras/digikam/trunk/debian/rules	2010-11-28 00:50:50 UTC (rev 18732)
@@ -3,5 +3,8 @@
 %:
 	dh $@ --with kde --parallel
 
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS
+
 override_dh_strip:
 	dh_strip -a --dbg-package=digikam-dbg

Modified: kde-extras/digikam/trunk/debian/watch
===================================================================
--- kde-extras/digikam/trunk/debian/watch	2010-11-27 16:41:24 UTC (rev 18731)
+++ kde-extras/digikam/trunk/debian/watch	2010-11-28 00:50:50 UTC (rev 18732)
@@ -1,8 +1,8 @@
-# See uscan(1) for format
 version=3
 
-opts=uversionmangle=s/-/~/  \
- http://sf.net/digikam/digikam-(\d+.*)\.tar\.bz2 debian svn-upgrade
+opts=filenamemangle=s/.*\/(.*)\/download/$1/,downloadurlmangle=s/http\:\/\/sourceforge\.net\/projects\/digikam\/files(.*)\/download/http\:\/\/downloads\.sourceforge\.net\/project\/digikam$1/ \
+    http://sourceforge.net/projects/digikam/files/ \
+    (?:.*)/digikam-([\d\.]+)\.tar.bz2/download debian svn-upgrade
 
 #opts=uversionmangle=s/-/~/  \
-# #http://digikam3rdparty.free.fr/0.10.x-releases/digikam-(.*).tar.bz2
+# http://sf.net/digikam/digikam-(\d+.*)\.tar\.bz2 debian svn-upgrade