[Python-modules-commits] [python-pyftpdlib] 09/11: merge patched into master

[Wolfgang Borgert]

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

debacle pushed a commit to branch master
in repository python-pyftpdlib.

commit a40aaa099241c8ee8f9a7f3ef119c265dfa3d1e5
Merge: 061a5a7 beec4f8
Author: W. Martin Borgert <debacle at debian.org>
Date:   Sun Nov 22 17:48:26 2015 +0100

    merge patched into master

 MANIFEST.in                                        |  5 ++--
 debian/.git-dpm                                    |  4 +--
 debian/patches/0001-fix-update-MANIFEST-file.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 6a80553,0000000..2145e4e
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
- da5dc2d853b22a412fdba704a9b61bce1ed2ea80
- da5dc2d853b22a412fdba704a9b61bce1ed2ea80
++beec4f8fb3f0af7db786433c7906768fae696c4d
++beec4f8fb3f0af7db786433c7906768fae696c4d
 +da5dc2d853b22a412fdba704a9b61bce1ed2ea80
 +da5dc2d853b22a412fdba704a9b61bce1ed2ea80
 +python-pyftpdlib_1.4.0.orig.tar.gz
 +f2d7ca1303768a90120ca4cf267db0a788f7ab8e
 +187701
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-fix-update-MANIFEST-file.patch
index 0000000,0000000..83d9792
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-fix-update-MANIFEST-file.patch
@@@ -1,0 -1,0 +1,29 @@@
++From beec4f8fb3f0af7db786433c7906768fae696c4d Mon Sep 17 00:00:00 2001
++From: "W. Martin Borgert" <debacle at debian.org>
++Date: Sun, 22 Nov 2015 17:48:17 +0100
++Subject: fix/update MANIFEST file
++
++---
++ MANIFEST.in | 5 ++---
++ 1 file changed, 2 insertions(+), 3 deletions(-)
++
++diff --git a/MANIFEST.in b/MANIFEST.in
++index 3609251..95ac375 100644
++--- a/MANIFEST.in
+++++ b/MANIFEST.in
++@@ -2,13 +2,12 @@
++ # Note: make sure everything is in place with "svn list -R".
++ 
++ include CREDITS
++-include HISTORY
++-include INSTALL
+++include HISTORY.rst
++ include LICENSE
++ include make.bat
++ include Makefile
++ include MANIFEST.in
++-include README
+++include README.rst
++ include setup.py
++ recursive-include demo *.py *.pem
++ recursive-include pyftpdlib *.py
diff --cc debian/patches/series
index 0000000,0000000..0826cc4
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-fix-update-MANIFEST-file.patch

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