Re: supertuxkart 0.8.1
Hi Bas,
Unfortunately the previous svn diff wasn't building on a clean environment because of a missing libbluetooth-dev.
This new svn diff builds with no problem now.
I hope Vincent will take it and upload it soon :)
I don't want to steal other people work, I would like to upload it, but we should wait for an ack before uploading right?
(does pkg-games follow a less restrictive rule on NMU or team uploads?)
bests,
Gianfranco
> Il Mercoledì 18 Dicembre 2013 15:57, Bas Wijnen <wijnen@debian.org> ha scritto:
> > On Wed, Dec 18, 2013 at 10:39:05AM +0000, Gianfranco Costamagna wrote:
>
>> (I'm only a DM, so I won't be able to push anything without a
> sponsor)
>
> If you need a sponsor, feel free to ping me. I'm quite slow at times,
> so you may require multiple pings though. ;-)
>
> I'd offer to help with the packaging as well, but I have several other
> things I need to do, so I really shouldn't.
>
> Thanks,
> Bas
>
Index: debian/changelog
===================================================================
--- debian/changelog (revision 14685)
+++ debian/changelog (working copy)
@@ -1,9 +1,20 @@
-supertuxkart (0.8-3) UNRELEASED; urgency=low
+supertuxkart (0.8.1-1) unstable; urgency=low
+ * Team upload
+
+ [ Alexander Reichle-Schmehl ]
* Removed myself from uploaders.
- -- Alexander Reichle-Schmehl <tolimar@debian.org> Fri, 18 Oct 2013 17:39:45 +0200
+ [ Gianfranco Costamagna ]
+ * New upstream release, patch refresh
+ * Bumped std-version to 3.9.5, no changes required
+ * Added libbluetooth-dev
+ * Added lib/irrlicht/lib/Linux/libIrrlicht.a
+ to debian/clean target
+ * Moved images from xpm to png, since upstream has changed them
+ -- Gianfranco Costamagna <costamagnagianfranco@yahoo.it> Wed, 18 Dec 2013 14:00:14 +0100
+
supertuxkart (0.8-2) unstable; urgency=low
* Upload to unstable.
Index: debian/control
===================================================================
--- debian/control (revision 14685)
+++ debian/control (working copy)
@@ -23,8 +23,9 @@
libvorbis-dev,
libxxf86vm-dev,
mesa-common-dev,
- zlib1g-dev
-Standards-Version: 3.9.4
+ zlib1g-dev,
+ libbluetooth-dev
+Standards-Version: 3.9.5
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/supertuxkart/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/supertuxkart/
Homepage: http://supertuxkart.sourceforge.net/
Index: debian/patches/build_against_system_enet.patch
===================================================================
--- debian/patches/build_against_system_enet.patch (revision 14685)
+++ debian/patches/build_against_system_enet.patch (working copy)
@@ -5,7 +5,7 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -28,10 +28,6 @@
+@@ -40,10 +40,6 @@
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
@@ -13,10 +13,10 @@
-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
-include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
-
- # Build the Wiiuse library
- if(USE_WIIUSE)
- add_subdirectory("${PROJECT_SOURCE_DIR}/lib/wiiuse")
-@@ -60,6 +56,10 @@
+ # Build the irrlicht library
+ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
+ include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
+@@ -107,6 +103,10 @@
find_package(CURL REQUIRED)
include_directories(${CURL_INCLUDE_DIRS})
@@ -27,16 +27,17 @@
# Fribidi
if(USE_FRIBIDI)
find_package(Fribidi)
-@@ -189,8 +189,8 @@
+@@ -225,9 +225,9 @@
bulletdynamics
bulletcollision
bulletmath
- enet
+ stkirrlicht
${CURL_LIBRARIES}
+ ${ENET_LIBRARIES}
- ${IRRLICHT_LIBRARIES}
${OGGVORBIS_LIBRARIES}
- ${IRRLICHT_LIBRARY}
+ ${IRRLICHT_XF86VM_LIBRARY}
+ ${OPENAL_LIBRARY}
--- /dev/null
+++ b/cmake/FindENet.cmake
@@ -0,0 +1,22 @@
Index: debian/patches/fix_desktop_file.patch
===================================================================
--- debian/patches/fix_desktop_file.patch (revision 14685)
+++ debian/patches/fix_desktop_file.patch (working copy)
@@ -12,11 +12,9 @@
--- a/data/supertuxkart_desktop.template
+++ b/data/supertuxkart_desktop.template
-@@ -1,12 +1,11 @@
- [Desktop Entry]
--Encoding=UTF-8
+@@ -2,10 +2,10 @@
Name=SuperTuxKart
- Icon=@PREFIX@/share/pixmaps/supertuxkart_64.xpm
+ Icon=@PREFIX@/share/pixmaps/supertuxkart_128.png
GenericName=A kart racing game
-GenericName[de_DE]=Ein Kart-Rennspiel
-GenericName[fr_FR]=Un jeu de karting
@@ -25,6 +23,6 @@
GenericName[gl]=Xogo de carreiras con karts
-GenericName[ro_RO]=Un joc de curse cu carturi
+GenericName[ro]=Un joc de curse cu carturi
- Exec=@PREFIX@/games/supertuxkart --log=file
+ Exec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart --no-console
Terminal=false
StartupNotify=false
Index: debian/patches/irrlicht/use-system-libs.diff
===================================================================
--- debian/patches/irrlicht/use-system-libs.diff (revision 14685)
+++ debian/patches/irrlicht/use-system-libs.diff (working copy)
@@ -56,7 +56,7 @@
#undef _IRR_USE_NON_SYSTEM_ZLIB_
-#endif
//! Define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ if you want to read AES-encrypted ZIP archives
- #define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
+ //#define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
#ifdef NO_IRR_COMPILE_WITH_ZIP_ENCRYPTION_
@@ -623,18 +625,12 @@
/** If this is commented out, Irrlicht will try to compile using the bzlib
@@ -69,7 +69,7 @@
//! Define _IRR_COMPILE_WITH_LZMA_ if you want to use LZMA compressed zip files.
/** LZMA is a very efficient compression code, known from 7zip. Irrlicht
currently only supports zip archives, though. */
--#define _IRR_COMPILE_WITH_LZMA_
+-//#define _IRR_COMPILE_WITH_LZMA_
-#ifdef NO_IRR_COMPILE_WITH_LZMA_
#undef _IRR_COMPILE_WITH_LZMA_
#endif
Index: debian/patches/link_against_system_libs.patch
===================================================================
--- debian/patches/link_against_system_libs.patch (revision 14685)
+++ debian/patches/link_against_system_libs.patch (working copy)
@@ -5,8 +5,8 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -196,7 +196,13 @@
- ${IRRLICHT_LIBRARY}
+@@ -231,7 +231,13 @@
+ ${OGGVORBIS_LIBRARIES}
${IRRLICHT_XF86VM_LIBRARY}
${OPENAL_LIBRARY}
- ${OPENGL_LIBRARIES})
@@ -18,5 +18,5 @@
+ bz2
+)
- if(USE_FRIBIDI)
- target_link_libraries(supertuxkart ${FRIBIDI_LIBRARIES})
+ if(APPLE)
+ # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has
Index: debian/rules
===================================================================
--- debian/rules (revision 14685)
+++ debian/rules (working copy)
@@ -11,6 +11,7 @@
override_dh_auto_clean:
$(MAKE) -C lib/irrlicht/source/Irrlicht clean
+ dh_clean lib/irrlicht/lib/Linux/libIrrlicht.a
dh_auto_clean
override_dh_auto_configure:
@@ -46,11 +47,11 @@
install -m 644 $(CURDIR)/debian/tmp/usr/share/games/supertuxkart/data/gui/karts.png \
$(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart.png
mkdir -p $(CURDIR)/debian/tmp/usr/share/icons/hicolor/32x32/apps
- install -m 644 $(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart_32.xpm \
- $(CURDIR)/debian/tmp/usr/share/icons/hicolor/32x32/apps/supertuxkart.xpm
+ install -m 644 $(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart_32.png \
+ $(CURDIR)/debian/tmp/usr/share/icons/hicolor/32x32/apps/supertuxkart.png
mkdir -p $(CURDIR)/debian/tmp/usr/share/icons/hicolor/64x64/apps
- install -m 644 $(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart_64.xpm \
- $(CURDIR)/debian/tmp/usr/share/icons/hicolor/64x64/apps/supertuxkart.xpm
+ install -m 644 $(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart_128.png \
+ $(CURDIR)/debian/tmp/usr/share/icons/hicolor/64x64/apps/supertuxkart.png
dh_install
Reply to: