r14325 - in packages/trunk/kiki-the-nano-bot/debian: . patches source
Peter De Wachter
pdewacht-guest at alioth.debian.org
Mon Jun 24 22:28:04 UTC 2013
Author: pdewacht-guest
Date: 2013-06-24 22:28:03 +0000 (Mon, 24 Jun 2013)
New Revision: 14325
Added:
packages/trunk/kiki-the-nano-bot/debian/source/
packages/trunk/kiki-the-nano-bot/debian/source/format
Modified:
packages/trunk/kiki-the-nano-bot/debian/changelog
packages/trunk/kiki-the-nano-bot/debian/compat
packages/trunk/kiki-the-nano-bot/debian/control
packages/trunk/kiki-the-nano-bot/debian/patches/Makefile.patch
packages/trunk/kiki-the-nano-bot/debian/rules
Log:
kiki-the-nano-bot: packaging cleanup
There's a bunch of new C++ warnings, might want to investigate those.
Modified: packages/trunk/kiki-the-nano-bot/debian/changelog
===================================================================
--- packages/trunk/kiki-the-nano-bot/debian/changelog 2013-06-24 20:00:00 UTC (rev 14324)
+++ packages/trunk/kiki-the-nano-bot/debian/changelog 2013-06-24 22:28:03 UTC (rev 14325)
@@ -1,6 +1,11 @@
kiki-the-nano-bot (1.0.2+dfsg1-5) UNRELEASED; urgency=low
* Fixed FTBFS (incorrect python-config command) (Closes: #713274)
+ * Packaging cleanups
+ - Switch to source format 3
+ - Use build-hardening flags
+ - Switch to debhelper 9
+ * Bumped Standards-Version to 3.9.4.
-- Peter De Wachter <pdewacht at gmail.com> Mon, 24 Jun 2013 21:28:22 +0200
Modified: packages/trunk/kiki-the-nano-bot/debian/compat
===================================================================
--- packages/trunk/kiki-the-nano-bot/debian/compat 2013-06-24 20:00:00 UTC (rev 14324)
+++ packages/trunk/kiki-the-nano-bot/debian/compat 2013-06-24 22:28:03 UTC (rev 14325)
@@ -1 +1 @@
-5
+9
Modified: packages/trunk/kiki-the-nano-bot/debian/control
===================================================================
--- packages/trunk/kiki-the-nano-bot/debian/control 2013-06-24 20:00:00 UTC (rev 14324)
+++ packages/trunk/kiki-the-nano-bot/debian/control 2013-06-24 22:28:03 UTC (rev 14325)
@@ -3,14 +3,14 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Peter De Wachter <pdewacht at gmail.com>
-Build-Depends: debhelper (>= 5), quilt, swig,
+Build-Depends: debhelper (>= 9), swig,
libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, freeglut3-dev,
libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev,
python-dev, vorbis-tools
-Standards-Version: 3.8.3
+Standards-Version: 3.9.4
Homepage: http://kiki.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/kiki-the-nano-bot/
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-games/packages/trunk/kiki-the-nano-bot/
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/kiki-the-nano-bot/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/kiki-the-nano-bot/
Package: kiki-the-nano-bot
Architecture: any
@@ -22,6 +22,9 @@
Package: kiki-the-nano-bot-data
Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Recommends: kiki-the-nano-bot
Description: Kiki the nano bot - game data
Kiki the nano bot is a 3D puzzle game, a mixture of Sokoban and Kula-World.
Your task is to help Kiki, a small robot living in the nano world, repair
Modified: packages/trunk/kiki-the-nano-bot/debian/patches/Makefile.patch
===================================================================
--- packages/trunk/kiki-the-nano-bot/debian/patches/Makefile.patch 2013-06-24 20:00:00 UTC (rev 14324)
+++ packages/trunk/kiki-the-nano-bot/debian/patches/Makefile.patch 2013-06-24 22:28:03 UTC (rev 14325)
@@ -1,12 +1,10 @@
Makefile fixes:
- - Make CXXFLAGS available for user-specified flags.
+ - Make CXXFLAGS, CPPFLAGS, LDFLAGS available for user-specified flags.
- run SWIG before compiling
Peter De Wachter (pdewacht at gmail.com)
placed in the public domain
-Status: in upstream CVS
-
--- a/kodilib/linux/Makefile
+++ b/kodilib/linux/Makefile
@@ -21,7 +21,7 @@
@@ -14,7 +12,7 @@
INCLUDES = $(KODI_INCLUDES) $(X11_INCLUDES) $(SDL_INCLUDES)
-CXXFLAGS = $(INCLUDES) $(SDL_CFLAGS)
-+CXXOPTS = $(INCLUDES) $(SDL_CFLAGS) $(CXXFLAGS)
++CXXOPTS = -Wall $(INCLUDES) $(SDL_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
src = \
$(KODISRCDIR)/handler/KEventHandler.cpp \
@@ -31,7 +29,7 @@
INCLUDES = $(KIKI_INCLUDES) $(X11_INCLUDES) $(PYTHON_INCLUDES)
-CXXFLAGS = $(INCLUDES) $(SDLCFLAGS)
-+CXXOPTS = $(INCLUDES) $(SDLCFLAGS) $(CXXFLAGS)
++CXXOPTS = -Wall $(INCLUDES) $(SDLCFLAGS) $(CPPFLAGS) $(CXXFLAGS)
src = \
$(KIKISRC)/base/KikiAction.cpp \
@@ -41,7 +39,7 @@
kiki: $(KIKISRC)/../SWIG/KikiPy_wrap.cpp $(obj)
- -(cd ../SWIG; swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i; cp kiki.py ../py)
- $(CXX) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)
-+ $(CXX) $(CXXOPTS) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)
++ $(CXX) $(LDFLAGS) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)
+
+$(KIKISRC)/../SWIG/KikiPy_wrap.cpp: $(wildcard ../SWIG/*.i)
+ -(cd ../SWIG && swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i && cp kiki.py ../py)
Modified: packages/trunk/kiki-the-nano-bot/debian/rules
===================================================================
--- packages/trunk/kiki-the-nano-bot/debian/rules 2013-06-24 20:00:00 UTC (rev 14324)
+++ packages/trunk/kiki-the-nano-bot/debian/rules 2013-06-24 22:28:03 UTC (rev 14325)
@@ -3,20 +3,14 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export CFLAGS = -Wall -g $(if $(findstring noopt,$(DEB_BUILD_OPTIONS)), -O0, -O2)
-export CXXFLAGS = $(CFLAGS)
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
-patch: patch-stamp
-patch-stamp:
- dh_testdir
- $(MAKE) -f /usr/share/quilt/quilt.make patch
- touch $@
-
build: build-arch build-indep
build-arch: build-arch-stamp
-build-arch-stamp: patch-stamp
+build-arch-stamp:
dh_testdir
# Add here commands to compile the package.
rm -f SWIG/KikiPy_wrap.cpp #force regeneration of SWIG bindings
@@ -42,7 +36,6 @@
make -C kodilib/linux clean
rm -f py/kiki.py SWIG/kiki.py SWIG/KikiPy_wrap.cpp
rm -f sound/*.ogg
- $(MAKE) -f /usr/share/quilt/quilt.make unpatch
dh_clean
@@ -51,14 +44,14 @@
install-indep: build
dh_testdir
dh_testroot
- dh_clean -k -i
+ dh_prep -i
dh_installdirs -i
dh_install -i
install-arch: build
dh_testdir
dh_testroot
- dh_clean -k -a
+ dh_prep -a
dh_installdirs -a
install linux/kiki debian/kiki-the-nano-bot/usr/games/kiki-the-nano-bot
dh_install -a
Added: packages/trunk/kiki-the-nano-bot/debian/source/format
===================================================================
--- packages/trunk/kiki-the-nano-bot/debian/source/format (rev 0)
+++ packages/trunk/kiki-the-nano-bot/debian/source/format 2013-06-24 22:28:03 UTC (rev 14325)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-games-commits
mailing list