rev 12259 - in kde-extras/kipi-plugins/trunk/debian: . patches
Mark Purcell
msp at alioth.debian.org
Sat Sep 27 12:39:05 UTC 2008
Author: msp
Date: 2008-09-27 12:39:05 +0000 (Sat, 27 Sep 2008)
New Revision: 12259
Added:
kde-extras/kipi-plugins/trunk/debian/kipi-plugins.lintian-overrides
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
Removed:
kde-extras/kipi-plugins/trunk/debian/patches/series
Modified:
kde-extras/kipi-plugins/trunk/debian/changelog
kde-extras/kipi-plugins/trunk/debian/control
kde-extras/kipi-plugins/trunk/debian/rules
Log:
* Add lintian-overrides - libkipiplugins not real lib
* Switch to simple-patchsys.mk & sf-get-source.mk
Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog 2008-09-27 11:36:04 UTC (rev 12258)
+++ kde-extras/kipi-plugins/trunk/debian/changelog 2008-09-27 12:39:05 UTC (rev 12259)
@@ -1,11 +1,9 @@
-kipi-plugins (0.1.6~beta1-1) UNRELEASED; urgency=low
+kipi-plugins (0.1.5-3) UNRELEASED; urgency=low
- * (NOT RELEASED YET)
- * New upstream release
- * debian/patches/40* incorporated upstream
- * Add Build-Depends: libexpat1-dev
+ * Add lintian-overrides - libkipiplugins not real lib
+ * Switch to simple-patchsys.mk & sf-get-source.mk
- -- Mark Purcell <msp at debian.org> Fri, 13 Jun 2008 22:28:23 +1000
+ -- Mark Purcell <msp at debian.org> Sat, 27 Sep 2008 22:22:29 +1000
kipi-plugins (0.1.5-2) unstable; urgency=low
Modified: kde-extras/kipi-plugins/trunk/debian/control
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/control 2008-09-27 11:36:04 UTC (rev 12258)
+++ kde-extras/kipi-plugins/trunk/debian/control 2008-09-27 12:39:05 UTC (rev 12259)
@@ -4,7 +4,7 @@
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), libexpat1-dev, libgphoto2-2-dev, libgpod-nogtk-dev,
+ libexiv2-dev (>= 0.16), 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
Standards-Version: 3.8.0
Copied: kde-extras/kipi-plugins/trunk/debian/kipi-plugins.lintian-overrides (from rev 12230, kde-extras/digikam/trunk/debian/digikam.lintian-overrides)
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/kipi-plugins.lintian-overrides (rev 0)
+++ kde-extras/kipi-plugins/trunk/debian/kipi-plugins.lintian-overrides 2008-09-27 12:39:05 UTC (rev 12259)
@@ -0,0 +1,8 @@
+# libkipiplugins.so is no 'proper' shared library. It's contents
+# changes as needed. Upstream does not support any use beside
+# for kipi-plugins Therefore we did not split out a
+# lib and lib-dev pkgs. For further discussion
+# see bug report #324592
+#
+kipi-plugins: non-dev-pkg-with-shlib-symlink
+kipi-plugins: package-name-doesnt-match-sonames
Copied: kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786355_timeadjusst_fix_filestat.diff (from rev 12229, kde-extras/kipi-plugins/tags/0.1.5-2/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-09-27 12:39:05 UTC (rev 12259)
@@ -0,0 +1,28 @@
+--- a/kipi-plugins/timeadjust/timeadjustdialog.cpp
++++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp
+@@ -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
Property changes on: kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786355_timeadjusst_fix_filestat.diff
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786363_timeAdjust_update_DateTimeOriginal.diff (from rev 12229, kde-extras/kipi-plugins/tags/0.1.5-2/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-09-27 12:39:05 UTC (rev 12259)
@@ -0,0 +1,29 @@
+--- a/kipi-plugins/timeadjust/timeadjustdialog.cpp
++++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp
+@@ -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())
Property changes on: kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786363_timeAdjust_update_DateTimeOriginal.diff
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786549_99_rawDecoding_jpeg_compression.diff (from rev 12229, kde-extras/kipi-plugins/tags/0.1.5-2/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-09-27 12:39:05 UTC (rev 12259)
@@ -0,0 +1,36 @@
+--- a/kipi-plugins/rawconverter/rawdecodingiface.cpp
++++ b/kipi-plugins/rawconverter/rawdecodingiface.cpp
+@@ -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.
+--- a/kipi-plugins/rawconverter/rawdecodingiface.h
++++ b/kipi-plugins/rawconverter/rawdecodingiface.h
+@@ -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
Property changes on: kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786549_99_rawDecoding_jpeg_compression.diff
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: kde-extras/kipi-plugins/trunk/debian/patches/series
Modified: kde-extras/kipi-plugins/trunk/debian/rules
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/rules 2008-09-27 11:36:04 UTC (rev 12258)
+++ kde-extras/kipi-plugins/trunk/debian/rules 2008-09-27 12:39:05 UTC (rev 12259)
@@ -1,47 +1,18 @@
#!/usr/bin/make -f
-FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.bz2
-URL = http://heanet.dl.sourceforge.net/kipi/$(UPFILENAME)
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/kde.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
+-include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
-# 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
+SF_PROJECT = kipi
+SF_MIRRORS = heanet optusnet
+TARBALL_EXT=tar.bz2
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
+
clean ::
rm -f po/*/*.gmo
-
-get-orig-source-dpatch:
- @@dh_testdir
- @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- @@dpatch-get-origtargz ../tarballs
-
-get-orig-source:
- @@dh_testdir
- @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- @@echo Downloading $(UPFILENAME) from $(URL) ...
- @@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
- @@echo Converting $(UPFILENAME) to $(FILENAME)
- @@bzcat ../tarballs/$(UPFILENAME) | gzip -9 > ../tarballs/$(FILENAME)
-
-print-version:
- @@echo DEB_SOURCE_PACKAGE: $(DEB_SOURCE_PACKAGE)
- @@echo DEB_VERSION: $(DEB_VERSION)
- @@echo DEB_NO_EPOCH_VERSION: $(DEB_NOEPOCH_VERSION)
- @@echo DEB_UPSTREAM_VERSION: $(DEB_UPSTREAM_VERSION)
- @@echo FILENAME: $(FILENAME)
- @@echo URL: $(URL)
-
More information about the pkg-kde-commits
mailing list