tags 356199 + pending
tags 578977 + patch
tags 578977 + pending
thanks
Dear maintainer,
I've prepared an NMU for csmash (versioned as 0.6.6-6.5) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer, or if the upload should be removed
from the queue.
Note that in addition to bug fixes, the packaging has been
updated to use the quilt format.
Regards.
diff -Nru csmash-0.6.6/BallView.h csmash-0.6.6/BallView.h
--- csmash-0.6.6/BallView.h 2010-05-14 23:34:18.000000000 -0700
+++ csmash-0.6.6/BallView.h 2003-07-13 08:26:24.000000000 -0700
@@ -32,7 +32,7 @@
static GLuint m_number[10];
private:
- void DrawTargetCircle();
+ void BallView::DrawTargetCircle();
GLUquadricObj *m_quad;
void DrawBall();
diff -Nru csmash-0.6.6/debian/changelog csmash-0.6.6/debian/changelog
--- csmash-0.6.6/debian/changelog 2010-05-14 23:34:18.000000000 -0700
+++ csmash-0.6.6/debian/changelog 2010-05-11 11:30:14.000000000 -0700
@@ -1,3 +1,40 @@
+csmash (0.6.6-6.5) unstable; urgency=low
+
+ [ Jari Aalto ]
+ * Non-maintainer upload.
+ - Update to packaging format "3.0 (quilt)".
+ - ACK old nmudiff for 0.6.6-6.1 in the BTS (Closes: #356199).
+ * cmash.menu
+ - (section): Change non-existing Games/Sports to Games/Action.
+ * debian/compat
+ - New file; value 7.
+ * debian/control
+ - (Build-Depends): update obsolete xutils to xutils-dev,
+ xlibmesa-gl-dev to libgl1-mesa-dev and remove libglu1-xorg-dev
+ (important; Closes: #578977). Add libsdl1.2-dev.
+ Update to debhelper 7.1. Remove dpatch
+ - (Homepage): New field. Lift from description.
+ - (Standards-Version): Update from ancient 3.6.1 to 3.8.4.
+ - (cmash::Depends): Add ${misc:Depends}. Change obsolete ${Source-Version}
+ to ${source:Version}.
+ - (cmash::Section): remove duplicate derived field.
+ - (cmash-data::Depends): Add ${misc:Depends}.
+ * debian/copyright
+ - Point to GPL-2. Fix spelling.
+ * debian/patches
+ - (Number 10): Allow SDL >= 1.2.
+ * debian/rules
+ - Remove dpatch; obsoleted by new package format.
+ - (clean): Fix lintian debian-rules-ignores-make-clean-error.
+ - (DH_COMPAT): Remove, use debian/compat instead.
+ - (install-stamp): use install(1) to copy csmash.xpm.
+ Change ch_clean with dh_prep. Install csmash.xpm with mode 644.
+ Delete empty directory usr/share/games/.
+ * debian/source/format
+ - New file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Tue, 11 May 2010 21:30:14 +0300
+
csmash (0.6.6-6.4) unstable; urgency=low
* Non-maintainer upload.
diff -Nru csmash-0.6.6/debian/compat csmash-0.6.6/debian/compat
--- csmash-0.6.6/debian/compat 1969-12-31 16:00:00.000000000 -0800
+++ csmash-0.6.6/debian/compat 2010-05-02 11:37:15.000000000 -0700
@@ -0,0 +1 @@
+7
diff -Nru csmash-0.6.6/debian/control csmash-0.6.6/debian/control
--- csmash-0.6.6/debian/control 2010-05-14 23:34:18.000000000 -0700
+++ csmash-0.6.6/debian/control 2010-05-09 11:22:11.000000000 -0700
@@ -2,14 +2,14 @@
Section: games
Priority: optional
Maintainer: Bartosz Fenski <fe...@debian.org>
-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, libxt-dev
+Build-Depends: debhelper (>= 7.1), xutils-dev, libjpeg62-dev | libjpeg-dev,
zlib1g-dev | libz-dev, libgl1-mesa-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, libxt-dev
Build-Conflicts: nvidia-glx
-Standards-Version: 3.6.1
+Standards-Version: 3.8.4
+Homepage: http://cannonsmash.sourceforge.net
Package: csmash
-Section: games
Architecture: any
-Depends: ${shlibs:Depends}, csmash-data (>= ${Source-Version})
+Depends: ${misc: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
@@ -20,19 +20,16 @@
Since csmash relies on OpenGL-compatible rendering, it is best
experienced with a 3D accelerator card, although software rendering
in wireframe mode should be sustainable.
- .
- Homepage: http://cannonsmash.sourceforge.net/
Package: csmash-data
Architecture: all
Conflicts: csmash (<< 0.6.6-3)
+Depends: ${misc:Depends}
Recommends: csmash
Description: data files for the CannonSmash game
- CannonSmash is a funny 3D table tennis game. It takes a while to get
- your hand at ease with the mouse+keyboard manipulations. But once
- you're used to the technique, you can feel like playing a real game.
- It is playable against the computer or through a network.
- .
- This package contains data files for CannonSmash.
+ CannonSmash is a funny 3D table tennis game. It takes a while to get
+ your hand at ease with the mouse+keyboard manipulations. But once
+ you're used to the technique, you can feel like playing a real game.
+ It is playable against the computer or through a network.
.
- Homepage: http://cannonsmash.sourceforge.net/
+ This package contains data files for CannonSmash.
diff -Nru csmash-0.6.6/debian/copyright csmash-0.6.6/debian/copyright
--- csmash-0.6.6/debian/copyright 2010-05-14 23:34:18.000000000 -0700
+++ csmash-0.6.6/debian/copyright 2010-05-02 11:39:24.000000000 -0700
@@ -15,7 +15,7 @@
parts.h and xerror.cpp are Copyright (C) 2002 ESESoft and distributed
under the license at the end of this file.
-Licensing informations:
+License:
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
GNU General Public License for more details.
On Debian GNU/Linux systems, the full text of the GNU General Public
-License can be found in the file /usr/share/common-licenses/GPL.
+License can be found in the file "/usr/share/common-licenses/GPL-2".
The files from ESESoft are distributed under these terms:
diff -Nru csmash-0.6.6/debian/csmash.menu csmash-0.6.6/debian/csmash.menu
--- csmash-0.6.6/debian/csmash.menu 2010-05-14 23:34:18.000000000 -0700
+++ csmash-0.6.6/debian/csmash.menu 2010-05-02 12:07:47.000000000 -0700
@@ -1,4 +1,4 @@
-?package(csmash):needs="x11" section="Games/Sports"\
+?package(csmash):needs="x11" section="Games/Action"\
title="CannonSmash" command="/usr/games/csmash"\
longtitle="CannonSmash - 3D tabletennis game"\
icon="/usr/share/pixmaps/csmash.xpm"
diff -Nru csmash-0.6.6/debian/patches/00list csmash-0.6.6/debian/patches/00list
--- csmash-0.6.6/debian/patches/00list 2010-05-14 23:34:18.000000000 -0700
+++ csmash-0.6.6/debian/patches/00list 1969-12-31 16:00:00.000000000 -0800
@@ -1,3 +0,0 @@
-01_loadparts
-02_gcc4.0
-03_broken_include
diff -Nru csmash-0.6.6/debian/patches/01-loadparts.patch
csmash-0.6.6/debian/patches/01-loadparts.patch
--- csmash-0.6.6/debian/patches/01-loadparts.patch 1969-12-31
16:00:00.000000000 -0800
+++ csmash-0.6.6/debian/patches/01-loadparts.patch 2010-05-09
11:33:04.000000000 -0700
@@ -0,0 +1,33 @@
+From 715bb929a5bee69b6ec3e7016bf2ffce79c10fbe Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aa...@cante.net>
+Date: Sun, 9 May 2010 21:26:04 +0300
+Subject: [PATCH] loadparts.cpp: add architechture check by Bartosz Fenski
<fe...@debian.org>
+Organization: Private
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Jari Aalto <jari.aa...@cante.net>
+---
+ loadparts.cpp | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/loadparts.cpp b/loadparts.cpp
+index 7358aaa..030d903 100644
+--- a/loadparts.cpp
++++ b/loadparts.cpp
+@@ -245,7 +245,11 @@ bool parts::loadfile(const char *str)
+
+ while ('\\' == line[l-1]) {
+ // concat next line(s)
++#if (defined __ia64__) || (defined __alpha__) || (defined __powerpc64__) ||
(defined __s390__) || (defined __x86_64__)
++ int bufsize = clamp((u_long) 0, sizeof(line)-l, sizeof(line)-1);
++#else
+ int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
++#endif
+ fgets(&line[l-2], bufsize, fp);
+ if (feof((FILE*)fp)) break;
+ l = strlen(line);
+--
+1.7.0
+
diff -Nru csmash-0.6.6/debian/patches/01_loadparts.dpatch
csmash-0.6.6/debian/patches/01_loadparts.dpatch
--- csmash-0.6.6/debian/patches/01_loadparts.dpatch 2010-05-14
23:34:18.000000000 -0700
+++ csmash-0.6.6/debian/patches/01_loadparts.dpatch 1969-12-31
16:00:00.000000000 -0800
@@ -1,36 +0,0 @@
-#! /bin/sh -e
-## loadparts.dpatch
-## Bartosz Fenski <fe...@debian.org>
-
-patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p0 < $0;;
- -unpatch) patch $patch_opts -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as
argument"
- exit 1;;
-esac
-
-exit 0
-
-...@dpatch@
---- loadparts.cpp.orig 2003-11-19 17:49:31.000000000 +0100
-+++ loadparts.cpp 2004-05-05 12:04:46.000000000 +0200
-@@ -245,7 +245,11 @@
-
- while ('\\' == line[l-1]) {
- // concat next line(s)
-+#if (defined __ia64__) || (defined __alpha__) || (defined __powerpc64__) ||
(defined __s390__) || (defined __x86_64__)
-+ int bufsize = clamp((u_long) 0, sizeof(line)-l, sizeof(line)-1);
-+#else
- int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
-+#endif
- fgets(&line[l-2], bufsize, fp);
- if (feof((FILE*)fp)) break;
- l = strlen(line);
-
diff -Nru csmash-0.6.6/debian/patches/02-gcc4.0.patch
csmash-0.6.6/debian/patches/02-gcc4.0.patch
--- csmash-0.6.6/debian/patches/02-gcc4.0.patch 1969-12-31 16:00:00.000000000
-0800
+++ csmash-0.6.6/debian/patches/02-gcc4.0.patch 2010-05-09 11:32:59.000000000
-0700
@@ -0,0 +1,71 @@
+From 19dbbbe68ae7864f424991854ff9762d841d8e15 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aa...@cante.net>
+Date: Sun, 9 May 2010 21:29:33 +0300
+Subject: [PATCH] matrix: compile fixed by Bartosz Fenski <fe...@debian.org>
+Organization: Private
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Jari Aalto <jari.aa...@cante.net>
+---
+ matrix | 18 ++++++------------
+ 1 files changed, 6 insertions(+), 12 deletions(-)
+
+diff --git a/matrix b/matrix
+index 14178cb..a633a09 100644
+--- a/matrix
++++ b/matrix
+@@ -42,15 +42,6 @@
+
+ /* __BEGIN__BEGIN__ */
+ //__NAMESPACE_BEGIN(ese);
+-#if (!defined __GNUG__) || (__GNUC__ == 3)
+-template<typename T>
+-void swap(T& a, T& b)
+-{
+- T c = a;
+- a = b;
+- b = c;
+-}
+-#endif
+
+ // matrix_size MUST BE larger than 1
+ template<int matrix_size, typename _float_t = float>
+@@ -174,9 +165,10 @@ private:
+ mx = x;
+ }
+ }
+- swap(pivot[k], pivot[piv]);
+
+ int kk = pivot[k];
++ pivot[k] = pivot[piv];
++ pivot[piv] = kk;
+ float_t t = m[kk][kk];
+ if (0 == t) {
+ return 0;
+@@ -222,9 +214,10 @@ private:
+ mx = x;
+ }
+ }
+- swap(pivot[k], pivot[piv]);
+
+ int kk = pivot[kk];
++ pivot[k] = pivot[piv];
++ pivot[piv] = kk;
+ double t = a[kk][kk];
+ if (0 == t) {
+ return 0;
+@@ -283,7 +276,8 @@ private:
+ }
+ ik = ip[j];
+ if (j != k) {
+- swap(ip[j], ip[k]);
++ ip[j] = ip[k];
++ ip[k] = ik;
+ det = -det;
+ }
+ u = a[ik][k];
+--
+1.7.0
+
diff -Nru csmash-0.6.6/debian/patches/02_gcc4.0.dpatch
csmash-0.6.6/debian/patches/02_gcc4.0.dpatch
--- csmash-0.6.6/debian/patches/02_gcc4.0.dpatch 2010-05-14
23:34:18.000000000 -0700
+++ csmash-0.6.6/debian/patches/02_gcc4.0.dpatch 1969-12-31
16:00:00.000000000 -0800
@@ -1,73 +0,0 @@
-#! /bin/sh -e
-## gcc4.0.dpatch
-## Bartosz Fenski <fe...@debian.org>
-
-patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as
argument"
- exit 1;;
-esac
-
-exit 0
-
-...@dpatch@
---- ../tmp-orig/csmash-0.6.6/matrix 2002-03-06 17:46:01.000000000 +0100
-+++ ./matrix 2005-01-06 19:43:32.037852232 +0100
-@@ -42,15 +42,6 @@
-
- /* __BEGIN__BEGIN__ */
- //__NAMESPACE_BEGIN(ese);
--#if (!defined __GNUG__) || (__GNUC__ == 3)
--template<typename T>
--void swap(T& a, T& b)
--{
-- T c = a;
-- a = b;
-- b = c;
--}
--#endif
-
- // matrix_size MUST BE larger than 1
- template<int matrix_size, typename _float_t = float>
-@@ -174,9 +165,10 @@
- mx = x;
- }
- }
-- swap(pivot[k], pivot[piv]);
-
- int kk = pivot[k];
-+ pivot[k] = pivot[piv];
-+ pivot[piv] = kk;
- float_t t = m[kk][kk];
- if (0 == t) {
- return 0;
-@@ -222,9 +214,10 @@
- mx = x;
- }
- }
-- swap(pivot[k], pivot[piv]);
-
- int kk = pivot[kk];
-+ pivot[k] = pivot[piv];
-+ pivot[piv] = kk;
- double t = a[kk][kk];
- if (0 == t) {
- return 0;
-@@ -283,7 +276,8 @@
- }
- ik = ip[j];
- if (j != k) {
-- swap(ip[j], ip[k]);
-+ ip[j] = ip[k];
-+ ip[k] = ik;
- det = -det;
- }
- u = a[ik][k];
diff -Nru csmash-0.6.6/debian/patches/03-broken-include.patch
csmash-0.6.6/debian/patches/03-broken-include.patch
--- csmash-0.6.6/debian/patches/03-broken-include.patch 1969-12-31
16:00:00.000000000 -0800
+++ csmash-0.6.6/debian/patches/03-broken-include.patch 2010-05-09
11:34:25.000000000 -0700
@@ -0,0 +1,30 @@
+From d43ce517f69eac53f1d5361aed30a0c7ceea4547 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aa...@cante.net>
+Date: Sun, 9 May 2010 21:34:22 +0300
+Subject: [PATCH] configure: correct CFLAGS -I option by <toli...@debian.org>
+Organization: Private
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Jari Aalto <jari.aa...@cante.net>
+---
+ configure | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index b030f32..c75537f 100755
+--- a/configure
++++ b/configure
+@@ -5515,7 +5515,7 @@ echo "${ECHO_T}libraries $x_libraries, headers
$x_includes" >&6
+ fi
+
+
+-CFLAGS="-I $x_includes"
++CFLAGS="-I/ $x_includes"
+ LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
+ CXXFLAGS="$CFLAGS -Wall"
+
+--
+1.7.0
+
diff -Nru csmash-0.6.6/debian/patches/03_broken_include.dpatch
csmash-0.6.6/debian/patches/03_broken_include.dpatch
--- csmash-0.6.6/debian/patches/03_broken_include.dpatch 2010-05-14
23:34:18.000000000 -0700
+++ csmash-0.6.6/debian/patches/03_broken_include.dpatch 1969-12-31
16:00:00.000000000 -0800
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_broken_include.dpatch by <toli...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Small fix for now broken includes
-
-...@dpatch@
-diff -urNad csmash-0.6.6~/configure csmash-0.6.6/configure
---- csmash-0.6.6~/configure 2003-08-16 07:54:31.000000000 +0200
-+++ csmash-0.6.6/configure 2006-07-24 14:04:49.000000000 +0200
-@@ -5515,7 +5515,7 @@
- fi
-
-
--CFLAGS="-I $x_includes"
-+CFLAGS="-I/ $x_includes"
- LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
- CXXFLAGS="$CFLAGS -Wall"
-
diff -Nru csmash-0.6.6/debian/patches/10-configure--sdl-version.patch
csmash-0.6.6/debian/patches/10-configure--sdl-version.patch
--- csmash-0.6.6/debian/patches/10-configure--sdl-version.patch 1969-12-31
16:00:00.000000000 -0800
+++ csmash-0.6.6/debian/patches/10-configure--sdl-version.patch 2010-05-11
11:25:06.000000000 -0700
@@ -0,0 +1,32 @@
+From 8dde57a4710734044cc7d60202fb5e83d12cb483 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aa...@cante.net>
+Date: Tue, 11 May 2010 21:18:13 +0300
+Subject: [PATCH] configure: Test >=, not just = for SDL version
+Organization: Private
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Jari Aalto <jari.aa...@cante.net>
+---
+ configure | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index b030f32..6b395dc 100755
+--- a/configure
++++ b/configure
+@@ -6530,8 +6530,8 @@ int main (int argc, char *argv[])
+ }
+
+ if (($sdl_major_version > major) ||
+- (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+- (($sdl_major_version == major) && ($sdl_minor_version == minor) &&
($sdl_micro_version >= micro)))
++ (($sdl_major_version == major) && ($sdl_minor_version >= minor)) ||
++ (($sdl_major_version == major) && ($sdl_minor_version >= minor) &&
($sdl_micro_version >= micro)))
+ {
+ return 0;
+ }
+--
+1.7.0
+
diff -Nru csmash-0.6.6/debian/patches/debian-changes-0.6.6-6.5
csmash-0.6.6/debian/patches/debian-changes-0.6.6-6.5
--- csmash-0.6.6/debian/patches/debian-changes-0.6.6-6.5 1969-12-31
16:00:00.000000000 -0800
+++ csmash-0.6.6/debian/patches/debian-changes-0.6.6-6.5 2010-05-14
23:23:28.000000000 -0700
@@ -0,0 +1,68 @@
+Description: Upstream changes introduced in version 0.6.6-6.5
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ csmash (0.6.6-6.5) unstable; urgency=low
+ .
+ [ Jari Aalto ]
+ * Non-maintainer upload.
+ - Update to packaging format "3.0 (quilt)".
+ - ACK old nmudiff for 0.6.6-6.1 in the BTS (Closes: #356199).
+ * cmash.menu
+ - (section): Change non-existing Games/Sports to Games/Action.
+ * debian/compat
+ - New file; value 7.
+ * debian/control
+ - (Build-Depends): update obsolete xutils to xutils-dev,
+ xlibmesa-gl-dev to libgl1-mesa-dev and remove libglu1-xorg-dev
+ (important; Closes: #578977). Add libsdl1.2-dev.
+ Update to debhelper 7.1. Remove dpatch
+ - (Homepage): New field. Lift from description.
+ - (Standards-Version): Update from ancient 3.6.1 to 3.8.4.
+ - (cmash::Depends): Add ${misc:Depends}. Change obsolete ${Source-Version}
+ to ${source:Version}.
+ - (cmash::Section): remove duplicate derived field.
+ - (cmash-data::Depends): Add ${misc:Depends}.
+ * debian/copyright
+ - Point to GPL-2. Fix spelling.
+ * debian/patches
+ - (Number 10): Allow SDL >= 1.2.
+ * debian/rules
+ - Remove dpatch; obsoleted by new package format.
+ - (clean): Fix lintian debian-rules-ignores-make-clean-error.
+ - (DH_COMPAT): Remove, use debian/compat instead.
+ - (install-stamp): use install(1) to copy csmash.xpm.
+ Change ch_clean with dh_prep. Install csmash.xpm with mode 644.
+ Delete empty directory usr/share/games/.
+ * debian/source/format
+ - New file.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Jari Aalto <jari.aa...@cante.net>
+Bug-Debian: http://bugs.debian.org/356199
+Bug-Debian: http://bugs.debian.org/578977
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- csmash-0.6.6.orig/BallView.h
++++ csmash-0.6.6/BallView.h
+@@ -32,7 +32,7 @@ public:
+
+ static GLuint m_number[10];
+ private:
+- void BallView::DrawTargetCircle();
++ void DrawTargetCircle();
+ GLUquadricObj *m_quad;
+
+ void DrawBall();
diff -Nru csmash-0.6.6/debian/patches/series csmash-0.6.6/debian/patches/series
--- csmash-0.6.6/debian/patches/series 1969-12-31 16:00:00.000000000 -0800
+++ csmash-0.6.6/debian/patches/series 2010-05-11 11:30:47.000000000 -0700
@@ -0,0 +1,5 @@
+01-loadparts.patch
+02-gcc4.0.patch
+03-broken-include.patch
+10-configure--sdl-version.patch
+debian-changes-0.6.6-6.5
diff -Nru csmash-0.6.6/debian/rules csmash-0.6.6/debian/rules
--- csmash-0.6.6/debian/rules 2010-05-14 23:34:18.000000000 -0700
+++ csmash-0.6.6/debian/rules 2010-05-11 11:29:58.000000000 -0700
@@ -3,14 +3,11 @@
package=csmash
package-data=csmash-data
-include /usr/share/dpatch/dpatch.make
-
#export DH_VERBOSE=1
-export DH_COMPAT=4
DEBIAN_DIR = $(shell pwd)/debian
-build: patch-stamp build-stamp
+build: build-stamp
build-stamp:
dh_testdir
dh_clean
@@ -32,12 +29,12 @@
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp install-stamp stamp-h1
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
rm -f config.log config.guess config.sub config.status config.h
rm -f .deps/*.Po po/Makefile.in po/POTFILES
find . -name 'Makefile' -print0 | xargs -0r rm -f
@@ -52,7 +49,7 @@
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install \
prefix=$(DEBIAN_DIR)/$(package)/usr \
@@ -63,7 +60,10 @@
man1dir=$(DEBIAN_DIR)/$(package)/usr/share/man/man1 \
datadir=$(DEBIAN_DIR)/$(package-data)/usr/share \
localedir=$(DEBIAN_DIR)/$(package)/usr/share/locale
- cp debian/csmash.xpm $(DEBIAN_DIR)/$(package)/usr/share/pixmaps/
+ install -D -m 644 debian/csmash.xpm \
+ $(DEBIAN_DIR)/$(package)/usr/share/pixmaps/csmash.xpm
+ # Delete empty dir
+ rmdir $(DEBIAN_DIR)/$(package)/usr/share/games
touch install-stamp
@@ -99,4 +99,4 @@
dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: binary clean binary-indep binary-arch binary install patch unpatch
+.PHONY: binary clean binary-indep binary-arch binary install
diff -Nru csmash-0.6.6/debian/source/format csmash-0.6.6/debian/source/format
--- csmash-0.6.6/debian/source/format 1969-12-31 16:00:00.000000000 -0800
+++ csmash-0.6.6/debian/source/format 2010-05-09 11:23:06.000000000 -0700
@@ -0,0 +1 @@
+3.0 (quilt)
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
