[Python-modules-commits] [python-measurement] 04/05: 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-measurement.

commit 72e5d0a3c750a8c0af5a0ef40d6421dde9268ac7
Merge: bf9947b 0046f15
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Tue May 3 17:24:20 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...tential-privacy-breach-from-documentation.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/index.rst                                     |  3 ---
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 3ac45c7,0000000..4d3ff4e
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
- 720be6a64cf803dede03f8b23becf939326b4863
- 720be6a64cf803dede03f8b23becf939326b4863
++0046f15c27f7d7b6ae621937229d74062b14df84
++0046f15c27f7d7b6ae621937229d74062b14df84
 +720be6a64cf803dede03f8b23becf939326b4863
 +720be6a64cf803dede03f8b23becf939326b4863
 +python-measurement_1.8.0.orig.tar.gz
 +7bc333036a374b4558a59032c86424e837dfbf72
 +22405
diff --cc debian/patches/0001-Remove-potential-privacy-breach-from-documentation.patch
index 0000000,0000000..7692bbf
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-potential-privacy-breach-from-documentation.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 0046f15c27f7d7b6ae621937229d74062b14df84 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Tue, 3 May 2016 17:23:38 +0200
++Subject: Remove potential privacy breach from documentation.
++
++Upstream documentation links to an external badge image from travis-ci.
++---
++ docs/index.rst | 3 ---
++ 1 file changed, 3 deletions(-)
++
++diff --git a/docs/index.rst b/docs/index.rst
++index e81ea19..98965ec 100644
++--- a/docs/index.rst
+++++ b/docs/index.rst
++@@ -6,9 +6,6 @@
++ python-measurement
++ ==================
++ 
++-.. image:: https://travis-ci.org/coddingtonbear/python-measurement.png?branch=master
++-   :target: https://travis-ci.org/coddingtonbear/python-measurement
++-
++ Easily use and manipulate unit-aware measurement objects in Python.
++ 
++ `django.contrib.gis.measure <https://github.com/django/django/blob/master/django/contrib/gis/measure.py>`_
diff --cc debian/patches/series
index 0000000,0000000..66a012d
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-potential-privacy-breach-from-documentation.patch

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