Package: cthugha
Version: 1.4-4
Severity: normal
Tags: patch
Hi,
Attached is the diff for my cthugha 1.4-4.1 NMU.
--
Homepage: http://www.sesse.net/
diff -u cthugha-1.4/src/GL_display.cc cthugha-1.4/src/GL_display.cc
--- cthugha-1.4/src/GL_display.cc
+++ cthugha-1.4/src/GL_display.cc
@@ -8,10 +8,11 @@
#include "pcx.h"
#include "CthughaBuffer.h"
#include "imath.h"
-#define GL_GLEXT_LEGACY //PROTOTYPES
+#define GL_GLEXT_PROTOTYPES
#include "glcthugha.h"
#include <GL/glut.h>
+#include <GL/glext.h>
diff -u cthugha-1.4/debian/changelog cthugha-1.4/debian/changelog
--- cthugha-1.4/debian/changelog
+++ cthugha-1.4/debian/changelog
@@ -1,3 +1,20 @@
+cthugha (1.4-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Don't use parenthesises around the type when using new[]; fixes FTBFS
+ on gcc-3.4/gcc-4.0, patch from Andreas Jochens. (Closes: #294028)
+ * Unset GL_GLEXT_LEGACY and set GL_GLEXT_PROTOTYPES instead, and include
+ <GL/glext.h>. (Closes: #349225)
+ * Replace build-dependency on xlibs-dev with an explicit build-dependency
+ on each required package. (Closes: #347144)
+ * Make the build-dependency on svgalib valid for amd64 as well.
+ (Closes: #255725)
+ * Make sure xlibmesa-gl-dev and xlibmesa-glu-dev are _first_ in their
+ alternatives chain, not last; sbuild needs a non-virtual alternative as
+ the first one.
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Sun, 22 Jan 2006 18:20:11 +0100
+
cthugha (1.4-4) unstable; urgency=low
* Debian/rules: Use build-stamp again. Unbashify clean target.
diff -u cthugha-1.4/debian/control cthugha-1.4/debian/control
--- cthugha-1.4/debian/control
+++ cthugha-1.4/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Martin Albert <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
-Build-Depends: libncurses5-dev, libglut3-dev, libgl-dev | mesag-dev |
xlibmesa-gl-dev, libglu-dev | libglu1-mesa-dev | xlibmesa-glu-dev, libsvga1-dev
[i386] | svgalibg1-dev [i386] | svgalib-dummyg1, xlibs-dev, libxaw6-dev |
libxaw7-dev, texinfo, debhelper
+Build-Depends: libncurses5-dev, libglut3-dev, xlibmesa-gl-dev | libgl-dev |
mesag-dev, xlibmesa-glu-dev | libglu-dev | libglu1-mesa-dev, libsvga1-dev [i386
amd64] | svgalibg1-dev [i386 amd64] | svgalib-dummyg1, libx11-dev, libxext-dev,
libxss-dev, libxt-dev, x-dev, libxaw6-dev | libxaw7-dev, texinfo, debhelper
Build-Conflicts: nvidia-glx
Package: cthugha
only in patch2:
unchanged:
--- cthugha-1.4.orig/src/Mixer.cc
+++ cthugha-1.4/src/Mixer.cc
@@ -194,7 +194,7 @@
printfee("Can not get recording source mask.");
}
- interfaceMixer.elements = new (InterfaceElement*)[SOUND_MIXER_NRDEVICES];
+ interfaceMixer.elements = new InterfaceElement*[SOUND_MIXER_NRDEVICES];
for(int i=0; i < SOUND_MIXER_NRDEVICES; i++) {
