[Python-modules-commits] r29586 - in packages/python-hiredis/tags (11 files)
apoikos at users.alioth.debian.org
apoikos at users.alioth.debian.org
Wed Jul 2 08:32:58 UTC 2014
Date: Wednesday, July 2, 2014 @ 08:32:57
Author: apoikos
Revision: 29586
[svn-buildpackage] Tagging python-hiredis 0.1.4-1
Added:
packages/python-hiredis/tags/0.1.4-1/
packages/python-hiredis/tags/0.1.4-1/debian/changelog
(from rev 29585, packages/python-hiredis/trunk/debian/changelog)
packages/python-hiredis/tags/0.1.4-1/debian/control
(from rev 29583, packages/python-hiredis/trunk/debian/control)
packages/python-hiredis/tags/0.1.4-1/debian/copyright
(from rev 29584, packages/python-hiredis/trunk/debian/copyright)
packages/python-hiredis/tags/0.1.4-1/debian/patches/0001-Use-system-libhiredis.patch
(from rev 29581, packages/python-hiredis/trunk/debian/patches/0001-Use-system-libhiredis.patch)
packages/python-hiredis/tags/0.1.4-1/debian/watch
(from rev 29580, packages/python-hiredis/trunk/debian/watch)
Deleted:
packages/python-hiredis/tags/0.1.4-1/debian/changelog
packages/python-hiredis/tags/0.1.4-1/debian/control
packages/python-hiredis/tags/0.1.4-1/debian/copyright
packages/python-hiredis/tags/0.1.4-1/debian/patches/0001-Use-system-libhiredis.patch
packages/python-hiredis/tags/0.1.4-1/debian/watch
Deleted: packages/python-hiredis/tags/0.1.4-1/debian/changelog
===================================================================
--- packages/python-hiredis/trunk/debian/changelog 2014-07-02 06:24:16 UTC (rev 29578)
+++ packages/python-hiredis/tags/0.1.4-1/debian/changelog 2014-07-02 08:32:57 UTC (rev 29586)
@@ -1,12 +0,0 @@
-python-hiredis (0.1.1-2) UNRELEASED; urgency=low
-
- * Use canonical URIs for Vcs-* fields.
- * Run tests only if DEB_BUILD_OPTIONS=nocheck is not set.
-
- -- Jakub Wilk <jwilk at debian.org> Thu, 13 Jun 2013 13:13:49 +0200
-
-python-hiredis (0.1.1-1) unstable; urgency=low
-
- * Initial release (Closes: #705915)
-
- -- Apollon Oikonomopoulos <apoikos at gmail.com> Mon, 22 Apr 2013 10:38:35 +0300
Copied: packages/python-hiredis/tags/0.1.4-1/debian/changelog (from rev 29585, packages/python-hiredis/trunk/debian/changelog)
===================================================================
--- packages/python-hiredis/tags/0.1.4-1/debian/changelog (rev 0)
+++ packages/python-hiredis/tags/0.1.4-1/debian/changelog 2014-07-02 08:32:57 UTC (rev 29586)
@@ -0,0 +1,19 @@
+python-hiredis (0.1.4-1) unstable; urgency=low
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+ * Run tests only if DEB_BUILD_OPTIONS=nocheck is not set.
+
+ [ Apollon Oikonomopoulos ]
+ * New upstream release.
+ + Refresh 0001-Use-system-libhiredis.patch.
+ * Update debian/copyright.
+ * Bump standards to 3.9.5 (no changes needed).
+
+ -- Apollon Oikonomopoulos <apoikos at debian.org> Wed, 02 Jul 2014 11:28:01 +0300
+
+python-hiredis (0.1.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #705915)
+
+ -- Apollon Oikonomopoulos <apoikos at gmail.com> Mon, 22 Apr 2013 10:38:35 +0300
Deleted: packages/python-hiredis/tags/0.1.4-1/debian/control
===================================================================
--- packages/python-hiredis/trunk/debian/control 2014-07-02 06:24:16 UTC (rev 29578)
+++ packages/python-hiredis/tags/0.1.4-1/debian/control 2014-07-02 08:32:57 UTC (rev 29586)
@@ -1,27 +0,0 @@
-Source: python-hiredis
-Section: python
-Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Apollon Oikonomopoulos <apoikos at gmail.com>
-Build-Depends: debhelper (>= 9), python-all-dev, libhiredis-dev, python-setuptools
-Standards-Version: 3.9.4
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-hiredis/trunk/
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-hiredis/trunk/
-Homepage: http://github.com/pietern/hiredis-py
-
-Package: python-hiredis
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: python-redis
-Suggests: redis-server, python-gevent
-Description: redis protocol reader for Python using hiredis
- python-hiredis provides a Python extension that wraps the protocol parsing
- code in Hiredis. It is targeted at speeding up parsing multi bulk replies from
- redis-server.
- .
- Hiredis is a minimalistic C client library for the Redis database, a
- persistent key-value database with support for atomically manipulating and
- querying data structures such as lists and sets.
- .
- python-hiredis is not a stand-alone redis client library and requires other
- code to perform low-level I/O with redis.
Copied: packages/python-hiredis/tags/0.1.4-1/debian/control (from rev 29583, packages/python-hiredis/trunk/debian/control)
===================================================================
--- packages/python-hiredis/tags/0.1.4-1/debian/control (rev 0)
+++ packages/python-hiredis/tags/0.1.4-1/debian/control 2014-07-02 08:32:57 UTC (rev 29586)
@@ -0,0 +1,28 @@
+Source: python-hiredis
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Apollon Oikonomopoulos <apoikos at debian.org>
+Build-Depends: debhelper (>= 9), python-all-dev, libhiredis-dev, python-setuptools
+Standards-Version: 3.9.5
+X-Python-Version: >= 2.6
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-hiredis/trunk/
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-hiredis/trunk/
+Homepage: http://github.com/redis/hiredis-py
+
+Package: python-hiredis
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: python-redis
+Suggests: redis-server, python-gevent
+Description: redis protocol reader for Python using hiredis
+ python-hiredis provides a Python extension that wraps the protocol parsing
+ code in Hiredis. It is targeted at speeding up parsing multi bulk replies from
+ redis-server.
+ .
+ Hiredis is a minimalistic C client library for the Redis database, a
+ persistent key-value database with support for atomically manipulating and
+ querying data structures such as lists and sets.
+ .
+ python-hiredis is not a stand-alone redis client library and requires other
+ code to perform low-level I/O with redis.
Deleted: packages/python-hiredis/tags/0.1.4-1/debian/copyright
===================================================================
--- packages/python-hiredis/trunk/debian/copyright 2014-07-02 06:24:16 UTC (rev 29578)
+++ packages/python-hiredis/tags/0.1.4-1/debian/copyright 2014-07-02 08:32:57 UTC (rev 29586)
@@ -1,37 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: hiredis-py
-Source: http://github.com/pietern/hiredis-py
-
-Files: *
-Copyright: 2011-2012, Pieter Noordhuis
-License: BSD-3-clause
-
-Files: debian/*
-Copyright: 2013 Apollon Oikonomopoulos <apoikos at gmail.com>
-License: BSD-3-clause
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- .
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- .
- * Neither the name of Redis nor the names of its contributors may be used to
- endorse or promote products derived from this software without specific prior
- written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copied: packages/python-hiredis/tags/0.1.4-1/debian/copyright (from rev 29584, packages/python-hiredis/trunk/debian/copyright)
===================================================================
--- packages/python-hiredis/tags/0.1.4-1/debian/copyright (rev 0)
+++ packages/python-hiredis/tags/0.1.4-1/debian/copyright 2014-07-02 08:32:57 UTC (rev 29586)
@@ -0,0 +1,37 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: hiredis-py
+Source: http://github.com/redis/hiredis-py
+
+Files: *
+Copyright: 2011-2014, Pieter Noordhuis
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: 2013-2014, Apollon Oikonomopoulos <apoikos at debian.org>
+License: BSD-3-clause
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ * Neither the name of Redis nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific prior
+ written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Deleted: packages/python-hiredis/tags/0.1.4-1/debian/patches/0001-Use-system-libhiredis.patch
===================================================================
--- packages/python-hiredis/trunk/debian/patches/0001-Use-system-libhiredis.patch 2014-07-02 06:24:16 UTC (rev 29578)
+++ packages/python-hiredis/tags/0.1.4-1/debian/patches/0001-Use-system-libhiredis.patch 2014-07-02 08:32:57 UTC (rev 29586)
@@ -1,39 +0,0 @@
-From: Apollon Oikonomopoulos <apollon at skroutz.gr>
-Date: Mon, 22 Apr 2013 10:51:27 +0300
-Subject: Use system libhiredis
-
-Patch setup.py to not build hiredis in vendor/
-
-Forwarded: no
-Last-Updated: 2013-04-22
----
- setup.py | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index cb6bd26..f22628d 100755
---- a/setup.py
-+++ b/setup.py
-@@ -20,13 +20,9 @@ class install_lib(_install_lib.install_lib):
- if self.distribution.has_ext_modules():
- self.run_command('build_ext')
-
--lib = ("hiredis", {
-- "sources": ["vendor/hiredis/%s.c" % src for src in ("hiredis", "net", "sds")],
-- "include_dirs": ["vendor/hiredis"]})
--
- ext = Extension("hiredis.hiredis",
- sources=glob.glob("src/*.c"),
-- include_dirs=["src", "vendor"],
-+ include_dirs=["src"],
- libraries=["hiredis"])
-
- setup(
-@@ -39,7 +35,6 @@ setup(
- keywords=["Redis"],
- license="BSD",
- packages=["hiredis"],
-- libraries=[lib],
- ext_modules=[ext],
-
- # Override "install_lib" command
Copied: packages/python-hiredis/tags/0.1.4-1/debian/patches/0001-Use-system-libhiredis.patch (from rev 29581, packages/python-hiredis/trunk/debian/patches/0001-Use-system-libhiredis.patch)
===================================================================
--- packages/python-hiredis/tags/0.1.4-1/debian/patches/0001-Use-system-libhiredis.patch (rev 0)
+++ packages/python-hiredis/tags/0.1.4-1/debian/patches/0001-Use-system-libhiredis.patch 2014-07-02 08:32:57 UTC (rev 29586)
@@ -0,0 +1,38 @@
+From: Apollon Oikonomopoulos <apoikos at debian.org>
+Date: Wed, 2 Jul 2014 10:51:27 +0300
+Subject: Use system libhiredis
+
+Patch setup.py to not build hiredis in vendor/
+
+Forwarded: no
+Last-Updated: 2014-07-02
+diff --git a/setup.py b/setup.py
+index c2c4dcd..529cb38 100755
+--- a/setup.py
++++ b/setup.py
+@@ -41,7 +41,8 @@ lib = ("hiredis_for_hiredis_py", {
+
+ ext = Extension("hiredis.hiredis",
+ sources=glob.glob("src/*.c"),
+- include_dirs=["vendor"])
++ include_dirs=["vendor"],
++ extra_link_args=["-lhiredis"])
+
+ setup(
+ name="hiredis",
+@@ -53,11 +54,13 @@ setup(
+ keywords=["Redis"],
+ license="BSD",
+ packages=["hiredis"],
+- libraries=[lib],
++ # Disabled in Debian, we use the system hiredis library
++ # libraries=[lib],
+ ext_modules=[ext],
+
+ # Override "install_lib" command
+- cmdclass={ "install_lib": install_lib },
++ # Debian: disable and link against the system hiredis library
++ # cmdclass={ "install_lib": install_lib },
+
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
Deleted: packages/python-hiredis/tags/0.1.4-1/debian/watch
===================================================================
--- packages/python-hiredis/trunk/debian/watch 2014-07-02 06:24:16 UTC (rev 29578)
+++ packages/python-hiredis/tags/0.1.4-1/debian/watch 2014-07-02 08:32:57 UTC (rev 29586)
@@ -1,2 +0,0 @@
-version=3
-https://github.com/pietern/hiredis-py/tags .*/v(\d[\d\.]+).tar.gz
Copied: packages/python-hiredis/tags/0.1.4-1/debian/watch (from rev 29580, packages/python-hiredis/trunk/debian/watch)
===================================================================
--- packages/python-hiredis/tags/0.1.4-1/debian/watch (rev 0)
+++ packages/python-hiredis/tags/0.1.4-1/debian/watch 2014-07-02 08:32:57 UTC (rev 29586)
@@ -0,0 +1,2 @@
+version=3
+https://github.com/redis/hiredis-py/tags .*/v(\d[\d\.]+).tar.gz
More information about the Python-modules-commits
mailing list