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

Mon Aug 1 02:52:05 UTC 2011

Date: Monday, August 1, 2011 @ 02:52:04
  Author: cjsmo-guest
Revision: 17961

added pydist-overrides, updated patches to DEP3, added 03_last_updated_service_workaround patch, updated to use dh_python2, use dh_install exclude instead of rm, added DMPT to uploaders

Added:
  packages/coherence/trunk/debian/patches/03_last_updated_service_field_workaround
  packages/coherence/trunk/debian/pydist-overrides
Modified:
  packages/coherence/trunk/debian/changelog
  packages/coherence/trunk/debian/control
  packages/coherence/trunk/debian/patches/series
  packages/coherence/trunk/debian/rules

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

--- packages/coherence/trunk/debian/changelog	2011-07-31 18:08:50 UTC (rev 17960)
+++ packages/coherence/trunk/debian/changelog	2011-08-01 02:52:04 UTC (rev 17961)
@@ -1,17 +1,22 @@
-coherence (0.6.6.2-6) UNRELEASED; urgency=low
+coherence (0.6.6.2-6) unstable; urgency=low
 
+  * added pydist-overrided for dhp2 error concerning python-configobj.
   * debian/patches:
-    - updated header information of all patches.
+    - updated header information for all patches.
+    - added 03_last_updated_service_field_workaround.  Thanks Danial T. Chen
+      for the bug report and thanks to Martin Bartlett for the patch.
+      Closes: #635835
   * debian/rules:
     - added "--with python2".
     - use dh_install exclude instead of "rm" to not install uuid.
+    - remove *egg.info in clean target dhp2 will regenerate it.
+    - dh_auto_install override no longer needed.
   * debian/control:
-    - added DMPT to Uploaders field.
-    - use X-S-V instead of XS-P-V
-    - increased X-P-V to >=2.6.
-    - increase python version to 2.6.6-3.
+    - added DMPT to uploaders field.
+    - use X-P-V instead of XS-P-V
+    - increase python version to 2.6.6-3~.
 
- -- Charlie Smotherman <cjsmo at cableone.net>  Mon, 03 Jan 2011 16:24:42 -0500
+ -- Charlie Smotherman <cjsmo at cableone.net>  Sun, 31 Jul 2011 21:42:42 -0500
 
 coherence (0.6.6.2-5) unstable; urgency=low
 

Modified: packages/coherence/trunk/debian/control
===================================================================
--- packages/coherence/trunk/debian/control	2011-07-31 18:08:50 UTC (rev 17960)
+++ packages/coherence/trunk/debian/control	2011-08-01 02:52:04 UTC (rev 17961)
@@ -2,20 +2,29 @@
 Section: python
 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.6.6-3), python-twisted-core,
+Uploaders: Loic Minier <lool at dooz.org>, Charlie Smotherman <cjsmo at cableone.net>,
+ Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 7.0.50),
+ python (>= 2.6.6-3),
+ python-setuptools,
+ python-twisted-core,
  python-twisted-web
-Build-Depends-Indep: python-setuptools
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 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/
-X-Python-Version: >=2.6
+X-Python-Version: >= 2.5
 
 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-configobj,
+ python-gst0.10,
+ python-louie,
+ python-pkg-resources,
+ python-axiom,
+ python-tagpy,
+ python-zopeinterface
 Conflicts: coherence
 Replaces: coherence
 Provides: coherence

Added: packages/coherence/trunk/debian/patches/03_last_updated_service_field_workaround
===================================================================
--- packages/coherence/trunk/debian/patches/03_last_updated_service_field_workaround	                        (rev 0)
+++ packages/coherence/trunk/debian/patches/03_last_updated_service_field_workaround	2011-08-01 02:52:04 UTC (rev 17961)
@@ -0,0 +1,23 @@
+Description: Force an update of the last_time_updated service field so that some clients will refresh
+Forwarded: http://coherence.beebits.net/ticket/320
+Author: Martin Bartlett
+Reviewed-By: Daniel T Chen <crimsun at ubuntu.com>
+Origin: Martin Bartlett, https://bugs.launchpad.net/ubuntu/+source/coherence/+bug/621722/+attachment/1515639/+files/service.py.patch
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/coherence/+bug/621722
+Last-Update: 2011-07-28
+
+--- coherence/service.py	2010-08-24 16:23:50.000000000 +0200
++++ ./coherence/upnp/core/service.py	2010-08-24 16:21:23.000000000 +0200
+@@ -368,6 +368,12 @@
+             self.detection_completed = True
+             louie.send('Coherence.UPnP.Service.detection_completed', sender=self.device, device=self.device)
+             self.info("send signal Coherence.UPnP.Service.detection_completed for %r" % self)
++            if self.last_time_updated == None:
++                # The clients (e.g. media_server_client) check for last time to detect whether service detection is complete
++                # so we need to set it here and now to avoid a potential race condition
++                self.last_time_updated = time.time()
++                louie.send('Coherence.UPnP.DeviceClient.Service.notified', sender=self.device, service=self)
++                self.info("send signal Coherence.UPnP.DeviceClient.Service.notified for %r" % self)
+             """
+             if (self.last_time_updated == None):
+                 if( self.id.endswith('AVTransport') or

Modified: packages/coherence/trunk/debian/patches/series
===================================================================
--- packages/coherence/trunk/debian/patches/series	2011-07-31 18:08:50 UTC (rev 17960)
+++ packages/coherence/trunk/debian/patches/series	2011-08-01 02:52:04 UTC (rev 17961)
@@ -1,2 +1,4 @@
+03_last_updated_service_field_workaround
 02_string_exception_fix
 01_systray_fix
+

Added: packages/coherence/trunk/debian/pydist-overrides
===================================================================
--- packages/coherence/trunk/debian/pydist-overrides	                        (rev 0)
+++ packages/coherence/trunk/debian/pydist-overrides	2011-08-01 02:52:04 UTC (rev 17961)
@@ -0,0 +1 @@
+ConfigObj python-configobj

Modified: packages/coherence/trunk/debian/rules
===================================================================
--- packages/coherence/trunk/debian/rules	2011-07-31 18:08:50 UTC (rev 17960)
+++ packages/coherence/trunk/debian/rules	2011-08-01 02:52:04 UTC (rev 17961)
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with python2 $@
+	dh $@ --with python2
 
-override_dh_auto_install:
-	dh_auto_install -- --single-version-externally-managed
+override_dh_auto_clean:
+	rm -rf build *.egg.info
 
 override_dh_install:
 	dh_install -Xuuid


