r15992 - in packages/trunk/nikwi/debian: . patches source
Markus Koschany
apo at moszumanska.debian.org
Sun Jul 30 22:25:43 UTC 2017
Author: apo
Date: 2017-07-30 22:25:42 +0000 (Sun, 30 Jul 2017)
New Revision: 15992
Added:
packages/trunk/nikwi/debian/nikwi.png
packages/trunk/nikwi/debian/patches/reproducible_build.patch
packages/trunk/nikwi/debian/source/include-binaries
Removed:
packages/trunk/nikwi/debian/nikwi.menu
packages/trunk/nikwi/debian/nikwi.xpm
Modified:
packages/trunk/nikwi/debian/changelog
packages/trunk/nikwi/debian/compat
packages/trunk/nikwi/debian/control
packages/trunk/nikwi/debian/nikwi.6
packages/trunk/nikwi/debian/patches/series
packages/trunk/nikwi/debian/rules
Log:
Release nikwi 0.0.20120213-4
Modified: packages/trunk/nikwi/debian/changelog
===================================================================
--- packages/trunk/nikwi/debian/changelog 2017-07-27 00:23:24 UTC (rev 15991)
+++ packages/trunk/nikwi/debian/changelog 2017-07-30 22:25:42 UTC (rev 15992)
@@ -1,3 +1,16 @@
+nikwi (0.0.20120213-4) unstable; urgency=medium
+
+ * Team upload.
+ * Switch to compat level 10.
+ * Declare compliance with Debian Policy 4.0.0.
+ * Drop deprecated menu file and xpm icon. Upscale xpm icon to 64x64 pixel,
+ convert it to png and install it into the hicolor icon directory.
+ * Add reproducible_build.patch and make the build reproducible.
+ Thanks to Chris Lamb for the report and patch, (Closes: #835625)
+ * Fix spelling mistake in nikwi.6 manpage.
+
+ -- Markus Koschany <apo at debian.org> Mon, 31 Jul 2017 00:05:21 +0200
+
nikwi (0.0.20120213-3) unstable; urgency=medium
* Team upload.
Modified: packages/trunk/nikwi/debian/compat
===================================================================
--- packages/trunk/nikwi/debian/compat 2017-07-27 00:23:24 UTC (rev 15991)
+++ packages/trunk/nikwi/debian/compat 2017-07-30 22:25:42 UTC (rev 15992)
@@ -1 +1 @@
-9
+10
Modified: packages/trunk/nikwi/debian/control
===================================================================
--- packages/trunk/nikwi/debian/control 2017-07-27 00:23:24 UTC (rev 15991)
+++ packages/trunk/nikwi/debian/control 2017-07-30 22:25:42 UTC (rev 15992)
@@ -7,9 +7,9 @@
Sam Hocevar <sho at debian.org>,
Barry deFreese <bdefreese at debian.org>
Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 10),
libsdl1.2-dev
-Standards-Version: 3.9.7
+Standards-Version: 4.0.0
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/nikwi/
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/nikwi/
Homepage: http://badsector.github.io/nikwi/Nikwi_Deluxe/
Modified: packages/trunk/nikwi/debian/nikwi.6
===================================================================
--- packages/trunk/nikwi/debian/nikwi.6 2017-07-27 00:23:24 UTC (rev 15991)
+++ packages/trunk/nikwi/debian/nikwi.6 2017-07-30 22:25:42 UTC (rev 15992)
@@ -42,7 +42,7 @@
New game - This option begins a new game. If you already have a game in the process and you went to the menu by pressing ESC (see the Controls part of this manual below), the current game is ended and a new game begins from the first level.
Credits - It shows a screen with information about the game's developers.
- Quit - It immediatelly quits the game. The shareware version will show some teaser screenshots of the full version before quitting.
+ Quit - It immediately quits the game. The shareware version will show some teaser screenshots of the full version before quitting.
.
.SS The game
.
Deleted: packages/trunk/nikwi/debian/nikwi.menu
===================================================================
--- packages/trunk/nikwi/debian/nikwi.menu 2017-07-27 00:23:24 UTC (rev 15991)
+++ packages/trunk/nikwi/debian/nikwi.menu 2017-07-30 22:25:42 UTC (rev 15992)
@@ -1,3 +0,0 @@
-?package(nikwi):needs="x11" section="Games/Action" \
- title="Nikwi Deluxe" command="/usr/games/nikwi" \
- icon="/usr/share/pixmaps/nikwi.xpm"
Added: packages/trunk/nikwi/debian/nikwi.png
===================================================================
(Binary files differ)
Property changes on: packages/trunk/nikwi/debian/nikwi.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: packages/trunk/nikwi/debian/nikwi.xpm
===================================================================
--- packages/trunk/nikwi/debian/nikwi.xpm 2017-07-27 00:23:24 UTC (rev 15991)
+++ packages/trunk/nikwi/debian/nikwi.xpm 2017-07-30 22:25:42 UTC (rev 15992)
@@ -1,373 +0,0 @@
-/* XPM */
-static char *nikwi[]={
-"32 32 338 2",
-"Qt c None",
-".K c #000000",
-".f c #000000",
-".x c #000000",
-".k c #000000",
-"dp c #000000",
-"aI c #000000",
-".w c #000000",
-".e c #000000",
-"do c #000000",
-"dm c #000000",
-".p c #000000",
-"bo c #000000",
-"dn c #000000",
-"aH c #000000",
-"bA c #000000",
-"b# c #000000",
-"bI c #281204",
-"bY c #291204",
-"bE c #2a1305",
-"c. c #2b1304",
-"bJ c #2b1405",
-".8 c #2c591e",
-"cu c #2d1606",
-".9 c #2d5a1f",
-"bZ c #2e1706",
-"cD c #2e1806",
-"#h c #2e5b21",
-"bz c #2f1907",
-"bN c #301a07",
-"dk c #311b07",
-".X c #315e23",
-"cj c #321a07",
-"#e c #325f24",
-"bH c #332011",
-"cT c #341d08",
-"bx c #342011",
-"bG c #342111",
-"bF c #342112",
-".3 c #356227",
-"b9 c #361d09",
-"d. c #361f09",
-"bw c #362213",
-".S c #366328",
-"dl c #371f09",
-"#r c #372312",
-"bu c #382414",
-"bt c #382415",
-"bh c #392515",
-"#g c #39672c",
-"bK c #3a1c07",
-"b0 c #3a200a",
-"bv c #3b2515",
-"#s c #3b2614",
-"bW c #3c200a",
-"bp c #3c220b",
-"cL c #3c230c",
-"#I c #3c2715",
-"#t c #3d2715",
-".J c #3d6a2f",
-"a4 c #3e2817",
-".W c #3e6b30",
-".g c #3e6c31",
-"bU c #3f200a",
-"dj c #3f240b",
-"cM c #3f240c",
-"bO c #40240c",
-"ck c #40250c",
-"ch c #40250e",
-"aZ c #402917",
-"#u c #402a17",
-".7 c #406e32",
-"bT c #41220c",
-".j c #416f33",
-"#f c #426f34",
-".v c #427034",
-"bB c #43270d",
-"c5 c #43270e",
-"at c #432b18",
-"#F c #442b18",
-"ab c #442c19",
-"br c #45240c",
-"cE c #45280e",
-".h c #457236",
-"ba c #46280e",
-"c# c #462a0e",
-"bd c #462d1b",
-"bg c #462e1b",
-".4 c #467338",
-"be c #482f1b",
-"cR c #492b0e",
-"dg c #492b10",
-"cK c #492c11",
-"aP c #492f1b",
-".u c #49773b",
-"ci c #4a2409",
-"cv c #4a2b0f",
-"de c #4a2d11",
-"c9 c #4a2e12",
-"bL c #4b250a",
-"bq c #4b2d11",
-".G c #4b793d",
-"bf c #4c311d",
-"bM c #4d260a",
-"af c #4d331d",
-".I c #4d7b3f",
-"bs c #4e270b",
-"di c #4e2e11",
-".F c #4e7b40",
-"bX c #50270b",
-"dc c #503012",
-"#H c #50341e",
-".i c #507e42",
-"b1 c #513214",
-"bS c #513319",
-"cY c #523213",
-"ct c #532c0d",
-"cq c #533415",
-".T c #538045",
-"#Y c #543721",
-"dd c #55310f",
-"c3 c #553414",
-"d# c #553516",
-".6 c #558446",
-"b8 c #563515",
-".V c #568648",
-"cQ c #573515",
-"cU c #573615",
-"cN c #583817",
-"cr c #583818",
-"a0 c #583a22",
-"dh c #593410",
-".t c #59884b",
-"cg c #5a3817",
-"b7 c #5a3819",
-"bR c #5a3a1b",
-"bV c #5b3312",
-"a3 c #5b3d24",
-"ca c #5c3b19",
-"#V c #5c3c23",
-".H c #5c8b4d",
-"db c #5d3c1a",
-"bD c #5e3513",
-"cF c #5e3b19",
-"c0 c #5f3813",
-"cZ c #5f3a18",
-"bb c #5f7088",
-"ac c #603f26",
-"bP c #613d1b",
-".C c #619053",
-".q c #619153",
-"aO c #624127",
-"cs c #633e1c",
-"#q c #63554a",
-"c6 c #64411d",
-"c8 c #64411e",
-"#G c #644228",
-"bc c #64748b",
-"cB c #65411c",
-"a1 c #674529",
-".R c #679559",
-".5 c #68955a",
-"aL c #69788d",
-"cA c #6a4621",
-"ad c #6a4629",
-"aM c #6a472b",
-"b3 c #6b4824",
-"#d c #6b5d52",
-"b2 c #6c4621",
-"#p c #6c5e53",
-"cS c #6d4218",
-"cl c #6d471f",
-"ce c #6d4823",
-"c1 c #6d4924",
-"cH c #6f4e2a",
-".U c #6f9f60",
-"bn c #723c50",
-"a2 c #724d2e",
-"aN c #724d2f",
-"#E c #726459",
-"#8 c #733c50",
-"c4 c #73481d",
-"cO c #734d25",
-"au c #734d2f",
-"cf c #734e25",
-".Q c #73a265",
-".r c #74a366",
-"aG c #753d52",
-"aY c #758194",
-"ao c #763f53",
-"as c #768294",
-"aX c #773e53",
-".2 c #77695e",
-"c7 c #78522b",
-".s c #78a66a",
-"by c #7a4055",
-"cV c #7a5328",
-"aw c #7c5232",
-"bm c #7d4459",
-"cP c #7d562e",
-"cX c #7d572e",
-"cn c #7d582f",
-".D c #7dac6e",
-"df c #7e4f21",
-"#U c #7e8999",
-"bi c #81455b",
-"cJ c #815122",
-"cC c #815526",
-"#P c #82455c",
-"aW c #82485d",
-"b4 c #825b32",
-"c2 c #84592a",
-"cx c #846138",
-"b. c #85495f",
-"bl c #854a60",
-"da c #866035",
-".d c #876864",
-"cd c #886337",
-".B c #887a6f",
-"aJ c #88919f",
-"a5 c #894f64",
-"#a c #896463",
-"aK c #89929f",
-"bj c #8a4f64",
-"#k c #8a4f65",
-"bC c #8a5a2c",
-".L c #8a736c",
-"aa c #8a92a0",
-"bk c #8b5268",
-"b6 c #8b5e30",
-"cW c #8b6235",
-"#z c #8c4f66",
-"aQ c #8c5066",
-"#7 c #8c5167",
-"#W c #8c5d38",
-"#c c #8c776f",
-"ax c #8e5269",
-"#Z c #8e5469",
-".# c #8e8177",
-"aF c #8f556a",
-".P c #8f6766",
-"cc c #8f683d",
-".o c #8f6f6b",
-"## c #8f97a3",
-"#O c #90536a",
-"#X c #90613a",
-".y c #906766",
-"ap c #9098a3",
-"ag c #91556c",
-".a c #91776f",
-"av c #92623b",
-"an c #93586e",
-"ae c #94633b",
-".l c #947e75",
-"#j c #965870",
-".Y c #96877c",
-"cw c #976833",
-".M c #978a80",
-"#9 c #979ea7",
-"ar c #979fa8",
-".1 c #996f6e",
-".E c #99c78a",
-"#J c #9b5c73",
-"bQ c #9b6b38",
-"b5 c #9b6e3d",
-"#x c #9c5d75",
-"aS c #9e6077",
-"#5 c #9e6078",
-"co c #9e7749",
-"#Q c #9ea4ab",
-"#D c #9ea4ac",
-"#R c #9ea6b0",
-"cp c #9f723d",
-"aC c #a0627a",
-"cb c #a0723e",
-"ay c #a16178",
-"cz c #a1743f",
-"aq c #a1a5ad",
-"#6 c #a2627a",
-"#y c #a3627a",
-"cI c #a3753f",
-"#o c #a3a8ae",
-"#i c #a4637b",
-"ah c #a4647c",
-"#N c #a4657d",
-"aR c #a7667e",
-"#n c #a8aeb5",
-"a6 c #a96f85",
-"a8 c #ab6982",
-"cm c #ab7e48",
-"a# c #acaeb4",
-"a7 c #ad7088",
-"#. c #adb0b4",
-"a9 c #ae6c85",
-".Z c #ae8a85",
-"#A c #aeb2b6",
-"#0 c #af6d86",
-"aT c #af6e87",
-"cy c #af834f",
-"am c #b06e87",
-"ai c #b0738a",
-".m c #b28280",
-"cG c #b48b57",
-".b c #b4aaa3",
-"#T c #b4b6b9",
-"aE c #b5758d",
-"#w c #b5768d",
-".c c #b58d89",
-"aV c #b6778f",
-"#l c #b9bcbe",
-"#K c #bb7993",
-"a. c #bbbcbd",
-"aU c #bc7a94",
-"aB c #be7c95",
-"#S c #bec2c6",
-"#v c #bf7c96",
-"az c #bf7d97",
-"#1 c #c1849b",
-"aD c #c2819a",
-"#b c #c3908c",
-"#4 c #c4849c",
-".A c #c5beb9",
-"#M c #c689a0",
-"al c #c7859f",
-".O c #cabeb9",
-".N c #cbc7c3",
-"aA c #cc8ca4",
-".n c #cc9594",
-".z c #cfaeab",
-"#m c #cfcfcf",
-"#B c #d0d1d3",
-"#L c #d599ae",
-".0 c #d69594",
-"ak c #d79ab1",
-"aj c #db9fb4",
-"#3 c #dba0b6",
-"#C c #dbdbdb",
-"#2 c #e1aabf",
-"QtQtQtQtQtQtQtQt.#.aQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQt.#.b.c.d.e.fQt.g.h.i.j.k.fQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQt.l.m.n.o.p.k.q.r.s.t.u.v.w.fQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQt.x.y.z.A.B.C.D.E.F.G.H.I.J.w.fQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQt.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.w.fQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQt.x.Y.Z.0.1.2.3.4.5.6.7.8.9.p.kQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQt#.###a#b#c#d#e#f#g#h#i#i#j#k.e.fQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQt#l#m#n#o#p#q#r#s#t#u#i#v#w#x#y#z.w.fQtQtQtQtQtQtQt",
-"QtQtQtQtQtQt#A#B#C#m#D#E#F#G#H#I#J#K#L#M#N#O#j#P.w.fQtQtQtQtQtQt",
-"QtQtQtQtQtQt#Q#R#S#T#U#V#W#X#Y#Z#0#1#2#3#4#5#6#7#8.w.fQtQtQtQtQt",
-"QtQtQtQtQtQt#9a.a#aaabacadaeafagahaiajakal#vamanao.p.kQtQtQtQtQt",
-"QtQtQtQtQtQtapaqarasatauavaw#uaxayazaAaBaCaDaEaFaGaHaIQtQtQtQtQt",
-"QtQtQtQtQtQt.xaJaKaLataMaNaOaPaQaRaSaTaUaTaVaEaWaXaHaIQtQtQtQtQt",
-"QtQtQtQtQtQt.K.waYaLaZa0a1a2a3a4a5a6a7a8a9#Nb.aXb#.p.kQtQtQtQtQt",
-"QtQtQtQtQtQtQt.Kbabbbcbdbebfbga4bhbibjbkblbmbnb#bo.w.fQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtbpbqbrbsbhbtbubvbwbxaXaXaXbybzbA.e.fQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQt.xbBbCbDbEbFbGbHbHbIbJbKbLbMbNaHaIQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQt.KbObPbQbRbSbTbUbVbWbXbYbIbZb#.p.kQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtb0b1b2b3b4b5b6b7b8b9c.bMbzbA.e.fQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQt.xc#cacbcccdcecfcgchbKcicjaHaIQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQt.Kckclcmcncocpcqcrcsctcub#.p.kQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQt.xcvcwcxcyczcAcBcCctcDbA.e.fQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQt.KcEcFcGcHcIcFcJcKcLbNaHaIQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtcMcNcOcPcAcQcRcScTb#.p.kQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQt.xcUcVcWcXcYcZc0bNbA.e.fQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQt.Kbqcwc1c2c3c4bNb#.p.kQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtc5c6c7c8bac9d.bA.e.fQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQt.xd#dadbdcddcTaHaIQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQt.KdedfdgdhbNb#.p.kQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQt.xdidjdkdlbA.e.fQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQt.K.wdmdnaHdo.kQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQt.K.xdpaI.k.fQtQtQtQtQtQtQtQtQtQtQtQt"};
Added: packages/trunk/nikwi/debian/patches/reproducible_build.patch
===================================================================
--- packages/trunk/nikwi/debian/patches/reproducible_build.patch (rev 0)
+++ packages/trunk/nikwi/debian/patches/reproducible_build.patch 2017-07-30 22:25:42 UTC (rev 15992)
@@ -0,0 +1,49 @@
+Description: Make the build reproducible
+Author: Chris Lamb <lamby at debian.org>
+Last-Update: 2016-08-27
+
+--- nikwi-0.0.20120213.orig/src/tools/upack/upack.c
++++ nikwi-0.0.20120213/src/tools/upack/upack.c
+@@ -159,9 +159,9 @@ static void packFile(char *filename, cha
+
+ static void scanDirectory(char *dirname, char *path)
+ {
+- DIR *dir;
++ int n;
+ char *spath;
+- struct dirent *de;
++ struct dirent *de, **namelist;
+ if (chdir(dirname))
+ return;
+
+@@ -170,15 +170,15 @@ static void scanDirectory(char *dirname,
+ sprintf(spath, "%s/%s", path, dirname);
+ else
+ sprintf(spath, "%s", dirname);
+- dir = opendir(".");
+- if (!dir)
+- {
++ n = scandir(".", &namelist, 0, alphasort);
++ if (n < 0) {
+ chdir("..");
+ printf("cannot open `%s'\n", dirname);
+ return;
+ }
+- while ((de = readdir(dir)))
++ while (n--)
+ {
++ de = namelist[n];
+ if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, ".."))
+ continue;
+ if (chdir(de->d_name))
+@@ -199,8 +199,9 @@ static void scanDirectory(char *dirname,
+ }
+ scanDirectory(de->d_name, spath);
+ }
++ free(de);
+ }
+- closedir(dir);
++ free(namelist);
+
+ free(spath);
+ chdir("..");
Modified: packages/trunk/nikwi/debian/patches/series
===================================================================
--- packages/trunk/nikwi/debian/patches/series 2017-07-27 00:23:24 UTC (rev 15991)
+++ packages/trunk/nikwi/debian/patches/series 2017-07-30 22:25:42 UTC (rev 15992)
@@ -4,3 +4,4 @@
slashfx_main.patch
uscript_type.patch
big-endian.patch
+reproducible_build.patch
Modified: packages/trunk/nikwi/debian/rules
===================================================================
--- packages/trunk/nikwi/debian/rules 2017-07-27 00:23:24 UTC (rev 15991)
+++ packages/trunk/nikwi/debian/rules 2017-07-30 22:25:42 UTC (rev 15992)
@@ -56,7 +56,7 @@
dh_prep -a
dh_installdirs -a
dh_install -a src/nikwi/nikwi usr/games
- dh_install -a debian/nikwi.xpm usr/share/pixmaps
+ dh_install -a debian/nikwi.png usr/share/icons/hicolor/64x64/apps
dh_install -a debian/nikwi.desktop usr/share/applications
dh_install -a manual usr/share/doc/nikwi
find . -type d -empty -delete
Added: packages/trunk/nikwi/debian/source/include-binaries
===================================================================
--- packages/trunk/nikwi/debian/source/include-binaries (rev 0)
+++ packages/trunk/nikwi/debian/source/include-binaries 2017-07-30 22:25:42 UTC (rev 15992)
@@ -0,0 +1 @@
+debian/nikwi.png
More information about the Pkg-games-commits
mailing list