Commit e7a36a4d authored by Colin Tuckley's avatar Colin Tuckley Committed by Andreas Tille

Import Debian changes 2.6-2

lbreakout2 (2.6-2) unstable; urgency=low

  * Fix various problems with duplicated and mis-placed files 
    caused by the upstream build system (Closes: #561020).
parent 140d4ba3
lbreakout2 (2.6-2) unstable; urgency=low
* Fix various problems with duplicated and mis-placed files
caused by the upstream build system (Closes: #561020).
-- Colin Tuckley <colint@debian.org> Mon, 14 Dec 2009 20:49:28 +0000
lbreakout2 (2.6-1) unstable; urgency=low
* New upstream release (Closes: #222057).
......
[Desktop Entry]
Name=lbreakout2
Version=2.5.2
Name=LBreakout2
Version=2.6
Comment=A ball-and-paddle game with nice graphics.
Encoding=UTF-8
Exec=/usr/games/lbreakout2
Icon=lbreakout2.xpm
Type=Application
......
/* XPM */
static char *lbreakout2[] = {
/* columns rows colors chars-per-pixel */
"32 32 45 1",
" c black",
". c #161616",
"X c gray11",
"o c #330000",
"O c #222222",
"+ c gray16",
"@ c gray20",
"# c #393939",
"$ c #336633",
"% c #660000",
"& c #663300",
"* c #663333",
"= c #666633",
"- c gray26",
"; c gray30",
": c #555555",
"> c #5F5F5F",
", c gray40",
"< c #777777",
"1 c #669966",
"2 c #66CC99",
"3 c #800000",
"4 c #993333",
"5 c #996633",
"6 c #996666",
"7 c #CC3333",
"8 c #CC6633",
"9 c #CC6666",
"0 c #999966",
"q c #CC9966",
"w c #ADA990",
"e c #B2B2B2",
"r c #99CC99",
"t c #CC9999",
"y c #CCCC99",
"u c #C0C0C0",
"i c gray80",
"p c #C0DCC0",
"a c #CCFFCC",
"s c #EFD6C6",
"d c #E7E7D6",
"f c #FFFFCC",
"g c #EAEAEA",
"h c gray100",
"j c None",
/* pixels */
"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
"jjjjjjjjjjjjjjjjjjjjjjj111$jjjjj",
"jjjjjjjjjjjjjjjjjjjjjj11rr1>jjjj",
"jjjjjjjjjjjjjjjjjjjjj1rrrar1:jjj",
"jjjjjjjjjjjjjjjjjjjj1rragpr1:+jj",
"jjjjjjjjjjjjjjjjjjjj12pahr1>$Xjj",
"jjjjjjjjjjjjjjjjjjjj1rpdp21$@Xjj",
"jjjjjjjjjjjjjjjjjjjj>,2r11$@+.jj",
"jjjjjjjjjjjjjjjjjjjjj:,1,$@OXjjj",
"jjjjjjjjjjjjjjjjjjjjjj$$#+OOjjjj",
"jjjjjjjjjjjjjjjjjjjjjjj+OOOjjjjj",
"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
"jjjj&444:,<<<<<<<<<,=,>:&*4%jjjj",
"jjj*9tt60wyyyyyyyyyyyyy069943jjj",
"jj59uiieysffffffffffffsyeiuq4*jj",
"jj0tiiieysffffffffffffsyeit985jj",
"jj09tttqwyyyyyyyyyyyyyywwtq985jj",
"jj6889950wywwwwwwwwwwww059874*jj",
"jj*44444=00000000000000,4444%Xjj",
"jj+%&3&&*;=>>>>=>=>>=:;-%%%%ojjj",
"jjj%oooo+@@@#@@@@@@@@++Xoooojjjj",
"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj"
};
static char * lbreakout2_xpm[] = {
"32 32 255 2",
" c None",
". c #020202",
"+ c #024A02",
"@ c #663A02",
"# c #629E46",
"$ c #066206",
"% c #9C926C",
"& c #B2E2BA",
"* c #8C5002",
"= c #1A7A1A",
"- c #701C10",
"; c #C68A2E",
"> c #238A23",
", c #0A2E0A",
"' c #9A5A06",
") c #A69870",
"! c #163A16",
"~ c #B28646",
"{ c #DE9A3A",
"] c #0A2A0A",
"^ c #5A765E",
"/ c #2A0202",
"( c #BA9E8E",
"_ c #268E26",
": c #204220",
"< c #022202",
"[ c #A2620A",
"} c #7A9A52",
"| c #5AA25A",
"1 c #6E624A",
"2 c #DABA8A",
"3 c #BE766A",
"4 c #38A238",
"5 c #161E16",
"6 c #B6EEBE",
"7 c #2E3E3E",
"8 c #7E7A5A",
"9 c #5EAA5E",
"0 c #7AAA5E",
"a c #260202",
"b c #A6BA8A",
"c c #FEFAC6",
"d c #56725A",
"e c #E2AA56",
"f c #36463A",
"g c #B25E52",
"h c #42B242",
"i c #8E6E4A",
"j c #665C42",
"k c #2F2E22",
"l c #7AC27A",
"m c #967652",
"n c #92B27A",
"o c #66C666",
"p c #B45042",
"q c #C6B28E",
"r c #EAB667",
"s c #2A2A1E",
"t c #82261A",
"u c #32261E",
"v c #DEDAAA",
"w c #D6A69A",
"x c #B68E56",
"y c #0E1216",
"z c #A25E4A",
"A c #4E4226",
"B c #9A3E32",
"C c #B67E32",
"D c #528A4E",
"E c #5A2602",
"F c #1A0202",
"G c #3AA63A",
"H c #24221A",
"I c #3A4E3E",
"J c #509250",
"K c #462A06",
"L c #D29282",
"M c #AE7E36",
"N c #62523E",
"O c #CE7E0E",
"P c #EEC276",
"Q c #9C6452",
"R c #AE7220",
"S c #024E02",
"T c #90C096",
"U c #0A0A06",
"V c #FAF6BE",
"W c #492E0A",
"X c #0E720E",
"Y c #56B656",
"Z c #3A823A",
"` c #C28632",
" . c #72D672",
".. c #5BC25B",
"+. c #562E02",
"@. c #3EAA3E",
"#. c #DAC6A2",
"$. c #82561E",
"%. c #B2B27E",
"&. c #CE8E2E",
"*. c #AA4636",
"=. c #D2CA9A",
"-. c #2A0E0A",
";. c #767254",
">. c #529A52",
",. c #524A3A",
"'. c #BAA28E",
"). c #BAB286",
"!. c #4A3A22",
"~. c #3A0602",
"{. c #3E8A42",
"]. c #7A4602",
"^. c #222E24",
"/. c #7EA68A",
"(. c #260A06",
"_. c #AE8246",
":. c #6AC26A",
"<. c #CE8212",
"[. c #723222",
"}. c #A2C6A6",
"|. c #662A1E",
"1. c #524E3E",
"2. c #1A821A",
"3. c #BE9256",
"4. c #AEA67A",
"5. c #DA9636",
"6. c #DACE9E",
"7. c #B27262",
"8. c #1A6E1A",
"9. c #3EAE3E",
"0. c #025602",
"a. c #C6B69A",
"b. c #0B0202",
"c. c #F6DEB2",
"d. c #6E9672",
"e. c #D28616",
"f. c #CA8A2A",
"g. c #B2BA93",
"h. c #BEB6A2",
"i. c #565246",
"j. c #DAC0BA",
"k. c #EEBE75",
"l. c #9C503E",
"m. c #221A12",
"n. c #423E3A",
"o. c #421612",
"p. c #D2BEAA",
"q. c #F2CE92",
"r. c #B2AA7E",
"s. c #52BA52",
"t. c #A87A3C",
"u. c #A2C29A",
"v. c #56524B",
"w. c #8EAA76",
"x. c #6A3A02",
"y. c #360C08",
"z. c #1E861E",
"A. c #5A3202",
"B. c #42AE42",
"C. c #342A20",
"D. c #DAC6AA",
"E. c #64C264",
"F. c #E6AE5A",
"G. c #3A2E20",
"H. c #261402",
"I. c #56564E",
"J. c #A37E4D",
"K. c #746C50",
"L. c #A68252",
"M. c #6DC66D",
"N. c #D29A52",
"O. c #DACAC6",
"P. c #D68A1A",
"Q. c #066606",
"R. c #BABA96",
"S. c #26362C",
"T. c #6E3E02",
"U. c #1F1E1D",
"V. c #E6DEA6",
"W. c #622216",
"X. c #78CA78",
"Y. c #46AA46",
"Z. c #D6861A",
"`. c #025A02",
" + c #96CA96",
".+ c #D6AEA2",
"++ c #56BE56",
"@+ c #060202",
"#+ c #633602",
"$+ c #965602",
"%+ c #524636",
"&+ c #AE864A",
"*+ c #EABA6C",
"=+ c #71CA71",
"-+ c #AA8252",
";+ c #E2E2AE",
">+ c #CABA9E",
",+ c #DEA242",
"'+ c #C27E6A",
")+ c #BA5646",
"!+ c #1E0A06",
"~+ c #56A256",
"{+ c #3E0E0A",
"]+ c #965646",
"^+ c #4AAE4A",
"/+ c #42A642",
"(+ c #A27A48",
"_+ c #B6AE81",
":+ c #1E821E",
"<+ c #AEBA91",
"[+ c #32120E",
"}+ c #C2B6A6",
"|+ c #D28212",
"1+ c #AA7E4A",
"2+ c #7A7656",
"3+ c #2E902E",
"4+ c #AA5A4A",
"5+ c #EAE2AA",
"6+ c #26261D",
"7+ c #060606",
"8+ c #228622",
"9+ c #26120E",
"0+ c #AE8656",
"a+ c #2E2A21",
"b+ c #320202",
"c+ c #C67A6A",
"d+ c #167216",
"e+ c #42AA42",
"f+ c #BAB282",
"g+ c #72BE72",
"h+ c #6E2A1E",
"i+ c #72C672",
"j+ c #9ECE9E",
"k+ c #42B642",
"l+ c #025E02",
"m+ c #AE8651",
"n+ c #565653",
"o+ c #C3BAA5",
"p+ c #9ACEA2",
"q+ c #723E02",
"r+ c #BEBAA1",
"s+ c #E6B25F",
"t+ c #6E3A02",
"u+ c #B6BA98",
"v+ c #187E18",
"w+ c #9E5E06",
"x+ c #8E724E",
"y+ c #562A02",
"z+ c #2A120E",
"A+ c #4E3E22",
"B+ c #26322A",
"C+ c #D28216",
"D+ c #322E2A",
"E+ c #BABA9E",
"F+ c #D68A1E",
"U.n+v.I.v.v.i.,.A+%+n+n+i.v.n+v.n+n+i.v.1.%+!.n+n+i.v.n+I.n+I.U.",
"C.m+m+m+J.(+J.t.R #.3.m+_.&+m+m+m+J.(+J.t.C x 2 m+_.&+m+m+m+L.C.",
"K <.<.O e.e.|+s+$+a.' e.e.O <.C+O <.e.C+{ f.x+-+<.F+O O |+O O W ",
"K O C+<.<.Z.|+s+$+>+[ |+P.C+O <.C+|+P.e.5.; m m+Z.e.e.O <.Z.<.K ",
"W e.O F+F+<.F+*+* q ' Z.e.e.Z.O e.F+|+e.,+` x+1+e.Z.e.P.O |+F+W ",
"A k.*+e r *+r c.].q ` k.P k.P k.F.s+*+r q.&+i N.*+P k.k.P r e A+",
"H.t+q+T.t+T.+.E y+M * #+q+].x.t+t+x.q+#+y+y+$.R #+@ ].T.x.q+x.H.",
"n.E+u+r+u+g.<+w.# %.>+h.<+u+r+g.o+o+b h.n 0 } #.}+<+g.o+u+r+r+n.",
"] 8+:+v+v+:+v+3+= j+2.2.> :+> z.2.2.2.v+8+> >.9 :+> :+z.8+:+v+] ",
"! @.@.G B.9.G .v+}.8+@.@.G G @.G G h @.++^+D | @.9.G G @.@.G ! ",
"! @.@.h @.9.@. .= +z.9.9.h @.G h @.@.@...B.J ~+e+@.h 9.G B.9.! ",
"! 9.@.h @.4 @. .X u.:+B.@.@.B.@.9.h 4 G ../+D | 9.h @.B.@.G k+! ",
": i+=+++E.o E. +l+g+/+M.X.M.M.X...++=+E.l {.Z Y E.M.=+M.X.M.++: ",
"< $ $ Q.$ $ `.+ + 3+X 0.$ Q.$ l+Q.$ $ $ S + 8.> `.`.$ Q.$ Q.$ < ",
". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
" ",
" ",
" ",
" ",
" y f S.. ",
" y /.6 p+I . ",
" 7 T & d.^.. ",
" B+^ d f 5 . ",
" . S.^.5 U . ",
" -.[+z+H 6+s 6+s s 6+6+6+H 9+-.(. ",
" o.4+3 Q % _+_+_+_+_+f+f+f+) Q g B {+ ",
" G.7.j.O.}+v V c c V V c c c v h.j.L l.u ",
" . K.'+.+.+( #.V.V.V.V.5+5+V.5+6.'.w c+4+N . ",
" . 1 l.p )+z % _+r._+r.r.r.4.4.% ]+p *.|.u . ",
" m.W.t t [.j ;.;.8 2+2+;.;.K.j |.- - ~.7+ ",
" F / ~.[+a+k D+a+C.k s k H U.!+/ a b. ",
" b.b.b.7+U U U U U U U 7+7+. @+@+ "};
10-ball-turbo-key-pref.dpatch
20-appropriate-spelling.dpatch
#! /bin/sh /usr/share/dpatch/dpatch-run
## 20-appropriate-spelling.dpatch by <colint@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix spelling of "appropriate".
@DPATCH@
diff -urNad lbreakout2-2.6~/client/manager.c lbreakout2-2.6/client/manager.c
--- lbreakout2-2.6~/client/manager.c 2005-10-19 21:51:21.000000000 +0100
+++ lbreakout2-2.6/client/manager.c 2009-12-14 21:19:19.082763789 +0000
@@ -173,7 +173,7 @@
"Loosing your ball means going to the next level.")
#define HINT_HUNTER _("Your task is to hunt down bricks by moving a chaos brick indirectly. Therefore "\
"each side of the playing field has a brick color and you can hit small pads bearing these colors. "\
- "When you hit one, the chaos brick will move toward the appropiate side. You must not hit "\
+ "When you hit one, the chaos brick will move toward the appropriate side. You must not hit "\
"the bordering bricks and you must get to the brick within a time limit, as always "\
"displayed in the lower right-hand side of the screen. The faster you are, the more score "\
"you'll gain.##"\
diff -urNad lbreakout2-2.6~/game/balls.c lbreakout2-2.6/game/balls.c
--- lbreakout2-2.6~/game/balls.c 2005-06-07 18:57:30.000000000 +0100
+++ lbreakout2-2.6/game/balls.c 2009-12-14 21:20:40.565590121 +0000
@@ -1483,7 +1483,7 @@
else
prim->side = SIDE_RIGHT;
#ifdef WITH_BUG_REPORT
- sprintf( side_str, "Had to change side as TOP wasn't appropiate!" );
+ sprintf( side_str, "Had to change side as TOP wasn't appropriate!" );
#endif
}
break;
@@ -1494,7 +1494,7 @@
else
prim->side = SIDE_RIGHT;
#ifdef WITH_BUG_REPORT
- sprintf( side_str, "Had to change side as BOTTOM wasn't appropiate!" );
+ sprintf( side_str, "Had to change side as BOTTOM wasn't appropriate!" );
#endif
}
break;
@@ -1505,7 +1505,7 @@
else
prim->side = SIDE_BOTTOM;
#ifdef WITH_BUG_REPORT
- sprintf( side_str, "Had to change side as LEFT wasn't appropiate!" );
+ sprintf( side_str, "Had to change side as LEFT wasn't appropriate!" );
#endif
}
break;
@@ -1516,7 +1516,7 @@
else
prim->side = SIDE_BOTTOM;
#ifdef WITH_BUG_REPORT
- sprintf( side_str, "Had to change side as RIGHT wasn't appropiate!" );
+ sprintf( side_str, "Had to change side as RIGHT wasn't appropriate!" );
#endif
}
break;
......@@ -74,6 +74,12 @@ install: build
mkdir -p debian/lbreakout2/usr/share/pixmaps
cp debian/lbreakout2.xpm debian/lbreakout2/usr/share/pixmaps
cp debian/lbreakout2.desktop debian/lbreakout2/usr/share/applications
# Remove some files duplicated by the upstream build system
rm -fr debian/lbreakout2-data/usr/share/games/locale
rm -fr debian/lbreakout2-data/usr/share/games/applications
rm -fr debian/lbreakout2-data/usr/share/games/icons
rm -fr debian/lbreakout2/usr/share/games/applications
rm -fr debian/lbreakout2/usr/share/games/icons
binary-indep: build install
dh_testdir -i
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment