rev 6550 - in kde-extras/qsynaptics/trunk/debian: . patches

[Mario Iseli]

Author: tico-guest
Date: 2007-06-20 15:13:44 +0000 (Wed, 20 Jun 2007)
New Revision: 6550

Added:
   kde-extras/qsynaptics/trunk/debian/patches/00list
   kde-extras/qsynaptics/trunk/debian/patches/01_ftbfs_gcc4.3.dpatch
Modified:
   kde-extras/qsynaptics/trunk/debian/changelog
   kde-extras/qsynaptics/trunk/debian/control
   kde-extras/qsynaptics/trunk/debian/rules
Log:
qsynaptics: Remove damaged old patch and fixed that with a new one, did also some other changes as explained in debian/changelog.


Modified: kde-extras/qsynaptics/trunk/debian/changelog
===================================================================
--- kde-extras/qsynaptics/trunk/debian/changelog	2007-06-19 17:27:46 UTC (rev 6549)
+++ kde-extras/qsynaptics/trunk/debian/changelog	2007-06-20 15:13:44 UTC (rev 6550)
@@ -1,8 +1,14 @@
-qsynaptics (0.22.0-9) UNRELEASED; urgency=low
+qsynaptics (0.22.0-9) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Added myself to the Uploaders field.
+  * Added build-dependency on dpatch.
+  * Removed patches/Bug417505-gcc4.3.diff since it's totally useless.
+  * Added patch from BTS by Martin Michlmayr to fix FTBFS with GCC 4.3
+    (Closes: #417505).
+  * Added some rules in debian/rules to use dpatch.
+  * Remove qsynaptics binary in clean target to avoid FTBFS (Closes: #424296).
 
- -- Mark Purcell <msp at debian.org>  Wed, 02 May 2007 19:05:30 +0100
+ -- Mario Iseli <admin at marioiseli.com>  Wed, 20 Jun 2007 16:02:34 +0100
 
 qsynaptics (0.22.0-8) unstable; urgency=low
 

Modified: kde-extras/qsynaptics/trunk/debian/control
===================================================================
--- kde-extras/qsynaptics/trunk/debian/control	2007-06-19 17:27:46 UTC (rev 6549)
+++ kde-extras/qsynaptics/trunk/debian/control	2007-06-20 15:13:44 UTC (rev 6550)
@@ -2,8 +2,8 @@
 Section: x11
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>, Arnaud Quette <aquette at debian.org>
-Build-Depends: debhelper (>= 5), libqt3-mt-dev
+Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>, Arnaud Quette <aquette at debian.org>, Mario Iseli <admin at marioiseli.com>
+Build-Depends: debhelper (>= 5), libqt3-mt-dev, dpatch
 Standards-Version: 3.7.2
 
 Package: qsynaptics

Added: kde-extras/qsynaptics/trunk/debian/patches/00list
===================================================================
--- kde-extras/qsynaptics/trunk/debian/patches/00list	                        (rev 0)
+++ kde-extras/qsynaptics/trunk/debian/patches/00list	2007-06-20 15:13:44 UTC (rev 6550)
@@ -0,0 +1 @@
+01_ftbfs_gcc4.3

Added: kde-extras/qsynaptics/trunk/debian/patches/01_ftbfs_gcc4.3.dpatch
===================================================================
--- kde-extras/qsynaptics/trunk/debian/patches/01_ftbfs_gcc4.3.dpatch	                        (rev 0)
+++ kde-extras/qsynaptics/trunk/debian/patches/01_ftbfs_gcc4.3.dpatch	2007-06-20 15:13:44 UTC (rev 6550)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-unnamed.dpatch by Mario Iseli <mario at marioiseli.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+
+diff -Naur qsynaptics-0.22.0/src/qsynaptics.cpp qsynaptics-0.22.0.new/src/qsynaptics.cpp
+--- qsynaptics-0.22.0/src/qsynaptics.cpp	2004-07-12 21:16:52.000000000 +0100
++++ qsynaptics-0.22.0.new/src/qsynaptics.cpp	2007-06-20 16:09:41.000000000 +0100
+@@ -22,6 +22,7 @@
+ 
+ #include "syntp.h"
+ 
++#include <cstdlib>
+ #include <map>
+ #include <string>
+ #include <iostream>


Property changes on: kde-extras/qsynaptics/trunk/debian/patches/01_ftbfs_gcc4.3.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: kde-extras/qsynaptics/trunk/debian/rules
===================================================================
--- kde-extras/qsynaptics/trunk/debian/rules	2007-06-19 17:27:46 UTC (rev 6549)
+++ kde-extras/qsynaptics/trunk/debian/rules	2007-06-20 15:13:44 UTC (rev 6550)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpatch/dpatch.make
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -14,7 +16,7 @@
 	INSTALL_PROGRAM += -s
 endif
 
-configure: configure-stamp
+configure: patch configure-stamp
 configure-stamp:
 	dh_testdir
 
@@ -31,9 +33,10 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
+	rm -f qsynaptics
 	rm -f build-stamp configure-stamp
 
 	-$(MAKE) clean