[Python-modules-commits] [python-testfixtures] 06/07: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository python-testfixtures.

commit 9e5fece867bf14dad87e34ca07cca89e630176f4
Merge: 0fd9aba 38e5cda
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Jan 27 09:54:34 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...Do-not-duplicate-license-in-documentation.patch | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/index.txt                                     |  1 -
 docs/license.txt                                   |  5 ----
 5 files changed, 37 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index ffcca28,0000000..aab7aea
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- ef4865dec81eaa5dd24c6c07edbffc10db783e36
- ef4865dec81eaa5dd24c6c07edbffc10db783e36
++38e5cdaecaa7fcf73ce07a90e63c73b0d8d54069
++38e5cdaecaa7fcf73ce07a90e63c73b0d8d54069
 +bdb10da94ce984ae8dd3926ee24f256b869e0b73
 +bdb10da94ce984ae8dd3926ee24f256b869e0b73
 +python-testfixtures_4.13.3.orig.tar.gz
 +d7626cabcc9bcdf22d51da53d7554490ee3cae33
 +93533
diff --cc debian/patches/0002-Do-not-duplicate-license-in-documentation.patch
index 0000000,0000000..107edc7
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Do-not-duplicate-license-in-documentation.patch
@@@ -1,0 -1,0 +1,34 @@@
++From 38e5cdaecaa7fcf73ce07a90e63c73b0d8d54069 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Fri, 27 Jan 2017 09:54:15 +0100
++Subject: Do not duplicate license in documentation.
++
++---
++ docs/index.txt   | 1 -
++ docs/license.txt | 5 -----
++ 2 files changed, 6 deletions(-)
++ delete mode 100644 docs/license.txt
++
++diff --git a/docs/index.txt b/docs/index.txt
++index cbd65e0..c0b8433 100644
++--- a/docs/index.txt
+++++ b/docs/index.txt
++@@ -38,7 +38,6 @@ development, please see the sections below:
++    installation.txt
++    development.txt
++    changes.txt
++-   license.txt
++ 
++ Indices and tables
++ ==================
++diff --git a/docs/license.txt b/docs/license.txt
++deleted file mode 100644
++index b383c6e..0000000
++--- a/docs/license.txt
+++++ /dev/null
++@@ -1,5 +0,0 @@
++-=======
++-License
++-=======
++-
++-.. literalinclude:: ../LICENSE.txt
diff --cc debian/patches/series
index 693f90d,0000000..f58db19
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Use-local-objects.inv-where-possible.patch
++0002-Do-not-duplicate-license-in-documentation.patch

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