rev 18886 - in kde-extras/kipi-plugins/trunk/debian: . patches

Modestas Vainius modax at alioth.debian.org
Wed Jun 1 22:15:13 UTC 2011


Author: modax
Date: 2011-06-01 22:15:12 +0000 (Wed, 01 Jun 2011)
New Revision: 18886

Added:
   kde-extras/kipi-plugins/trunk/debian/patches/dngconverter_s390_support.diff
   kde-extras/kipi-plugins/trunk/debian/patches/openvc_ftbfs_workaround.diff
Modified:
   kde-extras/kipi-plugins/trunk/debian/changelog
   kde-extras/kipi-plugins/trunk/debian/patches/sendimages-icedove.diff
   kde-extras/kipi-plugins/trunk/debian/patches/series
   kde-extras/kipi-plugins/trunk/debian/rules
Log:
Release to kipi-plugins 1.9.0-2 unstable (needed for KDE SC 4.6 transition).

* Refresh patches.
* Workaround FTBFSes caused by OpenCV bugginess with gcc 4.6. See: #624917
  (patch openvc_ftbfs_workaround.diff).
* Improve big/little endian detection in dngconverter. Fixes FTBFS on s390
  (patch dngconverter_s390_support.diff).
* Pass --parallel to dh in order to enable parallel building as needed.
* Call dh in compat=8 complaint way.
* Upload to unstable, needed for KDE SC 4.6 transition.

Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog	2011-05-30 01:42:05 UTC (rev 18885)
+++ kde-extras/kipi-plugins/trunk/debian/changelog	2011-06-01 22:15:12 UTC (rev 18886)
@@ -1,11 +1,22 @@
-kipi-plugins (1.9.0-2) UNRELEASED; urgency=low
+kipi-plugins (1.9.0-2) unstable; urgency=low
 
+  [ Mark Purcell ]
   * Upload to unstable
     - Fixes "kipi-plugins depends libkdcraw9 and libkexiv2-9" (Closes: #627000)
     - Fixes "FTBFS: gdbusintrospection.h:151: error:" (Closes: #614473)
 
- -- Mark Purcell <msp at debian.org>  Sat, 28 May 2011 22:36:08 +1000
+  [ Modestas Vainius ]
+  * Refresh patches.
+  * Workaround FTBFSes caused by OpenCV bugginess with gcc 4.6. See: #624917
+    (patch openvc_ftbfs_workaround.diff).
+  * Improve big/little endian detection in dngconverter. Fixes FTBFS on s390
+    (patch dngconverter_s390_support.diff).
+  * Pass --parallel to dh in order to enable parallel building as needed.
+  * Call dh in compat=8 complaint way.
+  * Upload to unstable, needed for KDE SC 4.6 transition.
 
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Thu, 02 Jun 2011 00:46:33 +0300
+
 kipi-plugins (1.9.0-1) experimental; urgency=low
 
   * New upstream release

Added: kde-extras/kipi-plugins/trunk/debian/patches/dngconverter_s390_support.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/dngconverter_s390_support.diff	                        (rev 0)
+++ kde-extras/kipi-plugins/trunk/debian/patches/dngconverter_s390_support.diff	2011-06-01 22:15:12 UTC (rev 18886)
@@ -0,0 +1,27 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Improve big/little endian detection in dngconverter.
+Forwarded: no
+Origin: vendor
+
+__BYTE_ORDER__ is a standard GNU C macro [1]. Neither of other checks passes on
+s390 causing a FTBFS.
+
+[1] http://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html
+
+--- a/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h
++++ b/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h
+@@ -91,6 +91,14 @@
+ #elif defined(__BIG_ENDIAN__)
+ #define qDNGBigEndian 1
+ 
++#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
++    __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
++#define qDNGBigEndian 1
++
++#elif defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
++    __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
++#define qDNGBigEndian 0
++
+ #else
+ 
+ #ifndef qXCodeRez

Added: kde-extras/kipi-plugins/trunk/debian/patches/openvc_ftbfs_workaround.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/openvc_ftbfs_workaround.diff	                        (rev 0)
+++ kde-extras/kipi-plugins/trunk/debian/patches/openvc_ftbfs_workaround.diff	2011-06-01 22:15:12 UTC (rev 18886)
@@ -0,0 +1,47 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: workaround FTBFSes caused by OpenCV bugginess with gcc 4.6
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624917
+Forwarded: not-needed
+Last-Update: 2011-06-02
+Origin: vendor
+
+--- a/removeredeyes/detection/locators/haarclassifier/haarclassifierlocator.h
++++ b/removeredeyes/detection/locators/haarclassifier/haarclassifierlocator.h
+@@ -33,6 +33,7 @@
+ #include <cv.h>
+ #include <highgui.h>
+ #else
++#include <cstddef>
+ #include <opencv/cv.h>
+ #include <opencv/highgui.h>
+ #endif
+--- a/removeredeyes/libcvblobs/Blob.h
++++ b/removeredeyes/libcvblobs/Blob.h
+@@ -38,6 +38,7 @@
+ #ifdef WIN32
+ #include <cxcore.h>
+ #else
++#include <cstddef>
+ #include <opencv/cxcore.h>
+ #endif // WIN32
+ 
+--- a/removeredeyes/libcvblobs/BlobExtraction.h
++++ b/removeredeyes/libcvblobs/BlobExtraction.h
+@@ -33,6 +33,7 @@
+ #ifdef WIN32
+ #include <cv.h>
+ #else
++#include <cstddef>
+ #include <opencv/cv.h>
+ #endif
+ 
+--- a/removeredeyes/libcvblobs/BlobResult.h
++++ b/removeredeyes/libcvblobs/BlobResult.h
+@@ -45,6 +45,7 @@
+ #ifdef WIN32
+ #include <cxcore.h>
+ #else
++#include <cstddef>
+ #include <opencv/cxcore.h>
+ #endif // WIN32
+ 

Modified: kde-extras/kipi-plugins/trunk/debian/patches/sendimages-icedove.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/sendimages-icedove.diff	2011-05-30 01:42:05 UTC (rev 18885)
+++ kde-extras/kipi-plugins/trunk/debian/patches/sendimages-icedove.diff	2011-06-01 22:15:12 UTC (rev 18886)
@@ -1,18 +1,16 @@
-diff -rux debian kipi-plugins-0.9.0.orig/sendimages/emailpage.cpp kipi-plugins-0.9.0/sendimages/emailpage.cpp
---- kipi-plugins-0.9.0.orig/sendimages/emailpage.cpp	2009-12-01 16:35:33.000000000 +0100
-+++ kipi-plugins-0.9.0/sendimages/emailpage.cpp	2009-12-20 22:21:12.000000000 +0100
-@@ -92,6 +92,7 @@
+--- a/sendimages/emailpage.cpp
++++ b/sendimages/emailpage.cpp
+@@ -91,6 +91,7 @@ EmailPage::EmailPage(QWidget* parent)
      d->mailAgentName->insertItem(EmailSettingsContainer::CLAWSMAIL,     "Claws Mail");
      d->mailAgentName->insertItem(EmailSettingsContainer::EVOLUTION,     "Evolution");
      d->mailAgentName->insertItem(EmailSettingsContainer::GMAILAGENT,    "Gmail-Agent");
 +    d->mailAgentName->insertItem(EmailSettingsContainer::ICEDOVE,       "Icedove");
      d->mailAgentName->insertItem(EmailSettingsContainer::KMAIL,         "KMail");
-     d->mailAgentName->insertItem(EmailSettingsContainer::MOZILLA,       "Mozilla");
      d->mailAgentName->insertItem(EmailSettingsContainer::NETSCAPE,      "Netscape");
-diff -rux debian kipi-plugins-0.9.0.orig/sendimages/emailsettingscontainer.h kipi-plugins-0.9.0/sendimages/emailsettingscontainer.h
---- kipi-plugins-0.9.0.orig/sendimages/emailsettingscontainer.h	2009-12-01 16:35:33.000000000 +0100
-+++ kipi-plugins-0.9.0/sendimages/emailsettingscontainer.h	2009-12-20 17:36:40.000000000 +0100
-@@ -68,7 +68,8 @@
+     d->mailAgentName->insertItem(EmailSettingsContainer::SYLPHEED,      "Sylpheed");
+--- a/sendimages/emailsettingscontainer.h
++++ b/sendimages/emailsettingscontainer.h
+@@ -68,7 +68,8 @@ public:
          NETSCAPE,
          SYLPHEED,
          SYLPHEEDCLAWS,
@@ -21,19 +19,18 @@
 +        ICEDOVE
      };
  
-     enum ImageSize 
-diff -rux debian kipi-plugins-0.9.0.orig/sendimages/sendimages.cpp kipi-plugins-0.9.0/sendimages/sendimages.cpp
---- kipi-plugins-0.9.0.orig/sendimages/sendimages.cpp	2009-12-01 16:35:33.000000000 +0100
-+++ kipi-plugins-0.9.0/sendimages/sendimages.cpp	2009-12-20 17:36:19.000000000 +0100
-@@ -490,6 +490,7 @@
-                 case EmailSettingsContainer::MOZILLA:
+     enum ImageSize
+--- a/sendimages/sendimages.cpp
++++ b/sendimages/sendimages.cpp
+@@ -497,6 +497,7 @@ bool SendImages::invokeMailAgent()
+ 
                  case EmailSettingsContainer::NETSCAPE:
                  case EmailSettingsContainer::THUNDERBIRD:
 +                case EmailSettingsContainer::ICEDOVE:
                  case EmailSettingsContainer::GMAILAGENT:
                  {
                      QString prog;
-@@ -499,6 +500,8 @@
+@@ -504,6 +505,8 @@ bool SendImages::invokeMailAgent()
                          prog = QString("netscape");
                      else if (d->settings.emailProgram == EmailSettingsContainer::THUNDERBIRD)
                          prog = QString("thunderbird");

Modified: kde-extras/kipi-plugins/trunk/debian/patches/series
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/series	2011-05-30 01:42:05 UTC (rev 18885)
+++ kde-extras/kipi-plugins/trunk/debian/patches/series	2011-06-01 22:15:12 UTC (rev 18886)
@@ -1 +1,3 @@
 sendimages-icedove.diff
+openvc_ftbfs_workaround.diff
+dngconverter_s390_support.diff

Modified: kde-extras/kipi-plugins/trunk/debian/rules
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/rules	2011-05-30 01:42:05 UTC (rev 18885)
+++ kde-extras/kipi-plugins/trunk/debian/rules	2011-06-01 22:15:12 UTC (rev 18886)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with quilt,kde --list-missing $@
+	dh $@ --parallel --with quilt,kde --list-missing
 
 .PHONY: override_dh_auto_test




More information about the pkg-kde-commits mailing list