Package: python-couchdb
Version: 0.10-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch
*** /tmp/tmp8IDN70/bug_body
In Ubuntu, the attached patch was applied to achieve the following:
* Merged from debian, remaining changes:
- ship couchdb-replicate
- fix postinst failure by disable pyexec in python3
this needs a proper fix once py3 is supported by the packages
Thanks for considering the patch.
For the postinst failure a better fix is probably the patch that gentoo
did (and that really should go upstream IMO):
https://www.mail-archive.com/gentoo-commits@lists.gentoo.org/msg38169.html
-- System Information:
Debian Release: jessie/sid
APT prefers utopic-updates
APT policy: (500, 'utopic-updates'), (500, 'utopic-security'), (500,
'utopic-proposed'), (500, 'utopic'), (100, 'utopic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-22-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru python-couchdb-0.10/debian/changelog python-couchdb-0.10/debian/changelog
diff -Nru python-couchdb-0.10/debian/install python-couchdb-0.10/debian/install
--- python-couchdb-0.10/debian/install 2014-09-28 18:14:36.000000000 +0200
+++ python-couchdb-0.10/debian/install 2014-10-28 17:02:46.000000000 +0100
@@ -1,5 +1,6 @@
couchdb-dump usr/bin/
couchdb-load usr/bin/
couchpy usr/bin/
+couchdb-replicate usr/bin/
debian/extra/python-couchdb etc/couchdb/default.d/
diff -Nru python-couchdb-0.10/debian/manpages python-couchdb-0.10/debian/manpages
--- python-couchdb-0.10/debian/manpages 2014-09-28 18:14:36.000000000 +0200
+++ python-couchdb-0.10/debian/manpages 2014-10-28 17:02:46.000000000 +0100
@@ -1,3 +1,4 @@
couchdb-dump.1
couchdb-load.1
couchpy.1
+couchdb-replicate.1
diff -Nru python-couchdb-0.10/debian/patches/04-fix-py3 python-couchdb-0.10/debian/patches/04-fix-py3
--- python-couchdb-0.10/debian/patches/04-fix-py3 1970-01-01 01:00:00.000000000 +0100
+++ python-couchdb-0.10/debian/patches/04-fix-py3 2014-10-28 17:06:19.000000000 +0100
@@ -0,0 +1,13 @@
+Index: python-couchdb-0.10/couchdb/util3.py
+===================================================================
+--- python-couchdb-0.10.orig/couchdb/util3.py
++++ python-couchdb-0.10/couchdb/util3.py
+@@ -14,7 +14,7 @@ from urllib.parse import urlsplit, urlun
+ from urllib.parse import quote as urlquote
+ from urllib.parse import unquote as urlunquote
+
+-pyexec = exec
++#pyexec = exec
+
+ def funcode(fun):
+ return fun.__code__
diff -Nru python-couchdb-0.10/debian/patches/series python-couchdb-0.10/debian/patches/series
--- python-couchdb-0.10/debian/patches/series 2014-09-28 18:14:36.000000000 +0200
+++ python-couchdb-0.10/debian/patches/series 2014-10-28 17:04:15.000000000 +0100
@@ -1,2 +1,3 @@
01-improve_bin_scripts.patch
03-remove_module_shebang.patch
+04-fix-py3
diff -Nru python-couchdb-0.10/debian/rules python-couchdb-0.10/debian/rules
--- python-couchdb-0.10/debian/rules 2014-09-28 18:14:36.000000000 +0200
+++ python-couchdb-0.10/debian/rules 2014-10-28 17:02:46.000000000 +0100
@@ -19,10 +19,10 @@
help2man -N -n "a CouchDB dump utility" ./couchdb-dump > couchdb-dump.1
help2man -N -n "a CouchDB load utility" ./couchdb-load > couchdb-load.1
help2man -N -n "a CouchDB Python view server" ./couchpy > couchpy.1
+ help2man -N -n "a CouchDB Python replication tool" --version-string=$(UPVER) ./couchdb-replicate > couchdb-replicate.1
override_dh_auto_install:
dh_auto_install -- --single-version-externally-managed
-
-rm -rf $(CURDIR)/debian/usr/share/doc/python-couchdb/html/_static/jquery.js
override_dh_clean:
