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

Maximiliano Curia maxy at moszumanska.debian.org
Fri Aug 1 09:05:10 UTC 2014 

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

The following commit has been merged in the master branch:
commit eff53b609a7aaac3bca8142ad211eb6e9946b2b5
Author: Alessandro Ghersi <alessandro-ghersi at kubuntu.org>
Date:   Sat Oct 3 21:54:08 2009 +0200

    kdeplasma-addons (4:4.3.2-0ubuntu1) karmic; urgency=low
    
      * New upstream release
        - Bump build deps
        - Remove build dependency on libxcomposite-dev and libxdamage-dev
          as they are no longer needed for building lancelot compositing
          support
        - Remove kubuntu_01_fix_armel_build.diff, fixed by upstream
        - Update plasma-widget-addons.install
---
 debian/changelog                               | 12 ++++++
 debian/control                                 |  7 ++--
 debian/patches/kubuntu_01_fix_armel_build.diff | 57 --------------------------
 debian/patches/series                          |  1 -
 debian/plasma-widgets-addons.install           |  4 +-
 5 files changed, 17 insertions(+), 64 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de3f294..36955bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+kdeplasma-addons (4:4.3.2-0ubuntu1) karmic; urgency=low
+
+  * New upstream release
+    - Bump build deps
+    - Remove build dependency on libxcomposite-dev and libxdamage-dev
+      as they are no longer needed for building lancelot compositing
+      support
+    - Remove kubuntu_01_fix_armel_build.diff, fixed by upstream
+    - Update plasma-widget-addons.install
+
+ -- Alessandro Ghersi <alessandro-ghersi at kubuntu.org>  Sat, 03 Oct 2009 18:52:18 +0200
+
 kdeplasma-addons (4:4.3.1-0ubuntu3) karmic; urgency=low
 
   * Add wallpapers/mandelbrot/mandelbrot.cpp armel fixes to
diff --git a/debian/control b/debian/control
index 598e65d..368ba1a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +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 (>= 7), quilt, pkg-kde-tools (>= 0.4.2),
- kdelibs5-dev (>= 4:4.3.1), kdepimlibs5-dev (>= 4:4.3.1), libqt4-opengl-dev,
- kdebase-workspace-dev (>= 4:4.3.1), libboost1.38-dev, libkexiv2-7-dev, python,
- libqimageblitz-dev, libeigen2-dev, libmarble-dev, libxcomposite-dev,
- libxrender-dev, libxdamage-dev
+ kdelibs5-dev (>= 4:4.3.2), kdepimlibs5-dev (>= 4:4.3.2), libqt4-opengl-dev,
+ kdebase-workspace-dev (>= 4:4.3.2), libboost1.38-dev, libkexiv2-7-dev, python,
+ libqimageblitz-dev, libeigen2-dev, libmarble-dev, libxrender-dev
 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_fix_armel_build.diff b/debian/patches/kubuntu_01_fix_armel_build.diff
deleted file mode 100644
index 1aa267c..0000000
--- a/debian/patches/kubuntu_01_fix_armel_build.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: kdeplasma-addons-4.3.1/applets/pastebin/pastebin.cpp
-===================================================================
---- kdeplasma-addons-4.3.1.orig/applets/pastebin/pastebin.cpp	2009-09-02 23:48:32.000000000 -0400
-+++ kdeplasma-addons-4.3.1/applets/pastebin/pastebin.cpp	2009-09-07 12:26:17.000000000 -0400
-@@ -253,7 +253,7 @@
- {
-     if (constraints & (Plasma::FormFactorConstraint | Plasma::SizeConstraint)) {
-         int minSize = KGlobalSettings::smallestReadableFont().pointSize();
--        int dynSize = qMax(1.0, qMin(contentsRect().width(), contentsRect().height()) / 4);
-+        int dynSize = qMax((qreal)1.0, (qreal)(qMin(contentsRect().width(), contentsRect().height()) / 4));
-         //kDebug() << "Min : Dyn" << minSize << dynSize << qMax(minSize, dynSize);
-         m_font.setPointSize(qMax(minSize, dynSize));
-     }
-Index: kdeplasma-addons-4.3.1/applets/mediaplayer/mediaplayer.cpp
-===================================================================
---- kdeplasma-addons-4.3.1.orig/applets/mediaplayer/mediaplayer.cpp	2009-09-02 23:48:32.000000000 -0400
-+++ kdeplasma-addons-4.3.1/applets/mediaplayer/mediaplayer.cpp	2009-09-07 12:26:17.000000000 -0400
-@@ -223,10 +223,10 @@
-         PlayPause();
-         break;
-     case Qt::Key_Up:
--        audio->setVolume(qMin(qreal(1.0), audio->volume() + 0.1));
-+        audio->setVolume(qMin(qreal(1.0), (qreal)(audio->volume() + 0.1)));
-         break;
-     case Qt::Key_Down:
--        audio->setVolume(qMax(qreal(0.0), audio->volume() - 0.1));
-+        audio->setVolume(qMax(qreal(0.0), (qreal)(audio->volume() - 0.1)));
-         break;
-     case Qt::Key_R:
-         RaiseLower();
-Index: kdeplasma-addons-4.3.1/wallpapers/mandelbrot/mandelbrot.cpp
-===================================================================
---- kdeplasma-addons-4.3.1.orig/wallpapers/mandelbrot/mandelbrot.cpp	2009-09-07 12:26:41.000000000 -0400
-+++ kdeplasma-addons-4.3.1/wallpapers/mandelbrot/mandelbrot.cpp	2009-09-07 12:29:03.000000000 -0400
-@@ -340,16 +340,16 @@
-     m_center += (oldResolution - newResolution) * (at - QPointF(width()/2, height()/2));
- 
-     // now scale part the old image and merge it immediately into m_image to give the user a sense of speed
--    qreal srcwidth = width() * qMin(zoomFactor,1.);
--    qreal srcheight = height() * qMin(zoomFactor,1.);
-+    qreal srcwidth = width() * qMin(zoomFactor,(qreal)(1.0));
-+    qreal srcheight = height() * qMin(zoomFactor,(qreal)(1.0));
-     qreal srcleft = at.x() - srcwidth/2.;
-     qreal srcright = at.x() + srcwidth/2.;
-     qreal srctop = at.y() - srcheight/2.;
-     qreal srcbottom = at.y() + srcheight/2.;
--    qreal srcleft_c = CLAMP(srcleft, 0., (qreal)width());
--    qreal srcright_c = CLAMP(srcright, 0., (qreal)width());
--    qreal srctop_c = CLAMP(srctop, 0., (qreal)height());
--    qreal srcbottom_c = CLAMP(srcbottom, 0., (qreal)height());
-+    qreal srcleft_c = CLAMP(srcleft, (qreal)(0.0), (qreal)width());
-+    qreal srcright_c = CLAMP(srcright, (qreal)(0.0), (qreal)width());
-+    qreal srctop_c = CLAMP(srctop, (qreal)(0.0), (qreal)height());
-+    qreal srcbottom_c = CLAMP(srcbottom, (qreal)(0.0), (qreal)height());
-     qreal srcwidth_c = srcright_c - srcleft_c;
-     qreal srcheight_c = srcbottom_c - srctop_c;
-     qreal dstwidth = width() * qMin(1./zoomFactor,1.);
diff --git a/debian/patches/series b/debian/patches/series
index 1fe23b7..03cb340 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-kubuntu_01_fix_armel_build.diff
 kubuntu_02_microblog_default_configuration.diff
 #kubuntu_03_opendestop_setup.diff
 kubuntu_04_netbook_runners.diff
diff --git a/debian/plasma-widgets-addons.install b/debian/plasma-widgets-addons.install
index d101fe0..b4ef484 100644
--- a/debian/plasma-widgets-addons.install
+++ b/debian/plasma-widgets-addons.install
@@ -43,7 +43,6 @@ usr/share/icons/hicolor/32x32/apps/previewer.png
 usr/share/icons/hicolor/48x48/apps/previewer.png
 usr/share/icons/hicolor/64x64/apps/previewer.png
 usr/share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz
-usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz
 usr/share/kde4/apps/bball/bball.svgz
 usr/share/kde4/apps/bball/bounce.ogg
 usr/share/kde4/apps/bball/football.svgz
@@ -60,12 +59,12 @@ usr/share/kde4/apps/desktoptheme/default/weatherstation/lcd_panel.svgz
 usr/share/kde4/apps/desktoptheme/default/widgets/eyes.svg
 usr/share/kde4/apps/desktoptheme/default/widgets/luna.svgz
 usr/share/kde4/apps/desktoptheme/default/widgets/notes.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/picture-frame-default.svgz
 usr/share/kde4/apps/desktoptheme/default/widgets/previewer-16.svgz
 usr/share/kde4/apps/desktoptheme/default/widgets/previewer-22.svgz
 usr/share/kde4/apps/desktoptheme/default/widgets/timer.svgz
 usr/share/kde4/apps/desktoptheme/default/widgets/microblog.svgz
 usr/share/kde4/apps/plasma_pastebin/plasma_pastebin.notifyrc
+usr/share/kde4/apps/plasma-applet-frame/picture-frame-default.jpg
 usr/share/kde4/apps/plasma-applet-opendesktop/user.css
 usr/share/kde4/apps/plasma/services/rtmauth.operations
 usr/share/kde4/apps/plasma/services/rtmtask.operations
@@ -121,3 +120,4 @@ usr/share/icons/hicolor/32x32/apps/bball.png
 usr/share/icons/hicolor/48x48/apps/bball.png
 usr/share/icons/hicolor/64x64/apps/bball.png
 usr/share/icons/hicolor/scalable/apps/bball.svgz
+usr/share/icons/hicolor/scalable/apps/accessories-dictionary.svgz

-- 
KDE Plasma Addons module packaging

More information about the pkg-kde-commits mailing list