--- stroq-0.2.orig/debian/stroq-icon.xpm
+++ stroq-0.2/debian/stroq-icon.xpm
@@ -0,0 +1,295 @@
+/* XPM */
+static char *stroq-icon[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #7B5A3E",
+".  c #885133",
+"X  c #945B32",
+"o  c #95612D",
+"O  c #9C6830",
+"+  c #805A62",
+"@  c #FD744B",
+"#  c #FD7A45",
+"$  c #FD7C4A",
+"%  c #FD7546",
+"&  c #FC725D",
+"*  c #FD7A54",
+"=  c #FC7759",
+"-  c #FC6E64",
+";  c #FC6E69",
+":  c #FB7264",
+">  c #FC736B",
+",  c #FC7D63",
+"<  c #FC7A6B",
+"1  c #FC7670",
+"2  c #FC7D74",
+"3  c #FC7D79",
+"4  c #9F8079",
+"5  c #CEA036",
+"6  c #FF9D03",
+"7  c #FE9C0D",
+"8  c #FE941D",
+"9  c #FE9A17",
+"0  c #FE9919",
+"q  c #FE8D2D",
+"w  c #FD833A",
+"e  c #FD8D34",
+"r  c #FD8E39",
+"t  c #FD8536",
+"y  c #FE9222",
+"u  c #FE9028",
+"i  c #FE9B20",
+"p  c #FE903F",
+"a  c #FD9B39",
+"s  c #FFA501",
+"d  c #FEA50A",
+"f  c #FEA901",
+"g  c #FEAB0A",
+"h  c #FEA112",
+"j  c #FEAD13",
+"k  c #FCAC19",
+"l  c #FDB00C",
+"z  c #F9B306",
+"x  c #FDB112",
+"c  c #FDB219",
+"v  c #FBB817",
+"b  c #FBBB1B",
+"n  c #EABF3E",
+"m  c #FDA224",
+"M  c #FDAC21",
+"N  c #FBAA2D",
+"B  c #FBAC3B",
+"V  c #FBA73A",
+"C  c #FDB123",
+"Z  c #FFB52A",
+"A  c #F9BF22",
+"S  c #FFBA33",
+"D  c #F9B237",
+"F  c #FC8244",
+"G  c #FC8E43",
+"H  c #FC8A4B",
+"J  c #FC8556",
+"K  c #FD8458",
+"L  c #FD8E58",
+"P  c #FE9D41",
+"I  c #FA9C4B",
+"U  c #FB9445",
+"Y  c #FB9451",
+"T  c #FE9759",
+"R  c #FD9A55",
+"E  c #FB8068",
+"W  c #FC8B65",
+"Q  c #FC8A69",
+"!  c #FC827B",
+"~  c #FC897C",
+"^  c #FC8B76",
+"/  c #FC9064",
+"(  c #FB936A",
+")  c #FB9C6C",
+"_  c #FB9B64",
+"`  c #FE9670",
+"'  c #FD937B",
+"]  c #FD9872",
+"[  c #EFBE46",
+"{  c #FEA244",
+"}  c #F9A74D",
+"|  c #FDA454",
+" . c #FAA45C",
+".. c #FCAD51",
+"X. c #FBAB5C",
+"o. c #FDB441",
+"O. c #FFB64F",
+"+. c #FFBB43",
+"@. c #F7BE50",
+"#. c #F8B652",
+"$. c #FAB35C",
+"%. c #F8BB54",
+"&. c #FBA26C",
+"*. c #FEAA66",
+"=. c #FAAB6B",
+"-. c #F9A165",
+";. c #FDA276",
+":. c #FBB562",
+">. c #F9B16C",
+",. c #F9BE66",
+"<. c #FDBC6D",
+"1. c #F9B671",
+"2. c #FEBD79",
+"3. c #FEB978",
+"4. c #F6C72C",
+"5. c #F6C82A",
+"6. c #F9C225",
+"7. c #F9C52C",
+"8. c #FCC821",
+"9. c #F6C522",
+"0. c #F5C533",
+"q. c #F5CC33",
+"w. c #F8CD30",
+"e. c #F8CB3B",
+"r. c #F3CA3D",
+"t. c #F5D235",
+"y. c #F3D53C",
+"u. c #F3D831",
+"i. c #F3D93C",
+"p. c #FDD639",
+"a. c #FBDD3D",
+"s. c #F5E03F",
+"d. c #FFE13D",
+"f. c #EDC040",
+"g. c #F6CF4D",
+"h. c #FDC143",
+"j. c #FAC44C",
+"k. c #F7C451",
+"l. c #F7C95B",
+"z. c #FEC452",
+"x. c #FDC55B",
+"c. c #FFC85C",
+"v. c #F7CC54",
+"b. c #F5D443",
+"n. c #F3D942",
+"m. c #F3DA4A",
+"M. c #FBD140",
+"N. c #F6D34B",
+"B. c #F7D156",
+"V. c #F4DC54",
+"C. c #F4DC59",
+"Z. c #F8C364",
+"A. c #F9C169",
+"S. c #FFCC66",
+"D. c #FECC68",
+"F. c #FBC374",
+"G. c #FFC67C",
+"H. c #FDCC76",
+"J. c #FFCF78",
+"K. c #F7D564",
+"L. c #F7DA6F",
+"P. c #F6DB65",
+"I. c #F7DD73",
+"U. c #F7DC78",
+"Y. c #FFD27C",
+"T. c #F8D975",
+"R. c #F8D373",
+"E. c #F4E04E",
+"W. c #F4E256",
+"Q. c #F4E25B",
+"!. c #F5E563",
+"~. c #F5E26C",
+"^. c #F7E576",
+"/. c #F6E579",
+"(. c #F6E974",
+"). c #F7EB7B",
+"_. c #F8E779",
+"`. c #F9E877",
+"'. c #F7F07D",
+"]. c #FC8B85",
+"[. c #FD8A86",
+"{. c #FC928B",
+"}. c #FD998C",
+"|. c #FD9B93",
+" X c #FD9C98",
+".X c #FDA285",
+"XX c #FDAF85",
+"oX c #FDAC8B",
+"OX c #FDA395",
+"+X c #FDA59C",
+"@X c #FEAB93",
+"#X c #FEB186",
+"$X c #FDB18E",
+"%X c #FFBA81",
+"&X c #FEBA8A",
+"*X c #FDB49B",
+"=X c #FEBC93",
+"-X c #FDBC99",
+";X c #FDA2A0",
+":X c #FDABA3",
+">X c #FDAEA9",
+",X c #FDB2AD",
+"<X c #FEBCA3",
+"1X c #FDBAAC",
+"2X c #FDB5A6",
+"3X c #FDB7B1",
+"4X c #FDBCB2",
+"5X c #FFC980",
+"6X c #FFCF8A",
+"7X c #FDC29D",
+"8X c #FDC195",
+"9X c #FDD483",
+"0X c #FCD68E",
+"qX c #FFD694",
+"wX c #FFD897",
+"eX c #FFD99B",
+"rX c #FEC3A5",
+"tX c #FEC2AC",
+"yX c #FECAA7",
+"uX c #FECAAA",
+"iX c #FEC4B3",
+"pX c #FEC5BA",
+"aX c #FEC8B6",
+"sX c #FECCBB",
+"dX c #FFDCA2",
+"fX c #FFDDAA",
+"gX c #FAE68D",
+"hX c #F7EC95",
+"jX c #F8EF96",
+"kX c #F8ED9C",
+"lX c #FFE0AB",
+"zX c #F9EEA8",
+"xX c #FFE2B2",
+"cX c #FDE6BD",
+"vX c #F8F7A3",
+"bX c #F9F2AD",
+"nX c #FAF5B3",
+"mX c #FBF8BD",
+"MX c #FED4C5",
+"NX c #FEDBD4",
+"BX c #FFE9C2",
+"VX c #FFECCA",
+"CX c #FEE4DA",
+"ZX c #FBF3C2",
+"AX c #FBF9C5",
+"SX c #FDF7DA",
+"DX c LightGoldenrodYellow",
+"FX c #FFE7E6",
+"GX c #FFEAE4",
+"HX c #FEEFEA",
+"JX c #FFF3ED",
+"KX c #FCFCE3",
+"LX c #FDFFEB",
+"PX c #FFF2F3",
+"IX c #FFF6F9",
+"UX c #FEFEFE",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYX9Xh.S f g z.c.YXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXD.z.h.S l g f f x c 7.h.z.YXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXc.S.S g f s f f g g f f s g j D D.YXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXY.Z d s f l b 4.t.t.q.5.8.b g f f C x.YXYXYXYXYXYXYX",
+"YXYXYXYXYX0Xk s d x 4.i.i.i.i.i.i.n.[ r.t.A g s j qXYXYXYXYXYXYX",
+"YXYXYXYXeXC d g 8.i.i.f.r.i.y.i.s.h.+ X i.n.q.c d M wXYXYXYXYXYX",
+"YXYXYXfX+.6 d g.bXE.p.+   y.i.y.i.q.O 5 a.y.i.y.k 6 o.dXYXYXYXYX",
+"YXYXYXH.9 7 0.DXUX`.p.. o a.i.y.i.i.a.a.y.i.y.i.4.9 7 6XYXYXYXYX",
+"YXYX6Xo.7 k kXUXUX~.u.r.M.i.i.y.n.y.i.i.n.y.i.i.n.C 7 O.YXYXYXYX",
+"YXYXF.m 0 0.KXUXZXn.n.n.n.n.n.n.y.i.n.n.n.n.n.b.n.0.0 m G.YXYXYX",
+"YXYX<.8 m n.bXzXy.5.q.y.n.n.n.n.n.n.b.n.m.n.m.n.n.n.m i <.YXYXYX",
+"YXYX:.8 M hXgXz f f f f b b.m.b.n.m.m.q.6.A 6.5.n.m.N i $.YXYXYX",
+"YXYXV u D Q.e.s f f f f f y.V.m.m.m.v s f f f f l b.D y ..YXYXYX",
+"YXYX{ u B m.m.6.f f f l 7.m.V.m.V.m.b f f s s s x m.o.u a YXYXYX",
+"YXYXX.q B V.V.C.V.b.b.V.V.V.V.V.V.V.V.r.w.7.7.y.V.W.V q a YXYXYX",
+"YXYX*.e a C.V.V.C.C.W.W.C.V.V.V.V.V.C.Q.Q.C.V.C.C.V.a e | YXYXYX",
+"YXYX3.U r B.Q.C.Y Y %.g.V.Q.Q.Q.W.Q.Q.C.k.} XXG.W.v.r e *.YXYXYX",
+"YXYX=XR t @.!.P.F *XNX-X>.$.@.k.k.@.#.>.<XNXaX=.Q.#.w G &XYXYXYX",
+"YXYXYX&.w ..!.!.I @XUXUXIXFXMXiXtXaXNXPXUXUXsXU !.} w T yXYXYXYX",
+"YXYXYXXXF I !.!.l.K HXUXUXUXUXUXUXUXUXUXUXUX2X..P.H w ;.YXYXYXYX",
+"YXYXYXrXL F K.jX/.G @XUXUXUXUXUXUXUXUXUXUXUX] l.Z.# H -XYXYXYXYX",
+"YXYXYXYX( # $.LXAXl.# sXUXUXUXUXUXUXUXCX8X*XY ~.X.$ W oXYXYXYXYX",
+"YXYXYXYXoX* H ZXKX~.$.$ MXUXUXUXUXUXUXPX,.K.L.(.X.@ ] oXYXYXYXYX",
+"YXYXYXYXiXQ @ 1.vX^.(. .% tXGXCXJXJXCXiX*.(.(.^.T. .J W .XYXYXYX",
+"YXYXYXYXYX@X= * Z.).).).$.) ] $ J J $ #  .)././.^.nXcXT Q iXYXYX",
+"YXYXYXYXYXsX' = = >./.(.).I.R.Z.>.:.Z.L./.(.).(./.SXUX0X* ' YXYX",
+"YXYXYXYXYXYX2X^ & & / R.).gX'.).).).gX'.).U.>.1.(.kXmX<.& , YXYX",
+"YXYXYXYXYXYXYXOX~ : & : ) 1.~./.).).U.F.&., & : -.nXAXW : }.YXYX",
+"YXYXYXYXYXYXYXYX}.{.E - : ; , Q ( ( , > - : : : - ( =.: ~ pXYXYX",
+"YXYXYXYXYXYXYXYXYXYX:X X1 > > ; - ; : > > 2 2 > ; ; - ; :XYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX{.].! 3 1 1 ! 3 ].].YX! 3 ; > [.YXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX{.3 3 |.YXYXYXYXYX;X> [.,XYXYXYXYX"
+};
--- stroq-0.2.orig/debian/control
+++ stroq-0.2/debian/control
@@ -1,15 +1,15 @@
 Source: stroq
 Section: games
 Priority: optional
-Maintainer: Arnaud Cornet <cuicui@t1r.net>
-Standards-Version: 3.6.1
-Build-Depends: cdbs, libqt3-dev, g++
+Maintainer: Arnaud Cornet <acornet@debian.org>
+Standards-Version: 3.8.0
+Build-Depends: cdbs, libqt3-mt-dev (>= 3:3.3.8b-5), g++ (>= 4.0.2-2), debhelper (>= 5.0.22), quilt
 
 Package: stroq
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A Polarium/Chokkan Hitofude clone.
-  StroQ is an addictive puzzle game where you have to flip white and black
-  tiles in order to form rows of the same color with a single stroke of your
-  mouse.
+Depends: ${shlibs:Depends}
+Description: A Polarium/Chokkan Hitofude clone
+ StroQ is an addictive puzzle game where you have to flip white and black
+ tiles in order to form rows of the same color with a single stroke of your
+ mouse.
--- stroq-0.2.orig/debian/copyright
+++ stroq-0.2/debian/copyright
@@ -1,13 +1,12 @@
-This package was debianized by Arnaud Cornet <cuicui@t1r.net> on
+This package was debianized by Arnaud Cornet <arnaud.cornet@gmail.com> on
 Tue, 24 May 2005 11:46:12 +0200.
 
 It was downloaded from http://stroq.sourceforge.net/ 
 
 Upstream Authors:
-
 Luc Vo Van <thelemmings@thelemmings.net>
 
-Copyright:
+Copyright (C) 2005 Luc Vo Van
 
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,8 +19,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this package; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'.
--- stroq-0.2.orig/debian/changelog
+++ stroq-0.2/debian/changelog
@@ -1,5 +1,52 @@
+stroq (0.2-7) unstable; urgency=low
+
+  * Use pwd to guess built binary name, this seems to be what qmake does.
+    (Closes: #483330).
+
+ -- Arnaud Cornet <acornet@debian.org>  Sat, 19 Jul 2008 13:28:21 +0200
+
+stroq (0.2-6) unstable; urgency=low
+
+  * Thighten qt version dependency.
+  * Work wether the build sys generates stroq or stoq-0.2 binary
+    (Closes: #486853).
+
+ -- Arnaud Cornet <acornet@debian.org>  Wed, 18 Jun 2008 23:52:59 +0200
+
+stroq (0.2-5) unstable; urgency=low
+
+  * Fix rules as generated binary has a new name with recent qmake
+    (Closes: #483330).
+  * Update my mail address.
+  * Fix clean rule (do not ignore make clean error).
+  * Move stroq binary to /usr/games.
+
+ -- Arnaud Cornet <acornet@debian.org>  Tue, 17 Jun 2008 22:00:24 +0200
+
+stroq (0.2-4) unstable; urgency=low
+
+  * Switch to quilt patch system.
+  * Add gcc42.patch (Closes: #417707)
+  * Bump standards-version (no change).
+
+ -- Arnaud Cornet <arnaud.cornet@gmail.com>  Tue, 29 May 2007 17:24:33 +0200
+
+stroq (0.2-3) unstable; urgency=low
+
+  * Added icon and menu entry (Closes: Bug#362433).
+  * Added .desktop file.
+
+ -- Arnaud Cornet <arnaud.cornet@gmail.com>  Thu, 13 Apr 2006 16:28:22 +0200
+
+stroq (0.2-2) unstable; urgency=low
+
+  * Merges patch from Martin Michlmayr, required to build with G++ 4.1.
+    (Closes: Bug#357601)
+
+ -- Arnaud Cornet <arnaud.cornet@gmail.com>  Sat, 18 Mar 2006 16:46:34 +0100
+
 stroq (0.2-1) unstable; urgency=low
 
   * Initial debian package
 
- -- Arnaud Cornet <cuicui@t1r.net>  Tue, 24 May 2005 11:46:12 +0200
+ -- Arnaud Cornet <arnaud.cornet@gmail.com>  Tue, 24 May 2005 11:46:12 +0200
--- stroq-0.2.orig/debian/stroq.menu
+++ stroq-0.2/debian/stroq.menu
@@ -0,0 +1,7 @@
+?package(stroq):\
+    needs="x11"\
+    section="Games/Board"\
+    title="StroQ"\
+    longtitle="StroQ, a Polarium/Chokkan Hitofude clone"\
+    icon="/usr/share/pixmaps/stroq-icon.xpm"\
+    command="/usr/games/stroq"
--- stroq-0.2.orig/debian/stroq.manpages
+++ stroq-0.2/debian/stroq.manpages
@@ -0,0 +1 @@
+debian/stroq.1
--- stroq-0.2.orig/debian/stroq.1
+++ stroq-0.2/debian/stroq.1
@@ -0,0 +1,27 @@
+.TH STROQ 1 "6 February 2006"
+
+.SH NAME
+
+stroq \- StroQ A Polarium/Chokkan Hitofude clone
+
+.SH SYNOPSIS
+
+\fBstroq\fP
+
+.SH DESCRIPTION
+
+StroQ is an addictive puzzle game where you have to flip white and black
+tiles in order to form rows of the same color with a single stroke of your
+mouse.
+
+The goal of the game is simple, draw a single continuous line, the stroke, from
+one square to another. When you run the puzzle (press F5) white and black
+squares along this line will flip over (white becoming black, and black
+becoming white). The puzzle is solved when all tiles on the rows are the same
+color. You can reset a puzzle by pressing the right mouse button or the F4 key.
+
+You can find a game tutorial at http://stroq.sourceforge.net/howtoplay.html.
+
+.SH AUTHOR
+
+Luc Vo Van
--- stroq-0.2.orig/debian/stroq.desktop
+++ stroq-0.2/debian/stroq.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=StroQ
+GenericName=Board Game
+Type=Application
+Categories=Application;Game;BoardGame;
+Terminal=0
+Exec=stroq
+Icon=/usr/share/pixmaps/stroq-icon.xpm
+Comment=StroQ, a Polarium/Chokkan Hitofude clone
--- stroq-0.2.orig/debian/stroq.install
+++ stroq-0.2/debian/stroq.install
@@ -0,0 +1,3 @@
+StroQ_fr.qm usr/share/qt3/translations/
+debian/stroq-icon.xpm usr/share/pixmaps/
+debian/stroq.desktop usr/share/applications/
--- stroq-0.2.orig/debian/rules
+++ stroq-0.2/debian/rules
@@ -2,16 +2,23 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 pre-build::
+	lrelease-qt3 StroQ_fr.ts
 	qmake -project
 	qmake
 
 clean::
-	-make distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f Makefile
-	rm -f stroq-0.2.pro
+	rm -f stroq.pro
+	rm -f StroQ_fr.qm
 
 install/stroq::
-	mkdir -p debian/stroq/usr/bin
-	cp stroq-0.2 debian/stroq/usr/bin/stroq
+	mkdir -p debian/stroq/usr/games
+	cp $(shell basename $(shell pwd)) debian/stroq/usr/games/stroq
+
+binary-install/stroq::
+	dh_desktop -pstroq
+
--- stroq-0.2.orig/debian/patches/gcc41.patch
+++ stroq-0.2/debian/patches/gcc41.patch
@@ -0,0 +1,39 @@
+Index: stroq-0.2/playsquare.h
+===================================================================
+--- stroq-0.2.orig/playsquare.h	2007-05-29 17:20:18.000000000 +0200
++++ stroq-0.2/playsquare.h	2007-05-29 17:20:28.000000000 +0200
+@@ -146,7 +146,7 @@
+ 	/**
+ 	 * Returns the index of the currently loaded theme
+ 	 */
+-	static int PlaySquare::getCurrentTheme();
++	static int getCurrentTheme();
+ 	
+ 	/**
+ 	 * Changes the current theme
+Index: stroq-0.2/puzzle.h
+===================================================================
+--- stroq-0.2.orig/puzzle.h	2007-05-29 17:19:57.000000000 +0200
++++ stroq-0.2/puzzle.h	2007-05-29 17:20:28.000000000 +0200
+@@ -79,7 +79,7 @@
+ 	 * Builds a puzzle made of PlaySquares given a code. See previous
+ 	 * method.
+ 	 */
+-	Puzzle::Puzzle(QString code, QCanvas *canvas);
++	Puzzle(QString code, QCanvas *canvas);
+ 	
+ 	/**
+ 	 * Class destructor
+Index: stroq-0.2/selectpuzzledialog.h
+===================================================================
+--- stroq-0.2.orig/selectpuzzledialog.h	2007-05-29 17:20:03.000000000 +0200
++++ stroq-0.2/selectpuzzledialog.h	2007-05-29 17:20:28.000000000 +0200
+@@ -67,7 +67,7 @@
+ 	
+ 	// The following two methods are used to get the results of the dialog
+ 	QString getPuzzleCode();
+-	int SelectPuzzleDialog::getPuzzleNumber();
++	int getPuzzleNumber();
+ 
+ signals:
+ 	/**
--- stroq-0.2.orig/debian/patches/series
+++ stroq-0.2/debian/patches/series
@@ -0,0 +1,2 @@
+gcc41.patch
+gcc42.diff
--- stroq-0.2.orig/debian/patches/gcc42.diff
+++ stroq-0.2/debian/patches/gcc42.diff
@@ -0,0 +1,12 @@
+Index: stroq-0.2/playarea.cpp
+===================================================================
+--- stroq-0.2.orig/playarea.cpp	2007-05-29 17:21:21.000000000 +0200
++++ stroq-0.2/playarea.cpp	2007-05-29 17:21:28.000000000 +0200
+@@ -34,6 +34,7 @@
+ #include <qpixmap.h>
+ #include <qsettings.h>
+ #include <qfile.h>
++#include <cstdlib>
+ #include <vector>
+ 
+ #include "playarea.h"