[Python-modules-commits] r18339 - in packages/python-django-shorturls/trunk/debian (10 files)

Thu Aug 25 19:12:54 UTC 2011

Date: Thursday, August 25, 2011 @ 19:12:53
  Author: janos-guest
Revision: 18339

Switch to dh_python2 and minor updates.

Added:
  packages/python-django-shorturls/trunk/debian/patches/0001-Corrected-sample-usage-to-convert-back-to-decimal.patch
  packages/python-django-shorturls/trunk/debian/source/local-options
Modified:
  packages/python-django-shorturls/trunk/debian/changelog
  packages/python-django-shorturls/trunk/debian/control
  packages/python-django-shorturls/trunk/debian/copyright
  packages/python-django-shorturls/trunk/debian/patches/01_doc-sync.diff
  packages/python-django-shorturls/trunk/debian/patches/02_setup-sync.diff
  packages/python-django-shorturls/trunk/debian/patches/series
  packages/python-django-shorturls/trunk/debian/rules
Deleted:
  packages/python-django-shorturls/trunk/debian/README.source

Deleted: packages/python-django-shorturls/trunk/debian/README.source
===================================================================

--- packages/python-django-shorturls/trunk/debian/README.source	2011-08-25 18:45:29 UTC (rev 18338)
+++ packages/python-django-shorturls/trunk/debian/README.source	2011-08-25 19:12:53 UTC (rev 18339)
@@ -1,2 +0,0 @@
-The package uses the quilt patch system to apply patches.
-See /usr/share/doc/quilt/README.source.

Modified: packages/python-django-shorturls/trunk/debian/changelog
===================================================================
--- packages/python-django-shorturls/trunk/debian/changelog	2011-08-25 18:45:29 UTC (rev 18338)
+++ packages/python-django-shorturls/trunk/debian/changelog	2011-08-25 19:12:53 UTC (rev 18339)
@@ -1,11 +1,16 @@
-python-django-shorturls (1.0.1-3) unstable; urgency=low
+python-django-shorturls (1.0.1-3) UNRELEASED; 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.1. No changes needed.
+  * 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.
 
- -- Janos Guljas <janos at resenje.org>  Mon, 24 Jan 2011 20:21:29 +0100
+ -- Janos Guljas <janos at resenje.org>  Thu, 25 Aug 2011 21:09:59 +0200
 
 python-django-shorturls (1.0.1-2) unstable; urgency=low
 

Modified: packages/python-django-shorturls/trunk/debian/control
===================================================================
--- packages/python-django-shorturls/trunk/debian/control	2011-08-25 18:45:29 UTC (rev 18338)
+++ packages/python-django-shorturls/trunk/debian/control	2011-08-25 19:12:53 UTC (rev 18339)
@@ -5,7 +5,7 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50~), python-support, python-setuptools
 XS-Python-Version: >= 2.5
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://pypi.python.org/pypi/django-shorturls/
 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/
@@ -14,6 +14,6 @@
 Architecture: all
 XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends}, ${python:Depends}, python-django
-Description: A short URL handler for Django applications
+Description: Short URL handler for Django applications
  Django-shorturls is a custom URL shortening application for Django, including
  easy rev=canonical support.

Modified: packages/python-django-shorturls/trunk/debian/copyright
===================================================================
--- packages/python-django-shorturls/trunk/debian/copyright	2011-08-25 18:45:29 UTC (rev 18338)
+++ packages/python-django-shorturls/trunk/debian/copyright	2011-08-25 19:12:53 UTC (rev 18339)
@@ -1,15 +1,38 @@
-This package was debianized by Janos Guljas <janos at janos.in.rs> on
-Thu, 10 Dec 2009 00:41:49 +0100.
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: django-shorturls
+Upstream-Contact: Jacob Kaplan-Moss <jacob at jacobian.org>
+Source: https://github.com/jacobian/django-shorturls/
 
-The Debian packaging is Copyright 2009, Janos Guljas <janos at janos.in.rs>
-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 <janos at resenje.org>
+License: BSD
 
-Upstream Authors: Simon Willison, Jacob Kaplan-Moss <jacob at jacobian.org>
+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

Added: packages/python-django-shorturls/trunk/debian/patches/0001-Corrected-sample-usage-to-convert-back-to-decimal.patch
===================================================================
--- packages/python-django-shorturls/trunk/debian/patches/0001-Corrected-sample-usage-to-convert-back-to-decimal.patch	                        (rev 0)
+++ packages/python-django-shorturls/trunk/debian/patches/0001-Corrected-sample-usage-to-convert-back-to-decimal.patch	2011-08-25 19:12:53 UTC (rev 18339)
@@ -0,0 +1,25 @@
+From de5ab6d2a21875b29a5d456551dbb46e7971fcbc Mon Sep 17 00:00:00 2001
+From: Jonathan Street <jonathan at jonathanstreet.com>
+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
+

Modified: packages/python-django-shorturls/trunk/debian/patches/01_doc-sync.diff
===================================================================
--- packages/python-django-shorturls/trunk/debian/patches/01_doc-sync.diff	2011-08-25 18:45:29 UTC (rev 18338)
+++ packages/python-django-shorturls/trunk/debian/patches/01_doc-sync.diff	2011-08-25 19:12:53 UTC (rev 18339)
@@ -1,5 +1,5 @@
 Description: Apply changes in README and add LICENCE from the git
-Author: Janos Guljas <janos at janos.in.rs>
+Author: Janos Guljas <janos at resenje.org>
 Last-Update: 2010-01-06
 
 --- /dev/null

Modified: packages/python-django-shorturls/trunk/debian/patches/02_setup-sync.diff
===================================================================
--- packages/python-django-shorturls/trunk/debian/patches/02_setup-sync.diff	2011-08-25 18:45:29 UTC (rev 18338)
+++ packages/python-django-shorturls/trunk/debian/patches/02_setup-sync.diff	2011-08-25 19:12:53 UTC (rev 18339)
@@ -1,5 +1,5 @@
 Description: Apply changes in setup.py from the git
-Author: Janos Guljas <janos at janos.in.rs>
+Author: Janos Guljas <janos at resenje.org>
 Last-Update: 2010-01-06
 
 --- a/setup.py

Modified: packages/python-django-shorturls/trunk/debian/patches/series
===================================================================
--- packages/python-django-shorturls/trunk/debian/patches/series	2011-08-25 18:45:29 UTC (rev 18338)
+++ packages/python-django-shorturls/trunk/debian/patches/series	2011-08-25 19:12:53 UTC (rev 18339)
@@ -1,2 +1,3 @@
+0001-Corrected-sample-usage-to-convert-back-to-decimal.patch
 01_doc-sync.diff
 02_setup-sync.diff

Modified: packages/python-django-shorturls/trunk/debian/rules
===================================================================
--- packages/python-django-shorturls/trunk/debian/rules	2011-08-25 18:45:29 UTC (rev 18338)
+++ packages/python-django-shorturls/trunk/debian/rules	2011-08-25 19:12:53 UTC (rev 18339)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with python2
 
 override_dh_auto_clean:
 	# remove AppleDouble encoded Macintosh files

Added: packages/python-django-shorturls/trunk/debian/source/local-options
===================================================================
--- packages/python-django-shorturls/trunk/debian/source/local-options	                        (rev 0)
+++ packages/python-django-shorturls/trunk/debian/source/local-options	2011-08-25 19:12:53 UTC (rev 18339)
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes


