[hedgewars] 01/01: Closing bug #726443 simplify debian/rules
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Tue Feb 11 09:21:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository hedgewars.
commit 449aba357e7d35e3c1c2fc5199fce0e373429cbe
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri Feb 7 11:59:05 2014 +0100
Closing bug #726443 simplify debian/rules
---
debian/changelog | 8 +
debian/hedgewars.install | 3 +-
.../hicolor-icons/128x128/{ => apps}/hedgewars.xpm | 0
.../hicolor-icons/16x16/{ => apps}/hedgewars.xpm | 0
.../hicolor-icons/256x256/{ => apps}/hedgewars.xpm | 0
.../hicolor-icons/32x32/{ => apps}/hedgewars.xpm | 0
.../hicolor-icons/512x512/{ => apps}/hedgewars.xpm | 0
debian/menu | 3 +-
...-Fixed-desktop-file-By-adding-an-xpm-icon.patch | 283 +++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 11 -
11 files changed, 296 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 530d082..bf04bdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hedgewars (0.9.20.5-5) experimental; urgency=low
+
+ * debian/patches/0001-Fixed-desktop-file-By-adding-an-xpm-icon.patch
+ Added an hedgewars.xpm file (Closes: #726443)
+ * Installing icons as xpm instead of png.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Fri, 07 Feb 2014 11:57:27 +0100
+
hedgewars (0.9.20.5-4) experimental; urgency=low
* debian/rules
diff --git a/debian/hedgewars.install b/debian/hedgewars.install
index 076aaea..d7614c7 100644
--- a/debian/hedgewars.install
+++ b/debian/hedgewars.install
@@ -1,4 +1,5 @@
usr/lib
obj-*/share/hedgewars/Data/misc/hwengine.desktop /usr/share/games/hedgewars/Data/misc
share/hedgewars/Data/misc/hedgewars.desktop /usr/share/applications/
-tmp-icon/* /usr/share/icons/hicolor/
+debian/hicolor-icons/* /usr/share/icons/hicolor/
+usr/lib/hedgewars/share/pixmaps/hedgewars.xpm /usr/share/pixmaps/
diff --git a/debian/hicolor-icons/128x128/hedgewars.xpm b/debian/hicolor-icons/128x128/apps/hedgewars.xpm
similarity index 100%
rename from debian/hicolor-icons/128x128/hedgewars.xpm
rename to debian/hicolor-icons/128x128/apps/hedgewars.xpm
diff --git a/debian/hicolor-icons/16x16/hedgewars.xpm b/debian/hicolor-icons/16x16/apps/hedgewars.xpm
similarity index 100%
rename from debian/hicolor-icons/16x16/hedgewars.xpm
rename to debian/hicolor-icons/16x16/apps/hedgewars.xpm
diff --git a/debian/hicolor-icons/256x256/hedgewars.xpm b/debian/hicolor-icons/256x256/apps/hedgewars.xpm
similarity index 100%
rename from debian/hicolor-icons/256x256/hedgewars.xpm
rename to debian/hicolor-icons/256x256/apps/hedgewars.xpm
diff --git a/debian/hicolor-icons/32x32/hedgewars.xpm b/debian/hicolor-icons/32x32/apps/hedgewars.xpm
similarity index 100%
rename from debian/hicolor-icons/32x32/hedgewars.xpm
rename to debian/hicolor-icons/32x32/apps/hedgewars.xpm
diff --git a/debian/hicolor-icons/512x512/hedgewars.xpm b/debian/hicolor-icons/512x512/apps/hedgewars.xpm
similarity index 100%
rename from debian/hicolor-icons/512x512/hedgewars.xpm
rename to debian/hicolor-icons/512x512/apps/hedgewars.xpm
diff --git a/debian/menu b/debian/menu
index 0521d63..60c40fa 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,3 +1,4 @@
?package(hedgewars):needs="x11" section="Games/Action"\
title="Hedgewars" \
- command="/usr/games/hedgewars"
+ command="/usr/games/hedgewars" \
+ icon="/usr/share/pixmaps/hedgewars32.xpm"
diff --git a/debian/patches/0001-Fixed-desktop-file-By-adding-an-xpm-icon.patch b/debian/patches/0001-Fixed-desktop-file-By-adding-an-xpm-icon.patch
new file mode 100644
index 0000000..c8aaf37
--- /dev/null
+++ b/debian/patches/0001-Fixed-desktop-file-By-adding-an-xpm-icon.patch
@@ -0,0 +1,283 @@
+From 92cd3c66f4e5fee73070f2bdb6d872d0da89a53f Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Date: Fri, 24 Jan 2014 15:37:40 +0100
+Subject: [PATCH] Fixed desktop file By adding an xpm icon
+
+---
+ share/hedgewars/Data/misc/CMakeLists.txt | 1 +
+ share/hedgewars/Data/misc/hedgewars.desktop | 1 +
+ share/hedgewars/Data/misc/hedgewars.xpm | 239 ++++++++++++++++++++++++++++
+ 3 files changed, 241 insertions(+)
+ create mode 100644 share/hedgewars/Data/misc/hedgewars.xpm
+
+diff --git a/share/hedgewars/Data/misc/CMakeLists.txt b/share/hedgewars/Data/misc/CMakeLists.txt
+index 6b1aa41..afb360b 100644
+--- a/share/hedgewars/Data/misc/CMakeLists.txt
++++ b/share/hedgewars/Data/misc/CMakeLists.txt
+@@ -5,5 +5,6 @@ if(UNIX AND NOT APPLE)
+ file(GLOB miscfiles *.xml *.desktop)
+
+ install(FILES ${miscfiles} DESTINATION ${SHAREPATH}/Data/misc)
++ install(FILES hedgewars.xpm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
+ endif()
+
+diff --git a/share/hedgewars/Data/misc/hedgewars.desktop b/share/hedgewars/Data/misc/hedgewars.desktop
+index 47f4d0b..abd6bfb 100755
+--- a/share/hedgewars/Data/misc/hedgewars.desktop
++++ b/share/hedgewars/Data/misc/hedgewars.desktop
+@@ -2,6 +2,7 @@
+ Type=Application
+ Version=1.0
+ Name=Hedgewars
++Keywords=game;strategy;
+ GenericName=Fighting Hedgehogs
+ GenericName[de]=Kämpfende Igel
+ GenericName[es]=Batallas entre erizos
+diff --git a/share/hedgewars/Data/misc/hedgewars.xpm b/share/hedgewars/Data/misc/hedgewars.xpm
+new file mode 100644
+index 0000000..c32d5f3
+--- /dev/null
++++ b/share/hedgewars/Data/misc/hedgewars.xpm
+@@ -0,0 +1,239 @@
++/* XPM */
++static char *Icon___x__x__[] = {
++/* columns rows colors chars-per-pixel */
++"32 32 201 2",
++" c #010101",
++". c #0A0709",
++"X c #1A1A1A",
++"o c #454545",
++"O c #94005E",
++"+ c #AE005D",
++"@ c #970063",
++"# c #9B0064",
++"$ c #94066D",
++"% c #9D036A",
++"& c #9E086E",
++"* c #880873",
++"= c #960E74",
++"- c #980D73",
++"; c #8C1578",
++": c #8C1A7D",
++"> c #9D1075",
++", c #9D177C",
++"< c #91187D",
++"1 c #9B1C7D",
++"2 c #A20065",
++"3 c #AA0067",
++"4 c #A3046B",
++"5 c #A0096F",
++"6 c #A20C73",
++"7 c #AD0B72",
++"8 c #A41276",
++"9 c #AD1074",
++"0 c #A61479",
++"q c #A81C7B",
++"w c #7B2083",
++"e c #772E8F",
++"r c #7D2C8E",
++"t c #732F91",
++"y c #6B3596",
++"u c #653B9B",
++"i c #6D3A9B",
++"p c #743294",
++"a c #783092",
++"s c #713899",
++"d c #5641A1",
++"f c #504BA9",
++"g c #5A4EAD",
++"h c #4D5AB6",
++"j c #5652B0",
++"k c #5058B5",
++"l c #6444A3",
++"z c #7C4CA8",
++"x c #7654B2",
++"c c #4363BF",
++"v c #3D67C3",
++"b c #3A69C5",
++"n c #3C73CE",
++"m c #2C77D1",
++"M c #237CD6",
++"N c #2C78D2",
++"B c #2F7ED8",
++"V c #3E7BD5",
++"C c #5F71CC",
++"Z c #6F6ECA",
++"A c #627FD6",
++"S c #6C7ED6",
++"D c #617ED9",
++"F c #6F7ED9",
++"G c #881F82",
++"H c #A11F83",
++"J c #AC1D82",
++"K c #872386",
++"L c #8A2387",
++"P c #8D2689",
++"I c #8A2C8F",
++"U c #952388",
++"Y c #812F91",
++"T c #873595",
++"R c #8D3192",
++"E c #8A3799",
++"W c #84399A",
++"Q c #AE2285",
++"! c #A32488",
++"~ c #A92D8D",
++"^ c #B1258A",
++"/ c #B32C8C",
++"( c #BD298E",
++") c #B5308E",
++"_ c #B72E91",
++"` c #BE2C91",
++"' c #BA3495",
++"] c #BA3895",
++"[ c #BC3C9A",
++"{ c #BF3BA0",
++"} c #C32E93",
++"| c #C23391",
++" . c #CF3D9D",
++".. c #C13DA2",
++"X. c #CA3BA0",
++"o. c #BE419C",
++"O. c #8148A4",
++"+. c #8152B0",
++"@. c #C0439E",
++"#. c #C345A3",
++"$. c #C54EA5",
++"%. c #CE4AA3",
++"&. c #C645AA",
++"*. c #C74EA9",
++"=. c #C94AAE",
++"-. c #D045AA",
++";. c #D04BAF",
++":. c #C750A8",
++">. c #CC59AB",
++",. c #CB4DB1",
++"<. c #CC51B4",
++"1. c #CD5AB0",
++"2. c #D45CBF",
++"3. c #D363BA",
++"4. c #D65FC3",
++"5. c #D769C0",
++"6. c #DB6CC3",
++"7. c #DE66C9",
++"8. c #DE6BCE",
++"9. c #DB74C5",
++"0. c #DE76CB",
++"q. c #DF6DD0",
++"w. c #E068CC",
++"e. c #EA7FCF",
++"r. c #E06FD1",
++"t. c #E274D5",
++"y. c #E47BD6",
++"u. c #E376D8",
++"i. c #E479D9",
++"p. c #E87FDE",
++"a. c #1E83DC",
++"s. c #2482DB",
++"d. c #2B80DA",
++"f. c #3682DC",
++"g. c #1B8BE3",
++"h. c #3187E0",
++"j. c #3D8BE4",
++"k. c #2790E8",
++"l. c #3594EC",
++"z. c #3D94EC",
++"x. c #4C90EA",
++"c. c #5494EB",
++"v. c #469CF4",
++"b. c #4C98F1",
++"n. c #5A97F1",
++"m. c #529AF2",
++"M. c #5A9FF8",
++"N. c #6B87E1",
++"B. c #49A1F9",
++"V. c #59A3F6",
++"C. c #52A6FE",
++"Z. c #5DA7FE",
++"A. c #56AFFF",
++"S. c #5CABFF",
++"D. c #56B4FF",
++"F. c #58B5FF",
++"G. c #54BBFF",
++"H. c #898989",
++"J. c #8A918D",
++"K. c #949394",
++"L. c #9C9B9C",
++"P. c #B5B4B5",
++"I. c #E483D2",
++"U. c #E789D6",
++"Y. c #E781DA",
++"T. c #E985DC",
++"R. c #EA89DC",
++"E. c #EC91DE",
++"W. c #EE9BDA",
++"Q. c #EC87E2",
++"!. c #EC8CE2",
++"~. c #EE93E1",
++"^. c #F195E6",
++"/. c #F29BE7",
++"(. c #F49EE9",
++"). c #F4A6E5",
++"_. c #F5A2EB",
++"`. c #F9A6EF",
++"'. c #F6AAED",
++"]. c #F5B2EC",
++"[. c #F6A2F0",
++"{. c #FAA6F1",
++"}. c #FAAAF3",
++"|. c #FBB7F5",
++" X c #FEB1F8",
++".X c #C8C7C8",
++"XX c #CBCBCC",
++"oX c #CDD1CF",
++"OX c #F3D2EB",
++"+X c #F7C6F0",
++"@X c #F8C1F1",
++"#X c #F8CAF2",
++"$X c #FFD1FC",
++"%X c #FDDBFB",
++"&X c #F9E6F7",
++"*X c #FDE5FA",
++"=X c #FDEDFB",
++"-X c #F3FCF5",
++";X c #FCF3FA",
++":X c #FEFEFE",
++">X c None",
++/* pixels */
++">X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
++">X>X>X>X>X>X>X>X>X>X>X= & >X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
++">X>X>X>X>X>X>X>X>X>X>Xp v : >X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
++">X>X>X>X>X>X>X>X>X>X>Xr k.f.u 4 >X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
++">X>X>X>X>X>X>X>X>X>X>Xt z.Z.l.c : 3 >X>X>X>X>X>X>X>X>X>X>X>X>X>X",
++">X>X>X>X>X>X>X>X>X>X>Xy l.Z.Z.B.h.l > >X>X>X>X>X>X>X>X>X>X>X>X>X",
++">X>X>X>X4 >X>X>X>X>X>Xt j.Z.A.S.n.C f * % >X>X>X>X>X>X>X>X>X>X>X",
++">X>X>X4 l g l i p r K : T P L R ~ ] [ ] ^ 8 O >X>X>X>X>X>X>X>X>X",
++">X>X>X>Xs g.s.s.s.M M s.d 8 %.I.(._.{.`._.E.3.Q # >X>X>X>X>X>X>X",
++">X>X>X>X4 D C.m.m.b.v.p ' E.}._.(././.(./._.`._.1.& >X>X>X>X>X>X",
++">X>X>X>X>XT A.Z.D.D.W .}._././.(._.(.(././.^./.}.6.6 >X>X>X>X>X",
++">X>X>X>X>X2 A D.N.W ( _._./.(.(.(.(.(./.'.+X at X_.].$X9.# >X>X>X>X",
++">X>X>X>X>X>X1 E ; 7 i._.(.(.(.(.(._./.].:X:X:X;X:X:X:X$.>X>X>X>X",
++">X>X>X>X4 < i b y -.!.(.(.(._.(.(.(./.*X:X:X:X:X:X:X-XOX6 >X>X>X",
++">X>X6 r k m a.m ! 7.!._.(.(.(.(.(./._.:X:X:XL.P.:XH. XX>.>X>X>X",
++">X* n a.M B z.C ( t.R._.(.(.(.(.(./.'.;X:X.X X :Xo J.W.# >X>X",
++">X# a V v.V.G.z X.t.R._./._.(./.(.(.(.=X:X.X X :XK.. oX).% >X>X",
++">X>X>X0 F G.S 2 ,.t.Y._./.(.(._.(._.^.#X:X:XK.P.:X:X-X=X~.8 >X>X",
++">X>X>X>X4 x I w ,.u.y.(.(._.(.(._.(.(./.&X:X:X:X=X+X%X'.U.) ] >X",
++">X>X>X>X>X+ h f .t.7.~.(./.(.(./.(.(.(._.#X&X*X|.{.3.U.U.] ^.q ",
++">X>X>X>X>Xp g.h ` i.t.Q.}._./.(.(.(.(.(./.(.~.6.3. at .$.}.3.#. X) ",
++">X>X>X>X: m d.c.! 7.,...3.E.`./.(._.(.(./._./.| @.r._.}.' 3.U.q ",
++">X>X>X4 c M x.F.O.7 [ :.o.Q 3.{./.(.(._.(./._.{. X_._.R.^ r.J >X",
++">X>X4 j g.z.F.V.U 6.}.}.}.E.Q 9.`./.(./.(.(.(././.).[.] 8 6 >X>X",
++">X>X- l g Z N.x } [.(././.}.9._ (.(.(._._.(.(.(.^.^.,.% >X>X>X>X",
++">X>X>X>X>X4 4 2 &.Q.(.(./._.T.Q t.y.R.~.~.~.Q.Q.Y.=.- >X>X>X>X>X",
++">X>X>X>X>X>X>X>X^ u.R./.(.{.*.[ i.q.8.8.q.r.i.q.' & >X>X>X>X>X>X",
++">X>X>X>X>X>X>X>X% _ 4.r.8.#.& ,.q.t.t.t.q.4.| J | 0 >X>X>X>X>X>X",
++">X>X>X>X>X>X>X>X>X>X6 0 6 - &.' Q ^ ^ ^ Q / *.U. X[ >X>X>X>X>X>X",
++">X>X>X>X>X>X>X>X>X>X>X>X>X6 q.!.~.I.U.*.] }.}._.}. at .>X>X>X>X>X>X",
++">X>X>X>X>X>X>X>X>X>X>X>X>X>X' u.Q.^.~.Q &.Q.~.(.r.8 >X>X>X>X>X>X",
++">X>X>X>X>X>X>X>X>X>X>X>X>X>X% ^ ,.&.J % 0 ..,...6 >X>X>X>X>X>X>X"
++};
+--
+1.8.3.2
+
diff --git a/debian/patches/series b/debian/patches/series
index a0be553..9784523 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
using_system_physfs.patch
using_system_fonts.patch
noversionupdate.patch
+0001-Fixed-desktop-file-By-adding-an-xpm-icon.patch
diff --git a/debian/rules b/debian/rules
index 3f519b3..11db3db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,19 +6,8 @@
DEJAVU_DIRECTORY := $(shell dirname `readlink -f /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf`)
override_dh_auto_configure:
- for icon in `find debian/hicolor-icons -type f`; do \
- dirname=`dirname $$icon`; \
- dirname=`basename $$dirname`; \
- basename=`basename $$icon .xpm`; \
- mkdir -p tmp-icon/$$dirname/apps; \
- convert $$icon tmp-icon/$$dirname/apps/$$basename.png; \
- done
dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr/lib/hedgewars \
-DDATA_INSTALL_DIR=/usr/share/games/hedgewars \
-DCMAKE_BUILD_TYPE=RELEASE -DPHYSFS_SYSTEM=ON \
-DFONTS_DIRS='/usr/share/fonts/truetype/wqy;$(DEJAVU_DIRECTORY)' \
-DNOVERSIONINFOUPDATE=1
-
-override_dh_clean:
- rm -rf tmp-icon
- dh_clean
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git
More information about the Pkg-games-commits
mailing list