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

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

    Date: Thursday, August 28, 2014 @ 19:34:32
  Author: fladi-guest
Revision: 30319

Update patch to not include flag icons.

Modified:
  packages/django-countries/trunk/debian/README.Debian
  packages/django-countries/trunk/debian/changelog
  packages/django-countries/trunk/debian/patches/dont_include_flag_icons.patch

Modified: packages/django-countries/trunk/debian/README.Debian
===================================================================
--- packages/django-countries/trunk/debian/README.Debian	2014-08-28 19:33:39 UTC (rev 30318)
+++ packages/django-countries/trunk/debian/README.Debian	2014-08-28 19:34:32 UTC (rev 30319)
@@ -4,39 +4,34 @@
 Flag icon support:
 ------------------
 
-This package does not include the flag icons. They are provided in separate packages:
+This package does not include the flag icons. They are provided in separate
+packages:
   - famfamfam-flags-png
   - famfamfam-flags-gif
 
-To use them within your Django project you need to create a symlink in your media root.
-If your have your media root configured this way in settings.py:
+The package come with a symlink that gets picked up by
+django.contrib.staticfiles. It will make sure that all flag icons from either
+famfamfam-flags-png or famfamfam-flags-gif are copied to your STATIC_ROOT.
 
-  MEDIA_ROOT = '/home/media/media.example.com/'
-  MEDIA_URL = '/media/'
-
-Create a symlink in your media root pointing to the famfamfam-flags-(png|gif) directory:
-
-  ln -s /usr/share/flags/countries/16x11 /home/media/media.example.com/flags 
-
 Now for PNG flag icons include this in settings.py:
 
   COUNTRIES_FLAG_URL = '/media/flags/%s.png'
 
-Or just change the suffix the use the GIF flags:
+Or just change the suffix to use the GIF flags:
 
   COUNTRIES_FLAG_URL = '/media/flags/%s.gif'
 
 Translations:
 -------------
 
-The package iso-codes comes with it's own translations of country names. django-countries has 
-been patched to automatically use these translations.
+The package iso-codes comes with it's own translations of country names.
+django-countries has been patched to automatically use these translations.
 
 Custom country codes:
 ---------------------
 
-It is possible (but not encouraged because of missing translations) to use a modified 
-iso_3166.xml file by adding this to your settings.py:
+It is possible (but not encouraged because of missing translations) to use a
+modified iso_3166.xml file by adding this to your settings.py:
 
   COUNTRIES_ISO_XML = '/path/to/custom_iso_3166.xml'
 

Modified: packages/django-countries/trunk/debian/changelog
===================================================================
--- packages/django-countries/trunk/debian/changelog	2014-08-28 19:33:39 UTC (rev 30318)
+++ packages/django-countries/trunk/debian/changelog	2014-08-28 19:34:32 UTC (rev 30319)
@@ -1,3 +1,11 @@
+django-countries (2.1.2-1) UNRELEASED; urgency=medium
+
+  * NOT RELEASED YET
+  * New upstream release.
+  * Rewrite use_iso_codes_package.patch for new upstream code.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Wed, 27 Aug 2014 15:36:47 +0200
+
 django-countries (1.5-1) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/django-countries/trunk/debian/patches/dont_include_flag_icons.patch
===================================================================
--- packages/django-countries/trunk/debian/patches/dont_include_flag_icons.patch	2014-08-28 19:33:39 UTC (rev 30318)
+++ packages/django-countries/trunk/debian/patches/dont_include_flag_icons.patch	2014-08-28 19:34:32 UTC (rev 30319)
@@ -7,12 +7,12 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -28,8 +28,6 @@
+@@ -26,7 +26,7 @@
+     url='https://github.com/SmileyChris/django-countries/',
      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)
+-    include_package_data=True,
++    include_package_data=False,
+     classifiers=[
+         'Development Status :: 5 - Production/Stable',
+         'Environment :: Web Environment',