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

Sat Mar 10 13:54:48 UTC 2012

Date: Saturday, March 10, 2012 @ 13:54:47
  Author: adejong
Revision: 20725

Merge changes from 3.0.0~c1-1 into trunk.

Added:
  packages/pyopengl/trunk/debian/preinst
    (from rev 20724, packages/pyopengl/tags/3.0.0~c1-1/debian/preinst)
  packages/pyopengl/trunk/debian/pyversions
    (from rev 20724, packages/pyopengl/tags/3.0.0~c1-1/debian/pyversions)
Modified:
  packages/pyopengl/trunk/debian/changelog
  packages/pyopengl/trunk/debian/control
  packages/pyopengl/trunk/debian/control.in
  packages/pyopengl/trunk/debian/rules
Deleted:
  packages/pyopengl/trunk/debian/patches/00list

Modified: packages/pyopengl/trunk/debian/changelog
===================================================================

--- packages/pyopengl/trunk/debian/changelog	2012-03-10 13:52:23 UTC (rev 20724)
+++ packages/pyopengl/trunk/debian/changelog	2012-03-10 13:54:47 UTC (rev 20725)
@@ -4,14 +4,21 @@
   * debian/compat
     - bumped debhelper compatibility level to 7
   * debian/control, debian/rules
+    - Switched to python-support
+    - bumped standards version to 3.8.1, no changes necessary
     - removed python-opengl-doc, documentation is not distributed anymore
       by upstream.
     - removed build dependency on python-setuptools and run-time
       dependency on python-pkg-resource, not needed anymore
     - dropped build dependencies on all GL libraries, not needed anymore
       because documentation is removed
+    - removed dependencies on dpatch
+  * debian/preinst
+    - make sure pycentral files are removed properly
+  * debian/patches/00list
+    - deactivated patches
 
- -- Torsten Marek <shlomme at debian.org>  Mon, 02 Mar 2009 23:58:57 +0100
+ -- Torsten Marek <shlomme at debian.org>  Fri, 27 Mar 2009 15:11:57 +0100
 
 pyopengl (3.0.0~b6-3) unstable; urgency=low
 

Modified: packages/pyopengl/trunk/debian/control
===================================================================
--- packages/pyopengl/trunk/debian/control	2012-03-10 13:52:23 UTC (rev 20724)
+++ packages/pyopengl/trunk/debian/control	2012-03-10 13:54:47 UTC (rev 20725)
@@ -3,16 +3,15 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> 
 Uploaders: Torsten Marek <shlomme at debian.org>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7), python-central (>= 0.6), dpatch, python-all-dev (>= 2.3.5-11)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.1), cdbs (>= 0.4.43), python-support, python-dev (>= 2.3.5-11)
+Standards-Version: 3.8.1
 Homepage: http://pyopengl.sourceforge.net
-XS-Python-Version: >= 2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyopengl/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/pyopengl/trunk/
 
 Package: python-opengl
 Architecture: all
-Depends: ${python:Depends}, python-ctypes | python (>= 2.5), libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, freeglut3
+Depends: ${python:Depends}, python-ctypes | python (>= 2.5), libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, freeglut3, ${misc:Depends}
 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	2012-03-10 13:52:23 UTC (rev 20724)
+++ packages/pyopengl/trunk/debian/control.in	2012-03-10 13:54:47 UTC (rev 20725)
@@ -3,16 +3,15 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> 
 Uploaders: Torsten Marek <shlomme at debian.org>
-Build-Depends: @cdbs@, python-all-dev (>= 2.3.5-11)
-Standards-Version: 3.8.0
+Build-Depends: @cdbs@, python-dev (>= 2.3.5-11)
+Standards-Version: 3.8.1
 Homepage: http://pyopengl.sourceforge.net
-XS-Python-Version: >= 2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyopengl/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/pyopengl/trunk/
 
 Package: python-opengl
 Architecture: all
-Depends: ${python:Depends}, python-ctypes | python (>= 2.5), libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, freeglut3
+Depends: ${python:Depends}, python-ctypes | python (>= 2.5), libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, freeglut3, ${misc:Depends}
 Suggests: python-tk, python-numpy, libgle3
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to OpenGL

Deleted: packages/pyopengl/trunk/debian/patches/00list
===================================================================
Copied: packages/pyopengl/trunk/debian/preinst (from rev 20724, packages/pyopengl/tags/3.0.0~c1-1/debian/preinst)
===================================================================
--- packages/pyopengl/trunk/debian/preinst	                        (rev 0)
+++ packages/pyopengl/trunk/debian/preinst	2012-03-10 13:54:47 UTC (rev 20725)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 3.0.0~c1-1; then
+   pycentral pkgremove python-opengl
+fi
+

Copied: packages/pyopengl/trunk/debian/pyversions (from rev 20724, packages/pyopengl/tags/3.0.0~c1-1/debian/pyversions)
===================================================================
--- packages/pyopengl/trunk/debian/pyversions	                        (rev 0)
+++ packages/pyopengl/trunk/debian/pyversions	2012-03-10 13:54:47 UTC (rev 20725)
@@ -0,0 +1 @@
+2.4-

Modified: packages/pyopengl/trunk/debian/rules
===================================================================
--- packages/pyopengl/trunk/debian/rules	2012-03-10 13:52:23 UTC (rev 20724)
+++ packages/pyopengl/trunk/debian/rules	2012-03-10 13:54:47 UTC (rev 20725)
@@ -1,9 +1,8 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pycentral
+DEB_PYTHON_SYSTEM=pysupport
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-# needed to use the dpatch tools (like dpatch-edit-patch)
-include /usr/share/dpatch/dpatch.make
+#include /usr/share/cdbs/1/rules/dpatch.mk
+#include /usr/share/dpatch/dpatch.make


