On Tue, 24 Mar 2009, Ubuntu Merge-o-Matic wrote:
> * Update the maintainer field since this is now a ubuntu updated package.
> .
> python-django-tagging (0.2.1+svn154-0ubuntu1) jaunty; urgency=low
> .
> * New svn snapshot. required as previous snapshot was broken with
> current django release. (LP: 347882)
Why do you believe that it's a good idea to fix this with an
Ubuntu-specific update when there's a fixed package in Debian ?
You could have synced the package from Debian unstable and be done with
it. (Right now you have a version that looks like to be based on
0.2.1+svn154-1 but that isn't, hence the -0ubuntu1)
Please replace your update with a sync if possible. I keep the diff below
so that you understand what I mean.
Cheers,
> --- 0.2.1+svn154-1/debian/changelog 2009-03-24 17:28:13.000000000 +0000
> +++ 0.2.1+svn154-0ubuntu2/debian/changelog 2009-03-24 17:24:58.000000000
> +0000
> @@ -1,20 +1,15 @@
> -python-django-tagging (0.2.1+svn154-1) unstable; urgency=low
> +python-django-tagging (0.2.1+svn154-0ubuntu2) jaunty; urgency=low
>
> - [ Sandro Tosi ]
> - * debian/control
> - - switch Vcs-Browser field to viewsvn
> + * Update the maintainer field since this is now a ubuntu updated package.
>
> - [ 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.
> + -- Roderick B. Greening <roderick.green...@gmail.com> Tue, 24 Mar 2009
> 10:39:06 -0230
> +
> +python-django-tagging (0.2.1+svn154-0ubuntu1) jaunty; urgency=low
> +
> + * New svn snapshot. required as previous snapshot was broken with
> + current django release. (LP: 347882)
>
> - -- Raphael Hertzog <hert...@debian.org> Fri, 13 Mar 2009 14:14:50 +0100
> + -- Roderick B. Greening <roderick.green...@gmail.com> Tue, 24 Mar 2009
> 02:57:47 -0230
>
> python-django-tagging (0.2.1+svn147-1) experimental; urgency=low
>
> diff -pruN 0.2.1+svn154-1/debian/compat 0.2.1+svn154-0ubuntu2/debian/compat
> --- 0.2.1+svn154-1/debian/compat 2009-03-24 17:28:13.000000000 +0000
> +++ 0.2.1+svn154-0ubuntu2/debian/compat 2009-03-24 17:24:58.000000000
> +0000
> @@ -1 +1 @@
> -7
> +5
> diff -pruN 0.2.1+svn154-1/debian/control 0.2.1+svn154-0ubuntu2/debian/control
> --- 0.2.1+svn154-1/debian/control 2009-03-24 17:28:13.000000000 +0000
> +++ 0.2.1+svn154-0ubuntu2/debian/control 2009-03-24 17:24:58.000000000
> +0000
> @@ -1,18 +1,20 @@
> Source: python-django-tagging
> Section: python
> Priority: optional
> -Maintainer: Debian Python Modules Team
> <python-modules-t...@lists.alioth.debian.org>
> +Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
> +XSBC-Original-Maintainer: Debian Python Modules Team
> <python-modules-t...@lists.alioth.debian.org>
> Uploaders: Raphael Hertzog <hert...@debian.org>, David Spreen
> <netzw...@debian.org>
> -Standards-Version: 3.8.1
> -Build-Depends: debhelper (>= 7.0.50), python-dev
> -Build-Depends-Indep: python-support, python-docutils
> +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/
> -Vcs-Browser:
> http://svn.debian.org/viewsvn/python-modules/packages/python-django-tagging/trunk/
> +Vcs-Browser:
> http://svn.debian.org/wsvn/python-modules/packages/python-django-tagging/trunk/?op=log
> Homepage: http://code.google.com/p/django-tagging/
>
> Package: python-django-tagging
> Architecture: all
> -Depends: ${python:Depends}, ${misc:Depends}, python-django (>= 1.0)
> +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
> association of a number of tags with any Model instance and makes
> diff -pruN 0.2.1+svn154-1/debian/patches/01_remove_django_builddeps.patch
> 0.2.1+svn154-0ubuntu2/debian/patches/01_remove_django_builddeps.patch
> --- 0.2.1+svn154-1/debian/patches/01_remove_django_builddeps.patch
> 1970-01-01 01:00:00.000000000 +0100
> +++ 0.2.1+svn154-0ubuntu2/debian/patches/01_remove_django_builddeps.patch
> 2009-03-24 17:24:58.000000000 +0000
> @@ -0,0 +1,30 @@
> +Forwarded-Upstream: Yes.
> +Author: David Spreen <netzw...@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 -pruN 0.2.1+svn154-1/debian/pycompat
> 0.2.1+svn154-0ubuntu2/debian/pycompat
> --- 0.2.1+svn154-1/debian/pycompat 1970-01-01 01:00:00.000000000 +0100
> +++ 0.2.1+svn154-0ubuntu2/debian/pycompat 2009-03-24 17:24:58.000000000
> +0000
> @@ -0,0 +1 @@
> +2
> diff -pruN 0.2.1+svn154-1/debian/rules 0.2.1+svn154-0ubuntu2/debian/rules
> --- 0.2.1+svn154-1/debian/rules 2009-03-24 17:28:13.000000000 +0000
> +++ 0.2.1+svn154-0ubuntu2/debian/rules 2009-03-24 17:24:58.000000000
> +0000
> @@ -1,12 +1,14 @@
> #!/usr/bin/make -f
>
> +DEB_PYTHON_SYSTEM := pysupport
> +
> PKG = $(shell dh_listpackages)
>
> -%:
> - dh $@
> +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
>
> -override_dh_installdocs:
> - dh_installdocs
> +binary-post-install/python-django-tagging::
> # Generate documentation
> rst2html <docs/overview.txt
> >debian/$(PKG)/usr/share/doc/$(PKG)/overview.html
> -
--
Raphaël Hertzog
Contribuez à Debian et gagnez un cahier de l'admin Debian Lenny :
http://www.ouaza.com/wp/2009/03/02/contribuer-a-debian-gagner-un-livre/
--
Ubuntu-motu mailing list
Ubuntu-motu@lists.ubuntu.com
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/ubuntu-motu
