r10171 - in packages/trunk/supertuxkart/debian: . patches
Christoph Egger
christoph-guest at alioth.debian.org
Sat Aug 22 11:02:00 UTC 2009
Author: christoph-guest
Date: 2009-08-22 11:01:59 +0000 (Sat, 22 Aug 2009)
New Revision: 10171
Added:
packages/trunk/supertuxkart/debian/supertuxkart.dirs
Removed:
packages/trunk/supertuxkart/debian/TODO
packages/trunk/supertuxkart/debian/patches/rubber.patch
Modified:
packages/trunk/supertuxkart/debian/changelog
packages/trunk/supertuxkart/debian/compat
packages/trunk/supertuxkart/debian/control
packages/trunk/supertuxkart/debian/menu
packages/trunk/supertuxkart/debian/patches/series
packages/trunk/supertuxkart/debian/rules
packages/trunk/supertuxkart/debian/supertuxkart.desktop
Log:
Getting 0.6.2 in shape
Deleted: packages/trunk/supertuxkart/debian/TODO
===================================================================
--- packages/trunk/supertuxkart/debian/TODO 2009-08-22 09:52:14 UTC (rev 10170)
+++ packages/trunk/supertuxkart/debian/TODO 2009-08-22 11:01:59 UTC (rev 10171)
@@ -1,7 +0,0 @@
-TODO for supertuxkart:
-----------------------
-
- * Adapt the handling of the configure target to avoid an extra
- configure run.
-
- -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr> Fri, 29 Feb 2008 01:06:22 +0100
Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog 2009-08-22 09:52:14 UTC (rev 10170)
+++ packages/trunk/supertuxkart/debian/changelog 2009-08-22 11:01:59 UTC (rev 10171)
@@ -1,3 +1,19 @@
+supertuxkart (0.6.2+dfsg1-1) unstable; urgency=low
+
+ * New Upstream Release
+ * Only Bugfixes and minor improvements
+ * Drop rubber.patch again as it was taken from 0.6.2 branch
+ and is part of this release
+ * Use replacement artwork from 0.6.1a
+ * Silence horn.wav (Closes: #515332)
+ * Bump Standards Version to 3.8.3 (No changes needed)
+ * Bump debhelper compat to 7 for dh_prep
+ * Update our copy of supertuxkart.desktop from upstreams,
+ our changes will get pushed upstream as well.
+ * Cleaning debian/rules a bit more
+
+ -- Christoph Egger <debian at christoph-egger.org> Sat, 22 Aug 2009 12:45:50 +0200
+
supertuxkart (0.6.1a+dfsg2-3) unstable; urgency=low
* Move config.* out of the diff (Closes: #538617)
Modified: packages/trunk/supertuxkart/debian/compat
===================================================================
--- packages/trunk/supertuxkart/debian/compat 2009-08-22 09:52:14 UTC (rev 10170)
+++ packages/trunk/supertuxkart/debian/compat 2009-08-22 11:01:59 UTC (rev 10171)
@@ -1 +1 @@
-5
+7
Modified: packages/trunk/supertuxkart/debian/control
===================================================================
--- packages/trunk/supertuxkart/debian/control 2009-08-22 09:52:14 UTC (rev 10170)
+++ packages/trunk/supertuxkart/debian/control 2009-08-22 11:01:59 UTC (rev 10171)
@@ -8,7 +8,7 @@
Build-Depends: debhelper (>= 7.0.0~), autotools-dev, libplib-dev,
libsdl-ttf2.0-dev, libsdl-image1.2-dev, docbook-to-man, libopenal-dev,
libalut-dev, libmikmod2-dev, libvorbis-dev, quilt
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/supertuxkart/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/supertuxkart/?op=log
Homepage: http://supertuxkart.sf.net/
Modified: packages/trunk/supertuxkart/debian/menu
===================================================================
--- packages/trunk/supertuxkart/debian/menu 2009-08-22 09:52:14 UTC (rev 10170)
+++ packages/trunk/supertuxkart/debian/menu 2009-08-22 11:01:59 UTC (rev 10171)
@@ -1,5 +1,5 @@
?package(supertuxkart):needs="X11"\
section="Games/Action"\
title="Supertuxkart"\
- command="/usr/games/supertuxkart"\
+ command="supertuxkart"\
icon="/usr/share/icons/hicolor/32x32/apps/supertuxkart.xpm"
Deleted: packages/trunk/supertuxkart/debian/patches/rubber.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/rubber.patch 2009-08-22 09:52:14 UTC (rev 10170)
+++ packages/trunk/supertuxkart/debian/patches/rubber.patch 2009-08-22 11:01:59 UTC (rev 10171)
@@ -1,124 +0,0 @@
-Index: a/src/items/rubber_band.cpp
-===================================================================
---- a/src/items/rubber_band.cpp (revision 3741)
-+++ b/src/items/rubber_band.cpp (working copy)
-@@ -51,7 +51,7 @@
- vertices->add(0, 0, 0); vertices->add(0, 0, 0);
- vertices->add(0, 0, 0); vertices->add(0, 0, 0);
- m_attached_state = RB_TO_PLUNGER;
-- update(0);
-+ updatePosition();
-
- sgVec3 norm;
- sgSetVec3(norm, 1/sqrt(2.0f), 0, 1/sqrt(2.0f));
-@@ -80,6 +80,42 @@
- } // removeFromScene
-
- // ----------------------------------------------------------------------------
-+/** Updates the position of the rubber band. It especially sets the
-+ * end position of the rubber band, i.e. the side attached to the plunger,
-+ * track, or kart hit.
-+ */
-+void RubberBand::updatePosition()
-+{
-+ const Vec3 &k = m_owner.getXYZ();
-+
-+ // Get the position to which the band is attached
-+ // ----------------------------------------------
-+ switch(m_attached_state)
-+ {
-+ case RB_TO_KART: m_end_position = m_hit_kart->getXYZ(); break;
-+ case RB_TO_TRACK: m_end_position = m_hit_position; break;
-+ case RB_TO_PLUNGER: m_end_position = m_plunger->getXYZ();
-+ checkForHit(k, m_end_position); break;
-+ } // switch(m_attached_state);
-+
-+ // Update the rubber band positions
-+ // --------------------------------
-+ // Todo: make height dependent on length (i.e. rubber band gets
-+ // thinner). And call explosion if the band is too long.
-+ const float hh=.1f; // half height of the band
-+ const Vec3 &p=m_end_position; // for shorter typing
-+ float *f = vertices->get(0);
-+ f[0] = p.getX()-hh; f[1] = p.getY(); f[2] = p.getZ()-hh;
-+ f = vertices->get(1);
-+ f[0] = p.getX()+hh; f[1] = p.getY(); f[2] = p.getZ()+hh;
-+ f = vertices->get(2);
-+ f[0] = k.getX()+hh; f[1] = k.getY(); f[2] = k.getZ()+hh;
-+ f = vertices->get(3);
-+ f[0] = k.getX()-hh; f[1] = k.getY(); f[2] = k.getZ()-hh;
-+ dirtyBSphere();
-+} // updatePosition
-+
-+// ----------------------------------------------------------------------------
- /** Updates the rubber band. It takes the new position of the kart and the
- * plunger, and sets the quad representing the rubber band appropriately.
- * It then casts a ray along the rubber band to detect if anything is hit. If
-@@ -97,38 +133,12 @@
- return;
- }
-
-- Vec3 p;
-+ updatePosition();
- const Vec3 &k = m_owner.getXYZ();
--
-- // Get the position to which the band is attached
-- // ----------------------------------------------
-- switch(m_attached_state)
-- {
-- case RB_TO_KART: p = m_hit_kart->getXYZ(); break;
-- case RB_TO_TRACK: p = m_hit_position; break;
-- case RB_TO_PLUNGER: p = m_plunger->getXYZ();
-- checkForHit(k, p); break;
-- } // switch(m_attached_state);
--
-- // Draw the rubber band
-- // --------------------
-- // Todo: make height dependent on length (i.e. rubber band gets
-- // thinner). And call explosion if the band is too long.
-- const float hh=.1f; // half height of the band
--
-- float *f = vertices->get(0);
-- f[0] = p.getX()-hh; f[1] = p.getY(); f[2] = p.getZ()-hh;
-- f = vertices->get(1);
-- f[0] = p.getX()+hh; f[1] = p.getY(); f[2] = p.getZ()+hh;
-- f = vertices->get(2);
-- f[0] = k.getX()+hh; f[1] = k.getY(); f[2] = k.getZ()+hh;
-- f = vertices->get(3);
-- f[0] = k.getX()-hh; f[1] = k.getY(); f[2] = k.getZ()-hh;
-- dirtyBSphere();
--
-+
- // Check for rubber band snapping
- // ------------------------------
-- float l = (p-k).length2();
-+ float l = (m_end_position-k).length2();
- float max_len = m_owner.getKartProperties()->getRubberBandMaxLength();
- if(l>max_len*max_len)
- {
-@@ -143,7 +153,7 @@
- if(m_attached_state!=RB_TO_PLUNGER)
- {
- float force = m_owner.getKartProperties()->getRubberBandForce();
-- Vec3 diff = p-k;
-+ Vec3 diff = m_end_position-k;
-
- // detach rubber band if kart gets very close to hit point
- if(m_attached_state==RB_TO_TRACK && diff.length2() < 10*10)
-Index: a/src/items/rubber_band.hpp
-===================================================================
---- a/src/items/rubber_band.hpp (revision 3741)
-+++ b/src/items/rubber_band.hpp (working copy)
-@@ -50,7 +50,12 @@
- /** State for rubber band. */
- ssgSimpleState *m_state;
-
-+ /** Stores the end of the rubber band (i.e. the side attached to the
-+ * plunger. */
-+ Vec3 m_end_position;
-+
- void checkForHit(const Vec3 &k, const Vec3 &p);
-+ void updatePosition();
-
- public:
- RubberBand(Plunger *plunger, const Kart &kart);
Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series 2009-08-22 09:52:14 UTC (rev 10170)
+++ packages/trunk/supertuxkart/debian/patches/series 2009-08-22 11:01:59 UTC (rev 10171)
@@ -1,2 +1 @@
# Nothing to do right now
-rubber.patch
Modified: packages/trunk/supertuxkart/debian/rules
===================================================================
--- packages/trunk/supertuxkart/debian/rules 2009-08-22 09:52:14 UTC (rev 10170)
+++ packages/trunk/supertuxkart/debian/rules 2009-08-22 11:01:59 UTC (rev 10171)
@@ -17,24 +17,16 @@
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CFLAGS = -Wall -g
-CXXFLAGS = -Wall -g
+CFLAGS += -Wall
+CXXFLAGS += -Wall
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
- CXXFLAGS += -O0
-else
- CFLAGS += -O2
- CXXFLAGS += -O2
-endif
-
config.status: $(QUILT_STAMPFN)
dh_testdir
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.guess config.guess
- # Add here commands to configure the package.
+# Add here commands to configure the package.
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=/usr/games
get-orig-source:
@@ -64,11 +56,11 @@
dh_testdir
dh_testroot
dh_prep
- dh_installdirs -psupertuxkart -Pdebian/tmp usr/share/pixmaps usr/share/icons/hicolor/32x32/apps usr/share/icons/hicolor/64x64/apps usr/share/applications
+ dh_installdirs -psupertuxkart -Pdebian/tmp
# Add here commands to install the package into debian/supertuxkart.
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- find $(CURDIR)/debian/tmp \( -iname "License.txt" -o -iname "License.Debian.txt" -o -iname "Music_license.rtf" \) -exec rm -f {} \;
+ find $(CURDIR)/debian/tmp \( -iname "License.txt" -o -iname "License.Debian.txt" -o -iname "Music_license.rtf" \) -delete
install -m 644 debian/supertuxkart_32.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart.xpm
install -m 644 debian/supertuxkart_32.xpm $(CURDIR)/debian/tmp/usr/share/icons/hicolor/32x32/apps/supertuxkart.xpm
@@ -82,7 +74,7 @@
binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs
+ dh_installchangelogs ChangeLog NEWS
dh_install
dh_installdocs
dh_installexamples
Modified: packages/trunk/supertuxkart/debian/supertuxkart.desktop
===================================================================
--- packages/trunk/supertuxkart/debian/supertuxkart.desktop 2009-08-22 09:52:14 UTC (rev 10170)
+++ packages/trunk/supertuxkart/debian/supertuxkart.desktop 2009-08-22 11:01:59 UTC (rev 10171)
@@ -6,6 +6,7 @@
Comment=a kart racing game
Comment[fr_FR]=un jeu de karting
Comment[ro_RO]=un joc de curse cu carturi
+Comment[de_DE]=ein Kart-Rennspiel
Exec=supertuxkart
Terminal=false
StartupNotify=false
Added: packages/trunk/supertuxkart/debian/supertuxkart.dirs
===================================================================
--- packages/trunk/supertuxkart/debian/supertuxkart.dirs (rev 0)
+++ packages/trunk/supertuxkart/debian/supertuxkart.dirs 2009-08-22 11:01:59 UTC (rev 10171)
@@ -0,0 +1,4 @@
+usr/share/pixmaps
+usr/share/icons/hicolor/32x32/apps
+usr/share/icons/hicolor/64x64/apps
+usr/share/applications
More information about the Pkg-games-commits
mailing list