[Python-modules-commits] [sqlobject] 03/05: merge patched into master

[Neil Muller]

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

drnlmza-guest pushed a commit to branch master
in repository sqlobject.

commit d54508f4dfb60a7dbe52605d1bcf6df903cced35
Merge: 88ccfbe 92d777b
Author: Neil Muller <drnlmuller+debian at gmail.com>
Date:   Fri Jul 1 22:05:35 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...vis-ci-image-link-due-to-privacy-concerns.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/DeveloperGuide.txt                            |  6 ++---
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 2f27f91,0000000..7587fdc
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- a4bc9c63f6e4e79c968cc54301f579e32e57cb5e
- a4bc9c63f6e4e79c968cc54301f579e32e57cb5e
++92d777b5e15f14a20fb18b9487e8f83e052a501d
++92d777b5e15f14a20fb18b9487e8f83e052a501d
 +ced1ca4e28c774f8711a474029b83ab2f1adf3e5
 +ced1ca4e28c774f8711a474029b83ab2f1adf3e5
 +sqlobject_3.0.0.orig.tar.gz
 +32bab12b6b38726c3315d7cb6c5c960eb7ea131f
 +892316
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0006-Remove-travis-ci-image-link-due-to-privacy-concerns.patch
index 0000000,0000000..e8f8854
new file mode 100644
--- /dev/null
+++ b/debian/patches/0006-Remove-travis-ci-image-link-due-to-privacy-concerns.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 92d777b5e15f14a20fb18b9487e8f83e052a501d Mon Sep 17 00:00:00 2001
++From: Neil Muller <drnlmuller+debian at gmail.com>
++Date: Fri, 1 Jul 2016 22:04:47 +0200
++Subject: Remove travis-ci image link, due to privacy concerns
++
++---
++ docs/DeveloperGuide.txt | 6 ++----
++ 1 file changed, 2 insertions(+), 4 deletions(-)
++
++diff --git a/docs/DeveloperGuide.txt b/docs/DeveloperGuide.txt
++index 4e091b1..f87db2e 100644
++--- a/docs/DeveloperGuide.txt
+++++ b/docs/DeveloperGuide.txt
++@@ -184,10 +184,8 @@ forced to write the test.  That's no fun for me, to just be writing
++ tests.  So please, write tests; everything at least needs to be
++ exercised, even if the tests are absolutely complete.
++ 
++-We now use Travis CI to run tests. See the status:
++-
++-.. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=master
++-  :target: https://travis-ci.org/sqlobject/sqlobject
+++We now use Travis CI to run tests. See the status at
+++https://travis-ci.org/sqlobject/sqlobject
++ 
++ Documentation
++ =============
diff --cc debian/patches/series
index 5644b17,0000000..203bb9b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,6 @@@
 +get_rid_of_setuptools
 +change_doc_build_script
 +remove_pkg_resources
 +replace_sf_logo
 +0005-Remove-docs-from-installed-files.patch
++0006-Remove-travis-ci-image-link-due-to-privacy-concerns.patch

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