rev 9863 - in kde-extras/kipi-plugins/trunk/debian: . patches
Achim Bohnet
ach-guest at alioth.debian.org
Tue Mar 25 21:40:36 UTC 2008
Author: ach-guest
Date: 2008-03-25 21:40:36 +0000 (Tue, 25 Mar 2008)
New Revision: 9863
Added:
kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786355_timeadjusst_fix_filestat.diff
kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786363_timeAdjust_update_DateTimeOriginal.diff
kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786549_99_rawDecoding_jpeg_compression.diff
Modified:
kde-extras/kipi-plugins/trunk/debian/changelog
kde-extras/kipi-plugins/trunk/debian/patches/series
Log:
* Cherry pick fixes from SVN:
+ 40_kdesvn786355_timeadjusst_fix_filestat.diff
+ 40_kdesvn786363_timeAdjust_update_DateTimeOriginal.diff
+ 40_kdesvn786549_99_rawDecoding_jpeg_compression.diff
Thx to upstream for pointing me to those patches.
Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog 2008-03-25 21:33:30 UTC (rev 9862)
+++ kde-extras/kipi-plugins/trunk/debian/changelog 2008-03-25 21:40:36 UTC (rev 9863)
@@ -25,6 +25,11 @@
* Update build-dep:
+ remove automake: not needed
+ remove libexif-dev: replaced upstream by libexiv2-dev
+ * Cherry pick fixes from SVN:
+ + 40_kdesvn786355_timeadjusst_fix_filestat.diff
+ + 40_kdesvn786363_timeAdjust_update_DateTimeOriginal.diff
+ + 40_kdesvn786549_99_rawDecoding_jpeg_compression.diff
+ Thx to upstream for pointing me to those patches.
[ Fathi Boudra ]
* Update copyright file
@@ -36,7 +41,7 @@
* Use Homepage field
* Clean up watch file
- -- Fathi Boudra <fabo at debian.org> Sun, 16 Mar 2008 14:18:50 +0100
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Tue, 25 Mar 2008 22:39:26 +0100
kipi-plugins (0.1.5~beta1-3) experimental; urgency=low
Added: kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786355_timeadjusst_fix_filestat.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786355_timeadjusst_fix_filestat.diff (rev 0)
+++ kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786355_timeadjusst_fix_filestat.diff 2008-03-25 21:40:36 UTC (rev 9863)
@@ -0,0 +1,28 @@
+--- libs/kipi-plugins/timeadjust/timeadjustdialog.cpp 2008/02/25 13:06:59 779082
++++ libs/kipi-plugins/timeadjust/timeadjustdialog.cpp 2008/03/16 20:56:32 786355
+@@ -444,12 +444,6 @@
+ dateTime = updateTime(info.path(), info.time());
+ info.setTime(dateTime);
+
+- // See B.K.O #138880: set the file acess and modification time.
+- struct utimbuf ut;
+- ut.modtime = dateTime.toTime_t();
+- ut.actime = dateTime.toTime_t();
+- ::utime(QFile::encodeName(url.path()), &ut);
+-
+ if (d->syncEXIFDateCheck->isChecked() || d->syncIPTCDateCheck->isChecked())
+ {
+ bool ret = true;
+@@ -492,6 +486,12 @@
+ else
+ updatedURLs.append(url);
+ }
++
++ // See B.K.O #138880: set the file acess and modification time (after than Exiv2 play with metadata).
++ struct utimbuf ut;
++ ut.modtime = dateTime.toTime_t();
++ ut.actime = dateTime.toTime_t();
++ ::utime(QFile::encodeName(url.path()), &ut);
+ }
+
+ // We use kipi interface refreshImages() method to tell to host than
Added: kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786363_timeAdjust_update_DateTimeOriginal.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786363_timeAdjust_update_DateTimeOriginal.diff (rev 0)
+++ kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786363_timeAdjust_update_DateTimeOriginal.diff 2008-03-25 21:40:36 UTC (rev 9863)
@@ -0,0 +1,31 @@
+Index: libs/kipi-plugins/timeadjust/timeadjustdialog.cpp
+===================================================================
+--- libs/kipi-plugins/timeadjust/timeadjustdialog.cpp (Revision 786362)
++++ libs/kipi-plugins/timeadjust/timeadjustdialog.cpp (Arbeitskopie)
+@@ -7,7 +7,7 @@
+ * Description : a plugin to set time stamp of picture files.
+ *
+ * Copyright (C) 2003-2005 by Jesper Pedersen <blackie at kde.org>
+- * Copyright (C) 2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -162,7 +162,7 @@
+ KAboutData::License_GPL,
+ I18N_NOOP("A Kipi plugin for adjusting time stamp of picture files"),
+ "(c) 2003-2005, Jesper K. Pedersen\n"
+- "(c) 2006-2007, Gilles Caulier");
++ "(c) 2006-2008, Gilles Caulier");
+
+ d->about->addAuthor("Jesper K. Pedersen", I18N_NOOP("Author"),
+ "blackie at kde.org");
+@@ -458,6 +458,8 @@
+ {
+ ret &= exiv2Iface.setExifTagString("Exif.Image.DateTime",
+ dateTime.toString(QString("yyyy:MM:dd hh:mm:ss")).ascii());
++ ret &= exiv2Iface.setExifTagString("Exif.Photo.DateTimeOriginal",
++ dateTime.toString(QString("yyyy:MM:dd hh:mm:ss")).ascii());
+ }
+
+ if (d->syncIPTCDateCheck->isChecked())
Added: kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786549_99_rawDecoding_jpeg_compression.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786549_99_rawDecoding_jpeg_compression.diff (rev 0)
+++ kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786549_99_rawDecoding_jpeg_compression.diff 2008-03-25 21:40:36 UTC (rev 9863)
@@ -0,0 +1,40 @@
+Index: libs/kipi-plugins/rawconverter/rawdecodingiface.cpp
+===================================================================
+--- libs/kipi-plugins/rawconverter/rawdecodingiface.cpp (Revision 786548)
++++ libs/kipi-plugins/rawconverter/rawdecodingiface.cpp (Revision 786549)
+@@ -6,8 +6,8 @@
+ * Date : 2006-12-09
+ * Description : RAW decoding interface
+ *
+- * Copyright (C) 2006-2007 by Marcel Wiesweg <marcel.wiesweg at gmx.de>
+- * Copyright (C) 2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel.wiesweg at gmx.de>
++ * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ *
+ * NOTE: Do not use kdDebug() in this implementation because
+ * it will be multithreaded. Use qDebug() instead.
+@@ -243,7 +243,8 @@
+ cinfo.comp_info[2].h_samp_factor = 1;
+ cinfo.comp_info[2].v_samp_factor = 1;
+
+- jpeg_set_quality(&cinfo, 100, true);
++ // B.K.O #154273: use 99 compresion level instead 100 to reduce output JPEG file size.
++ jpeg_set_quality(&cinfo, 99, true);
+ jpeg_start_compress(&cinfo, true);
+
+ // Write ICC color profil.
+Index: libs/kipi-plugins/rawconverter/rawdecodingiface.h
+===================================================================
+--- libs/kipi-plugins/rawconverter/rawdecodingiface.h (Revision 786548)
++++ libs/kipi-plugins/rawconverter/rawdecodingiface.h (Revision 786549)
+@@ -6,8 +6,8 @@
+ * Date : 2006-12-09
+ * Description : RAW decoding interface
+ *
+- * Copyright (C) 2006-2007 by Marcel Wiesweg <marcel.wiesweg at gmx.de>
+- * Copyright (C) 2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel.wiesweg at gmx.de>
++ * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
Modified: kde-extras/kipi-plugins/trunk/debian/patches/series
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/series 2008-03-25 21:33:30 UTC (rev 9862)
+++ kde-extras/kipi-plugins/trunk/debian/patches/series 2008-03-25 21:40:36 UTC (rev 9863)
@@ -1,2 +1,5 @@
10_use-icedove-instead-of-thunderbird.diff
20_420mpeg2.diff
+40_kdesvn786355_timeadjusst_fix_filestat.diff
+40_kdesvn786363_timeAdjust_update_DateTimeOriginal.diff
+40_kdesvn786549_99_rawDecoding_jpeg_compression.diff
More information about the pkg-kde-commits
mailing list