Package: csmash
Version: 0.6.6-6
Severity: normal
Tags: patch
Hi,
Attached is the diff for my csmash 0.6.6-6.1 NMU.
--
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u csmash-0.6.6/debian/changelog csmash-0.6.6/debian/changelog
--- csmash-0.6.6/debian/changelog
+++ csmash-0.6.6/debian/changelog
@@ -1,3 +1,12 @@
+csmash (0.6.6-6.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Use (>= ${Source-Version}) as any depending on all (Closes: #354575).
+ * Fix FTBFS with g++4.1 (Closes: #355463).
+ * Put real package alternatives first.
+
+ -- Luk Claes <[EMAIL PROTECTED]> Fri, 10 Mar 2006 12:32:56 +0100
+
csmash (0.6.6-6) unstable; urgency=low
* Rebuilding with uninstalled nvidia-glx (Closes: #291209)
diff -u csmash-0.6.6/debian/control csmash-0.6.6/debian/control
--- csmash-0.6.6/debian/control
+++ csmash-0.6.6/debian/control
@@ -2,14 +2,14 @@
Section: games
Priority: optional
Maintainer: Bartosz Fenski <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), xutils, libjpeg-dev | libjpeg62-dev,
libz-dev | zlib1g-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev |
libglu-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev,
libgtk2.0-dev, libogg-dev, libvorbis-dev, autotools-dev, dpatch
+Build-Depends: debhelper (>= 4.0.0), xutils, libjpeg62-dev | libjpeg-dev,
zlib1g-dev | libz-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev |
xlibmesa-glu-dev | libglu-dev, libsdl1.2-dev, libsdl-mixer1.2-dev,
libsdl-image1.2-dev, libgtk2.0-dev, libogg-dev, libvorbis-dev, autotools-dev,
dpatch
Build-Conflicts: nvidia-glx
Standards-Version: 3.6.1
Package: csmash
Section: games
Architecture: any
-Depends: ${shlibs:Depends}, csmash-data (= ${Source-Version})
+Depends: ${shlibs:Depends}, csmash-data (>= ${Source-Version})
Suggests: csmash-demosong
Description: CannonSmash, a table tennis simulation game
CannonSmash is a funny 3D table tennis game. It takes a while to get
only in patch2:
unchanged:
--- csmash-0.6.6.orig/BallView.h
+++ csmash-0.6.6/BallView.h
@@ -32,7 +32,7 @@
static GLuint m_number[10];
private:
- void BallView::DrawTargetCircle();
+ void DrawTargetCircle();
GLUquadricObj *m_quad;
void DrawBall();
