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

fladi-guest at users.alioth.debian.org fladi-guest at users.alioth.debian.org
Wed Nov 10 16:44:50 UTC 2010


    Date: Wednesday, November 10, 2010 @ 16:44:39
  Author: fladi-guest
Revision: 14866

New upstream release.
Add patch to remove nose-cover3 from tests during build.
Ship documentation in HTML format.

Added:
  packages/django-celery/trunk/debian/docs
  packages/django-celery/trunk/debian/patches/
  packages/django-celery/trunk/debian/patches/fix_dependencies.patch
  packages/django-celery/trunk/debian/patches/series
  packages/django-celery/trunk/debian/python-django-celery.doc-base
Modified:
  packages/django-celery/trunk/debian/changelog
  packages/django-celery/trunk/debian/control
  packages/django-celery/trunk/debian/rules
Deleted:
  packages/django-celery/trunk/debian/pyversions

Modified: packages/django-celery/trunk/debian/changelog
===================================================================
--- packages/django-celery/trunk/debian/changelog	2010-11-10 14:09:29 UTC (rev 14865)
+++ packages/django-celery/trunk/debian/changelog	2010-11-10 16:44:39 UTC (rev 14866)
@@ -1,5 +1,5 @@
-django-celery (2.0.2-1) UNRELEASED; urgency=low
+django-celery (2.1.2-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #588229)
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Wed, 28 Jul 2010 14:43:32 +0200
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Wed, 10 Nov 2010 14:00:47 +0100

Modified: packages/django-celery/trunk/debian/control
===================================================================
--- packages/django-celery/trunk/debian/control	2010-11-10 14:09:29 UTC (rev 14865)
+++ packages/django-celery/trunk/debian/control	2010-11-10 16:44:39 UTC (rev 14866)
@@ -4,13 +4,17 @@
 Maintainer: Fladischer Michael <FladischerMichael at fladi.at>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50~), 
-               python-all (>= 2.5), 
+               python-all (>= 2.6), 
                python-celery,
                python-django,
                python-django-nose,
+               python-django-picklefield,
+               python-sphinx,
                python-setuptools,
-               python-support 
-Standards-Version: 3.9.0
+               python-support,
+               python-unittest2
+Standards-Version: 3.9.1
+XS-Python-Version: >= 2.6
 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/
@@ -20,7 +24,8 @@
 Depends: ${python:Depends}, 
          ${misc:Depends}, 
          python-celery, 
-         python-django 
+         python-django,
+         python-django-picklefield 
 Description: Celery integration for Django using the Django ORM
  django-celery provides Celery integration for Django using the Django ORM and 
  cache backend for storing results, autodiscovery of task modules for 

Added: packages/django-celery/trunk/debian/docs
===================================================================
--- packages/django-celery/trunk/debian/docs	                        (rev 0)
+++ packages/django-celery/trunk/debian/docs	2010-11-10 16:44:39 UTC (rev 14866)
@@ -0,0 +1,4 @@
+FAQ
+TODO
+README
+.build/html/

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	2010-11-10 16:44:39 UTC (rev 14866)
@@ -0,0 +1,35 @@
+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/series
===================================================================
--- packages/django-celery/trunk/debian/patches/series	                        (rev 0)
+++ packages/django-celery/trunk/debian/patches/series	2010-11-10 16:44:39 UTC (rev 14866)
@@ -0,0 +1 @@
+fix_dependencies.patch

Added: packages/django-celery/trunk/debian/python-django-celery.doc-base
===================================================================
--- packages/django-celery/trunk/debian/python-django-celery.doc-base	                        (rev 0)
+++ packages/django-celery/trunk/debian/python-django-celery.doc-base	2010-11-10 16:44:39 UTC (rev 14866)
@@ -0,0 +1,11 @@
+Document: python-django-celery
+Title: Python Django Celery Documentation
+Author: Ask Solem
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-django-celery/html/index.html
+Files: /usr/share/doc/python-django-celery/html/*.html
+       /usr/share/doc/python-django-celery/html/cookbook/*.html
+       /usr/share/doc/python-django-celery/html/reference/*.html
+       /usr/share/doc/python-django-celery/html/getting-started/*.html

Deleted: packages/django-celery/trunk/debian/pyversions
===================================================================
--- packages/django-celery/trunk/debian/pyversions	2010-11-10 14:09:29 UTC (rev 14865)
+++ packages/django-celery/trunk/debian/pyversions	2010-11-10 16:44:39 UTC (rev 14866)
@@ -1 +0,0 @@
-2.5-

Modified: packages/django-celery/trunk/debian/rules
===================================================================
--- packages/django-celery/trunk/debian/rules	2010-11-10 14:09:29 UTC (rev 14865)
+++ packages/django-celery/trunk/debian/rules	2010-11-10 16:44:39 UTC (rev 14866)
@@ -2,6 +2,18 @@
 %:
 	dh $@
 
+.PHONY: override_dh_installdocs
+override_dh_installdocs:
+	sphinx-build -b html -d .build/.doctrees -N docs .build/html
+	dh_installdocs
+	rm -rf .build
+	rm debian/python-django-celery/usr/share/doc/python-django-celery/html/_static/jquery.js
+	ln -s ../../../../javascript/jquery/jquery.js debian/python-django-celery/usr/share/doc/python-django-celery/html/_static/jquery.js
+
+.PHONY: override_dh_compress
+override_dh_compress:
+	dh_compress -X .js -X .html
+
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))




More information about the Python-modules-commits mailing list