Created by Mat Scales on 2011-07-28 and last modified on 2011-09-05
Get this branch:
bzr branch lp:~wibblymat/ubuntu/oneiric/couchdb/update-to-1.1.0
Only Mat Scales can upload to this branch. If you are Mat Scales please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Mat Scales

Recent revisions

63. By Mat Scales on 2011-09-05

Updated the changelog to make it easier to spot changes:

* Fixed a regression in the latest debian version
  - See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635762
* Ubuntu changes still remaining:
  - moz000*.patch: Build against spidermonkey 1.8.5:
  - init.patch: Improved init script
  - fix-help2man.patch: Build with newer versions of help2man

62. By Mat Scales on 2011-07-28

Use the same version of autotools to rebuild moz0003 as was used by the previous uploader to keep the diff smaller.

61. By Mat Scales on 2011-07-28

* Merge from debian unstable.
  - New upstream release (closes: #590334).
  - Empty dependency_libs in *.la (closes: #621202).
  - Fix several lintian errors and warnings:
    - use real erlang dependency, not just the virtual ABI one
    - remove embedded jquery.form.js , depend on its package

* Removed superceded patches:
  - couchio-fix-0001-replicator_redirect_atts.patch
  - couchio-fix-0002-replicator_db_proxy_fix.patch
  - couchio-fix-0003-changes_redirect_1.patch
  - couchio-fix-0004-changes_redirect_2.patch
  - couchio-fix-0005-changes_proxy.patch
  - couchio-fix-0006-replicator_reader_errors.patch
  - couchio-fix-0007-ibrowse_upgrade.patch
  - couchio-fix-0008-replicator_doc_id_encoding.patch
  - couchio-fix-0009-replicator_changes_error.patch
  - couchio-fix-0010-replicator_changes_connection_close.patch
  - couchio-fix-0011-ibrowse_chunked_encoding_streaming.patch
  - couchio-fix-0012-replicator_ssl.patch
  - jquery15-fix.patch
* Rebuilt debian/patches/moz0003-spidermonkey1.8.5_autotools.patch

60. By Mat Scales on 2011-07-23

Patch has been partly superceded, updating.

59. By Mat Scales on 2011-07-23

Another superceded patch

58. By Mat Scales on 2011-07-23

Looks like all the CouchIO fixes were applied or superceded upstream.

57. By Mat Scales on 2011-07-23

Some extraneous files were not removed by the upstream merge though they aren't included in the latest version of upstream.

56. By Mat Scales on 2011-07-23

* New upstream release (1.1.0)
* Begun removing patches that are no longer needed

55. By Chris Coulson on 2011-06-14

* Update Spidermonkey 1.8.5 patchset to the more palatable ones I'm
  forwarding upstream
  - update debian/patches/moz0001-spidermonkey1.8.5.patch
  - update debian/patches/moz0002-libmozjs.patch
  - update debian/patches/moz0003-spidermonkey1.8.5_autotools.patch

54. By Chris Coulson on 2011-04-15

* Rebuild against latest libmozjs, since we turned on --enable-threadsafe
* Also switch to using pkg-config rather than using the js-config script
  shipped by libmozjs. The latter is totally broken since turning on
  - update debian/patches/moz0002-libmozjs.patch
  - update debian/patches/moz0003-spidermonkey1.8.5_autotools.patch
  - Fixes (LP: #758895)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.