Merge lp:~jderose/ubuntu/trusty/couchdb/1.5.0 into lp:ubuntu/trusty/couchdb

Proposed by Jason Gerard DeRose on 2013-11-30
Status: Needs review
Proposed branch: lp:~jderose/ubuntu/trusty/couchdb/1.5.0
Merge into: lp:ubuntu/trusty/couchdb
Diff against target: 282447 lines (+226348/-46070)
710 files modified
LICENSE (+146/-0)
Makefile.am (+1/-0)
Makefile.in (+4/-0)
NOTICE (+33/-1)
THANKS (+9/-2)
acinclude.m4 (+1/-1)
bin/Makefile.am (+6/-1)
bin/Makefile.in (+9/-1)
bin/couch-config.tpl.in (+10/-0)
bin/couchdb.1 (+1/-1)
bin/couchdb.tpl.in (+30/-16)
bin/erlang-version.escript (+3/-0)
build-aux/ltmain.sh (+57/-38)
configure (+208/-106)
configure.ac (+17/-8)
debian/changelog (+19/-0)
debian/control (+1/-5)
debian/couchdb-bin.install (+0/-1)
debian/couchdb.upstart (+3/-2)
debian/rules (+3/-1)
etc/Makefile.in (+3/-0)
etc/couchdb/Makefile.am (+2/-0)
etc/couchdb/Makefile.in (+5/-0)
etc/couchdb/default.ini.tpl.in (+3/-0)
etc/couchdb/local.ini (+4/-0)
etc/default/Makefile.in (+3/-0)
etc/init/Makefile.in (+3/-0)
etc/launchd/Makefile.in (+3/-0)
etc/logrotate.d/Makefile.in (+3/-0)
etc/windows/Makefile.in (+3/-0)
license.skip (+23/-0)
m4/libtool.m4 (+208/-57)
m4/ltoptions.m4 (+17/-2)
m4/ltversion.m4 (+5/-5)
share/Makefile.am (+20/-1)
share/Makefile.in (+23/-1)
share/doc/Makefile.in (+3/-0)
share/doc/build/Makefile.am (+351/-56)
share/doc/build/Makefile.in (+354/-56)
share/doc/build/html/_sources/about.txt (+25/-0)
share/doc/build/html/_sources/api-basics.txt (+0/-463)
share/doc/build/html/_sources/api/authn.txt (+0/-41)
share/doc/build/html/_sources/api/basics.txt (+601/-0)
share/doc/build/html/_sources/api/configuration.txt (+0/-297)
share/doc/build/html/_sources/api/database.txt (+0/-1471)
share/doc/build/html/_sources/api/database/bulk-api.txt (+599/-0)
share/doc/build/html/_sources/api/database/changes.txt (+556/-0)
share/doc/build/html/_sources/api/database/common.txt (+423/-0)
share/doc/build/html/_sources/api/database/compact.txt (+239/-0)
share/doc/build/html/_sources/api/database/index.txt (+47/-0)
share/doc/build/html/_sources/api/database/misc.txt (+339/-0)
share/doc/build/html/_sources/api/database/security.txt (+180/-0)
share/doc/build/html/_sources/api/database/temp-views.txt (+78/-0)
share/doc/build/html/_sources/api/ddoc/common.txt (+216/-0)
share/doc/build/html/_sources/api/ddoc/index.txt (+37/-0)
share/doc/build/html/_sources/api/ddoc/render.txt (+380/-0)
share/doc/build/html/_sources/api/ddoc/rewrites.txt (+89/-0)
share/doc/build/html/_sources/api/ddoc/views.txt (+779/-0)
share/doc/build/html/_sources/api/design.txt (+0/-1264)
share/doc/build/html/_sources/api/document/attachments.txt (+314/-0)
share/doc/build/html/_sources/api/document/common.txt (+1178/-0)
share/doc/build/html/_sources/api/document/index.txt (+26/-0)
share/doc/build/html/_sources/api/documents.txt (+0/-973)
share/doc/build/html/_sources/api/index.txt (+42/-0)
share/doc/build/html/_sources/api/local.txt (+41/-130)
share/doc/build/html/_sources/api/misc.txt (+0/-867)
share/doc/build/html/_sources/api/reference.txt (+0/-42)
share/doc/build/html/_sources/api/server/authn.txt (+450/-0)
share/doc/build/html/_sources/api/server/common.txt (+1000/-0)
share/doc/build/html/_sources/api/server/configuration.txt (+332/-0)
share/doc/build/html/_sources/api/server/index.txt (+28/-0)
share/doc/build/html/_sources/changelog.txt (+0/-1489)
share/doc/build/html/_sources/changes.txt (+0/-227)
share/doc/build/html/_sources/config/auth.txt (+360/-0)
share/doc/build/html/_sources/config/compaction.txt (+174/-0)
share/doc/build/html/_sources/config/couchdb.txt (+200/-0)
share/doc/build/html/_sources/config/externals.txt (+179/-0)
share/doc/build/html/_sources/config/http-handlers.txt (+291/-0)
share/doc/build/html/_sources/config/http.txt (+593/-0)
share/doc/build/html/_sources/config/index.txt (+34/-0)
share/doc/build/html/_sources/config/intro.txt (+172/-0)
share/doc/build/html/_sources/config/logging.txt (+94/-0)
share/doc/build/html/_sources/config/misc.txt (+223/-0)
share/doc/build/html/_sources/config/proxying.txt (+98/-0)
share/doc/build/html/_sources/config/query-servers.txt (+161/-0)
share/doc/build/html/_sources/config/replicator.txt (+167/-0)
share/doc/build/html/_sources/config/services.txt (+150/-0)
share/doc/build/html/_sources/config_reference.txt (+0/-330)
share/doc/build/html/_sources/configuring.txt (+0/-629)
share/doc/build/html/_sources/contents.txt (+40/-0)
share/doc/build/html/_sources/couchapp/ddocs.txt (+759/-0)
share/doc/build/html/_sources/couchapp/index.txt (+31/-0)
share/doc/build/html/_sources/couchapp/views/collation.txt (+256/-0)
share/doc/build/html/_sources/couchapp/views/index.txt (+30/-0)
share/doc/build/html/_sources/couchapp/views/intro.txt (+675/-0)
share/doc/build/html/_sources/couchapp/views/joins.txt (+430/-0)
share/doc/build/html/_sources/couchapp/views/nosql.txt (+530/-0)
share/doc/build/html/_sources/couchapp/views/pagination.txt (+287/-0)
share/doc/build/html/_sources/cve/2010-0009.txt (+54/-0)
share/doc/build/html/_sources/cve/2010-2234.txt (+64/-0)
share/doc/build/html/_sources/cve/2010-3854.txt (+57/-0)
share/doc/build/html/_sources/cve/2012-5641.txt (+77/-0)
share/doc/build/html/_sources/cve/2012-5649.txt (+50/-0)
share/doc/build/html/_sources/cve/2012-5650.txt (+69/-0)
share/doc/build/html/_sources/cve/index.txt (+73/-0)
share/doc/build/html/_sources/ddocs.txt (+0/-751)
share/doc/build/html/_sources/experimental.txt (+83/-0)
share/doc/build/html/_sources/externals.txt (+261/-0)
share/doc/build/html/_sources/fauxton/addons.txt (+199/-0)
share/doc/build/html/_sources/fauxton/index.txt (+23/-0)
share/doc/build/html/_sources/fauxton/install.txt (+109/-0)
share/doc/build/html/_sources/index.txt (+0/-46)
share/doc/build/html/_sources/install/freebsd.txt (+80/-0)
share/doc/build/html/_sources/install/index.txt (+26/-0)
share/doc/build/html/_sources/install/mac.txt (+194/-0)
share/doc/build/html/_sources/install/unix.txt (+269/-0)
share/doc/build/html/_sources/install/windows.txt (+275/-0)
share/doc/build/html/_sources/intro.txt (+0/-309)
share/doc/build/html/_sources/intro/api.txt (+783/-0)
share/doc/build/html/_sources/intro/consistency.txt (+465/-0)
share/doc/build/html/_sources/intro/curl.txt (+122/-0)
share/doc/build/html/_sources/intro/futon.txt (+186/-0)
share/doc/build/html/_sources/intro/index.txt (+56/-0)
share/doc/build/html/_sources/intro/overview.txt (+387/-0)
share/doc/build/html/_sources/intro/security.txt (+525/-0)
share/doc/build/html/_sources/intro/tour.txt (+542/-0)
share/doc/build/html/_sources/intro/why.txt (+315/-0)
share/doc/build/html/_sources/json-structure.txt (+0/-189)
share/doc/build/html/_sources/maintenance/compaction.txt (+193/-0)
share/doc/build/html/_sources/maintenance/index.txt (+21/-0)
share/doc/build/html/_sources/maintenance/performance.txt (+293/-0)
share/doc/build/html/_sources/query-server/erlang.txt (+139/-0)
share/doc/build/html/_sources/query-server/index.txt (+40/-0)
share/doc/build/html/_sources/query-server/javascript.txt (+288/-0)
share/doc/build/html/_sources/query-server/protocol.txt (+967/-0)
share/doc/build/html/_sources/query-servers.txt (+0/-436)
share/doc/build/html/_sources/replication.txt (+0/-95)
share/doc/build/html/_sources/replication/conflicts.txt (+793/-0)
share/doc/build/html/_sources/replication/index.txt (+37/-0)
share/doc/build/html/_sources/replication/intro.txt (+95/-0)
share/doc/build/html/_sources/replication/protocol.txt (+202/-0)
share/doc/build/html/_sources/replication/replicator.txt (+383/-0)
share/doc/build/html/_sources/replicator.txt (+0/-383)
share/doc/build/html/_sources/whatsnew/0.10.txt (+150/-0)
share/doc/build/html/_sources/whatsnew/0.11.txt (+357/-0)
share/doc/build/html/_sources/whatsnew/0.8.txt (+178/-0)
share/doc/build/html/_sources/whatsnew/0.9.txt (+262/-0)
share/doc/build/html/_sources/whatsnew/1.0.txt (+277/-0)
share/doc/build/html/_sources/whatsnew/1.1.txt (+175/-0)
share/doc/build/html/_sources/whatsnew/1.2.txt (+242/-0)
share/doc/build/html/_sources/whatsnew/1.3.txt (+256/-0)
share/doc/build/html/_sources/whatsnew/1.4.txt (+61/-0)
share/doc/build/html/_sources/whatsnew/1.5.txt (+48/-0)
share/doc/build/html/_sources/whatsnew/index.txt (+32/-0)
share/doc/build/html/about.html (+404/-0)
share/doc/build/html/api-basics.html (+0/-556)
share/doc/build/html/api/authn.html (+0/-222)
share/doc/build/html/api/basics.html (+698/-0)
share/doc/build/html/api/configuration.html (+0/-467)
share/doc/build/html/api/database.html (+0/-1646)
share/doc/build/html/api/database/bulk-api.html (+820/-0)
share/doc/build/html/api/database/changes.html (+734/-0)
share/doc/build/html/api/database/common.html (+729/-0)
share/doc/build/html/api/database/compact.html (+550/-0)
share/doc/build/html/api/database/index.html (+260/-0)
share/doc/build/html/api/database/misc.html (+688/-0)
share/doc/build/html/api/database/security.html (+428/-0)
share/doc/build/html/api/database/temp-views.html (+260/-0)
share/doc/build/html/api/ddoc/common.html (+451/-0)
share/doc/build/html/api/ddoc/index.html (+240/-0)
share/doc/build/html/api/ddoc/render.html (+675/-0)
share/doc/build/html/api/ddoc/rewrites.html (+316/-0)
share/doc/build/html/api/ddoc/views.html (+938/-0)
share/doc/build/html/api/design.html (+0/-1384)
share/doc/build/html/api/document/attachments.html (+613/-0)
share/doc/build/html/api/document/common.html (+1450/-0)
share/doc/build/html/api/document/index.html (+234/-0)
share/doc/build/html/api/documents.html (+0/-1136)
share/doc/build/html/api/index.html (+277/-0)
share/doc/build/html/api/local.html (+93/-163)
share/doc/build/html/api/misc.html (+0/-1222)
share/doc/build/html/api/reference.html (+0/-273)
share/doc/build/html/api/server/authn.html (+653/-0)
share/doc/build/html/api/server/common.html (+1535/-0)
share/doc/build/html/api/server/configuration.html (+651/-0)
share/doc/build/html/api/server/index.html (+249/-0)
share/doc/build/html/changelog.html (+0/-2043)
share/doc/build/html/changes.html (+0/-414)
share/doc/build/html/config-ref.html (+1090/-0)
share/doc/build/html/config/auth.html (+550/-0)
share/doc/build/html/config/compaction.html (+374/-0)
share/doc/build/html/config/couchdb.html (+391/-0)
share/doc/build/html/config/externals.html (+357/-0)
share/doc/build/html/config/http-handlers.html (+497/-0)
share/doc/build/html/config/http.html (+803/-0)
share/doc/build/html/config/index.html (+277/-0)
share/doc/build/html/config/intro.html (+337/-0)
share/doc/build/html/config/logging.html (+287/-0)
share/doc/build/html/config/misc.html (+420/-0)
share/doc/build/html/config/proxying.html (+278/-0)
share/doc/build/html/config/query-servers.html (+352/-0)
share/doc/build/html/config/replicator.html (+373/-0)
share/doc/build/html/config/services.html (+354/-0)
share/doc/build/html/config_reference.html (+0/-743)
share/doc/build/html/configuring.html (+0/-682)
share/doc/build/html/contents.html (+705/-0)
share/doc/build/html/contributing.html (+324/-0)
share/doc/build/html/couchapp/ddocs.html (+1012/-0)
share/doc/build/html/couchapp/index.html (+224/-0)
share/doc/build/html/couchapp/views/collation.html (+424/-0)
share/doc/build/html/couchapp/views/index.html (+274/-0)
share/doc/build/html/couchapp/views/intro.html (+844/-0)
share/doc/build/html/couchapp/views/joins.html (+590/-0)
share/doc/build/html/couchapp/views/nosql.html (+643/-0)
share/doc/build/html/couchapp/views/pagination.html (+458/-0)
share/doc/build/html/cve/2010-0009.html (+251/-0)
share/doc/build/html/cve/2010-2234.html (+254/-0)
share/doc/build/html/cve/2010-3854.html (+249/-0)
share/doc/build/html/cve/2012-5641.html (+275/-0)
share/doc/build/html/cve/2012-5649.html (+247/-0)
share/doc/build/html/cve/2012-5650.html (+264/-0)
share/doc/build/html/cve/index.html (+250/-0)
share/doc/build/html/ddocs.html (+0/-976)
share/doc/build/html/download.html (+207/-0)
share/doc/build/html/experimental.html (+265/-0)
share/doc/build/html/externals.html (+427/-0)
share/doc/build/html/fauxton/addons.html (+376/-0)
share/doc/build/html/fauxton/index.html (+224/-0)
share/doc/build/html/fauxton/install.html (+279/-0)
share/doc/build/html/genindex.html (+0/-360)
share/doc/build/html/http-api.html (+706/-0)
share/doc/build/html/index.html (+213/-178)
share/doc/build/html/install/freebsd.html (+263/-0)
share/doc/build/html/install/index.html (+227/-0)
share/doc/build/html/install/mac.html (+348/-0)
share/doc/build/html/install/unix.html (+417/-0)
share/doc/build/html/install/windows.html (+419/-0)
share/doc/build/html/intro.html (+0/-423)
share/doc/build/html/intro/api.html (+832/-0)
share/doc/build/html/intro/consistency.html (+562/-0)
share/doc/build/html/intro/curl.html (+290/-0)
share/doc/build/html/intro/futon.html (+345/-0)
share/doc/build/html/intro/index.html (+280/-0)
share/doc/build/html/intro/overview.html (+530/-0)
share/doc/build/html/intro/security.html (+637/-0)
share/doc/build/html/intro/tour.html (+614/-0)
share/doc/build/html/intro/why.html (+455/-0)
share/doc/build/html/json-structure.html (+96/-224)
share/doc/build/html/maintenance/compaction.html (+355/-0)
share/doc/build/html/maintenance/index.html (+241/-0)
share/doc/build/html/maintenance/performance.html (+457/-0)
share/doc/build/html/query-server/erlang.html (+349/-0)
share/doc/build/html/query-server/index.html (+231/-0)
share/doc/build/html/query-server/javascript.html (+598/-0)
share/doc/build/html/query-server/protocol.html (+1227/-0)
share/doc/build/html/query-servers.html (+0/-739)
share/doc/build/html/replication.html (+0/-247)
share/doc/build/html/replication/conflicts.html (+907/-0)
share/doc/build/html/replication/index.html (+253/-0)
share/doc/build/html/replication/intro.html (+277/-0)
share/doc/build/html/replication/protocol.html (+378/-0)
share/doc/build/html/replication/replicator.html (+533/-0)
share/doc/build/html/replicator.html (+0/-503)
share/doc/build/html/search.html (+35/-12)
share/doc/build/html/searchindex.js (+1/-1)
share/doc/build/html/whatsnew/0.10.html (+362/-0)
share/doc/build/html/whatsnew/0.11.html (+600/-0)
share/doc/build/html/whatsnew/0.8.html (+391/-0)
share/doc/build/html/whatsnew/0.9.html (+486/-0)
share/doc/build/html/whatsnew/1.0.html (+532/-0)
share/doc/build/html/whatsnew/1.1.html (+397/-0)
share/doc/build/html/whatsnew/1.2.html (+470/-0)
share/doc/build/html/whatsnew/1.3.html (+479/-0)
share/doc/build/html/whatsnew/1.4.html (+247/-0)
share/doc/build/html/whatsnew/1.5.html (+240/-0)
share/doc/build/html/whatsnew/index.html (+483/-0)
share/doc/build/texinfo/CouchDB.info (+30987/-9999)
share/doc/ext/configdomain.py (+127/-0)
share/doc/ext/github.py (+44/-0)
share/doc/ext/http-api-descr.json (+79/-0)
share/doc/ext/httpdomain.py (+650/-0)
share/doc/src/about.rst (+25/-0)
share/doc/src/api-basics.rst (+0/-463)
share/doc/src/api/authn.rst (+0/-41)
share/doc/src/api/basics.rst (+601/-0)
share/doc/src/api/configuration.rst (+0/-297)
share/doc/src/api/database.rst (+0/-1471)
share/doc/src/api/database/bulk-api.rst (+599/-0)
share/doc/src/api/database/changes.rst (+556/-0)
share/doc/src/api/database/common.rst (+423/-0)
share/doc/src/api/database/compact.rst (+239/-0)
share/doc/src/api/database/index.rst (+47/-0)
share/doc/src/api/database/misc.rst (+339/-0)
share/doc/src/api/database/security.rst (+180/-0)
share/doc/src/api/database/temp-views.rst (+78/-0)
share/doc/src/api/ddoc/common.rst (+216/-0)
share/doc/src/api/ddoc/index.rst (+37/-0)
share/doc/src/api/ddoc/render.rst (+380/-0)
share/doc/src/api/ddoc/rewrites.rst (+89/-0)
share/doc/src/api/ddoc/views.rst (+779/-0)
share/doc/src/api/design.rst (+0/-1264)
share/doc/src/api/document/attachments.rst (+314/-0)
share/doc/src/api/document/common.rst (+1178/-0)
share/doc/src/api/document/index.rst (+26/-0)
share/doc/src/api/documents.rst (+0/-973)
share/doc/src/api/index.rst (+42/-0)
share/doc/src/api/local.rst (+41/-130)
share/doc/src/api/misc.rst (+0/-867)
share/doc/src/api/reference.rst (+0/-42)
share/doc/src/api/server/authn.rst (+450/-0)
share/doc/src/api/server/common.rst (+1000/-0)
share/doc/src/api/server/configuration.rst (+332/-0)
share/doc/src/api/server/index.rst (+28/-0)
share/doc/src/changelog.rst (+0/-1489)
share/doc/src/changes.rst (+0/-227)
share/doc/src/conf.py (+80/-19)
share/doc/src/config/auth.rst (+360/-0)
share/doc/src/config/compaction.rst (+174/-0)
share/doc/src/config/couchdb.rst (+200/-0)
share/doc/src/config/externals.rst (+179/-0)
share/doc/src/config/http-handlers.rst (+291/-0)
share/doc/src/config/http.rst (+593/-0)
share/doc/src/config/index.rst (+34/-0)
share/doc/src/config/intro.rst (+172/-0)
share/doc/src/config/logging.rst (+94/-0)
share/doc/src/config/misc.rst (+223/-0)
share/doc/src/config/proxying.rst (+98/-0)
share/doc/src/config/query-servers.rst (+161/-0)
share/doc/src/config/replicator.rst (+167/-0)
share/doc/src/config/services.rst (+150/-0)
share/doc/src/config_reference.rst (+0/-330)
share/doc/src/configuring.rst (+0/-629)
share/doc/src/contents.rst (+40/-0)
share/doc/src/couchapp/ddocs.rst (+759/-0)
share/doc/src/couchapp/index.rst (+31/-0)
share/doc/src/couchapp/views/collation.rst (+256/-0)
share/doc/src/couchapp/views/index.rst (+30/-0)
share/doc/src/couchapp/views/intro.rst (+675/-0)
share/doc/src/couchapp/views/joins.rst (+430/-0)
share/doc/src/couchapp/views/nosql.rst (+530/-0)
share/doc/src/couchapp/views/pagination.rst (+287/-0)
share/doc/src/cve/2010-0009.rst (+54/-0)
share/doc/src/cve/2010-2234.rst (+64/-0)
share/doc/src/cve/2010-3854.rst (+57/-0)
share/doc/src/cve/2012-5641.rst (+77/-0)
share/doc/src/cve/2012-5649.rst (+50/-0)
share/doc/src/cve/2012-5650.rst (+69/-0)
share/doc/src/cve/index.rst (+73/-0)
share/doc/src/ddocs.rst (+0/-751)
share/doc/src/experimental.rst (+83/-0)
share/doc/src/externals.rst (+261/-0)
share/doc/src/fauxton/addons.rst (+199/-0)
share/doc/src/fauxton/index.rst (+23/-0)
share/doc/src/fauxton/install.rst (+109/-0)
share/doc/src/index.rst (+0/-46)
share/doc/src/install/freebsd.rst (+80/-0)
share/doc/src/install/index.rst (+26/-0)
share/doc/src/install/mac.rst (+194/-0)
share/doc/src/install/unix.rst (+269/-0)
share/doc/src/install/windows.rst (+275/-0)
share/doc/src/intro.rst (+0/-309)
share/doc/src/intro/api.rst (+783/-0)
share/doc/src/intro/consistency.rst (+465/-0)
share/doc/src/intro/curl.rst (+122/-0)
share/doc/src/intro/futon.rst (+186/-0)
share/doc/src/intro/index.rst (+56/-0)
share/doc/src/intro/overview.rst (+387/-0)
share/doc/src/intro/security.rst (+525/-0)
share/doc/src/intro/tour.rst (+542/-0)
share/doc/src/intro/why.rst (+315/-0)
share/doc/src/json-structure.rst (+0/-189)
share/doc/src/maintenance/compaction.rst (+193/-0)
share/doc/src/maintenance/index.rst (+21/-0)
share/doc/src/maintenance/performance.rst (+293/-0)
share/doc/src/query-server/erlang.rst (+139/-0)
share/doc/src/query-server/index.rst (+40/-0)
share/doc/src/query-server/javascript.rst (+288/-0)
share/doc/src/query-server/protocol.rst (+967/-0)
share/doc/src/query-servers.rst (+0/-436)
share/doc/src/replication.rst (+0/-95)
share/doc/src/replication/conflicts.rst (+793/-0)
share/doc/src/replication/index.rst (+37/-0)
share/doc/src/replication/intro.rst (+95/-0)
share/doc/src/replication/protocol.rst (+202/-0)
share/doc/src/replication/replicator.rst (+383/-0)
share/doc/src/replicator.rst (+0/-383)
share/doc/src/whatsnew/0.10.rst (+150/-0)
share/doc/src/whatsnew/0.11.rst (+357/-0)
share/doc/src/whatsnew/0.8.rst (+178/-0)
share/doc/src/whatsnew/0.9.rst (+262/-0)
share/doc/src/whatsnew/1.0.rst (+277/-0)
share/doc/src/whatsnew/1.1.rst (+175/-0)
share/doc/src/whatsnew/1.2.rst (+242/-0)
share/doc/src/whatsnew/1.3.rst (+256/-0)
share/doc/src/whatsnew/1.4.rst (+61/-0)
share/doc/src/whatsnew/1.5.rst (+48/-0)
share/doc/src/whatsnew/index.rst (+32/-0)
share/doc/templates/couchdb/domainindex.html (+49/-0)
share/doc/templates/couchdb/theme.conf (+13/-0)
share/doc/templates/help.html (+9/-0)
share/doc/templates/layout.html (+27/-0)
share/doc/templates/pages/download.html (+48/-0)
share/doc/templates/pages/index.html (+175/-0)
share/www/_sidebar.html (+2/-1)
share/www/fauxton/css/index.css (+37/-0)
share/www/fauxton/img/fontawesome-webfont.svg (+399/-0)
share/www/fauxton/img/fontcustom_fauxton.svg (+200/-0)
share/www/fauxton/index.html (+45/-0)
share/www/fauxton/js/require.js (+27/-0)
share/www/plugins.html (+121/-0)
share/www/script/couch_tests.js (+0/-1)
share/www/script/test/list_views.js (+1/-25)
share/www/script/test/show_documents.js (+0/-42)
share/www/script/test/update_documents.js (+3/-28)
share/www/script/test/users_db_security.js (+9/-2)
share/www/script/test/view_xml.js (+0/-39)
src/Makefile.am (+270/-1)
src/Makefile.in (+273/-1)
src/couch_dbupdates/Makefile.in (+3/-0)
src/couch_index/Makefile.in (+3/-0)
src/couch_mrview/Makefile.in (+3/-0)
src/couch_mrview/src/couch_mrview_http.erl (+24/-8)
src/couch_plugins/Makefile.am (+40/-0)
src/couch_plugins/Makefile.in (+529/-0)
src/couch_plugins/README.md (+186/-0)
src/couch_plugins/src/couch_plugins.app.src (+23/-0)
src/couch_plugins/src/couch_plugins.erl (+340/-0)
src/couch_plugins/src/couch_plugins_httpd.erl (+65/-0)
src/couch_replicator/Makefile.in (+3/-0)
src/couch_replicator/src/couch_replicator_api_wrap.erl (+132/-35)
src/couch_replicator/src/couch_replicator_worker.erl (+2/-2)
src/couchdb/Makefile.in (+3/-0)
src/couchdb/couch_config.erl (+1/-1)
src/couchdb/couch_httpd.erl (+3/-2)
src/couchdb/couch_secondary_sup.erl (+8/-1)
src/couchdb/couch_server.erl (+6/-1)
src/couchdb/priv/Makefile.in (+3/-0)
src/couchdb/priv/couch_js/utf8.c (+19/-16)
src/couchdb/priv/couchjs.1 (+1/-1)
src/couchjs-node/Makefile.am (+24/-0)
src/couchjs-node/Makefile.in (+460/-0)
src/couchjs-node/README.md (+32/-0)
src/couchjs-node/cli.js (+89/-0)
src/couchjs-node/console.js (+66/-0)
src/couchjs-node/couchdb.js (+29/-0)
src/couchjs-node/couchjs.js (+133/-0)
src/couchjs-node/inspector.js (+101/-0)
src/couchjs-node/package.json (+40/-0)
src/couchjs-node/sandbox.js (+47/-0)
src/couchjs-node/stream.js (+115/-0)
src/couchjs-node/test/experiment.js (+125/-0)
src/couchjs-node/xml.js (+22/-0)
src/ejson/Makefile.in (+3/-0)
src/erlang-oauth/Makefile.in (+3/-0)
src/etap/Makefile.in (+3/-0)
src/fauxton/Gruntfile.js (+423/-0)
src/fauxton/TODO.md (+26/-0)
src/fauxton/app/addons/activetasks/assets/less/activetasks.less (+6/-0)
src/fauxton/app/addons/activetasks/base.js (+26/-0)
src/fauxton/app/addons/activetasks/resources.js (+108/-0)
src/fauxton/app/addons/activetasks/routes.js (+58/-0)
src/fauxton/app/addons/activetasks/templates/detail.html (+21/-0)
src/fauxton/app/addons/activetasks/templates/table.html (+52/-0)
src/fauxton/app/addons/activetasks/templates/tabledetail.html (+36/-0)
src/fauxton/app/addons/activetasks/templates/tabs.html (+46/-0)
src/fauxton/app/addons/activetasks/tests/viewsSpec.js (+139/-0)
src/fauxton/app/addons/activetasks/views.js (+181/-0)
src/fauxton/app/addons/auth/assets/less/auth.less (+4/-0)
src/fauxton/app/addons/auth/base.js (+69/-0)
src/fauxton/app/addons/auth/resources.js (+363/-0)
src/fauxton/app/addons/auth/routes.js (+93/-0)
src/fauxton/app/addons/auth/templates/change_password.html (+26/-0)
src/fauxton/app/addons/auth/templates/create_admin.html (+37/-0)
src/fauxton/app/addons/auth/templates/login.html (+26/-0)
src/fauxton/app/addons/auth/templates/nav_dropdown.html (+26/-0)
src/fauxton/app/addons/auth/templates/nav_link_title.html (+22/-0)
src/fauxton/app/addons/auth/templates/noAccess.html (+20/-0)
src/fauxton/app/addons/config/base.js (+28/-0)
src/fauxton/app/addons/config/resources.js (+175/-0)
src/fauxton/app/addons/config/routes.js (+59/-0)
src/fauxton/app/addons/config/templates/dashboard.html (+52/-0)
src/fauxton/app/addons/config/templates/item.html (+31/-0)
src/fauxton/app/addons/contribute/base.js (+33/-0)
src/fauxton/app/addons/exampleAuth/base.js (+59/-0)
src/fauxton/app/addons/exampleAuth/templates/noAccess.html (+19/-0)
src/fauxton/app/addons/logs/base.js (+28/-0)
src/fauxton/app/addons/logs/resources.js (+223/-0)
src/fauxton/app/addons/logs/routes.js (+58/-0)
src/fauxton/app/addons/logs/templates/dashboard.html (+46/-0)
src/fauxton/app/addons/logs/templates/filterItem.html (+16/-0)
src/fauxton/app/addons/logs/templates/sidebar.html (+27/-0)
src/fauxton/app/addons/logs/tests/logSpec.js (+38/-0)
src/fauxton/app/addons/permissions/assets/less/permissions.less (+32/-0)
src/fauxton/app/addons/permissions/base.js (+25/-0)
src/fauxton/app/addons/permissions/resources.js (+70/-0)
src/fauxton/app/addons/permissions/routes.js (+64/-0)
src/fauxton/app/addons/permissions/templates/item.html (+17/-0)
src/fauxton/app/addons/permissions/templates/permissions.html (+15/-0)
src/fauxton/app/addons/permissions/templates/section.html (+46/-0)
src/fauxton/app/addons/permissions/tests/resourceSpec.js (+51/-0)
src/fauxton/app/addons/permissions/tests/viewsSpec.js (+159/-0)
src/fauxton/app/addons/permissions/views.js (+200/-0)
src/fauxton/app/addons/plugins/base.js (+24/-0)
src/fauxton/app/addons/plugins/resources.js (+26/-0)
src/fauxton/app/addons/plugins/routes.js (+47/-0)
src/fauxton/app/addons/plugins/templates/plugins.html (+102/-0)
src/fauxton/app/addons/replication/assets/less/replication.less (+196/-0)
src/fauxton/app/addons/replication/base.js (+24/-0)
src/fauxton/app/addons/replication/resources.js (+68/-0)
src/fauxton/app/addons/replication/route.js (+49/-0)
src/fauxton/app/addons/replication/templates/form.html (+74/-0)
src/fauxton/app/addons/replication/templates/progress.html (+22/-0)
src/fauxton/app/addons/replication/tests/replicationSpec.js (+28/-0)
src/fauxton/app/addons/replication/views.js (+295/-0)
src/fauxton/app/addons/stats/assets/less/stats.less (+20/-0)
src/fauxton/app/addons/stats/base.js (+26/-0)
src/fauxton/app/addons/stats/resources.js (+37/-0)
src/fauxton/app/addons/stats/routes.js (+61/-0)
src/fauxton/app/addons/stats/templates/by_method.html (+16/-0)
src/fauxton/app/addons/stats/templates/pie_table.html (+56/-0)
src/fauxton/app/addons/stats/templates/stats.html (+16/-0)
src/fauxton/app/addons/stats/templates/statselect.html (+22/-0)
src/fauxton/app/addons/stats/views.js (+171/-0)
src/fauxton/app/api.js (+453/-0)
src/fauxton/app/app.js (+81/-0)
src/fauxton/app/config.js (+62/-0)
src/fauxton/app/helpers.js (+72/-0)
src/fauxton/app/initialize.js (+65/-0)
src/fauxton/app/load_addons.js.underscore (+27/-0)
src/fauxton/app/main.js (+38/-0)
src/fauxton/app/mixins.js (+56/-0)
src/fauxton/app/modules/databases/base.js (+36/-0)
src/fauxton/app/modules/databases/resources.js (+157/-0)
src/fauxton/app/modules/databases/routes.js (+82/-0)
src/fauxton/app/modules/databases/views.js (+225/-0)
src/fauxton/app/modules/documents/base.js (+24/-0)
src/fauxton/app/modules/documents/resources.js (+546/-0)
src/fauxton/app/modules/documents/routes.js (+399/-0)
src/fauxton/app/modules/documents/tests/resourcesSpec.js (+84/-0)
src/fauxton/app/modules/documents/views.js (+1560/-0)
src/fauxton/app/modules/fauxton/base.js (+265/-0)
src/fauxton/app/modules/fauxton/components.js (+173/-0)
src/fauxton/app/modules/fauxton/layout.js (+98/-0)
src/fauxton/app/modules/pouchdb/base.js (+60/-0)
src/fauxton/app/modules/pouchdb/pouch.collate.js (+115/-0)
src/fauxton/app/modules/pouchdb/pouchdb.mapreduce.js (+324/-0)
src/fauxton/app/resizeColumns.js (+87/-0)
src/fauxton/app/router.js (+150/-0)
src/fauxton/app/templates/databases/item.html (+23/-0)
src/fauxton/app/templates/databases/list.html (+34/-0)
src/fauxton/app/templates/databases/newdatabase.html (+17/-0)
src/fauxton/app/templates/databases/sidebar.html (+31/-0)
src/fauxton/app/templates/documents/all_docs_item.html (+26/-0)
src/fauxton/app/templates/documents/all_docs_list.html (+50/-0)
src/fauxton/app/templates/documents/changes.html (+38/-0)
src/fauxton/app/templates/documents/ddoc_info.html (+28/-0)
src/fauxton/app/templates/documents/doc.html (+50/-0)
src/fauxton/app/templates/documents/doc_field_editor.html (+74/-0)
src/fauxton/app/templates/documents/doc_field_editor_tabs.html (+19/-0)
src/fauxton/app/templates/documents/duplicate_doc_modal.html (+36/-0)
src/fauxton/app/templates/documents/edit_tools.html (+44/-0)
src/fauxton/app/templates/documents/index_menu_item.html (+17/-0)
src/fauxton/app/templates/documents/index_row_docular.html (+26/-0)
src/fauxton/app/templates/documents/index_row_tabular.html (+25/-0)
src/fauxton/app/templates/documents/jumpdoc.html (+20/-0)
src/fauxton/app/templates/documents/search.html (+15/-0)
src/fauxton/app/templates/documents/sidebar.html (+65/-0)
src/fauxton/app/templates/documents/tabs.html (+39/-0)
src/fauxton/app/templates/documents/upload_modal.html (+42/-0)
src/fauxton/app/templates/documents/view_editor.html (+187/-0)
src/fauxton/app/templates/fauxton/api_bar.html (+30/-0)
src/fauxton/app/templates/fauxton/breadcrumbs.html (+24/-0)
src/fauxton/app/templates/fauxton/footer.html (+15/-0)
src/fauxton/app/templates/fauxton/index_pagination.html (+24/-0)
src/fauxton/app/templates/fauxton/nav_bar.html (+67/-0)
src/fauxton/app/templates/fauxton/notification.html (+18/-0)
src/fauxton/app/templates/fauxton/pagination.html (+31/-0)
src/fauxton/app/templates/layouts/login_pane.html (+17/-0)
src/fauxton/app/templates/layouts/one_pane.html (+28/-0)
src/fauxton/app/templates/layouts/two_pane.html (+30/-0)
src/fauxton/app/templates/layouts/with_right_sidebar.html (+26/-0)
src/fauxton/app/templates/layouts/with_sidebar.html (+27/-0)
src/fauxton/app/templates/layouts/with_tabs.html (+28/-0)
src/fauxton/app/templates/layouts/with_tabs_sidebar.html (+41/-0)
src/fauxton/assets/css/codemirror.css (+176/-0)
src/fauxton/assets/css/nv.d3.css (+656/-0)
src/fauxton/assets/img/fontawesome-webfont.svg (+399/-0)
src/fauxton/assets/img/fontcustom_fauxton.svg (+200/-0)
src/fauxton/assets/index.underscore (+47/-0)
src/fauxton/assets/js/libs/almond.js (+314/-0)
src/fauxton/assets/js/libs/backbone.js (+1571/-0)
src/fauxton/assets/js/libs/bootstrap.js (+2291/-0)
src/fauxton/assets/js/libs/codemirror.js (+3193/-0)
src/fauxton/assets/js/libs/d3.js (+7026/-0)
src/fauxton/assets/js/libs/jquery.js (+9789/-0)
src/fauxton/assets/js/libs/jshint.js (+4529/-0)
src/fauxton/assets/js/libs/lodash.js (+4493/-0)
src/fauxton/assets/js/libs/nv.d3.js (+13119/-0)
src/fauxton/assets/js/libs/require.js (+2045/-0)
src/fauxton/assets/js/libs/spin.min.js (+1/-0)
src/fauxton/assets/js/plugins/backbone.layoutmanager.js (+996/-0)
src/fauxton/assets/js/plugins/codemirror-javascript.js (+361/-0)
src/fauxton/assets/js/plugins/jquery.form.js (+1190/-0)
src/fauxton/assets/js/plugins/prettify.js (+28/-0)
src/fauxton/assets/less/bootstrap/accordion.less (+34/-0)
src/fauxton/assets/less/bootstrap/alerts.less (+79/-0)
src/fauxton/assets/less/bootstrap/bootstrap.less (+63/-0)
src/fauxton/assets/less/bootstrap/breadcrumbs.less (+24/-0)
src/fauxton/assets/less/bootstrap/button-groups.less (+229/-0)
src/fauxton/assets/less/bootstrap/buttons.less (+228/-0)
src/fauxton/assets/less/bootstrap/carousel.less (+158/-0)
src/fauxton/assets/less/bootstrap/close.less (+32/-0)
src/fauxton/assets/less/bootstrap/code.less (+61/-0)
src/fauxton/assets/less/bootstrap/component-animations.less (+22/-0)
src/fauxton/assets/less/bootstrap/dropdowns.less (+248/-0)
src/fauxton/assets/less/bootstrap/font-awesome/bootstrap.less (+84/-0)
src/fauxton/assets/less/bootstrap/font-awesome/core.less (+129/-0)
src/fauxton/assets/less/bootstrap/font-awesome/extras.less (+93/-0)
src/fauxton/assets/less/bootstrap/font-awesome/font-awesome-ie7.less (+1953/-0)
src/fauxton/assets/less/bootstrap/font-awesome/font-awesome.less (+33/-0)
src/fauxton/assets/less/bootstrap/font-awesome/icons.less (+381/-0)
src/fauxton/assets/less/bootstrap/font-awesome/mixins.less (+48/-0)
src/fauxton/assets/less/bootstrap/font-awesome/path.less (+14/-0)
src/fauxton/assets/less/bootstrap/font-awesome/variables.less (+735/-0)
src/fauxton/assets/less/bootstrap/forms.less (+690/-0)
src/fauxton/assets/less/bootstrap/grid.less (+21/-0)
src/fauxton/assets/less/bootstrap/hero-unit.less (+25/-0)
src/fauxton/assets/less/bootstrap/labels-badges.less (+84/-0)
src/fauxton/assets/less/bootstrap/layouts.less (+16/-0)
src/fauxton/assets/less/bootstrap/media.less (+55/-0)
src/fauxton/assets/less/bootstrap/mixins.less (+716/-0)
src/fauxton/assets/less/bootstrap/modals.less (+95/-0)
src/fauxton/assets/less/bootstrap/navbar.less (+497/-0)
src/fauxton/assets/less/bootstrap/navs.less (+409/-0)
src/fauxton/assets/less/bootstrap/pager.less (+43/-0)
src/fauxton/assets/less/bootstrap/pagination.less (+123/-0)
src/fauxton/assets/less/bootstrap/popovers.less (+133/-0)
src/fauxton/assets/less/bootstrap/progress-bars.less (+122/-0)
src/fauxton/assets/less/bootstrap/reset.less (+216/-0)
src/fauxton/assets/less/bootstrap/responsive-1200px-min.less (+28/-0)
src/fauxton/assets/less/bootstrap/responsive-767px-max.less (+193/-0)
src/fauxton/assets/less/bootstrap/responsive-768px-979px.less (+19/-0)
src/fauxton/assets/less/bootstrap/responsive-navbar.less (+189/-0)
src/fauxton/assets/less/bootstrap/responsive-utilities.less (+59/-0)
src/fauxton/assets/less/bootstrap/responsive.less (+48/-0)
src/fauxton/assets/less/bootstrap/scaffolding.less (+53/-0)
src/fauxton/assets/less/bootstrap/sprites.less (+197/-0)
src/fauxton/assets/less/bootstrap/tables.less (+244/-0)
src/fauxton/assets/less/bootstrap/tests/buttons.html (+139/-0)
src/fauxton/assets/less/bootstrap/tests/css-tests.css (+150/-0)
src/fauxton/assets/less/bootstrap/thumbnails.less (+53/-0)
src/fauxton/assets/less/bootstrap/tooltip.less (+70/-0)
src/fauxton/assets/less/bootstrap/type.less (+247/-0)
src/fauxton/assets/less/bootstrap/utilities.less (+30/-0)
src/fauxton/assets/less/bootstrap/variables.less (+301/-0)
src/fauxton/assets/less/bootstrap/wells.less (+29/-0)
src/fauxton/assets/less/config.less (+46/-0)
src/fauxton/assets/less/couchdb.less (+72/-0)
src/fauxton/assets/less/database.less (+238/-0)
src/fauxton/assets/less/fauxton.less (+982/-0)
src/fauxton/assets/less/icons.less (+99/-0)
src/fauxton/assets/less/logs.less (+24/-0)
src/fauxton/assets/less/prettyprint.less (+46/-0)
src/fauxton/assets/less/variables.less (+82/-0)
src/fauxton/bin/grunt (+18/-0)
src/fauxton/couchapp.js (+27/-0)
src/fauxton/index.html (+53/-0)
src/fauxton/package.json (+48/-0)
src/fauxton/readme.md (+69/-0)
src/fauxton/settings.json.default (+43/-0)
src/fauxton/settings.json.sample_external (+10/-0)
src/fauxton/tasks/addon/rename.json (+5/-0)
src/fauxton/tasks/addon/root/base.js.underscore (+21/-0)
src/fauxton/tasks/addon/root/resources.js.underscore (+21/-0)
src/fauxton/tasks/addon/root/routes.js.underscore (+21/-0)
src/fauxton/tasks/addon/template.js (+70/-0)
src/fauxton/tasks/couchserver.js (+102/-0)
src/fauxton/tasks/fauxton.js (+117/-0)
src/fauxton/tasks/helper.js (+45/-0)
src/fauxton/test/core/layoutSpec.js (+94/-0)
src/fauxton/test/core/navbarSpec.js (+107/-0)
src/fauxton/test/core/paginateSpec.js (+107/-0)
src/fauxton/test/core/routeObjectSpec.js (+102/-0)
src/fauxton/test/mocha/chai.js (+4330/-0)
src/fauxton/test/mocha/mocha.css (+251/-0)
src/fauxton/test/mocha/mocha.js (+5428/-0)
src/fauxton/test/mocha/sinon-chai.js (+109/-0)
src/fauxton/test/mocha/sinon.js (+4290/-0)
src/fauxton/test/mocha/testUtils.js (+50/-0)
src/fauxton/test/runner.html (+18/-0)
src/fauxton/test/test.config.underscore (+15/-0)
src/fauxton/writing_addons.md (+173/-0)
src/ibrowse/Makefile.in (+3/-0)
src/mochiweb/Makefile.in (+3/-0)
src/my-first-couchdb-plugin/.gitignore (+1/-0)
src/my-first-couchdb-plugin/Makefile (+38/-0)
src/my-first-couchdb-plugin/README.md (+196/-0)
src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src (+21/-0)
src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl (+18/-0)
src/my-first-couchdb-plugin/test/my_first_couchdb_plugin_tests.erl (+15/-0)
src/snappy/Makefile.in (+3/-0)
test/Makefile.in (+3/-0)
test/bench/Makefile.in (+3/-0)
test/etap/Makefile.in (+3/-0)
test/javascript/Makefile.in (+3/-0)
test/javascript/run.tpl (+10/-5)
test/view_server/Makefile.in (+3/-0)
utils/Makefile.am (+1/-0)
utils/Makefile.in (+4/-0)
var/Makefile.in (+3/-0)
To merge this branch: bzr merge lp:~jderose/ubuntu/trusty/couchdb/1.5.0
Reviewer Review Type Date Requested Status
Iain Lane 2013-11-30 Approve on 2014-01-14
Dave Cottlehuber (community) Approve on 2013-12-31
Jason Gerard DeRose (community) Resubmit on 2013-12-02
Review via email: mp+197291@code.launchpad.net

Description of the change

For background, please see this bug:
https://bugs.launchpad.net/ubuntu/+source/couchdb/+bug/1254371

Currently CouchDB 1.4.0 wont build on Trusty (same is true with CouchDB 1.5.0 on Trusty). The fix is to add a Build-Depends on `install-info`. Somehow this was getting pulled in on Raring (perhaps because `build-essential` depended on it), but isn't on Trusty.

However, after reviewing the actual content in the `couchdb` info page, I think it's best to neither build nor install this info page as it has the exact same content as the `couchdb` man page.

To aid the review, here's the result of `bzr diff debian/ -r 73..`:

=== modified file 'debian/changelog'
--- debian/changelog 2013-08-28 16:28:32 +0000
+++ debian/changelog 2013-11-30 20:52:48 +0000
@@ -1,3 +1,17 @@
+couchdb (1.5.0-0ubuntu1) trusty; urgency=low
+
+ * New upstream release (LP: #1254371)
+ * Don't include `couchdb` info page in `couchdb-bin` binary package as it
+ provides no meaningful benefit over the `couchdb` man page (note this change
+ means we don't need to add a Build-Depends on `install-info` for Trusty)
+ * Remove Build-Depends: texlive-latex-base, texlive-latex-recommended,
+ texlive-latex-extra, texlive-fonts-recommended, texinfo (as documentation
+ thus produced doesn't get included in binary the packages anyway)
+ * debian/rules: don't call ./configure with --enable-strictness as we dropped
+ Build-Depends on `texlive-*`, `texinfo`, plus didn't add `install-info`
+
+ -- Jason Gerard DeRose <email address hidden> Sat, 30 Nov 2013 13:52:40 -0700
+
 couchdb (1.4.0-0ubuntu1) saucy; urgency=low

   * New upstream release (LP: #1212481)

=== modified file 'debian/control'
--- debian/control 2013-08-28 16:28:32 +0000
+++ debian/control 2013-11-24 20:37:16 +0000
@@ -17,11 +17,6 @@
                libicu-dev,
                libmozjs185-dev,
                python-sphinx (>= 1.1.3),
- texlive-latex-base,
- texlive-latex-recommended,
- texlive-latex-extra,
- texlive-fonts-recommended,
- texinfo,
 Homepage: http://couchdb.apache.org/

 Package: couchdb-common

=== modified file 'debian/couchdb-bin.install'
--- debian/couchdb-bin.install 2013-08-28 16:28:32 +0000
+++ debian/couchdb-bin.install 2013-11-24 03:49:29 +0000
@@ -1,6 +1,5 @@
 debian/tmp/usr/bin
 debian/tmp/usr/lib
 debian/tmp/usr/share/man
-debian/tmp/usr/share/info
 debian/tmp/etc/couchdb/default.ini
 debian/tmp/etc/couchdb/default.d

=== modified file 'debian/rules'
--- debian/rules 2013-08-28 16:28:32 +0000
+++ debian/rules 2013-11-24 20:36:04 +0000
@@ -4,7 +4,7 @@
  dh $@

 override_dh_auto_configure:
- dh_auto_configure -- --enable-strictness --disable-init
+ dh_auto_configure -- --disable-init

 override_dh_auto_install:
  dh_auto_install

To post a comment you must log in.
83. By Jason Gerard DeRose on 2013-11-30

Fix debian/changelog typo: 'binary the packages' => 'the binary packages'

Dave Cottlehuber (skunkwerks) wrote :

LGTM overall, will take a while to digest details.

The official tarball (which I assume the upstream debian package is built from) has documentation and manpages etc prebuilt.

This means none of the python, texlive*, texinfo packages are needed either at build (nor at runtime).

I'll put a couple further actionable comments into separate review below.

Dave Cottlehuber (skunkwerks) wrote :

Please add vendor information into default.ini.

See my comment on https://code.launchpad.net/~yolanda.robla/ubuntu/trusty/couchdb/add_distribution/+merge/195788, included here for simplicity:

Great idea -- luckily CouchDB already provides functionality to do this without needing an erlang patch;

You should use the dict `vendor` option and store this in the default.ini file. There are name and version files specifically for that.

# $SOURCE/etc/couchdb/default.ini.tpl.in
[vendor]
name = Ubuntu
version = Trusty 14.04

Obviously you have a better idea of what these fields should be than me.

You should get something like this back after installing CouchDB:

GET / HTTP/1.1
Accept: application/json
Accept-Encoding: gzip, deflate, compress
Content-Type: application/json; charset=utf-8
Host: localhost:5984
User-Agent: HTTPie/0.8.0-dev

HTTP/1.1 200 OK
Cache-Control: must-revalidate
Content-Length: 145
Content-Type: application/json
Date: Sat, 30 Nov 2013 21:14:03 GMT
Server: CouchDB/1.5.0 (Erlang OTP/R16B02)

{
    "couchdb": "Welcome",
    "version": "1.5.0"
    "uuid": "24ca0e5e74a4e40356e498dcfb0575b1",
    "vendor": {
        "name": "Ubuntu",
        "version": "Trusty-14.04"
    },
}

The UUID entry is unique per couchdb installation, its shown here for completeness but shouldn't be part of the ubuntu package.

A gentle reminder to all reviewers, Apache CouchDB would love to hear more from downstream / packaging teams. We're here to help you help us!

review: Needs Fixing
Dave Cottlehuber (skunkwerks) wrote :

I put together an upstart script recently for couchdb; I found this:

    start on started networking and filesystem

was the thing that stopped the infamous respawn bug that has been present in debian packages. Would this be more appropriate than the simple runlevel check?

review: Needs Fixing
Jason Gerard DeRose (jderose) wrote :

Dave,

Thanks for the review! I didn't realize that was the intent of the "vendor" information (I thought it was to differentiate between say, rcouch, BigCouch, etc). I'll add that in ASAP.

As far as using the pre-built docs, I personally feel it's more correct to build the docs from their source during the package build. I recall getting dinged for using pre-built docs when I was trying to get pyskein into Debian. To do things the correct Debian way, all Sphinx docs should reference the common JavaScript in the `libjs-sphinxdoc` package, which means you need to build the docs from source so all the versions match up and whatnot. I've had good luck using dh_sphinxdoc for this[1], but I didn't get that working in time for the 1.4.0 package in Saucy. So thanks for reminding me that I still need to do this :)

As far as the Upstart script, I think your "start on" stanza is more correct than what I'm currently using, but as far as I know, my current Upstart script hasn't suffered from the infamous respawn bug. The reason is I'm not calling `couchdb` with the "-b -r 5" options the way the upstream init script does. Instead, I'm letting Upstart do all the process lifecycle management (including respawning if needed). Since switching to Upstart in couchdb 1.4.0-0ubuntu1, I've never encountered a situation where `sudo stop couchdb` didn't work correctly (including when removing or purging the `couchdb` package, something that still plagues the 1.2.0 package). Anyway, I'll incorporate your suggestion into the Upstart script.

Lastly, as far as packaging issues I'd like upstream to be aware of:

1) I'd like to see per-user CouchDB instances (rather than just the system-wide one) become a more official use case upstream; Ubuntu originally diverged from the Debian packaging because they needed to split things into the `couchdb` and `couchdb-bin` packages so desktopcouch could start per-user CouchDB instances without having a system-wide CouchDB instance needlessly running; although desktopcouch is no more, Novacut still has similar needs, just now Dmedia[2] starts CouchDB itself using UserCouch[3]; I think if this was a blessed use case upstream, it would be easier to get Debian (and other distros) on the same page

2) From a security perspective, I really don't like that CouchDB requires write access to its own config file (/etc/couchdb/local.ini); not sure what the correct solution is, but the current situation does *not* give me warm fuzzy feelings :P

Thanks again!

[1] dh_sphinxdoc example: http://bazaar.launchpad.net/~dmedia/dbase32/trunk/view/head:/debian/rules
[2] Dmedia: https://launchpad.net/dmedia
[3] UserCouch: https://launchpad.net/usercouch

Jason Gerard DeRose (jderose) wrote :

Dave: quick question, as far as setting [vendor] info, what is the recommended way of doing this? Is there a ./configure option, or should I just modify default.ini.tpl.in at the appropriate stage?

84. By Jason Gerard DeRose on 2013-12-01

Add Build-Depends lsb-release, dh-autoreconf, autoconf-archive; debian/rules: use --with autoreconf

Dave Cottlehuber (skunkwerks) wrote :

@Jason good point, actually I don't know :-). I'll check with nslater, the original autoconf package author for CouchDB what makes sense, but ATM I'd simply add that to the tpl.in file directly. Any change to autoconf will need tweaks and I don't think we'll put that in 1.6.

If there's a need from downstream to set specific vendor information (like Yolanda wants) then [vendor] is the place to do it. The intent in the original ticket was to allow us to start communicating feature sets under that key, for example cloudant might say "we are cloudant, we support this search interface v2, and geofeatures". An iriscouch/nodejitsu instance might say "geocouch 1.3" but not have search.

lsb-release will be used by build scripts to extract ubuntu release & version viz `lsb_release -a` or similar.

autoconf-archive is required by couchdb for building from tarball now, but shouldn't be needed for normal build.

see https://github.com/apache/couchdb/blob/master/INSTALL.Unix and https://github.com/apache/couchdb/blob/master/DEVELOPERS for tarball & git checkout info respectively.

I can't speak for the rest, but I'm keen to learn more about how the packaging works.

Dave Cottlehuber (skunkwerks) wrote :

@Jason thanks for the reply,

Re building docs etc, it doesn't really matter, whatever makes sense here. I'm merely pointing out that a large chunk of the dependencies are simply required to build docs, and by using the pre-built tarball that's avoided. Up to you! I do think that python pygments is required for highlighting, but that's not in the list AFAICT.

You're 100% right on the options being a large part of the (re)spwaning issue BTW. This is the right thing to do.

1) per-user instances are already supported, I suspect this will be a matter of documentation and/or config. I've used it for a while, so I suggest you open a JIRA over in CouchDB, we'll nut out what is technically required, fix doc/configs, and you are good to go.

2) only a couchdb admin can modify the local.ini. It stores local admin passwords, the per-instance UUID (used to help replication), and nothing a normal user can modify. This ini file can actually be put anywhere, and the *last* entry in the loaded configuration files is where writable entries need to go. So you can actually put that anywhere you like.

use `couchdb -c` to seee the current config chain:

/usr/local/etc/couchdb/default.ini
/usr/local/etc/couchdb/local.ini

and `couchdb -a /my/config.ini` or `couchdb -A /my/config/dir/` as required.

This is also the answer to (1) above BTW :-)

- install a "normal" couchdb config, don't have the service start up automatically, and then use your own (e.g. upstart's per-user config file http://upstart.ubuntu.com/cookbook/#id97) to set up a per user one, that puts an additional `-a ...` file in there. These settings will over-ride earlier set ones, so you can redirect pidfile, db location, view files, even view servers if you want.

85. By Jason Gerard DeRose on 2013-12-01

First attempt at setting proper [vendor] info in default.ini

86. By Jason Gerard DeRose on 2013-12-01

couchdb.upstart: start on filesystem and static-network-up, stop deconfiguring-networking

87. By Jason Gerard DeRose on 2013-12-01

couchdb.upstart: heck, might as well add 'author', all the cool kids are

88. By Jason Gerard DeRose on 2013-12-01

Till I understand Yolanda Robla's reasoning, drop Build-Depends dh-autoreconf and autoconf-archive, don't use --with autoreconf

89. By Jason Gerard DeRose on 2013-12-01

Update changelog

Jason Gerard DeRose (jderose) wrote :

Dave, okay, I finished the requested changes, and am ready for another review. I made two important changes:

1) The default.ini file now gets the appropriate [vendor] info from `lsb_release`

I'd really like to see an easier way of doing this implemented upstream, but I think my approach is workable for now, though a bit hacky.

2) I tweaked the couchdb.upstart config mostly based on your suggestions

Based on my reading of this:
http://upstart.ubuntu.com/cookbook/#ubuntu-well-known-events-ubuntu-specific

I feel it's most correct to:
  start on filesystem and static-network-up
  stop on deconfiguring-networking

I've tested start/stop, stop via apt-get remove/purge, and respawn (by manually killing the couchdb process).

review: Resubmit
Dave Cottlehuber (skunkwerks) wrote :

awesome! I'm partway through pulling this "back" to work on precise
too. I'll send more details through when I'm past the stupid error
stage..

(1) this is quite linux specific and vendor-specific. I'm +0 on
teaching couchdb configure scripts to handle different distros but if
lsb_release is available (at least as a package) on all linux flavours
then its not unreasonable.

(2) seems pretty sensible. some caveats:

upstart is not clear if static-network-up is available on dhcp or
not; according to man upstart-events in precise, its emitted when the
last static interface is up.

deconfiguring-networking; would this break a couchdb instance being
used as an offline-capable application? FWIW it isn't available on
precise but that shouldn't matter if it works for you.

A+
Dave

On 2 December 2013 05:05, Jason Gerard DeRose <email address hidden> wrote:
> Review: Resubmit
>
> Dave, okay, I finished the requested changes, and am ready for another review. I made two important changes:
>
> 1) The default.ini file now gets the appropriate [vendor] info from `lsb_release`
>
> I'd really like to see an easier way of doing this implemented upstream, but I think my approach is workable for now, though a bit hacky.
>
> 2) I tweaked the couchdb.upstart config mostly based on your suggestions
>
> Based on my reading of this:
> http://upstart.ubuntu.com/cookbook/#ubuntu-well-known-events-ubuntu-specific
>
> I feel it's most correct to:
> start on filesystem and static-network-up
> stop on deconfiguring-networking
>
> I've tested start/stop, stop via apt-get remove/purge, and respawn (by manually killing the couchdb process).
> --
> https://code.launchpad.net/~jderose/ubuntu/trusty/couchdb/1.5.0/+merge/197291
> You are reviewing the proposed merge of lp:~jderose/ubuntu/trusty/couchdb/1.5.0 into lp:ubuntu/couchdb.

Dave Cottlehuber (skunkwerks) wrote :

LGTM, I've reused a lot of this for a precise-based package & very happy with the results -- thanks Jason & Yolanda!

Let's merge this puppy :D

review: Approve
Iain Lane (laney) wrote :

Cheers. I'll upload these - please keep an eye on bug reports for any problems.

review: Approve
Iain Lane (laney) wrote :

s/these/this/

Jason Gerard DeRose (jderose) wrote :

Thanks, Iain! And yes, I'll keep an eye on things. I'm subscribed to all the bug reports, and I'm regularly using CouchDB 1.5.0 myself on Trusty now.

Unmerged revisions

89. By Jason Gerard DeRose on 2013-12-01

Update changelog

88. By Jason Gerard DeRose on 2013-12-01

Till I understand Yolanda Robla's reasoning, drop Build-Depends dh-autoreconf and autoconf-archive, don't use --with autoreconf

87. By Jason Gerard DeRose on 2013-12-01

couchdb.upstart: heck, might as well add 'author', all the cool kids are

86. By Jason Gerard DeRose on 2013-12-01

couchdb.upstart: start on filesystem and static-network-up, stop deconfiguring-networking

85. By Jason Gerard DeRose on 2013-12-01

First attempt at setting proper [vendor] info in default.ini

84. By Jason Gerard DeRose on 2013-12-01

Add Build-Depends lsb-release, dh-autoreconf, autoconf-archive; debian/rules: use --with autoreconf

83. By Jason Gerard DeRose on 2013-11-30

Fix debian/changelog typo: 'binary the packages' => 'the binary packages'

82. By Jason Gerard DeRose on 2013-11-30

Update 1.5.0-0ubuntu1 changelog timestamp in prep for merge proposal

81. By Jason Gerard DeRose on 2013-11-24

Update/clean-up changelog

80. By Jason Gerard DeRose on 2013-11-24

Drop Build-Depends on texlive-latex-base, texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended, texinfo

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'LICENSE'
2--- LICENSE 2013-08-28 18:21:32 +0000
3+++ LICENSE 2013-12-01 23:56:33 +0000
4@@ -896,6 +896,9 @@
5
6 Apache 2 License, see above.
7
8+If not otherwise noted, the extensions in this package are licensed
9+under the following license.
10+
11 For src/fauxton/test/mocha/mocha.js and src/fauxton/test/mocha/mocha.js
12
13 Copyright (c) 2011-2013 TJ Holowaychuk <tj@vision-media.ca>
14@@ -980,3 +983,146 @@
15 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
16 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
17 THE SOFTWARE.
18+
19+
20+for src/fauxton/assets/img/font-awesome.*
21+
22+SIL OPEN FONT LICENSE
23+
24+Version 1.1 - 26 February 2007
25+
26+PREAMBLE
27+The goals of the Open Font License (OFL) are to stimulate worldwide
28+development of collaborative font projects, to support the font creation
29+efforts of academic and linguistic communities, and to provide a free and
30+open framework in which fonts may be shared and improved in partnership
31+with others.
32+
33+The OFL allows the licensed fonts to be used, studied, modified and
34+redistributed freely as long as they are not sold by themselves. The
35+fonts, including any derivative works, can be bundled, embedded,
36+redistributed and/or sold with any software provided that any reserved
37+names are not used by derivative works. The fonts and derivatives,
38+however, cannot be released under any other type of license. The
39+requirement for fonts to remain under this license does not apply
40+to any document created using the fonts or their derivatives.
41+
42+DEFINITIONS
43+"Font Software" refers to the set of files released by the Copyright
44+Holder(s) under this license and clearly marked as such. This may
45+include source files, build scripts and documentation.
46+
47+"Reserved Font Name" refers to any names specified as such after the
48+copyright statement(s).
49+
50+"Original Version" refers to the collection of Font Software components as
51+distributed by the Copyright Holder(s).
52+
53+"Modified Version" refers to any derivative made by adding to, deleting,
54+or substituting — in part or in whole — any of the components of the
55+Original Version, by changing formats or by porting the Font Software to a
56+new environment.
57+
58+"Author" refers to any designer, engineer, programmer, technical
59+writer or other person who contributed to the Font Software.
60+
61+PERMISSION & CONDITIONS
62+Permission is hereby granted, free of charge, to any person obtaining
63+a copy of the Font Software, to use, study, copy, merge, embed, modify,
64+redistribute, and sell modified and unmodified copies of the Font
65+Software, subject to the following conditions:
66+
67+1) Neither the Font Software nor any of its individual components,
68+in Original or Modified Versions, may be sold by itself.
69+
70+2) Original or Modified Versions of the Font Software may be bundled,
71+redistributed and/or sold with any software, provided that each copy
72+contains the above copyright notice and this license. These can be
73+included either as stand-alone text files, human-readable headers or
74+in the appropriate machine-readable metadata fields within text or
75+binary files as long as those fields can be easily viewed by the user.
76+
77+3) No Modified Version of the Font Software may use the Reserved Font
78+Name(s) unless explicit written permission is granted by the corresponding
79+Copyright Holder. This restriction only applies to the primary font name as
80+presented to the users.
81+
82+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
83+Software shall not be used to promote, endorse or advertise any
84+Modified Version, except to acknowledge the contribution(s) of the
85+Copyright Holder(s) and the Author(s) or with their explicit written
86+permission.
87+
88+5) The Font Software, modified or unmodified, in part or in whole,
89+must be distributed entirely under this license, and must not be
90+distributed under any other license. The requirement for fonts to
91+remain under this license does not apply to any document created
92+using the Font Software.
93+
94+TERMINATION
95+This license becomes null and void if any of the above conditions are
96+not met.
97+
98+DISCLAIMER
99+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
100+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
101+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
102+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
103+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
104+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
105+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
106+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
107+OTHER DEALINGS IN THE FONT SOFTWARE.
108+
109+
110+for src/fauxton/assets/less/bootstrap/font-awesome/*
111+
112+The MIT License (MIT)
113+
114+Copyright (c) 2013 Dave Gandy
115+
116+Permission is hereby granted, free of charge, to any person obtaining a copy
117+of this software and associated documentation files (the "Software"), to deal
118+in the Software without restriction, including without limitation the rights
119+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
120+copies of the Software, and to permit persons to whom the Software is
121+furnished to do so, subject to the following conditions:
122+
123+The above copyright notice and this permission notice shall be included in
124+all copies or substantial portions of the Software.
125+
126+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
127+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
128+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
129+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
130+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
131+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
132+THE SOFTWARE.
133+
134+For share/doc/ext/httpdomain.py
135+
136+Copyright (c) 2010 by the contributors Hong Minhee <minhee@dahlia.kr>.
137+All rights reserved.
138+
139+Redistribution and use in source and binary forms, with or without
140+modification, are permitted provided that the following conditions are
141+met:
142+
143+* Redistributions of source code must retain the above copyright
144+ notice, this list of conditions and the following disclaimer.
145+
146+* Redistributions in binary form must reproduce the above copyright
147+ notice, this list of conditions and the following disclaimer in the
148+ documentation and/or other materials provided with the distribution.
149+
150+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
151+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
152+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
153+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
154+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
155+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
156+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
157+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
158+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
159+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
160+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
161
162=== modified file 'Makefile.am'
163--- Makefile.am 2013-08-28 16:28:32 +0000
164+++ Makefile.am 2013-12-01 23:56:33 +0000
165@@ -113,6 +113,7 @@
166 mkdir -p $(top_builddir)/tmp/lib
167 mkdir -p $(top_builddir)/tmp/log
168 mkdir -p $(top_builddir)/tmp/run/couchdb
169+ mkdir -p $(top_builddir)/tmp/plugins
170 endif
171
172 install-data-hook:
173
174=== modified file 'Makefile.in'
175--- Makefile.in 2013-08-28 16:28:32 +0000
176+++ Makefile.in 2013-12-01 23:56:33 +0000
177@@ -199,6 +199,7 @@
178 ERLANG_FLAGS = @ERLANG_FLAGS@
179 ERLC = @ERLC@
180 ERLC_FLAGS = @ERLC_FLAGS@
181+ESCRIPT = @ESCRIPT@
182 EXEEXT = @EXEEXT@
183 FGREP = @FGREP@
184 FLAGS = @FLAGS@
185@@ -287,6 +288,8 @@
186 datarootdir = @datarootdir@
187 docdir = @docdir@
188 dvidir = @dvidir@
189+erlangbin = @erlangbin@
190+erlangversion = @erlangversion@
191 exec_prefix = @exec_prefix@
192 host = @host@
193 host_alias = @host_alias@
194@@ -984,6 +987,7 @@
195 @TESTS_TRUE@ mkdir -p $(top_builddir)/tmp/lib
196 @TESTS_TRUE@ mkdir -p $(top_builddir)/tmp/log
197 @TESTS_TRUE@ mkdir -p $(top_builddir)/tmp/run/couchdb
198+@TESTS_TRUE@ mkdir -p $(top_builddir)/tmp/plugins
199
200 install-data-hook:
201 @echo
202
203=== modified file 'NOTICE'
204--- NOTICE 2013-08-28 16:28:32 +0000
205+++ NOTICE 2013-12-01 23:56:33 +0000
206@@ -146,7 +146,7 @@
207
208 Copyright 2012, Benoît Chesneau <benoitc@refuge.io>
209
210-* mocha.js (https://github.com/visionmedia/mocha)
211+ * mocha.js (https://github.com/visionmedia/mocha)
212
213 Copyright (c) 2011-2013 TJ Holowaychuk <tj@vision-media.ca>
214
215@@ -161,3 +161,35 @@
216 * spin.js
217
218 Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de]
219+
220+ * font-awesome http://fortawesome.github.io/Font-Awesome/
221+
222+ Copyright (c) 2013 Dave Gandy
223+
224+ * httpdomain.py (https://bitbucket.org/birkenfeld/sphinx-contrib/src/6a3a8ca714cfce957530890d0431d9a7b88c930f/httpdomain/sphinxcontrib/httpdomain.py?at=httpdomain-1.1.9)
225+
226+ Copyright (c) 2010, Hong Minhee <minhee@dahlia.kr>
227+
228+ * externals.rst (http://davispj.com/2010/09/26/new-couchdb-externals-api.html)
229+
230+ Copyright 2008-2010, Paul Joseph Davis <paul.joseph.davis@gmail.com>
231+
232+ * protocol.rst (http://www.dataprotocols.org/en/latest/couchdb_replication.html)
233+
234+ Copyright 2011-2013, Benoît Chesneau <benoitc@refuge.io>
235+
236+ * views/intro.rst views/nosql.rst views/pagination.rst
237+
238+ Copyright 2013, Creative Commons Attribution license
239+
240+ * share/doc/src/couchapp/views/joins.rst (Using View Collation)
241+
242+ Copyright 2007, Christopher Lenz <cmlenz@gmail.com>
243+
244+ * share/doc/src/templates/couchdb/domainindex.html
245+
246+ Copyright 2007-2011 by the Sphinx team
247+
248+ * sandbox.js https://github.com/KlausTrainer/sandbox.js
249+
250+ (c) 2013 Klaus Trainer
251
252=== modified file 'THANKS'
253--- THANKS 2013-08-28 16:28:32 +0000
254+++ THANKS 2013-12-01 23:56:33 +0000
255@@ -92,6 +92,8 @@
256 * Fedor Indutny <fedor@indutny.com>
257 * Tim Blair
258 * Tady Walsh <hello@tady.me>
259+ * Sam Rijs <recv@awesam.de>
260+ * Adam Kocoloski <adam@cloudant.com>
261 * Adam Lofts <Adam.Lofts@gmail.com>
262 * Alexander Dorofeev <aka.spin@gmail.com>
263 * Alexander Shorin <kxepal@gmail.com>
264@@ -100,6 +102,7 @@
265 * Ben Reser <ben@reser.org>
266 * Benjamin Nortier <bjnortier@gmail.com>
267 * Bob Dionne <bob@cloudant.com>
268+ * Bob Ippolito <bob@redivi.com>
269 * Caleb Case <calebcase@gmail.com>
270 * Christopher Bonhage <queezey@me.com>
271 * Dale Harvey <dale@arandomurl.com>
272@@ -109,13 +112,15 @@
273 * Ewan McDougall <mrloop@mrloop.com>
274 * Fedor Indutny <fedor.indutny@gmail.com>
275 * Filippo Fadda <filippo.fadda@gmail.com>
276- 92 Garren Smith <garren.smith@gmail.com>
277+ 107 Garren Smith <garren.smith@gmail.com>
278 * Jakub <jakub.oboza@gmail.com>
279+ * Jason Smith (work) <jason.h.smith@gmail.com>
280 * Jason Smith (work) <jhs@iriscouch.com>
281 * Jason Smith (work) <jhs@nodejitsu.com>
282 * Joel Reed <joelwreed@gmail.com>
283 * Johannes J. Schmidt <schmidt@netzmerk.com>
284 * Keks Keksov <keksov@gmail.com>
285+ * Klaus Trainer <klaus_trainer@posteo.de>
286 * Magnus Hoff <maghoff@gmail.com>
287 * Martin Higham <martin@ocastalabs.com>
288 * Michael Jackson <mjijackson@gmail.com>
289@@ -135,10 +140,12 @@
290 10 Simon Metson <simonmetson+github@googlemail.com>
291 * Sriram Melkote <siri@couchbase.com>
292 * Stefan Kögl <stefan@skoegl.net>
293+ * Sven Lito <me@svenlito.com>
294 * Volker Mische <volker.mische@gmail.com>
295 * Wei Cao <cyg.cao@gmail.com>
296 * Wendall Cada <wendallc@83864.com>
297+ * nvdev <modestdev@gmail.com>
298 * sean barclay <fudd1011@hotmail.com>
299- 17 suelockwood <deathbearbrown@gmail.com>
300+ 54 suelockwood <deathbearbrown@gmail.com>
301
302 For a list of authors see the `AUTHORS` file.
303
304=== modified file 'acinclude.m4'
305--- acinclude.m4 2013-08-28 16:28:32 +0000
306+++ acinclude.m4 2013-12-01 23:56:33 +0000
307@@ -17,7 +17,7 @@
308 m4_define([LOCAL_PACKAGE_NAME], [Apache CouchDB])
309 m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB])
310 m4_define([LOCAL_VERSION_MAJOR], [1])
311-m4_define([LOCAL_VERSION_MINOR], [4])
312+m4_define([LOCAL_VERSION_MINOR], [5])
313 m4_define([LOCAL_VERSION_REVISION], [0])
314 m4_define([LOCAL_VERSION_STAGE], [])
315 m4_define([LOCAL_VERSION_RELEASE], [])
316
317=== modified file 'bin/Makefile.am'
318--- bin/Makefile.am 2013-08-28 16:28:32 +0000
319+++ bin/Makefile.am 2013-12-01 23:56:33 +0000
320@@ -32,7 +32,7 @@
321
322 BUILT_SOURCES = $(man_file_build)
323
324-EXTRA_DIST = $(man_file_build)
325+EXTRA_DIST = $(man_file_build) erlang-version.escript
326
327 CLEANFILES = $(bin_SCRIPTS) $(man_file_build) $(noinst_SCRIPTS)
328
329@@ -51,6 +51,7 @@
330 -e "s|%localstatelogdir%|@localstatelogdir@|g" \
331 -e "s|%localstatelibdir%|@localstatelibdir@|g" \
332 -e "s|%localstatedir%|@localstatedir@|g" \
333+ -e "s|%locallibdir%|@locallibdir@|g" \
334 -e "s|%bug_uri%|@bug_uri@|g" \
335 -e "s|%package_author_address%|@package_author_address@|g" \
336 -e "s|%package_author_name%|@package_author_name@|g" \
337@@ -94,6 +95,8 @@
338 -e "s|%package_author_name%|@package_author_name@|g" \
339 -e "s|%package_name%|@package_name@|g" \
340 -e "s|%version%|@version@|g" \
341+ -e "s|%erlangversion%|@erlangversion@|g" \
342+ -e "s|%erlangbin%|@erlangbin@|g" \
343 -e "s|%couchdb_command_name%|$(couchdb_command_name)|g" > \
344 $@ < $<
345 chmod +x $@
346@@ -117,6 +120,8 @@
347 -e "s|%package_author_name%|@package_author_name@|g" \
348 -e "s|%package_name%|@package_name@|g" \
349 -e "s|%version%|@version@|g" \
350+ -e "s|%erlangversion%|@erlangversion@|g" \
351+ -e "s|%erlangbin%|@erlangbin@|g" \
352 -e "s|%couchdb_command_name%|$(abs_top_builddir)/utils/run|g" > \
353 $@ < $<
354 chmod +x $@
355
356=== modified file 'bin/Makefile.in'
357--- bin/Makefile.in 2013-08-28 16:28:32 +0000
358+++ bin/Makefile.in 2013-12-01 23:56:33 +0000
359@@ -138,6 +138,7 @@
360 ERLANG_FLAGS = @ERLANG_FLAGS@
361 ERLC = @ERLC@
362 ERLC_FLAGS = @ERLC_FLAGS@
363+ESCRIPT = @ESCRIPT@
364 EXEEXT = @EXEEXT@
365 FGREP = @FGREP@
366 FLAGS = @FLAGS@
367@@ -226,6 +227,8 @@
368 datarootdir = @datarootdir@
369 docdir = @docdir@
370 dvidir = @dvidir@
371+erlangbin = @erlangbin@
372+erlangversion = @erlangversion@
373 exec_prefix = @exec_prefix@
374 host = @host@
375 host_alias = @host_alias@
376@@ -290,7 +293,7 @@
377 @BUILD_MAN_FALSE@man_file_build =
378 @BUILD_MAN_TRUE@man_file_build = $(man_file)
379 BUILT_SOURCES = $(man_file_build)
380-EXTRA_DIST = $(man_file_build)
381+EXTRA_DIST = $(man_file_build) erlang-version.escript
382 CLEANFILES = $(bin_SCRIPTS) $(man_file_build) $(noinst_SCRIPTS)
383 couchdb_command_name = `echo couchdb | sed '$(transform)'`
384 couchjs_command_name = `echo couchjs | sed '$(transform)'`
385@@ -548,6 +551,7 @@
386 -e "s|%localstatelogdir%|@localstatelogdir@|g" \
387 -e "s|%localstatelibdir%|@localstatelibdir@|g" \
388 -e "s|%localstatedir%|@localstatedir@|g" \
389+ -e "s|%locallibdir%|@locallibdir@|g" \
390 -e "s|%bug_uri%|@bug_uri@|g" \
391 -e "s|%package_author_address%|@package_author_address@|g" \
392 -e "s|%package_author_name%|@package_author_name@|g" \
393@@ -589,6 +593,8 @@
394 -e "s|%package_author_name%|@package_author_name@|g" \
395 -e "s|%package_name%|@package_name@|g" \
396 -e "s|%version%|@version@|g" \
397+ -e "s|%erlangversion%|@erlangversion@|g" \
398+ -e "s|%erlangbin%|@erlangbin@|g" \
399 -e "s|%couchdb_command_name%|$(couchdb_command_name)|g" > \
400 $@ < $<
401 chmod +x $@
402@@ -612,6 +618,8 @@
403 -e "s|%package_author_name%|@package_author_name@|g" \
404 -e "s|%package_name%|@package_name@|g" \
405 -e "s|%version%|@version@|g" \
406+ -e "s|%erlangversion%|@erlangversion@|g" \
407+ -e "s|%erlangbin%|@erlangbin@|g" \
408 -e "s|%couchdb_command_name%|$(abs_top_builddir)/utils/run|g" > \
409 $@ < $<
410 chmod +x $@
411
412=== modified file 'bin/couch-config.tpl.in'
413--- bin/couch-config.tpl.in 2013-08-28 18:21:32 +0000
414+++ bin/couch-config.tpl.in 2013-12-01 23:56:33 +0000
415@@ -22,6 +22,8 @@
416 confdir="%localconfdir%"
417 urifile="%localstaterundir%/couch.uri"
418 logdir="%localstatelogdir%"
419+erlangversion="%erlangversion%"
420+erlangbin="%erlangbin%"
421
422 version () {
423 cat << EOF
424@@ -52,6 +54,7 @@
425 Options:
426
427 --erl-libs-dir Erlang library directory
428+ --erl-bin Erlang binary
429 --config-dir configuration directory
430 --db-dir database directory
431 --view-dir view index directory
432@@ -60,6 +63,7 @@
433 --log-dir log directory
434 --uri-file daemon sockets file
435 --couch-version version of Apache CouchDB
436+ --erlang-version version of Erlang that CouchDB was built with
437 --version version of $basename
438 --help Print usage
439
440@@ -84,6 +88,9 @@
441 --erl-libs-dir)
442 echo $erlanglibdir
443 ;;
444+ --erl-bin)
445+ echo $erlangbin
446+ ;;
447 --config-dir)
448 echo $confdir
449 ;;
450@@ -108,6 +115,9 @@
451 --couch-version)
452 echo $couchversion
453 ;;
454+ --erlang-version)
455+ echo $erlangversion
456+ ;;
457 --version)
458 version
459 exit 0
460
461=== modified file 'bin/couchdb.1'
462--- bin/couchdb.1 2013-08-28 16:28:32 +0000
463+++ bin/couchdb.1 2013-12-01 23:56:33 +0000
464@@ -1,5 +1,5 @@
465 .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.11.
466-.TH COUCHDB "1" "August 2013" "couchdb - Apache CouchDB 1.4.0" "User Commands"
467+.TH COUCHDB "1" "October 2013" "couchdb - Apache CouchDB 1.5.0" "User Commands"
468 .SH NAME
469 couchdb \- Apache CouchDB database server
470 .SH SYNOPSIS
471
472=== modified file 'bin/couchdb.tpl.in'
473--- bin/couchdb.tpl.in 2013-08-28 16:28:32 +0000
474+++ bin/couchdb.tpl.in 2013-12-01 23:56:33 +0000
475@@ -25,6 +25,7 @@
476 HEART_COMMAND="%bindir%/%couchdb_command_name% -k"
477 INTERACTIVE=false
478 KILL=false
479+PLUGINS_DIR=%locallibdir%/plugins
480 LOCAL_CONFIG_DIR=%localconfdir%/local.d
481 LOCAL_CONFIG_FILE=%localconfdir%/%localini%
482 PID_FILE=%localstatedir%/run/couchdb/couchdb.pid
483@@ -141,9 +142,17 @@
484 done
485 }
486
487+_add_erlang_config () {
488+ if [ -r "$1" ]; then
489+ ERL_START_OPTIONS="$ERL_START_OPTIONS -config '$1'"
490+ fi
491+}
492+
493 _load_config () {
494 _add_config_file "$DEFAULT_CONFIG_FILE"
495 _add_config_dir "$DEFAULT_CONFIG_DIR"
496+ # We initialize plugins here to get the desired default config load order
497+ _find_plugins
498 _add_config_file "$LOCAL_CONFIG_FILE"
499 _add_config_dir "$LOCAL_CONFIG_DIR"
500 if [ "$COUCHDB_ADDITIONAL_CONFIG_FILE" != '' ]
501@@ -216,6 +225,27 @@
502 fi
503 }
504
505+_find_plugins () {
506+ # Find plugins and add them to the Erlang path and load their default
507+ # configurations. This should be called from _load_config.
508+ if test -d "$PLUGINS_DIR"; then
509+ for plugin in "$PLUGINS_DIR"/*; do
510+ if echo "$COUCH_PLUGIN_BLACKLIST" | grep "$plugin" > /dev/null 2> /dev/null; then
511+ : # Do not use this plugin.
512+ else
513+ if echo "$ERL_ZFLAGS" | grep "$plugin/ebin" > /dev/null 2> /dev/null; then
514+ : # It's already loaded.
515+ else
516+ ERL_ZFLAGS="$ERL_ZFLAGS -pz '$plugin/ebin'"
517+ fi
518+ _add_config_dir "$plugin/priv/default.d"
519+ _add_erlang_config "$plugin/priv/couch_plugin.config"
520+ fi
521+ done
522+ export ERL_ZFLAGS
523+ fi
524+}
525+
526 start_couchdb () {
527 if test ! "$RECURSED" = "true"; then
528 if check_status 2> /dev/null; then
529@@ -232,22 +262,6 @@
530 interactive_option="+Bd -noinput"
531 fi
532
533- # Find plugins and add them to the Erlang path.
534- if test -d "%localerlanglibdir%/../../plugins"; then
535- for plugin in "%localerlanglibdir%/../../plugins"/*; do
536- if echo "$ERL_ZFLAGS" | grep "$plugin/ebin" > /dev/null 2> /dev/null; then
537- : # It's already loaded.
538- else
539- if echo "$COUCH_PLUGIN_BLACKLIST" | grep "$plugin" > /dev/null 2> /dev/null; then
540- : # Do not use this plugin.
541- else
542- ERL_ZFLAGS="$ERL_ZFLAGS -pz '$plugin/ebin'"
543- fi
544- fi
545- done
546- export ERL_ZFLAGS
547- fi
548-
549 command="%ERL% $interactive_option $ERL_START_OPTIONS \
550 -env ERL_LIBS $ERL_LIBS:%localerlanglibdir% -couch_ini $start_arguments -s couch"
551 if test "$BACKGROUND" = "true" -a "$RECURSED" = "false"; then
552
553=== added file 'bin/erlang-version.escript'
554--- bin/erlang-version.escript 1970-01-01 00:00:00 +0000
555+++ bin/erlang-version.escript 2013-12-01 23:56:33 +0000
556@@ -0,0 +1,3 @@
557+
558+main(_) ->
559+ io:format("~s~n", [erlang:system_info(otp_release)]).
560
561=== modified file 'build-aux/ltmain.sh' (properties changed: +x to -x)
562--- build-aux/ltmain.sh 2013-08-28 16:28:32 +0000
563+++ build-aux/ltmain.sh 2013-12-01 23:56:33 +0000
564@@ -1,9 +1,9 @@
565
566-# libtool (GNU libtool) 2.4
567+# libtool (GNU libtool) 2.4.2
568 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
569
570 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
571-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
572+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
573 # This is free software; see the source for copying conditions. There is NO
574 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
575
576@@ -41,6 +41,7 @@
577 # --quiet, --silent don't print informational messages
578 # --no-quiet, --no-silent
579 # print informational messages (default)
580+# --no-warn don't display warning messages
581 # --tag=TAG use configuration variables from tag TAG
582 # -v, --verbose print more informational messages than default
583 # --no-verbose don't print the extra informational messages
584@@ -69,7 +70,7 @@
585 # compiler: $LTCC
586 # compiler flags: $LTCFLAGS
587 # linker: $LD (gnu? $with_gnu_ld)
588-# $progname: (GNU libtool) 2.4
589+# $progname: (GNU libtool) 2.4.2
590 # automake: $automake_version
591 # autoconf: $autoconf_version
592 #
593@@ -79,9 +80,9 @@
594
595 PROGRAM=libtool
596 PACKAGE=libtool
597-VERSION=2.4
598+VERSION=2.4.2
599 TIMESTAMP=""
600-package_revision=1.3293
601+package_revision=1.3337
602
603 # Be Bourne compatible
604 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
605@@ -136,15 +137,10 @@
606
607 : ${CP="cp -f"}
608 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
609-: ${EGREP="grep -E"}
610-: ${FGREP="grep -F"}
611-: ${GREP="grep"}
612-: ${LN_S="ln -s"}
613 : ${MAKE="make"}
614 : ${MKDIR="mkdir"}
615 : ${MV="mv -f"}
616 : ${RM="rm -f"}
617-: ${SED="sed"}
618 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
619 : ${Xsed="$SED -e 1s/^X//"}
620
621@@ -387,7 +383,7 @@
622 ;;
623 *)
624 save_IFS="$IFS"
625- IFS=:
626+ IFS=${PATH_SEPARATOR-:}
627 for progdir in $PATH; do
628 IFS="$save_IFS"
629 test -x "$progdir/$progname" && break
630@@ -771,8 +767,8 @@
631 s*\$LTCFLAGS*'"$LTCFLAGS"'*
632 s*\$LD*'"$LD"'*
633 s/\$with_gnu_ld/'"$with_gnu_ld"'/
634- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
635- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
636+ s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
637+ s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
638 p
639 d
640 }
641@@ -1052,6 +1048,7 @@
642 opt_help=false
643 opt_help_all=false
644 opt_silent=:
645+opt_warning=:
646 opt_verbose=:
647 opt_silent=false
648 opt_verbose=false
649@@ -1120,6 +1117,10 @@
650 opt_silent=false
651 func_append preserve_args " $opt"
652 ;;
653+ --no-warning|--no-warn)
654+ opt_warning=false
655+func_append preserve_args " $opt"
656+ ;;
657 --no-verbose)
658 opt_verbose=false
659 func_append preserve_args " $opt"
660@@ -2059,7 +2060,7 @@
661 *.[cCFSifmso] | \
662 *.ada | *.adb | *.ads | *.asm | \
663 *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
664- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
665+ *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
666 func_xform "$libobj"
667 libobj=$func_xform_result
668 ;;
669@@ -3201,11 +3202,13 @@
670
671 # Set up the ranlib parameters.
672 oldlib="$destdir/$name"
673+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
674+ tool_oldlib=$func_to_tool_file_result
675
676 func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
677
678 if test -n "$stripme" && test -n "$old_striplib"; then
679- func_show_eval "$old_striplib $oldlib" 'exit $?'
680+ func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
681 fi
682
683 # Do each command in the postinstall commands.
684@@ -3470,7 +3473,7 @@
685 # linked before any other PIC object. But we must not use
686 # pic_flag when linking with -static. The problem exists in
687 # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
688- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
689+ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
690 pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
691 *-*-hpux*)
692 pic_flag_for_symtable=" $pic_flag" ;;
693@@ -3982,14 +3985,17 @@
694 # launches target application with the remaining arguments.
695 func_exec_program ()
696 {
697- for lt_wr_arg
698- do
699- case \$lt_wr_arg in
700- --lt-*) ;;
701- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
702- esac
703- shift
704- done
705+ case \" \$* \" in
706+ *\\ --lt-*)
707+ for lt_wr_arg
708+ do
709+ case \$lt_wr_arg in
710+ --lt-*) ;;
711+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
712+ esac
713+ shift
714+ done ;;
715+ esac
716 func_exec_program_core \${1+\"\$@\"}
717 }
718
719@@ -5057,9 +5063,15 @@
720 {
721 EOF
722 func_emit_wrapper yes |
723- $SED -e 's/\([\\"]\)/\\\1/g' \
724- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
725-
726+ $SED -n -e '
727+s/^\(.\{79\}\)\(..*\)/\1\
728+\2/
729+h
730+s/\([\\"]\)/\\\1/g
731+s/$/\\n/
732+s/\([^\n]*\).*/ fputs ("\1", f);/p
733+g
734+D'
735 cat <<"EOF"
736 }
737 EOF
738@@ -5643,7 +5655,8 @@
739 continue
740 ;;
741
742- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
743+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
744+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
745 func_append compiler_flags " $arg"
746 func_append compile_command " $arg"
747 func_append finalize_command " $arg"
748@@ -6147,7 +6160,8 @@
749 lib=
750 found=no
751 case $deplib in
752- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
753+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
754+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
755 if test "$linkmode,$pass" = "prog,link"; then
756 compile_deplibs="$deplib $compile_deplibs"
757 finalize_deplibs="$deplib $finalize_deplibs"
758@@ -6831,7 +6845,7 @@
759 test "$hardcode_direct_absolute" = no; then
760 add="$dir/$linklib"
761 elif test "$hardcode_minus_L" = yes; then
762- add_dir="-L$dir"
763+ add_dir="-L$absdir"
764 # Try looking first in the location we're being installed to.
765 if test -n "$inst_prefix_dir"; then
766 case $libdir in
767@@ -7316,6 +7330,7 @@
768 # which has an extra 1 added just for fun
769 #
770 case $version_type in
771+ # correct linux to gnu/linux during the next big refactor
772 darwin|linux|osf|windows|none)
773 func_arith $number_major + $number_minor
774 current=$func_arith_result
775@@ -7432,7 +7447,7 @@
776 versuffix="$major.$revision"
777 ;;
778
779- linux)
780+ linux) # correct to gnu/linux during the next big refactor
781 func_arith $current - $age
782 major=.$func_arith_result
783 versuffix="$major.$age.$revision"
784@@ -8020,6 +8035,11 @@
785
786 # Test again, we may have decided not to build it any more
787 if test "$build_libtool_libs" = yes; then
788+ # Remove ${wl} instances when linking with ld.
789+ # FIXME: should test the right _cmds variable.
790+ case $archive_cmds in
791+ *\$LD\ *) wl= ;;
792+ esac
793 if test "$hardcode_into_libs" = yes; then
794 # Hardcode the library paths
795 hardcode_libdirs=
796@@ -8050,7 +8070,7 @@
797 elif test -n "$runpath_var"; then
798 case "$perm_rpath " in
799 *" $libdir "*) ;;
800- *) func_apped perm_rpath " $libdir" ;;
801+ *) func_append perm_rpath " $libdir" ;;
802 esac
803 fi
804 done
805@@ -8058,11 +8078,7 @@
806 if test -n "$hardcode_libdir_separator" &&
807 test -n "$hardcode_libdirs"; then
808 libdir="$hardcode_libdirs"
809- if test -n "$hardcode_libdir_flag_spec_ld"; then
810- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
811- else
812- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
813- fi
814+ eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
815 fi
816 if test -n "$runpath_var" && test -n "$perm_rpath"; then
817 # We should set the runpath_var.
818@@ -9152,6 +9168,8 @@
819 esac
820 done
821 fi
822+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
823+ tool_oldlib=$func_to_tool_file_result
824 eval cmds=\"$old_archive_cmds\"
825
826 func_len " $cmds"
827@@ -9261,7 +9279,8 @@
828 *.la)
829 func_basename "$deplib"
830 name="$func_basename_result"
831- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
832+ func_resolve_sysroot "$deplib"
833+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
834 test -z "$libdir" && \
835 func_fatal_error "\`$deplib' is not a valid libtool archive"
836 func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
837
838=== modified file 'configure'
839--- configure 2013-08-28 16:28:32 +0000
840+++ configure 2013-12-01 23:56:33 +0000
841@@ -1,7 +1,7 @@
842 #! /bin/sh
843-# From configure.ac 1.4.0.
844+# From configure.ac 1.5.0.
845 # Guess values for system-dependent variables and create Makefiles.
846-# Generated by GNU Autoconf 2.69 for Apache CouchDB 1.4.0.
847+# Generated by GNU Autoconf 2.69 for Apache CouchDB 1.5.0.
848 #
849 # Report bugs to <https://issues.apache.org/jira/browse/COUCHDB>.
850 #
851@@ -591,8 +591,8 @@
852 # Identity of this package.
853 PACKAGE_NAME='Apache CouchDB'
854 PACKAGE_TARNAME='apache-couchdb'
855-PACKAGE_VERSION='1.4.0'
856-PACKAGE_STRING='Apache CouchDB 1.4.0'
857+PACKAGE_VERSION='1.5.0'
858+PACKAGE_STRING='Apache CouchDB 1.5.0'
859 PACKAGE_BUGREPORT='https://issues.apache.org/jira/browse/COUCHDB'
860 PACKAGE_URL=''
861
862@@ -640,6 +640,8 @@
863 abs_top_srcdir
864 localerlanglibdir
865 locallibbindir
866+erlangbin
867+erlangversion
868 localstaterundir
869 localstatelogdir
870 localstatelibdir
871@@ -713,6 +715,7 @@
872 JS_LIBS
873 JS_CFLAGS
874 ERLANG_FLAGS
875+ESCRIPT
876 ERL
877 SNAPPY_PATCHLEVEL
878 SNAPPY_MINOR
879@@ -1431,7 +1434,7 @@
880 # Omit some internal or obsolete options to make the list less imposing.
881 # This message is too long to be a string in the A/UX 3.1 sh.
882 cat <<_ACEOF
883-\`configure' configures Apache CouchDB 1.4.0 to adapt to many kinds of systems.
884+\`configure' configures Apache CouchDB 1.5.0 to adapt to many kinds of systems.
885
886 Usage: $0 [OPTION]... [VAR=VALUE]...
887
888@@ -1501,7 +1504,7 @@
889
890 if test -n "$ac_init_help"; then
891 case $ac_init_help in
892- short | recursive ) echo "Configuration of Apache CouchDB 1.4.0:";;
893+ short | recursive ) echo "Configuration of Apache CouchDB 1.5.0:";;
894 esac
895 cat <<\_ACEOF
896
897@@ -1536,7 +1539,7 @@
898 Optional Packages:
899 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
900 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
901- --with-pic try to use only PIC/non-PIC objects [default=use
902+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
903 both]
904 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
905 --with-sysroot=DIR Search for dependent libraries within DIR
906@@ -1658,7 +1661,7 @@
907 test -n "$ac_init_help" && exit $ac_status
908 if $ac_init_version; then
909 cat <<\_ACEOF
910-Apache CouchDB configure 1.4.0
911+Apache CouchDB configure 1.5.0
912 generated by GNU Autoconf 2.69
913
914 Copyright (C) 2012 Free Software Foundation, Inc.
915@@ -2402,7 +2405,7 @@
916 This file contains any messages produced by compilers while
917 running configure, to aid debugging if configure makes a mistake.
918
919-It was created by Apache CouchDB $as_me 1.4.0, which was
920+It was created by Apache CouchDB $as_me 1.5.0, which was
921 generated by GNU Autoconf 2.69. Invocation command line was
922
923 $ $0 $@
924@@ -3227,7 +3230,7 @@
925
926 # Define the identity of the package.
927 PACKAGE='apache-couchdb'
928- VERSION='1.4.0'
929+ VERSION='1.5.0'
930
931
932 cat >>confdefs.h <<_ACEOF
933@@ -5445,8 +5448,8 @@
934
935
936
937-macro_version='2.4'
938-macro_revision='1.3293'
939+macro_version='2.4.2'
940+macro_revision='1.3337'
941
942
943
944@@ -6161,6 +6164,11 @@
945 lt_cv_sys_max_cmd_len=196608
946 ;;
947
948+ os2*)
949+ # The test takes a long time on OS/2.
950+ lt_cv_sys_max_cmd_len=8192
951+ ;;
952+
953 osf*)
954 # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
955 # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
956@@ -6200,7 +6208,7 @@
957 # If test is not a shell built-in, we'll probably end up computing a
958 # maximum length that is only half of the actual maximum length, but
959 # we can't tell.
960- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
961+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
962 = "X$teststring$teststring"; } >/dev/null 2>&1 &&
963 test $i != 17 # 1/2 MB should be enough
964 do
965@@ -6626,7 +6634,7 @@
966 lt_cv_deplibs_check_method=pass_all
967 ;;
968
969-# This must be Linux ELF.
970+# This must be glibc/ELF.
971 linux* | k*bsd*-gnu | kopensolaris*-gnu)
972 lt_cv_deplibs_check_method=pass_all
973 ;;
974@@ -7263,13 +7271,13 @@
975 if test -n "$RANLIB"; then
976 case $host_os in
977 openbsd*)
978- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
979+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
980 ;;
981 *)
982- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
983+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
984 ;;
985 esac
986- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
987+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
988 fi
989
990 case $host_os in
991@@ -7416,6 +7424,7 @@
992 # which start with @ or ?.
993 lt_cv_sys_global_symbol_pipe="$AWK '"\
994 " {last_section=section; section=\$ 3};"\
995+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
996 " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
997 " \$ 0!~/External *\|/{next};"\
998 " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
999@@ -7804,7 +7813,7 @@
1000 CFLAGS="$SAVE_CFLAGS"
1001 fi
1002 ;;
1003-sparc*-*solaris*)
1004+*-*solaris*)
1005 # Find out which ABI we are using.
1006 echo 'int i;' > conftest.$ac_ext
1007 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
1008@@ -7815,7 +7824,20 @@
1009 case `/usr/bin/file conftest.o` in
1010 *64-bit*)
1011 case $lt_cv_prog_gnu_ld in
1012- yes*) LD="${LD-ld} -m elf64_sparc" ;;
1013+ yes*)
1014+ case $host in
1015+ i?86-*-solaris*)
1016+ LD="${LD-ld} -m elf_x86_64"
1017+ ;;
1018+ sparc*-*-solaris*)
1019+ LD="${LD-ld} -m elf64_sparc"
1020+ ;;
1021+ esac
1022+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
1023+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
1024+ LD="${LD-ld}_sol2"
1025+ fi
1026+ ;;
1027 *)
1028 if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
1029 LD="${LD-ld} -64"
1030@@ -8455,7 +8477,13 @@
1031 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
1032 -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
1033 _lt_result=$?
1034- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
1035+ # If there is a non-empty error log, and "single_module"
1036+ # appears in it, assume the flag caused a linker warning
1037+ if test -s conftest.err && $GREP single_module conftest.err; then
1038+ cat conftest.err >&5
1039+ # Otherwise, if the output was created with a 0 exit code from
1040+ # the compiler, it worked.
1041+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
1042 lt_cv_apple_cc_single_mod=yes
1043 else
1044 cat conftest.err >&5
1045@@ -8466,6 +8494,7 @@
1046 fi
1047 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
1048 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
1049+
1050 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
1051 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
1052 if ${lt_cv_ld_exported_symbols_list+:} false; then :
1053@@ -8498,6 +8527,7 @@
1054 fi
1055 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
1056 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
1057+
1058 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
1059 $as_echo_n "checking for -force_load linker flag... " >&6; }
1060 if ${lt_cv_ld_force_load+:} false; then :
1061@@ -8519,7 +8549,9 @@
1062 echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
1063 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
1064 _lt_result=$?
1065- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
1066+ if test -s conftest.err && $GREP force_load conftest.err; then
1067+ cat conftest.err >&5
1068+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
1069 lt_cv_ld_force_load=yes
1070 else
1071 cat conftest.err >&5
1072@@ -8895,7 +8927,22 @@
1073
1074 # Check whether --with-pic was given.
1075 if test "${with_pic+set}" = set; then :
1076- withval=$with_pic; pic_mode="$withval"
1077+ withval=$with_pic; lt_p=${PACKAGE-default}
1078+ case $withval in
1079+ yes|no) pic_mode=$withval ;;
1080+ *)
1081+ pic_mode=default
1082+ # Look at the argument we got. We use all the common list separators.
1083+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
1084+ for lt_pkg in $withval; do
1085+ IFS="$lt_save_ifs"
1086+ if test "X$lt_pkg" = "X$lt_p"; then
1087+ pic_mode=yes
1088+ fi
1089+ done
1090+ IFS="$lt_save_ifs"
1091+ ;;
1092+ esac
1093 else
1094 pic_mode=default
1095 fi
1096@@ -8973,6 +9020,10 @@
1097
1098
1099
1100+
1101+
1102+
1103+
1104 test -z "$LN_S" && LN_S="ln -s"
1105
1106
1107@@ -9432,7 +9483,9 @@
1108 case $cc_basename in
1109 nvcc*) # Cuda Compiler Driver 2.2
1110 lt_prog_compiler_wl='-Xlinker '
1111- lt_prog_compiler_pic='-Xcompiler -fPIC'
1112+ if test -n "$lt_prog_compiler_pic"; then
1113+ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
1114+ fi
1115 ;;
1116 esac
1117 else
1118@@ -9523,18 +9576,33 @@
1119 ;;
1120 *)
1121 case `$CC -V 2>&1 | sed 5q` in
1122- *Sun\ F* | *Sun*Fortran*)
1123+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
1124 # Sun Fortran 8.3 passes all unrecognized flags to the linker
1125 lt_prog_compiler_pic='-KPIC'
1126 lt_prog_compiler_static='-Bstatic'
1127 lt_prog_compiler_wl=''
1128 ;;
1129+ *Sun\ F* | *Sun*Fortran*)
1130+ lt_prog_compiler_pic='-KPIC'
1131+ lt_prog_compiler_static='-Bstatic'
1132+ lt_prog_compiler_wl='-Qoption ld '
1133+ ;;
1134 *Sun\ C*)
1135 # Sun C 5.9
1136 lt_prog_compiler_pic='-KPIC'
1137 lt_prog_compiler_static='-Bstatic'
1138 lt_prog_compiler_wl='-Wl,'
1139 ;;
1140+ *Intel*\ [CF]*Compiler*)
1141+ lt_prog_compiler_wl='-Wl,'
1142+ lt_prog_compiler_pic='-fPIC'
1143+ lt_prog_compiler_static='-static'
1144+ ;;
1145+ *Portland\ Group*)
1146+ lt_prog_compiler_wl='-Wl,'
1147+ lt_prog_compiler_pic='-fpic'
1148+ lt_prog_compiler_static='-Bstatic'
1149+ ;;
1150 esac
1151 ;;
1152 esac
1153@@ -9896,7 +9964,6 @@
1154 hardcode_direct=no
1155 hardcode_direct_absolute=no
1156 hardcode_libdir_flag_spec=
1157- hardcode_libdir_flag_spec_ld=
1158 hardcode_libdir_separator=
1159 hardcode_minus_L=no
1160 hardcode_shlibpath_var=unsupported
1161@@ -10146,8 +10213,7 @@
1162 xlf* | bgf* | bgxlf* | mpixlf*)
1163 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
1164 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
1165- hardcode_libdir_flag_spec=
1166- hardcode_libdir_flag_spec_ld='-rpath $libdir'
1167+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1168 archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
1169 if test "x$supports_anon_versioning" = xyes; then
1170 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
1171@@ -10526,6 +10592,7 @@
1172 # The linker will not automatically build a static lib if we build a DLL.
1173 # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
1174 enable_shared_with_static_runtimes=yes
1175+ exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
1176 export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
1177 # Don't use ranlib
1178 old_postinstall_cmds='chmod 644 $oldlib'
1179@@ -10571,6 +10638,7 @@
1180 hardcode_shlibpath_var=unsupported
1181 if test "$lt_cv_ld_force_load" = "yes"; then
1182 whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
1183+
1184 else
1185 whole_archive_flag_spec=''
1186 fi
1187@@ -10599,10 +10667,6 @@
1188 hardcode_shlibpath_var=no
1189 ;;
1190
1191- freebsd1*)
1192- ld_shlibs=no
1193- ;;
1194-
1195 # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
1196 # support. Future versions do this automatically, but an explicit c++rt0.o
1197 # does not break anything, and helps significantly (at the cost of a little
1198@@ -10615,7 +10679,7 @@
1199 ;;
1200
1201 # Unfortunately, older versions of FreeBSD 2 do not have this feature.
1202- freebsd2*)
1203+ freebsd2.*)
1204 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
1205 hardcode_direct=yes
1206 hardcode_minus_L=yes
1207@@ -10654,7 +10718,6 @@
1208 fi
1209 if test "$with_gnu_ld" = no; then
1210 hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
1211- hardcode_libdir_flag_spec_ld='+b $libdir'
1212 hardcode_libdir_separator=:
1213 hardcode_direct=yes
1214 hardcode_direct_absolute=yes
1215@@ -11278,11 +11341,6 @@
1216
1217
1218
1219-
1220-
1221-
1222-
1223-
1224 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
1225 $as_echo_n "checking dynamic linker characteristics... " >&6; }
1226
1227@@ -11372,7 +11430,7 @@
1228
1229 case $host_os in
1230 aix3*)
1231- version_type=linux
1232+ version_type=linux # correct to gnu/linux during the next big refactor
1233 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
1234 shlibpath_var=LIBPATH
1235
1236@@ -11381,7 +11439,7 @@
1237 ;;
1238
1239 aix[4-9]*)
1240- version_type=linux
1241+ version_type=linux # correct to gnu/linux during the next big refactor
1242 need_lib_prefix=no
1243 need_version=no
1244 hardcode_into_libs=yes
1245@@ -11446,7 +11504,7 @@
1246 ;;
1247
1248 bsdi[45]*)
1249- version_type=linux
1250+ version_type=linux # correct to gnu/linux during the next big refactor
1251 need_version=no
1252 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1253 soname_spec='${libname}${release}${shared_ext}$major'
1254@@ -11585,7 +11643,7 @@
1255 ;;
1256
1257 dgux*)
1258- version_type=linux
1259+ version_type=linux # correct to gnu/linux during the next big refactor
1260 need_lib_prefix=no
1261 need_version=no
1262 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
1263@@ -11593,10 +11651,6 @@
1264 shlibpath_var=LD_LIBRARY_PATH
1265 ;;
1266
1267-freebsd1*)
1268- dynamic_linker=no
1269- ;;
1270-
1271 freebsd* | dragonfly*)
1272 # DragonFly does not have aout. When/if they implement a new
1273 # versioning mechanism, adjust this.
1274@@ -11604,7 +11658,7 @@
1275 objformat=`/usr/bin/objformat`
1276 else
1277 case $host_os in
1278- freebsd[123]*) objformat=aout ;;
1279+ freebsd[23].*) objformat=aout ;;
1280 *) objformat=elf ;;
1281 esac
1282 fi
1283@@ -11635,7 +11689,7 @@
1284 esac
1285 shlibpath_var=LD_LIBRARY_PATH
1286 case $host_os in
1287- freebsd2*)
1288+ freebsd2.*)
1289 shlibpath_overrides_runpath=yes
1290 ;;
1291 freebsd3.[01]* | freebsdelf3.[01]*)
1292@@ -11655,17 +11709,18 @@
1293 ;;
1294
1295 gnu*)
1296- version_type=linux
1297+ version_type=linux # correct to gnu/linux during the next big refactor
1298 need_lib_prefix=no
1299 need_version=no
1300 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
1301 soname_spec='${libname}${release}${shared_ext}$major'
1302 shlibpath_var=LD_LIBRARY_PATH
1303+ shlibpath_overrides_runpath=no
1304 hardcode_into_libs=yes
1305 ;;
1306
1307 haiku*)
1308- version_type=linux
1309+ version_type=linux # correct to gnu/linux during the next big refactor
1310 need_lib_prefix=no
1311 need_version=no
1312 dynamic_linker="$host_os runtime_loader"
1313@@ -11726,7 +11781,7 @@
1314 ;;
1315
1316 interix[3-9]*)
1317- version_type=linux
1318+ version_type=linux # correct to gnu/linux during the next big refactor
1319 need_lib_prefix=no
1320 need_version=no
1321 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
1322@@ -11742,7 +11797,7 @@
1323 nonstopux*) version_type=nonstopux ;;
1324 *)
1325 if test "$lt_cv_prog_gnu_ld" = yes; then
1326- version_type=linux
1327+ version_type=linux # correct to gnu/linux during the next big refactor
1328 else
1329 version_type=irix
1330 fi ;;
1331@@ -11779,9 +11834,9 @@
1332 dynamic_linker=no
1333 ;;
1334
1335-# This must be Linux ELF.
1336+# This must be glibc/ELF.
1337 linux* | k*bsd*-gnu | kopensolaris*-gnu)
1338- version_type=linux
1339+ version_type=linux # correct to gnu/linux during the next big refactor
1340 need_lib_prefix=no
1341 need_version=no
1342 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1343@@ -11863,7 +11918,7 @@
1344 ;;
1345
1346 newsos6)
1347- version_type=linux
1348+ version_type=linux # correct to gnu/linux during the next big refactor
1349 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1350 shlibpath_var=LD_LIBRARY_PATH
1351 shlibpath_overrides_runpath=yes
1352@@ -11932,7 +11987,7 @@
1353 ;;
1354
1355 solaris*)
1356- version_type=linux
1357+ version_type=linux # correct to gnu/linux during the next big refactor
1358 need_lib_prefix=no
1359 need_version=no
1360 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1361@@ -11957,7 +12012,7 @@
1362 ;;
1363
1364 sysv4 | sysv4.3*)
1365- version_type=linux
1366+ version_type=linux # correct to gnu/linux during the next big refactor
1367 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1368 soname_spec='${libname}${release}${shared_ext}$major'
1369 shlibpath_var=LD_LIBRARY_PATH
1370@@ -11981,7 +12036,7 @@
1371
1372 sysv4*MP*)
1373 if test -d /usr/nec ;then
1374- version_type=linux
1375+ version_type=linux # correct to gnu/linux during the next big refactor
1376 library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
1377 soname_spec='$libname${shared_ext}.$major'
1378 shlibpath_var=LD_LIBRARY_PATH
1379@@ -12012,7 +12067,7 @@
1380
1381 tpf*)
1382 # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
1383- version_type=linux
1384+ version_type=linux # correct to gnu/linux during the next big refactor
1385 need_lib_prefix=no
1386 need_version=no
1387 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1388@@ -12022,7 +12077,7 @@
1389 ;;
1390
1391 uts4*)
1392- version_type=linux
1393+ version_type=linux # correct to gnu/linux during the next big refactor
1394 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1395 soname_spec='${libname}${release}${shared_ext}$major'
1396 shlibpath_var=LD_LIBRARY_PATH
1397@@ -12804,6 +12859,8 @@
1398
1399
1400
1401+
1402+
1403 ac_config_commands="$ac_config_commands libtool"
1404
1405
1406@@ -13500,7 +13557,6 @@
1407 hardcode_direct_CXX=no
1408 hardcode_direct_absolute_CXX=no
1409 hardcode_libdir_flag_spec_CXX=
1410-hardcode_libdir_flag_spec_ld_CXX=
1411 hardcode_libdir_separator_CXX=
1412 hardcode_minus_L_CXX=no
1413 hardcode_shlibpath_var_CXX=unsupported
1414@@ -14084,6 +14140,7 @@
1415 hardcode_shlibpath_var_CXX=unsupported
1416 if test "$lt_cv_ld_force_load" = "yes"; then
1417 whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
1418+
1419 else
1420 whole_archive_flag_spec_CXX=''
1421 fi
1422@@ -14128,7 +14185,7 @@
1423 esac
1424 ;;
1425
1426- freebsd[12]*)
1427+ freebsd2.*)
1428 # C++ shared libraries reported to be fairly broken before
1429 # switch to ELF
1430 ld_shlibs_CXX=no
1431@@ -14804,6 +14861,7 @@
1432 case "$CC $CFLAGS " in #(
1433 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
1434 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
1435+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
1436 esac
1437
1438 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
1439@@ -15593,7 +15651,9 @@
1440 ;;
1441 cygwin* | mingw* | cegcc*)
1442 case $cc_basename in
1443- cl*) ;;
1444+ cl*)
1445+ exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
1446+ ;;
1447 *)
1448 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
1449 exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
1450@@ -15746,8 +15806,6 @@
1451
1452
1453
1454-
1455-
1456 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
1457 $as_echo_n "checking dynamic linker characteristics... " >&6; }
1458
1459@@ -15773,7 +15831,7 @@
1460
1461 case $host_os in
1462 aix3*)
1463- version_type=linux
1464+ version_type=linux # correct to gnu/linux during the next big refactor
1465 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
1466 shlibpath_var=LIBPATH
1467
1468@@ -15782,7 +15840,7 @@
1469 ;;
1470
1471 aix[4-9]*)
1472- version_type=linux
1473+ version_type=linux # correct to gnu/linux during the next big refactor
1474 need_lib_prefix=no
1475 need_version=no
1476 hardcode_into_libs=yes
1477@@ -15847,7 +15905,7 @@
1478 ;;
1479
1480 bsdi[45]*)
1481- version_type=linux
1482+ version_type=linux # correct to gnu/linux during the next big refactor
1483 need_version=no
1484 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1485 soname_spec='${libname}${release}${shared_ext}$major'
1486@@ -15984,7 +16042,7 @@
1487 ;;
1488
1489 dgux*)
1490- version_type=linux
1491+ version_type=linux # correct to gnu/linux during the next big refactor
1492 need_lib_prefix=no
1493 need_version=no
1494 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
1495@@ -15992,10 +16050,6 @@
1496 shlibpath_var=LD_LIBRARY_PATH
1497 ;;
1498
1499-freebsd1*)
1500- dynamic_linker=no
1501- ;;
1502-
1503 freebsd* | dragonfly*)
1504 # DragonFly does not have aout. When/if they implement a new
1505 # versioning mechanism, adjust this.
1506@@ -16003,7 +16057,7 @@
1507 objformat=`/usr/bin/objformat`
1508 else
1509 case $host_os in
1510- freebsd[123]*) objformat=aout ;;
1511+ freebsd[23].*) objformat=aout ;;
1512 *) objformat=elf ;;
1513 esac
1514 fi
1515@@ -16034,7 +16088,7 @@
1516 esac
1517 shlibpath_var=LD_LIBRARY_PATH
1518 case $host_os in
1519- freebsd2*)
1520+ freebsd2.*)
1521 shlibpath_overrides_runpath=yes
1522 ;;
1523 freebsd3.[01]* | freebsdelf3.[01]*)
1524@@ -16054,17 +16108,18 @@
1525 ;;
1526
1527 gnu*)
1528- version_type=linux
1529+ version_type=linux # correct to gnu/linux during the next big refactor
1530 need_lib_prefix=no
1531 need_version=no
1532 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
1533 soname_spec='${libname}${release}${shared_ext}$major'
1534 shlibpath_var=LD_LIBRARY_PATH
1535+ shlibpath_overrides_runpath=no
1536 hardcode_into_libs=yes
1537 ;;
1538
1539 haiku*)
1540- version_type=linux
1541+ version_type=linux # correct to gnu/linux during the next big refactor
1542 need_lib_prefix=no
1543 need_version=no
1544 dynamic_linker="$host_os runtime_loader"
1545@@ -16125,7 +16180,7 @@
1546 ;;
1547
1548 interix[3-9]*)
1549- version_type=linux
1550+ version_type=linux # correct to gnu/linux during the next big refactor
1551 need_lib_prefix=no
1552 need_version=no
1553 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
1554@@ -16141,7 +16196,7 @@
1555 nonstopux*) version_type=nonstopux ;;
1556 *)
1557 if test "$lt_cv_prog_gnu_ld" = yes; then
1558- version_type=linux
1559+ version_type=linux # correct to gnu/linux during the next big refactor
1560 else
1561 version_type=irix
1562 fi ;;
1563@@ -16178,9 +16233,9 @@
1564 dynamic_linker=no
1565 ;;
1566
1567-# This must be Linux ELF.
1568+# This must be glibc/ELF.
1569 linux* | k*bsd*-gnu | kopensolaris*-gnu)
1570- version_type=linux
1571+ version_type=linux # correct to gnu/linux during the next big refactor
1572 need_lib_prefix=no
1573 need_version=no
1574 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1575@@ -16262,7 +16317,7 @@
1576 ;;
1577
1578 newsos6)
1579- version_type=linux
1580+ version_type=linux # correct to gnu/linux during the next big refactor
1581 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1582 shlibpath_var=LD_LIBRARY_PATH
1583 shlibpath_overrides_runpath=yes
1584@@ -16331,7 +16386,7 @@
1585 ;;
1586
1587 solaris*)
1588- version_type=linux
1589+ version_type=linux # correct to gnu/linux during the next big refactor
1590 need_lib_prefix=no
1591 need_version=no
1592 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1593@@ -16356,7 +16411,7 @@
1594 ;;
1595
1596 sysv4 | sysv4.3*)
1597- version_type=linux
1598+ version_type=linux # correct to gnu/linux during the next big refactor
1599 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1600 soname_spec='${libname}${release}${shared_ext}$major'
1601 shlibpath_var=LD_LIBRARY_PATH
1602@@ -16380,7 +16435,7 @@
1603
1604 sysv4*MP*)
1605 if test -d /usr/nec ;then
1606- version_type=linux
1607+ version_type=linux # correct to gnu/linux during the next big refactor
1608 library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
1609 soname_spec='$libname${shared_ext}.$major'
1610 shlibpath_var=LD_LIBRARY_PATH
1611@@ -16411,7 +16466,7 @@
1612
1613 tpf*)
1614 # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
1615- version_type=linux
1616+ version_type=linux # correct to gnu/linux during the next big refactor
1617 need_lib_prefix=no
1618 need_version=no
1619 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1620@@ -16421,7 +16476,7 @@
1621 ;;
1622
1623 uts4*)
1624- version_type=linux
1625+ version_type=linux # correct to gnu/linux during the next big refactor
1626 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1627 soname_spec='${libname}${release}${shared_ext}$major'
1628 shlibpath_var=LD_LIBRARY_PATH
1629@@ -16908,7 +16963,7 @@
1630
1631 SNAPPY_MAJOR="1"
1632 SNAPPY_MINOR="0"
1633-SNAPPY_PATCHLEVEL="3"
1634+SNAPPY_PATCHLEVEL="5"
1635
1636
1637
1638@@ -16989,6 +17044,46 @@
1639 fi
1640
1641
1642+# Extract the first word of "escript", so it can be a program name with args.
1643+set dummy escript; ac_word=$2
1644+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1645+$as_echo_n "checking for $ac_word... " >&6; }
1646+if ${ac_cv_path_ESCRIPT+:} false; then :
1647+ $as_echo_n "(cached) " >&6
1648+else
1649+ case $ESCRIPT in
1650+ [\\/]* | ?:[\\/]*)
1651+ ac_cv_path_ESCRIPT="$ESCRIPT" # Let the user override the test with a path.
1652+ ;;
1653+ *)
1654+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1655+for as_dir in $PATH
1656+do
1657+ IFS=$as_save_IFS
1658+ test -z "$as_dir" && as_dir=.
1659+ for ac_exec_ext in '' $ac_executable_extensions; do
1660+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1661+ ac_cv_path_ESCRIPT="$as_dir/$ac_word$ac_exec_ext"
1662+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1663+ break 2
1664+ fi
1665+done
1666+ done
1667+IFS=$as_save_IFS
1668+
1669+ ;;
1670+esac
1671+fi
1672+ESCRIPT=$ac_cv_path_ESCRIPT
1673+if test -n "$ESCRIPT"; then
1674+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ESCRIPT" >&5
1675+$as_echo "$ESCRIPT" >&6; }
1676+else
1677+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1678+$as_echo "no" >&6; }
1679+fi
1680+
1681+
1682
1683 if test x${ERL} = x; then :
1684
1685@@ -18936,6 +19031,9 @@
1686 fi
1687 fi
1688
1689+ERL_VERSION_COMMAND="${ESCRIPT} bin/erlang-version.escript"
1690+erlangversion=`${ERL_VERSION_COMMAND}`
1691+
1692
1693
1694
1695@@ -19033,11 +19131,11 @@
1696 package_name="Apache CouchDB"
1697
1698
1699-version="1.4.0"
1700+version="1.5.0"
1701
1702 version_major="1"
1703
1704-version_minor="4"
1705+version_minor="5"
1706
1707 version_revision="0"
1708
1709@@ -19063,6 +19161,11 @@
1710
1711 localstaterundir=${localstatedir}/run/${package_identifier}
1712
1713+erlangversion=${erlangversion}
1714+
1715+erlangbin=${ERL}
1716+
1717+
1718
1719 # On Windows we install directly into our erlang distribution.
1720 if test x${IS_WINDOWS} = xTRUE; then
1721@@ -19129,8 +19232,12 @@
1722
1723 ac_config_files="$ac_config_files src/couch_mrview/Makefile"
1724
1725+ac_config_files="$ac_config_files src/couch_plugins/Makefile"
1726+
1727 ac_config_files="$ac_config_files src/couch_replicator/Makefile"
1728
1729+ac_config_files="$ac_config_files src/couchjs-node/Makefile"
1730+
1731 ac_config_files="$ac_config_files src/couchdb/couch.app.tpl"
1732
1733 ac_config_files="$ac_config_files src/couchdb/Makefile"
1734@@ -19751,7 +19858,7 @@
1735 # report actual input values of CONFIG_FILES etc. instead of their
1736 # values after options handling.
1737 ac_log="
1738-This file was extended by Apache CouchDB $as_me 1.4.0, which was
1739+This file was extended by Apache CouchDB $as_me 1.5.0, which was
1740 generated by GNU Autoconf 2.69. Invocation command line was
1741
1742 CONFIG_FILES = $CONFIG_FILES
1743@@ -19817,7 +19924,7 @@
1744 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1745 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1746 ac_cs_version="\\
1747-Apache CouchDB config.status 1.4.0
1748+Apache CouchDB config.status 1.5.0
1749 configured by $0, generated by GNU Autoconf 2.69,
1750 with options \\"\$ac_cs_config\\"
1751
1752@@ -19957,6 +20064,7 @@
1753 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
1754 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
1755 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
1756+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
1757 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
1758 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
1759 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
1760@@ -20037,7 +20145,6 @@
1761 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
1762 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
1763 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
1764-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
1765 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
1766 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
1767 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
1768@@ -20109,7 +20216,6 @@
1769 allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
1770 no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
1771 hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
1772-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
1773 hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
1774 hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
1775 hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
1776@@ -20151,6 +20257,7 @@
1777 OBJDUMP \
1778 SHELL \
1779 ECHO \
1780+PATH_SEPARATOR \
1781 SED \
1782 GREP \
1783 EGREP \
1784@@ -20199,7 +20306,6 @@
1785 allow_undefined_flag \
1786 no_undefined_flag \
1787 hardcode_libdir_flag_spec \
1788-hardcode_libdir_flag_spec_ld \
1789 hardcode_libdir_separator \
1790 exclude_expsyms \
1791 include_expsyms \
1792@@ -20233,7 +20339,6 @@
1793 allow_undefined_flag_CXX \
1794 no_undefined_flag_CXX \
1795 hardcode_libdir_flag_spec_CXX \
1796-hardcode_libdir_flag_spec_ld_CXX \
1797 hardcode_libdir_separator_CXX \
1798 exclude_expsyms_CXX \
1799 include_expsyms_CXX \
1800@@ -20352,7 +20457,9 @@
1801 "src/couch_dbupdates/Makefile") CONFIG_FILES="$CONFIG_FILES src/couch_dbupdates/Makefile" ;;
1802 "src/couch_index/Makefile") CONFIG_FILES="$CONFIG_FILES src/couch_index/Makefile" ;;
1803 "src/couch_mrview/Makefile") CONFIG_FILES="$CONFIG_FILES src/couch_mrview/Makefile" ;;
1804+ "src/couch_plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/couch_plugins/Makefile" ;;
1805 "src/couch_replicator/Makefile") CONFIG_FILES="$CONFIG_FILES src/couch_replicator/Makefile" ;;
1806+ "src/couchjs-node/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchjs-node/Makefile" ;;
1807 "src/couchdb/couch.app.tpl") CONFIG_FILES="$CONFIG_FILES src/couchdb/couch.app.tpl" ;;
1808 "src/couchdb/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/Makefile" ;;
1809 "src/couchdb/priv/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/priv/Makefile" ;;
1810@@ -21082,8 +21189,8 @@
1811 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1812 #
1813 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1814-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1815-# Inc.
1816+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
1817+# Foundation, Inc.
1818 # Written by Gordon Matzigkeit, 1996
1819 #
1820 # This file is part of GNU Libtool.
1821@@ -21146,6 +21253,9 @@
1822 # An echo program that protects backslashes.
1823 ECHO=$lt_ECHO
1824
1825+# The PATH separator for the build system.
1826+PATH_SEPARATOR=$lt_PATH_SEPARATOR
1827+
1828 # The host system.
1829 host_alias=$host_alias
1830 host=$host
1831@@ -21441,10 +21551,6 @@
1832 # This must work even if \$libdir does not exist
1833 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
1834
1835-# If ld is used when linking, flag to hardcode \$libdir into a binary
1836-# during linking. This must work even if \$libdir does not exist.
1837-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
1838-
1839 # Whether we need a single "-rpath" flag with a separated argument.
1840 hardcode_libdir_separator=$lt_hardcode_libdir_separator
1841
1842@@ -21787,10 +21893,6 @@
1843 # This must work even if \$libdir does not exist
1844 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
1845
1846-# If ld is used when linking, flag to hardcode \$libdir into a binary
1847-# during linking. This must work even if \$libdir does not exist.
1848-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
1849-
1850 # Whether we need a single "-rpath" flag with a separated argument.
1851 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
1852
1853
1854=== modified file 'configure.ac'
1855--- configure.ac 2013-08-28 16:28:32 +0000
1856+++ configure.ac 2013-12-01 23:56:33 +0000
1857@@ -40,7 +40,7 @@
1858 dnl Config for google snappy
1859 m4_define([snappy_major], [1])
1860 m4_define([snappy_minor], [0])
1861-m4_define([snappy_patchlevel], [3])
1862+m4_define([snappy_patchlevel], [5])
1863
1864 AC_PROG_CXX
1865 AC_LANG([C++])
1866@@ -123,12 +123,13 @@
1867 fi
1868
1869 AC_PATH_PROG([ERL], [erl])
1870+AC_PATH_PROG([ESCRIPT], [escript])
1871
1872 AS_IF([test x${ERL} = x], [
1873 AC_MSG_ERROR([Could not find the `erl' executable. Is Erlang installed?])
1874 ])
1875
1876-AC_ARG_WITH([erlang],
1877+AC_ARG_WITH([erlang],
1878 [AS_HELP_STRING([--with-erlang=PATH],
1879 [set PATH to the Erlang include directory])
1880 ], [
1881@@ -476,35 +477,35 @@
1882 docs_enabled=yes
1883 strictness_enabled=no
1884
1885-AC_ARG_ENABLE([init],
1886+AC_ARG_ENABLE([init],
1887 [AS_HELP_STRING([--disable-init],
1888 [don't install init script where applicable])
1889 ], [
1890 use_init=$enableval
1891 ], [])
1892
1893-AC_ARG_ENABLE([launchd],
1894+AC_ARG_ENABLE([launchd],
1895 [AS_HELP_STRING([--disable-launchd],
1896 [don't install launchd configuration where applicable])
1897 ], [
1898 use_launchd=$enableval
1899 ], [])
1900
1901-AC_ARG_ENABLE([native-mochijson],
1902+AC_ARG_ENABLE([native-mochijson],
1903 [AS_HELP_STRING([--enable-native-mochijson],
1904 [compile mochijson to native code (EXPERIMENTAL)])
1905 ], [
1906 native_mochijson_enabled=$enableval
1907 ], [])
1908
1909-AC_ARG_ENABLE([tests],
1910+AC_ARG_ENABLE([tests],
1911 [AS_HELP_STRING([--disable-tests],
1912 [skip tests during build])
1913 ], [
1914 tests_enabled=$enableval
1915 ], [])
1916
1917-AC_ARG_ENABLE([docs],
1918+AC_ARG_ENABLE([docs],
1919 [AS_HELP_STRING([--disable-docs],
1920 [skip docs during build])
1921 ], [
1922@@ -614,7 +615,7 @@
1923 build_html=yes
1924 if test x${HAS_MAKEINFO} = xyes; then
1925 build_info=yes
1926- fi
1927+ fi
1928 if test x${HAS_PDFLATEX} = xyes; then
1929 build_pdf=yes
1930 fi
1931@@ -650,6 +651,9 @@
1932 fi
1933 fi
1934
1935+ERL_VERSION_COMMAND="${ESCRIPT} bin/erlang-version.escript"
1936+erlangversion=`${ERL_VERSION_COMMAND}`
1937+
1938 AC_ARG_VAR([ERL], [path to the `erl' executable])
1939 AC_ARG_VAR([ERLC], [path to the `erlc' executable])
1940
1941@@ -688,6 +692,9 @@
1942 AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
1943 AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
1944 AC_SUBST([localstaterundir], [${localstatedir}/run/${package_identifier}])
1945+AC_SUBST([erlangversion], [${erlangversion}])
1946+AC_SUBST([erlangbin], [${ERL}])
1947+
1948
1949 # On Windows we install directly into our erlang distribution.
1950 if test x${IS_WINDOWS} = xTRUE; then
1951@@ -727,7 +734,9 @@
1952 AC_CONFIG_FILES([src/couch_dbupdates/Makefile])
1953 AC_CONFIG_FILES([src/couch_index/Makefile])
1954 AC_CONFIG_FILES([src/couch_mrview/Makefile])
1955+AC_CONFIG_FILES([src/couch_plugins/Makefile])
1956 AC_CONFIG_FILES([src/couch_replicator/Makefile])
1957+AC_CONFIG_FILES([src/couchjs-node/Makefile])
1958 AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
1959 AC_CONFIG_FILES([src/couchdb/Makefile])
1960 AC_CONFIG_FILES([src/couchdb/priv/Makefile])
1961
1962=== modified file 'debian/changelog'
1963--- debian/changelog 2013-08-28 16:28:32 +0000
1964+++ debian/changelog 2013-12-01 23:56:33 +0000
1965@@ -1,3 +1,22 @@
1966+couchdb (1.5.0-0ubuntu1) trusty; urgency=low
1967+
1968+ * New upstream release (LP: #1254371)
1969+ * Don't include `couchdb` info page in `couchdb-bin` binary package as it
1970+ provides no meaningful benefit over the `couchdb` man page (note this change
1971+ means we don't need to add a Build-Depends on `install-info` for Trusty)
1972+ * Remove Build-Depends: texlive-latex-base, texlive-latex-recommended,
1973+ texlive-latex-extra, texlive-fonts-recommended, texinfo (as documentation
1974+ thus produced doesn't get included in the binary packages anyway)
1975+ * debian/rules: don't call ./configure with --enable-strictness as we dropped
1976+ Build-Depends on `texlive-*`, `texinfo`, plus didn't add `install-info`
1977+ * Add Build-Depends: lsb-release (used for [vendor] info in default.ini)
1978+ * debian/rules: insert proper [vendor] info in default.ini (note this should
1979+ be improved once there is a better mechanism upstream)
1980+ * debian/couchdb.upstart: start on filesystem and static-network-up,
1981+ stop on deconfiguring-networking, plus add "author" line
1982+
1983+ -- Jason Gerard DeRose <jason@system76.com> Sun, 01 Dec 2013 16:55:05 -0700
1984+
1985 couchdb (1.4.0-0ubuntu1) saucy; urgency=low
1986
1987 * New upstream release (LP: #1212481)
1988
1989=== modified file 'debian/control'
1990--- debian/control 2013-08-28 16:28:32 +0000
1991+++ debian/control 2013-12-01 23:56:33 +0000
1992@@ -17,11 +17,7 @@
1993 libicu-dev,
1994 libmozjs185-dev,
1995 python-sphinx (>= 1.1.3),
1996- texlive-latex-base,
1997- texlive-latex-recommended,
1998- texlive-latex-extra,
1999- texlive-fonts-recommended,
2000- texinfo,
2001+ lsb-release,
2002 Homepage: http://couchdb.apache.org/
2003
2004 Package: couchdb-common
2005
2006=== modified file 'debian/couchdb-bin.install'
2007--- debian/couchdb-bin.install 2013-08-28 16:28:32 +0000
2008+++ debian/couchdb-bin.install 2013-12-01 23:56:33 +0000
2009@@ -1,6 +1,5 @@
2010 debian/tmp/usr/bin
2011 debian/tmp/usr/lib
2012 debian/tmp/usr/share/man
2013-debian/tmp/usr/share/info
2014 debian/tmp/etc/couchdb/default.ini
2015 debian/tmp/etc/couchdb/default.d
2016
2017=== modified file 'debian/couchdb.upstart'
2018--- debian/couchdb.upstart 2013-08-28 16:28:32 +0000
2019+++ debian/couchdb.upstart 2013-12-01 23:56:33 +0000
2020@@ -1,9 +1,10 @@
2021 # couchdb - a RESTful document oriented database
2022
2023 description "Start the system-wide CouchDB instance"
2024+author "Jason Gerard DeRose <jason@system76.com>"
2025
2026-start on runlevel [2345]
2027-stop on runlevel [016]
2028+start on filesystem and static-network-up
2029+stop on deconfiguring-networking
2030 respawn
2031
2032 pre-start script
2033
2034=== modified file 'debian/rules'
2035--- debian/rules 2013-08-28 16:28:32 +0000
2036+++ debian/rules 2013-12-01 23:56:33 +0000
2037@@ -4,7 +4,9 @@
2038 dh $@
2039
2040 override_dh_auto_configure:
2041- dh_auto_configure -- --enable-strictness --disable-init
2042+ dh_auto_configure -- --disable-init
2043+ sed -i s/%package_author_name%/`lsb_release -si`/ etc/couchdb/default.ini.tpl
2044+ sed -i s/%version%/`lsb_release -sr`/ etc/couchdb/default.ini.tpl
2045
2046 override_dh_auto_install:
2047 dh_auto_install
2048
2049=== modified file 'etc/Makefile.in'
2050--- etc/Makefile.in 2013-08-28 16:28:32 +0000
2051+++ etc/Makefile.in 2013-12-01 23:56:33 +0000
2052@@ -181,6 +181,7 @@
2053 ERLANG_FLAGS = @ERLANG_FLAGS@
2054 ERLC = @ERLC@
2055 ERLC_FLAGS = @ERLC_FLAGS@
2056+ESCRIPT = @ESCRIPT@
2057 EXEEXT = @EXEEXT@
2058 FGREP = @FGREP@
2059 FLAGS = @FLAGS@
2060@@ -269,6 +270,8 @@
2061 datarootdir = @datarootdir@
2062 docdir = @docdir@
2063 dvidir = @dvidir@
2064+erlangbin = @erlangbin@
2065+erlangversion = @erlangversion@
2066 exec_prefix = @exec_prefix@
2067 host = @host@
2068 host_alias = @host_alias@
2069
2070=== modified file 'etc/couchdb/Makefile.am'
2071--- etc/couchdb/Makefile.am 2013-08-28 16:28:32 +0000
2072+++ etc/couchdb/Makefile.am 2013-12-01 23:56:33 +0000
2073@@ -44,6 +44,7 @@
2074 -e "s|%localconfdir%|$(localconfdir)|g" \
2075 -e "s|%localdatadir%|$(localdatadir)|g" \
2076 -e "s|%localbuilddatadir%|$(localdatadir)|g" \
2077+ -e "s|%locallibdir%|$(locallibdir)|g" \
2078 -e "s|%localstatelibdir%|$(localstatelibdir)|g" \
2079 -e "s|%localstatelogdir%|$(localstatelogdir)|g" \
2080 -e "s|%localstaterundir%|$(localstaterundir)|g" \
2081@@ -58,6 +59,7 @@
2082 sed -e "s|%bindir%|$(abs_top_builddir)/bin|g" \
2083 -e "s|%localconfdir%|$(abs_top_builddir)/etc/couchdb|g" \
2084 -e "s|%localdatadir%|$(abs_top_srcdir)/share|g" \
2085+ -e "s|%locallibdir%|$(abs_top_builddir)/tmp|g" \
2086 -e "s|%localbuilddatadir%|$(abs_top_builddir)/share|g" \
2087 -e "s|%localstatelibdir%|$(abs_top_builddir)/tmp/lib|g" \
2088 -e "s|%localstatelogdir%|$(abs_top_builddir)/tmp/log|g" \
2089
2090=== modified file 'etc/couchdb/Makefile.in'
2091--- etc/couchdb/Makefile.in 2013-08-28 16:28:32 +0000
2092+++ etc/couchdb/Makefile.in 2013-12-01 23:56:33 +0000
2093@@ -137,6 +137,7 @@
2094 ERLANG_FLAGS = @ERLANG_FLAGS@
2095 ERLC = @ERLC@
2096 ERLC_FLAGS = @ERLC_FLAGS@
2097+ESCRIPT = @ESCRIPT@
2098 EXEEXT = @EXEEXT@
2099 FGREP = @FGREP@
2100 FLAGS = @FLAGS@
2101@@ -225,6 +226,8 @@
2102 datarootdir = @datarootdir@
2103 docdir = @docdir@
2104 dvidir = @dvidir@
2105+erlangbin = @erlangbin@
2106+erlangversion = @erlangversion@
2107 exec_prefix = @exec_prefix@
2108 host = @host@
2109 host_alias = @host_alias@
2110@@ -526,6 +529,7 @@
2111 @WINDOWS_FALSE@ -e "s|%localconfdir%|$(localconfdir)|g" \
2112 @WINDOWS_FALSE@ -e "s|%localdatadir%|$(localdatadir)|g" \
2113 @WINDOWS_FALSE@ -e "s|%localbuilddatadir%|$(localdatadir)|g" \
2114+@WINDOWS_FALSE@ -e "s|%locallibdir%|$(locallibdir)|g" \
2115 @WINDOWS_FALSE@ -e "s|%localstatelibdir%|$(localstatelibdir)|g" \
2116 @WINDOWS_FALSE@ -e "s|%localstatelogdir%|$(localstatelogdir)|g" \
2117 @WINDOWS_FALSE@ -e "s|%localstaterundir%|$(localstaterundir)|g" \
2118@@ -539,6 +543,7 @@
2119 sed -e "s|%bindir%|$(abs_top_builddir)/bin|g" \
2120 -e "s|%localconfdir%|$(abs_top_builddir)/etc/couchdb|g" \
2121 -e "s|%localdatadir%|$(abs_top_srcdir)/share|g" \
2122+ -e "s|%locallibdir%|$(abs_top_builddir)/tmp|g" \
2123 -e "s|%localbuilddatadir%|$(abs_top_builddir)/share|g" \
2124 -e "s|%localstatelibdir%|$(abs_top_builddir)/tmp/lib|g" \
2125 -e "s|%localstatelogdir%|$(abs_top_builddir)/tmp/log|g" \
2126
2127=== modified file 'etc/couchdb/default.ini.tpl.in'
2128--- etc/couchdb/default.ini.tpl.in 2013-08-28 16:28:32 +0000
2129+++ etc/couchdb/default.ini.tpl.in 2013-12-01 23:56:33 +0000
2130@@ -27,6 +27,8 @@
2131 ; time for writes when there are many attachment write requests in parallel.
2132 attachment_stream_buffer_size = 4096
2133
2134+plugin_dir = %locallibdir%/plugins
2135+
2136 [database_compaction]
2137 ; larger buffer sizes can originate smaller files
2138 doc_buffer_size = 524288 ; value in bytes
2139@@ -160,6 +162,7 @@
2140 _session = {couch_httpd_auth, handle_session_req}
2141 _oauth = {couch_httpd_oauth, handle_oauth_req}
2142 _db_updates = {couch_dbupdates_httpd, handle_req}
2143+_plugins = {couch_plugins_httpd, handle_req}
2144
2145 [httpd_db_handlers]
2146 _all_docs = {couch_mrview_http, handle_all_docs_req}
2147
2148=== modified file 'etc/couchdb/local.ini'
2149--- etc/couchdb/local.ini 2013-08-28 16:28:32 +0000
2150+++ etc/couchdb/local.ini 2013-12-01 23:56:33 +0000
2151@@ -25,6 +25,10 @@
2152 ; the whitelist.
2153 ;config_whitelist = [{httpd,config_whitelist}, {log,level}, {etc,etc}]
2154
2155+[query_servers]
2156+;nodejs = /usr/local/bin/couchjs-node /path/to/couchdb/share/server/main.js
2157+
2158+
2159 [httpd_global_handlers]
2160 ;_google = {couch_httpd_proxy, handle_proxy_req, <<"http://www.google.com">>}
2161
2162
2163=== modified file 'etc/default/Makefile.in'
2164--- etc/default/Makefile.in 2013-08-28 16:28:32 +0000
2165+++ etc/default/Makefile.in 2013-12-01 23:56:33 +0000
2166@@ -106,6 +106,7 @@
2167 ERLANG_FLAGS = @ERLANG_FLAGS@
2168 ERLC = @ERLC@
2169 ERLC_FLAGS = @ERLC_FLAGS@
2170+ESCRIPT = @ESCRIPT@
2171 EXEEXT = @EXEEXT@
2172 FGREP = @FGREP@
2173 FLAGS = @FLAGS@
2174@@ -194,6 +195,8 @@
2175 datarootdir = @datarootdir@
2176 docdir = @docdir@
2177 dvidir = @dvidir@
2178+erlangbin = @erlangbin@
2179+erlangversion = @erlangversion@
2180 exec_prefix = @exec_prefix@
2181 host = @host@
2182 host_alias = @host_alias@
2183
2184=== modified file 'etc/init/Makefile.in'
2185--- etc/init/Makefile.in 2013-08-28 16:28:32 +0000
2186+++ etc/init/Makefile.in 2013-12-01 23:56:33 +0000
2187@@ -107,6 +107,7 @@
2188 ERLANG_FLAGS = @ERLANG_FLAGS@
2189 ERLC = @ERLC@
2190 ERLC_FLAGS = @ERLC_FLAGS@
2191+ESCRIPT = @ESCRIPT@
2192 EXEEXT = @EXEEXT@
2193 FGREP = @FGREP@
2194 FLAGS = @FLAGS@
2195@@ -195,6 +196,8 @@
2196 datarootdir = @datarootdir@
2197 docdir = @docdir@
2198 dvidir = @dvidir@
2199+erlangbin = @erlangbin@
2200+erlangversion = @erlangversion@
2201 exec_prefix = @exec_prefix@
2202 host = @host@
2203 host_alias = @host_alias@
2204
2205=== modified file 'etc/launchd/Makefile.in'
2206--- etc/launchd/Makefile.in 2013-08-28 16:28:32 +0000
2207+++ etc/launchd/Makefile.in 2013-12-01 23:56:33 +0000
2208@@ -107,6 +107,7 @@
2209 ERLANG_FLAGS = @ERLANG_FLAGS@
2210 ERLC = @ERLC@
2211 ERLC_FLAGS = @ERLC_FLAGS@
2212+ESCRIPT = @ESCRIPT@
2213 EXEEXT = @EXEEXT@
2214 FGREP = @FGREP@
2215 FLAGS = @FLAGS@
2216@@ -195,6 +196,8 @@
2217 datarootdir = @datarootdir@
2218 docdir = @docdir@
2219 dvidir = @dvidir@
2220+erlangbin = @erlangbin@
2221+erlangversion = @erlangversion@
2222 exec_prefix = @exec_prefix@
2223 host = @host@
2224 host_alias = @host_alias@
2225
2226=== modified file 'etc/logrotate.d/Makefile.in'
2227--- etc/logrotate.d/Makefile.in 2013-08-28 16:28:32 +0000
2228+++ etc/logrotate.d/Makefile.in 2013-12-01 23:56:33 +0000
2229@@ -107,6 +107,7 @@
2230 ERLANG_FLAGS = @ERLANG_FLAGS@
2231 ERLC = @ERLC@
2232 ERLC_FLAGS = @ERLC_FLAGS@
2233+ESCRIPT = @ESCRIPT@
2234 EXEEXT = @EXEEXT@
2235 FGREP = @FGREP@
2236 FLAGS = @FLAGS@
2237@@ -195,6 +196,8 @@
2238 datarootdir = @datarootdir@
2239 docdir = @docdir@
2240 dvidir = @dvidir@
2241+erlangbin = @erlangbin@
2242+erlangversion = @erlangversion@
2243 exec_prefix = @exec_prefix@
2244 host = @host@
2245 host_alias = @host_alias@
2246
2247=== modified file 'etc/windows/Makefile.in'
2248--- etc/windows/Makefile.in 2013-08-28 16:28:32 +0000
2249+++ etc/windows/Makefile.in 2013-12-01 23:56:33 +0000
2250@@ -106,6 +106,7 @@
2251 ERLANG_FLAGS = @ERLANG_FLAGS@
2252 ERLC = @ERLC@
2253 ERLC_FLAGS = @ERLC_FLAGS@
2254+ESCRIPT = @ESCRIPT@
2255 EXEEXT = @EXEEXT@
2256 FGREP = @FGREP@
2257 FLAGS = @FLAGS@
2258@@ -194,6 +195,8 @@
2259 datarootdir = @datarootdir@
2260 docdir = @docdir@
2261 dvidir = @dvidir@
2262+erlangbin = @erlangbin@
2263+erlangversion = @erlangversion@
2264 exec_prefix = @exec_prefix@
2265 host = @host@
2266 host_alias = @host_alias@
2267
2268=== modified file 'license.skip'
2269--- license.skip 2013-08-28 16:28:32 +0000
2270+++ license.skip 2013-12-01 23:56:33 +0000
2271@@ -24,6 +24,7 @@
2272 ^bin/Makefile.in
2273 ^bin/couchdb.1
2274 ^bin/couchjs.1
2275+^bin/erlang-version.escript
2276 ^build-aux/.*
2277 ^config..*
2278 ^configure
2279@@ -59,8 +60,14 @@
2280 ^share/doc/Makefile
2281 ^share/doc/Makefile.in
2282 ^share/doc/build/.*
2283+^share/doc/ext/__pycache__/.*
2284+^share/doc/ext/.*.pyc
2285+^share/doc/ext/httpdomain.py
2286+^share/doc/ext/http-api-descr.json
2287 ^share/doc/images/.*
2288+^share/doc/src/conf.pyc
2289 ^share/doc/static/rtd.css
2290+^share/doc/templates/couchdb/domainindex.html
2291 ^share/server/json2.js
2292 ^share/server/mimeparse.js
2293 ^share/server/coffee-script.js
2294@@ -73,6 +80,7 @@
2295 ^share/www/script/base64.js
2296 ^share/www/script/test/lorem.*
2297 ^share/www/style/jquery-ui-1.8.11.custom.css
2298+^share/www/fauxton/img/.*
2299 ^src/Makefile
2300 ^src/Makefile.in
2301 ^src/couch_index/Makefile
2302@@ -81,6 +89,10 @@
2303 ^src/couch_mrview/Makefile
2304 ^src/couch_mrview/Makefile.in
2305 ^src/couch_mrview/ebin/.*.beam
2306+^src/couch_plugins/README.md
2307+^src/couch_plugins/Makefile
2308+^src/couch_plugins/Makefile.in
2309+^src/couch_plugins/ebin/.*.beam
2310 ^src/couch_replicator/Makefile
2311 ^src/couch_replicator/Makefile.in
2312 ^src/couch_replicator/ebin/.*.beam
2313@@ -97,6 +109,11 @@
2314 ^src/couchdb/priv/couchjs
2315 ^src/couchdb/priv/couchspawnkillable
2316 ^src/couchdb/priv/stat_descriptions.cfg
2317+^src/couchjs-node/package.json
2318+^src/couchjs-node/sandbox.js
2319+^src/couchjs-node/README.md
2320+^src/couchjs-node/Makefile
2321+^src/couchjs-node/Makefile.in
2322 ^src/erlang-oauth/.*
2323 ^src/couch_dbupdates
2324 ^src/ejson/.*
2325@@ -117,8 +134,14 @@
2326 ^src/fauxton/tasks/addon/rename.json
2327 ^src/fauxton/app/addons/activetasks/assets/less/activetasks.less
2328 ^src/fauxton/app/addons/auth/assets/less/auth.less
2329+^src/fauxton/app/addons/permissions/assets/less/permissions.less
2330 ^src/ibrowse/.*
2331 ^src/mochiweb/.*
2332+^src/my-first-couchdb-plugin/priv/*/*
2333+^src/my-first-couchdb-plugin/README.md
2334+^src/my-first-couchdb-plugin/.gitignore
2335+^src/my-first-couchdb-plugin/Makefile
2336+^src/my-first-couchdb-plugin/Makefile.in
2337 ^src/snappy/.*
2338 ^stamp-h1
2339 ^test/Makefile
2340
2341=== modified file 'm4/libtool.m4'
2342--- m4/libtool.m4 2013-08-28 16:28:32 +0000
2343+++ m4/libtool.m4 2013-12-01 23:56:33 +0000
2344@@ -1,8 +1,8 @@
2345 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
2346 #
2347 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
2348-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
2349-# Inc.
2350+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
2351+# Foundation, Inc.
2352 # Written by Gordon Matzigkeit, 1996
2353 #
2354 # This file is free software; the Free Software Foundation gives
2355@@ -11,8 +11,8 @@
2356
2357 m4_define([_LT_COPYING], [dnl
2358 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
2359-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
2360-# Inc.
2361+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
2362+# Foundation, Inc.
2363 # Written by Gordon Matzigkeit, 1996
2364 #
2365 # This file is part of GNU Libtool.
2366@@ -146,6 +146,8 @@
2367 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
2368 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
2369
2370+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
2371+dnl
2372 _LT_DECL([], [host_alias], [0], [The host system])dnl
2373 _LT_DECL([], [host], [0])dnl
2374 _LT_DECL([], [host_os], [0])dnl
2375@@ -637,7 +639,7 @@
2376 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
2377 configured by $[0], generated by m4_PACKAGE_STRING.
2378
2379-Copyright (C) 2010 Free Software Foundation, Inc.
2380+Copyright (C) 2011 Free Software Foundation, Inc.
2381 This config.lt script is free software; the Free Software Foundation
2382 gives unlimited permision to copy, distribute and modify it."
2383
2384@@ -801,6 +803,7 @@
2385 m4_case([$1],
2386 [C], [_LT_LANG(C)],
2387 [C++], [_LT_LANG(CXX)],
2388+ [Go], [_LT_LANG(GO)],
2389 [Java], [_LT_LANG(GCJ)],
2390 [Fortran 77], [_LT_LANG(F77)],
2391 [Fortran], [_LT_LANG(FC)],
2392@@ -822,6 +825,31 @@
2393 ])# _LT_LANG
2394
2395
2396+m4_ifndef([AC_PROG_GO], [
2397+############################################################
2398+# NOTE: This macro has been submitted for inclusion into #
2399+# GNU Autoconf as AC_PROG_GO. When it is available in #
2400+# a released version of Autoconf we should remove this #
2401+# macro and use it instead. #
2402+############################################################
2403+m4_defun([AC_PROG_GO],
2404+[AC_LANG_PUSH(Go)dnl
2405+AC_ARG_VAR([GOC], [Go compiler command])dnl
2406+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
2407+_AC_ARG_VAR_LDFLAGS()dnl
2408+AC_CHECK_TOOL(GOC, gccgo)
2409+if test -z "$GOC"; then
2410+ if test -n "$ac_tool_prefix"; then
2411+ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
2412+ fi
2413+fi
2414+if test -z "$GOC"; then
2415+ AC_CHECK_PROG(GOC, gccgo, gccgo, false)
2416+fi
2417+])#m4_defun
2418+])#m4_ifndef
2419+
2420+
2421 # _LT_LANG_DEFAULT_CONFIG
2422 # -----------------------
2423 m4_defun([_LT_LANG_DEFAULT_CONFIG],
2424@@ -852,6 +880,10 @@
2425 m4_ifdef([LT_PROG_GCJ],
2426 [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
2427
2428+AC_PROVIDE_IFELSE([AC_PROG_GO],
2429+ [LT_LANG(GO)],
2430+ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
2431+
2432 AC_PROVIDE_IFELSE([LT_PROG_RC],
2433 [LT_LANG(RC)],
2434 [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
2435@@ -954,7 +986,13 @@
2436 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
2437 -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
2438 _lt_result=$?
2439- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
2440+ # If there is a non-empty error log, and "single_module"
2441+ # appears in it, assume the flag caused a linker warning
2442+ if test -s conftest.err && $GREP single_module conftest.err; then
2443+ cat conftest.err >&AS_MESSAGE_LOG_FD
2444+ # Otherwise, if the output was created with a 0 exit code from
2445+ # the compiler, it worked.
2446+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
2447 lt_cv_apple_cc_single_mod=yes
2448 else
2449 cat conftest.err >&AS_MESSAGE_LOG_FD
2450@@ -962,6 +1000,7 @@
2451 rm -rf libconftest.dylib*
2452 rm -f conftest.*
2453 fi])
2454+
2455 AC_CACHE_CHECK([for -exported_symbols_list linker flag],
2456 [lt_cv_ld_exported_symbols_list],
2457 [lt_cv_ld_exported_symbols_list=no
2458@@ -973,6 +1012,7 @@
2459 [lt_cv_ld_exported_symbols_list=no])
2460 LDFLAGS="$save_LDFLAGS"
2461 ])
2462+
2463 AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
2464 [lt_cv_ld_force_load=no
2465 cat > conftest.c << _LT_EOF
2466@@ -990,7 +1030,9 @@
2467 echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
2468 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
2469 _lt_result=$?
2470- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
2471+ if test -s conftest.err && $GREP force_load conftest.err; then
2472+ cat conftest.err >&AS_MESSAGE_LOG_FD
2473+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
2474 lt_cv_ld_force_load=yes
2475 else
2476 cat conftest.err >&AS_MESSAGE_LOG_FD
2477@@ -1035,8 +1077,8 @@
2478 ])
2479
2480
2481-# _LT_DARWIN_LINKER_FEATURES
2482-# --------------------------
2483+# _LT_DARWIN_LINKER_FEATURES([TAG])
2484+# ---------------------------------
2485 # Checks for linker and compiler features on darwin
2486 m4_defun([_LT_DARWIN_LINKER_FEATURES],
2487 [
2488@@ -1047,6 +1089,8 @@
2489 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
2490 if test "$lt_cv_ld_force_load" = "yes"; then
2491 _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
2492+ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
2493+ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
2494 else
2495 _LT_TAGVAR(whole_archive_flag_spec, $1)=''
2496 fi
2497@@ -1330,14 +1374,27 @@
2498 CFLAGS="$SAVE_CFLAGS"
2499 fi
2500 ;;
2501-sparc*-*solaris*)
2502+*-*solaris*)
2503 # Find out which ABI we are using.
2504 echo 'int i;' > conftest.$ac_ext
2505 if AC_TRY_EVAL(ac_compile); then
2506 case `/usr/bin/file conftest.o` in
2507 *64-bit*)
2508 case $lt_cv_prog_gnu_ld in
2509- yes*) LD="${LD-ld} -m elf64_sparc" ;;
2510+ yes*)
2511+ case $host in
2512+ i?86-*-solaris*)
2513+ LD="${LD-ld} -m elf_x86_64"
2514+ ;;
2515+ sparc*-*-solaris*)
2516+ LD="${LD-ld} -m elf64_sparc"
2517+ ;;
2518+ esac
2519+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
2520+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
2521+ LD="${LD-ld}_sol2"
2522+ fi
2523+ ;;
2524 *)
2525 if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
2526 LD="${LD-ld} -64"
2527@@ -1414,13 +1471,13 @@
2528 if test -n "$RANLIB"; then
2529 case $host_os in
2530 openbsd*)
2531- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
2532+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
2533 ;;
2534 *)
2535- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
2536+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
2537 ;;
2538 esac
2539- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
2540+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
2541 fi
2542
2543 case $host_os in
2544@@ -1600,6 +1657,11 @@
2545 lt_cv_sys_max_cmd_len=196608
2546 ;;
2547
2548+ os2*)
2549+ # The test takes a long time on OS/2.
2550+ lt_cv_sys_max_cmd_len=8192
2551+ ;;
2552+
2553 osf*)
2554 # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
2555 # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
2556@@ -1639,7 +1701,7 @@
2557 # If test is not a shell built-in, we'll probably end up computing a
2558 # maximum length that is only half of the actual maximum length, but
2559 # we can't tell.
2560- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
2561+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
2562 = "X$teststring$teststring"; } >/dev/null 2>&1 &&
2563 test $i != 17 # 1/2 MB should be enough
2564 do
2565@@ -2185,7 +2247,7 @@
2566
2567 case $host_os in
2568 aix3*)
2569- version_type=linux
2570+ version_type=linux # correct to gnu/linux during the next big refactor
2571 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
2572 shlibpath_var=LIBPATH
2573
2574@@ -2194,7 +2256,7 @@
2575 ;;
2576
2577 aix[[4-9]]*)
2578- version_type=linux
2579+ version_type=linux # correct to gnu/linux during the next big refactor
2580 need_lib_prefix=no
2581 need_version=no
2582 hardcode_into_libs=yes
2583@@ -2259,7 +2321,7 @@
2584 ;;
2585
2586 bsdi[[45]]*)
2587- version_type=linux
2588+ version_type=linux # correct to gnu/linux during the next big refactor
2589 need_version=no
2590 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2591 soname_spec='${libname}${release}${shared_ext}$major'
2592@@ -2398,7 +2460,7 @@
2593 ;;
2594
2595 dgux*)
2596- version_type=linux
2597+ version_type=linux # correct to gnu/linux during the next big refactor
2598 need_lib_prefix=no
2599 need_version=no
2600 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
2601@@ -2406,10 +2468,6 @@
2602 shlibpath_var=LD_LIBRARY_PATH
2603 ;;
2604
2605-freebsd1*)
2606- dynamic_linker=no
2607- ;;
2608-
2609 freebsd* | dragonfly*)
2610 # DragonFly does not have aout. When/if they implement a new
2611 # versioning mechanism, adjust this.
2612@@ -2417,7 +2475,7 @@
2613 objformat=`/usr/bin/objformat`
2614 else
2615 case $host_os in
2616- freebsd[[123]]*) objformat=aout ;;
2617+ freebsd[[23]].*) objformat=aout ;;
2618 *) objformat=elf ;;
2619 esac
2620 fi
2621@@ -2448,7 +2506,7 @@
2622 esac
2623 shlibpath_var=LD_LIBRARY_PATH
2624 case $host_os in
2625- freebsd2*)
2626+ freebsd2.*)
2627 shlibpath_overrides_runpath=yes
2628 ;;
2629 freebsd3.[[01]]* | freebsdelf3.[[01]]*)
2630@@ -2468,17 +2526,18 @@
2631 ;;
2632
2633 gnu*)
2634- version_type=linux
2635+ version_type=linux # correct to gnu/linux during the next big refactor
2636 need_lib_prefix=no
2637 need_version=no
2638 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
2639 soname_spec='${libname}${release}${shared_ext}$major'
2640 shlibpath_var=LD_LIBRARY_PATH
2641+ shlibpath_overrides_runpath=no
2642 hardcode_into_libs=yes
2643 ;;
2644
2645 haiku*)
2646- version_type=linux
2647+ version_type=linux # correct to gnu/linux during the next big refactor
2648 need_lib_prefix=no
2649 need_version=no
2650 dynamic_linker="$host_os runtime_loader"
2651@@ -2539,7 +2598,7 @@
2652 ;;
2653
2654 interix[[3-9]]*)
2655- version_type=linux
2656+ version_type=linux # correct to gnu/linux during the next big refactor
2657 need_lib_prefix=no
2658 need_version=no
2659 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
2660@@ -2555,7 +2614,7 @@
2661 nonstopux*) version_type=nonstopux ;;
2662 *)
2663 if test "$lt_cv_prog_gnu_ld" = yes; then
2664- version_type=linux
2665+ version_type=linux # correct to gnu/linux during the next big refactor
2666 else
2667 version_type=irix
2668 fi ;;
2669@@ -2592,9 +2651,9 @@
2670 dynamic_linker=no
2671 ;;
2672
2673-# This must be Linux ELF.
2674+# This must be glibc/ELF.
2675 linux* | k*bsd*-gnu | kopensolaris*-gnu)
2676- version_type=linux
2677+ version_type=linux # correct to gnu/linux during the next big refactor
2678 need_lib_prefix=no
2679 need_version=no
2680 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2681@@ -2657,7 +2716,7 @@
2682 ;;
2683
2684 newsos6)
2685- version_type=linux
2686+ version_type=linux # correct to gnu/linux during the next big refactor
2687 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2688 shlibpath_var=LD_LIBRARY_PATH
2689 shlibpath_overrides_runpath=yes
2690@@ -2726,7 +2785,7 @@
2691 ;;
2692
2693 solaris*)
2694- version_type=linux
2695+ version_type=linux # correct to gnu/linux during the next big refactor
2696 need_lib_prefix=no
2697 need_version=no
2698 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2699@@ -2751,7 +2810,7 @@
2700 ;;
2701
2702 sysv4 | sysv4.3*)
2703- version_type=linux
2704+ version_type=linux # correct to gnu/linux during the next big refactor
2705 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2706 soname_spec='${libname}${release}${shared_ext}$major'
2707 shlibpath_var=LD_LIBRARY_PATH
2708@@ -2775,7 +2834,7 @@
2709
2710 sysv4*MP*)
2711 if test -d /usr/nec ;then
2712- version_type=linux
2713+ version_type=linux # correct to gnu/linux during the next big refactor
2714 library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
2715 soname_spec='$libname${shared_ext}.$major'
2716 shlibpath_var=LD_LIBRARY_PATH
2717@@ -2806,7 +2865,7 @@
2718
2719 tpf*)
2720 # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
2721- version_type=linux
2722+ version_type=linux # correct to gnu/linux during the next big refactor
2723 need_lib_prefix=no
2724 need_version=no
2725 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2726@@ -2816,7 +2875,7 @@
2727 ;;
2728
2729 uts4*)
2730- version_type=linux
2731+ version_type=linux # correct to gnu/linux during the next big refactor
2732 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2733 soname_spec='${libname}${release}${shared_ext}$major'
2734 shlibpath_var=LD_LIBRARY_PATH
2735@@ -3238,7 +3297,7 @@
2736 lt_cv_deplibs_check_method=pass_all
2737 ;;
2738
2739-# This must be Linux ELF.
2740+# This must be glibc/ELF.
2741 linux* | k*bsd*-gnu | kopensolaris*-gnu)
2742 lt_cv_deplibs_check_method=pass_all
2743 ;;
2744@@ -3658,6 +3717,7 @@
2745 # which start with @ or ?.
2746 lt_cv_sys_global_symbol_pipe="$AWK ['"\
2747 " {last_section=section; section=\$ 3};"\
2748+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
2749 " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
2750 " \$ 0!~/External *\|/{next};"\
2751 " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
2752@@ -4242,7 +4302,9 @@
2753 case $cc_basename in
2754 nvcc*) # Cuda Compiler Driver 2.2
2755 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
2756- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
2757+ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
2758+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
2759+ fi
2760 ;;
2761 esac
2762 else
2763@@ -4334,18 +4396,33 @@
2764 ;;
2765 *)
2766 case `$CC -V 2>&1 | sed 5q` in
2767- *Sun\ F* | *Sun*Fortran*)
2768+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
2769 # Sun Fortran 8.3 passes all unrecognized flags to the linker
2770 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
2771 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
2772 _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
2773 ;;
2774+ *Sun\ F* | *Sun*Fortran*)
2775+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
2776+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
2777+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
2778+ ;;
2779 *Sun\ C*)
2780 # Sun C 5.9
2781 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
2782 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
2783 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
2784 ;;
2785+ *Intel*\ [[CF]]*Compiler*)
2786+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
2787+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
2788+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
2789+ ;;
2790+ *Portland\ Group*)
2791+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
2792+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
2793+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
2794+ ;;
2795 esac
2796 ;;
2797 esac
2798@@ -4505,7 +4582,9 @@
2799 ;;
2800 cygwin* | mingw* | cegcc*)
2801 case $cc_basename in
2802- cl*) ;;
2803+ cl*)
2804+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
2805+ ;;
2806 *)
2807 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
2808 _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
2809@@ -4530,7 +4609,6 @@
2810 _LT_TAGVAR(hardcode_direct, $1)=no
2811 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
2812 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
2813- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
2814 _LT_TAGVAR(hardcode_libdir_separator, $1)=
2815 _LT_TAGVAR(hardcode_minus_L, $1)=no
2816 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
2817@@ -4781,8 +4859,7 @@
2818 xlf* | bgf* | bgxlf* | mpixlf*)
2819 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
2820 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
2821- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
2822- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
2823+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2824 _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
2825 if test "x$supports_anon_versioning" = xyes; then
2826 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
2827@@ -5077,6 +5154,7 @@
2828 # The linker will not automatically build a static lib if we build a DLL.
2829 # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
2830 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
2831+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
2832 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
2833 # Don't use ranlib
2834 _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
2835@@ -5123,10 +5201,6 @@
2836 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
2837 ;;
2838
2839- freebsd1*)
2840- _LT_TAGVAR(ld_shlibs, $1)=no
2841- ;;
2842-
2843 # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
2844 # support. Future versions do this automatically, but an explicit c++rt0.o
2845 # does not break anything, and helps significantly (at the cost of a little
2846@@ -5139,7 +5213,7 @@
2847 ;;
2848
2849 # Unfortunately, older versions of FreeBSD 2 do not have this feature.
2850- freebsd2*)
2851+ freebsd2.*)
2852 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
2853 _LT_TAGVAR(hardcode_direct, $1)=yes
2854 _LT_TAGVAR(hardcode_minus_L, $1)=yes
2855@@ -5178,7 +5252,6 @@
2856 fi
2857 if test "$with_gnu_ld" = no; then
2858 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
2859- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
2860 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
2861 _LT_TAGVAR(hardcode_direct, $1)=yes
2862 _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
2863@@ -5620,9 +5693,6 @@
2864 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
2865 [Flag to hardcode $libdir into a binary during linking.
2866 This must work even if $libdir does not exist])
2867-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
2868- [[If ld is used when linking, flag to hardcode $libdir into a binary
2869- during linking. This must work even if $libdir does not exist]])
2870 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
2871 [Whether we need a single "-rpath" flag with a separated argument])
2872 _LT_TAGDECL([], [hardcode_direct], [0],
2873@@ -5780,7 +5850,6 @@
2874 _LT_TAGVAR(hardcode_direct, $1)=no
2875 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
2876 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
2877-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
2878 _LT_TAGVAR(hardcode_libdir_separator, $1)=
2879 _LT_TAGVAR(hardcode_minus_L, $1)=no
2880 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
2881@@ -6150,7 +6219,7 @@
2882 esac
2883 ;;
2884
2885- freebsd[[12]]*)
2886+ freebsd2.*)
2887 # C++ shared libraries reported to be fairly broken before
2888 # switch to ELF
2889 _LT_TAGVAR(ld_shlibs, $1)=no
2890@@ -6911,12 +6980,18 @@
2891 }
2892 };
2893 _LT_EOF
2894+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
2895+package foo
2896+func foo() {
2897+}
2898+_LT_EOF
2899 ])
2900
2901 _lt_libdeps_save_CFLAGS=$CFLAGS
2902 case "$CC $CFLAGS " in #(
2903 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
2904 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
2905+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
2906 esac
2907
2908 dnl Parse the compiler output and extract the necessary
2909@@ -7113,7 +7188,6 @@
2910 _LT_TAGVAR(hardcode_direct, $1)=no
2911 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
2912 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
2913-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
2914 _LT_TAGVAR(hardcode_libdir_separator, $1)=
2915 _LT_TAGVAR(hardcode_minus_L, $1)=no
2916 _LT_TAGVAR(hardcode_automatic, $1)=no
2917@@ -7246,7 +7320,6 @@
2918 _LT_TAGVAR(hardcode_direct, $1)=no
2919 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
2920 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
2921-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
2922 _LT_TAGVAR(hardcode_libdir_separator, $1)=
2923 _LT_TAGVAR(hardcode_minus_L, $1)=no
2924 _LT_TAGVAR(hardcode_automatic, $1)=no
2925@@ -7433,6 +7506,77 @@
2926 ])# _LT_LANG_GCJ_CONFIG
2927
2928
2929+# _LT_LANG_GO_CONFIG([TAG])
2930+# --------------------------
2931+# Ensure that the configuration variables for the GNU Go compiler
2932+# are suitably defined. These variables are subsequently used by _LT_CONFIG
2933+# to write the compiler configuration to `libtool'.
2934+m4_defun([_LT_LANG_GO_CONFIG],
2935+[AC_REQUIRE([LT_PROG_GO])dnl
2936+AC_LANG_SAVE
2937+
2938+# Source file extension for Go test sources.
2939+ac_ext=go
2940+
2941+# Object file extension for compiled Go test sources.
2942+objext=o
2943+_LT_TAGVAR(objext, $1)=$objext
2944+
2945+# Code to be used in simple compile tests
2946+lt_simple_compile_test_code="package main; func main() { }"
2947+
2948+# Code to be used in simple link tests
2949+lt_simple_link_test_code='package main; func main() { }'
2950+
2951+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
2952+_LT_TAG_COMPILER
2953+
2954+# save warnings/boilerplate of simple test code
2955+_LT_COMPILER_BOILERPLATE
2956+_LT_LINKER_BOILERPLATE
2957+
2958+# Allow CC to be a program name with arguments.
2959+lt_save_CC=$CC
2960+lt_save_CFLAGS=$CFLAGS
2961+lt_save_GCC=$GCC
2962+GCC=yes
2963+CC=${GOC-"gccgo"}
2964+CFLAGS=$GOFLAGS
2965+compiler=$CC
2966+_LT_TAGVAR(compiler, $1)=$CC
2967+_LT_TAGVAR(LD, $1)="$LD"
2968+_LT_CC_BASENAME([$compiler])
2969+
2970+# Go did not exist at the time GCC didn't implicitly link libc in.
2971+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
2972+
2973+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
2974+_LT_TAGVAR(reload_flag, $1)=$reload_flag
2975+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
2976+
2977+## CAVEAT EMPTOR:
2978+## There is no encapsulation within the following macros, do not change
2979+## the running order or otherwise move them around unless you know exactly
2980+## what you are doing...
2981+if test -n "$compiler"; then
2982+ _LT_COMPILER_NO_RTTI($1)
2983+ _LT_COMPILER_PIC($1)
2984+ _LT_COMPILER_C_O($1)
2985+ _LT_COMPILER_FILE_LOCKS($1)
2986+ _LT_LINKER_SHLIBS($1)
2987+ _LT_LINKER_HARDCODE_LIBPATH($1)
2988+
2989+ _LT_CONFIG($1)
2990+fi
2991+
2992+AC_LANG_RESTORE
2993+
2994+GCC=$lt_save_GCC
2995+CC=$lt_save_CC
2996+CFLAGS=$lt_save_CFLAGS
2997+])# _LT_LANG_GO_CONFIG
2998+
2999+
3000 # _LT_LANG_RC_CONFIG([TAG])
3001 # -------------------------
3002 # Ensure that the configuration variables for the Windows resource compiler
3003@@ -7502,6 +7646,13 @@
3004 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
3005
3006
3007+# LT_PROG_GO
3008+# ----------
3009+AC_DEFUN([LT_PROG_GO],
3010+[AC_CHECK_TOOL(GOC, gccgo,)
3011+])
3012+
3013+
3014 # LT_PROG_RC
3015 # ----------
3016 AC_DEFUN([LT_PROG_RC],
3017
3018=== modified file 'm4/ltoptions.m4'
3019--- m4/ltoptions.m4 2012-07-30 22:49:59 +0000
3020+++ m4/ltoptions.m4 2013-12-01 23:56:33 +0000
3021@@ -326,9 +326,24 @@
3022 # MODE is either `yes' or `no'. If omitted, it defaults to `both'.
3023 m4_define([_LT_WITH_PIC],
3024 [AC_ARG_WITH([pic],
3025- [AS_HELP_STRING([--with-pic],
3026+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
3027 [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
3028- [pic_mode="$withval"],
3029+ [lt_p=${PACKAGE-default}
3030+ case $withval in
3031+ yes|no) pic_mode=$withval ;;
3032+ *)
3033+ pic_mode=default
3034+ # Look at the argument we got. We use all the common list separators.
3035+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
3036+ for lt_pkg in $withval; do
3037+ IFS="$lt_save_ifs"
3038+ if test "X$lt_pkg" = "X$lt_p"; then
3039+ pic_mode=yes
3040+ fi
3041+ done
3042+ IFS="$lt_save_ifs"
3043+ ;;
3044+ esac],
3045 [pic_mode=default])
3046
3047 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
3048
3049=== modified file 'm4/ltversion.m4'
3050--- m4/ltversion.m4 2013-08-28 16:28:32 +0000
3051+++ m4/ltversion.m4 2013-12-01 23:56:33 +0000
3052@@ -9,15 +9,15 @@
3053
3054 # @configure_input@
3055
3056-# serial 3293 ltversion.m4
3057+# serial 3337 ltversion.m4
3058 # This file is part of GNU Libtool
3059
3060-m4_define([LT_PACKAGE_VERSION], [2.4])
3061-m4_define([LT_PACKAGE_REVISION], [1.3293])
3062+m4_define([LT_PACKAGE_VERSION], [2.4.2])
3063+m4_define([LT_PACKAGE_REVISION], [1.3337])
3064
3065 AC_DEFUN([LTVERSION_VERSION],
3066-[macro_version='2.4'
3067-macro_revision='1.3293'
3068+[macro_version='2.4.2'
3069+macro_revision='1.3337'
3070 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
3071 _LT_DECL(, macro_revision, 0)
3072 ])
3073
3074=== modified file 'share/Makefile.am'
3075--- share/Makefile.am 2013-08-28 16:28:32 +0000
3076+++ share/Makefile.am 2013-12-01 23:56:33 +0000
3077@@ -71,6 +71,25 @@
3078 www/dialog/_save_view_as.html \
3079 www/dialog/_upload_attachment.html \
3080 www/document.html \
3081+ www/fauxton/css/index.css \
3082+ www/fauxton/img/couchdb-site.png \
3083+ www/fauxton/img/couchdblogo.png \
3084+ www/fauxton/img/fontawesome-webfont.eot \
3085+ www/fauxton/img/fontawesome-webfont.svg \
3086+ www/fauxton/img/fontawesome-webfont.ttf \
3087+ www/fauxton/img/fontawesome-webfont.woff \
3088+ www/fauxton/img/FontAwesome.otf \
3089+ www/fauxton/img/fontcustom_fauxton.eot \
3090+ www/fauxton/img/fontcustom_fauxton.svg \
3091+ www/fauxton/img/fontcustom_fauxton.ttf \
3092+ www/fauxton/img/fontcustom_fauxton.woff \
3093+ www/fauxton/img/glyphicons-halflings-white.png \
3094+ www/fauxton/img/glyphicons-halflings.png \
3095+ www/fauxton/img/linen.png \
3096+ www/fauxton/img/loader.gif \
3097+ www/fauxton/img/minilogo.png \
3098+ www/fauxton/index.html \
3099+ www/fauxton/js/require.js \
3100 www/favicon.ico \
3101 www/image/add.png \
3102 www/image/apply.gif \
3103@@ -105,6 +124,7 @@
3104 www/image/toggle-expand.gif \
3105 www/image/twisty.gif \
3106 www/index.html \
3107+ www/plugins.html \
3108 www/replicator.html \
3109 www/script/couch.js \
3110 www/script/couch_tests.js \
3111@@ -218,7 +238,6 @@
3112 www/script/test/view_update_seq.js \
3113 www/script/test/view_pagination.js \
3114 www/script/test/view_sandboxing.js \
3115- www/script/test/view_xml.js \
3116 www/spec/couch_js_class_methods_spec.js \
3117 www/spec/couch_js_instance_methods_1_spec.js \
3118 www/spec/couch_js_instance_methods_2_spec.js \
3119
3120=== modified file 'share/Makefile.in'
3121--- share/Makefile.in 2013-08-28 16:28:32 +0000
3122+++ share/Makefile.in 2013-12-01 23:56:33 +0000
3123@@ -180,6 +180,7 @@
3124 ERLANG_FLAGS = @ERLANG_FLAGS@
3125 ERLC = @ERLC@
3126 ERLC_FLAGS = @ERLC_FLAGS@
3127+ESCRIPT = @ESCRIPT@
3128 EXEEXT = @EXEEXT@
3129 FGREP = @FGREP@
3130 FLAGS = @FLAGS@
3131@@ -268,6 +269,8 @@
3132 datarootdir = @datarootdir@
3133 docdir = @docdir@
3134 dvidir = @dvidir@
3135+erlangbin = @erlangbin@
3136+erlangversion = @erlangversion@
3137 exec_prefix = @exec_prefix@
3138 host = @host@
3139 host_alias = @host_alias@
3140@@ -365,6 +368,25 @@
3141 www/dialog/_save_view_as.html \
3142 www/dialog/_upload_attachment.html \
3143 www/document.html \
3144+ www/fauxton/css/index.css \
3145+ www/fauxton/img/couchdb-site.png \
3146+ www/fauxton/img/couchdblogo.png \
3147+ www/fauxton/img/fontawesome-webfont.eot \
3148+ www/fauxton/img/fontawesome-webfont.svg \
3149+ www/fauxton/img/fontawesome-webfont.ttf \
3150+ www/fauxton/img/fontawesome-webfont.woff \
3151+ www/fauxton/img/FontAwesome.otf \
3152+ www/fauxton/img/fontcustom_fauxton.eot \
3153+ www/fauxton/img/fontcustom_fauxton.svg \
3154+ www/fauxton/img/fontcustom_fauxton.ttf \
3155+ www/fauxton/img/fontcustom_fauxton.woff \
3156+ www/fauxton/img/glyphicons-halflings-white.png \
3157+ www/fauxton/img/glyphicons-halflings.png \
3158+ www/fauxton/img/linen.png \
3159+ www/fauxton/img/loader.gif \
3160+ www/fauxton/img/minilogo.png \
3161+ www/fauxton/index.html \
3162+ www/fauxton/js/require.js \
3163 www/favicon.ico \
3164 www/image/add.png \
3165 www/image/apply.gif \
3166@@ -399,6 +421,7 @@
3167 www/image/toggle-expand.gif \
3168 www/image/twisty.gif \
3169 www/index.html \
3170+ www/plugins.html \
3171 www/replicator.html \
3172 www/script/couch.js \
3173 www/script/couch_tests.js \
3174@@ -512,7 +535,6 @@
3175 www/script/test/view_update_seq.js \
3176 www/script/test/view_pagination.js \
3177 www/script/test/view_sandboxing.js \
3178- www/script/test/view_xml.js \
3179 www/spec/couch_js_class_methods_spec.js \
3180 www/spec/couch_js_instance_methods_1_spec.js \
3181 www/spec/couch_js_instance_methods_2_spec.js \
3182
3183=== modified file 'share/doc/Makefile.in'
3184--- share/doc/Makefile.in 2013-08-28 18:21:32 +0000
3185+++ share/doc/Makefile.in 2013-12-01 23:56:33 +0000
3186@@ -146,6 +146,7 @@
3187 ERLANG_FLAGS = @ERLANG_FLAGS@
3188 ERLC = @ERLC@
3189 ERLC_FLAGS = @ERLC_FLAGS@
3190+ESCRIPT = @ESCRIPT@
3191 EXEEXT = @EXEEXT@
3192 FGREP = @FGREP@
3193 FLAGS = @FLAGS@
3194@@ -234,6 +235,8 @@
3195 datarootdir = @datarootdir@
3196 docdir = @docdir@
3197 dvidir = @dvidir@
3198+erlangbin = @erlangbin@
3199+erlangversion = @erlangversion@
3200 exec_prefix = @exec_prefix@
3201 host = @host@
3202 host_alias = @host_alias@
3203
3204=== modified file 'share/doc/build/Makefile.am'
3205--- share/doc/build/Makefile.am 2013-08-28 18:21:32 +0000
3206+++ share/doc/build/Makefile.am 2013-12-01 23:56:33 +0000
3207@@ -45,27 +45,128 @@
3208 html/_images/futon-editeddoc.png \
3209 html/_images/futon-overview.png \
3210 html/_images/futon-replform.png \
3211- html/_sources/api/authn.txt \
3212- html/_sources/api/configuration.txt \
3213- html/_sources/api/database.txt \
3214- html/_sources/api/design.txt \
3215- html/_sources/api/documents.txt \
3216+ html/_images/intro-consistency-01.png \
3217+ html/_images/intro-consistency-02.png \
3218+ html/_images/intro-consistency-03.png \
3219+ html/_images/intro-consistency-04.png \
3220+ html/_images/intro-consistency-05.png \
3221+ html/_images/intro-consistency-06.png \
3222+ html/_images/intro-consistency-07.png \
3223+ html/_images/intro-tour-01.png \
3224+ html/_images/intro-tour-02.png \
3225+ html/_images/intro-tour-03.png \
3226+ html/_images/intro-tour-04.png \
3227+ html/_images/intro-tour-05.png \
3228+ html/_images/intro-tour-06.png \
3229+ html/_images/intro-tour-07.png \
3230+ html/_images/intro-tour-08.png \
3231+ html/_images/intro-tour-09.png \
3232+ html/_images/intro-tour-10.png \
3233+ html/_images/intro-why-01.png \
3234+ html/_images/intro-why-02.png \
3235+ html/_images/intro-why-03.png \
3236+ html/_images/views-intro-01.png \
3237+ html/_images/views-intro-02.png \
3238+ html/_images/views-intro-03.png \
3239+ html/_images/views-intro-04.png \
3240+ html/_sources/api/basics.txt \
3241+ html/_sources/api/index.txt \
3242 html/_sources/api/local.txt \
3243- html/_sources/api/misc.txt \
3244- html/_sources/api/reference.txt \
3245- html/_sources/api-basics.txt \
3246- html/_sources/changelog.txt \
3247- html/_sources/changes.txt \
3248- html/_sources/config_reference.txt \
3249- html/_sources/configuring.txt \
3250+ html/_sources/api/database/bulk-api.txt \
3251+ html/_sources/api/database/changes.txt \
3252+ html/_sources/api/database/common.txt \
3253+ html/_sources/api/database/compact.txt \
3254+ html/_sources/api/database/index.txt \
3255+ html/_sources/api/database/misc.txt \
3256+ html/_sources/api/database/security.txt \
3257+ html/_sources/api/database/temp-views.txt \
3258+ html/_sources/api/document/attachments.txt \
3259+ html/_sources/api/document/common.txt \
3260+ html/_sources/api/document/index.txt \
3261+ html/_sources/api/ddoc/common.txt \
3262+ html/_sources/api/ddoc/index.txt \
3263+ html/_sources/api/ddoc/render.txt \
3264+ html/_sources/api/ddoc/rewrites.txt \
3265+ html/_sources/api/ddoc/views.txt \
3266+ html/_sources/api/server/authn.txt \
3267+ html/_sources/api/server/common.txt \
3268+ html/_sources/api/server/configuration.txt \
3269+ html/_sources/api/server/index.txt \
3270+ html/_sources/config/auth.txt \
3271+ html/_sources/config/compaction.txt \
3272+ html/_sources/config/couchdb.txt \
3273+ html/_sources/config/externals.txt \
3274+ html/_sources/config/http.txt \
3275+ html/_sources/config/http-handlers.txt \
3276+ html/_sources/config/index.txt \
3277+ html/_sources/config/logging.txt \
3278+ html/_sources/config/misc.txt \
3279+ html/_sources/config/query-servers.txt \
3280+ html/_sources/config/replicator.txt \
3281+ html/_sources/config/services.txt \
3282+ html/_sources/config/intro.txt \
3283+ html/_sources/config/proxying.txt \
3284+ html/_sources/couchapp/ddocs.txt \
3285+ html/_sources/couchapp/index.txt \
3286+ html/_sources/couchapp/views/collation.txt \
3287+ html/_sources/couchapp/views/index.txt \
3288+ html/_sources/couchapp/views/intro.txt \
3289+ html/_sources/couchapp/views/joins.txt \
3290+ html/_sources/couchapp/views/nosql.txt \
3291+ html/_sources/couchapp/views/pagination.txt \
3292+ html/_sources/cve/2010-0009.txt \
3293+ html/_sources/cve/2010-2234.txt \
3294+ html/_sources/cve/2010-3854.txt \
3295+ html/_sources/cve/2012-5641.txt \
3296+ html/_sources/cve/2012-5649.txt \
3297+ html/_sources/cve/2012-5650.txt \
3298+ html/_sources/cve/index.txt \
3299+ html/_sources/fauxton/addons.txt \
3300+ html/_sources/fauxton/index.txt \
3301+ html/_sources/fauxton/install.txt \
3302+ html/_sources/install/index.txt \
3303+ html/_sources/install/freebsd.txt \
3304+ html/_sources/install/mac.txt \
3305+ html/_sources/install/unix.txt \
3306+ html/_sources/install/windows.txt \
3307+ html/_sources/intro/api.txt \
3308+ html/_sources/intro/consistency.txt \
3309+ html/_sources/intro/curl.txt \
3310+ html/_sources/intro/futon.txt \
3311+ html/_sources/intro/index.txt \
3312+ html/_sources/intro/overview.txt \
3313+ html/_sources/intro/security.txt \
3314+ html/_sources/intro/tour.txt \
3315+ html/_sources/intro/why.txt \
3316+ html/_sources/maintenance/compaction.txt \
3317+ html/_sources/maintenance/index.txt \
3318+ html/_sources/maintenance/performance.txt \
3319+ html/_sources/query-server/index.txt \
3320+ html/_sources/query-server/erlang.txt \
3321+ html/_sources/query-server/javascript.txt \
3322+ html/_sources/query-server/protocol.txt \
3323+ html/_sources/replication/conflicts.txt \
3324+ html/_sources/replication/index.txt \
3325+ html/_sources/replication/intro.txt \
3326+ html/_sources/replication/protocol.txt \
3327+ html/_sources/replication/replicator.txt \
3328+ html/_sources/whatsnew/0.8.txt \
3329+ html/_sources/whatsnew/0.9.txt \
3330+ html/_sources/whatsnew/0.10.txt \
3331+ html/_sources/whatsnew/0.11.txt \
3332+ html/_sources/whatsnew/1.0.txt \
3333+ html/_sources/whatsnew/1.1.txt \
3334+ html/_sources/whatsnew/1.2.txt \
3335+ html/_sources/whatsnew/1.3.txt \
3336+ html/_sources/whatsnew/1.4.txt \
3337+ html/_sources/whatsnew/1.5.txt \
3338+ html/_sources/whatsnew/index.txt \
3339+ html/_sources/about.txt \
3340+ html/_sources/contents.txt \
3341 html/_sources/contributing.txt \
3342- html/_sources/ddocs.txt \
3343- html/_sources/index.txt \
3344- html/_sources/intro.txt \
3345+ html/_sources/experimental.txt \
3346+ html/_sources/externals.txt \
3347 html/_sources/json-structure.txt \
3348- html/_sources/query-servers.txt \
3349- html/_sources/replication.txt \
3350- html/_sources/replicator.txt \
3351 html/_static/ajax-loader.gif \
3352 html/_static/basic.css \
3353 html/_static/comment-bright.png \
3354@@ -89,28 +190,109 @@
3355 html/_static/up-pressed.png \
3356 html/_static/up.png \
3357 html/_static/websupport.js \
3358- html/api/authn.html \
3359- html/api/configuration.html \
3360- html/api/database.html \
3361- html/api/design.html \
3362- html/api/documents.html \
3363+ html/api/basics.html \
3364+ html/api/index.html \
3365 html/api/local.html \
3366- html/api/misc.html \
3367- html/api/reference.html \
3368- html/api-basics.html \
3369- html/changelog.html \
3370- html/changes.html \
3371- html/config_reference.html \
3372- html/configuring.html \
3373- html/ddocs.html \
3374+ html/api/database/bulk-api.html \
3375+ html/api/database/changes.html \
3376+ html/api/database/common.html \
3377+ html/api/database/compact.html \
3378+ html/api/database/index.html \
3379+ html/api/database/misc.html \
3380+ html/api/database/security.html \
3381+ html/api/database/temp-views.html \
3382+ html/api/document/attachments.html \
3383+ html/api/document/common.html \
3384+ html/api/document/index.html \
3385+ html/api/ddoc/common.html \
3386+ html/api/ddoc/index.html \
3387+ html/api/ddoc/render.html \
3388+ html/api/ddoc/rewrites.html \
3389+ html/api/ddoc/views.html \
3390+ html/api/server/authn.html \
3391+ html/api/server/common.html \
3392+ html/api/server/configuration.html \
3393+ html/api/server/index.html \
3394+ html/config/auth.html \
3395+ html/config/compaction.html \
3396+ html/config/couchdb.html \
3397+ html/config/externals.html \
3398+ html/config/http.html \
3399+ html/config/http-handlers.html \
3400+ html/config/index.html \
3401+ html/config/logging.html \
3402+ html/config/misc.html \
3403+ html/config/query-servers.html \
3404+ html/config/replicator.html \
3405+ html/config/services.html \
3406+ html/config/intro.html \
3407+ html/config/proxying.html \
3408+ html/couchapp/ddocs.html \
3409+ html/couchapp/index.html \
3410+ html/couchapp/views/collation.html \
3411+ html/couchapp/views/index.html \
3412+ html/couchapp/views/intro.html \
3413+ html/couchapp/views/joins.html \
3414+ html/couchapp/views/nosql.html \
3415+ html/couchapp/views/pagination.html \
3416+ html/cve/2010-0009.html \
3417+ html/cve/2010-2234.html \
3418+ html/cve/2010-3854.html \
3419+ html/cve/2012-5641.html \
3420+ html/cve/2012-5649.html \
3421+ html/cve/2012-5650.html \
3422+ html/cve/index.html \
3423+ html/fauxton/addons.html \
3424+ html/fauxton/index.html \
3425+ html/fauxton/install.html \
3426+ html/install/index.html \
3427+ html/install/freebsd.html \
3428+ html/install/mac.html \
3429+ html/install/unix.html \
3430+ html/install/windows.html \
3431+ html/intro/api.html \
3432+ html/intro/consistency.html \
3433+ html/intro/curl.html \
3434+ html/intro/futon.html \
3435+ html/intro/index.html \
3436+ html/intro/overview.html \
3437+ html/intro/security.html \
3438+ html/intro/tour.html \
3439+ html/intro/why.html \
3440+ html/maintenance/compaction.html \
3441+ html/maintenance/index.html \
3442+ html/maintenance/performance.html \
3443+ html/query-server/index.html \
3444+ html/query-server/erlang.html \
3445+ html/query-server/javascript.html \
3446+ html/query-server/protocol.html \
3447+ html/replication/conflicts.html \
3448+ html/replication/index.html \
3449+ html/replication/intro.html \
3450+ html/replication/protocol.html \
3451+ html/replication/replicator.html \
3452+ html/whatsnew/0.8.html \
3453+ html/whatsnew/0.9.html \
3454+ html/whatsnew/0.10.html \
3455+ html/whatsnew/0.11.html \
3456+ html/whatsnew/1.0.html \
3457+ html/whatsnew/1.1.html \
3458+ html/whatsnew/1.2.html \
3459+ html/whatsnew/1.3.html \
3460+ html/whatsnew/1.4.html \
3461+ html/whatsnew/1.5.html \
3462+ html/whatsnew/index.html \
3463+ html/about.html \
3464+ html/config-ref.html \
3465+ html/contents.html \
3466+ html/contributing.html \
3467+ html/download.html \
3468+ html/experimental.html \
3469+ html/externals.html \
3470+ html/http-api.html \
3471 html/index.html \
3472- html/intro.html \
3473 html/json-structure.html \
3474- html/query-servers.html \
3475- html/replication.html \
3476- html/replicator.html \
3477 html/objects.inv \
3478- html/genindex.html \
3479 html/search.html \
3480 html/searchindex.js
3481
3482@@ -128,45 +310,158 @@
3483 ../images/futon-editeddoc.png \
3484 ../images/futon-overview.png \
3485 ../images/futon-replform.png \
3486- ../images/logo.png
3487+ ../images/intro-consistency-01.png \
3488+ ../images/intro-consistency-02.png \
3489+ ../images/intro-consistency-03.png \
3490+ ../images/intro-consistency-04.png \
3491+ ../images/intro-consistency-05.png \
3492+ ../images/intro-consistency-06.png \
3493+ ../images/intro-consistency-07.png \
3494+ ../images/intro-tour-01.png \
3495+ ../images/intro-tour-02.png \
3496+ ../images/intro-tour-03.png \
3497+ ../images/intro-tour-04.png \
3498+ ../images/intro-tour-05.png \
3499+ ../images/intro-tour-06.png \
3500+ ../images/intro-tour-07.png \
3501+ ../images/intro-tour-08.png \
3502+ ../images/intro-tour-09.png \
3503+ ../images/intro-tour-10.png \
3504+ ../images/intro-why-01.png \
3505+ ../images/intro-why-02.png \
3506+ ../images/intro-why-03.png \
3507+ ../images/logo.png \
3508+ ../images/views-intro-01.png \
3509+ ../images/views-intro-02.png \
3510+ ../images/views-intro-03.png \
3511+ ../images/views-intro-04.png
3512
3513 src_files = \
3514- ../src/api/authn.rst \
3515- ../src/api/configuration.rst \
3516- ../src/api/database.rst \
3517- ../src/api/design.rst \
3518- ../src/api/documents.rst \
3519+ ../src/api/basics.rst \
3520+ ../src/api/index.rst \
3521 ../src/api/local.rst \
3522- ../src/api/misc.rst \
3523- ../src/api/reference.rst \
3524- ../src/api-basics.rst \
3525- ../src/changelog.rst \
3526- ../src/changes.rst \
3527- ../src/config_reference.rst \
3528- ../src/configuring.rst \
3529+ ../src/api/database/bulk-api.rst \
3530+ ../src/api/database/changes.rst \
3531+ ../src/api/database/common.rst \
3532+ ../src/api/database/compact.rst \
3533+ ../src/api/database/index.rst \
3534+ ../src/api/database/misc.rst \
3535+ ../src/api/database/security.rst \
3536+ ../src/api/database/temp-views.rst \
3537+ ../src/api/document/attachments.rst \
3538+ ../src/api/document/common.rst \
3539+ ../src/api/document/index.rst \
3540+ ../src/api/ddoc/common.rst \
3541+ ../src/api/ddoc/index.rst \
3542+ ../src/api/ddoc/render.rst \
3543+ ../src/api/ddoc/rewrites.rst \
3544+ ../src/api/ddoc/views.rst \
3545+ ../src/api/server/authn.rst \
3546+ ../src/api/server/common.rst \
3547+ ../src/api/server/configuration.rst \
3548+ ../src/api/server/index.rst \
3549+ ../src/config/auth.rst \
3550+ ../src/config/compaction.rst \
3551+ ../src/config/couchdb.rst \
3552+ ../src/config/externals.rst \
3553+ ../src/config/http.rst \
3554+ ../src/config/http-handlers.rst \
3555+ ../src/config/index.rst \
3556+ ../src/config/logging.rst \
3557+ ../src/config/misc.rst \
3558+ ../src/config/query-servers.rst \
3559+ ../src/config/replicator.rst \
3560+ ../src/config/services.rst \
3561+ ../src/config/intro.rst \
3562+ ../src/config/proxying.rst \
3563+ ../src/couchapp/ddocs.rst \
3564+ ../src/couchapp/index.rst \
3565+ ../src/couchapp/views/collation.rst \
3566+ ../src/couchapp/views/index.rst \
3567+ ../src/couchapp/views/intro.rst \
3568+ ../src/couchapp/views/joins.rst \
3569+ ../src/couchapp/views/nosql.rst \
3570+ ../src/couchapp/views/pagination.rst \
3571+ ../src/cve/2010-0009.rst \
3572+ ../src/cve/2010-2234.rst \
3573+ ../src/cve/2010-3854.rst \
3574+ ../src/cve/2012-5641.rst \
3575+ ../src/cve/2012-5649.rst \
3576+ ../src/cve/2012-5650.rst \
3577+ ../src/cve/index.rst \
3578+ ../src/fauxton/addons.rst \
3579+ ../src/fauxton/index.rst \
3580+ ../src/fauxton/install.rst \
3581+ ../src/install/index.rst \
3582+ ../src/install/freebsd.rst \
3583+ ../src/install/mac.rst \
3584+ ../src/install/unix.rst \
3585+ ../src/install/windows.rst \
3586+ ../src/intro/api.rst \
3587+ ../src/intro/consistency.rst \
3588+ ../src/intro/curl.rst \
3589+ ../src/intro/futon.rst \
3590+ ../src/intro/index.rst \
3591+ ../src/intro/overview.rst \
3592+ ../src/intro/security.rst \
3593+ ../src/intro/tour.rst \
3594+ ../src/intro/why.rst \
3595+ ../src/maintenance/compaction.rst \
3596+ ../src/maintenance/index.rst \
3597+ ../src/maintenance/performance.rst \
3598+ ../src/query-server/index.rst \
3599+ ../src/query-server/erlang.rst \
3600+ ../src/query-server/javascript.rst \
3601+ ../src/query-server/protocol.rst \
3602+ ../src/replication/conflicts.rst \
3603+ ../src/replication/index.rst \
3604+ ../src/replication/intro.rst \
3605+ ../src/replication/protocol.rst \
3606+ ../src/replication/replicator.rst \
3607+ ../src/whatsnew/0.8.rst \
3608+ ../src/whatsnew/0.9.rst \
3609+ ../src/whatsnew/0.10.rst \
3610+ ../src/whatsnew/0.11.rst \
3611+ ../src/whatsnew/1.0.rst \
3612+ ../src/whatsnew/1.1.rst \
3613+ ../src/whatsnew/1.2.rst \
3614+ ../src/whatsnew/1.3.rst \
3615+ ../src/whatsnew/1.4.rst \
3616+ ../src/whatsnew/1.5.rst \
3617+ ../src/whatsnew/index.rst \
3618+ ../src/about.rst \
3619+ ../src/contents.rst \
3620+ ../src/experimental.rst \
3621 ../src/contributing.rst \
3622- ../src/ddocs.rst \
3623- ../src/index.rst \
3624- ../src/intro.rst \
3625+ ../src/externals.rst \
3626 ../src/json-structure.rst \
3627- ../src/query-servers.rst \
3628- ../src/replication.rst \
3629- ../src/replicator.rst \
3630 ../src/conf.py
3631
3632 src_files_html = \
3633 ../static/rtd.css \
3634+ ../templates/couchdb/domainindex.html \
3635+ ../templates/couchdb/theme.conf \
3636+ ../templates/pages/download.html \
3637+ ../templates/pages/index.html \
3638+ ../templates/layout.html \
3639 ../templates/help.html \
3640 ../templates/searchbox.html \
3641 ../templates/utilities.html
3642
3643+sphinx_extensions = \
3644+ ../ext/configdomain.py \
3645+ ../ext/github.py \
3646+ ../ext/httpdomain.py \
3647+ ../ext/http-api-descr.json
3648+
3649 EXTRA_DIST = \
3650 $(image_files) \
3651 $(src_files) \
3652 $(src_files_html) \
3653 $(info_file_build) \
3654 $(pdf_file_build) \
3655- $(html_files_build)
3656+ $(html_files_build) \
3657+ $(sphinx_extensions)
3658
3659 BUILT_SOURCES = \
3660 $(info_file_build) \
3661
3662=== modified file 'share/doc/build/Makefile.in'
3663--- share/doc/build/Makefile.in 2013-08-28 18:21:32 +0000
3664+++ share/doc/build/Makefile.in 2013-12-01 23:56:33 +0000
3665@@ -106,6 +106,7 @@
3666 ERLANG_FLAGS = @ERLANG_FLAGS@
3667 ERLC = @ERLC@
3668 ERLC_FLAGS = @ERLC_FLAGS@
3669+ESCRIPT = @ESCRIPT@
3670 EXEEXT = @EXEEXT@
3671 FGREP = @FGREP@
3672 FLAGS = @FLAGS@
3673@@ -194,6 +195,8 @@
3674 datarootdir = @datarootdir@
3675 docdir = @docdir@
3676 dvidir = @dvidir@
3677+erlangbin = @erlangbin@
3678+erlangversion = @erlangversion@
3679 exec_prefix = @exec_prefix@
3680 host = @host@
3681 host_alias = @host_alias@
3682@@ -271,27 +274,128 @@
3683 html/_images/futon-editeddoc.png \
3684 html/_images/futon-overview.png \
3685 html/_images/futon-replform.png \
3686- html/_sources/api/authn.txt \
3687- html/_sources/api/configuration.txt \
3688- html/_sources/api/database.txt \
3689- html/_sources/api/design.txt \
3690- html/_sources/api/documents.txt \
3691+ html/_images/intro-consistency-01.png \
3692+ html/_images/intro-consistency-02.png \
3693+ html/_images/intro-consistency-03.png \
3694+ html/_images/intro-consistency-04.png \
3695+ html/_images/intro-consistency-05.png \
3696+ html/_images/intro-consistency-06.png \
3697+ html/_images/intro-consistency-07.png \
3698+ html/_images/intro-tour-01.png \
3699+ html/_images/intro-tour-02.png \
3700+ html/_images/intro-tour-03.png \
3701+ html/_images/intro-tour-04.png \
3702+ html/_images/intro-tour-05.png \
3703+ html/_images/intro-tour-06.png \
3704+ html/_images/intro-tour-07.png \
3705+ html/_images/intro-tour-08.png \
3706+ html/_images/intro-tour-09.png \
3707+ html/_images/intro-tour-10.png \
3708+ html/_images/intro-why-01.png \
3709+ html/_images/intro-why-02.png \
3710+ html/_images/intro-why-03.png \
3711+ html/_images/views-intro-01.png \
3712+ html/_images/views-intro-02.png \
3713+ html/_images/views-intro-03.png \
3714+ html/_images/views-intro-04.png \
3715+ html/_sources/api/basics.txt \
3716+ html/_sources/api/index.txt \
3717 html/_sources/api/local.txt \
3718- html/_sources/api/misc.txt \
3719- html/_sources/api/reference.txt \
3720- html/_sources/api-basics.txt \
3721- html/_sources/changelog.txt \
3722- html/_sources/changes.txt \
3723- html/_sources/config_reference.txt \
3724- html/_sources/configuring.txt \
3725+ html/_sources/api/database/bulk-api.txt \
3726+ html/_sources/api/database/changes.txt \
3727+ html/_sources/api/database/common.txt \
3728+ html/_sources/api/database/compact.txt \
3729+ html/_sources/api/database/index.txt \
3730+ html/_sources/api/database/misc.txt \
3731+ html/_sources/api/database/security.txt \
3732+ html/_sources/api/database/temp-views.txt \
3733+ html/_sources/api/document/attachments.txt \
3734+ html/_sources/api/document/common.txt \
3735+ html/_sources/api/document/index.txt \
3736+ html/_sources/api/ddoc/common.txt \
3737+ html/_sources/api/ddoc/index.txt \
3738+ html/_sources/api/ddoc/render.txt \
3739+ html/_sources/api/ddoc/rewrites.txt \
3740+ html/_sources/api/ddoc/views.txt \
3741+ html/_sources/api/server/authn.txt \
3742+ html/_sources/api/server/common.txt \
3743+ html/_sources/api/server/configuration.txt \
3744+ html/_sources/api/server/index.txt \
3745+ html/_sources/config/auth.txt \
3746+ html/_sources/config/compaction.txt \
3747+ html/_sources/config/couchdb.txt \
3748+ html/_sources/config/externals.txt \
3749+ html/_sources/config/http.txt \
3750+ html/_sources/config/http-handlers.txt \
3751+ html/_sources/config/index.txt \
3752+ html/_sources/config/logging.txt \
3753+ html/_sources/config/misc.txt \
3754+ html/_sources/config/query-servers.txt \
3755+ html/_sources/config/replicator.txt \
3756+ html/_sources/config/services.txt \
3757+ html/_sources/config/intro.txt \
3758+ html/_sources/config/proxying.txt \
3759+ html/_sources/couchapp/ddocs.txt \
3760+ html/_sources/couchapp/index.txt \
3761+ html/_sources/couchapp/views/collation.txt \
3762+ html/_sources/couchapp/views/index.txt \
3763+ html/_sources/couchapp/views/intro.txt \
3764+ html/_sources/couchapp/views/joins.txt \
3765+ html/_sources/couchapp/views/nosql.txt \
3766+ html/_sources/couchapp/views/pagination.txt \
3767+ html/_sources/cve/2010-0009.txt \
3768+ html/_sources/cve/2010-2234.txt \
3769+ html/_sources/cve/2010-3854.txt \
3770+ html/_sources/cve/2012-5641.txt \
3771+ html/_sources/cve/2012-5649.txt \
3772+ html/_sources/cve/2012-5650.txt \
3773+ html/_sources/cve/index.txt \
3774+ html/_sources/fauxton/addons.txt \
3775+ html/_sources/fauxton/index.txt \
3776+ html/_sources/fauxton/install.txt \
3777+ html/_sources/install/index.txt \
3778+ html/_sources/install/freebsd.txt \
3779+ html/_sources/install/mac.txt \
3780+ html/_sources/install/unix.txt \
3781+ html/_sources/install/windows.txt \
3782+ html/_sources/intro/api.txt \
3783+ html/_sources/intro/consistency.txt \
3784+ html/_sources/intro/curl.txt \
3785+ html/_sources/intro/futon.txt \
3786+ html/_sources/intro/index.txt \
3787+ html/_sources/intro/overview.txt \
3788+ html/_sources/intro/security.txt \
3789+ html/_sources/intro/tour.txt \
3790+ html/_sources/intro/why.txt \
3791+ html/_sources/maintenance/compaction.txt \
3792+ html/_sources/maintenance/index.txt \
3793+ html/_sources/maintenance/performance.txt \
3794+ html/_sources/query-server/index.txt \
3795+ html/_sources/query-server/erlang.txt \
3796+ html/_sources/query-server/javascript.txt \
3797+ html/_sources/query-server/protocol.txt \
3798+ html/_sources/replication/conflicts.txt \
3799+ html/_sources/replication/index.txt \
3800+ html/_sources/replication/intro.txt \
3801+ html/_sources/replication/protocol.txt \
3802+ html/_sources/replication/replicator.txt \
3803+ html/_sources/whatsnew/0.8.txt \
3804+ html/_sources/whatsnew/0.9.txt \
3805+ html/_sources/whatsnew/0.10.txt \
3806+ html/_sources/whatsnew/0.11.txt \
3807+ html/_sources/whatsnew/1.0.txt \
3808+ html/_sources/whatsnew/1.1.txt \
3809+ html/_sources/whatsnew/1.2.txt \
3810+ html/_sources/whatsnew/1.3.txt \
3811+ html/_sources/whatsnew/1.4.txt \
3812+ html/_sources/whatsnew/1.5.txt \
3813+ html/_sources/whatsnew/index.txt \
3814+ html/_sources/about.txt \
3815+ html/_sources/contents.txt \
3816 html/_sources/contributing.txt \
3817- html/_sources/ddocs.txt \
3818- html/_sources/index.txt \
3819- html/_sources/intro.txt \
3820+ html/_sources/experimental.txt \
3821+ html/_sources/externals.txt \
3822 html/_sources/json-structure.txt \
3823- html/_sources/query-servers.txt \
3824- html/_sources/replication.txt \
3825- html/_sources/replicator.txt \
3826 html/_static/ajax-loader.gif \
3827 html/_static/basic.css \
3828 html/_static/comment-bright.png \
3829@@ -315,28 +419,109 @@
3830 html/_static/up-pressed.png \
3831 html/_static/up.png \
3832 html/_static/websupport.js \
3833- html/api/authn.html \
3834- html/api/configuration.html \
3835- html/api/database.html \
3836- html/api/design.html \
3837- html/api/documents.html \
3838+ html/api/basics.html \
3839+ html/api/index.html \
3840 html/api/local.html \
3841- html/api/misc.html \
3842- html/api/reference.html \
3843- html/api-basics.html \
3844- html/changelog.html \
3845- html/changes.html \
3846- html/config_reference.html \
3847- html/configuring.html \
3848- html/ddocs.html \
3849+ html/api/database/bulk-api.html \
3850+ html/api/database/changes.html \
3851+ html/api/database/common.html \
3852+ html/api/database/compact.html \
3853+ html/api/database/index.html \
3854+ html/api/database/misc.html \
3855+ html/api/database/security.html \
3856+ html/api/database/temp-views.html \
3857+ html/api/document/attachments.html \
3858+ html/api/document/common.html \
3859+ html/api/document/index.html \
3860+ html/api/ddoc/common.html \
3861+ html/api/ddoc/index.html \
3862+ html/api/ddoc/render.html \
3863+ html/api/ddoc/rewrites.html \
3864+ html/api/ddoc/views.html \
3865+ html/api/server/authn.html \
3866+ html/api/server/common.html \
3867+ html/api/server/configuration.html \
3868+ html/api/server/index.html \
3869+ html/config/auth.html \
3870+ html/config/compaction.html \
3871+ html/config/couchdb.html \
3872+ html/config/externals.html \
3873+ html/config/http.html \
3874+ html/config/http-handlers.html \
3875+ html/config/index.html \
3876+ html/config/logging.html \
3877+ html/config/misc.html \
3878+ html/config/query-servers.html \
3879+ html/config/replicator.html \
3880+ html/config/services.html \
3881+ html/config/intro.html \
3882+ html/config/proxying.html \
3883+ html/couchapp/ddocs.html \
3884+ html/couchapp/index.html \
3885+ html/couchapp/views/collation.html \
3886+ html/couchapp/views/index.html \
3887+ html/couchapp/views/intro.html \
3888+ html/couchapp/views/joins.html \
3889+ html/couchapp/views/nosql.html \
3890+ html/couchapp/views/pagination.html \
3891+ html/cve/2010-0009.html \
3892+ html/cve/2010-2234.html \
3893+ html/cve/2010-3854.html \
3894+ html/cve/2012-5641.html \
3895+ html/cve/2012-5649.html \
3896+ html/cve/2012-5650.html \
3897+ html/cve/index.html \
3898+ html/fauxton/addons.html \
3899+ html/fauxton/index.html \
3900+ html/fauxton/install.html \
3901+ html/install/index.html \
3902+ html/install/freebsd.html \
3903+ html/install/mac.html \
3904+ html/install/unix.html \
3905+ html/install/windows.html \
3906+ html/intro/api.html \
3907+ html/intro/consistency.html \
3908+ html/intro/curl.html \
3909+ html/intro/futon.html \
3910+ html/intro/index.html \
3911+ html/intro/overview.html \
3912+ html/intro/security.html \
3913+ html/intro/tour.html \
3914+ html/intro/why.html \
3915+ html/maintenance/compaction.html \
3916+ html/maintenance/index.html \
3917+ html/maintenance/performance.html \
3918+ html/query-server/index.html \
3919+ html/query-server/erlang.html \
3920+ html/query-server/javascript.html \
3921+ html/query-server/protocol.html \
3922+ html/replication/conflicts.html \
3923+ html/replication/index.html \
3924+ html/replication/intro.html \
3925+ html/replication/protocol.html \
3926+ html/replication/replicator.html \
3927+ html/whatsnew/0.8.html \
3928+ html/whatsnew/0.9.html \
3929+ html/whatsnew/0.10.html \
3930+ html/whatsnew/0.11.html \
3931+ html/whatsnew/1.0.html \
3932+ html/whatsnew/1.1.html \
3933+ html/whatsnew/1.2.html \
3934+ html/whatsnew/1.3.html \
3935+ html/whatsnew/1.4.html \
3936+ html/whatsnew/1.5.html \
3937+ html/whatsnew/index.html \
3938+ html/about.html \
3939+ html/config-ref.html \
3940+ html/contents.html \
3941+ html/contributing.html \
3942+ html/download.html \
3943+ html/experimental.html \
3944+ html/externals.html \
3945+ html/http-api.html \
3946 html/index.html \
3947- html/intro.html \
3948 html/json-structure.html \
3949- html/query-servers.html \
3950- html/replication.html \
3951- html/replicator.html \
3952 html/objects.inv \
3953- html/genindex.html \
3954 html/search.html \
3955 html/searchindex.js
3956
3957@@ -350,45 +535,158 @@
3958 ../images/futon-editeddoc.png \
3959 ../images/futon-overview.png \
3960 ../images/futon-replform.png \
3961- ../images/logo.png
3962+ ../images/intro-consistency-01.png \
3963+ ../images/intro-consistency-02.png \
3964+ ../images/intro-consistency-03.png \
3965+ ../images/intro-consistency-04.png \
3966+ ../images/intro-consistency-05.png \
3967+ ../images/intro-consistency-06.png \
3968+ ../images/intro-consistency-07.png \
3969+ ../images/intro-tour-01.png \
3970+ ../images/intro-tour-02.png \
3971+ ../images/intro-tour-03.png \
3972+ ../images/intro-tour-04.png \
3973+ ../images/intro-tour-05.png \
3974+ ../images/intro-tour-06.png \
3975+ ../images/intro-tour-07.png \
3976+ ../images/intro-tour-08.png \
3977+ ../images/intro-tour-09.png \
3978+ ../images/intro-tour-10.png \
3979+ ../images/intro-why-01.png \
3980+ ../images/intro-why-02.png \
3981+ ../images/intro-why-03.png \
3982+ ../images/logo.png \
3983+ ../images/views-intro-01.png \
3984+ ../images/views-intro-02.png \
3985+ ../images/views-intro-03.png \
3986+ ../images/views-intro-04.png
3987
3988 src_files = \
3989- ../src/api/authn.rst \
3990- ../src/api/configuration.rst \
3991- ../src/api/database.rst \
3992- ../src/api/design.rst \
3993- ../src/api/documents.rst \
3994+ ../src/api/basics.rst \
3995+ ../src/api/index.rst \
3996 ../src/api/local.rst \
3997- ../src/api/misc.rst \
3998- ../src/api/reference.rst \
3999- ../src/api-basics.rst \
4000- ../src/changelog.rst \
4001- ../src/changes.rst \
4002- ../src/config_reference.rst \
4003- ../src/configuring.rst \
4004+ ../src/api/database/bulk-api.rst \
4005+ ../src/api/database/changes.rst \
4006+ ../src/api/database/common.rst \
4007+ ../src/api/database/compact.rst \
4008+ ../src/api/database/index.rst \
4009+ ../src/api/database/misc.rst \
4010+ ../src/api/database/security.rst \
4011+ ../src/api/database/temp-views.rst \
4012+ ../src/api/document/attachments.rst \
4013+ ../src/api/document/common.rst \
4014+ ../src/api/document/index.rst \
4015+ ../src/api/ddoc/common.rst \
4016+ ../src/api/ddoc/index.rst \
4017+ ../src/api/ddoc/render.rst \
4018+ ../src/api/ddoc/rewrites.rst \
4019+ ../src/api/ddoc/views.rst \
4020+ ../src/api/server/authn.rst \
4021+ ../src/api/server/common.rst \
4022+ ../src/api/server/configuration.rst \
4023+ ../src/api/server/index.rst \
4024+ ../src/config/auth.rst \
4025+ ../src/config/compaction.rst \
4026+ ../src/config/couchdb.rst \
4027+ ../src/config/externals.rst \
4028+ ../src/config/http.rst \
4029+ ../src/config/http-handlers.rst \
4030+ ../src/config/index.rst \
4031+ ../src/config/logging.rst \
4032+ ../src/config/misc.rst \
4033+ ../src/config/query-servers.rst \
4034+ ../src/config/replicator.rst \
4035+ ../src/config/services.rst \
4036+ ../src/config/intro.rst \
4037+ ../src/config/proxying.rst \
4038+ ../src/couchapp/ddocs.rst \
4039+ ../src/couchapp/index.rst \
4040+ ../src/couchapp/views/collation.rst \
4041+ ../src/couchapp/views/index.rst \
4042+ ../src/couchapp/views/intro.rst \
4043+ ../src/couchapp/views/joins.rst \
4044+ ../src/couchapp/views/nosql.rst \
4045+ ../src/couchapp/views/pagination.rst \
4046+ ../src/cve/2010-0009.rst \
4047+ ../src/cve/2010-2234.rst \
4048+ ../src/cve/2010-3854.rst \
4049+ ../src/cve/2012-5641.rst \
4050+ ../src/cve/2012-5649.rst \
4051+ ../src/cve/2012-5650.rst \
4052+ ../src/cve/index.rst \
4053+ ../src/fauxton/addons.rst \
4054+ ../src/fauxton/index.rst \
4055+ ../src/fauxton/install.rst \
4056+ ../src/install/index.rst \
4057+ ../src/install/freebsd.rst \
4058+ ../src/install/mac.rst \
4059+ ../src/install/unix.rst \
4060+ ../src/install/windows.rst \
4061+ ../src/intro/api.rst \
4062+ ../src/intro/consistency.rst \
4063+ ../src/intro/curl.rst \
4064+ ../src/intro/futon.rst \
4065+ ../src/intro/index.rst \
4066+ ../src/intro/overview.rst \
4067+ ../src/intro/security.rst \
4068+ ../src/intro/tour.rst \
4069+ ../src/intro/why.rst \
4070+ ../src/maintenance/compaction.rst \
4071+ ../src/maintenance/index.rst \
4072+ ../src/maintenance/performance.rst \
4073+ ../src/query-server/index.rst \
4074+ ../src/query-server/erlang.rst \
4075+ ../src/query-server/javascript.rst \
4076+ ../src/query-server/protocol.rst \
4077+ ../src/replication/conflicts.rst \
4078+ ../src/replication/index.rst \
4079+ ../src/replication/intro.rst \
4080+ ../src/replication/protocol.rst \
4081+ ../src/replication/replicator.rst \
4082+ ../src/whatsnew/0.8.rst \
4083+ ../src/whatsnew/0.9.rst \
4084+ ../src/whatsnew/0.10.rst \
4085+ ../src/whatsnew/0.11.rst \
4086+ ../src/whatsnew/1.0.rst \
4087+ ../src/whatsnew/1.1.rst \
4088+ ../src/whatsnew/1.2.rst \
4089+ ../src/whatsnew/1.3.rst \
4090+ ../src/whatsnew/1.4.rst \
4091+ ../src/whatsnew/1.5.rst \
4092+ ../src/whatsnew/index.rst \
4093+ ../src/about.rst \
4094+ ../src/contents.rst \
4095+ ../src/experimental.rst \
4096 ../src/contributing.rst \
4097- ../src/ddocs.rst \
4098- ../src/index.rst \
4099- ../src/intro.rst \
4100+ ../src/externals.rst \
4101 ../src/json-structure.rst \
4102- ../src/query-servers.rst \
4103- ../src/replication.rst \
4104- ../src/replicator.rst \
4105 ../src/conf.py
4106
4107 src_files_html = \
4108 ../static/rtd.css \
4109+ ../templates/couchdb/domainindex.html \
4110+ ../templates/couchdb/theme.conf \
4111+ ../templates/pages/download.html \
4112+ ../templates/pages/index.html \
4113+ ../templates/layout.html \
4114 ../templates/help.html \
4115 ../templates/searchbox.html \
4116 ../templates/utilities.html
4117
4118+sphinx_extensions = \
4119+ ../ext/configdomain.py \
4120+ ../ext/github.py \
4121+ ../ext/httpdomain.py \
4122+ ../ext/http-api-descr.json
4123+
4124 EXTRA_DIST = \
4125 $(image_files) \
4126 $(src_files) \
4127 $(src_files_html) \
4128 $(info_file_build) \
4129 $(pdf_file_build) \
4130- $(html_files_build)
4131+ $(html_files_build) \
4132+ $(sphinx_extensions)
4133
4134 BUILT_SOURCES = \
4135 $(info_file_build) \
4136
4137=== modified file 'share/doc/build/html/_images/futon-editdoc.png'
4138Binary files share/doc/build/html/_images/futon-editdoc.png 2013-08-28 18:21:32 +0000 and share/doc/build/html/_images/futon-editdoc.png 2013-12-01 23:56:33 +0000 differ
4139=== modified file 'share/doc/build/html/_images/futon-editeddoc.png'
4140Binary files share/doc/build/html/_images/futon-editeddoc.png 2013-08-28 18:21:32 +0000 and share/doc/build/html/_images/futon-editeddoc.png 2013-12-01 23:56:33 +0000 differ
4141=== modified file 'share/doc/build/html/_images/futon-overview.png'
4142Binary files share/doc/build/html/_images/futon-overview.png 2013-08-28 18:21:32 +0000 and share/doc/build/html/_images/futon-overview.png 2013-12-01 23:56:33 +0000 differ
4143=== modified file 'share/doc/build/html/_images/futon-replform.png'
4144Binary files share/doc/build/html/_images/futon-replform.png 2013-08-28 18:21:32 +0000 and share/doc/build/html/_images/futon-replform.png 2013-12-01 23:56:33 +0000 differ
4145=== added file 'share/doc/build/html/_images/intro-consistency-01.png'
4146Binary files share/doc/build/html/_images/intro-consistency-01.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-consistency-01.png 2013-12-01 23:56:33 +0000 differ
4147=== added file 'share/doc/build/html/_images/intro-consistency-02.png'
4148Binary files share/doc/build/html/_images/intro-consistency-02.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-consistency-02.png 2013-12-01 23:56:33 +0000 differ
4149=== added file 'share/doc/build/html/_images/intro-consistency-03.png'
4150Binary files share/doc/build/html/_images/intro-consistency-03.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-consistency-03.png 2013-12-01 23:56:33 +0000 differ
4151=== added file 'share/doc/build/html/_images/intro-consistency-04.png'
4152Binary files share/doc/build/html/_images/intro-consistency-04.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-consistency-04.png 2013-12-01 23:56:33 +0000 differ
4153=== added file 'share/doc/build/html/_images/intro-consistency-05.png'
4154Binary files share/doc/build/html/_images/intro-consistency-05.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-consistency-05.png 2013-12-01 23:56:33 +0000 differ
4155=== added file 'share/doc/build/html/_images/intro-consistency-06.png'
4156Binary files share/doc/build/html/_images/intro-consistency-06.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-consistency-06.png 2013-12-01 23:56:33 +0000 differ
4157=== added file 'share/doc/build/html/_images/intro-consistency-07.png'
4158Binary files share/doc/build/html/_images/intro-consistency-07.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-consistency-07.png 2013-12-01 23:56:33 +0000 differ
4159=== added file 'share/doc/build/html/_images/intro-tour-01.png'
4160Binary files share/doc/build/html/_images/intro-tour-01.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-01.png 2013-12-01 23:56:33 +0000 differ
4161=== added file 'share/doc/build/html/_images/intro-tour-02.png'
4162Binary files share/doc/build/html/_images/intro-tour-02.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-02.png 2013-12-01 23:56:33 +0000 differ
4163=== added file 'share/doc/build/html/_images/intro-tour-03.png'
4164Binary files share/doc/build/html/_images/intro-tour-03.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-03.png 2013-12-01 23:56:33 +0000 differ
4165=== added file 'share/doc/build/html/_images/intro-tour-04.png'
4166Binary files share/doc/build/html/_images/intro-tour-04.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-04.png 2013-12-01 23:56:33 +0000 differ
4167=== added file 'share/doc/build/html/_images/intro-tour-05.png'
4168Binary files share/doc/build/html/_images/intro-tour-05.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-05.png 2013-12-01 23:56:33 +0000 differ
4169=== added file 'share/doc/build/html/_images/intro-tour-06.png'
4170Binary files share/doc/build/html/_images/intro-tour-06.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-06.png 2013-12-01 23:56:33 +0000 differ
4171=== added file 'share/doc/build/html/_images/intro-tour-07.png'
4172Binary files share/doc/build/html/_images/intro-tour-07.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-07.png 2013-12-01 23:56:33 +0000 differ
4173=== added file 'share/doc/build/html/_images/intro-tour-08.png'
4174Binary files share/doc/build/html/_images/intro-tour-08.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-08.png 2013-12-01 23:56:33 +0000 differ
4175=== added file 'share/doc/build/html/_images/intro-tour-09.png'
4176Binary files share/doc/build/html/_images/intro-tour-09.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-09.png 2013-12-01 23:56:33 +0000 differ
4177=== added file 'share/doc/build/html/_images/intro-tour-10.png'
4178Binary files share/doc/build/html/_images/intro-tour-10.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-10.png 2013-12-01 23:56:33 +0000 differ
4179=== added file 'share/doc/build/html/_images/intro-why-01.png'
4180Binary files share/doc/build/html/_images/intro-why-01.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-why-01.png 2013-12-01 23:56:33 +0000 differ
4181=== added file 'share/doc/build/html/_images/intro-why-02.png'
4182Binary files share/doc/build/html/_images/intro-why-02.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-why-02.png 2013-12-01 23:56:33 +0000 differ
4183=== added file 'share/doc/build/html/_images/intro-why-03.png'
4184Binary files share/doc/build/html/_images/intro-why-03.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-why-03.png 2013-12-01 23:56:33 +0000 differ
4185=== added file 'share/doc/build/html/_images/views-intro-01.png'
4186Binary files share/doc/build/html/_images/views-intro-01.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/views-intro-01.png 2013-12-01 23:56:33 +0000 differ
4187=== added file 'share/doc/build/html/_images/views-intro-02.png'
4188Binary files share/doc/build/html/_images/views-intro-02.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/views-intro-02.png 2013-12-01 23:56:33 +0000 differ
4189=== added file 'share/doc/build/html/_images/views-intro-03.png'
4190Binary files share/doc/build/html/_images/views-intro-03.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/views-intro-03.png 2013-12-01 23:56:33 +0000 differ
4191=== added file 'share/doc/build/html/_images/views-intro-04.png'
4192Binary files share/doc/build/html/_images/views-intro-04.png 1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/views-intro-04.png 2013-12-01 23:56:33 +0000 differ
4193=== added file 'share/doc/build/html/_sources/about.txt'
4194--- share/doc/build/html/_sources/about.txt 1970-01-01 00:00:00 +0000
4195+++ share/doc/build/html/_sources/about.txt 2013-12-01 23:56:33 +0000
4196@@ -0,0 +1,25 @@
4197+.. Licensed under the Apache License, Version 2.0 (the "License"); you may not
4198+.. use this file except in compliance with the License. You may obtain a copy of
4199+.. the License at
4200+..
4201+.. http://www.apache.org/licenses/LICENSE-2.0
4202+..
4203+.. Unless required by applicable law or agreed to in writing, software
4204+.. distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
4205+.. WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
4206+.. License for the specific language governing permissions and limitations under
4207+.. the License.
4208+
4209+
4210+.. _about:
4211+
4212+===========================
4213+About CouchDB Documentation
4214+===========================
4215+
4216+License
4217+=======
4218+
4219+.. literalinclude:: ../../../LICENSE
4220+ :lines: 1-202
4221+
4222
4223=== removed file 'share/doc/build/html/_sources/api-basics.txt'
4224--- share/doc/build/html/_sources/api-basics.txt 2013-08-28 18:21:32 +0000
4225+++ share/doc/build/html/_sources/api-basics.txt 1970-01-01 00:00:00 +0000
4226@@ -1,463 +0,0 @@
4227-.. Licensed under the Apache License, Version 2.0 (the "License"); you may not
4228-.. use this file except in compliance with the License. You may obtain a copy of
4229-.. the License at
4230-..
4231-.. http://www.apache.org/licenses/LICENSE-2.0
4232-..
4233-.. Unless required by applicable law or agreed to in writing, software
4234-.. distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
4235-.. WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
4236-.. License for the specific language governing permissions and limitations under
4237-.. the License.
4238-
4239-.. _api-basics:
4240-
4241-==========
4242-API Basics
4243-==========
4244-
4245-The CouchDB API is the primary method of interfacing to a CouchDB
4246-instance. Requests are made using HTTP and requests are used to request
4247-information from the database, store new data, and perform views and
4248-formatting of the information stored within the documents.
4249-
4250-Requests to the API can be categorised by the different areas of the
4251-CouchDB system that you are accessing, and the HTTP method used to send
4252-the request. Different methods imply different operations, for example
4253-retrieval of information from the database is typically handled by the
4254-``GET`` operation, while updates are handled by either a ``POST`` or
4255-``PUT`` request. There are some differences between the information that
4256-must be supplied for the different methods. For a guide to the basic
4257-HTTP methods and request structure, see :ref:`api-format`.
4258-
4259-For nearly all operations, the submitted data, and the returned data
4260-structure, is defined within a JavaScript Object Notation (JSON) object.
4261-Basic information on the content and data types for JSON are provided in
4262-:ref:`json`.
4263-
4264-Errors when accessing the CouchDB API are reported using standard HTTP
4265-Status Codes. A guide to the generic codes returned by CouchDB are
4266-provided in :ref:`errors`.
4267-
4268-When accessing specific areas of the CouchDB API, specific information
4269-and examples on the HTTP methods and request, JSON structures, and error
4270-codes are provided. For a guide to the different areas of the API, see
4271-:ref:`api-overview`.
4272-
4273-.. _api-format:
4274-
4275-Request Format and Responses
4276-============================
4277-
4278-CouchDB supports the following HTTP request methods:
4279-
4280-- ``GET``
4281-
4282- Request the specified item. As with normal HTTP requests, the format
4283- of the URL defines what is returned. With CouchDB this can include
4284- static items, database documents, and configuration and statistical
4285- information. In most cases the information is returned in the form of
4286- a JSON document.
4287-
4288-- ``HEAD``
4289-
4290- The ``HEAD`` method is used to get the HTTP header of a ``GET``
4291- request without the body of the response.
4292-
4293-- ``POST``
4294-
4295- Upload data. Within CouchDB ``POST`` is used to set values, including
4296- uploading documents, setting document values, and starting certain
4297- administration commands.
4298-
4299-- ``PUT``
4300-
4301- Used to put a specified resource. In CouchDB ``PUT`` is used to
4302- create new objects, including databases, documents, views and design
4303- documents.
4304-
4305-- ``DELETE``
4306-
4307- Deletes the specified resource, including documents, views, and
4308- design documents.
4309-
4310-- ``COPY``
4311-
4312- A special method that can be used to copy documents and objects.
4313-
4314-If you use the an unsupported HTTP request type with a URL that does not
4315-support the specified type, a 405 error will be returned, listing the
4316-supported HTTP methods. For example:
4317-
4318-.. code-block:: javascript
4319-
4320- {
4321- "error":"method_not_allowed",
4322- "reason":"Only GET,HEAD allowed"
4323- }
4324-
4325-
4326-The CouchDB design document API and the functions when returning HTML
4327-(for example as part of a show or list) enables you to include custom
4328-HTTP headers through the ``headers`` block of the return object.
4329-
4330-HTTP Headers
4331-============
4332-
4333-Because CouchDB uses HTTP for all communication, you need to ensure that
4334-the correct HTTP headers are supplied (and processed on retrieval) so
4335-that you get the right format and encoding. Different environments and
4336-clients will be more or less strict on the effect of these HTTP headers
4337-(especially when not present). Where possible you should be as specific
4338-as possible.
4339-
4340-Request Headers
4341----------------
4342-
4343-- ``Content-type``
4344-
4345- Specifies the content type of the information being supplied within
4346- the request. The specification uses MIME type specifications. For the
4347- majority of requests this will be JSON (``application/json``). For
4348- some settings the MIME type will be plain text. When uploading
4349- attachments it should be the corresponding MIME type for the
4350- attachment or binary (``application/octet-stream``).
4351-
4352- The use of the ``Content-type`` on a request is highly recommended.
4353-
4354-- ``Accept``
4355-
4356- Specifies the list of accepted data types to be returned by the
4357- server (i.e. that are accepted/understandable by the client). The
4358- format should be a list of one or more MIME types, separated by
4359- colons.
4360-
4361- For the majority of requests the definition should be for JSON data
4362- (``application/json``). For attachments you can either specify the
4363- MIME type explicitly, or use ``*/*`` to specify that all file types
4364- are supported. If the ``Accept`` header is not supplied, then the
4365- ``*/*`` MIME type is assumed (i.e. client accepts all formats).
4366-
4367- The use of ``Accept`` in queries for CouchDB is not required, but is
4368- highly recommended as it helps to ensure that the data returned can
4369- be processed by the client.
4370-
4371- If you specify a data type using the ``Accept`` header, CouchDB will
4372- honor the specified type in the ``Content-type`` header field
4373- returned. For example, if you explicitly request ``application/json``
4374- in the ``Accept`` of a request, the returned HTTP headers will use
4375- the value in the returned ``Content-type`` field.
4376-
4377- For example, when sending a request without an explicit ``Accept``
4378- header, or when specifying ``*/*``:
4379-
4380- .. code-block:: http
4381-
4382- GET /recipes HTTP/1.1
4383- Host: couchdb:5984
4384- Accept: */*
4385-
4386- The returned headers are:
4387-
4388- .. code-block:: http
4389-
4390- Server: CouchDB/1.0.1 (Erlang OTP/R13B)
4391- Date: Thu, 13 Jan 2011 13:39:34 GMT
4392- Content-Type: text/plain;charset=utf-8
4393- Content-Length: 227
4394- Cache-Control: must-revalidate
4395-
4396- Note that the returned content type is ``text/plain`` even though the
4397- information returned by the request is in JSON format.
4398-
4399- Explicitly specifying the ``Accept`` header:
4400-
4401- .. code-block:: http
4402-
4403- GET /recipes HTTP/1.1
4404- Host: couchdb:5984
4405- Accept: application/json
4406-
4407- The headers returned include the ``application/json`` content type:
4408-
4409- .. code-block:: http
4410-
4411- Server: CouchDB/|version| (Erlang OTP/R13B)
4412- Date: Thu, 13 Jan 2011 13:40:11 GMT
4413- Content-Type: application/json
4414- Content-Length: 227
4415- Cache-Control: must-revalidate
4416-
4417-Response Headers
4418-----------------
4419-
4420-Response headers are returned by the server when sending back content
4421-and include a number of different header fields, many of which are
4422-standard HTTP response header and have no significance to CouchDB
4423-operation. The list of response headers important to CouchDB are listed
4424-below.
4425-
4426-- ``Content-type``
4427-
4428- Specifies the MIME type of the returned data. For most request, the
4429- returned MIME type is ``text/plain``. All text is encoded in Unicode
4430- (UTF-8), and this is explicitly stated in the returned
4431- ``Content-type``, as ``text/plain;charset=utf-8``.
4432-
4433-- ``Cache-control``
4434-
4435- The cache control HTTP response header provides a suggestion for
4436- client caching mechanisms on how to treat the returned information.
4437- CouchDB typically returns the ``must-revalidate``, which indicates
4438- that the information should be revalidated if possible. This is used
4439- to ensure that the dynamic nature of the content is correctly
4440- updated.
4441-
4442-- ``Content-length``
4443-
4444- The length (in bytes) of the returned content.
4445-
4446-- ``Etag``
4447-
4448- The ``Etag`` HTTP header field is used to show the revision for a
4449- document, or a view.
4450-
4451- ETags have been assigned to a map/reduce group (the collection of
4452- views in a single design document). Any change to any of the indexes
4453- for those views would generate a new ETag for all view URL's in a
4454- single design doc, even if that specific view's results had not
4455- changed.
4456-
4457- Each ``_view`` URL has its own ETag which only gets updated when
4458- changes are made to the database that effect that index. If the
4459- index for that specific view does not change, that view keeps the
4460- original ETag head (therefore sending back 304 Not Modified more
4461- often).
4462-
4463-.. _json:
4464-
4465-JSON Basics
4466-===========
4467-
4468-The majority of requests and responses to CouchDB use the JavaScript
4469-Object Notation (JSON) for formatting the content and structure of the
4470-data and responses.
4471-
4472-JSON is used because it is the simplest and easiest to use solution for
4473-working with data within a web browser, as JSON structures can be
4474-evaluated and used as JavaScript objects within the web browser
4475-environment. JSON also integrates with the server-side JavaScript used
4476-within CouchDB.
4477-
4478-JSON supports the same basic types as supported by JavaScript, these
4479-are:
4480-
4481-- Number (either integer or floating-point).
4482-
4483-- String; this should be enclosed by double-quotes and supports Unicode
4484- characters and backslash escaping. For example:
4485-
4486- .. code-block:: javascript
4487-
4488- "A String"
4489-
4490-- Boolean - a ``true`` or ``false`` value. You can use these strings
4491- directly. For example:
4492-
4493- .. code-block:: javascript
4494-
4495- { "value": true}
4496-
4497-- Array - a list of values enclosed in square brackets. For example:
4498-
4499- .. code-block:: javascript
4500-
4501- ["one", "two", "three"]
4502-
4503-- Object - a set of key/value pairs (i.e. an associative array, or
4504- hash). The key must be a string, but the value can be any of the
4505- supported JSON values. For example:
4506-
4507- .. code-block:: javascript
4508-
4509- {
4510- "servings" : 4,
4511- "subtitle" : "Easy to make in advance, and then cook when ready",
4512- "cooktime" : 60,
4513- "title" : "Chicken Coriander"
4514- }
4515-
4516-
4517- In CouchDB, the JSON object is used to represent a variety of
4518- structures, including the main CouchDB document.
4519-
4520-Parsing JSON into a JavaScript object is supported through the
4521-``JSON.parse()`` function in JavaScript, or through various libraries that
4522-will perform the parsing of the content into a JavaScript object for
4523-you. Libraries for parsing and generating JSON are available in many
4524-languages, including Perl, Python, Ruby, Erlang and others.
4525-
4526-.. warning::
4527- Care should be taken to ensure that your JSON structures are
4528- valid, invalid structures will cause CouchDB to return an HTTP status code
4529- of 500 (server error).
4530-
4531-.. _errors:
4532-
4533-HTTP Status Codes
4534-=================
4535-
4536-With the interface to CouchDB working through HTTP, error codes and
4537-statuses are reported using a combination of the HTTP status code
4538-number, and corresponding data in the body of the response data.
4539-
4540-A list of the error codes returned by CouchDB, and generic descriptions
4541-of the related errors are provided below. The meaning of different
4542-status codes for specific request types are provided in the
4543-corresponding API call reference.
4544-
4545-- ``200 - OK``
4546-
4547- Request completed successfully.
4548-
4549-- ``201 - Created``
4550-
4551- Document created successfully.
4552-
4553-- ``202 - Accepted``
4554-
4555- Request has been accepted, but the corresponding operation may not
4556- have completed. This is used for background operations, such as
4557- database compaction.
4558-
4559-- ``304 - Not Modified``
4560-
4561- The additional content requested has not been modified. This is used
4562- with the ETag system to identify the version of information returned.
4563-
4564-- ``400 - Bad Request``
4565-
4566- Bad request structure. The error can indicate an error with the
4567- request URL, path or headers. Differences in the supplied MD5 hash
4568- and content also trigger this error, as this may indicate message
4569- corruption.
4570-
4571-- ``401 - Unauthorized``
4572-
4573- The item requested was not available using the supplied
4574- authorization, or authorization was not supplied.
4575-
4576-- ``403 - Forbidden``
4577-
4578- The requested item or operation is forbidden.
4579-
4580-- ``404 - Not Found``
4581-
4582- The requested content could not be found. The content will include
4583- further information, as a JSON object, if available. The structure
4584- will contain two keys, ``error`` and ``reason``. For example:
4585-
4586- .. code-block:: javascript
4587-
4588- {"error":"not_found","reason":"no_db_file"}
4589-
4590-- ``405 - Resource Not Allowed``
4591-
4592- A request was made using an invalid HTTP request type for the URL
4593- requested. For example, you have requested a ``PUT`` when a ``POST``
4594- is required. Errors of this type can also triggered by invalid URL
4595- strings.
4596-
4597-- ``406 - Not Acceptable``
4598-
4599- The requested content type is not supported by the server.
4600-
4601-- ``409 - Conflict``
4602-
4603- Request resulted in an update conflict.
4604-
4605-- ``412 - Precondition Failed``
4606-
4607- The request headers from the client and the capabilities of the
4608- server do not match.
4609-
4610-- ``415 - Bad Content Type``
4611-
4612- The content types supported, and the content type of the information
4613- being requested or submitted indicate that the content type is not
4614- supported.
4615-
4616-- ``416 - Requested Range Not Satisfiable``
4617-
4618- The range specified in the request header cannot be satisfied by the
4619- server.
4620-
4621-- ``417 - Expectation Failed``
4622-
4623- When sending documents in bulk, the bulk load operation failed.
4624-
4625-- ``500 - Internal Server Error``
4626-
4627- The request was invalid, either because the supplied JSON was
4628- invalid, or invalid information was supplied as part of the request.
4629-
4630-HTTP Range Requests
4631-===================
4632-
4633-HTTP allows you to specify byte ranges for requests. This allows the
4634-implementation of resumable downloads and skippable audio and video
4635-streams alike. This is available for all attachments inside CouchDB.
4636-
4637-This is just a real quick run through how this looks under the hood.
4638-Usually, you will have larger binary files to serve from CouchDB, like
4639-MP3s and videos, but to make things a little more obvious, I use a text
4640-file here (Note that I use the ``application/octet-stream`` Content-Type
4641-instead of ``text/plain``).
4642-
4643-.. code-block:: bash
4644-
4645- shell> cat file.txt
4646- My hovercraft is full of eels!
4647-
4648-Now let's store this text file as an attachment in CouchDB. First, we
4649-create a database:
4650-
4651-.. code-block:: bash
4652-
4653- shell> curl -X PUT http://127.0.0.1:5984/test
4654- {"ok":true}
4655-
4656-Then we create a new document and the file attachment in one go:
4657-
4658-.. code-block:: bash
4659-
4660- shell> curl -X PUT http://127.0.0.1:5984/test/doc/file.txt \
4661- -H "Content-Type: application/octet-stream" -d@file.txt
4662- {"ok":true,"id":"doc","rev":"1-287a28fa680ae0c7fb4729bf0c6e0cf2"}
4663-
4664-Now we can request the whole file easily:
4665-
4666-.. code-block:: bash
4667-
4668- shell> curl -X GET http://127.0.0.1:5984/test/doc/file.txt
4669- My hovercraft is full of eels!
4670-
4671-But say we only want the first 13 bytes:
4672-
4673-.. code-block:: bash
4674-
4675- shell> curl -X GET http://127.0.0.1:5984/test/doc/file.txt \
4676- -H "Range: bytes=0-12"
4677- My hovercraft
4678-
4679-HTTP supports many ways to specify single and even multiple byte
4680-ranges. Read all about it in `RFC 2616`_.
4681-
4682-.. note::
4683- Databases that have been created with CouchDB 1.0.2 or earlier will
4684- support range requests in |version|, but they are using a less-optimal
4685- algorithm. If you plan to make heavy use of this feature, make sure
4686- to compact your database with CouchDB |version| to take advantage of a
4687- better algorithm to find byte ranges.
4688-
4689-.. _RFC 2616: http://tools.ietf.org/html/rfc2616#section-14.27
4690
4691=== removed file 'share/doc/build/html/_sources/api/authn.txt'
4692--- share/doc/build/html/_sources/api/authn.txt 2013-08-28 18:21:32 +0000
4693+++ share/doc/build/html/_sources/api/authn.txt 1970-01-01 00:00:00 +0000
4694@@ -1,41 +0,0 @@
4695-.. Licensed under the Apache License, Version 2.0 (the "License"); you may not
4696-.. use this file except in compliance with the License. You may obtain a copy of
4697-.. the License at
4698-..
4699-.. http://www.apache.org/licenses/LICENSE-2.0
4700-..
4701-.. Unless required by applicable law or agreed to in writing, software
4702-.. distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
4703-.. WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
4704-.. License for the specific language governing permissions and limitations under
4705-.. the License.
4706-
4707-======================
4708-Authentication Methods
4709-======================
4710-
4711-.. todo:: Authentication Methods
4712-
4713-The CouchDB Authentication methods provide an interface for obtaining
4714-session and authorization data.
4715-
4716-A list of the available methods and URL paths are provided below:
4717-
4718-+--------+-------------------------+-------------------------------------------+
4719-| Method | Path | Description |
4720-+========+=========================+===========================================+
4721-| GET | /_oauth/access_token | TBC |
4722-+--------+-------------------------+-------------------------------------------+
4723-| GET | /_oauth/authorize | TBC |
4724-+--------+-------------------------+-------------------------------------------+
4725-| POST | /_oauth/authorize | TBC |
4726-+--------+-------------------------+-------------------------------------------+
4727-| GET | /_oauth/request_token | TBC |
4728-+--------+-------------------------+-------------------------------------------+
4729-| GET | /_session | Returns cookie based login user |
4730-| | | information |
4731-+--------+-------------------------+-------------------------------------------+
4732-| POST | /_session | Do cookie based user login |
4733-+--------+-------------------------+-------------------------------------------+
4734-| DELETE | /_session | Logout cookie based user |
4735-+--------+-------------------------+-------------------------------------------+
4736
4737=== added file 'share/doc/build/html/_sources/api/basics.txt'
4738--- share/doc/build/html/_sources/api/basics.txt 1970-01-01 00:00:00 +0000
4739+++ share/doc/build/html/_sources/api/basics.txt 2013-12-01 23:56:33 +0000
4740@@ -0,0 +1,601 @@
4741+.. Licensed under the Apache License, Version 2.0 (the "License"); you may not
4742+.. use this file except in compliance with the License. You may obtain a copy of
4743+.. the License at
4744+..
4745+.. http://www.apache.org/licenses/LICENSE-2.0
4746+..
4747+.. Unless required by applicable law or agreed to in writing, software
4748+.. distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
4749+.. WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
4750+.. License for the specific language governing permissions and limitations under
4751+.. the License.
4752+
4753+.. _api/basics:
4754+
4755+==========
4756+API Basics
4757+==========
4758+
4759+The CouchDB API is the primary method of interfacing to a CouchDB
4760+instance. Requests are made using HTTP and requests are used to request
4761+information from the database, store new data, and perform views and
4762+formatting of the information stored within the documents.
4763+
4764+Requests to the API can be categorised by the different areas of the
4765+CouchDB system that you are accessing, and the HTTP method used to send
4766+the request. Different methods imply different operations, for example
4767+retrieval of information from the database is typically handled by the
4768+``GET`` operation, while updates are handled by either a ``POST`` or
4769+``PUT`` request. There are some differences between the information that
4770+must be supplied for the different methods. For a guide to the basic
4771+HTTP methods and request structure, see :ref:`api/format`.
4772+
4773+For nearly all operations, the submitted data, and the returned data
4774+structure, is defined within a JavaScript Object Notation (JSON) object.
4775+Basic information on the content and data types for JSON are provided in
4776+:ref:`json`.
4777+
4778+Errors when accessing the CouchDB API are reported using standard HTTP
4779+Status Codes. A guide to the generic codes returned by CouchDB are
4780+provided in :ref:`errors`.
4781+
4782+When accessing specific areas of the CouchDB API, specific information
4783+and examples on the HTTP methods and request, JSON structures, and error
4784+codes are provided.
4785+
4786+.. _api/format:
4787+
4788+Request Format and Responses
4789+============================
4790+
4791+CouchDB supports the following HTTP request methods:
4792+
4793+- ``GET``
4794+
4795+ Request the specified item. As with normal HTTP requests, the format
4796+ of the URL defines what is returned. With CouchDB this can include
4797+ static items, database documents, and configuration and statistical
4798+ information. In most cases the information is returned in the form of
4799+ a JSON document.
4800+
4801+- ``HEAD``
4802+
4803+ The ``HEAD`` method is used to get the HTTP header of a ``GET``
4804+ request without the body of the response.
4805+
4806+- ``POST``
4807+
4808+ Upload data. Within CouchDB ``POST`` is used to set values, including
4809+ uploading documents, setting document values, and starting certain
4810+ administration commands.
4811+
4812+- ``PUT``
4813+
4814+ Used to put a specified resource. In CouchDB ``PUT`` is used to
4815+ create new objects, including databases, documents, views and design
4816+ documents.
4817+
4818+- ``DELETE``
4819+
4820+ Deletes the specified resource, including documents, views, and
4821+ design documents.
4822+
4823+- ``COPY``
4824+
4825+ A special method that can be used to copy documents and objects.
4826+
4827+If you use the an unsupported HTTP request type with a URL that does not
4828+support the specified type, a 405 error will be returned, listing the
4829+supported HTTP methods. For example:
4830+
4831+.. code-block:: javascript
4832+
4833+ {
4834+ "error":"method_not_allowed",
4835+ "reason":"Only GET,HEAD allowed"
4836+ }
4837+
4838+
4839+The CouchDB design document API and the functions when returning HTML
4840+(for example as part of a show or list) enables you to include custom
4841+HTTP headers through the ``headers`` block of the return object.
4842+
4843+HTTP Headers
4844+============
4845+
4846+Because CouchDB uses HTTP for all communication, you need to ensure that
4847+the correct HTTP headers are supplied (and processed on retrieval) so
4848+that you get the right format and encoding. Different environments and
4849+clients will be more or less strict on the effect of these HTTP headers
4850+(especially when not present). Where possible you should be as specific
4851+as possible.
4852+
4853+Request Headers
4854+---------------
4855+
4856+- ``Content-type``
4857+
4858+ Specifies the content type of the information being supplied within
4859+ the request. The specification uses MIME type specifications. For the
4860+ majority of requests this will be JSON (``application/json``). For
4861+ some settings the MIME type will be plain text. When uploading
4862+ attachments it should be the corresponding MIME type for the
4863+ attachment or binary (``application/octet-stream``).
4864+
4865+ The use of the ``Content-type`` on a request is highly recommended.
4866+
4867+- ``Accept``
4868+
4869+ Specifies the list of accepted data types to be returned by the
4870+ server (i.e. that are accepted/understandable by the client). The
4871+ format should be a list of one or more MIME types, separated by
4872+ colons.
4873+
4874+ For the majority of requests the definition should be for JSON data
4875+ (``application/json``). For attachments you can either specify the
4876+ MIME type explicitly, or use ``*/*`` to specify that all file types
4877+ are supported. If the ``Accept`` header is not supplied, then the
4878+ ``*/*`` MIME type is assumed (i.e. client accepts all formats).
4879+
4880+ The use of ``Accept`` in queries for CouchDB is not required, but is
4881+ highly recommended as it helps to ensure that the data returned can
4882+ be processed by the client.
4883+
4884+ If you specify a data type using the ``Accept`` header, CouchDB will
4885+ honor the specified type in the ``Content-type`` header field
4886+ returned. For example, if you explicitly request ``application/json``
4887+ in the ``Accept`` of a request, the returned HTTP headers will use
4888+ the value in the returned ``Content-type`` field.
4889+
4890+ For example, when sending a request without an explicit ``Accept``
4891+ header, or when specifying ``*/*``:
4892+
4893+ .. code-block:: http
4894+
4895+ GET /recipes HTTP/1.1
4896+ Host: couchdb:5984
4897+ Accept: */*
4898+
4899+ The returned headers are:
4900+
4901+ .. code-block:: http
4902+
4903+ Server: CouchDB (Erlang/OTP)
4904+ Date: Thu, 13 Jan 2011 13:39:34 GMT
4905+ Content-Type: text/plain;charset=utf-8
4906+ Content-Length: 227
4907+ Cache-Control: must-revalidate
4908+
4909+ Note that the returned content type is ``text/plain`` even though the
4910+ information returned by the request is in JSON format.
4911+
4912+ Explicitly specifying the ``Accept`` header:
4913+
4914+ .. code-block:: http
4915+
4916+ GET /recipes HTTP/1.1
4917+ Host: couchdb:5984
4918+ Accept: application/json
4919+
4920+ The headers returned include the ``application/json`` content type:
4921+
4922+ .. code-block:: http
4923+
4924+ Server: CouchDB (Erlang/OTP)
4925+ Date: Thu, 13 Jan 2013 13:40:11 GMT
4926+ Content-Type: application/json
4927+ Content-Length: 227
4928+ Cache-Control: must-revalidate
4929+
4930+Response Headers
4931+----------------
4932+
4933+Response headers are returned by the server when sending back content
4934+and include a number of different header fields, many of which are
4935+standard HTTP response header and have no significance to CouchDB
4936+operation. The list of response headers important to CouchDB are listed
4937+below.
4938+
4939+- ``Content-type``
4940+
4941+ Specifies the MIME type of the returned data. For most request, the
4942+ returned MIME type is ``text/plain``. All text is encoded in Unicode
4943+ (UTF-8), and this is explicitly stated in the returned
4944+ ``Content-type``, as ``text/plain;charset=utf-8``.
4945+
4946+- ``Cache-control``
4947+
4948+ The cache control HTTP response header provides a suggestion for
4949+ client caching mechanisms on how to treat the returned information.
4950+ CouchDB typically returns the ``must-revalidate``, which indicates
4951+ that the information should be revalidated if possible. This is used
4952+ to ensure that the dynamic nature of the content is correctly
4953+ updated.
4954+
4955+- ``Content-length``
4956+
4957+ The length (in bytes) of the returned content.
4958+
4959+- ``Etag``
4960+
4961+ The ``Etag`` HTTP header field is used to show the revision for a
4962+ document, or a view.
4963+
4964+ ETags have been assigned to a map/reduce group (the collection of
4965+ views in a single design document). Any change to any of the indexes
4966+ for those views would generate a new ETag for all view URLs in a
4967+ single design doc, even if that specific view's results had not
4968+ changed.
4969+
4970+ Each ``_view`` URL has its own ETag which only gets updated when
4971+ changes are made to the database that effect that index. If the
4972+ index for that specific view does not change, that view keeps the
4973+ original ETag head (therefore sending back 304 Not Modified more
4974+ often).
4975+
4976+.. _json:
4977+
4978+JSON Basics
4979+===========
4980+
4981+The majority of requests and responses to CouchDB use the JavaScript
4982+Object Notation (JSON) for formatting the content and structure of the
4983+data and responses.
4984+
4985+JSON is used because it is the simplest and easiest to use solution for
4986+working with data within a web browser, as JSON structures can be
4987+evaluated and used as JavaScript objects within the web browser
4988+environment. JSON also integrates with the server-side JavaScript used
4989+within CouchDB.
4990+
4991+JSON supports the same basic types as supported by JavaScript, these
4992+are:
4993+
4994+- Number (either integer or floating-point).
4995+
4996+- String; this should be enclosed by double-quotes and supports Unicode
4997+ characters and backslash escaping. For example:
4998+
4999+ .. code-block:: javascript
5000+
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches