Author: miriam Date: 2013-09-13 17:56:41 +0000 (Fri, 13 Sep 2013) New Revision: 14561
Added: packages/trunk/nikwi/debian/source/ packages/trunk/nikwi/debian/source/format packages/trunk/nikwi/debian/source/options Modified: packages/trunk/nikwi/debian/changelog packages/trunk/nikwi/debian/compat packages/trunk/nikwi/debian/control packages/trunk/nikwi/debian/copyright packages/trunk/nikwi/debian/patches/makefiles.patch packages/trunk/nikwi/debian/patches/nikwideluxe_makedata.patch packages/trunk/nikwi/debian/patches/nikwideluxe_nikio.patch packages/trunk/nikwi/debian/patches/nikwideluxe_rdtsc.patch packages/trunk/nikwi/debian/patches/series packages/trunk/nikwi/debian/patches/slashfx_main.patch packages/trunk/nikwi/debian/patches/uscript_type.patch packages/trunk/nikwi/debian/rules Log: New upstream release, obtained from git, and polishing the package a bit Modified: packages/trunk/nikwi/debian/changelog =================================================================== --- packages/trunk/nikwi/debian/changelog 2013-09-13 15:36:17 UTC (rev 14560) +++ packages/trunk/nikwi/debian/changelog 2013-09-13 17:56:41 UTC (rev 14561) @@ -1,9 +1,19 @@ -nikwi (0.0.20060823-3) UNRELEASED; urgency=low +nikwi (0.0.20120213-1) UNRELEASED; urgency=low + [ Evgeni Golov ] * Correct Vcs-* URLs to point to anonscm.debian.org - -- Evgeni Golov <[email protected]> Mon, 15 Jul 2013 22:21:49 +0200 + [ Miriam Ruiz ] + * New upstream release, obtained from https://github.com/badsector/nikwi + * Changed URLs in debian/control and debian/copyright + * Changed my email to [email protected] + * Added armhf to Architecture list. Closes: #645664 + * Upgraded Standards-Version from 3.8.1 to + * Upgraded compat level to 9 + * Upgraded package source format to 3.0 + -- Miriam Ruiz <[email protected]> Fri, 13 Sep 2013 17:41:13 +0200 + nikwi (0.0.20060823-2) unstable; urgency=low [ Miriam Ruiz ] Modified: packages/trunk/nikwi/debian/compat =================================================================== --- packages/trunk/nikwi/debian/compat 2013-09-13 15:36:17 UTC (rev 14560) +++ packages/trunk/nikwi/debian/compat 2013-09-13 17:56:41 UTC (rev 14561) @@ -1 +1 @@ -5 +9 Modified: packages/trunk/nikwi/debian/control =================================================================== --- packages/trunk/nikwi/debian/control 2013-09-13 15:36:17 UTC (rev 14560) +++ packages/trunk/nikwi/debian/control 2013-09-13 17:56:41 UTC (rev 14561) @@ -2,15 +2,15 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> -Uploaders: Miriam Ruiz <[email protected]>, Sam Hocevar <[email protected]>, Barry deFreese <[email protected]> -Build-Depends: debhelper (>= 5), quilt, libsdl1.2-dev -Standards-Version: 3.8.1 +Uploaders: Miriam Ruiz <[email protected]>, Sam Hocevar <[email protected]>, Barry deFreese <[email protected]> +Build-Depends: debhelper (>= 9), quilt, libsdl1.2-dev +Standards-Version: 3.9.4 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/nikwi/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/nikwi/ -Homepage: http://www.badsectoracula.com/games/nikwi/ +Homepage: http://badsector.github.io/nikwi/Nikwi_Deluxe/ Package: nikwi -Architecture: i386 alpha amd64 arm armel kfreebsd-i386 kfreebsd-amd64 hurd-i386 ia64 mipsel +Architecture: i386 alpha amd64 arm armel armhf kfreebsd-i386 kfreebsd-amd64 hurd-i386 ia64 mipsel Depends: nikwi-data (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Description: platform game where your goal is to collect candies You play the role of a 9 year old boy in his absolute dream: a world made Modified: packages/trunk/nikwi/debian/copyright =================================================================== --- packages/trunk/nikwi/debian/copyright 2013-09-13 15:36:17 UTC (rev 14560) +++ packages/trunk/nikwi/debian/copyright 2013-09-13 17:56:41 UTC (rev 14561) @@ -1,7 +1,7 @@ This package was debianized by Miriam Ruiz <[email protected]> on Thu, 28 Sep 2006 01:03:05 +0200. -It was downloaded from http://www.slashstone.com/more/nikwi +It was downloaded from https://github.com/badsector/nikwi Upstream Author: Kostas "Bad Sector" Michalopoulos <[email protected]> Modified: packages/trunk/nikwi/debian/patches/makefiles.patch =================================================================== --- packages/trunk/nikwi/debian/patches/makefiles.patch 2013-09-13 15:36:17 UTC (rev 14560) +++ packages/trunk/nikwi/debian/patches/makefiles.patch 2013-09-13 17:56:41 UTC (rev 14561) @@ -1,7 +1,8 @@ -diff -ruN srcdist.orig/Makefile.debian srcdist/Makefile.debian ---- srcdist.orig/Makefile.debian 1970-01-01 01:00:00.000000000 +0100 -+++ srcdist/Makefile.debian 2006-09-28 05:43:33.000000000 +0200 -@@ -0,0 +1,35 @@ +Index: nikwi-0.0.20120213/src/Makefile.debian +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ nikwi-0.0.20120213/src/Makefile.debian 2013-09-13 19:14:37.789028109 +0200 +@@ -0,0 +1,33 @@ +SLASHFX = slashfx/libslashfx.a +ADDCFG = badcfg/libbadcfg.a +SLASHTDP = slashtdp/libslashtdp.a @@ -9,10 +10,10 @@ + +CFLAGS = -Wall -O2 + -+all: nikwideluxe/nikwi ++all: nikwi/nikwi + -+nikwideluxe/nikwi: $(SLASHFX) $(ADDCFG) $(SLASHTDP) $(USCRIPT) -+ cd nikwideluxe; make -f Makefile.debian CFLAGS="$(CFLAGS)" ++nikwi/nikwi: $(SLASHFX) $(ADDCFG) $(SLASHTDP) $(USCRIPT) ++ cd nikwi; make -f Makefile.debian CFLAGS="$(CFLAGS)" + +$(SLASHFX): + cd slashfx; make -f Makefile.debian CFLAGS="$(CFLAGS)" @@ -26,20 +27,19 @@ +$(USCRIPT): + cd us; make -f Makefile.debian CFLAGS="$(CFLAGS)" + -+data: -+ cd nikwideluxe; make justdata.up -f Makefile.debian CFLAGS="$(CFLAGS)" -+ +clean: -+ cd nikwideluxe; make clean -f Makefile.debian -+ cd slashfx; make clean -f Makefile.debian -+ cd badcfg; make clean -f Makefile.debian -+ cd slashtdp; make clean -f Makefile.debian -+ cd us; make clean -f Makefile.debian ++ cd nikwi; make clean -f Makefile.debian ++ cd slashfx; make clean -f Makefile.debian ++ cd badcfg; make clean -f Makefile.debian ++ cd slashtdp; make clean -f Makefile.debian ++ cd us; make clean -f Makefile.debian ++ cd tools; make -f Makefile.debian clean + -rm -rf `find . -name "*.o"` + -rm -rf `find . -name "*.a"` -diff -ruN srcdist.orig/badcfg/Makefile.debian srcdist/badcfg/Makefile.debian ---- srcdist.orig/badcfg/Makefile.debian 1970-01-01 01:00:00.000000000 +0100 -+++ srcdist/badcfg/Makefile.debian 2006-09-28 05:43:33.000000000 +0200 +Index: nikwi-0.0.20120213/src/badcfg/Makefile.debian +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ nikwi-0.0.20120213/src/badcfg/Makefile.debian 2013-09-13 19:09:50.000000000 +0200 @@ -0,0 +1,25 @@ +OUTPUT = libbadcfg.a +CC = g++ @@ -47,47 +47,48 @@ +CFLAGS = -g3 -O3 -mfpmath=sse -msse -Wall +LDFLAGS = + -+CALLCC = $(CC) $(CFLAGS) -Iinclude ++CALLCC = $(CC) $(CFLAGS) -I. + +CC = gcc +AR = ar + -+$(OUTPUT): src/main.o ++$(OUTPUT): main.o + rm -f $(OUTPUT) -+ $(AR) rcs $(OUTPUT) src/main.o ++ $(AR) rcs $(OUTPUT) main.o + -+src/main.o: src/main.c include/badcfg.h -+ $(CALLCC) -c src/main.c -o src/main.o ++main.o: main.c badcfg.h ++ $(CALLCC) -c main.c -o main.o + +clean: -+ rm -f src/main.o ++ rm -f main.o + +distclean: clean + rm -f $(OUTPUT) + +.PHONY: clean distclean -diff -ruN srcdist.orig/nikwideluxe/Makefile.debian srcdist/nikwideluxe/Makefile.debian ---- srcdist.orig/nikwideluxe/Makefile.debian 1970-01-01 01:00:00.000000000 +0100 -+++ srcdist/nikwideluxe/Makefile.debian 2006-09-28 15:20:59.000000000 +0200 -@@ -0,0 +1,53 @@ +Index: nikwi-0.0.20120213/src/nikwi/Makefile.debian +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ nikwi-0.0.20120213/src/nikwi/Makefile.debian 2013-09-13 19:13:07.145028226 +0200 +@@ -0,0 +1,47 @@ +OUTPUT = nikwi +CC = g++ +LD = g++ +CFLAGS = -Wall -g3 -DDATADIR="\".\"" +CPPFLAGS = -+INCLUDES = -I../us/include -I../badcfg/include -I../slashtdp/include -I../slashfx/include ++INCLUDES = -I../us -I../badcfg -I../slashtdp -I../slashfx +LDFLAGS = -O +LIBS = -lSDL -L../us -L../badcfg -L../slashtdp -L../slashfx -luscript -lbadcfg -lslashtdp -lslashfx + +CC = g++ +AR = ar + -+OBJECTS = src/main.o src/gfx.o src/sprites.o src/nikio.o src/utils.o src/tiles.o \ -+ src/world.o src/objects.o src/motion.o src/screens.o src/editor.o src/game.o \ -+ src/menu.o src/imageScreen.o src/transitions.o src/ending.o src/sound.o -+HEADERS = src/nikwi.h src/gfx.h src/sprites.h src/nikio.h src/utils.h src/tiles.h \ -+ src/world.h src/objects.h src/motion.h src/screens.h src/editor.h src/game.h \ -+ src/menu.h src/imageScreen.h src/transitions.h src/ending.h src/sound.h ++OBJECTS = main.o gfx.o sprites.o nikio.o utils.o tiles.o \ ++ world.o objects.o motion.o screens.o editor.o game.o \ ++ menu.o imageScreen.o transitions.o ending.o sound.o ++HEADERS = nikwi.h gfx.h sprites.h nikio.h utils.h tiles.h \ ++ world.h objects.h motion.h screens.h editor.h game.h \ ++ menu.h imageScreen.h transitions.h ending.h sound.h + +$(OUTPUT): $(OBJECTS) + rm -f $(OUTPUT) @@ -107,13 +108,7 @@ +.S.o : + $(CC) $(ASMFLAGS) -c $< -o $@ + -+justdata.up: -+ cd tools; make -f Makefile.debian CFLAGS="$(CFLAGS)" -+ sh makedata.sh -+ sh makepack.sh -+ +clean: -+ cd tools; make -f Makefile.debian clean + rm -f $(OBJECTS) + rm -f justdata.up + rm -f images/tiles/*.ut images/objects/*.ut @@ -123,9 +118,10 @@ + rm -f $(OUTPUT) + +.PHONY: clean distclean -diff -ruN srcdist.orig/nikwideluxe/tools/Makefile.debian srcdist/nikwideluxe/tools/Makefile.debian ---- srcdist.orig/nikwideluxe/tools/Makefile.debian 1970-01-01 01:00:00.000000000 +0100 -+++ srcdist/nikwideluxe/tools/Makefile.debian 2006-09-28 05:43:33.000000000 +0200 +Index: nikwi-0.0.20120213/src/tools/Makefile.debian +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ nikwi-0.0.20120213/src/tools/Makefile.debian 2013-09-13 19:09:50.000000000 +0200 @@ -0,0 +1,13 @@ +all: upack/upack bmp2ut/bmp2ut + @@ -140,9 +136,10 @@ + +clean: + rm -f upack/upack bmp2ut/bmp2ut -diff -ruN srcdist.orig/slashfx/Makefile.debian srcdist/slashfx/Makefile.debian ---- srcdist.orig/slashfx/Makefile.debian 1970-01-01 01:00:00.000000000 +0100 -+++ srcdist/slashfx/Makefile.debian 2006-09-28 05:43:33.000000000 +0200 +Index: nikwi-0.0.20120213/src/slashfx/Makefile.debian +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ nikwi-0.0.20120213/src/slashfx/Makefile.debian 2013-09-13 19:09:50.000000000 +0200 @@ -0,0 +1,25 @@ +OUTPUT = libslashfx.a +CC = g++ @@ -150,28 +147,29 @@ +CFLAGS = -g3 -O3 -mfpmath=sse -msse -Wall +LDFLAGS = + -+CALLCC = $(CC) $(CFLAGS) -Iinclude ++CALLCC = $(CC) $(CFLAGS) -I. + +CC = gcc +AR = ar + -+$(OUTPUT): src/main.o ++$(OUTPUT): main.o + rm -f $(OUTPUT) -+ $(AR) rcs $(OUTPUT) src/main.o ++ $(AR) rcs $(OUTPUT) main.o + -+src/main.o: src/main.c include/slashfx.h -+ $(CALLCC) -c src/main.c -o src/main.o ++main.o: main.c slashfx.h ++ $(CALLCC) -c main.c -o main.o + +clean: -+ rm -f src/main.o ++ rm -f main.o + +distclean: clean + rm -f $(OUTPUT) + +.PHONY: clean distclean -diff -ruN srcdist.orig/slashtdp/Makefile.debian srcdist/slashtdp/Makefile.debian ---- srcdist.orig/slashtdp/Makefile.debian 1970-01-01 01:00:00.000000000 +0100 -+++ srcdist/slashtdp/Makefile.debian 2006-09-28 05:43:33.000000000 +0200 +Index: nikwi-0.0.20120213/src/slashtdp/Makefile.debian +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ nikwi-0.0.20120213/src/slashtdp/Makefile.debian 2013-09-13 19:09:50.000000000 +0200 @@ -0,0 +1,38 @@ +OUTPUT = libslashtdp.a +CC = g++ @@ -183,8 +181,8 @@ +CC = g++ +AR = ar + -+OBJECTS = src/body.o src/world.o -+HEADERS = include/slashtdp/slashtdp.h ++OBJECTS = body.o world.o ++HEADERS = slashtdp/slashtdp.h + +$(OUTPUT): $(OBJECTS) + rm -f $(OUTPUT) @@ -198,7 +196,7 @@ + +# object from C++ (.cc, .cpp, .C files) +.cc.o .cpp.o .C.o : $< $(HEADERS) -+ $(CC) -Iinclude $(CFLAGS) $(CPPFLAGS) -c $< -o $@ ++ $(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + +# object from asm +.S.o : @@ -211,9 +209,10 @@ + rm -f $(OUTPUT) + +.PHONY: clean distclean -diff -ruN srcdist.orig/us/Makefile.debian srcdist/us/Makefile.debian ---- srcdist.orig/us/Makefile.debian 1970-01-01 01:00:00.000000000 +0100 -+++ srcdist/us/Makefile.debian 2006-09-28 05:43:33.000000000 +0200 +Index: nikwi-0.0.20120213/src/us/Makefile.debian +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ nikwi-0.0.20120213/src/us/Makefile.debian 2013-09-13 19:09:50.000000000 +0200 @@ -0,0 +1,38 @@ +OUTPUT = libuscript.a +CC = g++ @@ -225,8 +224,8 @@ +CC = g++ +AR = ar + -+OBJECTS = src/uscript.o src/bytecode.o src/script.o src/compiler.o src/vm.o src/type.o src/funcs.o src/consts.o -+HEADERS = include/uscript/uscript.h include/uscript/bytecode.h include/uscript/script.h include/uscript/compiler.h include/uscript/vm.h include/uscript/type.h include/uscript/funcs.h include/uscript/consts.h ++OBJECTS = uscript.o bytecode.o script.o compiler.o vm.o type.o funcs.o consts.o ++HEADERS = uscript/uscript.h uscript/bytecode.h uscript/script.h uscript/compiler.h uscript/vm.h uscript/type.h uscript/funcs.h uscript/consts.h + +$(OUTPUT): $(OBJECTS) + rm -f $(OUTPUT) @@ -236,11 +235,11 @@ + +# object from C +.c.o : $< $(HEADERS) -+ $(CC) -Iinclude $(CFLAGS) -c $< -o $@ ++ $(CC) -I. $(CFLAGS) -c $< -o $@ + +# object from C++ (.cc, .cpp, .C files) +.cc.o .cpp.o .C.o : $< $(HEADERS) -+ $(CC) -Iinclude $(CFLAGS) $(CPPFLAGS) -c $< -o $@ ++ $(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + +# object from asm +.S.o : @@ -253,9 +252,10 @@ + rm -f $(OUTPUT) + +.PHONY: clean distclean -diff -ruN srcdist.orig/slashtdp/demo/Makefile.debian srcdist/slashtdp/demo/Makefile.debian ---- srcdist.orig/slashtdp/demo/Makefile.debian 1970-01-01 01:00:00.000000000 +0100 -+++ srcdist/slashtdp/demo/Makefile.debian 2006-10-07 18:37:16.000000000 +0200 +Index: nikwi-0.0.20120213/src/slashtdp/demo/Makefile.debian +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ nikwi-0.0.20120213/src/slashtdp/demo/Makefile.debian 2013-09-13 19:09:50.000000000 +0200 @@ -0,0 +1,40 @@ +OUTPUT = demo +CC = g++ Modified: packages/trunk/nikwi/debian/patches/nikwideluxe_makedata.patch =================================================================== --- packages/trunk/nikwi/debian/patches/nikwideluxe_makedata.patch 2013-09-13 15:36:17 UTC (rev 14560) +++ packages/trunk/nikwi/debian/patches/nikwideluxe_makedata.patch 2013-09-13 17:56:41 UTC (rev 14561) @@ -1,15 +1,14 @@ -diff -ruN srcdist.orig/nikwideluxe/makedata.sh srcdist/nikwideluxe/makedata.sh ---- srcdist.orig/nikwideluxe/makedata.sh 2006-08-23 19:35:35.000000000 +0200 -+++ srcdist/nikwideluxe/makedata.sh 2006-09-28 05:43:33.000000000 +0200 -@@ -17,6 +17,8 @@ +Index: nikwi-0.0.20120213/makedata.sh +=================================================================== +--- nikwi-0.0.20120213.orig/makedata.sh 2013-09-13 18:16:43.293032606 +0200 ++++ nikwi-0.0.20120213/makedata.sh 2013-09-13 18:16:43.285032606 +0200 +@@ -20,6 +20,9 @@ done; +test -d data/tiles || mkdir data/tiles mv images/tiles/*.ut data/tiles --mv images/objects/*.ut data/objects - ++ +test -d data/objects || mkdir data/objects -+mv images/objects/*.ut data/objects -Binary files srcdist.orig/nikwideluxe/nikwi and srcdist/nikwideluxe/nikwi differ -diff -ruN srcdist.orig/nikwideluxe/src/nikio.cpp srcdist/nikwideluxe/src/nikio.cpp + mv images/objects/*.ut data/objects + Modified: packages/trunk/nikwi/debian/patches/nikwideluxe_nikio.patch =================================================================== --- packages/trunk/nikwi/debian/patches/nikwideluxe_nikio.patch 2013-09-13 15:36:17 UTC (rev 14560) +++ packages/trunk/nikwi/debian/patches/nikwideluxe_nikio.patch 2013-09-13 17:56:41 UTC (rev 14561) @@ -1,7 +1,8 @@ -diff -ruN srcdist.orig/nikwideluxe/src/nikio.cpp srcdist/nikwideluxe/src/nikio.cpp ---- srcdist.orig/nikwideluxe/src/nikio.cpp 2006-08-23 19:17:53.000000000 +0200 -+++ srcdist/nikwideluxe/src/nikio.cpp 2006-09-28 15:20:10.000000000 +0200 -@@ -26,6 +26,10 @@ +Index: nikwi-0.0.20120213/src/nikwi/nikio.cpp +=================================================================== +--- nikwi-0.0.20120213.orig/src/nikwi/nikio.cpp 2013-09-13 18:17:02.613032581 +0200 ++++ nikwi-0.0.20120213/src/nikwi/nikio.cpp 2013-09-13 18:17:02.605032581 +0200 +@@ -27,6 +27,10 @@ #include "nikwi.h" @@ -12,7 +13,7 @@ struct PackEntry { String name; -@@ -41,12 +45,12 @@ +@@ -42,12 +46,12 @@ void initNikIO() { FILE *f; Modified: packages/trunk/nikwi/debian/patches/nikwideluxe_rdtsc.patch =================================================================== --- packages/trunk/nikwi/debian/patches/nikwideluxe_rdtsc.patch 2013-09-13 15:36:17 UTC (rev 14560) +++ packages/trunk/nikwi/debian/patches/nikwideluxe_rdtsc.patch 2013-09-13 17:56:41 UTC (rev 14561) @@ -1,6 +1,6 @@ -diff -ruN srcdist.orig/nikwideluxe/src/main.cpp srcdist/nikwideluxe/src/main.cpp ---- srcdist.orig/nikwideluxe/src/main.cpp 2006-08-23 19:33:17.000000000 +0200 -+++ srcdist/nikwideluxe/src/main.cpp 2006-10-08 20:01:44.000000000 +0200 +diff -ruN src/nikwi/main.cpp src/nikwi/main.cpp +--- src/nikwi/main.cpp 2006-08-23 19:33:17.000000000 +0200 ++++ src/nikwi/main.cpp 2006-10-08 20:01:44.000000000 +0200 @@ -25,36 +25,21 @@ */ Modified: packages/trunk/nikwi/debian/patches/series =================================================================== --- packages/trunk/nikwi/debian/patches/series 2013-09-13 15:36:17 UTC (rev 14560) +++ packages/trunk/nikwi/debian/patches/series 2013-09-13 17:56:41 UTC (rev 14561) @@ -1,6 +1,5 @@ -makefiles.patch -p0 -nikwideluxe_makedata.patch -p0 -nikwideluxe_nikio.patch -p0 -nikwideluxe_rdtsc.patch -p0 -slashfx_main.patch -p0 -uscript_type.patch -p0 +makefiles.patch +nikwideluxe_makedata.patch +nikwideluxe_nikio.patch +slashfx_main.patch +uscript_type.patch Modified: packages/trunk/nikwi/debian/patches/slashfx_main.patch =================================================================== --- packages/trunk/nikwi/debian/patches/slashfx_main.patch 2013-09-13 15:36:17 UTC (rev 14560) +++ packages/trunk/nikwi/debian/patches/slashfx_main.patch 2013-09-13 17:56:41 UTC (rev 14561) @@ -1,7 +1,8 @@ -diff -ruN srcdist.orig/slashfx/src/main.c srcdist/slashfx/src/main.c ---- srcdist.orig/slashfx/src/main.c 2006-08-28 12:58:02.000000000 +0200 -+++ srcdist/slashfx/src/main.c 2006-09-28 05:43:33.000000000 +0200 -@@ -101,8 +101,8 @@ +Index: nikwi-0.0.20120213/src/slashfx/main.c +=================================================================== +--- nikwi-0.0.20120213.orig/src/slashfx/main.c 2013-09-13 18:17:29.101032547 +0200 ++++ nikwi-0.0.20120213/src/slashfx/main.c 2013-09-13 18:17:29.093032547 +0200 +@@ -111,8 +111,8 @@ char version; Effect fx; int i, Fp, Vp, DP, Fnpp, Vnpp, wlength; Modified: packages/trunk/nikwi/debian/patches/uscript_type.patch =================================================================== --- packages/trunk/nikwi/debian/patches/uscript_type.patch 2013-09-13 15:36:17 UTC (rev 14560) +++ packages/trunk/nikwi/debian/patches/uscript_type.patch 2013-09-13 17:56:41 UTC (rev 14561) @@ -1,6 +1,7 @@ -diff -ruN srcdist.orig/us/src/type.cpp srcdist/us/src/type.cpp ---- srcdist.orig/us/src/type.cpp 2005-11-21 12:11:15.000000000 +0100 -+++ srcdist/us/src/type.cpp 2006-09-28 05:43:33.000000000 +0200 +Index: nikwi-0.0.20120213/src/us/type.cpp +=================================================================== +--- nikwi-0.0.20120213.orig/src/us/type.cpp 2013-09-13 18:17:48.673032522 +0200 ++++ nikwi-0.0.20120213/src/us/type.cpp 2013-09-13 18:17:48.665032522 +0200 @@ -69,7 +69,7 @@ //Globals void usInitTypeSubSystem() Modified: packages/trunk/nikwi/debian/rules =================================================================== --- packages/trunk/nikwi/debian/rules 2013-09-13 15:36:17 UTC (rev 14560) +++ packages/trunk/nikwi/debian/rules 2013-09-13 17:56:41 UTC (rev 14561) @@ -3,72 +3,70 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +LDFLAGS2:=-Wl,-z,defs -Wl,-as-needed -Wl,--no-undefined -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - configure: configure-stamp configure-stamp: dh_testdir - tar xvfj nikwideluxe-src.tar.bz2 - tar xvfj libbadcfg-0.1.tar.bz2 - tar xvf slashfx.tar - mv slashfx srcdist/slashfx - mv libbadcfg-0.1 srcdist/badcfg - $(MAKE) -f /usr/share/quilt/quilt.make patch - - cd srcdist; $(MAKE) clean -f Makefile.debian touch $@ build-arch: build-arch-stamp build-arch-stamp: configure-stamp dh_testdir - cd srcdist; $(MAKE) -f Makefile.debian CFLAGS="$(CFLAGS) \ - -DDATADIR=\\\\\\\"/usr/share/games/nikwi\\\\\\\"" + cd src; $(MAKE) -f Makefile.debian \ + CFLAGS="$(CFLAGS) $(CPPFLAGS) -DDATADIR=\\\\\\\"/usr/share/games/nikwi\\\\\\\"" \ + CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS) -DDATADIR=\\\\\\\"/usr/share/games/nikwi\\\\\\\"" \ + LDFLAGS="$(LDFLAGS) $(LDFLAGS2)" touch $@ build-indep: build-indep-stamp build-indep-stamp: configure-stamp dh_testdir - cd srcdist; $(MAKE) data -f Makefile.debian + cd src/tools; make -f Makefile.debian \ + CFLAGS="$(CFLAGS) $(CPPFLAGS) -DDATADIR=\\\\\\\"/usr/share/games/nikwi\\\\\\\"" \ + CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS) -DDATADIR=\\\\\\\"/usr/share/games/nikwi\\\\\\\"" \ + LDFLAGS="$(LDFLAGS) $(LDFLAGS2)" + sh makedata.sh + sh makepack.sh touch $@ build: configure-stamp build-arch-stamp build-indep-stamp -clean: +clean: configure-stamp dh_testdir dh_testroot - rm -f build-indep-stamp build-arch-stamp configure-stamp + rm -fv build-indep-stamp build-arch-stamp configure-stamp + cd src; $(MAKE) clean -f Makefile.debian $(MAKE) -f /usr/share/quilt/quilt.make unpatch + rm -rf data/objects data/tiles + rm -fv src/nikwi/nikwi justdata.up - rm -rf srcdist dh_clean install-arch: build-arch-stamp dh_testdir dh_testroot - dh_clean -a -k + dh_prep -a dh_installdirs -a - dh_install -a srcdist/nikwideluxe/nikwi usr/games + dh_install -a src/nikwi/nikwi usr/games dh_install -a debian/nikwi.xpm usr/share/pixmaps dh_install -a debian/nikwi.desktop usr/share/applications install-indep: build-indep-stamp dh_testdir dh_testroot - dh_clean -i -k + dh_prep -i dh_installdirs -i - dh_install -i srcdist/nikwideluxe/justdata.up usr/share/games/nikwi + dh_install -i justdata.up usr/share/games/nikwi install: build install-arch install-indep @@ -109,16 +107,6 @@ dh_md5sums -i dh_builddeb -i -get-orig-source: - wget http://www.slashstone.com/more/nikwi/nikwideluxe-src.tar.bz2 - wget http://www.slashstone.com/more/libbadcfg/libbadcfg-0.1.tar.bz2 - wget http://www.slashstone.com/more/slashfx/slashfx.tar - mkdir nikwi-0.0.20060823 - mv nikwideluxe-src.tar.bz2 libbadcfg-0.1.tar.bz2 slashfx.tar nikwi-0.0.20060823 - tar cvfz nikwi_0.0.20060823.orig.tar.gz nikwi-0.0.20060823 - rm -rf nikwi-0.0.20060823 - mv nikwi_0.0.20060823.orig.tar.gz .. - binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install install-indep \ install-arch configure get-orig-source Added: packages/trunk/nikwi/debian/source/format =================================================================== --- packages/trunk/nikwi/debian/source/format (rev 0) +++ packages/trunk/nikwi/debian/source/format 2013-09-13 17:56:41 UTC (rev 14561) @@ -0,0 +1 @@ +3.0 (quilt) Added: packages/trunk/nikwi/debian/source/options =================================================================== --- packages/trunk/nikwi/debian/source/options (rev 0) +++ packages/trunk/nikwi/debian/source/options 2013-09-13 17:56:41 UTC (rev 14561) @@ -0,0 +1,5 @@ +# Bzip2 compression for debian.tar +compression = "bzip2" +compression-level = 7 +# Do not generate diff for changes in config.(sub|guess) +extend-diff-ignore = "(^|/)config.(sub|guess)$" _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
