[Python-modules-commits] [python-cups] 04/05: merge patched into master

[Ondřej Nový]

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

onovy-guest pushed a commit to branch master
in repository python-cups.

commit d00383588ff2dab4465015616850474adf233cb9
Merge: 49e80d0 63bf966
Author: Ondřej Nový <novy at ondrej.org>
Date:   Mon Mar 7 00:01:23 2016 +0100

    merge patched into master

 NEWS                              |   5 ++
 PKG-INFO                          |   2 +-
 cupsconnection.c                  |   9 ++-
 cupsmodule.c                      | 128 +++++++++++++++++++-------------------
 cupsmodule.h                      |  16 +++--
 debian/.git-dpm                   |   6 +-
 debian/patches/01_no_epydoc.patch |   2 +-
 setup.py                          |   2 +-
 8 files changed, 96 insertions(+), 74 deletions(-)

diff --cc debian/.git-dpm
index daad105,0000000..97df5a0
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
- 1c7e6a858db6f0edd414c515c6620dc2f7ecee62
- 1c7e6a858db6f0edd414c515c6620dc2f7ecee62
- fd7109c0aa33cdd0bac18aefdde9f78e4e923ea6
++63bf96646d62c8b46a40a4349e8273d4849d37bc
++63bf96646d62c8b46a40a4349e8273d4849d37bc
++dc806f5779031aeb71a54fb0a84531b59399e773
 +dc806f5779031aeb71a54fb0a84531b59399e773
 +python-cups_1.9.73.orig.tar.bz2
 +561dc41a0025ad3467e7d151ee2ce84e5e564f9d
 +52732
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/01_no_epydoc.patch
index 39f3db4,0000000..f1895c6
mode 100644,000000..100644
--- a/debian/patches/01_no_epydoc.patch
+++ b/debian/patches/01_no_epydoc.patch
@@@ -1,25 -1,0 +1,25 @@@
- From 1c7e6a858db6f0edd414c515c6620dc2f7ecee62 Mon Sep 17 00:00:00 2001
++From 63bf96646d62c8b46a40a4349e8273d4849d37bc Mon Sep 17 00:00:00 2001
 +From: Otavio Salvador <otavio at debian.org>
 +Date: Fri, 30 Nov 2012 08:09:12 +0100
 +Subject: 01_no_epydoc
 +
 +Patch-Name: 01_no_epydoc.patch
 +---
 + Makefile | 4 +++-
 + 1 file changed, 3 insertions(+), 1 deletion(-)
 +
 +diff --git a/Makefile b/Makefile
 +index 85e4940..9ce5424 100644
 +--- a/Makefile
 ++++ b/Makefile
 +@@ -18,7 +18,9 @@ cups.so: force
 + 
 + doc:	cups.so
 + 	rm -rf html
 +-	epydoc -o html --html $<
 ++	mkdir -p html
 ++	pydoc -w $(patsubst %.so,%,$<)
 ++	mv $(patsubst %.so,%.html,$<) html
 + 
 + doczip:	doc
 + 	cd html && zip ../cups-html.zip *

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