lp:~xnox/ubuntu/quantal/python-couchdb/merge

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:ubuntu/quantal/python-couchdb

Barry Warsaw (community): Needs Fixing on 2012-05-22

Ubuntu branches: Pending requested 2012-05-03

Diff: 3886 lines (+635/-2100)

42 files modified

.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/.version (+0/-1)
.pc/00-correct_readme.patch/README.txt (+10/-0)
.pc/01-improve_bin_scripts.patch/setup.py (+148/-0)
.pc/03-remove_module_shebang.patch/couchdb/view.py (+230/-0)
.pc/applied-patches (+0/-1)
.pc/python2.5_compatibility.patch/couchdb/client.py (+0/-1092)
README.txt (+2/-1)
couchdb-dump (+5/-0)
couchdb-load (+5/-0)
couchdb-replicate (+5/-0)
couchdb/design.py (+0/-207)
couchdb/json.py (+0/-139)
couchdb/multipart.py (+0/-247)
couchdb/tests/design.py (+0/-22)
couchdb/tests/multipart.py (+0/-186)
couchdb/tools/__init__.py (+0/-7)
couchdb/view.py (+0/-1)
couchpy (+5/-0)
debian/README.source (+0/-20)
debian/changelog (+32/-0)
debian/clean (+2/-0)
debian/compat (+1/-1)
debian/control (+19/-11)
debian/copyright (+23/-20)
debian/doc-base (+7/-0)
debian/docs (+1/-1)
debian/extra/python-couchdb (+2/-0)
debian/install (+5/-0)
debian/links (+1/-0)
debian/manpages (+0/-1)
debian/patches/00-correct_readme.patch (+20/-0)
debian/patches/01-improve_bin_scripts.patch (+61/-0)
debian/patches/03-remove_module_shebang.patch (+16/-0)
debian/patches/build-docs-with-sphinx.patch (+0/-76)
debian/patches/correct-readme.patch (+0/-13)
debian/patches/remove-module-shebang.patch (+0/-8)
debian/patches/series (+3/-0)
debian/rules (+29/-36)
debian/source/format (+1/-0)
setup.py (+0/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

12. By Dimitri John Ledkov on 2012-05-03

* Merge with Debian; remaining changes:
  - prefer debian packaging
  - build using dh_python2

11. By Dimitri John Ledkov on 2012-05-03

Force merge

10. By Dimitri John Ledkov on 2012-05-03

Merging shared upstream rev into target branch.

9. By Matthias Klose on 2011-12-17

Build using dh_python2

8. By Martin Pitt on 2011-01-12

releasing version 0.8-0ubuntu1

7. By Martin Pitt on 2011-01-12

* New upstream release.
* Remove debian/patches/improve-bin-scripts.patch and fix up debian/rules
  and generate man pages from actual scripts.
* Include replication tool in binaries, and poke version into man page.
* Remove debian/patches/python2.5_compatibility.patch .
* Use explicit BSD license to placate lintian.
* Fix broken build-docs rule. Add 'python-sphinx' as build-dep.
* Add constraint so we don't break older desktopcouch.

6. By Debian Python Modules Team on 2009-08-18

[ Noah Slater ]
* Updated debian/control, updated Build-Depends on debhelper to 7.2.11.

[ Piotr Ożarowski ]
* New upstream release. Closes: #537456
* Add python-cjson as an alternative dependency to python-simplejson and
  python >= 2.6 (due to new couchdb/json.py)
* python2.5_compatibility.patch added
* Remove PYTHONPATH from debian/rules, not really needed
* Standards-Version bumped to 3.8.3 (no other changes needed)

5. By James Westby on 2009-07-18

New upstream release

4. By Noah Slater on 2009-01-18

* New upstream release.
* Added debian/README.source file.
* Updated debian/control, updated Vcs-Browser.
* Updated debian/control, updated Depends.
* Updated debian/control, updated Description.
* Updated debian/copyright, added additional copyright holder.
* Updated debian/rules, improved uscan options for get-orig-source.

3. By Noah Slater <email address hidden> on 2008-07-10

* New upstream release.
* Added python-docutils, python-epydoc and python-pygments to build depends.
* Added API documentation generation to debian/rules.
* Added debian/README.source for upstream source information.
* Updated debian/copyright per latest proposed format.
* Updated Standards-Version to 3.8.0.