diff -u python-django-0.96.2/debian/rules python-django-0.96.2/debian/rules --- python-django-0.96.2/debian/rules +++ python-django-0.96.2/debian/rules @@ -7,6 +7,11 @@ include /usr/share/cdbs/1/class/python-distutils.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +build/python-django:: + # testing + cp debian/tests_settings.py tests/settings.py + PYTHONPATH='.' python tests/runtests.py --settings=settings -v1 + binary-post-install/python-django:: # Use default python shebang perl -pi -e 's|^#!/usr/bin/env python.*$$|#!/usr/bin/python|' debian/python-django/usr/share/python-support/python-django/django/conf/project_template/manage.py diff -u python-django-0.96.2/debian/control python-django-0.96.2/debian/control --- python-django-0.96.2/debian/control +++ python-django-0.96.2/debian/control @@ -1,7 +1,8 @@ Source: python-django Section: python Priority: optional -Maintainer: Brett Parker +Maintainer: Ubuntu MOTU developers +XSBC-Original-Maintainer: Brett Parker Uploaders: Raphael Hertzog , Debian Python Modules Team Standards-Version: 3.7.3 Build-Depends: debhelper (>= 5.0.37.2), python-dev, cdbs (>= 0.4.42), python-setuptools (>= 0.6b3), python-support (>= 0.3) diff -u python-django-0.96.2/debian/changelog python-django-0.96.2/debian/changelog --- python-django-0.96.2/debian/changelog +++ python-django-0.96.2/debian/changelog @@ -1,9 +1,30 @@ +python-django (0.96.2-1ubuntu1) intrepid; urgency=low + + * Also closes LP: #234631: "security vulnerability in django admin" + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/patches/04_workaround_net_tests.patch + - debian/rules: run testsuite during build process + - debian/control: Maintainer set to Ubuntu Motu. + + -- Andrea Gasparini Tue, 20 May 2008 12:31:33 +0200 + python-django (0.96.2-1) unstable; urgency=low * New upstream security release. Closes: #481164 -- Raphael Hertzog Thu, 15 May 2008 21:40:59 +0200 +python-django (0.96.1-3ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable (LP: #229954). Remaining Ubuntu changes + - debian/patches/04_workaround_net_tests.patch run testsuite + during build process + - debian/patches/03_dynamicshebang.diff: manage.py created + with the right python interpreter. + - debian/control: Maintainer set to Ubuntu Motu. + + -- Andrea Gasparini Thu, 10 Apr 2008 17:31:54 +0200 + python-django (0.96.1-3) unstable; urgency=low * Fix for bash completion (Upstream bug 6661) @@ -11,6 +32,21 @@ -- Brett Parker Sat, 01 Mar 2008 18:40:52 +0000 +python-django (0.96.1-2ubuntu2) hardy; urgency=low + + * run testsuite during build process (LP: #208587) + + -- Eddy Mulyono Fri, 28 Mar 2008 18:03:37 -0700 + +python-django (0.96.1-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/patches/03_dynamicshebang.diff: + manage.py created with the right python interpreter.fix + * really put 03_dynamicshebang.diff in debian/patches :) + + -- Lionel Porcheron Thu, 14 Feb 2008 11:58:00 +0100 + python-django (0.96.1-2) unstable; urgency=low [ Brett Parker ] @@ -27,6 +63,21 @@ -- Brett Parker Wed, 23 Jan 2008 22:14:34 +0000 +python-django (0.96.1-1ubuntu2) hardy; urgency=low + + * debian/patches/03_dynamicshebang.diff: + manage.py created with the right python interpreter.fix LP: #182807 + + -- Andrea Gasparini Mon, 14 Jan 2008 11:52:15 +0100 + +python-django (0.96.1-1ubuntu1) hardy; urgency=low + + * Change examples installation from debian/docs to debian/examples as + dh_installdocs doesn't install empty files (LP: #175230) + * debian/control: changed maintainer field to ubuntu motu. + + -- Andrea Gasparini Wed, 12 Dec 2007 17:13:33 +0100 + python-django (0.96.1-1) unstable; urgency=low * New upstream release with security fix for CVE-2007-5712 only in patch2: unchanged: --- python-django-0.96.2.orig/debian/patches/04_workaround_net_tests.patch +++ python-django-0.96.2/debian/patches/04_workaround_net_tests.patch @@ -0,0 +1,21 @@ +diff -Nur python-django-0.96.1/tests/regressiontests/forms/tests.py python-django-0.96.1.new/tests/regressiontests/forms/tests.py +--- python-django-0.96.1/tests/regressiontests/forms/tests.py 2007-10-26 12:21:38.000000000 -0700 ++++ python-django-0.96.1.new/tests/regressiontests/forms/tests.py 2008-03-30 16:31:49.000000000 -0700 +@@ -1432,8 +1432,6 @@ + URLField takes an optional verify_exists parameter, which is False by default. + This verifies that the URL is live on the Internet and doesn't return a 404 or 500: + >>> f = URLField(verify_exists=True) +->>> f.clean('http://www.google.com') # This will fail if there's no Internet connection +-u'http://www.google.com' + >>> f.clean('http://example') + Traceback (most recent call last): + ... +@@ -1449,8 +1447,6 @@ + >>> f = URLField(verify_exists=True, required=False) + >>> f.clean('') + u'' +->>> f.clean('http://www.google.com') # This will fail if there's no Internet connection +-u'http://www.google.com' + + EmailField also access min_length and max_length parameters, for convenience. + >>> f = URLField(min_length=15, max_length=20)