r10255 - in packages/trunk/supertux/debian: . patches
Christoph Egger
christoph-guest at alioth.debian.org
Mon Aug 31 13:36:55 UTC 2009
Author: christoph-guest
Date: 2009-08-31 13:36:54 +0000 (Mon, 31 Aug 2009)
New Revision: 10255
Added:
packages/trunk/supertux/debian/patches/
packages/trunk/supertux/debian/patches/gcc4.3.patch
packages/trunk/supertux/debian/patches/series
packages/trunk/supertux/debian/supertux.dirs
Removed:
packages/trunk/supertux/debian/dirs
Modified:
packages/trunk/supertux/debian/
packages/trunk/supertux/debian/changelog
packages/trunk/supertux/debian/compat
packages/trunk/supertux/debian/control
packages/trunk/supertux/debian/rules
packages/trunk/supertux/debian/supertux-data.install
packages/trunk/supertux/debian/supertux.install
Log:
Some first round of cleanup all over the place
Property changes on: packages/trunk/supertux/debian
___________________________________________________________________
Added: origDir
+ /media/extern/freeart/pkg-games/packages/trunk/tarballs/supertux_0.3.1d.orig.tar.gz
Added: svn-bp:origDir
+ /media/extern/freeart/pkg-games/packages/trunk/tarballs/
Added: origURL
+ /media/extern/freeart/pkg-games/packages/trunk/tarballs/
Modified: packages/trunk/supertux/debian/changelog
===================================================================
--- packages/trunk/supertux/debian/changelog 2009-08-31 06:08:25 UTC (rev 10254)
+++ packages/trunk/supertux/debian/changelog 2009-08-31 13:36:54 UTC (rev 10255)
@@ -1,7 +1,7 @@
-supertux (0.3.0~dfsg-2) UNRELEASED; urgency=low
+supertux (0.3.1d) experimental; urgency=low
- [ Alexander Schmehl ]
- * NOT RELEASED YET
+ * New upstream Release
+ * Adopting by the Debian Games Team (Closes: #535147 )
[ Jon Dowland ]
* update menu section to "Games/Action" for menu policy transition.
@@ -21,8 +21,11 @@
[ Peter De Wachter ]
* Added watch file.
- -- Jon Dowland <jon at alcopop.org> Mon, 03 Dec 2007 17:43:13 +0000
+ [ Christoph Egger ]
+ * Drop Cyril Brulebois from uploaders on his request
+ -- Christoph Egger <debian at christoph-egger.org> Mon, 31 Aug 2009 14:44:59 +0200
+
supertux (0.3.0~dfsg-1) experimental; urgency=low
* New upstream release (Closes: #404676).
Modified: packages/trunk/supertux/debian/compat
===================================================================
--- packages/trunk/supertux/debian/compat 2009-08-31 06:08:25 UTC (rev 10254)
+++ packages/trunk/supertux/debian/compat 2009-08-31 13:36:54 UTC (rev 10255)
@@ -1 +1 @@
-5
+7
Modified: packages/trunk/supertux/debian/control
===================================================================
--- packages/trunk/supertux/debian/control 2009-08-31 06:08:25 UTC (rev 10254)
+++ packages/trunk/supertux/debian/control 2009-08-31 13:36:54 UTC (rev 10255)
@@ -2,8 +2,17 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Bartosz Fenski <fenio at debian.org>, Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
-Build-Depends: debhelper (>= 5), libsdl1.2-dev (>=1.2.7+1.2.8cvs20041007-5.2), libsdl-image1.2-dev (>= 1.2.3-5), libsdl-mixer1.2-dev, libphysfs-dev, jam, libopenal-dev
+Uploaders: Bartosz Fenski <fenio at debian.org>,
+ Christoph Egger <debian at christoph-egger.org>
+Build-Depends: debhelper (>= 7),
+ libsdl1.2-dev (>=1.2.7+1.2.8cvs20041007-5.2),
+ libsdl-image1.2-dev (>= 1.2.3-5),
+ libsdl-mixer1.2-dev,
+ libphysfs-dev,
+ jam,
+ libopenal-dev,
+ autotools-dev,
+ quilt
Build-Conflicts: nvidia-glx, nvidia-glx-legacy
Standards-Version: 3.7.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/supertux/
Deleted: packages/trunk/supertux/debian/dirs
===================================================================
--- packages/trunk/supertux/debian/dirs 2009-08-31 06:08:25 UTC (rev 10254)
+++ packages/trunk/supertux/debian/dirs 2009-08-31 13:36:54 UTC (rev 10255)
@@ -1,2 +0,0 @@
-usr/games
-usr/share/applications
Added: packages/trunk/supertux/debian/patches/gcc4.3.patch
===================================================================
--- packages/trunk/supertux/debian/patches/gcc4.3.patch (rev 0)
+++ packages/trunk/supertux/debian/patches/gcc4.3.patch 2009-08-31 13:36:54 UTC (rev 10255)
@@ -0,0 +1,83 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_supertux-0.3.1-gcc43.dpatch by Nathan Handler <nhandler at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from Fedora to fix building with gcc-4.3
+
+diff -urNad supertux-0.3.1d~/src/addon_manager.cpp supertux-0.3.1d/src/addon_manager.cpp
+--- supertux-0.3.1d~/src/addon_manager.cpp 2008-01-03 14:59:28.000000000 -0600
++++ supertux-0.3.1d/src/addon_manager.cpp 2008-07-26 09:08:29.000000000 -0500
+@@ -25,6 +25,7 @@
+ #include <physfs.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "addon_manager.hpp"
+ #include "config.h"
+ #include "log.hpp"
+diff -urNad supertux-0.3.1d~/src/console.hpp supertux-0.3.1d/src/console.hpp
+--- supertux-0.3.1d~/src/console.hpp 2008-01-03 14:59:27.000000000 -0600
++++ supertux-0.3.1d/src/console.hpp 2008-07-26 09:09:19.000000000 -0500
+@@ -26,6 +26,7 @@
+ #include <string>
+ #include <sstream>
+ #include <iostream>
++#include <memory>
+ #include <squirrel.h>
+
+ class Console;
+diff -urNad supertux-0.3.1d~/src/lisp/lexer.cpp supertux-0.3.1d/src/lisp/lexer.cpp
+--- supertux-0.3.1d~/src/lisp/lexer.cpp 2008-01-03 14:59:26.000000000 -0600
++++ supertux-0.3.1d/src/lisp/lexer.cpp 2008-07-26 09:10:22.000000000 -0500
+@@ -21,6 +21,7 @@
+ #include <sstream>
+ #include <stdexcept>
+ #include <iostream>
++#include <string.h>
+
+ #include "lexer.hpp"
+
+diff -urNad supertux-0.3.1d~/src/sprite/sprite_manager.hpp supertux-0.3.1d/src/sprite/sprite_manager.hpp
+--- supertux-0.3.1d~/src/sprite/sprite_manager.hpp 2008-01-03 14:59:26.000000000 -0600
++++ supertux-0.3.1d/src/sprite/sprite_manager.hpp 2008-07-26 09:10:40.000000000 -0500
+@@ -21,6 +21,7 @@
+ #define SUPERTUX_SPRITE_MANAGER_H
+
+ #include <map>
++#include <string>
+
+ class SpriteData;
+ class Sprite;
+diff -urNad supertux-0.3.1d~/src/textscroller.hpp supertux-0.3.1d/src/textscroller.hpp
+--- supertux-0.3.1d~/src/textscroller.hpp 2008-01-03 14:59:27.000000000 -0600
++++ supertux-0.3.1d/src/textscroller.hpp 2008-07-26 09:09:37.000000000 -0500
+@@ -24,6 +24,7 @@
+ #include <vector>
+ #include <string>
+ #include <map>
++#include <memory>
+
+ #include "screen.hpp"
+ #include "math/vector.hpp"
+diff -urNad supertux-0.3.1d~/src/title.cpp supertux-0.3.1d/src/title.cpp
+--- supertux-0.3.1d~/src/title.cpp 2008-01-03 14:59:28.000000000 -0600
++++ supertux-0.3.1d/src/title.cpp 2008-07-26 09:08:59.000000000 -0500
+@@ -23,6 +23,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <stdexcept>
++#include <algorithm>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff -urNad supertux-0.3.1d~/src/video/sdl_texture.hpp supertux-0.3.1d/src/video/sdl_texture.hpp
+--- supertux-0.3.1d~/src/video/sdl_texture.hpp 2008-01-03 14:59:22.000000000 -0600
++++ supertux-0.3.1d/src/video/sdl_texture.hpp 2008-07-26 09:10:03.000000000 -0500
+@@ -22,6 +22,7 @@
+
+ #include <config.h>
+
++#include <algorithm>
+ #include <SDL.h>
+
+ #include "texture.hpp"
Added: packages/trunk/supertux/debian/patches/series
===================================================================
--- packages/trunk/supertux/debian/patches/series (rev 0)
+++ packages/trunk/supertux/debian/patches/series 2009-08-31 13:36:54 UTC (rev 10255)
@@ -0,0 +1 @@
+gcc4.3.patch
Modified: packages/trunk/supertux/debian/rules
===================================================================
--- packages/trunk/supertux/debian/rules 2009-08-31 06:08:25 UTC (rev 10254)
+++ packages/trunk/supertux/debian/rules 2009-08-31 13:36:54 UTC (rev 10255)
@@ -12,66 +12,53 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/quilt/quilt.make
-CFLAGS = -Wall -g
+config.status: $(QUILT_STAMPFN)
+ dh_testdir
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
endif
-config.status: configure
- dh_testdir
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games
+ CFLAGS="$(CFLAGS)" ./configure \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --bindir=\$${prefix}/games \
+ --datadir=\$${prefix}/share/games
-
build: build-stamp
-
build-stamp: config.status
dh_testdir
jam
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp
+
-jam distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
+ dh_clean
- dh_clean
-
install: build
dh_testdir
dh_testroot
- dh_clean -k
- dh_installdirs
+ dh_prep
+ dh_installdirs -psupertux -Pdebian/tmp
jam -sprefix=$(CURDIR)/debian/tmp/usr install
- #cp -vR src/supertux $(CURDIR)/debian/supertux/usr/games
- #cp -vR data/images $(CURDIR)/debian/supertux-data/usr/share/games/supertux
- #cp -vR data/levels $(CURDIR)/debian/supertux-data/usr/share/games/supertux
- #cp -vR data/sounds $(CURDIR)/debian/supertux-data/usr/share/games/supertux
- #cp -vR data/music $(CURDIR)/debian/supertux-data/usr/share/games/supertux
- #cp -vR data/{CREDITS,*.txt,supertux.strf} $(CURDIR)/debian/supertux-data/usr/share/games/supertux
- #chmod -x $(CURDIR)/debian/supertux-data/usr/share/games/supertux/sounds/warp.wav
- #cp supertux.desktop $(CURDIR)/debian/supertux/usr/share/applications
- #install -d $(CURDIR)/debian/tmp/usr/share/applications
-
- # DIRTY:
- install -d $(CURDIR)/debian/tmp/usr/share/applications
- install -m 644 supertux.desktop $(CURDIR)/debian/tmp/usr/share/applications
+# DIRTY:
+# install -d $(CURDIR)/debian/tmp/usr/share/applications
+# install -m 644 supertux.desktop $(CURDIR)/debian/tmp/usr/share/applications
+
binary-indep: build install
dh_testdir -i
dh_testroot -i
@@ -106,4 +93,4 @@
dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install
Modified: packages/trunk/supertux/debian/supertux-data.install
===================================================================
--- packages/trunk/supertux/debian/supertux-data.install 2009-08-31 06:08:25 UTC (rev 10254)
+++ packages/trunk/supertux/debian/supertux-data.install 2009-08-31 13:36:54 UTC (rev 10255)
@@ -1 +1 @@
-usr/share/games/supertux
+usr/share/games/supertux2
Added: packages/trunk/supertux/debian/supertux.dirs
===================================================================
--- packages/trunk/supertux/debian/supertux.dirs (rev 0)
+++ packages/trunk/supertux/debian/supertux.dirs 2009-08-31 13:36:54 UTC (rev 10255)
@@ -0,0 +1 @@
+usr/share/games/supertux
Modified: packages/trunk/supertux/debian/supertux.install
===================================================================
--- packages/trunk/supertux/debian/supertux.install 2009-08-31 06:08:25 UTC (rev 10254)
+++ packages/trunk/supertux/debian/supertux.install 2009-08-31 13:36:54 UTC (rev 10255)
@@ -1,2 +1,2 @@
usr/games
-usr/share/applications
+usr/share/games/applications usr/share/applications
More information about the Pkg-games-commits
mailing list