[Python-modules-commits] [python-django] 02/02: Prepare release to unstable

[Raphaël Hertzog]

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

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

commit 69efab999ed88f15da083d5a2c02de7dda8f1314
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Mon Nov 2 16:00:24 2015 +0100

    Prepare release to unstable
    
    Drop patches that are no longer needed.
---
 debian/README.source                               |  4 +--
 debian/changelog                                   |  6 ++++
 ...4-Added-a-dummy-class-for-HTMLParserError.patch | 34 ----------------------
 debian/patches/0005-Add-numpy-1.9-support.patch    | 28 ------------------
 debian/patches/series                              |  2 --
 5 files changed, 8 insertions(+), 66 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 265e298..46bee0f 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -17,12 +17,12 @@ following commands (and update them again when a branch starts following
 a new upstream release):
 
 git config branch.debian/experimental.dpmUpstreamBranch upstream/1.8.x
-git config branch.debian/sid.dpmUpstreamBranch upstream/1.7.x
+git config branch.debian/master.dpmUpstreamBranch upstream/1.8.x
 git config branch.debian/jessie.dpmUpstreamBranch upstream/1.7.x
 git config branch.debian/wheezy.dpmUpstreamBranch upstream/1.4.x
 git config branch.debian/squeeze.dpmUpstreamBranch upstream/1.2.x
 git config branch.debian/experimental.dpmPatchedBranch debian/patched-experimental
-git config branch.debian/sid.dpmPatchedBranch debian/patched-sid
+git config branch.debian/master.dpmPatchedBranch debian/patched-master
 git config branch.debian/jessie.dpmPatchedBranch debian/patched-jessie
 git config branch.debian/wheezy.dpmPatchedBranch debian/patched-wheezy
 git config branch.debian/squeeze.dpmPatchedBranch debian/patched-squeeze
diff --git a/debian/changelog b/debian/changelog
index 6efc44a..d65bc6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-django (1.8.5-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Raphaël Hertzog <hertzog at debian.org>  Mon, 02 Nov 2015 15:56:10 +0100
+
 python-django (1.8.5-1) experimental; urgency=medium
 
   * New upstream bugfix release:
diff --git a/debian/patches/0004-Added-a-dummy-class-for-HTMLParserError.patch b/debian/patches/0004-Added-a-dummy-class-for-HTMLParserError.patch
deleted file mode 100644
index f7784e4..0000000
--- a/debian/patches/0004-Added-a-dummy-class-for-HTMLParserError.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8b6b9e2927c1191c8a896424b25653a001ee41ad Mon Sep 17 00:00:00 2001
-From: Brian May <brian at microcomaustralia.com.au>
-Date: Sun, 11 Oct 2015 12:12:44 +1100
-Subject: Added a dummy class for HTMLParserError.
-
-Fix problem introduced by python-3.5 and causes FTBFS for several Django
-related packages.
-
-Backport of upstream fix.
-https://github.com/django/django/commit/b07aa52e8a8e4c7fdc7265f75ce2e7992e657ae9
-
-Closes: #796104
----
- django/utils/html_parser.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/django/utils/html_parser.py b/django/utils/html_parser.py
-index efe5422..ab1f654 100644
---- a/django/utils/html_parser.py
-+++ b/django/utils/html_parser.py
-@@ -9,7 +9,12 @@ use_workaround = (
-     (current_version >= (3, 0) and current_version < (3, 2, 3))
- )
- 
--HTMLParseError = _html_parser.HTMLParseError
-+try:
-+    HTMLParseError = _html_parser.HTMLParseError
-+except AttributeError:
-+    # create a dummy class for Python 3.5+ where it's been removed
-+    class HTMLParseError(Exception):
-+        pass
- 
- if not use_workaround:
-     if current_version >= (3, 4):
diff --git a/debian/patches/0005-Add-numpy-1.9-support.patch b/debian/patches/0005-Add-numpy-1.9-support.patch
deleted file mode 100644
index 93f7716..0000000
--- a/debian/patches/0005-Add-numpy-1.9-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From cdf0cc9f72f1847763290c018038990b3bcec4c1 Mon Sep 17 00:00:00 2001
-From: Brian May <bam at debian.org>
-Date: Mon, 12 Oct 2015 12:16:13 +1100
-Subject: Add numpy 1.9 support
-
-From upstream:
-https://github.com/django/django/commit/12809e160995eb617fe394c75e5b9f3211c056ff
-
-Closes: #801554
----
- django/template/base.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/django/template/base.py b/django/template/base.py
-index 822e026..25008d5 100644
---- a/django/template/base.py
-+++ b/django/template/base.py
-@@ -762,7 +762,9 @@ class Variable(object):
-             for bit in self.lookups:
-                 try:  # dictionary lookup
-                     current = current[bit]
--                except (TypeError, AttributeError, KeyError, ValueError):
-+                    # ValueError/IndexError are for numpy.array lookup on
-+                    # numpy < 1.9 and 1.9+ respectively
-+                except (TypeError, AttributeError, KeyError, ValueError, IndexError):
-                     try:  # attribute lookup
-                         # Don't return class attributes if the class is the context:
-                         if isinstance(current, BaseContext) and getattr(type(current), bit):
diff --git a/debian/patches/series b/debian/patches/series
index d3394c7..9b1ddfc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 02_disable-sources-in-sphinxdoc.diff
 06_use_debian_geoip_database_as_default.diff
-0004-Added-a-dummy-class-for-HTMLParserError.patch
-0005-Add-numpy-1.9-support.patch

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