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

[Mark Purcell]

Author: msp
Date: 2008-07-13 12:22:34 +0000 (Sun, 13 Jul 2008)
New Revision: 11466

Modified:
   kde-extras/digikam/branches/kde4/debian/changelog
   kde-extras/digikam/branches/kde4/debian/control
Log:
Build-Conflicts: libmarble-dev
(Debian version crashes digikam -
http://mail.kde.org/pipermail/digikam-devel/2008-July/019748.html)

Modified: kde-extras/digikam/branches/kde4/debian/changelog
===================================================================
--- kde-extras/digikam/branches/kde4/debian/changelog	2008-07-12 15:11:53 UTC (rev 11465)
+++ kde-extras/digikam/branches/kde4/debian/changelog	2008-07-13 12:22:34 UTC (rev 11466)
@@ -5,6 +5,9 @@
   * Update KDE4 build-depends
   * Force -lpthread with ${CMAKE_THREAD_LIBS_INIT}; link-pthread.patch
   * Refresh debian/*.install for KDE4
+  * Build-Conflicts: libmarble-dev
+    (Debian version crashes digikam -
+    http://mail.kde.org/pipermail/digikam-devel/2008-July/019748.html)
 
  -- Mark Purcell <msp at debian.org>  Sat, 05 Jul 2008 10:31:00 +1000
 

Modified: kde-extras/digikam/branches/kde4/debian/control
===================================================================
--- kde-extras/digikam/branches/kde4/debian/control	2008-07-12 15:11:53 UTC (rev 11465)
+++ kde-extras/digikam/branches/kde4/debian/control	2008-07-13 12:22:34 UTC (rev 11466)
@@ -9,10 +9,11 @@
  libkipi5-dev, libkexiv2-6-dev, libkdcraw5-dev,
  liblcms1-dev, libtiff4-dev, libpng12-dev,
  libjasper-dev,
- kdepimlibs5-dev, libmarble-dev,
+ kdepimlibs5-dev, 
  libsqlite3-dev,
  libltdl3-dev
 # liblensfun (ITP needed)
+Build-Conflicts: libmarble-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/digikam/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/digikam/?op=log