[Python-modules-commits] r15505 - in packages/django-countries/trunk/debian (6 files)

Mon Feb 7 12:27:00 UTC 2011

Date: Monday, February 7, 2011 @ 12:26:57
  Author: fladi-guest
Revision: 15505

Prepare for upload to unstable.

Added:
  packages/django-countries/trunk/debian/settings.py
Modified:
  packages/django-countries/trunk/debian/changelog
  packages/django-countries/trunk/debian/control
  packages/django-countries/trunk/debian/copyright
  packages/django-countries/trunk/debian/rules
Deleted:
  packages/django-countries/trunk/debian/pyversions

Modified: packages/django-countries/trunk/debian/changelog
===================================================================

--- packages/django-countries/trunk/debian/changelog	2011-02-07 12:17:38 UTC (rev 15504)
+++ packages/django-countries/trunk/debian/changelog	2011-02-07 12:26:57 UTC (rev 15505)
@@ -1,9 +1,13 @@
 django-countries (1.0.5-1) unstable; urgency=low
 
   * New upstream release.
-  * Bump to standards version 3.9.1. No changes.
+  * Bump to standards-version 3.9.1.
+  * Update DEP5 format.
+  * Drop debian/pyversions in favour of XS-Python-Version.
+  * Simplify debian/rules by using a predefined settings.py.
+  * Set PMPT as maintainer and myself as uploader.
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Mon, 20 Sep 2010 07:54:44 +0200
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Mon, 07 Feb 2011 13:24:36 +0100
 
 django-countries (1.0.4-1) unstable; urgency=low
 

Modified: packages/django-countries/trunk/debian/control
===================================================================
--- packages/django-countries/trunk/debian/control	2011-02-07 12:17:38 UTC (rev 15504)
+++ packages/django-countries/trunk/debian/control	2011-02-07 12:26:57 UTC (rev 15505)
@@ -1,11 +1,12 @@
 Source: django-countries
 Section: python
 Priority: optional
-Maintainer: Fladischer Michael <FladischerMichael at fladi.at>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Fladischer Michael <FladischerMichael at fladi.at>
 Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.5), python-support, 
  python-setuptools, python-django, iso-codes
 Standards-Version: 3.9.1
+XS-Python-Version: >= 2.5
 Homepage: http://bitbucket.org/smileychris/django-countries/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/django-countries/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/django-countries/trunk/

Modified: packages/django-countries/trunk/debian/copyright
===================================================================
--- packages/django-countries/trunk/debian/copyright	2011-02-07 12:17:38 UTC (rev 15504)
+++ packages/django-countries/trunk/debian/copyright	2011-02-07 12:26:57 UTC (rev 15505)
@@ -1,6 +1,6 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: django-countries
-Maintainer: Chris Beaven <smileychris at gmail.com>
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Upstream-Name: django-countries
+Upstream-Contact: Chris Beaven <smileychris at gmail.com>
 Source: http://pypi.python.org/pypi/django-countries/
 
 Files: *
@@ -15,28 +15,28 @@
 License: MIT
 
 License: MIT
-    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.
+ 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.
 
 License: Flag-Icon-License
-    The flag icons are available for free use for any purpose with 
-    no requirement for attribution. 
+ The flag icons are available for free use for any purpose with 
+ no requirement for attribution. 
 

Deleted: packages/django-countries/trunk/debian/pyversions
===================================================================
--- packages/django-countries/trunk/debian/pyversions	2011-02-07 12:17:38 UTC (rev 15504)
+++ packages/django-countries/trunk/debian/pyversions	2011-02-07 12:26:57 UTC (rev 15505)
@@ -1 +0,0 @@
-2.5-

Modified: packages/django-countries/trunk/debian/rules
===================================================================
--- packages/django-countries/trunk/debian/rules	2011-02-07 12:17:38 UTC (rev 15504)
+++ packages/django-countries/trunk/debian/rules	2011-02-07 12:26:57 UTC (rev 15505)
@@ -11,11 +11,7 @@
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	django-admin startproject testproject
-	echo 'DATABASE_ENGINE = "sqlite3"' > testproject/settings.py
-	echo 'DATABASE_NAME = "testproject/test.db3"' >> testproject/settings.py
-	echo 'INSTALLED_APPS = ["django_countries","django.contrib.auth","django.contrib.contenttypes","django.contrib.admin","django.contrib.sites","django.contrib.sessions"]' >> testproject/settings.py
-	echo 'SITE_ID = 1' >> testproject/settings.py
-	echo 'ROOT_URLCONF = "testproject.urls"' >> testproject/settings.py
+	cp debian/settings.py testproject/settings.py
 	set -e; \
 	for python in $(shell pyversions -r); do \
 	  rm -f testproject/test.db3 ; \

Added: packages/django-countries/trunk/debian/settings.py
===================================================================
--- packages/django-countries/trunk/debian/settings.py	                        (rev 0)
+++ packages/django-countries/trunk/debian/settings.py	2011-02-07 12:26:57 UTC (rev 15505)
@@ -0,0 +1,11 @@
+DATABASE_ENGINE = "sqlite3"
+DATABASE_NAME = "testproject/test.db3"
+INSTALLED_APPS = ["django_countries",
+                  "django.contrib.auth",
+                  "django.contrib.contenttypes",
+                  "django.contrib.admin",
+                  "django.contrib.sites",
+                  "django.contrib.sessions",
+                  ]
+SITE_ID = 1
+ROOT_URLCONF = "testproject.urls"


Property changes on: packages/django-countries/trunk/debian/settings.py
___________________________________________________________________
Added: svn:executable
   + *


