[Python-modules-commits] r20988 - in packages/python-django/trunk/debian (10 files)
hertzog at users.alioth.debian.org
hertzog at users.alioth.debian.org
Sat Mar 31 11:14:57 UTC 2012
Date: Saturday, March 31, 2012 @ 11:14:53
Author: hertzog
Revision: 20988
* New upstream release. Closes: #666003
* Updated Standards-Version to 3.9.3 (no change needed).
* Drop 01_disable_url_verify_regression_tests.diff since upstream test
suite has been modified to work even without internet connection.
* Update 04_hyphen-manpage.diff to apply again.
* Drop 05_fix_djangodocs_sphinx_ext.diff which has been merged
upstream.
* Update 06_use_debian_geoip_database_as_default.diff to apply on
renamed file.
* Drop 07_fix_for_sphinx1.1.2.diff merged upstream.
* Drop 08_fix_test_week_view_allow_future.diff, merged upstream.
Modified:
packages/python-django/trunk/debian/changelog
packages/python-django/trunk/debian/control
packages/python-django/trunk/debian/patches/02_disable-sources-in-sphinxdoc.diff
packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff
packages/python-django/trunk/debian/patches/06_use_debian_geoip_database_as_default.diff
packages/python-django/trunk/debian/patches/series
Deleted:
packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff
packages/python-django/trunk/debian/patches/05_fix_djangodocs_sphinx_ext.diff
packages/python-django/trunk/debian/patches/07_fix_for_sphinx1.1.2.diff
packages/python-django/trunk/debian/patches/08_fix_test_week_view_allow_future.diff
Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog 2012-03-31 10:36:59 UTC (rev 20987)
+++ packages/python-django/trunk/debian/changelog 2012-03-31 11:14:53 UTC (rev 20988)
@@ -1,7 +1,17 @@
python-django (1.4-1) UNRELEASED; urgency=low
- * New upstream release.
+ * New upstream release. Closes: #666003
* Fix watch file to correctly extract the version number from the URL.
+ * Updated Standards-Version to 3.9.3 (no change needed).
+ * Drop 01_disable_url_verify_regression_tests.diff since upstream test
+ suite has been modified to work even without internet connection.
+ * Update 04_hyphen-manpage.diff to apply again.
+ * Drop 05_fix_djangodocs_sphinx_ext.diff which has been merged
+ upstream.
+ * Update 06_use_debian_geoip_database_as_default.diff to apply on
+ renamed file.
+ * Drop 07_fix_for_sphinx1.1.2.diff merged upstream.
+ * Drop 08_fix_test_week_view_allow_future.diff, merged upstream.
-- Raphaël Hertzog <hertzog at debian.org> Sat, 31 Mar 2012 10:14:40 +0200
Modified: packages/python-django/trunk/debian/control
===================================================================
--- packages/python-django/trunk/debian/control 2012-03-31 10:36:59 UTC (rev 20987)
+++ packages/python-django/trunk/debian/control 2012-03-31 11:14:53 UTC (rev 20988)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Chris Lamb <lamby at debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Raphaël Hertzog <hertzog at debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Build-Depends: debhelper (>= 7.0.50), python (>= 2.6.6-3~), python-sphinx (>= 1.0.8), locales (>= 0)
Build-Depends-Indep: libjs-jquery
Homepage: http://www.djangoproject.com/
Deleted: packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff
===================================================================
--- packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff 2012-03-31 10:36:59 UTC (rev 20987)
+++ packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff 2012-03-31 11:14:53 UTC (rev 20988)
@@ -1,97 +0,0 @@
-Description: Drop regression tests that require an internet connection
- This is a Debian specific patch because source packages should be
- buildable without any internet connection.
-Author: Chris Lamb <lamby at debian.org>
-Author: Evgeni Golov <evgeni at debian.org>
-Forwarded: not-needed
-Origin: vendor
-
---- a/tests/regressiontests/forms/tests/error_messages.py
-+++ b/tests/regressiontests/forms/tests/error_messages.py
-@@ -139,17 +139,6 @@ class FormsErrorMessagesTestCase(unittes
- self.assertFormErrors([u'EMPTY FILE'], f.clean, SimpleUploadedFile('name', None))
- self.assertFormErrors([u'EMPTY FILE'], f.clean, SimpleUploadedFile('name', ''))
-
-- def test_urlfield(self):
-- e = {
-- 'required': 'REQUIRED',
-- 'invalid': 'INVALID',
-- 'invalid_link': 'INVALID LINK',
-- }
-- f = URLField(verify_exists=True, error_messages=e)
-- self.assertFormErrors([u'REQUIRED'], f.clean, '')
-- self.assertFormErrors([u'INVALID'], f.clean, 'abc.c')
-- self.assertFormErrors([u'INVALID LINK'], f.clean, 'http://www.broken.djangoproject.com')
--
- def test_booleanfield(self):
- e = {
- 'required': 'REQUIRED',
---- a/tests/modeltests/validation/tests.py
-+++ b/tests/modeltests/validation/tests.py
-@@ -53,23 +53,6 @@ class BaseModelValidationTests(Validatio
- mtv = ModelToValidate(number=10, name='Some Name', url='not a url')
- self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url', [u'Enter a valid value.'])
-
-- #The tests below which use url_verify are deprecated
-- def test_correct_url_but_nonexisting_gives_404(self):
-- mtv = ModelToValidate(number=10, name='Some Name', url_verify='http://qa-dev.w3.org/link-testsuite/http.php?code=404')
-- self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url_verify', [u'This URL appears to be a broken link.'])
--
-- def test_correct_url_value_passes(self):
-- mtv = ModelToValidate(number=10, name='Some Name', url_verify='http://www.google.com/')
-- self.assertEqual(None, mtv.full_clean()) # This will fail if there's no Internet connection
--
-- def test_correct_url_with_redirect(self):
-- mtv = ModelToValidate(number=10, name='Some Name', url_verify='http://qa-dev.w3.org/link-testsuite/http.php?code=301') #example.com is a redirect to iana.org now
-- self.assertEqual(None, mtv.full_clean()) # This will fail if there's no Internet connection
--
-- def test_correct_https_url_but_nonexisting(self):
-- mtv = ModelToValidate(number=10, name='Some Name', url_verify='https://www.example.com/')
-- self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url_verify', [u'This URL appears to be a broken link.'])
--
- def test_text_greater_that_charfields_max_length_raises_erros(self):
- mtv = ModelToValidate(number=10, name='Some Name'*100)
- self.assertFailsValidation(mtv.full_clean, ['name',])
---- a/tests/regressiontests/forms/tests/fields.py
-+++ b/tests/regressiontests/forms/tests/fields.py
-@@ -557,27 +557,6 @@ class FieldsTests(TestCase):
- self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example.')
- self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://.com')
-
-- def test_urlfield_3(self):
-- f = URLField(verify_exists=True)
-- self.assertEqual(u'http://www.google.com/', f.clean('http://www.google.com')) # This will fail if there's no Internet connection
-- self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example')
-- self.assertRaises(ValidationError, f.clean, 'http://www.broken.djangoproject.com') # bad domain
-- self.assertRaises(ValidationError, f.clean, 'http://qa-dev.w3.org/link-testsuite/http.php?code=405') # Method not allowed
-- try:
-- f.clean('http://www.broken.djangoproject.com') # bad domain
-- except ValidationError, e:
-- self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
-- self.assertRaises(ValidationError, f.clean, 'http://qa-dev.w3.org/link-testsuite/http.php?code=400') # good domain, bad page
-- try:
-- f.clean('http://google.com/we-love-microsoft.html') # good domain, bad page
-- except ValidationError, e:
-- self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
--
-- def test_urlfield_4(self):
-- f = URLField(verify_exists=True, required=False)
-- self.assertEqual(u'', f.clean(''))
-- self.assertEqual(u'http://www.google.com/', f.clean('http://www.google.com')) # This will fail if there's no Internet connection
--
- def test_urlfield_5(self):
- f = URLField(min_length=15, max_length=20)
- self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 15 characters (it has 13).']", f.clean, 'http://f.com')
-@@ -625,12 +604,6 @@ class FieldsTests(TestCase):
- except ValidationError, e:
- self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
-
-- def test_urlfield_10(self):
-- # UTF-8 in the domain.
-- f = URLField(verify_exists=True)
-- url = u'http://\u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac.idn.icann.org/\u0391\u03c1\u03c7\u03b9\u03ba\u03ae_\u03c3\u03b5\u03bb\u03af\u03b4\u03b1'
-- self.assertEqual(url, f.clean(url)) #This will fail without internet.
--
- # BooleanField ################################################################
-
- def test_booleanfield_1(self):
Modified: packages/python-django/trunk/debian/patches/02_disable-sources-in-sphinxdoc.diff
===================================================================
--- packages/python-django/trunk/debian/patches/02_disable-sources-in-sphinxdoc.diff 2012-03-31 10:36:59 UTC (rev 20987)
+++ packages/python-django/trunk/debian/patches/02_disable-sources-in-sphinxdoc.diff 2012-03-31 11:14:53 UTC (rev 20988)
@@ -9,7 +9,7 @@
--- a/docs/conf.py
+++ b/docs/conf.py
-@@ -158,7 +158,10 @@ html_additional_pages = {}
+@@ -168,7 +168,10 @@ html_additional_pages = {}
#html_split_index = False
# If true, links to the reST sources are added to the pages.
Modified: packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff
===================================================================
--- packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff 2012-03-31 10:36:59 UTC (rev 20987)
+++ packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff 2012-03-31 11:14:53 UTC (rev 20988)
@@ -7,12 +7,12 @@
--- a/docs/man/django-admin.1
+++ b/docs/man/django-admin.1
-@@ -192,7 +192,7 @@ The domain of the message files (default
+@@ -194,7 +194,7 @@ The domain of the message files (default
.TP
.I \-e, \-\-extension=EXTENSION
- The file extension(s) to examine (default: ".html", separate multiple
--extensions with commas, or use -e multiple times).
-+extensions with commas, or use \-e multiple times).
+ The file extension(s) to examine (separate multiple
+-extensions with commas, or use -e multiple times) (makemessages command).
++extensions with commas, or use \-e multiple times) (makemessages command).
.TP
.I \-s, \-\-symlinks
Follows symlinks to directories when examining source code and templates for
Deleted: packages/python-django/trunk/debian/patches/05_fix_djangodocs_sphinx_ext.diff
===================================================================
--- packages/python-django/trunk/debian/patches/05_fix_djangodocs_sphinx_ext.diff 2012-03-31 10:36:59 UTC (rev 20987)
+++ packages/python-django/trunk/debian/patches/05_fix_djangodocs_sphinx_ext.diff 2012-03-31 11:14:53 UTC (rev 20988)
@@ -1,13 +0,0 @@
-Description: Fix djangodocs Sphinx extension to work with latest Sphinx
-Origin: upstream, https://code.djangoproject.com/changeset/16231
-Bug-Debian: http://bugs.debian.org/643758
-Forwarded: not-needed
-
---- a/docs/_ext/djangodocs.py (revision 16223)
-+++ b/docs/_ext/djangodocs.py (revision 16231)
-@@ -135,4 +135,5 @@
- self.body.append('(')
- self.first_param = 1
-+ self.param_separator = node.child_text_separator
-
- def depart_desc_parameterlist(self, node):
Modified: packages/python-django/trunk/debian/patches/06_use_debian_geoip_database_as_default.diff
===================================================================
--- packages/python-django/trunk/debian/patches/06_use_debian_geoip_database_as_default.diff 2012-03-31 10:36:59 UTC (rev 20987)
+++ packages/python-django/trunk/debian/patches/06_use_debian_geoip_database_as_default.diff 2012-03-31 11:14:53 UTC (rev 20988)
@@ -7,9 +7,9 @@
Forwarded: not-needed
Author: Tapio Rantala <tapio.rantala at iki.fi>
---- a/django/contrib/gis/utils/geoip.py
-+++ b/django/contrib/gis/utils/geoip.py
-@@ -164,7 +164,8 @@ class GeoIP(object):
+--- a/django/contrib/gis/geoip/base.py
++++ b/django/contrib/gis/geoip/base.py
+@@ -61,7 +61,8 @@ class GeoIP(object):
* path: Base directory to where GeoIP data is located or the full path
to where the city or country data files (*.dat) are located.
Assumes that both the city and country data sets are located in
@@ -18,26 +18,27 @@
+ If neither is set, defaults to '/usr/share/GeoIP'.
* cache: The cache settings when opening up the GeoIP datasets,
- and may be an integer in (0, 1, 2, 4) corresponding to
-@@ -173,11 +174,13 @@ class GeoIP(object):
- respectively. Defaults to 0, meaning that the data is read
+ and may be an integer in (0, 1, 2, 4, 8) corresponding to
+@@ -70,11 +71,13 @@ class GeoIP(object):
+ settings, respectively. Defaults to 0, meaning that the data is read
from the disk.
- * country: The name of the GeoIP country data file. Defaults to
- 'GeoIP.dat'; overrides the GEOIP_COUNTRY settings attribute.
+-
+- * city: The name of the GeoIP city data file. Defaults to
+- 'GeoLiteCity.dat'; overrides the GEOIP_CITY settings attribute.
+ * country: The name of the GeoIP country data file. Overrides
+ the GEOIP_COUNTRY settings attribute. If neither is set,
+ defaults to 'GeoIP.dat'
-
-- * city: The name of the GeoIP city data file. Defaults to
-- 'GeoLiteCity.dat'; overrides the GEOIP_CITY settings attribute.
++
+ * city: The name of the GeoIP city data file. Overrides the
+ GEOIP_CITY settings attribute. If neither is set, defaults
+ to 'GeoIPCity.dat'.
"""
# Checking the given cache option.
if cache in self.cache_options:
-@@ -187,8 +190,7 @@ class GeoIP(object):
+@@ -84,8 +87,7 @@ class GeoIP(object):
# Getting the GeoIP data path.
if not path:
@@ -47,12 +48,12 @@
if not isinstance(path, basestring):
raise TypeError('Invalid path type: %s' % type(path).__name__)
-@@ -201,7 +203,7 @@ class GeoIP(object):
- self._country = geoip_open(country_db, cache)
+@@ -98,7 +100,7 @@ class GeoIP(object):
+ self._country = GeoIP_open(country_db, cache)
self._country_file = country_db
- city_db = os.path.join(path, city or GEOIP_SETTINGS.get('GEOIP_CITY', 'GeoLiteCity.dat'))
+ city_db = os.path.join(path, city or GEOIP_SETTINGS.get('GEOIP_CITY', 'GeoIPCity.dat'))
if os.path.isfile(city_db):
- self._city = geoip_open(city_db, cache)
+ self._city = GeoIP_open(city_db, cache)
self._city_file = city_db
Deleted: packages/python-django/trunk/debian/patches/07_fix_for_sphinx1.1.2.diff
===================================================================
--- packages/python-django/trunk/debian/patches/07_fix_for_sphinx1.1.2.diff 2012-03-31 10:36:59 UTC (rev 20987)
+++ packages/python-django/trunk/debian/patches/07_fix_for_sphinx1.1.2.diff 2012-03-31 11:14:53 UTC (rev 20988)
@@ -1,11 +0,0 @@
-Description: Fix Django to build with Sphinx 1.1.2
-Origin: upstream, https://code.djangoproject.com/changeset/16223
-
---- a/docs/_ext/djangodocs.py (revision 14652)
-+++ b/docs/_ext/djangodocs.py (revision 16223)
-@@ -128,4 +128,5 @@
- # Don't use border=1, which docutils does by default.
- def visit_table(self, node):
-+ self._table_row_index = 0 # Needed by Sphinx
- self.body.append(self.starttag(node, 'table', CLASS='docutils'))
-
Deleted: packages/python-django/trunk/debian/patches/08_fix_test_week_view_allow_future.diff
===================================================================
--- packages/python-django/trunk/debian/patches/08_fix_test_week_view_allow_future.diff 2012-03-31 10:36:59 UTC (rev 20987)
+++ packages/python-django/trunk/debian/patches/08_fix_test_week_view_allow_future.diff 2012-03-31 11:14:53 UTC (rev 20988)
@@ -1,15 +0,0 @@
-Description: Fix regression test test_week_view_allow_future that only worked in 2011
-Bug: https://code.djangoproject.com/ticket/17488
-Bug-Debian: http://bugs.debian.org/655666
-Origin: upstream, https://code.djangoproject.com/changeset/17321
-
---- a/tests/regressiontests/generic_views/dates.py (revision 16981)
-+++ b/tests/regressiontests/generic_views/dates.py (revision 17321)
-@@ -258,5 +258,6 @@
-
- def test_week_view_allow_future(self):
-- future = datetime.date(datetime.date.today().year + 1, 1, 1)
-+ # January 7th always falls in week 1, given Python's definition of week numbers
-+ future = datetime.date(datetime.date.today().year + 1, 1, 7)
- b = Book.objects.create(name="The New New Testement", pages=600, pubdate=future)
-
Modified: packages/python-django/trunk/debian/patches/series
===================================================================
--- packages/python-django/trunk/debian/patches/series 2012-03-31 10:36:59 UTC (rev 20987)
+++ packages/python-django/trunk/debian/patches/series 2012-03-31 11:14:53 UTC (rev 20988)
@@ -1,8 +1,4 @@
-01_disable_url_verify_regression_tests.diff
02_disable-sources-in-sphinxdoc.diff
03_manpage.diff
04_hyphen-manpage.diff
-05_fix_djangodocs_sphinx_ext.diff
06_use_debian_geoip_database_as_default.diff
-07_fix_for_sphinx1.1.2.diff
-08_fix_test_week_view_allow_future.diff
More information about the Python-modules-commits
mailing list