[Python-modules-commits] r30090 - in packages/python-librabbitmq/trunk/debian (5 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Sat Aug 9 14:16:48 UTC 2014
Date: Saturday, August 9, 2014 @ 14:16:47
Author: fladi-guest
Revision: 30090
New upstream release (Closes: #747270).
Thanks to Brian May for his help with this bug.
Added:
packages/python-librabbitmq/trunk/debian/source/lintian-overrides
Modified:
packages/python-librabbitmq/trunk/debian/changelog
packages/python-librabbitmq/trunk/debian/control
packages/python-librabbitmq/trunk/debian/copyright
packages/python-librabbitmq/trunk/debian/patches/fix_setup.patch
Modified: packages/python-librabbitmq/trunk/debian/changelog
===================================================================
--- packages/python-librabbitmq/trunk/debian/changelog 2014-08-09 13:55:32 UTC (rev 30089)
+++ packages/python-librabbitmq/trunk/debian/changelog 2014-08-09 14:16:47 UTC (rev 30090)
@@ -1,13 +1,13 @@
-python-librabbitmq (1.5.0+dfsg-1) unstable; urgency=low
+python-librabbitmq (1.5.2-1) unstable; urgency=low
- * New upstream release.
+ * New upstream release (Closes: #747270).
+ Thanks to Brian May for his help with this bug.
* Bump Standards version to 3.9.5.
- * Bump Build-Depends on librabbitmq-dev to (>= 0.5.0).
* Refresh fix_setup.patch.
* Clean librabbitmq.egg-info/SOURCES.txt.
- * Remove bundled librabbitmq sources.
* Mangle "+dfsg" in debian/watch.
- * Add license in d/copyright for rabbitmq-codegen files.
+ * Add license in d/copyright for rabbitmq-codegen and clib files.
+ * Add source lintian override for included byte code file.
* Check PGP signature on upstream tarball:
+ Add signature URL to debian/watch.
+ Include upstream public PGP key 030A2708.
Modified: packages/python-librabbitmq/trunk/debian/control
===================================================================
--- packages/python-librabbitmq/trunk/debian/control 2014-08-09 13:55:32 UTC (rev 30089)
+++ packages/python-librabbitmq/trunk/debian/control 2014-08-09 14:16:47 UTC (rev 30090)
@@ -4,7 +4,7 @@
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
Build-Depends: debhelper (>= 9),
- librabbitmq-dev (>= 0.5.0),
+ librabbitmq-dev (>= 0.4.0),
python-all-dev (>= 2.6.6-3~),
python-nose,
python-setuptools,
Modified: packages/python-librabbitmq/trunk/debian/copyright
===================================================================
--- packages/python-librabbitmq/trunk/debian/copyright 2014-08-09 13:55:32 UTC (rev 30089)
+++ packages/python-librabbitmq/trunk/debian/copyright 2014-08-09 14:16:47 UTC (rev 30090)
@@ -2,13 +2,14 @@
Upstream-Name: librabbitmq
Upstream-Contact: Ask Solem <ask at celeryproject.org>
Source: http://github.com/celery/librabbitmq
-Files-Excluded: clib/*
Files: debian/*
Copyright: 2013, Fladischer Michael <FladischerMichael at fladi.at>
License: MPL-1.1
-Files: rabbitmq-codegen/amqp-rabbitmq-*.json rabbitmq-codegen/demo_extension.json
+Files:
+ clib/*
+ rabbitmq-codegen/amqp-rabbitmq-*.json rabbitmq-codegen/demo_extension.json
Copyright: 2008-2012, VM Ware Inc.
License: Expat
Modified: packages/python-librabbitmq/trunk/debian/patches/fix_setup.patch
===================================================================
--- packages/python-librabbitmq/trunk/debian/patches/fix_setup.patch 2014-08-09 13:55:32 UTC (rev 30089)
+++ packages/python-librabbitmq/trunk/debian/patches/fix_setup.patch 2014-08-09 14:16:47 UTC (rev 30090)
@@ -22,7 +22,7 @@
source-dir = docs/
--- a/setup.py
+++ b/setup.py
-@@ -1,209 +1,13 @@
+@@ -1,214 +1,13 @@
-import os
-import platform
-import sys
@@ -71,7 +71,7 @@
- from distutils.command.build import build as _build
- cmd = None
- pkgdirs = [] # incdirs and libdirs get these
-- libs = []#'rabbitmq']
+- libs = []
- defs = []
- incdirs = []
- libdirs = []
@@ -115,6 +115,9 @@
-
- incdirs.append(LRMQDIST()) # for config.h
-
+- if is_linux: # Issue #42
+- libs.append('rt') # -lrt for clock_gettime
+-
- librabbitmq_ext = Extension('_librabbitmq',
- sources=PyC_files + librabbit_files,
- libraries=libs, include_dirs=incdirs,
@@ -156,8 +159,10 @@
- vars[key] = vars[key].replace(
- '-isysroot /Developer/SDKs/MacOSX10.6.sdk', '')
- vars[key] = vars[key].replace('-Wall', '')
-- restore = senv(('CFLAGS', vars['c']),
-- ('LDFLAGS', vars['ld']))
+- restore = senv(
+- ('CFLAGS', vars['c']),
+- ('LDFLAGS', vars['ld']),
+- )
- try:
- os.chdir(LRMQDIST())
- if not os.path.isfile('config.h'):
@@ -206,12 +211,12 @@
-ext_modules = []
-cmdclass = {}
-packages = []
--install_requires = []
-goahead = False
-is_jython = sys.platform.startswith('java')
-is_pypy = hasattr(sys, 'pypy_version_info')
-is_py3k = sys.version_info[0] == 3
-is_win = platform.system() == 'Windows'
+-is_linux = platform.system() == 'Linux'
-if is_jython or is_pypy or is_py3k or is_win:
- pass
-elif find_make():
@@ -234,14 +239,14 @@
setup(
name='librabbitmq',
version=version,
-@@ -215,10 +19,14 @@
+@@ -220,12 +19,14 @@
long_description=long_description,
test_suite='nose.collector',
zip_safe=False,
- packages=packages,
- cmdclass=cmdclass,
-- install_requires=install_requires,
-- ext_modules=ext_modules,
+- install_requires=[
+- 'amqp>=1.2.1',
+ packages=find_packages(exclude=['ez_setup', 'funtests', 'funtests.*']),
+ package_dir={'librabbitmq.funtests': 'funtests'},
+ ext_modules=[
@@ -249,7 +254,8 @@
+ libraries=['rabbitmq'],
+ include_dirs=['/usr/include'],
+ library_dirs=['/usr/lib'])
-+ ],
+ ],
+- ext_modules=ext_modules,
classifiers=[
'Development Status :: 5 - Production/Stable',
'Operating System :: POSIX',
Added: packages/python-librabbitmq/trunk/debian/source/lintian-overrides
===================================================================
--- packages/python-librabbitmq/trunk/debian/source/lintian-overrides (rev 0)
+++ packages/python-librabbitmq/trunk/debian/source/lintian-overrides 2014-08-09 14:16:47 UTC (rev 30090)
@@ -0,0 +1,3 @@
+# This single byte code file is not used during build.
+# Reported to upstream: https://github.com/celery/librabbitmq/issues/55
+python-librabbitmq source: source-contains-prebuilt-python-object rabbitmq-codegen/amqp_codegen.pyc
More information about the Python-modules-commits
mailing list