[Python-modules-commits] r5820 - in packages/pyopengl/trunk/debian (7 files)

shlomme at users.alioth.debian.org shlomme at users.alioth.debian.org
Thu Jul 3 08:51:25 UTC 2008 

    Date: Thursday, July 3, 2008 @ 08:51:24
  Author: shlomme
Revision: 5820

* prepare new upload

Added:
  packages/pyopengl/trunk/debian/patches/02_test_fix.dpatch
  packages/pyopengl/trunk/debian/patches/03_tk_fix.dpatch
Modified:
  packages/pyopengl/trunk/debian/changelog
  packages/pyopengl/trunk/debian/control
  packages/pyopengl/trunk/debian/control.in
  packages/pyopengl/trunk/debian/patches/00list
  packages/pyopengl/trunk/debian/rules

Modified: packages/pyopengl/trunk/debian/changelog
===================================================================
--- packages/pyopengl/trunk/debian/changelog	2008-07-02 23:03:57 UTC (rev 5819)
+++ packages/pyopengl/trunk/debian/changelog	2008-07-03 08:51:24 UTC (rev 5820)
@@ -1,3 +1,15 @@
+pyopengl (3.0.0~b3-1) unstable; urgency=low
+
+  * New upstream release (Closes: #454988)
+  * debian/control
+    - update standard version to 3.8.0, no changes necessary
+    - change dependency on python-ctypes to 
+      python-ctypes | python (>= 2.5) (Closes: #485594)
+  * Handle missing Togl module gracefully,
+    do not break the Python help system (Closes: #455896)
+	
+ -- Torsten Marek <shlomme at debian.org>  Tue, 01 Jul 2008 17:25:00 +0200
+
 pyopengl (3.0.0~b1-2) unstable; urgency=low
 
   * debian/rules

Modified: packages/pyopengl/trunk/debian/control
===================================================================
--- packages/pyopengl/trunk/debian/control	2008-07-02 23:03:57 UTC (rev 5819)
+++ packages/pyopengl/trunk/debian/control	2008-07-03 08:51:24 UTC (rev 5820)
@@ -5,7 +5,7 @@
 Uploaders: Torsten Marek <shlomme at debian.org>
 Build-Depends-Indep: python-setuptools (>= 0.6b3), libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, freeglut3, libgle3
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.39), python-central (>= 0.6.0), dpatch, python-all-dev (>= 2.3.5-11)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://pyopengl.sourceforge.net
 XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyopengl/trunk/
@@ -13,7 +13,7 @@
 
 Package: python-opengl
 Architecture: all
-Depends: ${python:Depends}, python-ctypes, libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, freeglut3, python-pkg-resources
+Depends: ${python:Depends}, python-ctypes | python (>= 2.5), libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, freeglut3, python-pkg-resources
 Suggests: python-tk, python-numpy, libgle3
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to OpenGL

Modified: packages/pyopengl/trunk/debian/control.in
===================================================================
--- packages/pyopengl/trunk/debian/control.in	2008-07-02 23:03:57 UTC (rev 5819)
+++ packages/pyopengl/trunk/debian/control.in	2008-07-03 08:51:24 UTC (rev 5820)
@@ -5,7 +5,7 @@
 Uploaders: Torsten Marek <shlomme at debian.org>
 Build-Depends-Indep: python-setuptools (>= 0.6b3), libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, freeglut3, libgle3
 Build-Depends: @cdbs@, python-all-dev (>= 2.3.5-11)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://pyopengl.sourceforge.net
 XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyopengl/trunk/

Modified: packages/pyopengl/trunk/debian/patches/00list
===================================================================
--- packages/pyopengl/trunk/debian/patches/00list	2008-07-02 23:03:57 UTC (rev 5819)
+++ packages/pyopengl/trunk/debian/patches/00list	2008-07-03 08:51:24 UTC (rev 5820)
@@ -1 +1,3 @@
 01_no_ctypes_dep
+02_test_fix
+

Added: packages/pyopengl/trunk/debian/patches/02_test_fix.dpatch
===================================================================
--- packages/pyopengl/trunk/debian/patches/02_test_fix.dpatch	                        (rev 0)
+++ packages/pyopengl/trunk/debian/patches/02_test_fix.dpatch	2008-07-03 08:51:24 UTC (rev 5820)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_test_fix.dpatch by Torsten Marek <shlomme at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad pyopengl-3.0.0~b3~/OpenGL/tests/glread_test.py pyopengl-3.0.0~b3/OpenGL/tests/glread_test.py
+--- pyopengl-3.0.0~b3~/OpenGL/tests/glread_test.py	2008-06-06 17:57:23.000000000 +0200
++++ pyopengl-3.0.0~b3/OpenGL/tests/glread_test.py	2008-07-03 10:28:16.000000000 +0200
+@@ -30,8 +30,8 @@
+     glutDestroyWindow(win)
+     quit()
+ 
+-glutDisplayFunc(draw)
+-glutKeyboardFunc(keyfunc)
+-
+-glutMainLoop()
++if __name__ == "__main__":
++    glutDisplayFunc(draw)
++    glutKeyboardFunc(keyfunc)
+ 
++    glutMainLoop()


Property changes on: packages/pyopengl/trunk/debian/patches/02_test_fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/pyopengl/trunk/debian/patches/03_tk_fix.dpatch
===================================================================
--- packages/pyopengl/trunk/debian/patches/03_tk_fix.dpatch	                        (rev 0)
+++ packages/pyopengl/trunk/debian/patches/03_tk_fix.dpatch	2008-07-03 08:51:24 UTC (rev 5820)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_tk_fix.dpatch by Torsten Marek <shlomme at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad pyopengl-3.0.0~b3~/OpenGL/Tk/__init__.py pyopengl-3.0.0~b3/OpenGL/Tk/__init__.py
+--- pyopengl-3.0.0~b3~/OpenGL/Tk/__init__.py	2007-02-07 19:02:45.000000000 +0100
++++ pyopengl-3.0.0~b3/OpenGL/Tk/__init__.py	2008-07-03 10:43:47.000000000 +0200
+@@ -84,7 +84,11 @@
+ 	_default_root.tk.eval('load {} Togl')
+ except TclError:
+ 	pass
+-_default_root.tk.call('package', 'require', 'Togl')
++try:
++        _default_root.tk.call('package', 'require', 'Togl')
++except TclError:
++        if _default_root:
++                _default_root.destroy()
+ 
+ # This code is needed to avoid faults on sys.exit()
+ # [DAA, Jan 1998]


Property changes on: packages/pyopengl/trunk/debian/patches/03_tk_fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/pyopengl/trunk/debian/rules
===================================================================
--- packages/pyopengl/trunk/debian/rules	2008-07-02 23:03:57 UTC (rev 5819)
+++ packages/pyopengl/trunk/debian/rules	2008-07-03 08:51:24 UTC (rev 5820)
@@ -20,7 +20,5 @@
 	cd documentation/pydoc/ && PYTHONPATH="../.." python2.5 builddocs.py
 
 clean::
-#	hack (CDBS bug -- see #300149)
-	-rm -rf build
 	-sed -i -e '/setup\.cfg/d' PyOpenGL.egg-info/SOURCES.txt
-	-rm documentation/pydoc/*.html
+	-rm -f documentation/pydoc/*.html

More information about the Python-modules-commits mailing list