[Python-modules-commits] r19200 - in packages/django-celery/trunk/debian (8 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Tue Nov 8 12:35:49 UTC 2011
Date: Tuesday, November 8, 2011 @ 12:35:48
Author: fladi-guest
Revision: 19200
New upstream release.
Added:
packages/django-celery/trunk/debian/patches/fix_dependencies.patch
packages/django-celery/trunk/debian/patches/series
Modified:
packages/django-celery/trunk/debian/changelog
packages/django-celery/trunk/debian/control
packages/django-celery/trunk/debian/copyright
packages/django-celery/trunk/debian/rules
Deleted:
packages/django-celery/trunk/debian/patches/fix_dependencies.patch
packages/django-celery/trunk/debian/patches/series
Modified: packages/django-celery/trunk/debian/changelog
===================================================================
--- packages/django-celery/trunk/debian/changelog 2011-11-08 12:15:34 UTC (rev 19199)
+++ packages/django-celery/trunk/debian/changelog 2011-11-08 12:35:48 UTC (rev 19200)
@@ -1,5 +1,5 @@
-django-celery (2.2.4-1) unstable; urgency=low
+django-celery (2.4.1-1) UNRELEASED; urgency=low
* Initial release (Closes: #588229)
- -- Fladischer Michael <FladischerMichael at fladi.at> Fri, 04 Feb 2011 15:07:17 +0100
+ -- Fladischer Michael <FladischerMichael at fladi.at> Tue, 08 Nov 2011 13:34:50 +0100
Modified: packages/django-celery/trunk/debian/control
===================================================================
--- packages/django-celery/trunk/debian/control 2011-11-08 12:15:34 UTC (rev 19199)
+++ packages/django-celery/trunk/debian/control 2011-11-08 12:35:48 UTC (rev 19200)
@@ -5,17 +5,18 @@
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Build-Depends: debhelper (>= 7.0.50~),
docbook-to-man,
- python-all (>= 2.6),
- python-celery (>=2.2~),
- python-django,
+ python-all (>= 2.6.6-3~),
+ python-celery (>=2.4.1~),
+ python-django (>= 1.2),
python-django-nose,
python-django-picklefield,
- python-sphinx,
+ python-mock,
+ python-sphinx (>= 1.0.7+dfsg),
+ python-sphinxcontrib.issuetracker,
python-setuptools,
- python-support,
python-unittest2
-Standards-Version: 3.9.1
-XS-Python-Version: >= 2.6
+Standards-Version: 3.9.2
+XS-Python-Version: >= 2.7
Homepage: http://pypi.python.org/pypi/django-celery/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/django-celery/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/django-celery/trunk/
@@ -24,7 +25,7 @@
Architecture: all
Depends: ${python:Depends},
${misc:Depends},
- python-celery (>= 2.2~),
+ python-celery (>= 2.4.1~),
python-django (>= 1.2),
python-django-picklefield
Description: Celery integration for Django
@@ -35,7 +36,7 @@
Package: python-django-celery-doc
Section: doc
Architecture: all
-Depends: ${python:Depends},
+Depends: ${sphinxdoc:Depends},
${misc:Depends},
python-django-celery
Description: Celery integration for Django (Documentation)
Modified: packages/django-celery/trunk/debian/copyright
===================================================================
--- packages/django-celery/trunk/debian/copyright 2011-11-08 12:15:34 UTC (rev 19199)
+++ packages/django-celery/trunk/debian/copyright 2011-11-08 12:35:48 UTC (rev 19200)
@@ -1,17 +1,17 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: django-celery
-Maintainer: Ask Solem <ask at celeryproject.org>
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=174
+Upstream-Name: django-celery
+Upstream-Contact: Ask Solem <ask at celeryproject.org>
Source: http://pypi.python.org/pypi/django-celery
Files: *
-Copyright: 2009, Ask Solem
-License: BSD
+Copyright: 2009-2011, Ask Solem
+License: BSD-solem
Files: debian/*
-Copyright: 2010, Fladischer Michael
-License: BSD
+Copyright: 2011, Fladischer Michael
+License: BSD-solem
-License: BSD
+License: BSD-solem
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
Deleted: packages/django-celery/trunk/debian/patches/fix_dependencies.patch
===================================================================
--- packages/django-celery/trunk/debian/patches/fix_dependencies.patch 2011-11-08 12:15:34 UTC (rev 19199)
+++ packages/django-celery/trunk/debian/patches/fix_dependencies.patch 2011-11-08 12:35:48 UTC (rev 19200)
@@ -1,35 +0,0 @@
-Description: Remove pretty-printing nose-cover3 from build.
- It's not essential to the build-proccess and is not packaged
- for Debian.
-Author: Fladischer Michael <FladischerMichael at fladi.at>
-Forwarded: not-needed
-Last-Update: 2010-11-10
-
-Index: django-celery/contrib/requirements/test.txt
-===================================================================
---- django-celery.orig/contrib/requirements/test.txt 2010-11-10 15:21:16.636234157 +0100
-+++ django-celery/contrib/requirements/test.txt 2010-11-10 15:21:20.528237339 +0100
-@@ -1,7 +1,6 @@
- unittest2>=0.4.0
- coverage>=3.0
- nose
--nose-cover3
- django
- django-nose
- python-memcached
-Index: django-celery/tests/settings.py
-===================================================================
---- django-celery.orig/tests/settings.py 2010-11-10 15:21:27.196230395 +0100
-+++ django-celery/tests/settings.py 2010-11-10 15:21:53.544232176 +0100
-@@ -26,10 +26,7 @@
- )
-
- 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)]
-+ os.environ.get("NOSE_VERBOSE") and "--verbose" or ""]
-
- BROKER_HOST = "localhost"
- BROKER_PORT = 5672
Added: packages/django-celery/trunk/debian/patches/fix_dependencies.patch
===================================================================
--- packages/django-celery/trunk/debian/patches/fix_dependencies.patch (rev 0)
+++ packages/django-celery/trunk/debian/patches/fix_dependencies.patch 2011-11-08 12:35:48 UTC (rev 19200)
@@ -0,0 +1,50 @@
+Description: Remove pretty-printing nose-cover3 from build.
+ It's not essential to the build-proccess and is not packaged
+ for Debian.
+Author: Fladischer Michael <FladischerMichael at fladi.at>
+Forwarded: not-needed
+Last-Update: 2011-11-08
+
+--- a/tests/settings.py
++++ b/tests/settings.py
+@@ -26,10 +26,7 @@
+ )
+
+ 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)]
++ os.environ.get("NOSE_VERBOSE") and "--verbose" or ""]
+
+ BROKER_HOST = "localhost"
+ BROKER_PORT = 5672
+--- a/requirements/test.txt
++++ b/requirements/test.txt
+@@ -1,7 +1,6 @@
+ unittest2>=0.4.0
+ coverage>=3.0
+ nose
+-nose-cover3
+ mock
+ django
+ django-nose
+--- a/setup.py
++++ b/setup.py
+@@ -102,16 +102,9 @@
+ def extra_args(self):
+ toxinidir = os.environ.get("TOXINIDIR", "")
+ return [
+- "--with-coverage3",
+- "--cover3-xml",
+- "--cover3-xml-file=%s" % (
+- os.path.join(toxinidir, "coverage.xml"), ),
+ "--with-xunit",
+ "--xunit-file=%s" % (
+ os.path.join(toxinidir, "nosetests.xml"), ),
+- "--cover3-html",
+- "--cover3-html-dir=%s" % (
+- os.path.join(toxinidir, "cover"), ),
+ ]
+
+
Deleted: packages/django-celery/trunk/debian/patches/series
===================================================================
--- packages/django-celery/trunk/debian/patches/series 2011-11-08 12:15:34 UTC (rev 19199)
+++ packages/django-celery/trunk/debian/patches/series 2011-11-08 12:35:48 UTC (rev 19200)
@@ -1 +0,0 @@
-fix_dependencies.patch
Added: packages/django-celery/trunk/debian/patches/series
===================================================================
--- packages/django-celery/trunk/debian/patches/series (rev 0)
+++ packages/django-celery/trunk/debian/patches/series 2011-11-08 12:35:48 UTC (rev 19200)
@@ -0,0 +1 @@
+fix_dependencies.patch
Modified: packages/django-celery/trunk/debian/rules
===================================================================
--- packages/django-celery/trunk/debian/rules 2011-11-08 12:15:34 UTC (rev 19199)
+++ packages/django-celery/trunk/debian/rules 2011-11-08 12:35:48 UTC (rev 19200)
@@ -1,8 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --with python2,sphinxdoc
-
.PHONY: override_dh_installman
override_dh_installman:
set -e ; \
@@ -11,13 +10,10 @@
done
dh_installman
-.PHONY: override_dh_installdocs
-override_dh_installdocs:
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
sphinx-build -b html -d .build/.doctrees -N docs .build/html
- dh_installdocs
- rm -rf .build
- rm debian/python-django-celery-doc/usr/share/doc/python-django-celery-doc/html/_static/jquery.js
- ln -s ../../../../javascript/jquery/jquery.js debian/python-django-celery-doc/usr/share/doc/python-django-celery-doc/html/_static/jquery.js
+ dh_auto_build
.PHONY: override_dh_compress
override_dh_compress:
@@ -31,3 +27,8 @@
$$python setup.py test ; \
done
endif
+
+.PHONY: override_dh_clean
+override_dh_clean:
+ rm -rf .build
+ dh_clean
More information about the Python-modules-commits
mailing list