[tryton-debian-vcs] cached-property branch debian updated. debian/1.2.0-1-5-g987c876

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu May 21 16:19:45 UTC 2015


The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/cached-property.git;a=commitdiff;h=debian/1.2.0-1-5-g987c876

commit 987c87652e97bbaec20ac7cd40c71e4a58154ffb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu May 21 18:17:21 2015 +0200

    Releasing debian version 1.2.0+ds-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 633f2b9..30ba685 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cached-property (1.2.0+ds-1) unstable; urgency=medium
+
+  * Merging upstream version 1.2.0+ds.
+  * Adding the cause for tarball repacking in copyright.
+  * Removing 01-fix-codec-error.patch, patch must be applied on tarball.
+  * Adapting watch file to mangle repacked tarball name.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 21 May 2015 17:36:14 +0200
+
 cached-property (1.2.0-1) unstable; urgency=medium
 
   * Merging upstream version 1.2.0.
commit 7b0cf5f49c794062eed0dc85a1f232a775158d6e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu May 21 17:35:33 2015 +0200

    Adapting watch file to mangle repacked tarball name.

diff --git a/debian/watch b/debian/watch
index eb6eb7f..bca5f14 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+opts=dversionmangle=s/\+ds$//,uversionmangle=s/(rc|a|b|c)/~$1/ \
 http://pypi.debian.net/cached-property/cached-property-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
commit 4db07653063cd5fe7a02f5af50cc6fb01e683505
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu May 21 17:34:40 2015 +0200

    Removing 01-fix-codec-error.patch, patch must be applied on tarball.

diff --git a/debian/patches/01-fix-codec-error.patch b/debian/patches/01-fix-codec-error.patch
deleted file mode 100644
index 57ed968..0000000
--- a/debian/patches/01-fix-codec-error.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Fixing UnicodeDecodeError in setup.py.
- Fixes:
- I: pybuild base:170: python3.4 setup.py clean
- Traceback (most recent call last):
- File "setup.py", line 15, in
- history = open('HISTORY.rst').read().replace('.. :changelog:', '')
- File "/usr/lib/python3.4/encodings/ascii.py", line 26, in decode
- return codecs.ascii_decode(input, self.errors)[0]
- i : 'ascii' codec can't decode byte 0xe2 in position 561: ordinal not in range(128)
-Author: Mathias Behrle <mathiasb at m9s.biz>
-Origin: https://github.com/mbehrle/cached-property/commit/e75addd999cdd702675fdb27c9eaefe51fe68e06
-Bug: https://github.com/pydanny/cached-property/issues/22
-Forwarded: https://github.com/pydanny/cached-property/pull/23
-
---- cached-property.orig/setup.py	2015-05-12 15:31:55.692859294 +0200
-+++ cached-property/setup.py	2015-05-12 15:31:55.688859329 +0200
-@@ -3,6 +3,7 @@
- 
- import os
- import sys
-+import codecs
- 
- try:
-     from setuptools import setup
-@@ -11,8 +12,13 @@
- 
- __version__ = '1.2.0'
- 
--readme = open('README.rst').read()
--history = open('HISTORY.rst').read().replace('.. :changelog:', '')
-+
-+def read(fname):
-+    return codecs.open(
-+        os.path.join(os.path.dirname(__file__), fname), 'r', 'utf-8').read()
-+
-+readme = read('README.rst')
-+history = read('HISTORY.rst').replace('.. :changelog:', '')
- 
- if sys.argv[-1] == 'publish':
-     os.system('python setup.py sdist bdist_wheel upload')
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 31c3af6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-fix-codec-error.patch
commit 91612723ba6a1c03a6482ca36bd0edc1f2484954
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu May 21 17:30:51 2015 +0200

    Adding the cause for tarball repacking in copyright.
    
    The pristine upstream source fails to clean with python 3.4 in the
    usual build process (python3.4 setup.py clean). Since at this
    early stage quilt patches are not yet applied, the upstream tarball
    has to be patched to work with python 3.4.
    Issue: https://github.com/pydanny/cached-property/issues/22
    Fix: https://github.com/mbehrle/cached-property/commit/e75addd999cdd702675fdb27c9eaefe51fe68e06

diff --git a/debian/copyright b/debian/copyright
index fce92c3..9563dfc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,13 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: cached-property
+Upstream-Contact: Daniel Greenfeld <pydanny at gmail.com>
+Source: https://github.com/pydanny/cached-property
+    The pristine upstream source fails to clean with python 3.4 in the
+    usual build process (python3.4 setup.py clean). Since at this early stage
+    quilt patches are not yet applied, the upstream tar ball has to be patched
+    to work with python 3.4.
+    Issue: https://github.com/pydanny/cached-property/issues/22
+    Fix: https://github.com/mbehrle/cached-property/commit/e75addd999cdd702675fdb27c9eaefe51fe68e06
 
 Files: *
 Copyright: 2015 Daniel Greenfeld
commit 3ad55bb154580b23557cdd716bac4ff9c0d3caf1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu May 21 17:16:50 2015 +0200

    Merging upstream version 1.2.0+ds.

diff --git a/setup.py b/setup.py
index a3855b6..c26ef9b 100755
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@
 
 import os
 import sys
+import codecs
 
 try:
     from setuptools import setup
@@ -11,8 +12,13 @@ except ImportError:
 
 __version__ = '1.2.0'
 
-readme = open('README.rst').read()
-history = open('HISTORY.rst').read().replace('.. :changelog:', '')
+
+def read(fname):
+    return codecs.open(
+        os.path.join(os.path.dirname(__file__), fname), 'r', 'utf-8').read()
+
+readme = read('README.rst')
+history = read('HISTORY.rst').replace('.. :changelog:', '')
 
 if sys.argv[-1] == 'publish':
     os.system('python setup.py sdist bdist_wheel upload')
-- 
cached-property



More information about the tryton-debian-vcs mailing list