[Python-modules-commits] r30061 - in packages/python-django-tagging/tags (13 files)
hertzog at users.alioth.debian.org
hertzog at users.alioth.debian.org
Wed Aug 6 11:41:34 UTC 2014
Date: Wednesday, August 6, 2014 @ 11:41:33
Author: hertzog
Revision: 30061
[svn-buildpackage] Tagging python-django-tagging 1:0.3.1-4
Added:
packages/python-django-tagging/tags/1:0.3.1-4/
packages/python-django-tagging/tags/1:0.3.1-4/debian/changelog
(from rev 30060, packages/python-django-tagging/trunk/debian/changelog)
packages/python-django-tagging/tags/1:0.3.1-4/debian/compat
(from rev 30058, packages/python-django-tagging/trunk/debian/compat)
packages/python-django-tagging/tags/1:0.3.1-4/debian/control
(from rev 30060, packages/python-django-tagging/trunk/debian/control)
packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/django-1.7-compat.patch
(from rev 30057, packages/python-django-tagging/trunk/debian/patches/django-1.7-compat.patch)
packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/fix-testsuite.patch
(from rev 30057, packages/python-django-tagging/trunk/debian/patches/fix-testsuite.patch)
packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/series
(from rev 30057, packages/python-django-tagging/trunk/debian/patches/series)
packages/python-django-tagging/tags/1:0.3.1-4/debian/rules
(from rev 30059, packages/python-django-tagging/trunk/debian/rules)
Deleted:
packages/python-django-tagging/tags/1:0.3.1-4/debian/changelog
packages/python-django-tagging/tags/1:0.3.1-4/debian/compat
packages/python-django-tagging/tags/1:0.3.1-4/debian/control
packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/series
packages/python-django-tagging/tags/1:0.3.1-4/debian/rules
Deleted: packages/python-django-tagging/tags/1:0.3.1-4/debian/changelog
===================================================================
--- packages/python-django-tagging/trunk/debian/changelog 2014-08-06 09:09:14 UTC (rev 30054)
+++ packages/python-django-tagging/tags/1:0.3.1-4/debian/changelog 2014-08-06 11:41:33 UTC (rev 30061)
@@ -1,107 +0,0 @@
-python-django-tagging (1:0.3.1-4) UNRELEASED; urgency=medium
-
- * Drop David Spreen from Uploaders. Closes: #738932
-
- -- Raphaël Hertzog <hertzog at debian.org> Fri, 14 Feb 2014 09:31:36 +0100
-
-python-django-tagging (1:0.3.1-3) unstable; urgency=low
-
- [ Jakub Wilk ]
- * Use canonical URIs for Vcs-* fields.
-
- [ Jonas Genannt ]
- * added myself as Uploader
- * Added epoch, since python-django-taggit has taken over the binary
- package due an mistake.
-
- -- Jonas Genannt <jonas.genannt at capi2name.de> Sun, 01 Sep 2013 16:46:35 +0200
-
-python-django-tagging (0.3.1-2) unstable; urgency=low
-
- * Switch to dh_python2 instead of python-support.
- * Bump debhelper compat level to 8.
- * Update Standards-Version to 3.9.2 (no change needed).
- * Drop the article from the description (lintian warning).
- * Update Vcs-Browser URL to point to the new location.
-
- -- Raphaël Hertzog <hertzog at debian.org> Wed, 02 Nov 2011 12:29:00 +0100
-
-python-django-tagging (0.3.1-1) unstable; urgency=low
-
- * New upstream release.
- * Change build-depends on python-all-dev to python-all.
- * Switch to source format 3.0 (quilt).
- * Drop useless README.source.
- * Register documentation with doc-base.
-
- -- Raphaël Hertzog <hertzog at debian.org> Wed, 27 Jan 2010 15:47:04 +0100
-
-python-django-tagging (0.3-1) unstable; urgency=low
-
- * New upstream release. Closes: #549612
- * Update watch file to match new scheme.
- * Update Standards-Version to 3.8.3, no changes needed.
- * Add a README.source pointing to quilt's README.source.
-
- -- Raphaël Hertzog <hertzog at debian.org> Mon, 05 Oct 2009 23:52:09 +0200
-
-python-django-tagging (0.2.1+svn154-2) unstable; urgency=low
-
- * Apply patch to fix weight of tag when using logarithmic distribution.
- Closes: #525770
-
- -- Raphael Hertzog <hertzog at debian.org> Fri, 08 May 2009 12:30:16 +0200
-
-python-django-tagging (0.2.1+svn154-1) unstable; urgency=low
-
- [ Sandro Tosi ]
- * debian/control
- - switch Vcs-Browser field to viewsvn
-
- [ 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 at debian.org> Fri, 13 Mar 2009 14:14:50 +0100
-
-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 at debian.org> Thu, 21 Aug 2008 18:07:31 -0700
-
-python-django-tagging (0.2.1-1) experimental; urgency=low
-
- [ Raphael Hertzog ]
- * New upstream release.
- * Update the Vcs-Browser URL to match the python-modules standard.
- * Updated Standards-Version to 3.7.3.
- * Moved some build dependencies to Build-Depends-Indep as they are only
- needed during build.
- * Updated the dependency on python-django to make sure 0.96.1 doesn't
- satisfy it accidentally.
-
- [ Sandro Tosi ]
- * debian/control
- - uniforming Vcs-Browser field
-
- -- Raphael Hertzog <hertzog at debian.org> Sun, 02 Mar 2008 12:01:32 +0100
-
-python-django-tagging (0.1+svn102-1) experimental; urgency=low
-
- * Initial release.
- * Upload to experimental because it requires the development version
- of python-django.
-
- -- Raphael Hertzog <hertzog at debian.org> Thu, 04 Oct 2007 12:44:38 +0200
Copied: packages/python-django-tagging/tags/1:0.3.1-4/debian/changelog (from rev 30060, packages/python-django-tagging/trunk/debian/changelog)
===================================================================
--- packages/python-django-tagging/tags/1:0.3.1-4/debian/changelog (rev 0)
+++ packages/python-django-tagging/tags/1:0.3.1-4/debian/changelog 2014-08-06 11:41:33 UTC (rev 30061)
@@ -0,0 +1,112 @@
+python-django-tagging (1:0.3.1-4) unstable; urgency=medium
+
+ * Drop David Spreen from Uploaders. Closes: #738932
+ * Add fix-testsuite.patch and now run the testsuite.
+ * Add django-1.7-compat.patch to make it work with Django 1.7.
+ Closes: #755624
+ * Bump Standards-Version to 3.9.5 and debhelper compat to 9.
+ * Add python-django to Build-Depends for the test suite.
+
+ -- Raphaël Hertzog <hertzog at debian.org> Fri, 14 Feb 2014 09:31:36 +0100
+
+python-django-tagging (1:0.3.1-3) unstable; urgency=low
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ [ Jonas Genannt ]
+ * added myself as Uploader
+ * Added epoch, since python-django-taggit has taken over the binary
+ package due an mistake.
+
+ -- Jonas Genannt <jonas.genannt at capi2name.de> Sun, 01 Sep 2013 16:46:35 +0200
+
+python-django-tagging (0.3.1-2) unstable; urgency=low
+
+ * Switch to dh_python2 instead of python-support.
+ * Bump debhelper compat level to 8.
+ * Update Standards-Version to 3.9.2 (no change needed).
+ * Drop the article from the description (lintian warning).
+ * Update Vcs-Browser URL to point to the new location.
+
+ -- Raphaël Hertzog <hertzog at debian.org> Wed, 02 Nov 2011 12:29:00 +0100
+
+python-django-tagging (0.3.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Change build-depends on python-all-dev to python-all.
+ * Switch to source format 3.0 (quilt).
+ * Drop useless README.source.
+ * Register documentation with doc-base.
+
+ -- Raphaël Hertzog <hertzog at debian.org> Wed, 27 Jan 2010 15:47:04 +0100
+
+python-django-tagging (0.3-1) unstable; urgency=low
+
+ * New upstream release. Closes: #549612
+ * Update watch file to match new scheme.
+ * Update Standards-Version to 3.8.3, no changes needed.
+ * Add a README.source pointing to quilt's README.source.
+
+ -- Raphaël Hertzog <hertzog at debian.org> Mon, 05 Oct 2009 23:52:09 +0200
+
+python-django-tagging (0.2.1+svn154-2) unstable; urgency=low
+
+ * Apply patch to fix weight of tag when using logarithmic distribution.
+ Closes: #525770
+
+ -- Raphael Hertzog <hertzog at debian.org> Fri, 08 May 2009 12:30:16 +0200
+
+python-django-tagging (0.2.1+svn154-1) unstable; urgency=low
+
+ [ Sandro Tosi ]
+ * debian/control
+ - switch Vcs-Browser field to viewsvn
+
+ [ 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 at debian.org> Fri, 13 Mar 2009 14:14:50 +0100
+
+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 at debian.org> Thu, 21 Aug 2008 18:07:31 -0700
+
+python-django-tagging (0.2.1-1) experimental; urgency=low
+
+ [ Raphael Hertzog ]
+ * New upstream release.
+ * Update the Vcs-Browser URL to match the python-modules standard.
+ * Updated Standards-Version to 3.7.3.
+ * Moved some build dependencies to Build-Depends-Indep as they are only
+ needed during build.
+ * Updated the dependency on python-django to make sure 0.96.1 doesn't
+ satisfy it accidentally.
+
+ [ Sandro Tosi ]
+ * debian/control
+ - uniforming Vcs-Browser field
+
+ -- Raphael Hertzog <hertzog at debian.org> Sun, 02 Mar 2008 12:01:32 +0100
+
+python-django-tagging (0.1+svn102-1) experimental; urgency=low
+
+ * Initial release.
+ * Upload to experimental because it requires the development version
+ of python-django.
+
+ -- Raphael Hertzog <hertzog at debian.org> Thu, 04 Oct 2007 12:44:38 +0200
Deleted: packages/python-django-tagging/tags/1:0.3.1-4/debian/compat
===================================================================
--- packages/python-django-tagging/trunk/debian/compat 2014-08-06 09:09:14 UTC (rev 30054)
+++ packages/python-django-tagging/tags/1:0.3.1-4/debian/compat 2014-08-06 11:41:33 UTC (rev 30061)
@@ -1 +0,0 @@
-8
Copied: packages/python-django-tagging/tags/1:0.3.1-4/debian/compat (from rev 30058, packages/python-django-tagging/trunk/debian/compat)
===================================================================
--- packages/python-django-tagging/tags/1:0.3.1-4/debian/compat (rev 0)
+++ packages/python-django-tagging/tags/1:0.3.1-4/debian/compat 2014-08-06 11:41:33 UTC (rev 30061)
@@ -0,0 +1 @@
+9
Deleted: packages/python-django-tagging/tags/1:0.3.1-4/debian/control
===================================================================
--- packages/python-django-tagging/trunk/debian/control 2014-08-06 09:09:14 UTC (rev 30054)
+++ packages/python-django-tagging/tags/1:0.3.1-4/debian/control 2014-08-06 11:41:33 UTC (rev 30061)
@@ -1,23 +0,0 @@
-Source: python-django-tagging
-Section: python
-Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Raphaël Hertzog <hertzog at debian.org>, Jonas Genannt <jonas.genannt at capi2name.de>
-Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~)
-Build-Depends-Indep: python-docutils
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-django-tagging/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-django-tagging/trunk/
-Homepage: http://code.google.com/p/django-tagging/
-
-Package: python-django-tagging
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-django (>= 1.0)
-Description: 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
- retrieval of tags simple.
- .
- Models can be expanded with a new TagField; web templates
- can easily include tag clouds and dedicated views are available
- to browse objects by tag.
Copied: packages/python-django-tagging/tags/1:0.3.1-4/debian/control (from rev 30060, packages/python-django-tagging/trunk/debian/control)
===================================================================
--- packages/python-django-tagging/tags/1:0.3.1-4/debian/control (rev 0)
+++ packages/python-django-tagging/tags/1:0.3.1-4/debian/control 2014-08-06 11:41:33 UTC (rev 30061)
@@ -0,0 +1,23 @@
+Source: python-django-tagging
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Raphaël Hertzog <hertzog at debian.org>, Jonas Genannt <jonas.genannt at capi2name.de>
+Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-django
+Build-Depends-Indep: python-docutils
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-django-tagging/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-django-tagging/trunk/
+Homepage: http://code.google.com/p/django-tagging/
+
+Package: python-django-tagging
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, python-django (>= 1.0)
+Description: 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
+ retrieval of tags simple.
+ .
+ Models can be expanded with a new TagField; web templates
+ can easily include tag clouds and dedicated views are available
+ to browse objects by tag.
Copied: packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/django-1.7-compat.patch (from rev 30057, packages/python-django-tagging/trunk/debian/patches/django-1.7-compat.patch)
===================================================================
--- packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/django-1.7-compat.patch (rev 0)
+++ packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/django-1.7-compat.patch 2014-08-06 11:41:33 UTC (rev 30061)
@@ -0,0 +1,37 @@
+Description: Add django 1.7 compatibility
+Author: Raphaël Hertzog <hertzog at debian.org>
+Bug-Debian: http://bugs.debian.org/755624
+Origin: vendor
+Last-Update: 2014-08-06
+
+--- python-django-tagging-0.3.1.orig/tagging/models.py
++++ python-django-tagging-0.3.1/tagging/models.py
+@@ -17,6 +17,8 @@ from tagging import settings
+ from tagging.utils import calculate_cloud, get_tag_list, get_queryset_and_model, parse_tag_input
+ from tagging.utils import LOGARITHMIC
+
++import collections
++
+ qn = connection.ops.quote_name
+
+ ############
+@@ -166,9 +168,16 @@ class TagManager(models.Manager):
+ # Django 1.2+
+ compiler = queryset.query.get_compiler(using='default')
+ extra_joins = ' '.join(compiler.get_from_clause()[0][1:])
+- where, params = queryset.query.where.as_sql(
+- compiler.quote_name_unless_alias, compiler.connection
+- )
++ if isinstance(compiler, collections.Callable):
++ # Django 1.7+
++ where, params = queryset.query.where.as_sql(
++ compiler, compiler.connection
++ )
++ else:
++ # Django 1.2-1.6
++ where, params = queryset.query.where.as_sql(
++ compiler.quote_name_unless_alias, compiler.connection
++ )
+ else:
+ # Django pre-1.2
+ extra_joins = ' '.join(queryset.query.get_from_clause()[0][1:])
Copied: packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/fix-testsuite.patch (from rev 30057, packages/python-django-tagging/trunk/debian/patches/fix-testsuite.patch)
===================================================================
--- packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/fix-testsuite.patch (rev 0)
+++ packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/fix-testsuite.patch 2014-08-06 11:41:33 UTC (rev 30061)
@@ -0,0 +1,39 @@
+Description: Fix settings for test suite
+Author: Raphaël Hertzog <hertzog at debian.org>
+Origin: vendor
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format.
+--- python-django-tagging-0.3.1.orig/tagging/tests/settings.py
++++ python-django-tagging-0.3.1/tagging/tests/settings.py
+@@ -3,22 +3,14 @@ DIRNAME = os.path.dirname(__file__)
+
+ DEFAULT_CHARSET = 'utf-8'
+
+-test_engine = os.environ.get("TAGGING_TEST_ENGINE", "sqlite3")
+-
+-DATABASE_ENGINE = test_engine
+-DATABASE_NAME = os.environ.get("TAGGING_DATABASE_NAME", "tagging_test")
+-DATABASE_USER = os.environ.get("TAGGING_DATABASE_USER", "")
+-DATABASE_PASSWORD = os.environ.get("TAGGING_DATABASE_PASSWORD", "")
+-DATABASE_HOST = os.environ.get("TAGGING_DATABASE_HOST", "localhost")
+-
+-if test_engine == "sqlite":
+- DATABASE_NAME = os.path.join(DIRNAME, 'tagging_test.db')
+- DATABASE_HOST = ""
+-elif test_engine == "mysql":
+- DATABASE_PORT = os.environ.get("TAGGING_DATABASE_PORT", 3306)
+-elif test_engine == "postgresql_psycopg2":
+- DATABASE_PORT = os.environ.get("TAGGING_DATABASE_PORT", 5432)
++DATABASES = {
++ 'default': {
++ 'ENGINE': 'django.db.backends.sqlite3',
++ 'NAME': os.path.join(DIRNAME, 'tagging_test.db'),
++ }
++}
+
++SECRET_KEY = 'liewoo1jie7TahTao3ci7xayee8gieg9ukee'
+
+ INSTALLED_APPS = (
+ 'django.contrib.contenttypes',
Deleted: packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/series
===================================================================
--- packages/python-django-tagging/trunk/debian/patches/series 2014-08-06 09:09:14 UTC (rev 30054)
+++ packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/series 2014-08-06 11:41:33 UTC (rev 30061)
@@ -1 +0,0 @@
-fix_calc_tag_weight
Copied: packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/series (from rev 30057, packages/python-django-tagging/trunk/debian/patches/series)
===================================================================
--- packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/series (rev 0)
+++ packages/python-django-tagging/tags/1:0.3.1-4/debian/patches/series 2014-08-06 11:41:33 UTC (rev 30061)
@@ -0,0 +1,3 @@
+fix_calc_tag_weight
+fix-testsuite.patch
+django-1.7-compat.patch
Deleted: packages/python-django-tagging/tags/1:0.3.1-4/debian/rules
===================================================================
--- packages/python-django-tagging/trunk/debian/rules 2014-08-06 09:09:14 UTC (rev 30054)
+++ packages/python-django-tagging/tags/1:0.3.1-4/debian/rules 2014-08-06 11:41:33 UTC (rev 30061)
@@ -1,12 +0,0 @@
-#!/usr/bin/make -f
-
-PKG = $(shell dh_listpackages)
-
-%:
- dh $@ --with python2
-
-override_dh_installdocs:
- dh_installdocs
- # Generate documentation
- rst2html <docs/overview.txt >debian/$(PKG)/usr/share/doc/$(PKG)/overview.html
-
Copied: packages/python-django-tagging/tags/1:0.3.1-4/debian/rules (from rev 30059, packages/python-django-tagging/trunk/debian/rules)
===================================================================
--- packages/python-django-tagging/tags/1:0.3.1-4/debian/rules (rev 0)
+++ packages/python-django-tagging/tags/1:0.3.1-4/debian/rules 2014-08-06 11:41:33 UTC (rev 30061)
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+PKG = $(shell dh_listpackages)
+
+%:
+ dh $@ --with python2
+
+override_dh_auto_test:
+ PYTHONPATH=. DJANGO_SETTINGS_MODULE=tagging.tests.settings python /usr/bin/django-admin test
+
+override_dh_installdocs:
+ dh_installdocs
+ # Generate documentation
+ rst2html <docs/overview.txt >debian/$(PKG)/usr/share/doc/$(PKG)/overview.html
+
More information about the Python-modules-commits
mailing list