rev 16609 - in kde-extras/touchfreeze/trunk/debian: . patches source
Kel Modderman
kelmo-guest at alioth.debian.org
Fri Jan 15 11:46:55 UTC 2010
Author: kelmo-guest
Date: 2010-01-15 11:46:54 +0000 (Fri, 15 Jan 2010)
New Revision: 16609
Added:
kde-extras/touchfreeze/trunk/debian/install
kde-extras/touchfreeze/trunk/debian/patches/
kde-extras/touchfreeze/trunk/debian/patches/segfault.patch
kde-extras/touchfreeze/trunk/debian/patches/series
kde-extras/touchfreeze/trunk/debian/source/
kde-extras/touchfreeze/trunk/debian/source/format
kde-extras/touchfreeze/trunk/debian/source/include-binaries
kde-extras/touchfreeze/trunk/debian/touchfreeze.png
Modified:
kde-extras/touchfreeze/trunk/debian/changelog
kde-extras/touchfreeze/trunk/debian/control
kde-extras/touchfreeze/trunk/debian/rules
kde-extras/touchfreeze/trunk/debian/watch
Log:
* Use minimal dh-centric debian/rules with overrides. Build-depend on
debhelper >= 7.0.50.
* Use debian/install rather than explicit dh_install commands in
debian/rules.
* Convert to 3.0 (quilt) source format. Add debian/source/format.
* Provide debian/touchpad.png binary to avoid huge build-dependency on
inkscape. Add debian/touchpad.png to debian/source/include-binaries.
* Remove call to uupdate in debian/watch, it is no longer useful.
* Adjust Standards-Version to 3.8.3, no other changes needed.
* Add debian/patches/segfault.patch to fix trivial problem with
QApplication usage. (Closes: #563038)
Modified: kde-extras/touchfreeze/trunk/debian/changelog
===================================================================
--- kde-extras/touchfreeze/trunk/debian/changelog 2010-01-15 10:46:50 UTC (rev 16608)
+++ kde-extras/touchfreeze/trunk/debian/changelog 2010-01-15 11:46:54 UTC (rev 16609)
@@ -1,9 +1,23 @@
touchfreeze (0.2.3-3) UNRELEASED; urgency=low
+ [ Mark Purcell ]
* NOT RELEASED YET
- -- Mark Purcell <msp at debian.org> Tue, 14 Apr 2009 20:15:36 +1000
+ [ Kel Modderman ]
+ * Use minimal dh-centric debian/rules with overrides. Build-depend on
+ debhelper >= 7.0.50.
+ * Use debian/install rather than explicit dh_install commands in
+ debian/rules.
+ * Convert to 3.0 (quilt) source format. Add debian/source/format.
+ * Provide debian/touchpad.png binary to avoid huge build-dependency on
+ inkscape. Add debian/touchpad.png to debian/source/include-binaries.
+ * Remove call to uupdate in debian/watch, it is no longer useful.
+ * Adjust Standards-Version to 3.8.3, no other changes needed.
+ * Add debian/patches/segfault.patch to fix trivial problem with
+ QApplication usage. (Closes: #563038)
+ -- Kel Modderman <kel at otaku42.de> Fri, 15 Jan 2010 20:54:40 +1000
+
touchfreeze (0.2.3-2) unstable; urgency=low
* Recommend xserver-xorg-input-synaptics (>= 1.1.0), SHMConfig
Modified: kde-extras/touchfreeze/trunk/debian/control
===================================================================
--- kde-extras/touchfreeze/trunk/debian/control 2010-01-15 10:46:50 UTC (rev 16608)
+++ kde-extras/touchfreeze/trunk/debian/control 2010-01-15 11:46:54 UTC (rev 16609)
@@ -3,12 +3,11 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Kel Modderman <kel at otaku42.de>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 7.0.50),
libqt4-dev,
libx11-dev,
- docbook-to-man,
- inkscape
-Standards-Version: 3.8.1
+ docbook-to-man
+Standards-Version: 3.8.3
Homepage: http://qsynaptics.sourceforge.net/index.html
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/touchfreeze/trunk
Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/touchfreeze/trunk
Added: kde-extras/touchfreeze/trunk/debian/install
===================================================================
--- kde-extras/touchfreeze/trunk/debian/install (rev 0)
+++ kde-extras/touchfreeze/trunk/debian/install 2010-01-15 11:46:54 UTC (rev 16609)
@@ -0,0 +1,3 @@
+touchfreeze usr/bin/
+debian/touchfreeze.desktop usr/share/applications/
+debian/touchfreeze.png usr/share/pixmaps/
Added: kde-extras/touchfreeze/trunk/debian/patches/segfault.patch
===================================================================
--- kde-extras/touchfreeze/trunk/debian/patches/segfault.patch (rev 0)
+++ kde-extras/touchfreeze/trunk/debian/patches/segfault.patch 2010-01-15 11:46:54 UTC (rev 16609)
@@ -0,0 +1,26 @@
+Description: QApplication's argc must be a reference.
+Bug-Debian: http://bugs.debian.org/563038
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/touchfreeze/+bug/453581
+
+--- a/TouchFreezeApp.h
++++ b/TouchFreezeApp.h
+@@ -37,7 +37,7 @@ class TouchFreezeApp: public QApplicatio
+ {
+ Q_OBJECT
+ public:
+- TouchFreezeApp( int argc, char* argv[] );
++ TouchFreezeApp( int& argc, char* argv[] );
+ virtual ~TouchFreezeApp();
+
+ protected:
+--- a/TouchFreezeApp.cpp
++++ b/TouchFreezeApp.cpp
+@@ -35,7 +35,7 @@
+ #include <QString>
+ #include <QProcess>
+
+-TouchFreezeApp::TouchFreezeApp( int argc, char* argv[] ) : QApplication( argc, argv )
++TouchFreezeApp::TouchFreezeApp( int& argc, char* argv[] ) : QApplication( argc, argv )
+ {
+ if ( !QSystemTrayIcon::isSystemTrayAvailable() )
+ {
Added: kde-extras/touchfreeze/trunk/debian/patches/series
===================================================================
--- kde-extras/touchfreeze/trunk/debian/patches/series (rev 0)
+++ kde-extras/touchfreeze/trunk/debian/patches/series 2010-01-15 11:46:54 UTC (rev 16609)
@@ -0,0 +1 @@
+segfault.patch
Modified: kde-extras/touchfreeze/trunk/debian/rules
===================================================================
--- kde-extras/touchfreeze/trunk/debian/rules 2010-01-15 10:46:50 UTC (rev 16608)
+++ kde-extras/touchfreeze/trunk/debian/rules 2010-01-15 11:46:54 UTC (rev 16609)
@@ -1,40 +1,12 @@
#!/usr/bin/make -f
+%:
+ dh $@
-debian/touchfreeze.1:
- docbook-to-man debian/touchfreeze.sgml > $@
-
-debian/touchfreeze.png:
- inkscape res/touchpad.svg \
- --without-gui \
- --export-width=48 \
- --export-height=48 \
- --export-png=$@
-
-build: build-stamp
-build-stamp: debian/touchfreeze.1 debian/touchfreeze.png
- dh build --before dh_auto_configure
+override_dh_auto_build:
qmake-qt4
- dh build --after dh_auto_configure
- touch build-stamp
+ dh_auto_build
-clean:
- dh clean
- dh_clean debian/touchfreeze.png debian/touchfreeze.1
-
-install: build install-stamp
-install-stamp:
- dh install --before dh_auto_install
- dh_install touchfreeze usr/bin/
- dh_install debian/touchfreeze.desktop usr/share/applications/
- dh_install debian/touchfreeze.png usr/share/pixmaps/
- dh_installman debian/touchfreeze.1
- dh install --after dh_auto_install
- touch install-stamp
-
-binary-arch: install
- dh binary-arch
-
-binary-indep: install
- dh binary-indep
-
-binary: binary-arch binary-indep
+override_dh_installman:
+ mkdir -p debian/tmp
+ docbook-to-man debian/touchfreeze.sgml > debian/tmp/touchfreeze.1
+ dh_installman debian/tmp/touchfreeze.1
Added: kde-extras/touchfreeze/trunk/debian/source/format
===================================================================
--- kde-extras/touchfreeze/trunk/debian/source/format (rev 0)
+++ kde-extras/touchfreeze/trunk/debian/source/format 2010-01-15 11:46:54 UTC (rev 16609)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: kde-extras/touchfreeze/trunk/debian/source/include-binaries
===================================================================
--- kde-extras/touchfreeze/trunk/debian/source/include-binaries (rev 0)
+++ kde-extras/touchfreeze/trunk/debian/source/include-binaries 2010-01-15 11:46:54 UTC (rev 16609)
@@ -0,0 +1 @@
+debian/touchfreeze.png
Added: kde-extras/touchfreeze/trunk/debian/touchfreeze.png
===================================================================
(Binary files differ)
Property changes on: kde-extras/touchfreeze/trunk/debian/touchfreeze.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: kde-extras/touchfreeze/trunk/debian/watch
===================================================================
--- kde-extras/touchfreeze/trunk/debian/watch 2010-01-15 10:46:50 UTC (rev 16608)
+++ kde-extras/touchfreeze/trunk/debian/watch 2010-01-15 11:46:54 UTC (rev 16609)
@@ -1,2 +1,2 @@
version=3
-http://qsynaptics.sourceforge.net/dl.html touchfreeze-(.*)\.tar\.gz debian uupdate
+http://qsynaptics.sourceforge.net/dl.html touchfreeze-(.*)\.tar\.gz debian
More information about the pkg-kde-commits
mailing list