diff -Nru python-django-shorturls-1.0.1/debian/changelog python-django-shorturls-1.0.1/debian/changelog --- python-django-shorturls-1.0.1/debian/changelog 2010-01-18 21:01:05.000000000 +0000 +++ python-django-shorturls-1.0.1/debian/changelog 2011-12-27 01:48:03.000000000 +0000 @@ -1,3 +1,20 @@ +python-django-shorturls (1.0.1-3) unstable; urgency=low + + * Switch to dh_python2. + * Change debian/copyright to be DEP5 compatible. + * Added dependency to python-django. + * Fixed Vcs-Svn and Vcs-Browser values. + * Bump standards to 3.9.2. No changes needed. + * Changed my email address. + * Added debian/source/local-options. + * Remove debian/README.source. + * Fix description-synopsis-starts-with-article warning. + * Add DM-Upload-Allowed control field. + * Add python-all to build-depends to fix "missing build dependency + for dh addon" lintian warning. + + -- Janos Guljas Mon, 26 Dec 2011 22:50:41 +0100 + python-django-shorturls (1.0.1-2) unstable; urgency=low * Changed Long description (Closes: #563574) diff -Nru python-django-shorturls-1.0.1/debian/control python-django-shorturls-1.0.1/debian/control --- python-django-shorturls-1.0.1/debian/control 2010-01-18 21:01:05.000000000 +0000 +++ python-django-shorturls-1.0.1/debian/control 2011-12-27 01:48:03.000000000 +0000 @@ -1,19 +1,20 @@ Source: python-django-shorturls Section: python Priority: optional -Maintainer: Janos Guljas +Maintainer: Janos Guljas Uploaders: Debian Python Modules Team -Build-Depends: debhelper (>= 7.0.50), python-support, python-setuptools +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 7.0.50~), python-all, python-support, python-setuptools XS-Python-Version: >= 2.5 -Standards-Version: 3.8.3 +Standards-Version: 3.9.2 Homepage: http://pypi.python.org/pypi/django-shorturls/ -Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-textile/trunk -Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-textile/trunk/ +Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-django-shorturls/trunk +Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-django-shorturls/trunk/ Package: python-django-shorturls Architecture: all XB-Python-Version: ${python:Versions} -Depends: ${misc:Depends}, ${python:Depends} -Description: A short URL handler for Django applications +Depends: ${misc:Depends}, ${python:Depends}, python-django +Description: Short URL handler for Django applications Django-shorturls is a custom URL shortening application for Django, including easy rev=canonical support. diff -Nru python-django-shorturls-1.0.1/debian/copyright python-django-shorturls-1.0.1/debian/copyright --- python-django-shorturls-1.0.1/debian/copyright 2009-12-10 00:49:04.000000000 +0000 +++ python-django-shorturls-1.0.1/debian/copyright 2011-12-26 19:14:52.000000000 +0000 @@ -1,15 +1,38 @@ -This package was debianized by Janos Guljas on -Thu, 10 Dec 2009 00:41:49 +0100. +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 +Upstream-Name: django-shorturls +Upstream-Contact: Jacob Kaplan-Moss +Source: https://github.com/jacobian/django-shorturls/ -The Debian packaging is Copyright 2009, Janos Guljas -and is licensed under the BSD license. Under Debian systems, you can find -the text of the BSD license under /usr/share/common-licenses/BSD +Files: * +Copyright: 2008 Simon Willison and Jacob Kaplan-Moss +License: BSD -It was downloaded from http://pypi.python.org/pypi/django-shorturls +Files: debian/* +Copyright: 2011 Janos Guljas +License: BSD -Upstream Authors: Simon Willison, Jacob Kaplan-Moss +License: BSD + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. 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. + 3. Neither the name of the PyFilesystem nor the names of his contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. -Copyright: - - django-shorturls is under a BSD license. Under Debian systems, you can find - the text of the BSD license under /usr/share/common-licenses/BSD diff -Nru python-django-shorturls-1.0.1/debian/patches/0001-Corrected-sample-usage-to-convert-back-to-decimal.patch python-django-shorturls-1.0.1/debian/patches/0001-Corrected-sample-usage-to-convert-back-to-decimal.patch --- python-django-shorturls-1.0.1/debian/patches/0001-Corrected-sample-usage-to-convert-back-to-decimal.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-django-shorturls-1.0.1/debian/patches/0001-Corrected-sample-usage-to-convert-back-to-decimal.patch 2011-12-26 19:14:52.000000000 +0000 @@ -0,0 +1,25 @@ +From de5ab6d2a21875b29a5d456551dbb46e7971fcbc Mon Sep 17 00:00:00 2001 +From: Jonathan Street +Date: Mon, 4 Jul 2011 07:30:20 -0700 +Subject: [PATCH] Corrected sample usage to convert back to decimal. + +--- + src/shorturls/baseconv.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/shorturls/baseconv.py b/src/shorturls/baseconv.py +index ba2f759..1e22ed1 100644 +--- a/src/shorturls/baseconv.py ++++ b/src/shorturls/baseconv.py +@@ -8,7 +8,7 @@ Sample usage: + >>> base20 = BaseConverter('0123456789abcdefghij') + >>> base20.from_decimal(1234) + '31e' +->>> base20.from_decimal('31e') ++>>> base20.to_decimal('31e') + 1234 + """ + +-- +1.7.5.4 + diff -Nru python-django-shorturls-1.0.1/debian/patches/01_doc-sync.diff python-django-shorturls-1.0.1/debian/patches/01_doc-sync.diff --- python-django-shorturls-1.0.1/debian/patches/01_doc-sync.diff 2010-01-16 23:09:57.000000000 +0000 +++ python-django-shorturls-1.0.1/debian/patches/01_doc-sync.diff 2011-12-26 19:14:52.000000000 +0000 @@ -1,5 +1,5 @@ Description: Apply changes in README and add LICENCE from the git -Author: Janos Guljas +Author: Janos Guljas Last-Update: 2010-01-06 --- /dev/null diff -Nru python-django-shorturls-1.0.1/debian/patches/02_setup-sync.diff python-django-shorturls-1.0.1/debian/patches/02_setup-sync.diff --- python-django-shorturls-1.0.1/debian/patches/02_setup-sync.diff 2010-01-16 23:09:57.000000000 +0000 +++ python-django-shorturls-1.0.1/debian/patches/02_setup-sync.diff 2011-12-26 19:14:52.000000000 +0000 @@ -1,5 +1,5 @@ Description: Apply changes in setup.py from the git -Author: Janos Guljas +Author: Janos Guljas Last-Update: 2010-01-06 --- a/setup.py diff -Nru python-django-shorturls-1.0.1/debian/patches/series python-django-shorturls-1.0.1/debian/patches/series --- python-django-shorturls-1.0.1/debian/patches/series 2010-01-16 23:09:57.000000000 +0000 +++ python-django-shorturls-1.0.1/debian/patches/series 2011-12-26 19:14:52.000000000 +0000 @@ -1,2 +1,3 @@ +0001-Corrected-sample-usage-to-convert-back-to-decimal.patch 01_doc-sync.diff 02_setup-sync.diff diff -Nru python-django-shorturls-1.0.1/debian/README.source python-django-shorturls-1.0.1/debian/README.source --- python-django-shorturls-1.0.1/debian/README.source 2010-01-16 23:09:57.000000000 +0000 +++ python-django-shorturls-1.0.1/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -The package uses the quilt patch system to apply patches. -See /usr/share/doc/quilt/README.source. diff -Nru python-django-shorturls-1.0.1/debian/rules python-django-shorturls-1.0.1/debian/rules --- python-django-shorturls-1.0.1/debian/rules 2010-01-18 21:01:05.000000000 +0000 +++ python-django-shorturls-1.0.1/debian/rules 2011-12-26 19:14:52.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ + dh $@ --with python2 override_dh_auto_clean: # remove AppleDouble encoded Macintosh files