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

[Mark Purcell]

Author: msp
Date: 2010-02-01 15:53:09 +0000 (Mon, 01 Feb 2010)
New Revision: 16765

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
Log:
* New upstream release
* Recommenas:d dolphin used in the Open Filemanager function
  - non-kde users are not required to install Recommends:
  - Fix "digikam 1.0 should Recommend: dolphin" (Closes: #562152)
* Build-Conflicts: libmarble-dev (See bug 560893)
  - causes 100% CPU on exit

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2010-02-01 15:16:14 UTC (rev 16764)
+++ kde-extras/digikam/trunk/debian/changelog	2010-02-01 15:53:09 UTC (rev 16765)
@@ -1,3 +1,14 @@
+digikam (2:1.1.0-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Recommenas:d dolphin used in the Open Filemanager function
+    - non-kde users are not required to install Recommends:
+    - Fix "digikam 1.0 should Recommend: dolphin" (Closes: #562152)
+  * Build-Conflicts: libmarble-dev (See bug 560893)
+    - causes 100% CPU on exit
+
+ -- Mark Purcell <msp at debian.org>  Mon, 01 Feb 2010 16:30:50 +0100
+
 digikam (2:1.0.0-1) unstable; urgency=low
 
   * New upstream release

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2010-02-01 15:16:14 UTC (rev 16764)
+++ kde-extras/digikam/trunk/debian/control	2010-02-01 15:53:09 UTC (rev 16765)
@@ -10,10 +10,10 @@
  liblcms1-dev, libtiff4-dev, libpng12-dev, liblqr-1-0-dev,
  libjasper-dev,
  liblensfun-dev,
- libmarble-dev,
  libsqlite3-dev,
  libltdl3-dev,
  libx11-dev
+Build-Conflicts: libmarble-dev
 Standards-Version: 3.8.3
 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