rev 5382 - in kde-extras/kipi-plugins/branches/experimental/debian: . patches

[Mark Purcell]

Author: msp
Date: 2007-01-20 15:38:16 +0100 (Sat, 20 Jan 2007)
New Revision: 5382

Added:
   kde-extras/kipi-plugins/branches/experimental/debian/patches/30_kdesvn_625568_pod.patch
Modified:
   kde-extras/kipi-plugins/branches/experimental/debian/changelog
   kde-extras/kipi-plugins/branches/experimental/debian/control
Log:
* Grab upstream ipod patch for libgphoto 0.4.2:
  debian/patches/30_kdesvn_625568_pod.patch

Modified: kde-extras/kipi-plugins/branches/experimental/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/branches/experimental/debian/changelog	2007-01-20 14:02:41 UTC (rev 5381)
+++ kde-extras/kipi-plugins/branches/experimental/debian/changelog	2007-01-20 14:38:16 UTC (rev 5382)
@@ -1,9 +1,14 @@
 kipi-plugins (0.1.3~rc1-2) UNRELEASED; urgency=low
 
+  [ Debian KDE Extras Team ]
   * NOT RELEASED YET
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun,  7 Jan 2007 18:35:11 +0000
+  [ Mark Purcell ]
+  * Grab upstream ipod patch for libgphoto 0.4.2:
+    debian/patches/30_kdesvn_625568_pod.patch
 
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 20 Jan 2007 13:27:02 +0000
+
 kipi-plugins (0.1.3~rc1-1) experimental; urgency=low
 
   * new upstream release

Modified: kde-extras/kipi-plugins/branches/experimental/debian/control
===================================================================
--- kde-extras/kipi-plugins/branches/experimental/debian/control	2007-01-20 14:02:41 UTC (rev 5381)
+++ kde-extras/kipi-plugins/branches/experimental/debian/control	2007-01-20 14:38:16 UTC (rev 5382)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Paul Telford <pxt at debian.org>, Achim Bohnet <ach at mpe.mpg.de>, Tom Albers <tomalbers at kde.nl>
-Build-Depends: cdbs, debhelper, kdelibs4-dev, libexiv2-dev (>= 0.12), libexif-dev, libkipi0-dev (>= 0.1.5), libimlib2-dev, libtiff4-dev, pkg-config, libgphoto2-2-dev, libmagick++9-dev | libmagick++-dev, libgpod-dev
+Build-Depends: cdbs, debhelper, kdelibs4-dev, libexiv2-dev (>= 0.12), libexif-dev, libkipi0-dev (>= 0.1.5), libimlib2-dev, libtiff4-dev, pkg-config, libgphoto2-2-dev, libmagick++9-dev | libmagick++-dev, libgpod-dev (> 0.4)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kipi-plugins/branches/experimental/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kipi-plugins/branches/experimental/
@@ -54,7 +54,7 @@
   HTMLGallery:         Export images to HTML
   SimpleviewerExport:  Export images in a nice flash movie
   GPSSync:             Geolocalize pictures
-  IpodExport:          Export pictures with an Ipod device (DISABLED)
+  IpodExport:          Export pictures with an Ipod device
   MetadataEdit:        Edit EXIF and IPTC pictures metadata
  .
  Homepage: http://www.kipi-plugins.org/

Added: kde-extras/kipi-plugins/branches/experimental/debian/patches/30_kdesvn_625568_pod.patch
===================================================================
--- kde-extras/kipi-plugins/branches/experimental/debian/patches/30_kdesvn_625568_pod.patch	2007-01-20 14:02:41 UTC (rev 5381)
+++ kde-extras/kipi-plugins/branches/experimental/debian/patches/30_kdesvn_625568_pod.patch	2007-01-20 14:38:16 UTC (rev 5382)
@@ -0,0 +1,21 @@
+diff -Nur kipi-plugins-0.1.3~rc1/kipi-plugins/ipodexport/ipodexportdialog.cpp kipi-plugins-0.1.3~rc1.new/kipi-plugins/ipodexport/ipodexportdialog.cpp
+--- kipi-plugins-0.1.3~rc1/kipi-plugins/ipodexport/ipodexportdialog.cpp	2007-01-20 13:24:22.000000000 +0000
++++ kipi-plugins-0.1.3~rc1.new/kipi-plugins/ipodexport/ipodexportdialog.cpp	2007-01-20 13:25:21.000000000 +0000
+@@ -325,7 +325,7 @@
+ #define item static_cast<ImageListItem*>(item)
+         debug() << "Uploading "      << item->pathSrc()
+                 << " to ipod album " << album->name << endl;
+-        Itdb_Artwork *art = itdb_photodb_add_photo( m_itdb, QFile::encodeName( item->pathSrc() ), &err );
++        Itdb_Artwork *art = itdb_photodb_add_photo( m_itdb, QFile::encodeName( item->pathSrc() ), 0, 0, &err );
+         if( !art )
+         {
+             if( err )
+@@ -336,7 +336,7 @@
+             }
+         }
+         else
+-            itdb_photodb_photoalbum_add_photo( m_itdb, album, art );
++            itdb_photodb_photoalbum_add_photo( m_itdb, album, art, 0 );
+ 
+         delete item;
+ #undef  item