[opencity] 34/91: + * do not ignore make distclean return anymore + * install LEGGIMI.txt and FAQ.txt in /usr/share/doc/opencity and remove some + useless files (Closes: #442029) + * use imagemagick's convert to create the .xpm from OpenCity.png + - new builddep: imagemagick + - remove debian/opencity.xpm
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Mar 25 12:23:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository opencity.
commit 8dc7ae7cdab15ec3fc80b846e45d19fa7d921a15
Author: Gonéri Le Bouder <goneri at rulezlan.org>
Date: Sat Sep 15 10:33:17 2007 +0000
+ * do not ignore make distclean return anymore
+ * install LEGGIMI.txt and FAQ.txt in /usr/share/doc/opencity and remove some
+ useless files (Closes: #442029)
+ * use imagemagick's convert to create the .xpm from OpenCity.png
+ - new builddep: imagemagick
+ - remove debian/opencity.xpm
---
debian/changelog | 22 ++--
debian/control | 2 +-
debian/opencity.xpm | 338 --------------------------------------------------
debian/patches/series | 1 +
debian/rules | 12 +-
5 files changed, 26 insertions(+), 349 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e4aeff2..3316841 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-opencity (0.0.4stable-3) UNRELEASED; urgency=low
+opencity (0.0.4stable-3) unstable; urgency=low
[ Eddy Petrișor ]
* added Encoding field in the desktop file
@@ -10,12 +10,20 @@ opencity (0.0.4stable-3) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
* Fixed copyright:
- - Added missing “or any later version” to match upstream's copyright
- statement in the COPYRIGHT file (Closes: #442034).
- - Fixed public domain statement by replacing the copyright by an
- authorship statement (Closes: #442056).
-
- -- Jon Dowland <jon at alcopop.org> Thu, 12 Jul 2007 12:03:33 +0100
+ - Added missing “or any later version” to match upstream's copyright
+ statement in the COPYRIGHT file (Closes: #442034).
+ - Fixed public domain statement by replacing the copyright by an
+ authorship statement (Closes: #442056).
+
+ [ Gonéri Le Bouder ]
+ * do not ignore make distclean return anymore
+ * install LEGGIMI.txt and FAQ.txt in /usr/share/doc/opencity and remove some
+ useless files (Closes: #442029)
+ * use imagemagick's convert to create the .xpm from OpenCity.png
+ - new builddep: imagemagick
+ - remove debian/opencity.xpm
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Sat, 15 Sep 2007 12:13:27 +0200
opencity (0.0.4stable-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index cbb86b2..459130d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>
Build-Depends: debhelper (>= 5.0.0), autotools-dev, libsdl1.2-dev,
libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev (>= 1.2.5-7),
- docbook-to-man, libglu1-mesa-dev, quilt
+ docbook-to-man, libglu1-mesa-dev, quilt, imagemagick
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/opencity/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/opencity/?op=log
diff --git a/debian/opencity.xpm b/debian/opencity.xpm
deleted file mode 100644
index 4c618cc..0000000
--- a/debian/opencity.xpm
+++ /dev/null
@@ -1,338 +0,0 @@
-/* XPM */
-static char * opencity_xpm[] = {
-"32 32 303 2",
-" c None",
-". c #F0F001",
-"+ c #E8E801",
-"@ c #DEDE0D",
-"# c #DBDB26",
-"$ c #DFDF13",
-"% c #E2E11C",
-"& c #E9E901",
-"* c #F2F201",
-"= c #F9F901",
-"- c #FFFF01",
-"; c #FFFF17",
-"> c #FFFF5D",
-", c #FFFF70",
-"' c #FFFF83",
-") c #FFFF06",
-"! c #0000C6",
-"~ c #0000B7",
-"{ c #0000B1",
-"] c #0B0CB0",
-"^ c #292BA3",
-"/ c #5D618F",
-"( c #7D82A8",
-"_ c #D8D983",
-": c #FFFF84",
-"< c #FFFF12",
-"[ c #0001E1",
-"} c #0001E0",
-"| c #090ADF",
-"1 c #1C23F3",
-"2 c #1C26FD",
-"3 c #2832FD",
-"4 c #0B17FF",
-"5 c #000CFF",
-"6 c #AFB3A1",
-"7 c #FFFF1E",
-"8 c #0A0BE2",
-"9 c #282EF4",
-"0 c #303AFF",
-"a c #3E47FF",
-"b c #212BFF",
-"c c #A6AAA7",
-"d c #FFFF27",
-"e c #02349F",
-"f c #0008D7",
-"g c #090AE2",
-"h c #2A30F4",
-"i c #2F39FF",
-"j c #2833FF",
-"k c #9DA2AE",
-"l c #FFFF23",
-"m c #01D000",
-"n c #07B500",
-"o c #08B200",
-"p c #08B100",
-"q c #07AA0B",
-"r c #079932",
-"s c #158D7B",
-"t c #2E3AFD",
-"u c #2A34FF",
-"v c #010DFF",
-"w c #959AB4",
-"x c #FEFD84",
-"y c #EAA412",
-"z c #ECB800",
-"A c #00D900",
-"B c #00D700",
-"C c #0DCB0A",
-"D c #13D516",
-"E c #17DB1B",
-"F c #26E82C",
-"G c #30F63A",
-"H c #0CF919",
-"I c #00FC0F",
-"J c #00F816",
-"K c #2748E9",
-"L c #2B35FF",
-"M c #915E89",
-"N c #D13119",
-"O c #C60100",
-"P c #C60400",
-"Q c #C73300",
-"R c #1DDE1E",
-"S c #41FD4C",
-"T c #6AFF73",
-"U c #66FF70",
-"V c #5FFF69",
-"W c #34FF40",
-"X c #00FF10",
-"Y c #00FE11",
-"Z c #2159D2",
-"` c #2C36FF",
-" . c #290ACB",
-".. c #920442",
-"+. c #BD0100",
-"@. c #B00000",
-"#. c #1EDE1E",
-"$. c #40FA4A",
-"%. c #4BFF56",
-"&. c #1C73B4",
-"*. c #513DDB",
-"=. c #921457",
-"-. c #C50101",
-";. c #C20100",
-">. c #B20000",
-",. c #AF0000",
-"'. c #1CDD1C",
-"). c #38F541",
-"!. c #67FF70",
-"~. c #60FF6A",
-"{. c #54FF5E",
-"]. c #05FF14",
-"^. c #5F613D",
-"/. c #C30205",
-"(. c #C50202",
-"_. c #CC0A0D",
-":. c #B20101",
-"<. c #18DC19",
-"[. c #2FF136",
-"}. c #6AFE73",
-"|. c #67FF71",
-"1. c #54FF5F",
-"2. c #4F7A36",
-"3. c #E10E11",
-"4. c #FC1D23",
-"5. c #FF1E25",
-"6. c #F81B22",
-"7. c #D40E11",
-"8. c #B30202",
-"9. c #12DC12",
-"0. c #36F03C",
-"a. c #62FE6C",
-"b. c #68FF71",
-"c. c #60FF6B",
-"d. c #55FF60",
-"e. c #04FF14",
-"f. c #1B977D",
-"g. c #BE050E",
-"h. c #C70600",
-"i. c #DE250B",
-"j. c #FA1C22",
-"k. c #D80F13",
-"l. c #B70304",
-"m. c #06DA06",
-"n. c #40EC45",
-"o. c #55FE60",
-"p. c #61FF6A",
-"q. c #01FF10",
-"r. c #0DAE6C",
-"s. c #8E1C67",
-"t. c #D82108",
-"u. c #F72D1C",
-"v. c #FB1C23",
-"w. c #DD1115",
-"x. c #3FE641",
-"y. c #47FE52",
-"z. c #62FF6A",
-"A. c #4EFF58",
-"B. c #07C74C",
-"C. c #502ECA",
-"D. c #C61116",
-"E. c #F22D26",
-"F. c #FF2027",
-"G. c #FF252C",
-"H. c #FD1D24",
-"I. c #31E332",
-"J. c #62FF6B",
-"K. c #46FF51",
-"L. c #02E030",
-"M. c #AD0C29",
-"N. c #BD0615",
-"O. c #D01230",
-"P. c #FD1E26",
-"Q. c #FF2126",
-"R. c #FD3332",
-"S. c #FC4644",
-"T. c #FA585C",
-"U. c #FA7073",
-"V. c #FC8688",
-"W. c #FE999B",
-"X. c #FEAEAE",
-"Y. c #FEC4C4",
-"Z. c #FEDCDA",
-"`. c #FEF2EF",
-" + c #FEFFFC",
-".+ c #1FDF20",
-"++ c #41FB4B",
-"@+ c #3EFF49",
-"#+ c #00F11E",
-"$+ c #3B45FF",
-"%+ c #9573A4",
-"&+ c #CE8484",
-"*+ c #CA8E91",
-"=+ c #DAB4B2",
-"-+ c #DBCAC8",
-";+ c #DDDEDA",
-">+ c #E3E4E0",
-",+ c #DDD9D0",
-"'+ c #CFC2B1",
-")+ c #C9B298",
-"!+ c #C8A784",
-"~+ c #C39C72",
-"{+ c #BD8C58",
-"]+ c #DEC2A2",
-"^+ c #0FDC10",
-"/+ c #3FF848",
-"(+ c #62FF6C",
-"_+ c #35FF41",
-":+ c #00F519",
-"<+ c #3C47FD",
-"[+ c #989CC6",
-"}+ c #B8BAB7",
-"|+ c #B6B8B9",
-"1+ c #D1D3D0",
-"2+ c #D7D8D5",
-"3+ c #DCDEDA",
-"4+ c #E1E3DF",
-"5+ c #C89862",
-"6+ c #D0710B",
-"7+ c #CE710E",
-"8+ c #C86D0D",
-"9+ c #BF6506",
-"0+ c #DFB586",
-"a+ c #04DA04",
-"b+ c #3BF543",
-"c+ c #68FF72",
-"d+ c #63FF6C",
-"e+ c #30FF3C",
-"f+ c #00F717",
-"g+ c #3452EA",
-"h+ c #9195CD",
-"i+ c #B5B8BB",
-"j+ c #D0D2CE",
-"k+ c #D5D7D4",
-"l+ c #DBDCD9",
-"m+ c #E0E2DE",
-"n+ c #CA9256",
-"o+ c #D3720C",
-"p+ c #C96E0D",
-"q+ c #E7C8A4",
-"r+ c #3BF443",
-"s+ c #66FE6F",
-"t+ c #2C62D4",
-"u+ c #5F66E6",
-"v+ c #B9BBBB",
-"w+ c #CFD1CD",
-"x+ c #D4D6D2",
-"y+ c #D9DBD8",
-"z+ c #DFE0DD",
-"A+ c #C78B49",
-"B+ c #CF710D",
-"C+ c #C86D0C",
-"D+ c #EFDBC2",
-"E+ c #42F148",
-"F+ c #58FE62",
-"G+ c #63FF6D",
-"H+ c #2EFF3A",
-"I+ c #00FE10",
-"J+ c #0666AB",
-"K+ c #BCBEBB",
-"L+ c #CDCFCC",
-"M+ c #D3D5D1",
-"N+ c #D8DAD7",
-"O+ c #DDDFDB",
-"P+ c #C47F35",
-"Q+ c #D4730A",
-"R+ c #C66B0B",
-"S+ c #F7EEE1",
-"T+ c #48EE4C",
-"U+ c #48FD53",
-"V+ c #64FF6E",
-"W+ c #1EFF2C",
-"X+ c #00FF0F",
-"Y+ c #BDBFBC",
-"Z+ c #CDCFCB",
-"`+ c #D7D9D5",
-" @ c #C57520",
-".@ c #D4720A",
-"+@ c #CF710E",
-"@@ c #C36809",
-"#@ c #C0680B",
-"$@ c #FEFEFA",
-"%@ c #26FD33",
-"&@ c #28FF36",
-"*@ c #BEBFBD",
-"=@ c #CCCECA",
-"-@ c #D6D7D4",
-";@ c #C76F13",
-">@ c #CE700D",
-",@ c #C77A28",
-"'@ c #C0C2BF",
-")@ c #D4D6D3",
-"!@ c #DADBD8",
-"~@ c #CA6E0B",
-"{@ c #C96C0A",
-"]@ c #CE8B42",
-"^@ c #C8C9C6",
-"/@ c #CDCECB",
-"(@ c #CED0CC",
-"_@ c #DCDEDB",
-":@ c #D16F08",
-"<@ c #D3720A",
-"[@ c #C56908",
-" ",
-" ",
-" ",
-" ",
-" . + @ # $ % & * = ",
-" - - ; > , ' ) - - ",
-" ! ~ { { ] ^ / ( _ : < - - ",
-" [ } | 1 2 3 4 5 5 6 : 7 - - ",
-" [ [ 8 9 0 a b 5 5 c : d - - ",
-" e f g h i a j 5 5 k : l - - ",
-"m n o o o o p q r s t a u v 5 w x y z - ",
-"A B C D E F G H I J K a L v 5 M N O P Q ",
-"A A R S T U V W X Y Z a ` ...O O O O O +. at . ",
-" A #.$.T U V %.X X &.*.=.-.O O O O O O O ;.>.,. ",
-" A '.).T !.~.{.].X ^./.O O O O O O O O O O (._.:.,. ",
-" A <.[.}.|.~.1.].X 2.O O O O O O O O O O 3.4.5.6.7.8. ",
-" A 9.0.a.b.c.d.e.X f.g.O O O O O O h.i.j.5.5.5.5.5.j.k.l. ",
-" A m.n.o.|.p.{.q.X r.s.O O O O O t.u.5.5.5.5.5.5.5.5.5.v.w. ",
-" A A x.y.b.z.A.X X B.C.O O O D.E.5.5.5.5.5.5.5.5.5.5.5.F.G.H. ",
-" A I.S b.J.K.X X L.0 M.N.O.P.5.Q.R.S.T.U.V.W.X.Y.Z.`. + + ",
-" A .+++b.J. at +X X #+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+ + + + ",
-" A ^+/+b.(+_+X X :+<+[+}+|+1+2+3+4+5+6+7+8+9+9+0+ + + + ",
-" A a+b+c+d+e+X X f+g+h+}+i+j+k+l+m+n+o+7+p+9+9+q+ + + + ",
-" A A r+s+d+e+X X Y t+u+}+v+w+x+y+z+A+o+B+C+9+9+D+ + + + ",
-" A E+F+G+H+X X I+J+ }+K+L+M+N+O+P+Q+7+R+9+9+S+ + + + ",
-" T+U+V+W+X+ }+Y+Z+1+`+3+ @. at +@@@9+#@$@ + + + ",
-" %@&@ *@=@j+- at l+;@.@>@9+9+,@ + + + ",
-" '@=@w+)@!@~@.@{@9+9+]@ + + + ",
-" ^@/@(@- at _@:@<@[@9+9+ ",
-" ",
-" ",
-" "};
diff --git a/debian/patches/series b/debian/patches/series
index 23605f6..7a42b09 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
fix_homedir.diff
fix_gcc-4.3.diff
+desktop.diff -p0
diff --git a/debian/rules b/debian/rules
index bff32e7..3704919 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,7 @@ build-stamp: config.status
# Add here commands to compile the package.
$(MAKE)
docbook-to-man debian/manpage.sgml > debian/opencity.6
+ convert -geometry 32x32 ./OpenCity.png debian/opencity.xpm
touch build-stamp
@@ -41,7 +42,7 @@ clean:
rm -f build-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
@@ -60,7 +61,11 @@ install: build
# Add here commands to install the package into debian/opencity.
$(MAKE) install DESTDIR=$(CURDIR)/debian/opencity
- mv $(CURDIR)/debian/opencity/usr/bin $(CURDIR)/debian/opencity/usr/games
+ mv debian/opencity/usr/bin debian/opencity/usr/games
+ rm -rf debian/opencity/usr/share/games/opencity/docs \
+ debian/opencity/usr/share/games/opencity/autopackage \
+ debian/opencity/usr/share/games/opencity/OpenCity.desktop \
+ debian/opencity/usr/share/games/opencity/OpenCity.png \
dh_install debian/opencity.desktop usr/share/applications
dh_install debian/opencity.xpm usr/share/pixmaps
@@ -70,7 +75,8 @@ binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
- dh_installdocs
+ dh_installdocs ./docs/FAQ.txt
+ dh_installdocs ./docs/LEGGIMI.txt
dh_installexamples
dh_installman debian/opencity.6
dh_desktop
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/opencity.git
More information about the Pkg-games-commits
mailing list