[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=dbc7d37

The following commit has been merged in the master branch:
commit dbc7d37d6b38c7b7284d61a1350d5e04fe93c825
Author: Harald Sitter <apachelogger at ubuntu.com>
Date:   Sun Jan 25 20:30:33 2009 +0100

    * New upstream release
      - remove kubuntu_01_qreal_portability_fixes.diff, resolved upstream
      - bump version build-deps in debian/control
      - add build-dep on quilt
---
 debian/changelog                                   |  9 ++++++
 debian/control                                     |  6 ++--
 .../kubuntu_01_qreal_portability_fixes.diff        | 35 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a5f96c1..13027eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kdeplasma-addons (4:4.2.0-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release
+    - remove kubuntu_01_qreal_portability_fixes.diff, resolved upstream
+    - bump version build-deps in debian/control
+    - add build-dep on quilt
+
+ -- Steve Stalcup <vorian at ubuntu.com>  Sat, 24 Jan 2009 20:32:42 -0500
+
 kdeplasma-addons (4:4.1.96-0ubuntu2) jaunty; urgency=low
 
   * Rebuild against new libplasma-dev
diff --git a/debian/control b/debian/control
index 676826e..37f4849 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@ XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), cmake (>= 2.6.2),
- kdebase-workspace-dev (>= 4:4.1.96), libglu1-mesa-dev, libqt4-opengl-dev,
- libboost-dev, python, libkexiv2-7-dev, kdebase-workspace-data (>= 4:4.1.96),
- libxcomposite-dev, kdepimlibs5-dev (>= 4:4.1.96)
+ kdebase-workspace-dev (>= 4:4.2.0), libglu1-mesa-dev, libqt4-opengl-dev,
+ libboost-dev, python, libkexiv2-7-dev, kdebase-workspace-data (>= 4:4.2.0),
+ libxcomposite-dev, kdepimlibs5-dev (>= 4:4.2.0), quilt
 Standards-Version: 3.8.0
 Homepage: http://plasma.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdeplasma-addons/ubuntu
diff --git a/debian/patches/kubuntu_01_qreal_portability_fixes.diff b/debian/patches/kubuntu_01_qreal_portability_fixes.diff
deleted file mode 100644
index cc5569f..0000000
--- a/debian/patches/kubuntu_01_qreal_portability_fixes.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: kdeplasma-addons-4.1.85/applets/comic/fadingitem.cpp
-===================================================================
---- kdeplasma-addons-4.1.85.orig/applets/comic/fadingitem.cpp	2008-12-31 01:25:37.000000000 +0000
-+++ kdeplasma-addons-4.1.85/applets/comic/fadingitem.cpp	2008-12-31 01:25:50.000000000 +0000
-@@ -61,7 +61,7 @@
-     QPainter tempPainter( &temp );
-     QColor color = Qt::black;
- 
--    color.setAlphaF( qMin( mOpacity, 0.99 ) );
-+    color.setAlphaF( qMin( double(mOpacity), 0.99 ) );
-     tempPainter.setCompositionMode( QPainter::CompositionMode_DestinationIn );
-     tempPainter.fillRect( mParent.rect(), color );
-     painter->drawPixmap( QPoint( 0, 0 ), temp );
-Index: kdeplasma-addons-4.1.85/applets/previewer/previewwidget.cpp
-===================================================================
---- kdeplasma-addons-4.1.85.orig/applets/previewer/previewwidget.cpp	2008-12-31 02:09:49.000000000 +0000
-+++ kdeplasma-addons-4.1.85/applets/previewer/previewwidget.cpp	2008-12-31 18:43:09.000000000 +0000
-@@ -359,7 +359,7 @@
- void PreviewWidget::expandingSlot(qreal progress)
- {
-     const int min = s_topBorder + bottomBorderHeight();
--    if (qFuzzyCompare(1.0, progress)) {
-+    if (qFuzzyCompare(1.0, double(progress))) {
-         m_animId = -1;
- 
-         if (m_closeStatus) {
-@@ -374,7 +374,7 @@
-             }
-         }
-     } else {
--        m_animationHeight = qMax(qreal(min),
-+        m_animationHeight = qMax(double(min),
-                                  min - 1 + ((size().height() - min)  * 
-                                             (m_closeStatus ? 1.0 - progress : progress)));
-     }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 087aea1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kubuntu_01_qreal_portability_fixes.diff

-- 
KDE Plasma Addons module packaging