diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 11 | ||||
-rw-r--r-- | debian/control | 6 | ||||
-rw-r--r-- | debian/patches/01_remove_django_builddeps.patch | 30 |
3 files changed, 44 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 6f5b5ff..164acbc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +python-django-tagging (0.2.1+svn147-1) experimental; urgency=low + + * SVN snapshot to ensure compatibility with upcoming Django 1.0 release. + * debian/control: Depend on python-django >= 1.0~beta1. + * debian/patches/01_remove_django_builddeps: Added patch to remove + build-dep on python-django and the need to install the package + from within $PYTHON_PATH. + * debian/control: Updated policy version. + + -- David Spreen <netzwurm@debian.org> Thu, 21 Aug 2008 18:07:31 -0700 + python-django-tagging (0.2.1-1) experimental; urgency=low [ Raphael Hertzog ] diff --git a/debian/control b/debian/control index c078a6b..26d65bc 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: python-django-tagging Section: python Priority: optional Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> -Uploaders: Raphael Hertzog <hertzog@debian.org> -Standards-Version: 3.7.3 +Uploaders: Raphael Hertzog <hertzog@debian.org>, David Spreen <netzwurm@debian.org> +Standards-Version: 3.8.0 Build-Depends: debhelper (>= 5.0.37.2), python-dev, cdbs (>= 0.4.42) Build-Depends-Indep: python-support (>= 0.3), python-docutils Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-django-tagging/trunk/ @@ -12,7 +12,7 @@ Homepage: http://code.google.com/p/django-tagging/ Package: python-django-tagging Architecture: all -Depends: ${python:Depends}, python-django (>= 0.97~svn6668) +Depends: ${python:Depends}, python-django (>= 1.0~beta1) Priority: optional Description: A generic tagging application for Django projects This is a generic tagging application for Django, which allows diff --git a/debian/patches/01_remove_django_builddeps.patch b/debian/patches/01_remove_django_builddeps.patch new file mode 100644 index 0000000..664c418 --- /dev/null +++ b/debian/patches/01_remove_django_builddeps.patch @@ -0,0 +1,30 @@ +Forwarded-Upstream: Yes. +Author: David Spreen <netzwurm@debian.org> +Comment: + Since setup.py uses tagging/__init__.py to determine the version number, the + import statements should be moved to the function that actually uses them. + This removes a build-dependency on django for packaging which eases the + transition to Django 1.0. + . + Ticket exists at http://code.google.com/p/django-tagging/issues/detail?id=110. + +--- tagging-trunk/tagging/__init__.py 2008-08-21 11:05:41.000000000 -0700 ++++ tagging-trunk.new/tagging/__init__.py 2008-08-21 13:25:47.000000000 -0700 +@@ -1,7 +1,3 @@ +-from django.utils.translation import ugettext as _ +- +-from tagging.managers import ModelTaggedItemManager, TagDescriptor +- + VERSION = (0, 3, 'pre') + + class AlreadyRegistered(Exception): +@@ -17,6 +13,9 @@ + """ + Sets the given model class up for working with tags. + """ ++ from django.utils.translation import ugettext as _ ++ from tagging.managers import ModelTaggedItemManager, TagDescriptor ++ + if model in registry: + raise AlreadyRegistered( + _('The model %s has already been registered.') % model.__name__) |