Merge lp://staging/~wibblymat/ubuntu/oneiric/couchdb/update-to-1.1.0 into lp://staging/ubuntu/oneiric/couchdb

Proposed by Mat Scales
Status: Work in progress
Proposed branch: lp://staging/~wibblymat/ubuntu/oneiric/couchdb/update-to-1.1.0
Merge into: lp://staging/ubuntu/oneiric/couchdb
Diff against target: 48668 lines (+19677/-13379)
268 files modified
AUTHORS (+1/-1)
CHANGES (+56/-1)
INSTALL (+80/-17)
INSTALL.Windows (+12/-7)
LICENSE (+29/-0)
Makefile.am (+1/-1)
Makefile.in (+10/-9)
NEWS (+30/-4)
NOTICE (+5/-1)
THANKS (+16/-0)
acinclude.m4 (+2/-2)
aclocal.m4 (+5/-5)
bin/Makefile.in (+1/-1)
bin/couchdb.1 (+0/-83)
bin/couchjs.1 (+0/-32)
build-aux/config.guess (+82/-141)
build-aux/config.sub (+43/-15)
build-aux/ltmain.sh (+26/-19)
configure (+357/-282)
configure.ac (+6/-0)
debian/binary.lintian-overrides (+0/-1)
debian/changelog (+42/-0)
debian/control (+28/-11)
debian/couchdb-bin.dirs (+0/-1)
debian/patches/couchio-fix-0001-replicator_redirect_atts.patch (+0/-26)
debian/patches/couchio-fix-0002-replicator_db_proxy_fix.patch (+0/-25)
debian/patches/couchio-fix-0003-changes_redirect_1.patch (+0/-13)
debian/patches/couchio-fix-0004-changes_redirect_2.patch (+0/-17)
debian/patches/couchio-fix-0005-changes_proxy.patch (+0/-77)
debian/patches/couchio-fix-0006-replicator_reader_errors.patch (+0/-126)
debian/patches/couchio-fix-0007-ibrowse_upgrade.patch (+0/-3481)
debian/patches/couchio-fix-0008-replicator_doc_id_encoding.patch (+0/-91)
debian/patches/couchio-fix-0009-replicator_changes_error.patch (+0/-33)
debian/patches/couchio-fix-0010-replicator_changes_connection_close.patch (+0/-74)
debian/patches/couchio-fix-0011-ibrowse_chunked_encoding_streaming.patch (+0/-92)
debian/patches/couchio-fix-0012-replicator_ssl.patch (+0/-99)
debian/patches/jquery15-fix.patch (+0/-124)
debian/patches/moz0003-spidermonkey1.8.5_autotools.patch (+1884/-3648)
debian/rules (+6/-1)
etc/Makefile.in (+3/-3)
etc/couchdb/Makefile.am (+3/-0)
etc/couchdb/Makefile.in (+4/-1)
etc/couchdb/default.ini.tpl.in (+36/-12)
etc/couchdb/local.ini (+29/-0)
etc/default/Makefile.in (+1/-1)
etc/init/Makefile.in (+1/-1)
etc/launchd/Makefile.in (+1/-1)
etc/logrotate.d/Makefile.in (+1/-1)
etc/windows/Makefile.in (+1/-1)
etc/windows/couchdb.iss.tpl (+8/-5)
license.skip (+4/-0)
m4/libtool.m4 (+30/-10)
m4/ltversion.m4 (+5/-5)
share/Makefile.am (+9/-1)
share/Makefile.in (+10/-2)
share/server/json2.js (+2/-1)
share/server/loop.js (+2/-0)
share/server/render.js (+4/-4)
share/server/state.js (+6/-1)
share/server/util.js (+72/-38)
share/server/views.js (+2/-13)
share/www/_sidebar.html (+6/-7)
share/www/couch_tests.html (+4/-1)
share/www/custom_test.html (+1/-1)
share/www/database.html (+10/-6)
share/www/dialog/_change_password.html (+31/-0)
share/www/index.html (+1/-1)
share/www/replicator.html (+50/-21)
share/www/script/couch.js (+40/-40)
share/www/script/couch_test_runner.js (+19/-7)
share/www/script/couch_tests.js (+5/-0)
share/www/script/futon.browse.js (+28/-17)
share/www/script/futon.format.js (+4/-1)
share/www/script/futon.js (+68/-4)
share/www/script/jquery-ui-1.8.11.custom.min.js (+81/-0)
share/www/script/jquery.couch.js (+70/-33)
share/www/script/json2.js (+2/-1)
share/www/script/jspec/jspec.js (+1/-1)
share/www/script/test/all_docs.js (+41/-0)
share/www/script/test/attachment_conflicts.js (+56/-0)
share/www/script/test/attachment_names.js (+28/-17)
share/www/script/test/attachment_paths.js (+10/-4)
share/www/script/test/attachment_ranges.js (+134/-0)
share/www/script/test/attachment_views.js (+2/-2)
share/www/script/test/attachments.js (+15/-13)
share/www/script/test/attachments_multipart.js (+175/-10)
share/www/script/test/auth_cache.js (+31/-0)
share/www/script/test/basics.js (+11/-13)
share/www/script/test/bulk_docs.js (+5/-5)
share/www/script/test/changes.js (+134/-23)
share/www/script/test/compact.js (+3/-3)
share/www/script/test/config.js (+101/-5)
share/www/script/test/conflicts.js (+26/-1)
share/www/script/test/cookie_auth.js (+21/-9)
share/www/script/test/copy_doc.js (+3/-0)
share/www/script/test/design_docs.js (+403/-141)
share/www/script/test/erlang_views.js (+1/-1)
share/www/script/test/etags_views.js (+95/-9)
share/www/script/test/http.js (+3/-3)
share/www/script/test/jsonp.js (+1/-1)
share/www/script/test/list_views.js (+48/-1)
share/www/script/test/method_override.js (+1/-1)
share/www/script/test/oauth.js (+14/-14)
share/www/script/test/proxyauth.js (+7/-8)
share/www/script/test/purge.js (+44/-4)
share/www/script/test/recreate_doc.js (+1/-1)
share/www/script/test/reduce.js (+20/-4)
share/www/script/test/reduce_builtin.js (+30/-4)
share/www/script/test/replication.js (+421/-80)
share/www/script/test/replicator_db.js (+1380/-0)
share/www/script/test/rewrite.js (+64/-4)
share/www/script/test/security_validation.js (+18/-11)
share/www/script/test/show_documents.js (+22/-0)
share/www/script/test/stats.js (+5/-5)
share/www/script/test/update_documents.js (+4/-0)
share/www/script/test/users_db.js (+22/-1)
share/www/script/test/view_errors.js (+30/-3)
share/www/script/test/view_include_docs.js (+54/-0)
share/www/script/test/view_multi_key_all_docs.js (+37/-0)
share/www/script/test/view_multi_key_design.js (+81/-3)
share/www/script/test/view_pagination.js (+74/-49)
share/www/script/test/view_sandboxing.js (+90/-2)
share/www/script/test/view_update_seq.js (+27/-10)
share/www/session.html (+1/-1)
share/www/style/jquery-ui-1.8.11.custom.css (+347/-0)
share/www/style/layout.css (+4/-4)
src/Makefile.in (+3/-3)
src/couchdb/Makefile.am (+8/-0)
src/couchdb/Makefile.in (+11/-3)
src/couchdb/couch_auth_cache.erl (+11/-2)
src/couchdb/couch_btree.erl (+5/-2)
src/couchdb/couch_changes.erl (+157/-88)
src/couchdb/couch_config.erl (+27/-16)
src/couchdb/couch_config_writer.erl (+8/-1)
src/couchdb/couch_db.erl (+32/-10)
src/couchdb/couch_db.hrl (+12/-28)
src/couchdb/couch_db_updater.erl (+76/-59)
src/couchdb/couch_doc.erl (+46/-10)
src/couchdb/couch_event_sup.erl (+6/-2)
src/couchdb/couch_file.erl (+59/-33)
src/couchdb/couch_httpd.erl (+124/-110)
src/couchdb/couch_httpd_auth.erl (+21/-11)
src/couchdb/couch_httpd_db.erl (+197/-108)
src/couchdb/couch_httpd_external.erl (+10/-3)
src/couchdb/couch_httpd_misc_handlers.erl (+86/-21)
src/couchdb/couch_httpd_proxy.erl (+431/-0)
src/couchdb/couch_httpd_rewrite.erl (+114/-79)
src/couchdb/couch_httpd_show.erl (+18/-13)
src/couchdb/couch_httpd_vhost.erl (+403/-0)
src/couchdb/couch_httpd_view.erl (+99/-36)
src/couchdb/couch_js_functions.hrl (+142/-1)
src/couchdb/couch_key_tree.erl (+99/-73)
src/couchdb/couch_log.erl (+54/-12)
src/couchdb/couch_os_daemons.erl (+364/-0)
src/couchdb/couch_query_servers.erl (+187/-83)
src/couchdb/couch_rep.erl (+435/-181)
src/couchdb/couch_rep_att.erl (+1/-2)
src/couchdb/couch_rep_changes_feed.erl (+212/-95)
src/couchdb/couch_rep_httpc.erl (+88/-16)
src/couchdb/couch_rep_missing_revs.erl (+6/-6)
src/couchdb/couch_rep_reader.erl (+29/-86)
src/couchdb/couch_rep_writer.erl (+11/-16)
src/couchdb/couch_replication_manager.erl (+387/-0)
src/couchdb/couch_server.erl (+15/-9)
src/couchdb/couch_server_sup.erl (+32/-5)
src/couchdb/couch_stream.erl (+41/-3)
src/couchdb/couch_util.erl (+58/-34)
src/couchdb/couch_view.erl (+54/-32)
src/couchdb/couch_view_compactor.erl (+9/-5)
src/couchdb/couch_view_group.erl (+99/-49)
src/couchdb/couch_view_updater.erl (+21/-8)
src/couchdb/couch_work_queue.erl (+88/-48)
src/couchdb/priv/Makefile.in (+1/-1)
src/couchdb/priv/stat_descriptions.cfg.in (+0/-1)
src/erlang-oauth/Makefile.in (+1/-1)
src/erlang-oauth/oauth_uri.erl (+38/-28)
src/etap/Makefile.in (+1/-1)
src/ibrowse/Makefile.am (+1/-1)
src/ibrowse/Makefile.in (+2/-2)
src/ibrowse/ibrowse.app.in (+5/-5)
src/ibrowse/ibrowse.erl (+354/-251)
src/ibrowse/ibrowse.hrl (+10/-1)
src/ibrowse/ibrowse_app.erl (+4/-5)
src/ibrowse/ibrowse_http_client.erl (+1171/-792)
src/ibrowse/ibrowse_lb.erl (+25/-6)
src/ibrowse/ibrowse_lib.erl (+173/-181)
src/ibrowse/ibrowse_sup.erl (+2/-4)
src/ibrowse/ibrowse_test.erl (+173/-37)
src/mochiweb/Makefile.am (+70/-48)
src/mochiweb/Makefile.in (+71/-49)
src/mochiweb/internal.hrl (+3/-0)
src/mochiweb/mochifmt.erl (+13/-14)
src/mochiweb/mochifmt_records.erl (+8/-0)
src/mochiweb/mochifmt_std.erl (+7/-0)
src/mochiweb/mochiglobal.erl (+107/-0)
src/mochiweb/mochihex.erl (+27/-11)
src/mochiweb/mochijson.erl (+15/-12)
src/mochiweb/mochijson2.erl (+181/-39)
src/mochiweb/mochilists.erl (+104/-0)
src/mochiweb/mochilogfile2.erl (+140/-0)
src/mochiweb/mochinum.erl (+62/-20)
src/mochiweb/mochitemp.erl (+310/-0)
src/mochiweb/mochiutf8.erl (+316/-0)
src/mochiweb/mochiweb.app.in (+1/-1)
src/mochiweb/mochiweb.app.src (+9/-0)
src/mochiweb/mochiweb.erl (+200/-21)
src/mochiweb/mochiweb_acceptor.erl (+48/-0)
src/mochiweb/mochiweb_app.erl (+7/-0)
src/mochiweb/mochiweb_charref.erl (+24/-11)
src/mochiweb/mochiweb_cookies.erl (+80/-28)
src/mochiweb/mochiweb_cover.erl (+75/-0)
src/mochiweb/mochiweb_echo.erl (+9/-2)
src/mochiweb/mochiweb_headers.erl (+115/-67)
src/mochiweb/mochiweb_html.erl (+418/-250)
src/mochiweb/mochiweb_http.erl (+150/-29)
src/mochiweb/mochiweb_io.erl (+46/-0)
src/mochiweb/mochiweb_mime.erl (+94/-0)
src/mochiweb/mochiweb_multipart.erl (+358/-64)
src/mochiweb/mochiweb_request.erl (+140/-239)
src/mochiweb/mochiweb_response.erl (+8/-0)
src/mochiweb/mochiweb_skel.erl (+27/-14)
src/mochiweb/mochiweb_socket.erl (+84/-0)
src/mochiweb/mochiweb_socket_server.erl (+106/-82)
src/mochiweb/mochiweb_sup.erl (+7/-0)
src/mochiweb/mochiweb_util.erl (+291/-177)
src/mochiweb/reloader.erl (+39/-1)
test/Makefile.in (+3/-3)
test/bench/Makefile.in (+1/-1)
test/etap/010-file-basics.t (+2/-1)
test/etap/021-btree-reductions.t (+2/-2)
test/etap/030-doc-from-json.t (+2/-5)
test/etap/031-doc-to-json.t (+2/-5)
test/etap/050-stream.t (+3/-3)
test/etap/060-kt-merging.t (+37/-62)
test/etap/070-couch-db.t (+1/-3)
test/etap/083-config-no-files.t (+1/-1)
test/etap/110-replication-httpc.t (+6/-8)
test/etap/111-replication-changes-feed.t (+7/-8)
test/etap/112-replication-missing-revs.t (+23/-11)
test/etap/113-replication-attachment-comp.t (+53/-12)
test/etap/130-attachments-md5.t (+2/-6)
test/etap/140-attachment-comp.t (+71/-20)
test/etap/150-invalid-view-seq.t (+4/-6)
test/etap/160-vhosts.t (+181/-21)
test/etap/170-os-daemons.es (+26/-0)
test/etap/170-os-daemons.t (+114/-0)
test/etap/171-os-daemons-config.es (+83/-0)
test/etap/171-os-daemons-config.t (+74/-0)
test/etap/172-os-daemon-errors.1.sh (+17/-0)
test/etap/172-os-daemon-errors.2.sh (+15/-0)
test/etap/172-os-daemon-errors.3.sh (+15/-0)
test/etap/172-os-daemon-errors.4.sh (+15/-0)
test/etap/172-os-daemon-errors.t (+126/-0)
test/etap/173-os-daemon-cfg-register.t (+93/-0)
test/etap/180-http-proxy.ini (+20/-0)
test/etap/180-http-proxy.t (+378/-0)
test/etap/190-oauth.t (+31/-0)
test/etap/200-view-group-no-db-leaks.t (+262/-0)
test/etap/Makefile.am (+22/-2)
test/etap/Makefile.in (+175/-22)
test/etap/random_port.ini (+19/-0)
test/etap/test_cfg_register.c (+30/-0)
test/etap/test_util.erl.in (+9/-2)
test/etap/test_web.erl (+99/-0)
test/javascript/Makefile.in (+1/-1)
test/view_server/Makefile.in (+1/-1)
utils/Makefile.in (+1/-1)
var/Makefile.in (+1/-1)
To merge this branch: bzr merge lp://staging/~wibblymat/ubuntu/oneiric/couchdb/update-to-1.1.0
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Daniel Holbach Pending
Ubuntu branches Pending
Review via email: mp+74236@code.staging.launchpad.net

This proposal supersedes a proposal from 2011-07-28.

Description of the change

Merges the latest debian version of couchdb, updates to upstream version 1.1.0

Merge bug #817656

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote : Posted in a previous version of this proposal

Thanks a lot for your work on this. Could you please edit debian/changelog and list all the changes that we still carry on top of Debian below "Merged from Debian"? Just copying the relevant bits from older Ubuntu changelog entries would be good enough.

This would make reviewing a lot easier.

review: Needs Fixing
Revision history for this message
Daniel Holbach (dholbach) wrote : Posted in a previous version of this proposal

Thanks a lot for your work on this. Could you please edit debian/changelog and list all the changes that we still carry on top of Debian below "Merged from Debian"? Just copying the relevant bits from older Ubuntu changelog entries would be good enough.

This would make reviewing a lot easier.

review: Needs Fixing
Revision history for this message
Daniel Holbach (dholbach) wrote : Posted in a previous version of this proposal

libjs-jquery-form is in universe. It would need to follow https://wiki.ubuntu.com/MainInclusionProcess

Revision history for this message
Daniel Holbach (dholbach) wrote : Posted in a previous version of this proposal

Also: are all the new erlang-* build-depends necessary - there's nothing about them in debian/changelog.

Revision history for this message
Samuele Pedroni (pedronis) wrote : Posted in a previous version of this proposal

can confirm that the dropped patches are superseded

desktopcouch tests pass with a locally built version of this, same for the smoke-test internal U1 replication test

Revision history for this message
Sebastien Bacher (seb128) wrote : Posted in a previous version of this proposal

You will also need a feature freeze exception granted to get that on in Oneiric, setting to Work in progress until Daniel's points about the mir and build depends and changelog points are adressed, you should set it back to "Needs review" once you have an update adressing those

Revision history for this message
Daniel Holbach (dholbach) wrote : Posted in a previous version of this proposal
Revision history for this message
John Lenton (chipaca) wrote : Posted in a previous version of this proposal

Is there a reason the dependency on libjs-jquery-form can't be made a recommends instead?

Revision history for this message
Michael Chang (thenewme91) wrote : Posted in a previous version of this proposal

The current couchdb-bin package in oneiric contains the contents of libjs-jquery-form verbatim (i.e. jquery.form.js), albeit a version from Nov 2009; if it's in oneiric it makes more sense to point to a single updated copy in a package in the repos then to have two copies (one in couchdb and one in libjs-jquery-form).

Also, couchdb-bin currently depends on libjs-jquery in a similar fashion.

Revision history for this message
Michael Chang (thenewme91) wrote : Posted in a previous version of this proposal

libjs-jquery-form recommends javascript-common; either this will will need to be changed to suggests or javascript-common will need to also have a MIR.
javascript-common depends on wwwconfig-common, so if adding a MIR for javascript-common, also need one for wwwconfig-common.

Note that libjs-jquery only suggests javascript-common, not recommends it.

Note that libjs-jquery-form is new in oneiric (appears to have come from the autosync with Debian unstable).

Revision history for this message
Mat Scales (wibblymat) wrote : Posted in a previous version of this proposal

A note on the diff between the Debian version and my version. If you see the bug at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635762 there was some regression in the Debian version. I submitted a patch that would fix things up but the Debian maintainer appears to be AWOL.

This branch fixes that regression, which is the largest source of difference. I'll update the changelog to state that along with which Ubuntu patches we sill have.

Revision history for this message
Mat Scales (wibblymat) wrote : Posted in a previous version of this proposal

The erlang-* build dependencies replace the erlang-nox dependency. erlang-nox depends on a whole bunch of other packages, including ones we don't need. Only erlang-eunit is actually new since the last Ubuntu version, a new dependency upstream.

Revision history for this message
James Page (james-page) wrote :

1.1.0-2 is now in Debian testing - which looks like it may resolve some of the regressions in the Debian version.

Please can this merge proposal be revised in light of this new Debian version.

Thanks

review: Needs Fixing

Unmerged revisions

63. By Mat Scales

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

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

* 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

Patch has been partly superceded, updating.

59. By Mat Scales

Another superceded patch

58. By Mat Scales

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

57. By Mat Scales

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches