[Python-apps-commits] r14042 - in packages/spambayes/trunk/debian (5 files)

[hle at users.alioth.debian.org]

    Date: Wednesday, May 24, 2017 @ 14:26:54
  Author: hle
Revision: 14042

Fix #789564

Added:
  packages/spambayes/trunk/debian/patches/lockfile.patch
Modified:
  packages/spambayes/trunk/debian/changelog
  packages/spambayes/trunk/debian/control
  packages/spambayes/trunk/debian/patches/series
  packages/spambayes/trunk/debian/spambayes.docs

Modified: packages/spambayes/trunk/debian/changelog
===================================================================
--- packages/spambayes/trunk/debian/changelog	2017-05-24 13:59:38 UTC (rev 14041)
+++ packages/spambayes/trunk/debian/changelog	2017-05-24 14:26:54 UTC (rev 14042)
@@ -12,8 +12,11 @@
     - Make debian/copyright DEP5 compliant.
     - Re-license debian/* to GPL-3+ (Approved by Alexandre Fayolle).
     - Update Hugo Lefeuvre's e-mail address.
-  * Install CHANGELOG.txt instead of changelog in spambayes.docs.
+  * Upstream changelog is automatically installed, stop mentionning
+    it in debian/spambayes.docs
   * Remove debian/TODO, not up-to-date anymore.
+  * debian/patches/lockfile.patch:
+    - Compatibility with newer python-lockfile (>> 0.10) (Closes: #789564)
 
  -- Hugo Lefeuvre <hle at debian.org>  Wed, 24 May 2017 15:09:12 +0200
 

Modified: packages/spambayes/trunk/debian/control
===================================================================
--- packages/spambayes/trunk/debian/control	2017-05-24 13:59:38 UTC (rev 14041)
+++ packages/spambayes/trunk/debian/control	2017-05-24 14:26:54 UTC (rev 14042)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 10), 
                python, 
                python-setuptools, 
-               python-lockfile,
+               python-lockfile (>= 1:0.10),
                dh-python
 Standards-Version: 3.9.8
 X-Python-Version: >= 2.6

Added: packages/spambayes/trunk/debian/patches/lockfile.patch
===================================================================
--- packages/spambayes/trunk/debian/patches/lockfile.patch	                        (rev 0)
+++ packages/spambayes/trunk/debian/patches/lockfile.patch	2017-05-24 14:26:54 UTC (rev 14042)
@@ -0,0 +1,26 @@
+Description: Compatibility with newer python-lockfile
+ Follow the gratuitous renaming of the main python-lockfile API.
+Author: <jepler at unpythonic.net>
+Bug-Debian: https://bugs.debian.org/789564
+Forwarded: no
+Last-Update: 2017-05-24
+--- a/spambayes/safepickle.py	2008-11-25 02:33:24.000000000 +0100
++++ b/spambayes/safepickle.py	2017-05-24 16:23:21.063862689 +0200
+@@ -10,7 +10,7 @@
+ 
+ def pickle_read(filename):
+     """Read pickle file contents with a lock."""
+-    lock = lockfile.FileLock(filename)
++    lock = lockfile.LockFile(filename)
+     lock.acquire(timeout=20)
+     try:
+         return pickle.load(open(filename, 'rb'))
+@@ -20,7 +20,7 @@
+ def pickle_write(filename, value, protocol=0):
+     '''Store value as a pickle without creating corruption'''
+ 
+-    lock = lockfile.FileLock(filename)
++    lock = lockfile.LockFile(filename)
+     lock.acquire(timeout=20)
+ 
+     try:

Modified: packages/spambayes/trunk/debian/patches/series
===================================================================
--- packages/spambayes/trunk/debian/patches/series	2017-05-24 13:59:38 UTC (rev 14041)
+++ packages/spambayes/trunk/debian/patches/series	2017-05-24 14:26:54 UTC (rev 14042)
@@ -1,3 +1,4 @@
+lockfile.patch
 gnus_fix.patch
 paths_fix.patch
 asyncore.patch

Modified: packages/spambayes/trunk/debian/spambayes.docs
===================================================================
--- packages/spambayes/trunk/debian/spambayes.docs	2017-05-24 13:59:38 UTC (rev 14041)
+++ packages/spambayes/trunk/debian/spambayes.docs	2017-05-24 14:26:54 UTC (rev 14042)
@@ -1,4 +1,3 @@
-CHANGELOG.txt
 NEWTRICKS.txt
 POP3PROXY.txt
 README-DEVEL.txt