[Python-modules-commits] [django-auth-ldap] 03/04: Refresh patches for 1.2.15.

[Michael Fladischer]

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

fladi pushed a commit to branch debian/master
in repository django-auth-ldap.

commit 70d4c5caf267fe2717df0385637323566c52ff1f
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sun Aug 20 10:37:20 2017 +0200

    Refresh patches for 1.2.15.
---
 debian/changelog                                   |  6 +++++
 ...3-Use-pyldap-for-both-Python2-and-Python3.patch | 10 ++++----
 debian/patches/docs-do_not_install_archive.patch   | 28 ----------------------
 .../docs-use_local_intersphinx_mapping.patch       |  2 +-
 debian/patches/series                              |  1 -
 5 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45ac35b..7873abb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+django-auth-ldap (1.2.14+dfsg-2) UNRELEASED; urgency=medium
+
+  * Refresh patches for 1.2.15.
+
+ -- Michael Fladischer <fladi at debian.org>  Sun, 20 Aug 2017 10:37:06 +0200
+
 django-auth-ldap (1.2.14+dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/0003-Use-pyldap-for-both-Python2-and-Python3.patch b/debian/patches/0003-Use-pyldap-for-both-Python2-and-Python3.patch
index 0a42df8..c163ef1 100644
--- a/debian/patches/0003-Use-pyldap-for-both-Python2-and-Python3.patch
+++ b/debian/patches/0003-Use-pyldap-for-both-Python2-and-Python3.patch
@@ -7,11 +7,11 @@ Subject: Use pyldap for both Python2 and Python3.
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 6d06024..b8b13f9 100644
+index dc7dd6a..6312c56 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -5,9 +5,6 @@ import sys
- from setuptools import setup
+@@ -7,9 +7,6 @@ from setuptools import setup
+ import django_auth_ldap
  
  
 -PY3 = (sys.version_info[0] == 3)
@@ -19,8 +19,8 @@ index 6d06024..b8b13f9 100644
 -
  setup(
      name="django-auth-ldap",
-     version="1.2.14",
-@@ -47,7 +44,7 @@ setup(
+     version=django_auth_ldap.version_string,
+@@ -49,7 +46,7 @@ setup(
      keywords=["django", "ldap", "authentication", "auth"],
      install_requires=[
          "django",
diff --git a/debian/patches/docs-do_not_install_archive.patch b/debian/patches/docs-do_not_install_archive.patch
deleted file mode 100644
index de21a67..0000000
--- a/debian/patches/docs-do_not_install_archive.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Michael Fladischer <fladi at debian.org>
-Date: Thu, 8 Oct 2015 08:49:53 -0700
-Subject: Do not include a static copy of "archive"
-
- Upstream configured sphinx to do a static copy of the "archive" directory,
- which is useless in the contet of the Debian package as it only contains
- outdated versions of the documentation.
-Last-Update: 2013-11-26
-Forwarded: not-needed
-
-Patch-Name: docs-do_not_install_archive.patch
----
- docs/source/conf.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/source/conf.py b/docs/source/conf.py
-index 406ce1a..7649568 100644
---- a/docs/source/conf.py
-+++ b/docs/source/conf.py
-@@ -134,7 +134,7 @@ html_theme_options = {
- # Add any paths that contain custom static files (such as style sheets) here,
- # relative to this directory. They are copied after the builtin static files,
- # so a file named "default.css" will overwrite the builtin "default.css".
--html_static_path = ['../archive']
-+#html_static_path = ['../archive']
- 
- # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
- # using the given strftime format.
diff --git a/debian/patches/docs-use_local_intersphinx_mapping.patch b/debian/patches/docs-use_local_intersphinx_mapping.patch
index a1ade3a..eaccb77 100644
--- a/debian/patches/docs-use_local_intersphinx_mapping.patch
+++ b/debian/patches/docs-use_local_intersphinx_mapping.patch
@@ -14,7 +14,7 @@ Patch-Name: docs-use_local_intersphinx_mapping.patch
  1 file changed, 17 insertions(+), 6 deletions(-)
 
 diff --git a/docs/source/conf.py b/docs/source/conf.py
-index 7649568..b2de920 100644
+index 7098158..96695b3 100644
 --- a/docs/source/conf.py
 +++ b/docs/source/conf.py
 @@ -29,12 +29,23 @@ extensions = [
diff --git a/debian/patches/series b/debian/patches/series
index 5e2a5af..3c32edf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-docs-do_not_install_archive.patch
 docs-use_local_intersphinx_mapping.patch
 0003-Use-pyldap-for-both-Python2-and-Python3.patch

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