diff -u couchdb-0.10.0~svn813472/debian/rules couchdb-0.10.0~svn813472/debian/rules --- couchdb-0.10.0~svn813472/debian/rules +++ couchdb-0.10.0~svn813472/debian/rules @@ -36,10 +36,10 @@ sed -i s,VERSION=$(DEB_UPSTREAM_VERSION)$$,VERSION=%VERSION%, debian/postrm common-binary-post-install-arch:: - rm -f debian/couchdb/usr/lib/couchdb/erlang/lib/couch-*/priv/lib/couch_erl_driver.la - rm -f debian/couchdb/usr/share/couchdb/www/script/jquery.js + rm -f debian/couchdb-bin/usr/lib/couchdb/erlang/lib/couch-*/priv/lib/couch_erl_driver.la + rm -f debian/couchdb-bin/usr/share/couchdb/www/script/jquery.js dh_link /usr/share/javascript/jquery/jquery.js /usr/share/couchdb/www/script/jquery.js - cp debian/binary.lintian-overrides debian/couchdb/usr/share/lintian/overrides/couchdb + cp debian/binary.lintian-overrides debian/couchdb-bin/usr/share/lintian/overrides/couchdb common-binary-predeb-arch:: echo 'xulrunner:Depends=$(xulrunner_dep)' >> debian/couchdb.substvars reverted: --- couchdb-0.10.0~svn813472/debian/dirs +++ couchdb-0.10.0~svn813472.orig/debian/dirs @@ -1 +0,0 @@ -usr/share/lintian/overrides diff -u couchdb-0.10.0~svn813472/debian/changelog couchdb-0.10.0~svn813472/debian/changelog --- couchdb-0.10.0~svn813472/debian/changelog +++ couchdb-0.10.0~svn813472/debian/changelog @@ -1,3 +1,10 @@ +couchdb (0.10.0~svn813472-0ubuntu2) karmic; urgency=low + + * Split couchdb into couchdb (to hold only the init) and couchdb-bin + (to hold everything else). (LP: #427036) + + -- Chad Miller Wed, 16 Sep 2009 14:12:56 -0400 + couchdb (0.10.0~svn813472-0ubuntu1) karmic; urgency=low * New snapshot of couchdb 0.10.x stable prerelease branch diff -u couchdb-0.10.0~svn813472/debian/control couchdb-0.10.0~svn813472/debian/control --- couchdb-0.10.0~svn813472/debian/control +++ couchdb-0.10.0~svn813472/debian/control @@ -12,12 +12,28 @@ Vcs-Svn: svn://svn.berlios.de/erlang-pkg/couchdb/trunk/ Vcs-Browser: https://svn.berlios.de/wsvn/erlang-pkg/couchdb/?op=log -Package: couchdb +Package: couchdb-bin Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, ${erlang-base:Depends}, ${erlang-crypto:Depends}, ${erlang-inets:Depends}, ${erlang-xmerl:Depends}, ${erlang-abi:Depends}, adduser, libjs-jquery, lsb-base, ${xulrunner:Depends} -Description: RESTful document oriented database +Description: RESTful document oriented database, programs + Apache CouchDB is a distributed, fault-tolerant and schema-free + document-oriented database accessible via a RESTful HTTP/JSON API. Among other + features, it provides robust, incremental replication with bi-directional + conflict detection and resolution, and is queryable and indexable using a + table-oriented view engine with JavaScript acting as the default view + definition language. + . + CouchDB is written in Erlang, but can be easily accessed from any environment + that provides means to make HTTP requests. There are a multitude of third-party + client libraries that make this even easier for a variety of programming + languages and environments. + +Package: couchdb +Architecture: any +Depends: ${couchdb-bin:Depends} +Description: RESTful document oriented database, system-db init Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database accessible via a RESTful HTTP/JSON API. Among other features, it provides robust, incremental replication with bi-directional diff -u couchdb-0.10.0~svn813472/debian/binary.lintian-overrides couchdb-0.10.0~svn813472/debian/binary.lintian-overrides --- couchdb-0.10.0~svn813472/debian/binary.lintian-overrides +++ couchdb-0.10.0~svn813472/debian/binary.lintian-overrides @@ -1 +1 @@ -couchdb binary: virtual-package-depends-without-real-package-depends depends: erlang-abi-11.b.3 +couchdb-bin binary: virtual-package-depends-without-real-package-depends depends: erlang-abi-11.b.3 only in patch2: unchanged: --- couchdb-0.10.0~svn813472.orig/debian/couchdb.install +++ couchdb-0.10.0~svn813472/debian/couchdb.install @@ -0,0 +1 @@ +debian/tmp/etc/init.d only in patch2: unchanged: --- couchdb-0.10.0~svn813472.orig/debian/couchdb-bin.install +++ couchdb-0.10.0~svn813472/debian/couchdb-bin.install @@ -0,0 +1,5 @@ +debian/tmp/usr +debian/tmp/etc/default +debian/tmp/etc/couchdb +debian/tmp/etc/logrotate.d +debian/tmp/var only in patch2: unchanged: --- couchdb-0.10.0~svn813472.orig/debian/couchdb-bin.dirs +++ couchdb-0.10.0~svn813472/debian/couchdb-bin.dirs @@ -0,0 +1 @@ +usr/share/lintian/overrides