Re: Please unblock xmakemol/5.15-2
On Sat, Feb 17, 2007 at 10:33:26AM +0100, Michael Banck wrote:
> Please unblock it, the interdiff is attached.
Hit send to soon, the interdiff is now there.
Michael
Index: control
===================================================================
--- control (revision 135)
+++ control (revision 293)
@@ -2,7 +2,7 @@
Section: science
Priority: optional
Maintainer: Michael Banck <mbanck@debian.org>
-Build-Depends: debhelper (>> 3.0.0), dpatch, libxpm-dev, libxt-dev, libgl1-mesa-swx11-dev, lesstif2-dev, libglut3-dev
+Build-Depends: debhelper (>> 3.0.0), dpatch, libxpm-dev, libxt-dev, libgl1-mesa-swx11-dev, lesstif2-dev, freeglut3-dev
Standards-Version: 3.5.6.1
Package: xmakemol
Index: changelog
===================================================================
--- changelog (revision 135)
+++ changelog (revision 293)
+xmakemol (5.15-2) unstable; urgency=medium
+
+ * Urgency medium due to fix for bug which severly decreases the
+ usefulness of xmakemol-gl.
+ * debian/patches/02_glutInit.dpatch: New patch, taken from upstream
+ CVS: Call glutInit() before other GLUT functions; closes: #344369.
+ * debian/patches/00list (02_glutInit): Added.
+ * debian/control (Build-Depends): Changed libglut3-dev to
+ freeglut3-dev; closes: #394507.
+
+ -- Michael Banck <mbanck@debian.org> Thu, 7 Dec 2006 13:44:03 +0100
+
xmakemol (5.15-1) unstable; urgency=low
* New upstream release.
Index: patches/02_glutInit.dpatch
===================================================================
--- patches/02_glutInit.dpatch (revision 0)
+++ patches/02_glutInit.dpatch (revision 293)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_glutInit.dpatch by Michael Banck <mbanck@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Call glutInit() before other GLUT functions
+
+@DPATCH@
+
+===================================================================
+RCS file: /sources/xmakemol/xmakemol/xmakemol.c,v
+retrieving revision 1.57
+retrieving revision 1.58
+diff -u -r1.57 -r1.58
+--- xmakemol/xmakemol.c 2005/03/07 10:10:41 1.57
++++ xmakemol/xmakemol.c 2006/09/11 11:34:57 1.58
+@@ -204,6 +204,8 @@
+ /* aro--> moved */
+
+ #ifdef GL
++ glutInit (&argc, argv);
++
+ visinfo = glXChooseVisual(display, screen_num, gl_attrib);
+
+ if (!visinfo)
Property changes on: patches/02_glutInit.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Index: patches/00list
===================================================================
--- patches/00list (revision 0)
+++ patches/00list (revision 293)
@@ -0,0 +1 @@
+02_glutInit
Reply to: