diff options
| -rw-r--r-- | debian/.git-dpm | 8 | ||||
| -rw-r--r-- | debian/changelog | 118 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 23 | ||||
| -rw-r--r-- | debian/copyright | 62 | ||||
| -rw-r--r-- | debian/docs | 1 | ||||
| -rw-r--r-- | debian/patches/django-1.7-compat.patch | 47 | ||||
| -rw-r--r-- | debian/patches/fix-testsuite.patch | 46 | ||||
| -rw-r--r-- | debian/patches/fix_calc_tag_weight | 29 | ||||
| -rw-r--r-- | debian/patches/series | 3 | ||||
| -rw-r--r-- | debian/python-django-tagging.doc-base | 13 | ||||
| -rwxr-xr-x | debian/rules | 15 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/watch | 3 |
14 files changed, 370 insertions, 0 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm new file mode 100644 index 0000000..240eef7 --- /dev/null +++ b/debian/.git-dpm @@ -0,0 +1,8 @@ +# see git-dpm(1) from git-dpm package +210bfd7f97afe0162e682cbd2530115cf09fd51d +210bfd7f97afe0162e682cbd2530115cf09fd51d +29425a36c920e9b54e5860429ef3e3ce639fb155 +29425a36c920e9b54e5860429ef3e3ce639fb155 +python-django-tagging_0.3.1.orig.tar.gz +f737bff307a21175b0dbacdb7969cd6bfff6f6ea +31531 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..3993c44 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,118 @@ +python-django-tagging (1:0.3.1-5) UNRELEASED; urgency=medium + + * Drop myself from Uploaders. + + -- Raphaël Hertzog <hertzog@debian.org> Wed, 11 Feb 2015 10:11:51 +0100 + +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@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@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@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@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@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@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@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@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@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@debian.org> Thu, 04 Oct 2007 12:44:38 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..229d871 --- /dev/null +++ b/debian/control @@ -0,0 +1,23 @@ +Source: python-django-tagging +Section: python +Priority: optional +Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> +Uploaders: Jonas Genannt <jonas.genannt@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. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..7f2d729 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,62 @@ +This package was debianized by Raphael Hertzog <hertzog@debian.org>. + +It was downloaded from http://code.google.com/p/django-tagging/ + +Upstream Author: Jonathan Buchanan <jonathan.buchanan@gmail.com> + +Copyright: +---------- + +This copyright notice applies to django-tagging itself: + + Copyright (c) 2007, Jonathan Buchanan + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +This copyright notice applies to "Cab" (http://code.google.com/p/cab/) which +was used as base for creating django-tagging: + + Copyright (c) 2007, James Bennett + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of the author nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..bf4cbd5 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +docs/*.txt diff --git a/debian/patches/django-1.7-compat.patch b/debian/patches/django-1.7-compat.patch new file mode 100644 index 0000000..3b388e3 --- /dev/null +++ b/debian/patches/django-1.7-compat.patch @@ -0,0 +1,47 @@ +From 210bfd7f97afe0162e682cbd2530115cf09fd51d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org> +Date: Thu, 8 Oct 2015 11:51:55 -0700 +Subject: Add django 1.7 compatibility + +Bug-Debian: http://bugs.debian.org/755624 +Origin: vendor +Last-Update: 2014-08-06 + +Patch-Name: django-1.7-compat.patch +--- + tagging/models.py | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/tagging/models.py b/tagging/models.py +index 860cf81..e13b077 100644 +--- a/tagging/models.py ++++ b/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:]) diff --git a/debian/patches/fix-testsuite.patch b/debian/patches/fix-testsuite.patch new file mode 100644 index 0000000..c1a87fc --- /dev/null +++ b/debian/patches/fix-testsuite.patch @@ -0,0 +1,46 @@ +From f50f19a1d9495ca98bf0e5de941ab9c21bcdbf91 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org> +Date: Thu, 8 Oct 2015 11:51:54 -0700 +Subject: Fix settings for test suite + +Origin: vendor + +Patch-Name: fix-testsuite.patch +--- + tagging/tests/settings.py | 22 +++++++--------------- + 1 file changed, 7 insertions(+), 15 deletions(-) + +diff --git a/tagging/tests/settings.py b/tagging/tests/settings.py +index 74eb909..1985118 100644 +--- a/tagging/tests/settings.py ++++ b/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', diff --git a/debian/patches/fix_calc_tag_weight b/debian/patches/fix_calc_tag_weight new file mode 100644 index 0000000..b7def19 --- /dev/null +++ b/debian/patches/fix_calc_tag_weight @@ -0,0 +1,29 @@ +From e54ad0924908aec2a7970c957551787875317b2b Mon Sep 17 00:00:00 2001 +From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org> +Date: Thu, 8 Oct 2015 11:51:53 -0700 +Subject: Fix tag_weight when using logarithmic distribution + + When logarithmic distribution is used _calculate_tag_weight may + return weight greater than maximum threshold. Because of this the attribute + font_size of the most frequently used tag may be left unset. +Upstream: http://code.google.com/p/django-tagging/issues/detail?id=91 +Debian: #525770 + +Patch-Name: fix_calc_tag_weight +--- + tagging/utils.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tagging/utils.py b/tagging/utils.py +index e89bab0..759e8d8 100644 +--- a/tagging/utils.py ++++ b/tagging/utils.py +@@ -232,7 +232,7 @@ def _calculate_tag_weight(weight, max_weight, distribution): + if distribution == LINEAR or max_weight == 1: + return weight + elif distribution == LOGARITHMIC: +- return math.log(weight) * max_weight / math.log(max_weight) ++ return min((max_weight, math.log(weight) * max_weight / math.log(max_weight))) + raise ValueError(_('Invalid distribution algorithm specified: %s.') % distribution) + + def calculate_cloud(tags, steps=4, distribution=LOGARITHMIC): diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..5499ba6 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +fix_calc_tag_weight +fix-testsuite.patch +django-1.7-compat.patch diff --git a/debian/python-django-tagging.doc-base b/debian/python-django-tagging.doc-base new file mode 100644 index 0000000..c34dbc6 --- /dev/null +++ b/debian/python-django-tagging.doc-base @@ -0,0 +1,13 @@ +Document: django-tagging-overview +Title: Django Tagging Documentation +Abstract: This is the documentation of Django Tagging, a generic tagging + application for Django projects, which allows association of a number of + tags with any Django model instance and makes retrieval of tags simple. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/python-django-tagging/overview.html +Files: /usr/share/doc/python-django-tagging/overview.html + +Format: Text +Files: /usr/share/doc/python-django-tagging/overview.txt.gz diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..b76798a --- /dev/null +++ b/debian/rules @@ -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 + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..7c08702 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://code.google.com/p/django-tagging/downloads/list \ +.*/files/django-tagging-(\d.*)\.tar\.gz |