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

[Mark Purcell]

Author: msp
Date: 2014-05-02 21:57:43 +0000 (Fri, 02 May 2014)
New Revision: 19887

Removed:
   kde-extras/digikam/trunk/debian/patches/doc-translations-installation.diff
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/patches/sendimages-icedove.diff
   kde-extras/digikam/trunk/debian/patches/series
Log:
* New upstream release
* Refresh debian/patches/
* Drop doc-translations-installation.diff - incorporated upstream

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2014-05-02 11:37:09 UTC (rev 19886)
+++ kde-extras/digikam/trunk/debian/changelog	2014-05-02 21:57:43 UTC (rev 19887)
@@ -1,3 +1,11 @@
+digikam (4:4.0.0~rc-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Refresh debian/patches/
+  * Drop doc-translations-installation.diff - incorporated upstream
+
+ -- Mark Purcell <msp at debian.org>  Fri, 02 May 2014 21:37:20 +1000
+
 digikam (4:4.0.0~beta4-1) experimental; urgency=medium
 
   * Team upload.

Modified: kde-extras/digikam/trunk/debian/patches/sendimages-icedove.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/sendimages-icedove.diff	2014-05-02 11:37:09 UTC (rev 19886)
+++ kde-extras/digikam/trunk/debian/patches/sendimages-icedove.diff	2014-05-02 21:57:43 UTC (rev 19887)
@@ -1,8 +1,8 @@
-Index: digikam-4.0.0~beta1/extra/kipi-plugins/sendimages/sendimages.cpp
+Index: digikam-4.0.0~rc/extra/kipi-plugins/sendimages/sendimages.cpp
 ===================================================================
---- digikam-4.0.0~beta1.orig/extra/kipi-plugins/sendimages/sendimages.cpp	2013-12-02 21:24:24.000000000 +1100
-+++ digikam-4.0.0~beta1/extra/kipi-plugins/sendimages/sendimages.cpp	2013-12-11 22:33:28.257866860 +1100
-@@ -583,6 +583,7 @@
+--- digikam-4.0.0~rc.orig/extra/kipi-plugins/sendimages/sendimages.cpp	2014-04-28 07:20:41.000000000 +1000
++++ digikam-4.0.0~rc/extra/kipi-plugins/sendimages/sendimages.cpp	2014-05-02 21:46:38.989248687 +1000
+@@ -582,6 +582,7 @@
  
                  case EmailSettings::NETSCAPE:
                  case EmailSettings::THUNDERBIRD:
@@ -10,7 +10,7 @@
                  case EmailSettings::GMAILAGENT:
                  {
                      QString prog;
-@@ -595,6 +596,10 @@
+@@ -594,6 +595,10 @@
                      {
                          prog = QString("thunderbird");
                      }
@@ -21,10 +21,10 @@
                      else
                      {
                          prog = QString("gmailagent");
-Index: digikam-4.0.0~beta1/extra/kipi-plugins/sendimages/emailsettings.h
+Index: digikam-4.0.0~rc/extra/kipi-plugins/sendimages/emailsettings.h
 ===================================================================
---- digikam-4.0.0~beta1.orig/extra/kipi-plugins/sendimages/emailsettings.h	2013-12-02 21:24:24.000000000 +1100
-+++ digikam-4.0.0~beta1/extra/kipi-plugins/sendimages/emailsettings.h	2013-12-11 22:32:19.483052140 +1100
+--- digikam-4.0.0~rc.orig/extra/kipi-plugins/sendimages/emailsettings.h	2014-04-28 07:20:41.000000000 +1000
++++ digikam-4.0.0~rc/extra/kipi-plugins/sendimages/emailsettings.h	2014-05-02 21:46:38.989248687 +1000
 @@ -70,6 +70,7 @@
          NETSCAPE,
          SYLPHEED,
@@ -33,10 +33,10 @@
          THUNDERBIRD
      };
  
-Index: digikam-4.0.0~beta1/extra/kipi-plugins/sendimages/settingswidget.cpp
+Index: digikam-4.0.0~rc/extra/kipi-plugins/sendimages/settingswidget.cpp
 ===================================================================
---- digikam-4.0.0~beta1.orig/extra/kipi-plugins/sendimages/settingswidget.cpp	2013-12-02 21:24:24.000000000 +1100
-+++ digikam-4.0.0~beta1/extra/kipi-plugins/sendimages/settingswidget.cpp	2013-12-11 22:32:19.483052140 +1100
+--- digikam-4.0.0~rc.orig/extra/kipi-plugins/sendimages/settingswidget.cpp	2014-04-28 07:20:41.000000000 +1000
++++ digikam-4.0.0~rc/extra/kipi-plugins/sendimages/settingswidget.cpp	2014-05-02 21:46:38.993248621 +1000
 @@ -100,6 +100,7 @@
      d->mailAgentName->insertItem(EmailSettings::SYLPHEED,      "Sylpheed");
      d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, "Sylpheed-Claws");

Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	2014-05-02 11:37:09 UTC (rev 19886)
+++ kde-extras/digikam/trunk/debian/patches/series	2014-05-02 21:57:43 UTC (rev 19887)
@@ -1,2 +1 @@
 sendimages-icedove.diff
-doc-translations-installation.diff