rev 9862 - in kde-extras/digikam/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Tue Mar 25 21:33:42 UTC 2008
Author: fabo
Date: 2008-03-25 21:33:30 +0000 (Tue, 25 Mar 2008)
New Revision: 9862
Modified:
kde-extras/digikam/trunk/debian/changelog
kde-extras/digikam/trunk/debian/control
kde-extras/digikam/trunk/debian/patches/10_lp201053_fix_download_rename_race.diff
kde-extras/digikam/trunk/debian/patches/20_fix_ftbfs_with_libkdcraw3.diff
kde-extras/digikam/trunk/debian/patches/30_respect_umask.diff
kde-extras/digikam/trunk/debian/patches/40_kdesvn783161_fix_wrong_file-exits_check.diff
kde-extras/digikam/trunk/debian/patches/40_kdesvn786622_honour_scrollbar.diff
Log:
fix typo and quiltify patches.
Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog 2008-03-25 20:31:27 UTC (rev 9861)
+++ kde-extras/digikam/trunk/debian/changelog 2008-03-25 21:33:30 UTC (rev 9862)
@@ -11,7 +11,7 @@
+ libexif-dev: replaced by libexiv2 upstream.
* Remove Paul Telford <pxt at debian.org> from uploaders. He's no longer
- involved in digikam maintainance. Thx for taking care of digikam as
+ involved in digikam maintenance. Thx for taking care of digikam as
well as sponsoring me for a long time.
* debian/copyright: replace Copyright (C) with ©
Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control 2008-03-25 20:31:27 UTC (rev 9861)
+++ kde-extras/digikam/trunk/debian/control 2008-03-25 21:33:30 UTC (rev 9862)
@@ -5,15 +5,14 @@
Uploaders: Achim Bohnet <ach at mpe.mpg.de>, Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-dev,
libtiff4-dev, libgphoto2-2-dev, libkipi0-dev,
- libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-dev (>= 0.1.5),
- libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev (>= 0.14),
+ libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-dev (>= 0.1.6),
+ libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev (>= 0.16),
libkdcraw-dev (>= 0.1.4)
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/digikam/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/digikam/?op=log
Homepage: http://www.digikam.org
-
Package: digikam
Architecture: any
Depends: ${shlibs:Depends}, kdebase-kio-plugins
Modified: kde-extras/digikam/trunk/debian/patches/10_lp201053_fix_download_rename_race.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/10_lp201053_fix_download_rename_race.diff 2008-03-25 20:31:27 UTC (rev 9861)
+++ kde-extras/digikam/trunk/debian/patches/10_lp201053_fix_download_rename_race.diff 2008-03-25 21:33:30 UTC (rev 9862)
@@ -1,5 +1,5 @@
---- digikam-0.9.3.orig/digikam/utilities/cameragui/cameracontroller.cpp
-+++ digikam-0.9.3/digikam/utilities/cameragui/cameracontroller.cpp
+--- a/digikam/utilities/cameragui/cameracontroller.cpp
++++ b/digikam/utilities/cameragui/cameracontroller.cpp
@@ -370,7 +370,7 @@
KURL tempURL(dest);
Modified: kde-extras/digikam/trunk/debian/patches/20_fix_ftbfs_with_libkdcraw3.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/20_fix_ftbfs_with_libkdcraw3.diff 2008-03-25 20:31:27 UTC (rev 9861)
+++ kde-extras/digikam/trunk/debian/patches/20_fix_ftbfs_with_libkdcraw3.diff 2008-03-25 21:33:30 UTC (rev 9862)
@@ -1,7 +1,5 @@
-Index: imageplugins/whitebalance/imageeffect_whitebalance.cpp
-===================================================================
---- digikam-0.9.3.orig/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp (révision 776168)
-+++ digikam-0.9.3/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp (copie de travail)
+--- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
++++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
@@ -7,7 +7,8 @@
* Description : a digiKam image editor plugin to correct
* image white balance
@@ -80,10 +78,8 @@
slotTemperatureChanged(m_temperatureInput->value());
slotChannelChanged(m_channelCB->currentItem());
slotScaleChanged(m_scaleBG->selectedId());
-Index: imageplugins/whitebalance/imageeffect_whitebalance.h
-===================================================================
---- digikam-0.9.3.orig/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h (révision 776168)
-+++ digikam-0.9.3/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h (copie de travail)
+--- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h
++++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h
@@ -7,7 +7,8 @@
* Description : a digiKam image editor plugin to correct
* image white balance
@@ -102,10 +98,8 @@
#ifndef IMAGEEFFECT_WHITEBALANCE_H
#define IMAGEEFFECT_WHITEBALANCE_H
-Index: libs/whitebalance/whitebalance.cpp
-===================================================================
---- digikam-0.9.3.orig/digikam/libs/whitebalance/whitebalance.cpp (révision 776168)
-+++ digikam-0.9.3/digikam/libs/whitebalance/whitebalance.cpp (copie de travail)
+--- a/digikam/libs/whitebalance/whitebalance.cpp
++++ b/digikam/libs/whitebalance/whitebalance.cpp
@@ -6,7 +6,8 @@
* Date : 2007-16-01
* Description : white balance color correction.
@@ -158,14 +152,14 @@
- sG = tc.green() / t;
- sB = tc.blue() / t;
- mRB = sR / sB;
-+ DDebug() << "Sums: R:" << tc.red() << " G:" << tc.green() << " B:" << tc.blue() << endl;
-
+-
- DDebug() << "Sums: R:" << sR << " G:" << sG << " B:" << sB << endl;
-
- l = 0;
- r = sizeof(blackBodyWhiteBalance)/(sizeof(float)*3);
- m = (r + l) / 2;
--
++ DDebug() << "Sums: R:" << tc.red() << " G:" << tc.green() << " B:" << tc.blue() << endl;
+
- for (l = 0, r = sizeof(blackBodyWhiteBalance)/(sizeof(float)*3), m = (l+r)/2 ; r-l > 1 ; m = (l+r)/2)
+ /* This is a dichotomic search based on Blue and Red layers ratio
+ to find the matching temperature
@@ -193,11 +187,11 @@
}
-
- DDebug() << "Temperature (K):" << m*10.0+2000.0 << endl;
+-
+- t = (blackBodyWhiteBalance[m][1]/blackBodyWhiteBalance[m][0]) / (sG/sR);
+ // Calculate the green level to neutralize picture
+ green = (mr / mg) / ((double)tc.green() / (double)tc.red());
-- t = (blackBodyWhiteBalance[m][1]/blackBodyWhiteBalance[m][0]) / (sG/sR);
--
- DDebug() << "Green component:" << t << endl;
-
- temperature = m*10.0+2000.0;
@@ -207,7 +201,7 @@
}
void WhiteBalance::autoExposureAdjustement(uchar* data, int width, int height, bool sb,
-@@ -207,27 +199,75 @@
+@@ -207,25 +199,73 @@
delete histogram;
}
@@ -286,20 +280,16 @@
+ mr /= mi;
+ mg /= mi;
+ mb /= mi;
- }
-
++}
++
+void WhiteBalance::setRGBmult()
+{
+ setRGBmult(d->temperature, d->green, d->mr, d->mg, d->mb);
-+}
-+
+ }
+
void WhiteBalance::setLUTv()
- {
- double b = d->mg * pow(2, d->exposition);
-Index: libs/whitebalance/whitebalance.h
-===================================================================
---- digikam-0.9.3.orig/digikam/libs/whitebalance/whitebalance.h (révision 776168)
-+++ digikam-0.9.3/digikam/libs/whitebalance/whitebalance.h (copie de travail)
+--- a/digikam/libs/whitebalance/whitebalance.h
++++ b/digikam/libs/whitebalance/whitebalance.h
@@ -6,7 +6,8 @@
* Date : 2007-16-01
* Description : white balance color correction.
@@ -327,10 +317,8 @@
void setLUTv();
void adjustWhiteBalance(uchar *data, int width, int height, bool sixteenBit);
inline unsigned short pixelColor(int colorMult, int index, int value);
-Index: utilities/setup/setupdcraw.cpp
-===================================================================
---- digikam-0.9.3.orig/digikam/utilities/setup/setupdcraw.cpp (révision 776168)
-+++ digikam-0.9.3/digikam/utilities/setup/setupdcraw.cpp (copie de travail)
+--- a/digikam/utilities/setup/setupdcraw.cpp
++++ b/digikam/utilities/setup/setupdcraw.cpp
@@ -6,7 +6,7 @@
* Date : 2007-02-06
* Description : setup RAW decoding settings.
@@ -366,10 +354,8 @@
d->dcrawSettings->setFourColor(config->readBoolEntry("RGBInterpolate4Colors", false));
d->dcrawSettings->setQuality((KDcrawIface::RawDecodingSettings::DecodingQuality)
config->readNumEntry("RAWQuality",
-Index: utilities/setup/setupdcraw.h
-===================================================================
---- digikam-0.9.3.orig/digikam/utilities/setup/setupdcraw.h (révision 776168)
-+++ digikam-0.9.3/digikam/utilities/setup/setupdcraw.h (copie de travail)
+--- a/digikam/utilities/setup/setupdcraw.h
++++ b/digikam/utilities/setup/setupdcraw.h
@@ -6,7 +6,7 @@
* Date : 2007-02-06
* Description : setup RAW decoding settings.
@@ -379,10 +365,8 @@
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
-Index: utilities/imageeditor/editor/editorwindow.cpp
-===================================================================
---- digikam-0.9.3.orig/digikam/utilities/imageeditor/editor/editorwindow.cpp (révision 776168)
-+++ digikam-0.9.3/digikam/utilities/imageeditor/editor/editorwindow.cpp (copie de travail)
+--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
++++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp
@@ -885,10 +885,12 @@
m_IOFileSettings->rawDecodingSettings.outputColorSpace = KDcrawIface::RawDecodingSettings::SRGB;
Modified: kde-extras/digikam/trunk/debian/patches/30_respect_umask.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/30_respect_umask.diff 2008-03-25 20:31:27 UTC (rev 9861)
+++ kde-extras/digikam/trunk/debian/patches/30_respect_umask.diff 2008-03-25 21:33:30 UTC (rev 9862)
@@ -1,8 +1,6 @@
-Index: utilities/imageeditor/editor/editorwindow.cpp
-===================================================================
---- digikam-0.9.3.orig/digikam/utilities/imageeditor/editor/editorwindow.cpp (revision 726776)
-+++ digikam-0.9.3/digikam/utilities/imageeditor/editor/editorwindow.cpp (working copy)
-@@ -1653,8 +1653,16 @@
+--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
++++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp
+@@ -1655,8 +1655,16 @@
{
QCString dstFileName = QFile::encodeName(m_savingContext->destinationURL.path());
@@ -21,7 +19,7 @@
if (m_savingContext->destinationExisted)
{
struct stat stbuf;
-@@ -1673,12 +1681,9 @@
+@@ -1675,12 +1683,9 @@
}
// restore permissions
Modified: kde-extras/digikam/trunk/debian/patches/40_kdesvn783161_fix_wrong_file-exits_check.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/40_kdesvn783161_fix_wrong_file-exits_check.diff 2008-03-25 20:31:27 UTC (rev 9861)
+++ kde-extras/digikam/trunk/debian/patches/40_kdesvn783161_fix_wrong_file-exits_check.diff 2008-03-25 21:33:30 UTC (rev 9862)
@@ -1,6 +1,6 @@
---- digikam-0.9.3.orig/digikam/utilities/cameragui/cameracontroller.cpp.orig 2008-03-17 19:06:18.000000000 +0100
-+++ digikam-0.9.3/digikam/utilities/cameragui/cameracontroller.cpp 2008-03-17 19:08:10.000000000 +0100
-@@ -931,6 +931,7 @@
+--- a/digikam/utilities/cameragui/cameracontroller.cpp
++++ b/digikam/utilities/cameragui/cameracontroller.cpp
+@@ -937,6 +937,7 @@
int result = dlg.exec();
dest = dlg.newDestURL().path();
Modified: kde-extras/digikam/trunk/debian/patches/40_kdesvn786622_honour_scrollbar.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/40_kdesvn786622_honour_scrollbar.diff 2008-03-25 20:31:27 UTC (rev 9861)
+++ kde-extras/digikam/trunk/debian/patches/40_kdesvn786622_honour_scrollbar.diff 2008-03-25 21:33:30 UTC (rev 9862)
@@ -1,5 +1,5 @@
---- digikam-0.9.3/digikam/libs/thumbbar/thumbbar.cpp.orig 2008-03-17 18:47:49.000000000 +0100
-+++ digikam-0.9.3/digikam/libs/thumbbar/thumbbar.cpp 2008-03-17 19:03:38.000000000 +0100
+--- a/digikam/libs/thumbbar/thumbbar.cpp
++++ b/digikam/libs/thumbbar/thumbbar.cpp
@@ -687,9 +687,9 @@
}
More information about the pkg-kde-commits
mailing list