--- einstein-2.0.dfsg.2.orig/debian/menu
+++ einstein-2.0.dfsg.2/debian/menu
@@ -0,0 +1,2 @@
+?package(einstein):needs="X11" section="Games/Puzzles"\
+  title="Einstein" command="/usr/games/einstein"
--- einstein-2.0.dfsg.2.orig/debian/einstein.desktop
+++ einstein-2.0.dfsg.2/debian/einstein.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Einstein
+Comment="Puzzle game inspired on Einstein's puzzle"
+Exec=einstein
+Icon=einstein.png
+Terminal=false
+Type=Application
+Categories=Game;LogicGame;
+StartupNotify=false
--- einstein-2.0.dfsg.2.orig/debian/dirs
+++ einstein-2.0.dfsg.2/debian/dirs
@@ -0,0 +1 @@
+usr/games
--- einstein-2.0.dfsg.2.orig/debian/changelog
+++ einstein-2.0.dfsg.2/debian/changelog
@@ -0,0 +1,71 @@
+einstein (2.0.dfsg.2-5) unstable; urgency=low
+
+  * debian/patches/10_gcc43.diff: Added.  Closes: #455158.
+
+ -- Bart Martens <bartm@debian.org>  Sat, 26 Jan 2008 11:45:42 +0100
+
+einstein (2.0.dfsg.2-4) unstable; urgency=low
+
+  * debian/*: Repackaged with cdbs.  Closes: #436811.
+  * debian/copyright: Updated for 2007.
+  * debian/einstein.desktop: Updated categories.
+  * debian/patches/01_sdl.diff: Include directory SDL.
+  * debian/patches/02_prefix.diff: Prefix /usr.
+  * debian/patches/08_gcc43.diff: Closes: #421127.
+  * debian/patches/09_colors.diff: Closes: #436086.
+  * debian/watch: Updated.
+
+ -- Bart Martens <bartm@knars.be>  Fri, 31 Aug 2007 08:43:12 +0200
+
+einstein (2.0.dfsg.2-3) unstable; urgency=low
+
+  * puzgen.cpp: Seed time to random number generator.  Closes: #397127.
+  * res/rules.txt: Clarify Hall Of Fame.  Closes: #393537.
+  * main.cpp, res/resources.descr, debian/icon.bmp.uue, debian/rules: Window
+    icon.  Closes: #396113.  Thanks to Sven Arvidsson <sa@whiz.se>.
+
+ -- Bart Martens <bartm@knars.be>  Sun,  5 Nov 2006 13:32:08 +0100
+
+einstein (2.0.dfsg.2-2) unstable; urgency=low
+
+  * debian/control: Build-depends on sharutils for uudecode.
+  * debian/einstein.png.uue, debian/einstein.desktop: Added.  Thanks to Sven
+    Arvidsson <sa@whiz.se>.
+  * debian/rules, debian/dirs, debian/install: Decoding the uuencoded icon,
+    and installing the icon and the Gnome desktop file.  Closes: #396041.
+  * debian/copyright: Updated, for the icon from the Windows package.
+
+ -- Bart Martens <bartm@knars.be>  Sun, 29 Oct 2006 15:32:30 +0100
+
+einstein (2.0.dfsg.2-1) unstable; urgency=low
+
+  * debian/README.Debian-source, *.cpp, res/resources.descr, debian/control,
+    debian/rules, debian/copyright: Repackaged the .orig.tar.gz to allow this
+    package to stay in section main by removing res/*.ttf, and replaced
+    references to laudcn2.ttf and nova.ttf by DejaVuSans.ttf from the
+    ttf-dejavu package.  Build-depends on ttf-dejavu because the
+    DejaVuSans.ttf file is added in the resources file.  Closes: #393690.
+
+ -- Bart Martens <bartm@knars.be>  Wed, 18 Oct 2006 19:20:10 +0200
+
+einstein (2.0.dfsg.1-2) unstable; urgency=low
+
+  * formatter.cpp: Fix "cast from 'void*' to 'int' loses precision" on amd64.
+
+ -- Bart Martens <bartm@knars.be>  Tue,  5 Sep 2006 20:39:40 +0200
+
+einstein (2.0.dfsg.1-1) unstable; urgency=low
+
+  * debian/README.Debian-source, game.cpp, menu.cpp, topscores.cpp,
+    res/resources.descr: Repackaged the .orig.tar.gz to allow this
+    package to enter section main by removing res/luximb.ttf, and replaced
+    references to luximb.ttf by laudcn2.ttf.
+
+ -- Bart Martens <bartm@knars.be>  Tue,  5 Sep 2006 07:58:31 +0200
+
+einstein (2.0-1) unstable; urgency=low
+
+  * Initial release.  Closes: #289339.
+
+ -- Bart Martens <bartm@knars.be>  Sun, 20 Aug 2006 09:05:21 +0200
+
--- einstein-2.0.dfsg.2.orig/debian/watch
+++ einstein-2.0.dfsg.2/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts="dversionmangle=s/\.dfsg\.\d+$//" \
+http://games.flowix.com/files/einstein/einstein-(.*)-src\.tar\.gz
--- einstein-2.0.dfsg.2.orig/debian/install
+++ einstein-2.0.dfsg.2/debian/install
@@ -0,0 +1,3 @@
+debian/einstein.png usr/share/icons/
+debian/einstein.desktop usr/share/applications/
+res/einstein.res usr/share/einstein/res
--- einstein-2.0.dfsg.2.orig/debian/einstein.png.uue
+++ einstein-2.0.dfsg.2/debian/einstein.png.uue
@@ -0,0 +1,24 @@
+begin 644 debian/einstein.png
+MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!F)+1T0`_P#_
+M`/^@O:>3````"7!(67,```!(````2`!&R6L^```#+TE$0518P^V676A41Q3'
+M?W?N[F8WFD17W21:M5*)&@G&0(H?\2M6'XI471^BOFN%D!;JDY$0)>"#^)"'
+MMB])"T*I_?`3"B)*C!]86MJ-T1(-:J*H16U80X+&.]E[QX>[NV:]V>MNU*?F
+M#\,P\[\SYW_.N3-S8!SC^+]#RW9!Z&:_$H:%;I@(&>]'C+MKYF2]9T8HO!Y5
+MG]X]H_YZMEB]L'054Z1MCY]-4>_4>-'UJ/JXYV_U-);G:CC1VBZ@/!,S$R$R
+M,6[Z!`W!1O+TP8P$M[9`3L%TEM1'WBC"54#1-=MXR'S,NOS3*5Q?'ZQ9!;E^
+MJ%X-[>WV?#0*QXY"87D875JLJ/O#583'C;1\`B$MJB>>Q:.9*=S>>K@2F<S,
+M+[\F.J.,7<<B5!QIHJ?C#C'R*"Q9CY`FNK08DX#0S7ZEQ12ZM"CW1QQ\1P1"
+M6[[BP]+9A+RW\!0$^/?)80:>_DGIO"`>TXN(GXQ/ME]4YWY<J64EP#9N;_!1
+MSFT'?^$2H#<1\#4DYZ(#^6QX<(H<;0+"L+U/]%G_`T+:YUL8)B'O(P<?"$#`
+M)U/FSOPV0$=+V+X7I&7?$])"&&,0,'*#J=X^,L&WW\#D#RI?B8]'4$@S[9JT
+M*;"]L#<(Z,]'_::M#:YUPO(J&!J"WZ]`Q89P7+R);EC):&0O(!XZ85CXA'3P
+MK2VP:R<4S*IDP@]S&7QPE8*B'(*3%KZ6`M,U!6D%)+S7I8FF.8_R=ZT06K29
+MDNIZ^T=+A/SU/BXDK:.9I,"(^1W\\#`4+_@L>=:3(9<CO$^FP!R#@$0*I,6`
+MD>_@ERT'8>E)HWXUQ)ZZ1@X=J$T1_Z84I!70O76.EGAN^P:G.?A]^Z&L^"0^
+MTZ!D>A<'&[Y@154[\Q=T,3B\(RE>2(N?NS>E?:)=K^)$*.]'9[.P^)\4+AB$
+M[YN/`\<=Z\(U]SC1?(.09ZZK]ZX1`.BLG:_ITJ*S=S'9H&8KW/WO-$):'.D-
+MOWV!LF;?9=7S<))K#?#<0-WN1?WT*ZIZ+<HK<M]M4;+T\_/*GU>L@+1-0U<!
+MSQ15%"A75<'=&0G(.CSKMEU4H]6"B?$O71O?3TTXCG&\+[P$GSKI1&G!$+X`
++````245.1*Y"8((`
+`
+end
--- einstein-2.0.dfsg.2.orig/debian/compat
+++ einstein-2.0.dfsg.2/debian/compat
@@ -0,0 +1 @@
+5
--- einstein-2.0.dfsg.2.orig/debian/rules
+++ einstein-2.0.dfsg.2/debian/rules
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+DEB_INSTALL_DOCS_ALL =
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/einstein
+
+update-config::
+	[ -f res/DejaVuSans.ttf ] || cp -p /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf res/
+	uudecode debian/einstein.png.uue
+	uudecode debian/icon.bmp.uue
+
+reverse-config::
+	rm -f res/DejaVuSans.ttf
+	rm -f debian/einstein.png
+	rm -f debian/icon.bmp
+
+clean::
+	rm -f res/icon.bmp
--- einstein-2.0.dfsg.2.orig/debian/control
+++ einstein-2.0.dfsg.2/debian/control
@@ -0,0 +1,16 @@
+Source: einstein
+Section: games
+Priority: optional
+Maintainer: Bart Martens <bartm@debian.org>
+Build-Depends: cdbs, debhelper (>= 5), libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, zlib1g-dev, ttf-dejavu, sharutils
+Standards-Version: 3.7.3
+Homepage: http://games.flowix.com/
+
+Package: einstein
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Puzzle game inspired on Einstein's puzzle
+ This puzzle is a remake of old DOS game Sherlock which was inspired by Albert
+ Einstein's puzzle. The game goal is to open all cards in square of 6x6 cards.
+ For this, a number of hints describing relations between card positions are
+ given. Use them to find the correct layout.
--- einstein-2.0.dfsg.2.orig/debian/README.Debian-source
+++ einstein-2.0.dfsg.2/debian/README.Debian-source
@@ -0,0 +1,12 @@
+einstein for Debian
+-------------------
+
+How I created the .orig.tar.gz:
+
+tar xzf einstein-2.0-src.tar.gz
+tar xzf einstein-2.0-res.tar.gz
+rm einstein-2.0/einstein.res
+rm einstein-2.0/res/*.ttf
+tar czf einstein_2.0.dfsg.2.orig.tar.gz einstein-2.0
+
+ -- Bart Martens <bartm@knars.be>  Wed, 18 Oct 2006 19:20:10 +0200
--- einstein-2.0.dfsg.2.orig/debian/copyright
+++ einstein-2.0.dfsg.2/debian/copyright
@@ -0,0 +1,90 @@
+This package was debianized by Bart Martens <bartm@knars.be> on
+Sun, 20 Aug 2006 09:05:21 +0200.
+
+It was downloaded from: http://games.flowix.com/
+
+Upstream author: Alexander Babichev
+
+Copyright (c) 2003-2005 Alexander Babichev
+Copyright (c) 2003-2005 Flowix www.flowix.com
+
+License:
+
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is
+Copyright (C) 2006-2007, Bart Martens <bartm@knars.be>
+and is licensed under the GPL, see above.
+
+Quoting Sven Arvidsson <sa@whiz.se> Sun, 29 Oct 2006 14:47:28 +0100: "The icon
+was converted from the .ico icon in the Windows package."  The Windows package
+is also licensed under the GPL, see above.
+
+The file DejaVuSans.ttf included in the resources file in the binary
+distribution is:
+
+Copyright (c) 2003 by Bitstream, Inc.
+
+License:
+
+   Bitstream Vera Fonts Copyright
+   ------------------------------
+
+   Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+   a trademark of Bitstream, Inc.
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of the fonts accompanying this license ("Fonts") and associated
+   documentation files (the "Font Software"), to reproduce and distribute the
+   Font Software, including without limitation the rights to use, copy, merge,
+   publish, distribute, and/or sell copies of the Font Software, and to permit
+   persons to whom the Font Software is furnished to do so, subject to the
+   following conditions:
+
+   The above copyright and trademark notices and this permission notice shall
+   be included in all copies of one or more of the Font Software typefaces.
+
+   The Font Software may be modified, altered, or added to, and in particular
+   the designs of glyphs or characters in the Fonts may be modified and
+   additional glyphs or characters may be added to the Fonts, only if the fonts
+   are renamed to names not containing either the words "Bitstream" or the word
+   "Vera".
+
+   This License becomes null and void to the extent applicable to Fonts or Font
+   Software that has been modified and is distributed under the "Bitstream
+   Vera" names.
+
+   The Font Software may be sold as part of a larger software package but no
+   copy of one or more of the Font Software typefaces may be sold by itself.
+
+   THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+   TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+   FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+   ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+   THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+   FONT SOFTWARE.
+
+   Except as contained in this notice, the names of Gnome, the Gnome
+   Foundation, and Bitstream Inc., shall not be used in advertising or
+   otherwise to promote the sale, use or other dealings in this Font Software
+   without prior written authorization from the Gnome Foundation or Bitstream
+   Inc., respectively. For further information, contact: fonts at gnome dot
+   org. 
--- einstein-2.0.dfsg.2.orig/debian/icon.bmp.uue
+++ einstein-2.0.dfsg.2/debian/icon.bmp.uue
@@ -0,0 +1,96 @@
+begin 644 res/icon.bmp
+M0DTV$````````#8````H````(````"`````!`"`````````0```3"P``$PL`
+M````````````````_P```/\```#_````_P```/\```#_````_P```/\```#_
+M````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\`
+M``#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P``
+M`/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````
+M_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_
+M````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\`
+M``#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P``
+M`/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````
+M_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_
+M````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\`
+M``#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P``
+M`/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````
+M_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_
+M````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\`
+M``#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P``
+M`/\```#_````_P```/\```#_````_\)91?_`4T?_O4Q*_[M%3/^X/D__MCA1
+M_[,Q5/^Q*E;_````_P```/\```#_````_P```/\```#_````_P```/\```#_
+M````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\`
+M``#_````_[]G.?\9#0C_````_P```/\```#_````_P```/\```#_````_P,`
+M`?\3!`G_,`D8_W,2//\```#_````_P```/\```#_````_P```/\```#_````
+M_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/_$@$'_
+M$.7>_P#__/\`__S_`/_\_P#__/\`__S_`/_\_P#__/\`^?;_`-_<_P"KJ/\`
+M0T+_"@(%_P```/\```#_````_P```/\```#_````_P```/\```#_````_P``
+M`/\```#_````_P```/\```#_````_P```/\```#_TX@T_WRSA?\`__S_`/_\
+M_P#__/\`__S_`/_\_P#__/\`__S_`/_\_P#__/\`__S_`/_\_P#LZ?]##R'_
+MKB)9_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\`
+M``#_````_P```/\```#_````_]B5+__5CC'_2]2T_P#__/\`__S_`/_\_P#_
+M_/\`__S_`/_\_P#__/\`__S_`/_\_P#__/\`__S_`)22_XPD0?^P*%?_KB%9
+M_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_
+M````_P```/\```#_VILL_]>4+_\LYM'_`/_\_P#__/\`__S_`/_\_P#MZO]2
+M;U[_OV%'_YIX:?\HV=7_`/_\_P#__/\?/4#_M352_[,O5/^P*%?_````_P``
+M`/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````
+M_]^H)__<H2K_VILL_Q?SY?\`__S_`/_\_P#__/\`__S_`&QJ_Z)6,?_&9$'_
+MQ%Y#_[I<2_]`P[__*M;4_[I"3?^W/%#_M352_[(N5?^P)U?_````_P```/\`
+M``#_````_P```/\```#_````_P```/\```#_````_P```/\```#_X:XE_]ZH
+M*/_<H2K_"?KS_P#__/\`__S_`/_\_P#__/\`,3#_GU@O_\AK/O_&9$'_PUU#
+M_\%61O^_4$C_O$E+_[I"3?^W.U#_M312_[(N5?\```#_````_P```/\```#_
+M````_P```/\```#_````_P```/\```#_````_P```/_CM2/_X:XE_]ZG*/\!
+M_OK_`/_\_P#__/\`__S_`/_\_P`V-?]1+Q;_RW$\_\AJ/O_&8T'_PUU#_\%6
+M1O^^3TC_O$A+_[E"3?^W.U#_M312_P```/\```#_````_P```/\```#_````
+M_P```/\```#_````_P```/\```#_````_^:[(/_CM"/_X:TE_P+]^?\`__S_
+M`/_\_P#__/\`__S_`)J8_P```/\U'@__63(:_RD6#?\P&`__PUQ$_\%51O^^
+M3TG_O$A+_[E!3O^W.E#_````_P```/\```#_````_P```/\```#_````_P``
+M`/\```#_````_P```/\```#_Z,$>_^6[(?_CM"/_"/OS_P#__/\`__S_`/_\
+M_P#__/\`__S_`+VZ_P".C/\`RL?_`,&^_P```/^83#+_PUQ$_\!51O^^3DG_
+MO$=+_[E!3O\```#_````_P```/\```#_````_P```/\```#_````_P```/\`
+M``#_````_P```/_JR!S_Z,$>_^6Z(?\2^.K_`/_\_P#__/\`__S_`/_\_P#_
+M_/\`__S_`/_\_P#__/\`__S_`#HY_T8E%O_%8D'_PUM$_\!51O^^3DG_NT=+
+M_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_
+M````_^S.&?_JQQS_Y\`>_R;SUO\`__S_`/_\_P#__/\`__S_`/_\_P#__/\`
+M__S_`/_\_P#__/\`I:/_$0D%_\AH/__%8D+_PUM$_\!41_^^34G_````_P``
+M`/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_[]07
+M_^S.&O_JQQS_/N[`_P#__/\`__S_`/_\_P#__/\`]O/_!OGS_P#__/\`__S_
+M`/_\_P[QZO^_;C;_RF\]_\=H/__%84+_PEI$_\!41_\```#_````_P```/\`
+M``#_````_P```/\```#_````_P```/\```#_````_P```/_PV!;_[]07_^S-
+M&O]BYYW_`/_\_P#__/\`__S_`/_\_P`S,O^#7QG_Q*!`_ZVE5O^IH%K_Q(I`
+M_XY5)O^@7"W_RFX]_\=G/__%84+_PEI$_P```/\```#_````_P```/\```#_
+M````_P```/\```#_````_P```/\```#_````_P```/_PV!;_[M,7_Y3?;?\`
+M__S_`/_\_P#__/\`__S_`&5C_Q$,`_^E=B#_TI$L_Z!L)/\C9E;_`#4T_PT(
+M`__%<3G_R6X]_\=G0/\```#_````_P```/\```#_````_P```/\```#_````
+M_P```/\```#_````_P```/\```#_````_^[2&/_PV17_V=8K_P/^^/\`__S_
+M`/_\_P#__/\`Z^C_`#X]_P`'!O\`/S[_`+^\_P#__/\`[>K_``@'_W]+(O_,
+M=#O_R6T]_P```/\```#_````_P```/\```#_````_P```/\```#_````_P``
+M`/\```#_````_P```/\```#_````_^[3&/_PV17_3/"S_P#__/\`__S_`/_\
+M_P#__/\`__S_`/_\_P#__/\`__S_`/_\_P#__/\`7%K_+1L+_\YZ./\```#_
+M````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\`
+M``#_````_P```/\```#_````_^[3&/_-WC;_#?SO_P#__/\`__S_`/_\_P#_
+M_/\`__S_`/_\_P#__/\`__S_`/_\_P#!OO\3#`3_````_P```/\```#_````
+M_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_
+M````_P```/\```#_````_^[3%_^YX$K_,?7,_P/^^/\`__S_`/_\_P#__/\`
+M__S_`/_\_P#__/\`__S_$_7I_P```/\```#_````_P```/\```#_````_P``
+M`/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````
+M_P```/\```#_````_P```/_PV!;_[M$8_^O*&__IQ!W_YKT@_^2V(O_AKR7_
+MWZDG_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\`
+M``#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P``
+M`/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````
+M_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_
+M````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\`
+M``#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P``
+M`/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````
+M_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_
+M````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\`
+M``#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P``
+M`/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````
+M_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_
+M````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\`
+M``#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P``
+M`/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````
+M_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\```#_
+M````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P```/\`
+M``#_````_P```/\```#_````_P```/\```#_````_P```/\```#_````_P``
+*`/\```#_````_P``
+`
+end
--- einstein-2.0.dfsg.2.orig/debian/patches/03_fonts.diff
+++ einstein-2.0.dfsg.2/debian/patches/03_fonts.diff
@@ -0,0 +1,249 @@
+diff -ruN ../orig/einstein-2.0/descr.cpp ./descr.cpp
+--- ../orig/einstein-2.0/descr.cpp	2005-08-17 15:42:29.000000000 +0200
++++ ./descr.cpp	2007-08-31 08:42:16.000000000 +0200
+@@ -139,9 +139,9 @@
+ {
+     currentPage = 0;
+     //area.add(parentArea, false);
+-    titleFont = new Font(L"nova.ttf", 26);
+-    buttonFont = new Font(L"laudcn2.ttf", 14);
+-    textFont = new Font(L"laudcn2.ttf", 16);
++    titleFont = new Font(L"DejaVuSans.ttf", 26);
++    buttonFont = new Font(L"DejaVuSans.ttf", 14);
++    textFont = new Font(L"DejaVuSans.ttf", 16);
+     textHeight = (int)(textFont->getHeight(L"A") * 1.0);
+     text = new TextParser(msg(L"rulesText"), *textFont, START_X, START_Y, 
+                 CLIENT_WIDTH, CLIENT_HEIGHT);
+diff -ruN ../orig/einstein-2.0/game.cpp ./game.cpp
+--- ../orig/einstein-2.0/game.cpp	2005-08-23 00:44:54.000000000 +0200
++++ ./game.cpp	2007-08-31 08:42:16.000000000 +0200
+@@ -33,7 +33,7 @@
+     screen.draw(8, 10, tile);
+     SDL_FreeSurface(tile);
+     
+-    Font titleFont(L"nova.ttf", 28);
++    Font titleFont(L"DejaVuSans.ttf", 28);
+     titleFont.draw(screen.getSurface(), 20, 20, 255,255,0, true, 
+             msg(L"einsteinPuzzle"));
+     
+@@ -89,7 +89,7 @@
+ {
+     lastRun = elapsed = lastUpdate = 0;
+     stop();
+-    font = new Font(L"luximb.ttf", 16);
++    font = new Font(L"DejaVuSans.ttf", 16);
+ }
+ 
+ Watch::Watch(std::istream &stream)
+@@ -97,7 +97,7 @@
+     elapsed = readInt(stream);
+     lastUpdate = 0;
+     stop();
+-    font = new Font(L"luximb.ttf", 16);
++    font = new Font(L"DejaVuSans.ttf", 16);
+ }
+ 
+ Watch::~Watch()
+@@ -178,7 +178,7 @@
+             watch->stop();
+             Area area;
+             area.add(background, false);
+-            Font font(L"laudcn2.ttf", 16);
++            Font font(L"DejaVuSans.ttf", 16);
+             area.add(new Window(280, 275, 240, 50, L"greenpattern.bmp", 6));
+             area.add(new Label(&font, 280, 275, 240, 50, Label::ALIGN_CENTER,
+                 Label::ALIGN_MIDDLE, 255,255,0, msg(L"paused")));
+@@ -209,7 +209,7 @@
+         virtual void doAction() {
+             sound->play(L"applause.wav");
+             watch->stop();
+-            Font font(L"laudcn2.ttf", 20);
++            Font font(L"DejaVuSans.ttf", 20);
+             showMessageWindow(gameArea, L"marble1.bmp", 
+                     500, 70, &font, 255,0,0, msg(L"won"));
+             gameArea->draw();
+@@ -257,8 +257,8 @@
+             sound->play(L"glasbk2.wav");
+             bool restart = false;
+             bool newGame = false;
+-            Font font(L"laudcn2.ttf", 24);
+-            Font btnFont(L"laudcn2.ttf", 14);
++            Font font(L"DejaVuSans.ttf", 24);
++            Font btnFont(L"DejaVuSans.ttf", 14);
+             Area area;
+             area.add(gameArea);
+             area.add(new Window(220, 240, 360, 140, L"redpattern.bmp", 6));
+@@ -329,7 +329,7 @@
+         CheatCommand(Area *a) { gameArea = a; };
+         
+         virtual void doAction() {
+-            Font font(L"nova.ttf", 30);
++            Font font(L"DejaVuSans.ttf", 30);
+             showMessageWindow(gameArea, L"darkpattern.bmp", 
+                     500, 100, &font, 255,255,255, 
+                     msg(L"iddqd"));
+@@ -475,7 +475,7 @@
+     drawWallpaper(L"rain.bmp");
+     Window window(230, 260, 340, 80, L"greenpattern.bmp", 6);
+     window.draw();
+-    Font font(L"laudcn2.ttf", 16);
++    Font font(L"DejaVuSans.ttf", 16);
+     Label label(&font, 280, 275, 240, 50, Label::ALIGN_CENTER,
+                 Label::ALIGN_MIDDLE, 255,255,0, msg(L"loading"));
+     label.draw();
+@@ -533,7 +533,7 @@
+ void Game::run()
+ {
+     Area area;
+-    Font btnFont(L"laudcn2.ttf", 14);
++    Font btnFont(L"DejaVuSans.ttf", 14);
+     
+     area.setTimer(300, watch);
+ 
+diff -ruN ../orig/einstein-2.0/main.cpp ./main.cpp
+--- ../orig/einstein-2.0/main.cpp	2005-09-26 12:32:54.000000000 +0200
++++ ./main.cpp	2007-08-31 10:45:09.000000000 +0200
+@@ -78,7 +84,7 @@
+ /*static void checkBetaExpire()
+ {
+     if (1124832535L + 60L*60L*24L*40L < time(NULL)) {
+-        Font font(L"laudcn2.ttf", 16);
++        Font font(L"DejaVuSans.ttf", 16);
+         Area area;
+         showMessageWindow(&area, L"darkpattern.bmp", 
+                 700, 100, &font, 255,255,255, 
+diff -ruN ../orig/einstein-2.0/menu.cpp ./menu.cpp
+--- ../orig/einstein-2.0/menu.cpp	2005-09-25 22:51:00.000000000 +0200
++++ ./menu.cpp	2007-08-31 08:42:16.000000000 +0200
+@@ -23,11 +23,11 @@
+     SDL_Surface *title = loadImage(L"nova.bmp");
+     screen.draw(0, 0, title);
+     SDL_FreeSurface(title);
+-    Font font(L"nova.ttf", 28);
++    Font font(L"DejaVuSans.ttf", 28);
+     std::wstring s(msg(L"einsteinFlowix"));
+     int width = font.getWidth(s);
+     font.draw((screen.getWidth() - width) / 2, 30, 255,255,255, true, s);
+-    Font urlFont(L"luximb.ttf", 16);
++    Font urlFont(L"DejaVuSans.ttf", 16);
+     s = L"http://games.flowix.com";
+     width = urlFont.getWidth(s);
+     urlFont.draw((screen.getWidth() - width) / 2, 60, 255,255,0, true, s);
+@@ -133,9 +133,9 @@
+ 
+         virtual void doAction() {
+             Area area;
+-            Font titleFont(L"nova.ttf", 26);
+-            Font font(L"laudcn2.ttf", 14);
+-            Font urlFont(L"luximb.ttf", 16);
++            Font titleFont(L"DejaVuSans.ttf", 26);
++            Font font(L"DejaVuSans.ttf", 14);
++            Font urlFont(L"DejaVuSans.ttf", 16);
+ 
+ #define LABEL(pos, c, f, text) area.add(new Label(&f, 220, pos, 360, 20, \
+             Label::ALIGN_CENTER, Label::ALIGN_MIDDLE, 255,255,c, text));
+@@ -171,7 +171,7 @@
+ void menu()
+ {
+     Area area;
+-    Font font(L"laudcn2.ttf", 20);
++    Font font(L"DejaVuSans.ttf", 20);
+ 
+     area.add(new MenuBackground());
+     area.draw();
+diff -ruN ../orig/einstein-2.0/opensave.cpp ./opensave.cpp
+--- ../orig/einstein-2.0/opensave.cpp	2005-08-14 23:33:36.000000000 +0200
++++ ./opensave.cpp	2007-08-31 08:42:16.000000000 +0200
+@@ -160,7 +160,7 @@
+ static void showListWindow(SavesList &list, Command **commands,
+         const std::wstring &title, Area &area, Font *font)
+ {
+-    Font titleFont(L"nova.ttf", 26);
++    Font titleFont(L"DejaVuSans.ttf", 26);
+ 
+     area.add(new Window(250, 90, 300, 420, L"blue.bmp"));
+     area.add(new Label(&titleFont, 250, 95, 300, 40, Label::ALIGN_CENTER,
+@@ -189,7 +189,7 @@
+     
+     Area area;
+     area.add(parentArea, false);
+-    Font font(L"laudcn2.ttf", 14);
++    Font font(L"DejaVuSans.ttf", 14);
+     bool saved = false;
+     
+     SavesList list;
+@@ -258,7 +258,7 @@
+     
+     Area area;
+     area.add(parentArea, false);
+-    Font font(L"laudcn2.ttf", 14);
++    Font font(L"DejaVuSans.ttf", 14);
+     
+     Game *newGame = NULL;
+     
+diff -ruN ../orig/einstein-2.0/options.cpp ./options.cpp
+--- ../orig/einstein-2.0/options.cpp	2005-09-26 12:33:18.000000000 +0200
++++ ./options.cpp	2007-08-31 08:42:16.000000000 +0200
+@@ -53,8 +53,8 @@
+ 
+ void showOptionsWindow(Area *parentArea)
+ {
+-    Font titleFont(L"nova.ttf", 26);
+-    Font font(L"laudcn2.ttf", 14);
++    Font titleFont(L"DejaVuSans.ttf", 26);
++    Font font(L"DejaVuSans.ttf", 14);
+ 
+     bool fullscreen = (getStorage()->get(L"fullscreen", 1) != 0);
+     bool niceCursor = (getStorage()->get(L"niceCursor", 1) != 0);
+diff -ruN ../orig/einstein-2.0/res/resources.descr ./res/resources.descr
+--- ../orig/einstein-2.0/res/resources.descr	2005-09-25 22:51:14.000000000 +0200
++++ ./res/resources.descr	2007-08-31 08:42:16.000000000 +0200
+@@ -89,13 +90,11 @@
+     { name = "title.bmp" }
+     { name = "marble1.bmp" }
+     { name = "blue.bmp" }
+-    { name = "luximb.ttf" }
+     { name = "redpattern.bmp" }
+     { name = "greenpattern.bmp" }
+     { name = "darkpattern.bmp" }
+     { name = "nova.bmp" }
+-    { name = "nova.ttf" }
+-    { name = "laudcn2.ttf" }
++    { name = "DejaVuSans.ttf" }
+     { name = "btn.bmp" }
+     { name = "rules.txt", format = "messages" group = "messages" }
+     { name = "rules_ru.txt", format = "messages" group = "messages" }
+diff -ruN ../orig/einstein-2.0/topscores.cpp ./topscores.cpp
+--- ../orig/einstein-2.0/topscores.cpp	2005-08-14 23:08:43.000000000 +0200
++++ ./topscores.cpp	2007-08-31 08:42:16.000000000 +0200
+@@ -103,9 +103,9 @@
+ ScoresWindow::ScoresWindow(int x, int y, TopScores *scores, int highlight): 
+                 Window(x, y, 320, 350, L"blue.bmp")
+ {
+-    Font titleFont(L"nova.ttf", 26);
+-    Font entryFont(L"laudcn2.ttf", 14);
+-    Font timeFont(L"luximb.ttf", 14);
++    Font titleFont(L"DejaVuSans.ttf", 26);
++    Font entryFont(L"DejaVuSans.ttf", 14);
++    Font timeFont(L"DejaVuSans.ttf", 14);
+     
+     std::wstring txt = msg(L"topScores");
+     int w = titleFont.getWidth(txt);
+@@ -139,7 +139,7 @@
+ {
+     Area area;
+ 
+-    Font font(L"laudcn2.ttf", 16);
++    Font font(L"DejaVuSans.ttf", 16);
+     area.add(parentArea);
+     area.add(new ScoresWindow(240, 125, scores, highlight));
+     ExitCommand exitCmd(area);
+@@ -154,7 +154,7 @@
+ {
+     Area area;
+     
+-    Font font(L"laudcn2.ttf", 16);
++    Font font(L"DejaVuSans.ttf", 16);
+     area.add(parentArea);
+     area.add(new Window(170, 280, 460, 100, L"blue.bmp"));
+     Storage *storage = getStorage();
--- einstein-2.0.dfsg.2.orig/debian/patches/02_prefix.diff
+++ einstein-2.0.dfsg.2/debian/patches/02_prefix.diff
@@ -0,0 +1,11 @@
+--- ../orig/einstein-2.0.dfsg.2/main.cpp	2007-08-31 08:42:16.000000000 +0200
++++ main.cpp	2007-08-31 10:39:20.000000000 +0200
+@@ -70,7 +70,7 @@
+ #ifdef __APPLE__
+     dirs.push_back(getResourcesPath(selfPath));
+ #else
+-    dirs.push_back(PREFIX L"/share/einstein/res");
++    dirs.push_back("/usr" L"/share/einstein/res");
+     dirs.push_back(fromMbcs(getenv("HOME")) + L"/.einstein/res");
+ #endif
+ #endif
--- einstein-2.0.dfsg.2.orig/debian/patches/07_long.diff
+++ einstein-2.0.dfsg.2/debian/patches/07_long.diff
@@ -0,0 +1,31 @@
+--- ../orig/einstein-2.0/formatter.cpp	2005-08-14 04:40:58.000000000 +0200
++++ formatter.cpp	2007-08-31 08:42:16.000000000 +0200
+@@ -58,7 +58,7 @@
+             if ((c.type == INT_ARG) || (c.type == STRING_ARG) ||
+                     (c.type == FLOAT_ARG) || (c.type == DOUBLE_ARG))
+             {
+-                int no = (int)c.data;
++                long no = (long)c.data;
+                 args[no - 1] = c.type;
+             }
+         }
+@@ -123,7 +123,7 @@
+ std::wstring Formatter::format(std::vector<ArgValue*> &argValues) const
+ {
+     std::wstring s;
+-    int no;
++    long no;
+ 
+     for (int i = 0; i < commandsCnt; i++) {
+         Command *cmd = &commands[i];
+@@ -135,8 +135,8 @@
+                 
+             case STRING_ARG:
+             case INT_ARG:
+-                no = (int)cmd->data - 1;
+-                if (no < (int)argValues.size())
++                no = (long)cmd->data - 1;
++                if (no < (long)argValues.size())
+                     s += argValues[no]->format(cmd);
+                 break;
+ 
--- einstein-2.0.dfsg.2.orig/debian/patches/10_gcc43.diff
+++ einstein-2.0.dfsg.2/debian/patches/10_gcc43.diff
@@ -0,0 +1,38 @@
+diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/einstein-2.0.dfsg.2/mkres/compressor.cpp ./mkres/compressor.cpp
+--- ../orig/einstein-2.0.dfsg.2/mkres/compressor.cpp	2005-08-14 04:40:58.000000000 +0200
++++ ./mkres/compressor.cpp	2008-01-26 11:50:29.000000000 +0100
+@@ -1,5 +1,6 @@
+ #include "compressor.h"
+ #include <zlib.h>
++#include <string.h>
+ #include "convert.h"
+ #include "exceptions.h"
+ 
+diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/einstein-2.0.dfsg.2/mkres/main.cpp ./mkres/main.cpp
+--- ../orig/einstein-2.0.dfsg.2/mkres/main.cpp	2005-08-14 04:40:58.000000000 +0200
++++ ./mkres/main.cpp	2008-01-26 11:48:37.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include "compressor.h"
+ #include "exceptions.h"
+ #include "unicode.h"
+diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/einstein-2.0.dfsg.2/mkres/unicode.cpp ./mkres/unicode.cpp
+--- ../orig/einstein-2.0.dfsg.2/mkres/unicode.cpp	2005-08-14 04:40:58.000000000 +0200
++++ ./mkres/unicode.cpp	2008-01-26 11:51:35.000000000 +0100
+@@ -1,5 +1,6 @@
+ #include <wchar.h>
+ #include <stdlib.h>
++#include <string.h>
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/einstein-2.0.dfsg.2/unicode.cpp ./unicode.cpp
+--- ../orig/einstein-2.0.dfsg.2/unicode.cpp	2005-08-14 04:40:58.000000000 +0200
++++ ./unicode.cpp	2008-01-26 11:49:10.000000000 +0100
+@@ -1,5 +1,6 @@
+ #include <wchar.h>
+ #include <stdlib.h>
++#include <string.h>
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
--- einstein-2.0.dfsg.2.orig/debian/patches/08_gcc43.diff
+++ einstein-2.0.dfsg.2/debian/patches/08_gcc43.diff
@@ -0,0 +1,22 @@
+Patch by Martin Michlmayr <tbm@cyrius.com> via bug 421127.
+
+--- ../orig/einstein-2.0.dfsg.2/convert.h	2005-08-14 04:40:58.000000000 +0200
++++ convert.h	2007-08-31 11:33:06.000000000 +0200
+@@ -5,6 +5,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <string>
++#include <typeinfo>
+ 
+ #include "exceptions.h"
+ #include "unicode.h"
+--- ../orig/einstein-2.0.dfsg.2/mkres/convert.h	2005-08-14 04:40:58.000000000 +0200
++++ mkres/convert.h	2007-08-31 11:33:17.000000000 +0200
+@@ -5,6 +5,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <string>
++#include <typeinfo>
+ 
+ #include "exceptions.h"
+ #include "unicode.h"
--- einstein-2.0.dfsg.2.orig/debian/patches/09_colors.diff
+++ einstein-2.0.dfsg.2/debian/patches/09_colors.diff
@@ -0,0 +1,22 @@
+--- ../orig/einstein-2.0.dfsg.2/descr.cpp	2007-08-31 11:02:45.000000000 +0200
++++ descr.cpp	2007-08-31 13:48:19.000000000 +0200
+@@ -11,6 +11,7 @@
+ #include "convert.h"
+ #include "utils.h"
+ #include "tokenizer.h"
++#include "storage.h"
+ 
+ 
+ #define WIDTH		600
+@@ -259,7 +260,10 @@
+ {
+     if (0 < line.length()) {
+         page->add(new Label(&font, offsetX, offsetY + curPosY,
+-                    255,255,255, line, false));
++                    getStorage()->get(L"text_red", 0),
++                    getStorage()->get(L"text_green", 0),
++                    getStorage()->get(L"text_blue", 100),
++                    line, false));
+         line.clear();
+         curPosY += 10 + charHeight;
+         lineWidth = 0;
--- einstein-2.0.dfsg.2.orig/debian/patches/04_fame.diff
+++ einstein-2.0.dfsg.2/debian/patches/04_fame.diff
@@ -0,0 +1,10 @@
+--- ../orig/einstein-2.0/res/rules.txt	2005-10-12 01:13:34.000000000 +0200
++++ res/rules.txt	2007-08-31 08:42:16.000000000 +0200
+@@ -52,6 +52,7 @@
+ If you no longer need some tip, remove it by right mouse button click.
+ You can always see removed tips by pressing 'Switch' button.
+ 
++Who loads or restarts a game, does not enter the Hall Of Fame.
+ 
+ "
+ 
--- einstein-2.0.dfsg.2.orig/debian/patches/05_icon.diff
+++ einstein-2.0.dfsg.2/debian/patches/05_icon.diff
@@ -0,0 +1,25 @@
+--- ../orig/einstein-2.0/res/resources.descr	2005-09-25 22:51:14.000000000 +0200
++++ res/resources.descr	2007-08-31 10:54:56.000000000 +0200
+@@ -1,6 +1,7 @@
+ priority = 100
+ 
+ resources = {
++    { name = "icon.bmp" }
+     { name = "cursor.bmp" }
+     { name = "rain.bmp" }
+     { name = "tile.bmp" }
+--- ../orig/einstein-2.0/main.cpp	2005-09-26 12:32:54.000000000 +0200
++++ main.cpp	2007-08-31 10:52:59.000000000 +0200
+@@ -31,6 +31,12 @@
+     SDL_SetColorKey(mouse, SDL_SRCCOLORKEY, SDL_MapRGB(mouse->format, 0, 0, 0));
+     screen.setMouseImage(mouse);
+     SDL_FreeSurface(mouse);
++    
++    SDL_Surface *icon = loadImage(L"icon.bmp");
++    SDL_SetColorKey(icon, SDL_SRCCOLORKEY, SDL_MapRGB(icon->format, 0, 0, 0));
++    SDL_WM_SetIcon(icon, NULL);
++    SDL_FreeSurface(icon);
++    
+     SDL_WM_SetCaption("Einstein", NULL);
+ 
+ #ifdef __APPLE__
--- einstein-2.0.dfsg.2.orig/debian/patches/01_sdl.diff
+++ einstein-2.0.dfsg.2/debian/patches/01_sdl.diff
@@ -0,0 +1,108 @@
+diff -ruN ../orig/einstein-2.0.dfsg.2/font.h ./font.h
+--- ../orig/einstein-2.0.dfsg.2/font.h	2005-08-16 00:33:17.000000000 +0200
++++ ./font.h	2007-08-31 10:00:33.000000000 +0200
+@@ -3,7 +3,7 @@
+ 
+ 
+ #include <string>
+-#include <SDL_ttf.h>
++#include <SDL/SDL_ttf.h>
+ 
+ 
+ class Font
+diff -ruN ../orig/einstein-2.0.dfsg.2/iconset.h ./iconset.h
+--- ../orig/einstein-2.0.dfsg.2/iconset.h	2005-08-14 04:40:58.000000000 +0200
++++ ./iconset.h	2007-08-31 09:51:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ #define __ICONSET_H__
+ 
+ 
+-#include <SDL.h>
++#include <SDL/SDL.h>
+ 
+ 
+ class IconSet
+diff -ruN ../orig/einstein-2.0.dfsg.2/main.cpp ./main.cpp
+--- ../orig/einstein-2.0.dfsg.2/main.cpp	2007-08-31 08:42:16.000000000 +0200
++++ ./main.cpp	2007-08-31 10:06:07.000000000 +0200
+@@ -1,8 +1,8 @@
+ #include <stdlib.h>
+ #include <iostream>
+-#include <SDL.h>
+-#include <SDL_main.h>
+-#include <SDL_ttf.h>
++#include <SDL/SDL.h>
++#include <SDL/SDL_main.h>
++#include <SDL/SDL_ttf.h>
+ #include "main.h"
+ #include "utils.h"
+ #include "storage.h"
+diff -ruN ../orig/einstein-2.0.dfsg.2/screen.cpp ./screen.cpp
+--- ../orig/einstein-2.0.dfsg.2/screen.cpp	2005-09-24 07:17:30.000000000 +0200
++++ ./screen.cpp	2007-08-31 09:52:07.000000000 +0200
+@@ -1,4 +1,4 @@
+-#include <SDL.h>
++#include <SDL/SDL.h>
+ #include "screen.h"
+ #include "exceptions.h"
+ #include "unicode.h"
+diff -ruN ../orig/einstein-2.0.dfsg.2/screen.h ./screen.h
+--- ../orig/einstein-2.0.dfsg.2/screen.h	2005-09-24 07:08:44.000000000 +0200
++++ ./screen.h	2007-08-31 09:52:26.000000000 +0200
+@@ -2,7 +2,7 @@
+ #define __SCREEN_H__
+ 
+ 
+-#include "SDL.h"
++#include "SDL/SDL.h"
+ #include <vector>
+ #include <list>
+ 
+diff -ruN ../orig/einstein-2.0.dfsg.2/sound.cpp ./sound.cpp
+--- ../orig/einstein-2.0.dfsg.2/sound.cpp	2005-09-24 08:32:07.000000000 +0200
++++ ./sound.cpp	2007-08-31 10:07:35.000000000 +0200
+@@ -1,7 +1,7 @@
+ #include "sound.h"
+ 
+ #include <iostream>
+-#include <SDL_events.h>
++#include <SDL/SDL_events.h>
+ #include "resources.h"
+ 
+ 
+diff -ruN ../orig/einstein-2.0.dfsg.2/sound.h ./sound.h
+--- ../orig/einstein-2.0.dfsg.2/sound.h	2005-09-24 08:24:20.000000000 +0200
++++ ./sound.h	2007-08-31 10:01:28.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ #include <string>
+ #include <map>
+-#include <SDL_mixer.h>
++#include <SDL/SDL_mixer.h>
+ 
+ 
+ class Sound
+diff -ruN ../orig/einstein-2.0.dfsg.2/utils.h ./utils.h
+--- ../orig/einstein-2.0.dfsg.2/utils.h	2005-08-14 04:40:58.000000000 +0200
++++ ./utils.h	2007-08-31 09:52:39.000000000 +0200
+@@ -1,7 +1,7 @@
+ #ifndef __UTILS_H__
+ #define __UTILS_H__
+ 
+-#include <SDL.h>
++#include <SDL/SDL.h>
+ #include <string>
+ #ifdef WIN32
+ #include <sys/time.h>
+diff -ruN ../orig/einstein-2.0.dfsg.2/widgets.h ./widgets.h
+--- ../orig/einstein-2.0.dfsg.2/widgets.h	2005-09-24 08:11:11.000000000 +0200
++++ ./widgets.h	2007-08-31 09:59:58.000000000 +0200
+@@ -4,7 +4,7 @@
+ #include <string>
+ #include <list>
+ #include <set>
+-#include <SDL.h>
++#include <SDL/SDL.h>
+ #include "font.h"
+ 
+ 
--- einstein-2.0.dfsg.2.orig/debian/patches/06_srand.diff
+++ einstein-2.0.dfsg.2/debian/patches/06_srand.diff
@@ -0,0 +1,11 @@
+--- ../orig/einstein-2.0/puzgen.cpp	2005-08-14 04:40:58.000000000 +0200
++++ puzgen.cpp	2007-08-31 08:42:16.000000000 +0200
+@@ -313,6 +313,8 @@
+ 
+ void genPuzzle(SolvedPuzzle &puzzle, Rules &rules)
+ {
++    srand(time(NULL));
++
+     for (int i = 0; i < PUZZLE_SIZE; i++) {
+         for (int j = 0; j < PUZZLE_SIZE; j++) 
+             puzzle[i][j] = j + 1;
--- einstein-2.0.dfsg.2.orig/Makefile
+++ einstein-2.0.dfsg.2/Makefile
@@ -5,7 +5,7 @@
 ########################################
 
 # installation prefix
-PREFIX=/usr/local
+PREFIX=/usr
 
 ########################################
 #
@@ -49,10 +49,14 @@
 
 
 $(TARGET): $(OBJECTS)
+	cd mkres && make
+	cd res && ../mkres/mkres --source resources.descr --output einstein.res
 	$(CXX) $(LNFLAGS) $(OBJECTS) -o $(TARGET)
 
 clean:
 	rm -f $(OBJECTS) core* *core $(TARGET) *~
+	cd res && rm -f einstein.res
+	cd mkres && make clean
 
 depend:
 	@makedepend $(SOURCES) 2> /dev/null
@@ -61,8 +65,7 @@
 	./$(TARGET)
 
 install: $(TARGET)
-	$(INSTALL) -s -D $(TARGET) $(PREFIX)/bin/$(TARGET)
-	$(INSTALL) -D einstein.res $(PREFIX)/share/einstein/res/einstein.res
+	$(INSTALL) -s -D $(TARGET) $(DESTDIR)/$(PREFIX)/games/$(TARGET)
 	
 # DO NOT DELETE THIS LINE -- make depend depends on it.