6 files changed, 23 insertions, 46 deletions
diff --git a/debian/changelog b/debian/changelog
index 27c4f23..1c82900 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,20 @@
-python-django-tagging (0.2.1+svn147-2) UNRELEASED; urgency=low
+python-django-tagging (0.2.1+svn154-1) unstable; urgency=low
 
+  [ Sandro Tosi ]
   * debian/control
     - switch Vcs-Browser field to viewsvn
 
- -- Sandro Tosi <morph@debian.org>  Mon, 03 Nov 2008 22:15:07 +0100
+  [ Raphael Hertzog ]
+  * New SVN snapshot. Upload to unstable now that Django 1.0 is there.
+  * Drop debian/patches/01_remove_django_builddeps as setup.py got fixed
+    upstream.
+  * Standards-Version bumped to 3.8.1, no changes needed.
+  * Switch to debhelper 7 and drop CDBS.
+  * Drop useless debian/pycompat file.
+  * Drop duplicate Priority field.
+  * Add ${misc:Depends} variable in Depends.
+
+ -- Raphael Hertzog <hertzog@debian.org>  Fri, 13 Mar 2009 14:14:50 +0100
 
 python-django-tagging (0.2.1+svn147-1) experimental; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 21b9557..62351bf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,16 @@ Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 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
+Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7.0.50), python-dev
+Build-Depends-Indep: python-support, python-docutils
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-django-tagging/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-django-tagging/trunk/
 Homepage: http://code.google.com/p/django-tagging/
 
 Package: python-django-tagging
 Architecture: all
-Depends: ${python:Depends}, python-django (>= 1.0~beta1)
-Priority: optional
+Depends: ${python:Depends}, ${misc:Depends}, python-django (>= 1.0)
 Description: A generic tagging application for Django projects
  This is a generic tagging application for Django, which allows
  association of a number of tags with any Model instance and makes
diff --git a/debian/patches/01_remove_django_builddeps.patch b/debian/patches/01_remove_django_builddeps.patch
deleted file mode 100644
index 664c418..0000000
--- a/debian/patches/01_remove_django_builddeps.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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__)
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/rules b/debian/rules
index b66c0d2..78edc06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,12 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM := pysupport
-
 PKG = $(shell dh_listpackages)
 
-include /usr/share/cdbs/1/rules/buildcore.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+%:
+	dh $@
 
-binary-post-install/python-django-tagging::
+override_dh_installdocs:
+	dh_installdocs
 	# Generate documentation
 	rst2html <docs/overview.txt >debian/$(PKG)/usr/share/doc/$(PKG)/overview.html
+