[Python-modules-commits] [python-cement] 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-cement.

commit 7486eb99eadae7930f5207b0cee1c1881c11a522
Merge: b96419a 36c633c
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri May 20 09:18:20 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...2-Don-t-use-license-text-in-documentation.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 doc/source/index.rst                               |  1 -
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 2d1e57b,0000000..c4e0854
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
- e482d27faec5373ae0019f0a2106798ce2c4563c
- e482d27faec5373ae0019f0a2106798ce2c4563c
++36c633c0cfa25d9f9ef65c6b6e264d647f1ecf69
++36c633c0cfa25d9f9ef65c6b6e264d647f1ecf69
 +71b6945457b2a54e3bbda057f92942fcadb82305
 +71b6945457b2a54e3bbda057f92942fcadb82305
 +python-cement_2.8.2.orig.tar.gz
 +ec56a0785c21c41bc0bce39abc1021a0ecafe8af
 +165697
diff --cc debian/patches/0002-Don-t-use-license-text-in-documentation.patch
index 0000000,0000000..f73c721
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Don-t-use-license-text-in-documentation.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 36c633c0cfa25d9f9ef65c6b6e264d647f1ecf69 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Fri, 20 May 2016 09:17:21 +0200
++Subject: Don't use license text in documentation.
++
++It is already shipped by all binary packages.
++---
++ doc/source/index.rst | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/doc/source/index.rst b/doc/source/index.rst
++index de3fd7f..01ef356 100644
++--- a/doc/source/index.rst
+++++ b/doc/source/index.rst
++@@ -74,7 +74,6 @@ Documentation
++    :maxdepth: 1
++ 
++    changes
++-   license
++    contributors
++    upgrading
++    whats_new
diff --cc debian/patches/series
index d6674d4,0000000..d515b82
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Remove-badges-and-mailinglist-signup-form-from-docum.patch
++0002-Don-t-use-license-text-in-documentation.patch

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