lp:ubuntu/quantal/python-django

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

40. By Raphaël Hertzog on 2012-08-21

* New patch 01_use_stdlib_htmlparser_when_possible.diff to not override
  Python stdlib's HTMLParser with Python versions which are unaffected by
  http://bugs.python.org/issue670664 Closes: #683648
  Thanks to David Watson <email address hidden> for the patch.
* Update the above patch to use the version committed upstream (commit
  57d9ccc).

39. By Raphaël Hertzog on 2012-08-02

* New upstream security and maintenance release. Closes: #683364
  Fixes: CVE-2012-3442 CVE-2012-3443 CVE-2012-3444
* Drop 01_disable_broken_test.diff and 04_hyphen-manpage.diff which
  have been merged upstream.

38. By Raphaël Hertzog on 2012-03-31

* 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.
* Add 01_disable_broken_test.diff to disable a test that fails with
  the current python 2.7 version in Debian.

37. By Dave Walker on 2012-02-17

* Merge with Debian. Remaining changes:
  - 09_test_view_decorator_sleep.diff increases the sleep time to
    reduce race condition effects on build machines.
    https://code.djangoproject.com/ticket/16686 (LP: #829487)
* debian/patches/{psycopg2_creation.diff,compat-psycopg2-plus2.4.2.diff}:
  - New patches, resolve compatibility with psycopg2 > 2.4.1, patches
    based on upstream submissions, rebasing courtesy of Dave Pifke.
  - LP: #905837

36. By Barry Warsaw on 2011-10-19

* Merge with Debian. Remaining changes:
  - 09_test_view_decorator_sleep.diff increases the sleep time to
    reduce race condition effects on build machines.
    https://code.djangoproject.com/ticket/16686 (LP: #829487)

35. By Raphaël Hertzog on 2011-09-15

* New upstream release. It includes security updates described here:
  https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
  Closes: #641405
* Update 01_disable_url_verify_regression_tests.diff and merge
  07_disable_url_verify_model_tests.diff into it.
* Update patch headers to conform to DEP-3.
* Apply patch from Steve Langasek to dynamically build the UTF-8
  locale required by the test-suite instead of build-depending on
  locales-all. Closes: #630421
* Use "dh --with sphinxdoc" to clean up the Sphinx generated documentation
  and avoid the embedded-javascript-library lintian warning. Build-Depends
  on python-sphinx >= 1.0.7+dfsg-1 for this and also add
  ${sphinxdoc:Depends} to python-django-doc Depends field.
* Cleanup build-dependencies now that even oldstable has python 2.5.
* Switch to dh_python2 as python helper tool. Drop legacy files
  debian/pyversions and debian/pycompat.
* New patch 02_disable-sources-in-sphinxdoc.diff to not generate
  the _sources directory that we used to remove manually within the rules
  file. But must be kept disabled until #641710 is fixed.
* Properly support DEB_BUILD_OPTIONS=nocheck despite the override
  of dh_auto_test.

34. By Barry Warsaw on 2011-08-23

* 09_test_view_decorator_sleep.diff increases the sleep time to
  reduce race condition effects on build machines.
  https://code.djangoproject.com/ticket/16686 (LP: #829487)
* Remove build-dep on locales-all which isn't in the Ubuntu archive.

33. By Piotr Ożarowski on 2011-05-02

* Team upload.

[ Chris Lamb ]
* Don't remove "backup~" test file - upstream did ship it; we were just
  removing it with dh_clean.

[ Piotr Ożarowski ]
* Fix builds with non-default Python versions installed
* Bump Standards-Version to 3.9.2 (no changes needed)

32. By Jamie Strandboge on 2011-02-17

* Merge from Debian for security fixes (LP: #719031). Remaining changes:
  - debian/control: don't Build-Depends on locales-all, which doesn't exist
    in natty
* Drop the following patches, now included upstream:
  - debian/patches/07_security_admin_infoleak.diff
  - debian/patches/08_security_pasword_reset_dos.diff

31. By Jamie Strandboge on 2011-01-03

* SECURITY UPDATE: information leak in admin interface
  - debian/patches/07_security_admin_infoleak.diff: validate querystring
    lookup arguments either specify only fields on the model being viewed,
    or cross relations which have been explicitly whitelisted.
  - CVE-2010-XXXX
* SECURITY UPDATE:
  - debian/patches/08_security_pasword_reset_dos.diff: adjust
    base36_to_int() function in django.utils.http will now validate the
    length of its input; on input longer than 13 digits (sufficient to
    base36-encode any 64-bit integer), it will now raise ValueError.
    Additionally, the default URL patterns for django.contrib.auth will now
    enforce a maximum length on the relevant parameters.
  - CVE-2010-XXXX