Package: space-orbit
Version: 1.01-6
Severity: normal
Tags: patch
Hi,
Attached is the diff for my space-orbit 1.01-6.1 NMU.
--
Homepage: http://www.sesse.net/
diff -u space-orbit-1.01/debian/changelog space-orbit-1.01/debian/changelog
--- space-orbit-1.01/debian/changelog
+++ space-orbit-1.01/debian/changelog
@@ -1,3 +1,13 @@
+space-orbit (1.01-6.1) unstable; urgency=low
+
+ * Non-Maintainer Upload.
+ * Move glutInit() before any other GLUT calls, patch from John Lightsey
+ (Closes: 336840).
+ * Replace xlibs-dev by explicit build-depends on the required libraries.
+ (Closes: 346991).
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Thu, 19 Jan 2006 01:42:49 +0100
+
space-orbit (1.01-6) unstable; urgency=low
* Build space-orbit-common only as a target of binary-indep (closes: #267396)
diff -u space-orbit-1.01/debian/control space-orbit-1.01/debian/control
--- space-orbit-1.01/debian/control
+++ space-orbit-1.01/debian/control
@@ -1,7 +1,7 @@
Source: space-orbit
Section: games
Priority: optional
-Build-Depends: debhelper (>= 4.2.4), xlibs-dev, glutg3-dev, libesd0-dev,
xlibmesa-gl-dev, xlibmesa-glu-dev
+Build-Depends: debhelper (>= 4.2.4), libx11-dev, libxext-dev, libxi-dev,
libxmu-dev, libxt-dev, glutg3-dev, libesd0-dev, xlibmesa-gl-dev,
xlibmesa-glu-dev
Maintainer: Eric Schwartz (Skif) <[EMAIL PROTECTED]>
Standards-Version: 3.6.0
only in patch2:
unchanged:
--- space-orbit-1.01.orig/space-orbit_freeglut.diff?bug=336840;msg=10;att=1.1
+++ space-orbit-1.01/space-orbit_freeglut.diff?bug=336840;msg=10;att=1.1
@@ -0,0 +1,26 @@
+diff -ur space-orbit-1.01.orig/src/orbit.c space-orbit-1.01/src/orbit.c
+--- space-orbit-1.01.orig/src/orbit.c 2005-12-13 18:22:35.000000000 -0600
++++ space-orbit-1.01/src/orbit.c 2005-12-13 18:22:22.000000000 -0600
+@@ -41,6 +41,9 @@
+ /* Set up the player viewpoint, etc */
+ InitPlayer();
+
++ /* glutInit is required for InitStuff() */
++ glutInit(&argc, argv);
++
+ /* Initialize all sorts of other stuff */
+ InitStuff();
+
+@@ -63,8 +66,10 @@
+ */
+ {
+ char *p;
+-
+- glutInit (&argc, argv);
++
++ /* This is being called in main() now */
++ /* glutInit (&argc, argv); */
++
+ glutInitDisplayMode (GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH);
+
+ glutInitWindowPosition (0, 0);
