[Python-modules-commits] r19020 - in packages/django-countries/trunk/debian (6 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Fri Oct 21 16:46:37 UTC 2011
Date: Friday, October 21, 2011 @ 16:46:34
Author: fladi-guest
Revision: 19020
Update patches.
Added:
packages/django-countries/trunk/debian/patches/dont_include_flag_icons.patch
(from rev 18841, packages/django-countries/trunk/debian/patches/dont_include_flag_icons)
packages/django-countries/trunk/debian/patches/use_iso_codes_package.patch
(from rev 18840, packages/django-countries/trunk/debian/patches/use_iso_codes_package)
Modified:
packages/django-countries/trunk/debian/changelog
packages/django-countries/trunk/debian/patches/series
Deleted:
packages/django-countries/trunk/debian/patches/dont_include_flag_icons
packages/django-countries/trunk/debian/patches/use_iso_codes_package
Modified: packages/django-countries/trunk/debian/changelog
===================================================================
--- packages/django-countries/trunk/debian/changelog 2011-10-21 15:31:07 UTC (rev 19019)
+++ packages/django-countries/trunk/debian/changelog 2011-10-21 16:46:34 UTC (rev 19020)
@@ -6,8 +6,10 @@
* Update d/copyright.
* Bump standards version to 3.9.2.
* Update dont_include_flag_icons patch.
+ * Fix patch descriptions to match DEP3.
+ * Add suffix .patch to all patches.
- -- Fladischer Michael <FladischerMichael at fladi.at> Fri, 07 Oct 2011 13:50:39 +0200
+ -- Fladischer Michael <FladischerMichael at fladi.at> Fri, 21 Oct 2011 18:46:14 +0200
django-countries (1.0.5-1) unstable; urgency=low
Deleted: packages/django-countries/trunk/debian/patches/dont_include_flag_icons
===================================================================
--- packages/django-countries/trunk/debian/patches/dont_include_flag_icons 2011-10-21 15:31:07 UTC (rev 19019)
+++ packages/django-countries/trunk/debian/patches/dont_include_flag_icons 2011-10-21 16:46:34 UTC (rev 19020)
@@ -1,17 +0,0 @@
-Description: Don't install the included flag icons as this package should use
- the ones from famfamfam-flag-(png|gif).
-Author: Fladischer Michael <FladischerMichael at fladi.at>
-Forwarded: not-needed
-Last-Update: 2010-04-20
-
---- 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)
Copied: packages/django-countries/trunk/debian/patches/dont_include_flag_icons.patch (from rev 18841, packages/django-countries/trunk/debian/patches/dont_include_flag_icons)
===================================================================
--- packages/django-countries/trunk/debian/patches/dont_include_flag_icons.patch (rev 0)
+++ packages/django-countries/trunk/debian/patches/dont_include_flag_icons.patch 2011-10-21 16:46:34 UTC (rev 19020)
@@ -0,0 +1,18 @@
+Description: Don't install the included flag icons
+ Debian already provides appropriate flag icons with the packages
+ famfamfam-flag-(png|gif). Therefore ignore the images shipped by upstream.
+Author: Fladischer Michael <FladischerMichael at fladi.at>
+Forwarded: not-needed
+Last-Update: 2011-10-18
+
+--- 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)
Modified: packages/django-countries/trunk/debian/patches/series
===================================================================
--- packages/django-countries/trunk/debian/patches/series 2011-10-21 15:31:07 UTC (rev 19019)
+++ packages/django-countries/trunk/debian/patches/series 2011-10-21 16:46:34 UTC (rev 19020)
@@ -1,2 +1,2 @@
-dont_include_flag_icons
-use_iso_codes_package
+dont_include_flag_icons.patch
+use_iso_codes_package.patch
Deleted: packages/django-countries/trunk/debian/patches/use_iso_codes_package
===================================================================
--- packages/django-countries/trunk/debian/patches/use_iso_codes_package 2011-10-21 15:31:07 UTC (rev 19019)
+++ packages/django-countries/trunk/debian/patches/use_iso_codes_package 2011-10-21 16:46:34 UTC (rev 19020)
@@ -1,63 +0,0 @@
-Description: Don't use the shipped static lists for the country-codes, instead
- gather the data at runtime by parsing the XML files shipped with the
- iso-codes package.
- Translations for the countries names are also taken from iso-codes.
-Author: Fladischer Michael <FladischerMichael at fladi.at>
-Forwarded: not-needed
-Last-Update: 2010-04-20
-
-Index: django-countries/django_countries/settings.py
-===================================================================
---- django-countries.orig/django_countries/settings.py 2010-04-20 11:36:57.513764350 +0200
-+++ django-countries/django_countries/settings.py 2010-04-20 11:37:14.377763439 +0200
-@@ -1,3 +1,4 @@
-+import os
- from django.conf import settings
-
-
-@@ -11,5 +12,11 @@
- prefix = '%s/' % prefix
- return '%s%s' % (prefix, url)
-
-+def _build_iso_xml():
-+ if hasattr(settings, 'COUNTRIES_ISO_XML'):
-+ return settings.COUNTRIES_ISO_XML
-+ else:
-+ return '/usr/share/xml/iso-codes/iso_3166.xml'
-
- FLAG_URL = _build_flag_url()
-+ISO_XML = _build_iso_xml()
-Index: django-countries/django_countries/countries.py
-===================================================================
---- django-countries.orig/django_countries/countries.py 2010-04-20 11:37:25.497767986 +0200
-+++ django-countries/django_countries/countries.py 2010-04-20 11:39:15.877763941 +0200
-@@ -1,3 +1,23 @@
-+from gettext import dgettext as _
-+
-+from xml.dom.minidom import parse
-+
-+from django_countries import settings
-+
-+# Nicely titled (and translated) country names.
-+COUNTRIES = []
-+COUNTRIES_PLUS = []
-+OFFICIAL_COUNTRIES = {}
-+
-+for node in parse(settings.ISO_XML).getElementsByTagName('iso_3166_entry'):
-+ _code = node.getAttribute('alpha_2_code')
-+ _name = _('iso_3166', node.getAttribute('name'))
-+ COUNTRIES.append((_code, _name))
-+ COUNTRIES_PLUS.append((_code, _name))
-+ OFFICIAL_COUNTRIES[_code.upper()] = _name.upper()
-+
-+'''
-+# Upstream shipped static lists of countries.
- from django.utils.translation import ugettext_lazy as _
-
- # Nicely titled (and translatable) country names.
-@@ -764,3 +784,5 @@
- 'ZM': u'ZAMBIA',
- 'ZW': u'ZIMBABWE',
- }
-+'''
-+
Copied: packages/django-countries/trunk/debian/patches/use_iso_codes_package.patch (from rev 18840, packages/django-countries/trunk/debian/patches/use_iso_codes_package)
===================================================================
--- packages/django-countries/trunk/debian/patches/use_iso_codes_package.patch (rev 0)
+++ packages/django-countries/trunk/debian/patches/use_iso_codes_package.patch 2011-10-21 16:46:34 UTC (rev 19020)
@@ -0,0 +1,60 @@
+Description: Don't use the shipped static lists for the country-codes
+ Debian already provides the necessary data as part of its ico-codes package.
+ This patch changes the upstream behaviour to gather the data at runtime by
+ parsing the XML files shipped with the iso-codes package.
+ Translations for the countries names are also taken from iso-codes.
+Author: Fladischer Michael <FladischerMichael at fladi.at>
+Forwarded: not-needed
+Last-Update: 2011-10-18
+
+--- a/django_countries/settings.py
++++ b/django_countries/settings.py
+@@ -1,3 +1,4 @@
++import os
+ from django.conf import settings
+
+
+@@ -11,5 +12,11 @@
+ prefix = '%s/' % prefix
+ return '%s%s' % (prefix, url)
+
++def _build_iso_xml():
++ if hasattr(settings, 'COUNTRIES_ISO_XML'):
++ return settings.COUNTRIES_ISO_XML
++ else:
++ return '/usr/share/xml/iso-codes/iso_3166.xml'
+
+ FLAG_URL = _build_flag_url()
++ISO_XML = _build_iso_xml()
+--- a/django_countries/countries.py
++++ b/django_countries/countries.py
+@@ -1,3 +1,23 @@
++from gettext import dgettext as _
++
++from xml.dom.minidom import parse
++
++from django_countries import settings
++
++# Nicely titled (and translated) country names.
++COUNTRIES = []
++COUNTRIES_PLUS = []
++OFFICIAL_COUNTRIES = {}
++
++for node in parse(settings.ISO_XML).getElementsByTagName('iso_3166_entry'):
++ _code = node.getAttribute('alpha_2_code')
++ _name = _('iso_3166', node.getAttribute('name'))
++ COUNTRIES.append((_code, _name))
++ COUNTRIES_PLUS.append((_code, _name))
++ OFFICIAL_COUNTRIES[_code.upper()] = _name.upper()
++
++'''
++# Upstream shipped static lists of countries.
+ from django.utils.translation import ugettext_lazy as _
+
+ # Nicely titled (and translatable) country names.
+@@ -775,3 +795,5 @@
+ 'ZM': u'ZAMBIA',
+ 'ZW': u'ZIMBABWE',
+ }
++'''
++
More information about the Python-modules-commits
mailing list