[Python-modules-commits] r15248 - in packages/coherence/trunk/debian (5 files)

[cjsmo-guest at users.alioth.debian.org]

    Date: Monday, January 3, 2011 @ 22:58:57
  Author: cjsmo-guest
Revision: 15248

updated package to use python2

Modified:
  packages/coherence/trunk/debian/changelog
  packages/coherence/trunk/debian/control
  packages/coherence/trunk/debian/patches/01_systray_fix
  packages/coherence/trunk/debian/patches/02_string_exception_fix
  packages/coherence/trunk/debian/rules

Modified: packages/coherence/trunk/debian/changelog
===================================================================
--- packages/coherence/trunk/debian/changelog	2011-01-03 12:29:13 UTC (rev 15247)
+++ packages/coherence/trunk/debian/changelog	2011-01-03 22:58:57 UTC (rev 15248)
@@ -1,3 +1,16 @@
+coherence (0.6.6.2-6) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - updated header information of all patches.
+  * debian/rules:
+    - added "--with python2".
+    - use dh_install exclude instead of "rm" to not install uuid.
+  * debian/control:
+    - added DMPT to Uploaders field.
+    - increased XS-P-V to >=2.6.
+
+ -- Charlie Smotherman <cjsmo at cableone.net>  Mon, 03 Jan 2011 16:24:42 -0500
+
 coherence (0.6.6.2-5) unstable; urgency=low
 
   * debian/rules made use of ${CURDIR} variable in remove statement.

Modified: packages/coherence/trunk/debian/control
===================================================================
--- packages/coherence/trunk/debian/control	2011-01-03 12:29:13 UTC (rev 15247)
+++ packages/coherence/trunk/debian/control	2011-01-03 22:58:57 UTC (rev 15248)
@@ -3,26 +3,19 @@
 Priority: extra
 Maintainer: Arnaud Quette <aquette at debian.org>
 Uploaders: Loic Minier <lool at dooz.org>, Charlie Smotherman <cjsmo at cableone.net>
-Build-Depends: debhelper (>= 7.0.50), python (>=2.5), python-twisted-core,
+Build-Depends: debhelper (>= 7.0.50), python (>=2.6.5-2~), python-twisted-core,
  python-twisted-web
-Build-Depends-Indep: python-support (>= 0.6.4), python-setuptools
-Standards-Version: 3.9.0
+Build-Depends-Indep: python-setuptools
+Standards-Version: 3.9.1
 Homepage: http://coherence.beebits.net
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/coherence/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/coherence/trunk/
-XS-Python-Version: >= 2.5
+XS-Python-Version: >=2.6
 
 Package: python-coherence
 Architecture: all
-Depends: ${misc:Depends},
-         ${python:Depends},
-         python-configobj,
-         python-gst0.10,
-         python-louie,
-         python-pkg-resources,
-         python-axiom,
-         python-tagpy,
-         python-zopeinterface
+Depends: ${misc:Depends}, ${python:Depends}, python-configobj, python-gst0.10,
+ python-louie, python-pkg-resources, python-axiom, python-tagpy, python-zopeinterface
 Conflicts: coherence
 Replaces: coherence
 Provides: coherence

Modified: packages/coherence/trunk/debian/patches/01_systray_fix
===================================================================
--- packages/coherence/trunk/debian/patches/01_systray_fix	2011-01-03 12:29:13 UTC (rev 15247)
+++ packages/coherence/trunk/debian/patches/01_systray_fix	2011-01-03 22:58:57 UTC (rev 15248)
@@ -1,9 +1,8 @@
-Subject: Desktop Applet not showing in system tray.
-
-* applet-coherence: added correct path to icon.
-
+Description: Desktop Applet not showing in system tray.
+Origin: Debian
 Bug-Debian: http://bugs.debian.org/572745
 Author: Olivier Berger <oberger at ouvaton.org>
+Forwarded: not needed.
 
 Index: coherence/misc/Desktop-Applet/applet-coherence
 ===================================================================

Modified: packages/coherence/trunk/debian/patches/02_string_exception_fix
===================================================================
--- packages/coherence/trunk/debian/patches/02_string_exception_fix	2011-01-03 12:29:13 UTC (rev 15247)
+++ packages/coherence/trunk/debian/patches/02_string_exception_fix	2011-01-03 22:58:57 UTC (rev 15248)
@@ -1,8 +1,7 @@
-Subject: Depreciated string exceptions in python (>=2.6)
-
-* gallery.py: corrected string exception.
-
+Description: Corrected depreciated string exceptions in python 2.6
+Origin: Debian
 Author: Charlie Smotherman <cjsmo at cableone.net>
+Forwarded: to upstreams bug tracker
 
 Index: coherence-0.6.6.3/coherence/extern/galleryremote/gallery.py
 ===================================================================

Modified: packages/coherence/trunk/debian/rules
===================================================================
--- packages/coherence/trunk/debian/rules	2011-01-03 12:29:13 UTC (rev 15247)
+++ packages/coherence/trunk/debian/rules	2011-01-03 22:58:57 UTC (rev 15248)
@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh --with python2 $@
 
 override_dh_auto_install:
 	dh_auto_install -- --single-version-externally-managed
+
 override_dh_install:
-	dh_install
-	rm -rf ${CURDIR}/debian/python-coherence/usr/lib/python*/*-packages/coherence/extern/uuid
+	dh_install -Xuuid