[SCM] kamoso packaging branch, master, updated. 7d9a4ecbfbc61107c57755a1d0afa540ff44d0aa

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit aaeeb4221da601666849714b66b0f05a11a463bd
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Jul 22 23:18:11 2011 +0200

    Remove 01_fix_build_numberofcolors.diff.
---
 debian/patches/01_fix_build_numberofcolors.diff |   48 -----------------------
 debian/patches/series                           |    1 -
 2 files changed, 0 insertions(+), 49 deletions(-)

diff --git a/debian/patches/01_fix_build_numberofcolors.diff b/debian/patches/01_fix_build_numberofcolors.diff
deleted file mode 100644
index 6396273..0000000
--- a/debian/patches/01_fix_build_numberofcolors.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-# Description: patch stolen from upstream git commit 
-#  8e71f8e1b232b093a0a015c18eb6403d93fb3f76 it fixes an FTBFS the commit log
-#  says "Build++ on some 64bits platforms, seems that Qt have something called
-#  colorCount somewhere.
-# Origin: upstream
-# Author: Alex Fiestas <alex at eyeos.org>
-# Forwarded: no because this patch is stolen from upstream
-
---- a/src/countdownwidget.cpp
-+++ b/src/countdownwidget.cpp
-@@ -24,8 +24,8 @@
- #include <QDebug>
- #include <QTimeLine>
- 
--static const int colorCount=3;
--static const QColor colors[colorCount]={ Qt::red, Qt::yellow, Qt::green };
-+static const int numberOfColours=3;
-+static const QColor colors[numberOfColours]={ Qt::red, Qt::yellow, Qt::green };
- 
- CountdownWidget::CountdownWidget(QWidget* parent)
- 	: QWidget(parent)
-@@ -63,11 +63,11 @@ void CountdownWidget::paintEvent(QPaintEvent* )
- 	
- 	const int margin=5;
- 	int rad=height()/2-margin;
--	int dist=(width()-rad*colorCount)/(colorCount-1);
-+	int dist=(width()-rad*numberOfColours)/(numberOfColours-1);
- 	
--	int current=int(mProgress*colorCount);
-+	int current=int(mProgress*numberOfColours);
- 	
--	for(int i=0; i<colorCount; i++) {
-+	for(int i=0; i<numberOfColours; i++) {
- 		QColor color=colors[i];
- 		if(i>=current)
- 			color=color.dark(125);
-@@ -83,7 +83,7 @@ void CountdownWidget::paintEvent(QPaintEvent* )
- 			painter.setPen(color);
- 			painter.setBrush(color);
- 			
--			double progUnit=1./colorCount;
-+			double progUnit=1./numberOfColours;
- 			double prog=(mProgress-i*progUnit)/progUnit;
- 			
- 			painter.drawEllipse(tl, rad*prog, rad*prog);
--- 
-1.6.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7a4be1f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_fix_build_numberofcolors.diff

-- 
kamoso packaging