[Python-modules-commits] [django-tables] 01/01: Add changes by Neil Williams.

[Brian May]

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

bam pushed a commit to branch master
in repository django-tables.

commit fbb9df8a4cdc77e4b2a3b899a1c80d7fed6dbc79
Author: Brian May <bam at debian.org>
Date:   Sat Apr 23 12:31:19 2016 +1000

    Add changes by Neil Williams.
---
 debian/changelog | 13 +++++++++++++
 debian/control   |  8 ++++----
 debian/rules     |  5 +++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8bc0895..95ba2fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+django-tables (1.1.6-2) UNRELEASED; urgency=medium
+
+  [ Neil Williams ]
+  * Update django build depends to 1.8 as 1.7 in jessie causes the
+    django-tables test suite to fail.
+  * Add clean rule to remove docs/.build to allow package to build twice
+    in a row.
+
+  [ Brian May ]
+  * Add changes by Neil Williams. Closes: #822224.
+
+ -- Neil Williams <codehelp at debian.org>  Fri, 22 Apr 2016 08:15:18 +0100
+
 django-tables (1.1.6-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 25ed54c..d8370cc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Brian May <bam at debian.org>
 Build-Depends: debhelper (>=8.1.0), dh-python,
- python-all (>= 2.6.6-3~), python-django (>= 1.4.5), python-setuptools, python-six,
+ python-all (>= 2.6.6-3~), python-django (>= 1.8), python-setuptools, python-six,
  python-pytest-django, python-fudge, python-lxml, python-tz,
  python-django-haystack,
- python3-all, python3-django (>= 1.4.5), python3-setuptools, python3-six,
+ python3-all, python3-django (>= 1.8), python3-setuptools, python3-six,
  python3-pytest-django, python3-fudge, python3-lxml, python3-tz,
  python3-django-haystack,
 Build-Depends-Indep: python-sphinx (>= 1.0.7+dfsg-1~), python-doc, python-django-doc
@@ -19,7 +19,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/django-tabl
 
 Package: python-django-tables2
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-django (>= 1.4.5)
+Depends: ${misc:Depends}, ${python:Depends}, python-django (>= 1.8)
 Suggests: python-django-tables2-doc
 Replaces: django-tables (<< 0.13.0-2)
 Breaks: django-tables (<< 0.13.0-2)
@@ -30,7 +30,7 @@ Description: Table/data-grid framework for Django
 
 Package: python3-django-tables2
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, python3-django (>= 1.4.5)
+Depends: ${misc:Depends}, ${python3:Depends}, python3-django (>= 1.8)
 Suggests: python-django-tables2-doc
 Description: Table/data-grid framework for Django
  django-tables2 simplifies the task of turning sets of data into HTML tables. It
diff --git a/debian/rules b/debian/rules
index 4c44c95..0bfc0fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,11 @@ override_dh_auto_build:
 	PYTHONPATH=. sphinx-build -b html -d docs/.build/.doctrees -N docs docs/.build/html
 	dh_auto_build
 
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	dh_auto_clean
+	$(RM) -r docs/.build
+
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
 	PYTHONPATH=. \

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