[Python-modules-commits] [bdist-nsi] 08/12: merge patched into master

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository bdist-nsi.

commit 9ec949b2ac88cf25a3aa9e31402643e98ac5ec4c
Merge: ec75cc8 78cb83d
Author: Dominik George <nik at naturalnet.de>
Date:   Sun Apr 23 21:03:25 2017 +0200

    merge patched into master

 README.rst                                         |  2 +-
 debian/.git-dpm                                    |  4 ++--
 ...Fix-the-import-instructions-in-the-README.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index db41675,0000000..4bb48d6
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
- ab833ee8e6bf4fdb6f05df80c8a185683a6c9c44
- ab833ee8e6bf4fdb6f05df80c8a185683a6c9c44
++78cb83d2f5b451d8ade11bfe95a9e906cf923537
++78cb83d2f5b451d8ade11bfe95a9e906cf923537
 +ab833ee8e6bf4fdb6f05df80c8a185683a6c9c44
 +ab833ee8e6bf4fdb6f05df80c8a185683a6c9c44
 +bdist-nsi_0.1.5.orig.tar.gz
 +9d3ed4b54e5e8faf19e94e8bc7e5df8e77d095cb
 +56796
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-the-import-instructions-in-the-README.patch
index 0000000,0000000..f19a581
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-the-import-instructions-in-the-README.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 78cb83d2f5b451d8ade11bfe95a9e906cf923537 Mon Sep 17 00:00:00 2001
++From: Dominik George <nik at naturalnet.de>
++Date: Sun, 23 Apr 2017 20:58:52 +0200
++Subject: Fix the import instructions in the README.
++
++---
++ README.rst | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/README.rst b/README.rst
++index 8d1a29e..cd29d9e 100755
++--- a/README.rst
+++++ b/README.rst
++@@ -34,7 +34,7 @@ Add ``bdist_nsi`` option to your setup.py file.
++ In your projects setup.py::
++ 
++     try:
++-        import bdist_nsi
+++        from bdist_nsi import bdist_nsi
++     except ImportError:
++         pass
++ 
diff --cc debian/patches/series
index 0000000,0000000..05d6d7d
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-the-import-instructions-in-the-README.patch

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