[Python-modules-commits] [python-django] 02/02: Merge changes of Chris Lamb

[Raphaël Hertzog]

This is an automated email from the git hooks/post-receive script.

hertzog pushed a commit to branch debian/sid
in repository python-django.

commit 930fd17926f36a794fa6243a5b638bc963972367
Merge: 5b394db 0b3333f
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Fri Feb 13 10:54:06 2015 +0100

    Merge changes of Chris Lamb
    
    He dropped himself from Uploaders and I had forgotten to push the latest
    version.
    
    Conflicts:
    	debian/changelog

 debian/changelog | 7 +++++++
 debian/control   | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 5d59c9d,4489c0e..4d3045c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,33 -1,4 +1,40 @@@
 -python-django (1.7.1-2) UNRELEASED; urgency=medium
++python-django (1.7.4-2) UNRELEASED; urgency=medium
++
++  [ Chris Lamb ]
++  * Remove myself from Uploaders.
++
++ -- Raphaël Hertzog <hertzog at debian.org>  Fri, 13 Feb 2015 10:53:36 +0100
++
 +python-django (1.7.4-1) unstable; urgency=medium
 +
 +  * Release to unstable and hopefully to Jessie too.
 +
 + -- Raphaël Hertzog <hertzog at debian.org>  Mon, 09 Feb 2015 10:39:15 +0100
 +
 +python-django (1.7.4-1~exp1) experimental; urgency=medium
 +
 +  * New upstream bugfix release.
 +  * Drop fix-24193-python34-test-failure.diff, merged upstream.
 +
 + -- Raphaël Hertzog <hertzog at debian.org>  Wed, 28 Jan 2015 09:38:24 +0100
 +
 +python-django (1.7.3-1~exp1) experimental; urgency=high
 +
 +  [ Luke Faraone ]
 +  * New upstream security release.
 +    - WSGI header spoofing via underscore/dash conflation (CVE-2015-0219)
 +    - Possible XSS attack via user-supplied redirect URLs (CVE-2015-0220)
 +    - DoS attack against django.views.static.serve (CVE-2015-0221)
 +    - Database DoS with ModelMultipleChoiceField (CVE-2015-0222)
 +    Closes: #775375
 +
 +  [ Raphaël Hertzog ]
 +  * Add patch fix-24193-python34-test-failure.diff to fix a test failure with
 +    Python3.4.
 +
 + -- Raphaël Hertzog <hertzog at debian.org>  Wed, 21 Jan 2015 09:56:19 +0100
 +
 +python-django (1.7.2-1) experimental; urgency=medium
  
    [ Raphaël Hertzog ]
    * Add geoip-database-extra as an alternative to geoip-database-contrib.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git