--- desktopcouch-0.4.2.orig/debian/copyright +++ desktopcouch-0.4.2/debian/copyright @@ -0,0 +1,11 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Upstream-Name: desktopcouch +Upstream-Maintainer: Stuart Langridge +Upstream-Source: https://launchpad.net/desktopcouch + +Files: * +Copyright: (C) 2009 Canonical Ltd. + +License: LGPL-3 + The full text of the LGPL is distributed in + /usr/share/common-licenses/LGPL-3 on Debian systems. --- desktopcouch-0.4.2.orig/debian/changelog +++ desktopcouch-0.4.2/debian/changelog @@ -0,0 +1,136 @@ +desktopcouch (0.4.2-0ubuntu1) karmic; urgency=low + + * Include missing 0.4.0 changelog entry. + * New upstream release. + + Log to correct place in service, ~/.cache/desktop-couch/ . + + Abandon service modules giving host and port info separate from the + db prefixes, which now give a URI. + + Let the replicator gather its own OAuth data to use to connect to far + end. This *should* fix repliction to cloud. + + Make service more resilient to errors, and make breakable parts in + smaller granules. + + Support Python 2.5. + + Added basic notes record API to include NOTE_RECORD_TYPE. + + Make create-contacts script agnostic of desktop vs cloud and oauth + vs noauth. + * Depend on a more recent version of couchdb, which provides OAuth + support. + + -- Chad Miller Mon, 28 Sep 2009 12:06:08 -0400 + +desktopcouch (0.4.1-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #435429) + * debian/python-desktopcouch-records.install + Added notes, contacts, and replication_services + + -- Ken VanDine Wed, 23 Sep 2009 14:22:38 -0400 + +desktopcouch (0.4-0ubuntu1) karmic; urgency=low + + * Packaging: desktopcouch-tools installed by default in Karmic (LP: #427421) + * Forcing desktopcouch auth on. (LP: #427446) + * Requiring new version of couchdb that supports authentication properly. + * Pairing updates couchdb replication system. (LP: #397663) + * Added pairing of desktop Couches to desktopcouch-tools (LP: #404087) + * Admin users in the system couchdb are no longer inherited by desktopcouch + couchdbs (LP: #424330) + * Fixed failing tests in desktopcouch (LP: #405612) + * Creating login details on initial desktopcouch setup (LP: #416413) + * Starting replication to paired servers on desktopcouch startup. + (LP: #416581) + * Unpaired couchdb peers are reconciled with replication. (LP: #424386) + * At pairing time, changing couchdb pairing address to public. (LP: #419969) + * In replication daemon, verifying local couchdb bind address is not 127/8 . + (LP: #419973) + * getPort no longer suceeds when desktopcouch isn't running. (LP: #422127) + + -- Chad Miller Mon, 14 Sep 2009 19:24:08 -0400 + +desktopcouch (0.3.1-0ubuntu2) karmic; urgency=low + + * Depend on couchdb-bin instead of couchdb (LP: #427036) + + -- Elliot Murphy Wed, 16 Sep 2009 17:32:51 -0400 + +desktopcouch (0.3.1-0ubuntu1) karmic; urgency=low + + [Ken VanDine] + * debian/control + - Added depends on python-desktopcouch-records. (LP: #422179) + [Chad Miller] + * New upstream release. + * Changed Vcs-Bzr links in control file. + * Changed version dependency on couchdb. + * Converting to a full-blown source-package branch. + * Fix getPort failure. (LP: #420911, LP: #422127) + * Check couchdb bind-port in replicator. (LP: #419973) + * Change couchdb bind-port in pairing tool. (LP: #419969) + + -- Chad Miller Tue, 01 Sep 2009 11:57:25 -0400 + +desktopcouch (0.3-0ubuntu1) karmic; urgency=low + + [ Ken VanDine ] + * New upstream release (LP: #416591) + - added unit tests for couchwidget, and then fixed bug #412266 + - Change to freedesktop URL for record type spec. + - First version of the contacts picker, based on CouchWidget + - Adding the desktopcouch.contacts module. + - Use subprocess.Popen and ourselves to the wait()ing, + since subprocess.call() is buggy. There's still an EINTR bug + in subprocess, though. + - Occasionally stop couchdb in tests, so we exercise the automatic + starting code. This will lead to spurious errors because of the + aforementioned subprocess bug, but it's the right thing to do. + - Abstract away some of the linuxisms and complain if we're run on + an unsupported OS. + - Fix a race condition in the process-testing code. + - Replace the TestCase module with one that doesn't complain of dirty + twisted reactors. + - Add a means of stopping the desktop couchdb daemon. + - Add an additional check that a found PID and process named correctly + is indeed a process that this user started, so we don't try to talk + to other local users' desktop couchdbs. + - Get the port at function-call time, instead of storing a port at + start-time and giving that back. The info can be stale, the old + way. + - Don't create a view per record-type; instead, call the standard + return-all-records-keyed-by-record-type and use slice notation on + the viewresults to only get back the records with that type, + which does the same thing but more elegantly. + - Remove the unused/invalid "utils" import from test_server + - Change the name of a function tested to be what actually exists in + the code. + - Refactored server.py by renaming server.get_records_and_type to + server.get_records. Also modified the function to take a record + type param if desired to only create records of that type and + optionally create a view name "get_"+ record_type. (LP: #411475) + * debian/control + - Make python-desktopcouch depend on python-gtk2 and python-gnomekeyring + - Make python-desktopcouch-records depend on python-gtk2, + python-gnomekeyring, and python-oauth. + - Remove depends for python-distutils-extra + - Fixed Vcs-Browser tag + + [Elliot Murphy] + * debian/control: added build-dep on python-setuptools + + + [ Martin Pitt ] + * debian/control: Fix Vcs-* links. + + -- Ken VanDine Thu, 27 Aug 2009 15:32:11 +0200 + +desktopcouch (0.2-0ubuntu1) karmic; urgency=low + + * New upstream release + * Handle the case where the pid file is empty or doesn't exist (LP: #408796) + + -- Ken VanDine Wed, 05 Aug 2009 02:17:47 +0100 + +desktopcouch (0.1-0ubuntu1) karmic; urgency=low + + * Initial release (LP: #397662) + + -- Ken VanDine Fri, 31 Jul 2009 13:44:45 -0400 --- desktopcouch-0.4.2.orig/debian/compat +++ desktopcouch-0.4.2/debian/compat @@ -0,0 +1 @@ +6 --- desktopcouch-0.4.2.orig/debian/pycompat +++ desktopcouch-0.4.2/debian/pycompat @@ -0,0 +1 @@ +2 --- desktopcouch-0.4.2.orig/debian/desktopcouch-tools.install +++ desktopcouch-0.4.2/debian/desktopcouch-tools.install @@ -0,0 +1,4 @@ +debian/tmp/usr/share/applications/desktopcouch-pair.desktop +debian/tmp/usr/bin/desktopcouch-pair +debian/tmp/usr/share/man/man1/desktopcouch-pair.1 +#debian/tmp/usr/share/locale/*/LC_MESSAGES/desktopcouch.mo --- desktopcouch-0.4.2.orig/debian/rules +++ desktopcouch-0.4.2/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f + +DEB_PYTHON_SYSTEM := pycentral + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/python-distutils.mk +include /usr/share/cdbs/1/rules/langpack.mk --- desktopcouch-0.4.2.orig/debian/control +++ desktopcouch-0.4.2/debian/control @@ -0,0 +1,76 @@ +Source: desktopcouch +Section: python +Priority: optional +Build-Depends: cdbs (>= 0.4.43), + debhelper (>= 6), + python, + python-central (>= 0.6.11), + python-distutils-extra (>= 2.8), + python-setuptools +Maintainer: Ubuntu Developers +Standards-Version: 3.8.2 +XS-Python-Version: current +Homepage: http://launchpad.net/desktopcouch +Vcs-Bzr: https://code.launchpad.net/~ubuntuone-control-tower/ubuntu/karmic/desktopcouch/spb +Vcs-Browser: http://bazaar.launchpad.net/~ubuntuone-control-tower/ubuntu/karmic/desktopcouch/spb + +Package: desktopcouch +Architecture: all +XB-Python-Version: ${python:Versions} +Depends: ${misc:Depends}, + ${python:Depends}, + couchdb-bin (>= 0.10.0~svn818859), + python-dbus, + python-couchdb (>= 0.6), + python-twisted-core, + python-gobject, + python-avahi, + python-desktopcouch, + python-desktopcouch-records, + python-gtk2 +Description: A Desktop CouchDB instance + Runs an instance of CouchDB with the users session. + +Package: desktopcouch-tools +Architecture: all +XB-Python-Version: ${python:Versions} +Depends: ${misc:Depends}, + ${python:Depends}, + python-dbus, + python-twisted-core, + python-gobject, + python-avahi, + python-desktopcouch, + python-desktopcouch-records, + python-gtk2 +Description: Desktop CouchDB tools + Tools used to work with Desktop CouchDB. + +Package: python-desktopcouch +Architecture: all +XB-Python-Version: ${python:Versions} +Depends: ${misc:Depends}, + ${python:Depends}, + desktopcouch, + python-dbus, + python-couchdb, + python-xdg, + python-twisted-core, + python-gtk2, + python-gnomekeyring +Description: Python Desktop CouchDB + A Python library for Desktop CouchDB. + +Package: python-desktopcouch-records +Architecture: all +XB-Python-Version: ${python:Versions} +Depends: ${misc:Depends}, + ${python:Depends}, + python-dbus, + python-couchdb, + python-desktopcouch, + python-gtk2, + python-gnomekeyring, + python-oauth +Description: Desktop CouchDB Records API + A Python library for the Desktop CouchDB Records API. --- desktopcouch-0.4.2.orig/debian/python-desktopcouch-records.install +++ desktopcouch-0.4.2/debian/python-desktopcouch-records.install @@ -0,0 +1,5 @@ +debian/tmp/usr/share/doc/python-desktopcouch-records/api +debian/tmp/usr/lib/*/*/desktopcouch/records/* +debian/tmp/usr/lib/*/*/desktopcouch/contacts/* +debian/tmp/usr/lib/*/*/desktopcouch/notes/* +debian/tmp/usr/lib/*/*/desktopcouch/replication_services/* --- desktopcouch-0.4.2.orig/debian/desktopcouch.install +++ desktopcouch-0.4.2/debian/desktopcouch.install @@ -0,0 +1,3 @@ +debian/tmp/usr/share/desktopcouch +debian/tmp/usr/lib/desktopcouch/desktopcouch-{stop,service} +debian/tmp/usr/share/dbus-1/services/org.desktopcouch.CouchDB.service --- desktopcouch-0.4.2.orig/debian/python-desktopcouch.install +++ desktopcouch-0.4.2/debian/python-desktopcouch.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/*/*/desktopcouch/*.py +debian/tmp/usr/lib/*/*/desktopcouch/pair/{couchdb_pairing,__init__.py} --- desktopcouch-0.4.2.orig/debian/watch +++ desktopcouch-0.4.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/desktopcouch/+download .*/desktopcouch-([0-9.]+)\.tar\.gz