[Python-modules-commits] [python-webob] 02/02: merge patched-hacking into hacking

[Barry Warsaw]

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

barry pushed a commit to branch hacking
in repository python-webob.

commit a3d437c9f30e0ae789e25828a389ee0b5a955d68
Merge: c7d0f2c 6deeb1d
Author: Barry Warsaw <barry at python.org>
Date:   Wed Oct 21 18:29:49 2015 -0400

    merge patched-hacking into hacking

 debian/.git-dpm                                |  4 ++--
 debian/patches/0001-include-package-data.patch | 21 +++++++++++++++++++++
 debian/patches/series                          |  1 +
 setup.py                                       |  1 +
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 270b2e0,0000000..a74f3a2
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
- 87d7f0340c823fd5e3de21bd28dd7076d86726e9
- 87d7f0340c823fd5e3de21bd28dd7076d86726e9
++6deeb1d045662d8227909ea2e9e246eeb4e58207
++6deeb1d045662d8227909ea2e9e246eeb4e58207
 +87d7f0340c823fd5e3de21bd28dd7076d86726e9
 +87d7f0340c823fd5e3de21bd28dd7076d86726e9
 +python-webob_1.4.1.orig.tar.gz
 +711f188e02bac4f7b2195a5875e7c07191924435
 +671495
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-include-package-data.patch
index 0000000,0000000..39fb77a
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-include-package-data.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 6deeb1d045662d8227909ea2e9e246eeb4e58207 Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Wed, 21 Oct 2015 18:29:37 -0400
++Subject: include package data
++
++---
++ setup.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/setup.py b/setup.py
++index 2af1833..9a3be62 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -54,6 +54,7 @@ You may install the `in-development version of WebOb
++     zip_safe=True,
++     test_suite='nose.collector',
++     tests_require=['nose'],
+++    include_package_data=True,
++     extras_require = {
++         'testing':testing_extras,
++         'docs':docs_extras,
diff --cc debian/patches/series
index 0000000,0000000..845b0a6
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-include-package-data.patch

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