[Python-modules-commits] r28642 - in packages/python-librabbitmq/trunk/debian (8 files)

fladi-guest at users.alioth.debian.org fladi-guest at users.alioth.debian.org
Thu Apr 24 08:50:35 UTC 2014


    Date: Thursday, April 24, 2014 @ 08:50:34
  Author: fladi-guest
Revision: 28642

New upstream release.

Added:
  packages/python-librabbitmq/trunk/debian/source/include-binaries
  packages/python-librabbitmq/trunk/debian/upstream-signing-key.pgp
Modified:
  packages/python-librabbitmq/trunk/debian/changelog
  packages/python-librabbitmq/trunk/debian/clean
  packages/python-librabbitmq/trunk/debian/control
  packages/python-librabbitmq/trunk/debian/copyright
  packages/python-librabbitmq/trunk/debian/patches/fix_setup.patch
  packages/python-librabbitmq/trunk/debian/watch

Modified: packages/python-librabbitmq/trunk/debian/changelog
===================================================================
--- packages/python-librabbitmq/trunk/debian/changelog	2014-04-24 07:43:57 UTC (rev 28641)
+++ packages/python-librabbitmq/trunk/debian/changelog	2014-04-24 08:50:34 UTC (rev 28642)
@@ -1,3 +1,20 @@
+python-librabbitmq (1.5.0+dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * 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.
+  * Check PGP signature on upstream tarball:
+    + Add signature URL to debian/watch.
+    + Include upstream public PGP key 030A2708.
+    + Allow debian/upstream-signing-key.pgp to be included as a binary.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Wed, 23 Apr 2014 16:38:01 +0200
+
 python-librabbitmq (1.0.1-1) unstable; urgency=low
 
   * Initial release (Closes: #688026)

Modified: packages/python-librabbitmq/trunk/debian/clean
===================================================================
--- packages/python-librabbitmq/trunk/debian/clean	2014-04-24 07:43:57 UTC (rev 28641)
+++ packages/python-librabbitmq/trunk/debian/clean	2014-04-24 08:50:34 UTC (rev 28642)
@@ -1,2 +1,3 @@
 librabbitmq.egg-info/PKG-INFO
 librabbitmq.egg-info/top_level.txt
+librabbitmq.egg-info/SOURCES.txt

Modified: packages/python-librabbitmq/trunk/debian/control
===================================================================
--- packages/python-librabbitmq/trunk/debian/control	2014-04-24 07:43:57 UTC (rev 28641)
+++ packages/python-librabbitmq/trunk/debian/control	2014-04-24 08:50:34 UTC (rev 28642)
@@ -4,12 +4,12 @@
 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.3.0),
+               librabbitmq-dev (>= 0.5.0),
                python-all-dev (>= 2.6.6-3~),
                python-nose,
                python-setuptools,
                python-unittest2
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
 Homepage: https://github.com/celery/librabbitmq
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-librabbitmq/trunk/

Modified: packages/python-librabbitmq/trunk/debian/copyright
===================================================================
--- packages/python-librabbitmq/trunk/debian/copyright	2014-04-24 07:43:57 UTC (rev 28641)
+++ packages/python-librabbitmq/trunk/debian/copyright	2014-04-24 08:50:34 UTC (rev 28642)
@@ -2,22 +2,21 @@
 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: clib/codegen/amqp-rabbitmq-*.json clib/codegen/demo_extension.json
- rabbitmq-codegen/amqp-rabbitmq-*.json rabbitmq-codegen/demo_extension.json
+Files: rabbitmq-codegen/amqp-rabbitmq-*.json rabbitmq-codegen/demo_extension.json
 Copyright: 2008-2012, VM Ware Inc.
-License: Mit
+License: Expat
 
 Files: *
 Copyright: 2012, Ask Solem <ask at celeryproject.org>
 License: MPL-1.1
 
-License: Mit
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights

Modified: packages/python-librabbitmq/trunk/debian/patches/fix_setup.patch
===================================================================
--- packages/python-librabbitmq/trunk/debian/patches/fix_setup.patch	2014-04-24 07:43:57 UTC (rev 28641)
+++ packages/python-librabbitmq/trunk/debian/patches/fix_setup.patch	2014-04-24 08:50:34 UTC (rev 28642)
@@ -22,7 +22,7 @@
  source-dir = docs/
 --- a/setup.py
 +++ b/setup.py
-@@ -1,201 +1,13 @@
+@@ -1,209 +1,13 @@
 -import os
 -import platform
 -import sys
@@ -101,21 +101,19 @@
 -    ])
 -    librabbit_files = map(LRMQSRC, [
 -        'amqp_api.c',
+-        'amqp_connection.c',
+-        'amqp_consumer.c',
+-        'amqp_framing.c',
+-        'amqp_hostcheck.c',
 -        'amqp_mem.c',
--        'amqp_url.c',
--        'amqp_connection.c',
 -        'amqp_socket.c',
--        'amqp_framing.c',
 -        'amqp_table.c',
+-        'amqp_tcp_socket.c',
+-        'amqp_timer.c',
+-        'amqp_url.c',
 -    ])
 -
 -    incdirs.append(LRMQDIST())  # for config.h
--    if platform.system() == 'Windows':
--        incdirs.append(LRMQSRC('windows'))
--        librabbit_files.append(LRMQSRC('windows', 'socket.c'))
--    else:
--        incdirs.append(LRMQSRC('unix'))
--        librabbit_files.append(LRMQSRC('unix', 'socket.c'))
 -
 -    librabbitmq_ext = Extension('_librabbitmq',
 -                            sources=PyC_files + librabbit_files,
@@ -137,7 +135,7 @@
 -
 -    class build(_build):
 -        stdcflags = [
--            '-W -Wall -DHAVE_CONFIG_H',
+-            '-DHAVE_CONFIG_H',
 -        ]
 -        if os.environ.get('PEDANTIC'):
 -            # Python.h breaks -pedantic, so can only use it while developing.
@@ -149,14 +147,24 @@
 -            from distutils import sysconfig
 -            config = sysconfig.get_config_vars()
 -            try:
--                restore = senv(('CFLAGS', config['CFLAGS']),
--                    ('LDFLAGS', config['LDFLAGS']))
+-                vars = {'ld': config['LDFLAGS'],
+-                        'c': config['CFLAGS']}
+-                for key in list(vars):
+-                    vars[key] = vars[key].replace('-lSystem', '')
+-                    # Python on Maverics sets this, but not supported on clang
+-                    vars[key] = vars[key].replace('-mno-fused-madd', '')
+-                    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']))
 -                try:
 -                    os.chdir(LRMQDIST())
 -                    if not os.path.isfile('config.h'):
 -                        print('- configure rabbitmq-c...')
--                        os.system('/bin/sh configure --disable-tools \
--                                   --disable-docs --disable-dependency-tracking')
+-                        if os.system('/bin/sh configure --disable-tools \
+-                                --disable-docs --disable-dependency-tracking'):
+-                            return
 -                    #print('- make rabbitmq-c...')
 -                    #os.chdir(LRMQSRC())
 -                    #os.system(''%s' all' % find_make())
@@ -210,8 +218,8 @@
 -    try:
 -        librabbitmq_ext, build = create_builder()
 -    except Exception, exc:
+-        print('Could not create builder: %r' % (exc, ))
 -        raise
--        print('Couldn not create builder: %r' % (exc, ))
 -    else:
 -        goahead = True
 -        ext_modules= [librabbitmq_ext]
@@ -226,7 +234,7 @@
  setup(
      name='librabbitmq',
      version=version,
-@@ -207,10 +19,14 @@
+@@ -215,10 +19,14 @@
      long_description=long_description,
      test_suite='nose.collector',
      zip_safe=False,

Added: packages/python-librabbitmq/trunk/debian/source/include-binaries
===================================================================
--- packages/python-librabbitmq/trunk/debian/source/include-binaries	                        (rev 0)
+++ packages/python-librabbitmq/trunk/debian/source/include-binaries	2014-04-24 08:50:34 UTC (rev 28642)
@@ -0,0 +1 @@
+debian/upstream-signing-key.pgp

Added: packages/python-librabbitmq/trunk/debian/upstream-signing-key.pgp
===================================================================
(Binary files differ)


Property changes on: packages/python-librabbitmq/trunk/debian/upstream-signing-key.pgp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: packages/python-librabbitmq/trunk/debian/watch
===================================================================
--- packages/python-librabbitmq/trunk/debian/watch	2014-04-24 07:43:57 UTC (rev 28641)
+++ packages/python-librabbitmq/trunk/debian/watch	2014-04-24 08:50:34 UTC (rev 28642)
@@ -1,2 +1,3 @@
 version=3
+opts=pgpsigurlmangle=s/$/.asc/,dversionmangle=s/\+dfsg// \
 http://pypi.python.org/packages/source/l/librabbitmq/librabbitmq-([\d\.]+)\.tar\.gz




More information about the Python-modules-commits mailing list