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

[fladi-guest at users.alioth.debian.org]

    Date: Friday, October 7, 2011 @ 11:50:51
  Author: fladi-guest
Revision: 18841

New upstream release.

Modified:
  packages/django-countries/trunk/debian/changelog
  packages/django-countries/trunk/debian/control
  packages/django-countries/trunk/debian/copyright
  packages/django-countries/trunk/debian/patches/dont_include_flag_icons

Modified: packages/django-countries/trunk/debian/changelog
===================================================================
--- packages/django-countries/trunk/debian/changelog	2011-10-07 06:46:16 UTC (rev 18840)
+++ packages/django-countries/trunk/debian/changelog	2011-10-07 11:50:51 UTC (rev 18841)
@@ -1,3 +1,14 @@
+django-countries (1.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Prefer PNG icons.
+  * Streamline packaging code with wrap-and-sort.
+  * Update d/copyright.
+  * Bump standards version to 3.9.2.
+  * Update dont_include_flag_icons patch.
+
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Fri, 07 Oct 2011 13:50:39 +0200
+
 django-countries (1.0.5-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/django-countries/trunk/debian/control
===================================================================
--- packages/django-countries/trunk/debian/control	2011-10-07 06:46:16 UTC (rev 18840)
+++ packages/django-countries/trunk/debian/control	2011-10-07 11:50:51 UTC (rev 18841)
@@ -3,9 +3,13 @@
 Priority: optional
 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
+Build-Depends: debhelper (>= 7.0.50~),
+               iso-codes,
+               python-all (>= 2.5),
+               python-django,
+               python-setuptools,
+               python-support
+Standards-Version: 3.9.2
 XS-Python-Version: >= 2.5
 Homepage: http://bitbucket.org/smileychris/django-countries/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/django-countries/trunk/
@@ -13,11 +17,13 @@
 
 Package: python-django-countries
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-django, 
- famfamfam-flag-gif | famfamfam-flag-png, iso-codes
+Depends: famfamfam-flag-png | famfamfam-flag-gif,
+         iso-codes,
+         python-django,
+         ${misc:Depends},
+         ${python:Depends}
 Description: provides a country field for Django models
- A Django application which provides all ISO 3166-1 countries as choices for 
+ A Django application which provides all ISO 3166-1 countries as choices for
  use with forms, and a country field for models.
- It also includes a small template filter for getting country flags by 
- ISO 3166-1 alpha-2 country code. 
-
+ It also includes a small template filter for getting country flags by
+ ISO 3166-1 alpha-2 country code.

Modified: packages/django-countries/trunk/debian/copyright
===================================================================
--- packages/django-countries/trunk/debian/copyright	2011-10-07 06:46:16 UTC (rev 18840)
+++ packages/django-countries/trunk/debian/copyright	2011-10-07 11:50:51 UTC (rev 18841)
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=174
 Upstream-Name: django-countries
 Upstream-Contact: Chris Beaven <smileychris at gmail.com>
 Source: http://pypi.python.org/pypi/django-countries/
@@ -8,10 +8,11 @@
 License: MIT
 
 Files: django_countries/media/flags/*
+Copyright: Mark James <mjames at gmail.com>
 License: Flag-Icon-License
 
 Files: debian/*
-Copyright: 2010, Fladischer Michael
+Copyright: 2011, Fladischer Michael
 License: MIT
 
 License: MIT
@@ -37,6 +38,5 @@
  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.

Modified: packages/django-countries/trunk/debian/patches/dont_include_flag_icons
===================================================================
--- packages/django-countries/trunk/debian/patches/dont_include_flag_icons	2011-10-07 06:46:16 UTC (rev 18840)
+++ packages/django-countries/trunk/debian/patches/dont_include_flag_icons	2011-10-07 11:50:51 UTC (rev 18841)
@@ -4,15 +4,14 @@
 Forwarded: not-needed
 Last-Update: 2010-04-20
 
-Index: django-countries/setup.py
-===================================================================
---- django-countries.orig/setup.py	2010-04-20 11:40:34.357763942 +0200
-+++ django-countries/setup.py	2010-04-20 11:40:39.870263830 +0200
-@@ -25,7 +25,6 @@
-       author_email='smileychris at gmail.com',
-       url='http://bitbucket.org/smileychris/django-countries/',
-       packages=find_packages(),
--      package_data={'django_countries': ['bin/*.py', 'media/flags/*.gif']},
-       # titlecase PYPI is broken, copied the module directly for now (in /bin)
- #      requires=['titlecase'],
-       classifiers=[
+--- a/setup.py
++++ b/setup.py
+@@ -28,8 +28,6 @@
+     packages=find_packages(),
+     zip_safe=False,
+     package_data={'django_countries': [
+-        'bin/*.py',
+-        'static/flags/*.gif',
+         'locale/*/LC_MESSAGES/*',
+     ]},
+     # titlecase PYPI is broken, copied the module directly for now (in /bin)