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

Fathi Boudra fabo at alioth.debian.org
Sun Aug 10 21:42:21 UTC 2008 

Author: fabo
Date: 2008-08-10 21:42:20 +0000 (Sun, 10 Aug 2008)
New Revision: 11912

Added:
   kde-extras/kipi-plugins/trunk/debian/patches/50_images2mpg_default_bin_folder.diff
Modified:
   kde-extras/kipi-plugins/trunk/debian/changelog
   kde-extras/kipi-plugins/trunk/debian/control
   kde-extras/kipi-plugins/trunk/debian/patches/10_use-icedove-instead-of-thunderbird.diff
   kde-extras/kipi-plugins/trunk/debian/patches/series
   kde-extras/kipi-plugins/trunk/debian/rules
Log:
Merge kipi-plugins 0.1.5-2 changes with current svn trunk.

Comment gcc 4.3 bug workaround in debian/rules and
add a comment to suggest -fno-tree-pre usage.


Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog	2008-08-10 21:22:00 UTC (rev 11911)
+++ kde-extras/kipi-plugins/trunk/debian/changelog	2008-08-10 21:42:20 UTC (rev 11912)
@@ -7,6 +7,18 @@
 
  -- Mark Purcell <msp at debian.org>  Fri, 13 Jun 2008 22:28:23 +1000
 
+kipi-plugins (0.1.5-2) unstable; urgency=low
+
+  * Bump Standards-Version to 3.8.0 (no changes needed).
+  * Fix package description. (Closes: #493503)
+  * Replace Thunderbird references on dialog box by Icedove. (Closes: #493100)
+  * Downgrade k3b, kmail, kooka, mpg123 and sane-utils from Recommends to
+    Suggests. (Closes: #492824)
+  * Set default binary folder to "/usr/bin" in images2mpg script.
+    (Closes: #484314)
+
+ -- Fathi Boudra <fabo at debian.org>  Sun, 10 Aug 2008 22:01:32 +0200
+
 kipi-plugins (0.1.5-1) unstable; urgency=low
 
   * New upstream release

Modified: kde-extras/kipi-plugins/trunk/debian/control
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/control	2008-08-10 21:22:00 UTC (rev 11911)
+++ kde-extras/kipi-plugins/trunk/debian/control	2008-08-10 21:42:20 UTC (rev 11912)
@@ -4,21 +4,21 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Achim Bohnet <ach at mpe.mpg.de>, Fathi Boudra <fabo at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, kdelibs4-dev,
- libexiv2-dev (>= 0.16), libgphoto2-2-dev, libgpod-nogtk-dev,
+ libexiv2-dev (>= 0.16), libexpat1-dev, libgphoto2-2-dev, libgpod-nogtk-dev,
  libkcal2-dev, libkdcraw-dev (>= 0.1.4), libkexiv2-dev (>= 0.1.6),
- libkipi0-dev (>= 0.1.5), libltdl3-dev, libtiff4-dev, libxslt1-dev, libexpat1-dev
-Standards-Version: 3.7.3
+ libkipi0-dev (>= 0.1.5), libltdl3-dev, libtiff4-dev, libxslt1-dev
+Standards-Version: 3.8.0
+Homepage: http://www.kipi-plugins.org/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kipi-plugins/trunk/?op=log
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kipi-plugins/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kipi-plugins/trunk/?op=log
-Homepage: http://www.kipi-plugins.org/
 
 Package: kipi-plugins
 Replaces: digikamplugins
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: k3b, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail, kdeprint, sane-utils, kooka, konqueror, mpg123
-Suggests: gimp, gallery, kipi-plugins-doc
-Enhances: digikam, kphotoalbum, showimg, gwenview
+Recommends: graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kdeprint, konqueror
+Suggests: gallery, gimp, k3b, kipi-plugins-doc, kmail, kooka, mpg123, sane-utils
+Enhances: digikam, gwenview, kphotoalbum, showimg
 Description: image manipulation/handling plugins for KIPI aware programs
  KIPI plugins (KDE Image Plugin Interface) is an effort to develop a
  common plugin structure for Digikam, KPhotoAlbum (formerly known as
@@ -51,7 +51,7 @@
   FindDuplicateImages: Find duplicate images in albums
   TimeAdjust:          Adjust image file time and date
   WallPaper:           Set your image as wallpaper
-  FindImages:          Find duplicate images in albums
+  FindImages:          Search images in albums
   GalleryExport:       Interface for export images collections to remote
                        Gallery (and Gallery 2) servers
   FlickrExport:        Export images to a remote Flickr web service

Modified: kde-extras/kipi-plugins/trunk/debian/patches/10_use-icedove-instead-of-thunderbird.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/10_use-icedove-instead-of-thunderbird.diff	2008-08-10 21:22:00 UTC (rev 11911)
+++ kde-extras/kipi-plugins/trunk/debian/patches/10_use-icedove-instead-of-thunderbird.diff	2008-08-10 21:42:20 UTC (rev 11912)
@@ -9,3 +9,93 @@
  
      if (config.readEntry("ImagesChangeProp", "true") == "true")
          m_changeImagesProp->setChecked( true );
+@@ -385,7 +385,7 @@
+     m_mailAgentName->insertItem( "Netscape" );
+     m_mailAgentName->insertItem( "Sylpheed" );
+     m_mailAgentName->insertItem( "Sylpheed-Claws" );
+-    m_mailAgentName->insertItem( "Thunderbird" );
++    m_mailAgentName->insertItem( "Icedove" );
+     m_mailAgentName->setCurrentText( i18n("Default") );
+     QWhatsThis::add( m_mailAgentName, i18n("<p>Select here your preferred external mail agent program."
+                                            "These mail agent versions are supported:<p>"
+@@ -398,7 +398,7 @@
+                                            "<b>Netscape</b>: >= 7.x<p>"
+                                            "<b>Sylpheed</b>: >= 0.9<p>"
+                                            "<b>Sylpheed-Claws</b>: >= 0.9<p>"
+-                                           "<b>Thunderbird</b>: >= 0.4<p>") );
++                                           "<b>Icedove</b>: >= 0.4<p>") );
+ 
+     hlay10->addWidget( m_mailAgentLabel );
+     hlay10->addStretch( 1 );
+@@ -419,7 +419,7 @@
+     connect(m_ThunderbirdBinPath, SIGNAL(textChanged(const QString&)),
+             this, SLOT(slotThunderbirdBinPathChanged(const QString&)));
+ 
+-    QWhatsThis::add( m_ThunderbirdBinPath, i18n("<p>The path name to the Thunderbird binary program.") );
++    QWhatsThis::add( m_ThunderbirdBinPath, i18n("<p>The path name to the Icedove binary program.") );
+ 
+     //---------------------------------------------
+ 
+@@ -558,7 +558,7 @@
+ 
+ void SendImagesDialog::slotMailAgentChanged(int)
+ {
+-    if ( m_mailAgentName->currentText() == "Thunderbird" )
++    if ( m_mailAgentName->currentText() == "Icedove" )
+     {
+         m_labelThunderbirdBinPath->setEnabled(true);
+         m_ThunderbirdBinPath->setEnabled(true);
+@@ -572,7 +572,7 @@
+ 
+ void SendImagesDialog::slotThunderbirdBinPathChanged(const QString &url )
+ {
+-    if ( m_mailAgentName->currentText() == "Thunderbird" )
++    if ( m_mailAgentName->currentText() == "Icedove" )
+        enableButtonOK( !url.isEmpty());
+ }
+ 
+@@ -655,13 +655,13 @@
+         return;
+     }
+ 
+-    if ( m_mailAgentName->currentText() == "Thunderbird" )
++    if ( m_mailAgentName->currentText() == "Icedove" )
+     {
+         QFile fileThunderbird(m_ThunderbirdBinPath->url());
+     
+         if (fileThunderbird.exists() == false)
+         {
+-            KMessageBox::sorry(this, i18n("Thunderbird binary path is not valid. Please check it."));
++            KMessageBox::sorry(this, i18n("Icedove binary path is not valid. Please check it."));
+             return;
+         }
+     }
+--- a/kipi-plugins/sendimages/sendimages.cpp
++++ b/kipi-plugins/sendimages/sendimages.cpp
+@@ -569,7 +569,7 @@
+     
+         if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Mozilla" ||
+              m_sendImagesDialog->m_mailAgentName->currentText() == "Netscape" ||
+-             m_sendImagesDialog->m_mailAgentName->currentText() == "Thunderbird" ||
++             m_sendImagesDialog->m_mailAgentName->currentText() == "Icedove" ||
+              m_sendImagesDialog->m_mailAgentName->currentText() == "GmailAgent")
+         {
+             m_mailAgentProc = new KProcess;
+@@ -580,7 +580,7 @@
+             {
+                 *m_mailAgentProc << "mozilla" << "-remote";
+             }
+-            else if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Thunderbird" )
++            else if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Icedove" )
+             {
+                 *m_mailAgentProc << m_thunderbirdUrl << "-remote";
+                 qDebug("URL: %s", m_thunderbirdUrl.ascii());
+@@ -863,7 +863,7 @@
+ 
+         if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Mozilla" )
+            *m_mailAgentProc2 << "mozilla" << "-mail";
+-        else if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Thunderbird" )
++        else if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Icedove" )
+            *m_mailAgentProc2 << m_thunderbirdUrl << "-mail";  ///for new versions of thunderbird, we don't need it anymore
+            //*m_mailAgentProc2 << m_thunderbirdUrl;
+         else

Added: kde-extras/kipi-plugins/trunk/debian/patches/50_images2mpg_default_bin_folder.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/50_images2mpg_default_bin_folder.diff	                        (rev 0)
+++ kde-extras/kipi-plugins/trunk/debian/patches/50_images2mpg_default_bin_folder.diff	2008-08-10 21:42:20 UTC (rev 11912)
@@ -0,0 +1,21 @@
+--- a/kipi-plugins/mpegencoder/images2mpg
++++ b/kipi-plugins/mpegencoder/images2mpg
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # -------------------------------------------------------------------------------------------------------
+ # DESCRIPTION :
+@@ -229,10 +229,10 @@
+ TEMPORARYFOLDER=""
+ 
+ # Default ImageMagick binary folder -> using PATH variable.
+-IMBINFOLDER=""
++IMBINFOLDER="/usr/bin"
+ 
+ # Default MJPEGTools binary folder -> using PATH variable.
+-MJPEGTBINFOLDER=""
++MJPEGTBINFOLDER="/usr/bin"
+ 
+ # Not running with 'KIPI' KDE gui frontend.
+ WITHGUI=0

Modified: kde-extras/kipi-plugins/trunk/debian/patches/series
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/series	2008-08-10 21:22:00 UTC (rev 11911)
+++ kde-extras/kipi-plugins/trunk/debian/patches/series	2008-08-10 21:42:20 UTC (rev 11912)
@@ -1,2 +1,3 @@
 10_use-icedove-instead-of-thunderbird.diff
 20_420mpeg2.diff
+50_images2mpg_default_bin_folder.diff

Modified: kde-extras/kipi-plugins/trunk/debian/rules
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/rules	2008-08-10 21:22:00 UTC (rev 11911)
+++ kde-extras/kipi-plugins/trunk/debian/rules	2008-08-10 21:42:20 UTC (rev 11912)
@@ -13,13 +13,14 @@
 
 # GCC42_HERE:= powerpc
 # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=483137
+# See http://websvn.kde.org/?view=rev&revision=827522
+# Use -fno-tree-pre to workaround the problem
+#ifneq (,$(findstring $(DEB_HOST_ARCH),$(GCC42_HERE)))
+#   CC=gcc-4.2
+#   CPP=cpp-4.2
+#   CXX=g++-4.2
+#endif
 
-ifneq (,$(findstring $(DEB_HOST_ARCH),$(GCC42_HERE)))
-   CC=gcc-4.2
-   CPP=cpp-4.2
-   CXX=g++-4.2
-endif
-
 clean ::
 	rm -f po/*/*.gmo

More information about the pkg-kde-commits mailing list