[Python-modules-commits] r13297 - in packages/coherence/trunk/debian (6 files)

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

    Date: Monday, June 7, 2010 @ 19:34:41
  Author: cjsmo-guest
Revision: 13297

fixed string exception, added README.source, fixed lintian errors, added coherence.docs

Added:
  packages/coherence/trunk/debian/README.source
  packages/coherence/trunk/debian/patches/02_string_exception_fix
Modified:
  packages/coherence/trunk/debian/changelog
  packages/coherence/trunk/debian/control
  packages/coherence/trunk/debian/patches/01_systray_fix
  packages/coherence/trunk/debian/patches/series

Added: packages/coherence/trunk/debian/README.source
===================================================================
--- packages/coherence/trunk/debian/README.source	                        (rev 0)
+++ packages/coherence/trunk/debian/README.source	2010-06-07 19:34:41 UTC (rev 13297)
@@ -0,0 +1,2 @@
+This package uses the quilt patch system to maintian several patches.  For
+more information about quilt please see /usr/share/doc/quilt/README.source.

Modified: packages/coherence/trunk/debian/changelog
===================================================================
--- packages/coherence/trunk/debian/changelog	2010-06-07 13:30:31 UTC (rev 13296)
+++ packages/coherence/trunk/debian/changelog	2010-06-07 19:34:41 UTC (rev 13297)
@@ -1,10 +1,15 @@
 coherence (0.6.6.2-4) unstable; urgency=low
 
-  [UNRELEASED]
   * Added debian/coherence.docs to install README into 
     /usr/share/docs/python-coherence. Closes: #572801
+  * Added debian/patches/02_string_exception_fix to correct an inappropriate
+    string exception.
+  * The package is named correctly in accordance with python policy
+    section 2.2. After talking with upsteam, he is not interested in
+    splitting the package at this time.  Closes: #572744 
+  * debian/control changed Standards-Version to 3.8.4 no changes needed.
 
- -- Charlie Smotherman <cjsmo at cableone.net>  Fri, 13 Mar 2010 13:46:00 -0600
+ -- Charlie Smotherman <cjsmo at cableone.net>  Mon, 07 June 2010 13:12:27 -0500
 
 coherence (0.6.6.2-3) unstable; urgency=low
 

Modified: packages/coherence/trunk/debian/control
===================================================================
--- packages/coherence/trunk/debian/control	2010-06-07 13:30:31 UTC (rev 13296)
+++ packages/coherence/trunk/debian/control	2010-06-07 19:34:41 UTC (rev 13297)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7.0.50), quilt (>=0.46-7)
 Build-Depends-Indep: python (>=2.5), python-support (>= 0.6.4), python-setuptools,
  python-twisted-core, python-twisted-web
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 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/

Modified: packages/coherence/trunk/debian/patches/01_systray_fix
===================================================================
--- packages/coherence/trunk/debian/patches/01_systray_fix	2010-06-07 13:30:31 UTC (rev 13296)
+++ packages/coherence/trunk/debian/patches/01_systray_fix	2010-06-07 19:34:41 UTC (rev 13297)
@@ -1,3 +1,10 @@
+Subject: Desktop Applet not showing in system tray.
+
+* applet-coherence: added correct path to icon.
+
+Bug-Debian: http://bugs.debian.org/572745
+Author: Olivier Berger <oberger at ouvaton.org>
+
 Index: coherence/misc/Desktop-Applet/applet-coherence
 ===================================================================
 --- coherence.orig/misc/Desktop-Applet/applet-coherence	2010-03-12 10:34:31.000000000 -0600

Added: packages/coherence/trunk/debian/patches/02_string_exception_fix
===================================================================
--- packages/coherence/trunk/debian/patches/02_string_exception_fix	                        (rev 0)
+++ packages/coherence/trunk/debian/patches/02_string_exception_fix	2010-06-07 19:34:41 UTC (rev 13297)
@@ -0,0 +1,19 @@
+Subject: Depreciated string exceptions in python (>=2.6)
+
+* gallery.py: corrected string exception.
+
+Author: Charlie Smotherman <cjsmo at cableone.net>
+
+Index: coherence-0.6.6.3/coherence/extern/galleryremote/gallery.py
+===================================================================
+--- coherence-0.6.6.3.orig/coherence/extern/galleryremote/gallery.py	2010-06-07 12:10:53.440177834 -0500
++++ coherence-0.6.6.3/coherence/extern/galleryremote/gallery.py	2010-06-07 12:11:39.520707119 -0500
+@@ -137,7 +137,7 @@
+ 
+         # make sure the 1st line is #__GR2PROTO__
+         if string.find( line, '#__GR2PROTO__' ) == -1:
+-            raise "Bad response: \r\n" + response
++            raise Exception("Bad response: \r\n" + response)
+ 
+         resDict = {}
+ 

Modified: packages/coherence/trunk/debian/patches/series
===================================================================
--- packages/coherence/trunk/debian/patches/series	2010-06-07 13:30:31 UTC (rev 13296)
+++ packages/coherence/trunk/debian/patches/series	2010-06-07 19:34:41 UTC (rev 13297)
@@ -1 +1,2 @@
+02_string_exception_fix
 01_systray_fix