rev 19169 - in kde-extras/digikam/trunk/debian: . patches
Mark Purcell
msp at alioth.debian.org
Wed Apr 11 10:26:11 UTC 2012
Author: msp
Date: 2012-04-11 10:26:11 +0000 (Wed, 11 Apr 2012)
New Revision: 19169
Added:
kde-extras/digikam/trunk/debian/patches/qreal-float.diff
Modified:
kde-extras/digikam/trunk/debian/changelog
kde-extras/digikam/trunk/debian/control
kde-extras/digikam/trunk/debian/digikam.install
kde-extras/digikam/trunk/debian/patches/series
kde-extras/digikam/trunk/debian/rules
Log:
* New upstream release
* Fix "FTBFS on armel and armhf distinctions double and qreal"
- added qreal-float.diff (Closes: #667700)
Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog 2012-04-05 21:35:01 UTC (rev 19168)
+++ kde-extras/digikam/trunk/debian/changelog 2012-04-11 10:26:11 UTC (rev 19169)
@@ -1,3 +1,11 @@
+digikam (4:2.6.0~beta3-1) unstable; urgency=low
+
+ * New upstream release
+ * Fix "FTBFS on armel and armhf distinctions double and qreal"
+ - added qreal-float.diff (Closes: #667700)
+
+ -- Mark Purcell <msp at debian.org> Wed, 11 Apr 2012 20:07:04 +1000
+
digikam (4:2.6.0~beta2-2) unstable; urgency=low
* Relax Versioned Build-Depends (libexiv2-dev)
Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control 2012-04-05 21:35:01 UTC (rev 19168)
+++ kde-extras/digikam/trunk/debian/control 2012-04-11 10:26:11 UTC (rev 19169)
@@ -129,12 +129,11 @@
Depends: ${misc:Depends}, khelpcenter4
Recommends: digikam
Section: doc
-Description: handbook for digiKam and showFoto in several languages
+Description: handbook for digiKam
digiKam is an easy to use and powerful digital photo management
application.
.
- This package contains the handbooks for digiKam, showFoto and
- kipi-plugins from the digikam package.
+ This package contains the handbooks for digiKam and kipi-plugins.
Package: kipi-plugins
Architecture: any
@@ -185,6 +184,7 @@
RajceExport : export images to Rajce web service
Vkontakte : export images to VKontakte web service
PhotoLayoutEditor : assemble images together
+ ImageShackExport : export images to ImageShack web service
.
Porting under progress to Qt4/KDE4:
.
Modified: kde-extras/digikam/trunk/debian/digikam.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.install 2012-04-05 21:35:01 UTC (rev 19168)
+++ kde-extras/digikam/trunk/debian/digikam.install 2012-04-11 10:26:11 UTC (rev 19169)
@@ -3,7 +3,6 @@
usr/bin/cleanup_digikamdb
usr/bin/digikam
usr/bin/digitaglinktree
-usr/bin/libkgeomap_demo
usr/include
usr/lib/cmake
usr/lib/kde4/digikam*
Added: kde-extras/digikam/trunk/debian/patches/qreal-float.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/qreal-float.diff (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/qreal-float.diff 2012-04-11 10:26:11 UTC (rev 19169)
@@ -0,0 +1,43 @@
+Index: digikam-2.6.0~beta3/core/utilities/gpssearch/gpssearchview.cpp
+===================================================================
+--- digikam-2.6.0~beta3.orig/core/utilities/gpssearch/gpssearchview.cpp 2012-04-01 20:54:26.000000000 +1000
++++ digikam-2.6.0~beta3/core/utilities/gpssearch/gpssearchview.cpp 2012-04-10 18:59:40.000000000 +1000
+@@ -422,7 +422,7 @@
+
+ // NOTE: coordinates as lon1, lat1, lon2, lat2 (or West, North, East, South)
+ // as left/top, right/bottom rectangle.
+- QList<qreal> coordinatesList = QList<qreal>() <<
++ QList<double> coordinatesList = QList<double>() <<
+ coordinates.first.lon() << coordinates.first.lat() <<
+ coordinates.second.lon() << coordinates.second.lat();
+
+Index: digikam-2.6.0~beta3/extra/kipi-plugins/photolayoutseditor/widgets/canvas/CropWidgetItem.cpp
+===================================================================
+--- digikam-2.6.0~beta3.orig/extra/kipi-plugins/photolayoutseditor/widgets/canvas/CropWidgetItem.cpp 2012-04-01 20:54:26.000000000 +1000
++++ digikam-2.6.0~beta3/extra/kipi-plugins/photolayoutseditor/widgets/canvas/CropWidgetItem.cpp 2012-04-10 18:59:40.000000000 +1000
+@@ -340,8 +340,8 @@
+ QPointF dif = event->scenePos() - event->lastScenePos();
+ temp.translate(dif);
+
+- temp.translate( qMin(maxRect.right()-temp.right(),0.0), qMin(maxRect.bottom()-temp.bottom(),0.0) );
+- temp.translate( qMax(maxRect.left()-temp.left(),0.0), qMax(maxRect.top()-temp.top(),0.0) );
++ temp.translate( qMin(maxRect.right()-temp.right(),qreal(0.0)), qMin(maxRect.bottom()-temp.bottom(),qreal(0.0)) );
++ temp.translate( qMax(maxRect.left()-temp.left(),qreal(0.0)), qMax(maxRect.top()-temp.top(),qreal(0.0)) );
+ }
+ // Size change
+ else
+Index: digikam-2.6.0~beta3/core/libs/widgets/graphicsview/regionframeitem.cpp
+===================================================================
+--- digikam-2.6.0~beta3.orig/core/libs/widgets/graphicsview/regionframeitem.cpp 2012-04-01 20:54:26.000000000 +1000
++++ digikam-2.6.0~beta3/core/libs/widgets/graphicsview/regionframeitem.cpp 2012-04-10 18:59:40.000000000 +1000
+@@ -639,8 +639,8 @@
+ {
+ const QSizeF maxSize = parentDImgItem()->boundingRect().size();
+ const QPointF point = mapToParent(event->pos());
+- qreal posX = qBound<qreal>(0., point.x(), maxSize.width());
+- qreal posY = qBound<qreal>(0., point.y(), maxSize.height());
++ qreal posX = qBound(qreal(0.), point.x(), maxSize.width());
++ qreal posY = qBound(qreal(0.), point.y(), maxSize.height());
+ QRectF r = rect();
+
+ // Adjust edge
Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series 2012-04-05 21:35:01 UTC (rev 19168)
+++ kde-extras/digikam/trunk/debian/patches/series 2012-04-11 10:26:11 UTC (rev 19169)
@@ -1 +1,2 @@
+qreal-float.diff
highgui_c.h
Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules 2012-04-05 21:35:01 UTC (rev 19168)
+++ kde-extras/digikam/trunk/debian/rules 2012-04-11 10:26:11 UTC (rev 19169)
@@ -4,7 +4,7 @@
dh $@ --with kde --parallel
override_dh_auto_configure:
- LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure --buildsystem=kde
+ LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure --buildsystem=kde -- -DDIGIKAMSC_COMPILE_DOC=on -DDIGIKAMSC_COMPILE_PO=on
override_dh_installchangelogs:
dh_installchangelogs core/ChangeLog
More information about the pkg-kde-commits
mailing list