[Python-modules-commits] r28738 - in packages/django-celery/trunk/debian (5 files)

[bam at users.alioth.debian.org]

    Date: Friday, May 2, 2014 @ 04:43:43
  Author: bam
Revision: 28738

Updates for version 3.1.10.

Modified:
  packages/django-celery/trunk/debian/changelog
  packages/django-celery/trunk/debian/clean
  packages/django-celery/trunk/debian/control
  packages/django-celery/trunk/debian/patches/fix_dependencies.patch
  packages/django-celery/trunk/debian/patches/no-issues.patch

Modified: packages/django-celery/trunk/debian/changelog
===================================================================
--- packages/django-celery/trunk/debian/changelog	2014-05-02 02:31:09 UTC (rev 28737)
+++ packages/django-celery/trunk/debian/changelog	2014-05-02 04:43:43 UTC (rev 28738)
@@ -1,3 +1,11 @@
+django-celery (3.1.10-1) unstable; urgency=low
+
+  * New upstream release (Closes: #742762).
+  * Remove python-billiard from build-depends. Appears to build ok without it.
+  * Refresh patches.
+
+ -- Brian May <bam at debian.org>  Fri, 02 May 2014 11:57:34 +1000
+
 django-celery (3.1.1-1) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/django-celery/trunk/debian/clean
===================================================================
--- packages/django-celery/trunk/debian/clean	2014-05-02 02:31:09 UTC (rev 28737)
+++ packages/django-celery/trunk/debian/clean	2014-05-02 04:43:43 UTC (rev 28738)
@@ -1,3 +1,2 @@
 djcelerymon.1
-django_celery.egg-info/PKG-INFO
-django_celery.egg-info/SOURCES.txt
+*.egg-info/*

Modified: packages/django-celery/trunk/debian/control
===================================================================
--- packages/django-celery/trunk/debian/control	2014-05-02 02:31:09 UTC (rev 28737)
+++ packages/django-celery/trunk/debian/control	2014-05-02 04:43:43 UTC (rev 28738)
@@ -2,12 +2,11 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
+Uploaders: Michael Fladischer <FladischerMichael at fladi.at>, Brian May <bam at debian.org>
 Build-Depends: debhelper (>= 8.1.0~),
                docbook-to-man,
                python-all (>= 2.7),
                python-anyjson,
-               python-billiard,
                python-celery (>= 3.1.1),
                python-django,
                python-django-nose,

Modified: packages/django-celery/trunk/debian/patches/fix_dependencies.patch
===================================================================
--- packages/django-celery/trunk/debian/patches/fix_dependencies.patch	2014-05-02 02:31:09 UTC (rev 28737)
+++ packages/django-celery/trunk/debian/patches/fix_dependencies.patch	2014-05-02 04:43:43 UTC (rev 28738)
@@ -5,18 +5,36 @@
 Forwarded: not-needed
 Last-Update: 2011-11-28
 
---- a/requirements/test.txt
-+++ b/requirements/test.txt
+Index: django-celery-3.1.10/tests/settings.py
+===================================================================
+--- django-celery-3.1.10.orig/tests/settings.py	2014-02-14 03:38:40.000000000 +1100
++++ django-celery-3.1.10/tests/settings.py	2014-05-02 11:58:45.806695419 +1000
+@@ -43,9 +43,6 @@
+ NOSE_ARGS = [
+     os.path.join(here, os.pardir, 'djcelery', 'tests'),
+     os.environ.get('NOSE_VERBOSE') and '--verbose' or '',
+-    '--cover3-package=djcelery',
+-    '--cover3-branch',
+-    '--cover3-exclude=%s' % ','.join(COVERAGE_EXCLUDE_MODULES),
+ ]
+ 
+ BROKER_URL = 'amqp://'
+Index: django-celery-3.1.10/requirements/test.txt
+===================================================================
+--- django-celery-3.1.10.orig/requirements/test.txt	2014-04-01 01:40:49.000000000 +1100
++++ django-celery-3.1.10/requirements/test.txt	2014-05-02 11:58:45.806695419 +1000
 @@ -1,7 +1,6 @@
  unittest2>=0.4.0
  coverage>=3.0
  nose
 -nose-cover3
  mock
- django
  django-nose
---- a/setup.py
-+++ b/setup.py
+ python-memcached
+Index: django-celery-3.1.10/setup.py
+===================================================================
+--- django-celery-3.1.10.orig/setup.py	2014-04-01 01:40:49.000000000 +1100
++++ django-celery-3.1.10/setup.py	2014-05-02 11:58:45.806695419 +1000
 @@ -146,16 +146,9 @@
      def extra_args(self):
          toxinidir = os.environ.get('TOXINIDIR', '')
@@ -34,15 +52,3 @@
          ]
  
  
---- a/tests/settings.py
-+++ b/tests/settings.py
-@@ -43,9 +43,6 @@
- NOSE_ARGS = [
-     os.path.join(here, os.pardir, 'djcelery', 'tests'),
-     os.environ.get('NOSE_VERBOSE') and '--verbose' or '',
--    '--cover3-package=djcelery',
--    '--cover3-branch',
--    '--cover3-exclude=%s' % ','.join(COVERAGE_EXCLUDE_MODULES),
- ]
- 
- BROKER_URL = 'amqp://'

Modified: packages/django-celery/trunk/debian/patches/no-issues.patch
===================================================================
--- packages/django-celery/trunk/debian/patches/no-issues.patch	2014-05-02 02:31:09 UTC (rev 28737)
+++ packages/django-celery/trunk/debian/patches/no-issues.patch	2014-05-02 04:43:43 UTC (rev 28738)
@@ -5,8 +5,10 @@
 Author: Evgeni Golov <evgeni at debian.org>
 Bug-Debian: http://bugs.debian.org/681379
 
---- a/docs/conf.py
-+++ b/docs/conf.py
+Index: django-celery-3.1.9/docs/conf.py
+===================================================================
+--- django-celery-3.1.9.orig/docs/conf.py	2014-01-23 07:31:21.000000000 +1100
++++ django-celery-3.1.9/docs/conf.py	2014-03-28 10:04:35.878599644 +1100
 @@ -81,6 +81,7 @@
  }
  
@@ -15,6 +17,6 @@
 -issuetracker_project = 'celery/django-celery'
 -issuetracker_issue_pattern = r'[Ii]ssue #(\d+)'
 +if os.environ.get("DEB_BUILD_ISSUES", False) != "disabled":
-+    issuetracker = "github"
-+    issuetracker_project = "celery/django-celery"
++    issuetracker = 'github'
++    issuetracker_project = 'celery/django-celery'
 +    issuetracker_issue_pattern = r'[Ii]ssue #(\d+)'