diff -u pyopengl-3.0.0~b1/debian/rules pyopengl-3.0.0~b1/debian/rules --- pyopengl-3.0.0~b1/debian/rules +++ pyopengl-3.0.0~b1/debian/rules @@ -16,11 +16,8 @@ +UPSTREAM_VERSION=$(subst ~,,${DEB_UPSTREAM_VERSION}) +PYVER=$(shell pyversions -vd) + pre-build:: chmod a-x PyOpenGL.egg-info/* install/python-opengl-doc:: - 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 + cd documentation/pydoc/ && PYTHONPATH="../.." python$(PYVER) builddocs.py diff -u pyopengl-3.0.0~b1/debian/control pyopengl-3.0.0~b1/debian/control --- pyopengl-3.0.0~b1/debian/control +++ pyopengl-3.0.0~b1/debian/control @@ -1,7 +1,8 @@ Source: pyopengl Section: python Priority: optional -Maintainer: Debian Python Modules Team +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Torsten Marek 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) @@ -13,8 +14,9 @@ Package: python-opengl Architecture: all -Depends: ${python:Depends}, python-ctypes, libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, freeglut3, python-pkg-resources +Depends: ${python:Depends}, libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, freeglut3, python-pkg-resources Suggests: python-tk, python-numpy, libgle3 +Recommends: python (>= 2.5) | python-ctypes XB-Python-Version: ${python:Versions} Description: Python bindings to OpenGL PyOpenGL is a cross-platform open source Python binding to the standard diff -u pyopengl-3.0.0~b1/debian/changelog pyopengl-3.0.0~b1/debian/changelog --- pyopengl-3.0.0~b1/debian/changelog +++ pyopengl-3.0.0~b1/debian/changelog @@ -1,3 +1,21 @@ +pyopengl (3.0.0~b1-2ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable.(LP: #239858) Remaining Ubuntu changes: + * Make python-ctypes a recommendation (python2.5 includes it). + * Modify Maintainer value to match the DebianMaintainerField + specification. + * debian/rules: + - clean target: + - remove workaround for cdbs bug, which is fixed already + - Do not remove setup.cfg from PyOpenGL.egg-info/SOURCES.txt. + I could not find a reference why it was added and other packages + do not remove it, too. + + * changelog: removed spurious file + * debian/rules: don't use fixed pyversion for building docs + + -- Andrea Gasparini Mon, 19 May 2008 03:10:01 +0200 + pyopengl (3.0.0~b1-2) unstable; urgency=low * debian/rules @@ -36,6 +54,54 @@ -- Torsten Marek Sun, 02 Mar 2008 22:51:50 +0100 +pyopengl (3.0.0~b1-0ubuntu4) hardy; urgency=low + + * debian/control: Conflict/Replace python2.4-opengl, to allow upgrades from + Dapper. + + -- William Grant Sun, 30 Mar 2008 18:42:58 +1100 + +pyopengl (3.0.0~b1-0ubuntu3) hardy; urgency=low + + * python-opengl: Depend on python-pkg-resources instead of python-setuptools. + + -- Matthias Klose Wed, 12 Mar 2008 07:13:50 +0000 + +pyopengl (3.0.0~b1-0ubuntu2) hardy; urgency=low + + * debian/rules: + - Removed "mv" of .egg-info directory in + common-binary-post-install-indep, which caused broken symlinks in + /usr/lib/python2.5/site-packages/PyOpenGL-3.0.0b1-py2.5.egg-info/. + According to snapshot.debian.org the first package introducing this had + already the "Where does this come from" comment in it (3.0.0~a6-1). + The links where broken in 3.0.0~a6, too, but it did not depend on the + OpenGL.platform.implementation feature. (LP: #195270) + - clean target: + - remove workaround for cdbs bug, which is fixed already + - Do not remove setup.cfg from PyOpenGL.egg-info/SOURCES.txt. + I could not find a reference why it was added and other packages + do not remove it, too. + * debian/control: + - Standards-Version 3.7.3 + - Moved Homepage from Description to control field + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Daniel Hahler Wed, 27 Feb 2008 01:43:32 +0100 + +pyopengl (3.0.0~b1-0ubuntu1) hardy; urgency=low + + * New upstream version. + + -- Matthias Klose Thu, 21 Feb 2008 09:14:35 +0000 + +pyopengl (3.0.0~a6-4ubuntu1) gutsy; urgency=low + + * Make python-ctypes a recommendation (python2.5 includes it). + + -- Matthias Klose Thu, 30 Aug 2007 11:30:47 +0000 + pyopengl (3.0.0~a6-4) unstable; urgency=low * Just suggest python-numpy, don't recommend it. (Closes: #435602) diff -u pyopengl-3.0.0~b1/debian/control.in pyopengl-3.0.0~b1/debian/control.in --- pyopengl-3.0.0~b1/debian/control.in +++ pyopengl-3.0.0~b1/debian/control.in @@ -1,7 +1,8 @@ Source: pyopengl Section: python Priority: optional -Maintainer: Debian Python Modules Team +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Torsten Marek 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) @@ -13,7 +14,8 @@ Package: python-opengl Architecture: all -Depends: ${python:Depends}, python-ctypes, libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, freeglut3, python-pkg-resources +Depends: ${python:Depends}, libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, freeglut3, python-pkg-resources +Recommends: python (>= 2.5) | python-ctypes Suggests: python-tk, python-numpy, libgle3 XB-Python-Version: ${python:Versions} Description: Python bindings to OpenGL only in patch2: unchanged: