rev 20054 - in kde-extras/digikam/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2015-04-06 05:14:27 +0000 (Mon, 06 Apr 2015)
New Revision: 20054

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/patches/series
   kde-extras/digikam/trunk/debian/watch
Log:
* New upstream release
  - Fixes "new upstream release 4.7.0" (Closes: #777110)
* Ack NMU - Thanks jmv
* Non-maintainer upload.
* Add versioned Breaks/Replaces on digikam-doc, that fixes the Squeeze to
  Wheezy upgrade. (Closes: #767570)

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2015-04-06 04:37:35 UTC (rev 20053)
+++ kde-extras/digikam/trunk/debian/changelog	2015-04-06 05:14:27 UTC (rev 20054)
@@ -1,3 +1,19 @@
+digikam (4:4.8.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Fixes "new upstream release 4.7.0" (Closes: #777110)
+  * Ack NMU - Thanks jmv
+
+ -- Mark Purcell <mark at localhost.localdomain>  Mon, 06 Apr 2015 14:37:44 +1000
+
+digikam (4:4.4.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add versioned Breaks/Replaces on digikam-doc, that fixes the Squeeze to
+    Wheezy upgrade. (Closes: #767570)
+
+ -- Jean-Michel Nirgal Vourgère <jmv_deb at nirgal.com>  Sat, 15 Nov 2014 12:15:00 +0000
+
 digikam (4:4.4.0-1) unstable; urgency=medium
 
   * Team upload.

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2015-04-06 04:37:35 UTC (rev 20053)
+++ kde-extras/digikam/trunk/debian/control	2015-04-06 05:14:27 UTC (rev 20054)
@@ -116,8 +116,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, digikam-private-libs (= ${binary:Version})
 Recommends: dolphin, kipi-plugins
-Breaks: kipi-plugins-common (<< 4:3.1.0-2~)
-Replaces: kipi-plugins-common (<< 4:3.1.0-2~)
+Breaks: digikam-doc (<< 2:2.0.0-1), kipi-plugins-common (<< 4:3.1.0-2~)
+Replaces: digikam-doc (<< 2:2.0.0-1), kipi-plugins-common (<< 4:3.1.0-2~)
 Description: image viewer/editor for KDE
  showFoto is the standalone image editor of the digiKam project.
  .

Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	2015-04-06 04:37:35 UTC (rev 20053)
+++ kde-extras/digikam/trunk/debian/patches/series	2015-04-06 05:14:27 UTC (rev 20054)
@@ -1,2 +1,2 @@
-upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
+#upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
 sendimages-icedove.diff

Modified: kde-extras/digikam/trunk/debian/watch
===================================================================
--- kde-extras/digikam/trunk/debian/watch	2015-04-06 04:37:35 UTC (rev 20053)
+++ kde-extras/digikam/trunk/debian/watch	2015-04-06 05:14:27 UTC (rev 20054)
@@ -3,5 +3,5 @@
 opts=uversionmangle=s/-/~/  \
  http://download.kde.org/stable/digikam/digikam-(.*).tar.bz2 debian svn-upgrade
 
-opts=uversionmangle=s/-/~/  \
- http://download.kde.org/unstable/digikam/digikam-(.*).tar.bz2 debian svn-upgrade
+#opts=uversionmangle=s/-/~/  \
+# http://download.kde.org/unstable/digikam/digikam-(.*).tar.bz2 debian svn-upgrade