[Python-modules-commits] [python-django] 01/03: Merge tag 'debian/1%1.11.7-1' into debian/stretch-backports

[Raphaël Hertzog]

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

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

commit 795029b3f96c03cea3523959b97458beec50fdaf
Merge: f88b2bf 6073e7b
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Mon Nov 20 10:51:21 2017 +0100

    Merge tag 'debian/1%1.11.7-1' into debian/stretch-backports
    
    tagging package python-django version debian/1%1.11.7-1

 AUTHORS                            |  1 +
 Django.egg-info/PKG-INFO           |  2 +-
 Django.egg-info/SOURCES.txt        |  1 +
 PKG-INFO                           |  2 +-
 debian/changelog                   | 63 +++++++++++++++++++++++++-------------
 debian/control                     |  9 ++++--
 debian/watch                       |  2 +-
 django/__init__.py                 |  2 +-
 django/conf/global_settings.py     |  8 ++---
 django/conf/locale/eu/formats.py   |  2 +-
 django/core/cache/backends/base.py | 12 +++++---
 django/db/models/expressions.py    |  5 ++-
 docs/ref/forms/renderers.txt       |  8 ++---
 docs/ref/models/querysets.txt      |  2 +-
 docs/releases/1.11.7.txt           | 21 +++++++++++++
 docs/releases/index.txt            |  1 +
 tests/cache/tests.py               |  5 +++
 tests/expressions/models.py        |  1 +
 tests/expressions/tests.py         |  5 +++
 tests/i18n/tests.py                | 15 +++++++++
 tests/ordering/tests.py            | 36 ++++++++++++----------
 21 files changed, 142 insertions(+), 61 deletions(-)

diff --cc debian/changelog
index dc65873,a1223fe..ab48074
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,22 +1,29 @@@
+ python-django (1:1.11.7-1) unstable; urgency=medium
+ 
+   * New upstream bugfix release.
+     <https://www.djangoproject.com/weblog/2017/nov/01/bugfix-release/>
+   * debian/watch: Only match 1.x versions on this branch.
+ 
+  -- Chris Lamb <lamby at debian.org>  Thu, 02 Nov 2017 07:47:22 +0100
+ 
+ python-django (1:1.11.6-2) unstable; urgency=medium
+ 
+   * Add Breaks: openstack-dashboard (<< 3:12) to ensure this package gets
+     upgraded (etc.) first. The version in experimental (3:12.x) is supposed to
+     work with the newer python-django. (Closes: #880409)
+   * wrap-and-sort -sa.
+   * Use HTTPS URI in debian/watch.
+   * Tidy whitespace in debian/changelog.
+ 
+  -- Chris Lamb <lamby at debian.org>  Wed, 01 Nov 2017 11:35:53 +0100
+ 
 +python-django (1:1.11.6-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +  * Set debian-branch to debian/stretch-backports in debian/gbp.conf.
 +
 + -- Chris Lamb <lamby at debian.org>  Thu, 12 Oct 2017 10:22:46 -0400
 +
  python-django (1:1.11.6-1) unstable; urgency=medium
  
    * New upstream bugfix release.

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