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

[Mark Purcell]

Author: msp
Date: 2010-03-30 11:50:47 +0000 (Tue, 30 Mar 2010)
New Revision: 17549

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
Log:
Renable Build-Depends: libmarble-dev

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2010-03-30 09:34:52 UTC (rev 17548)
+++ kde-extras/digikam/trunk/debian/changelog	2010-03-30 11:50:47 UTC (rev 17549)
@@ -1,8 +1,9 @@
-digikam (2:1.2.0-1) UNRELEASED; urgency=low
+digikam (2:1.2.0-0+snapshots) UNRELEASED; urgency=low
 
   * New upstream release
+  * Renable Build-Depends: libmarble-dev
 
- -- Mark Purcell <msp at debian.org>  Tue, 30 Mar 2010 19:18:32 +1100
+ -- Mark Purcell <msp at debian.org>  Tue, 30 Mar 2010 22:50:16 +1100
 
 digikam (2:1.1.0-1+snapshots) UNRELEASED; urgency=low
 

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2010-03-30 09:34:52 UTC (rev 17548)
+++ kde-extras/digikam/trunk/debian/control	2010-03-30 11:50:47 UTC (rev 17549)
@@ -6,14 +6,13 @@
 Build-Depends: cdbs, quilt, debhelper (>= 7.2), pkg-kde-tools (>= 0.4.6), cmake (>= 2.6.2),
  kdelibs5-dev, kdepimlibs5-dev,
  libglib2.0-dev, libgphoto2-2-dev (>= 2.4),
- libkipi-dev, libkexiv2-7-dev, libkdcraw-dev,
+ libkipi-dev, libkexiv2-7-dev, libkdcraw-dev, libmarble-dev,
  liblcms1-dev, libtiff4-dev, libpng12-dev, liblqr-1-0-dev,
  libjasper-dev,
  liblensfun-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