--- desktopcouch-0.6.4.orig/debian/compat +++ desktopcouch-0.6.4/debian/compat @@ -0,0 +1 @@ +6 --- desktopcouch-0.6.4.orig/debian/watch +++ desktopcouch-0.6.4/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/desktopcouch/+download .*/desktopcouch-([0-9.]+)\.tar\.gz --- desktopcouch-0.6.4.orig/debian/rules +++ desktopcouch-0.6.4/debian/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +DEB_PYTHON_SYSTEM := pycentral +DEB_DH_INSTALL_ARGS := --list-missing --exclude=/tests/ --exclude=egg-info/ + +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 +include /usr/share/cdbs/1/rules/simple-patchsys.mk --- desktopcouch-0.6.4.orig/debian/copyright +++ desktopcouch-0.6.4/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.6.4.orig/debian/desktopcouch-tools.install +++ desktopcouch-0.6.4/debian/desktopcouch-tools.install @@ -0,0 +1,3 @@ +debian/tmp/usr/share/applications/desktopcouch-pair.desktop +debian/tmp/usr/bin/desktopcouch-pair +debian/tmp/usr/share/man/man1/desktopcouch-pair.1 --- desktopcouch-0.6.4.orig/debian/pycompat +++ desktopcouch-0.6.4/debian/pycompat @@ -0,0 +1 @@ +2 --- desktopcouch-0.6.4.orig/debian/python-desktopcouch-records.install +++ desktopcouch-0.6.4/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.6.4.orig/debian/python-desktopcouch.install +++ desktopcouch-0.6.4/debian/python-desktopcouch.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/*/*/desktopcouch/*.py +debian/tmp/usr/lib/*/*/desktopcouch/pair/ --- desktopcouch-0.6.4.orig/debian/control +++ desktopcouch-0.6.4/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.4 +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-0ubuntu3), + 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.6.4.orig/debian/desktopcouch.install +++ desktopcouch-0.6.4/debian/desktopcouch.install @@ -0,0 +1,6 @@ +debian/tmp/etc/xdg/desktop-couch/ +debian/tmp/usr/share/desktopcouch/ +debian/tmp/usr/lib/desktopcouch/desktopcouch-service +debian/tmp/usr/lib/desktopcouch/desktopcouch-stop +debian/tmp/usr/lib/desktopcouch/desktopcouch-get-port +debian/tmp/usr/share/dbus-1/services/org.desktopcouch.CouchDB.service --- desktopcouch-0.6.4.orig/debian/changelog +++ desktopcouch-0.6.4/debian/changelog @@ -0,0 +1,297 @@ +desktopcouch (0.6.4-0ubuntu1) lucid; urgency=low + + * Upstream release. Adds all patches that were previously in this packaging. + * Split desktopcouch-service threads into to discrete processes, since they + do not depend on each other, and because multithreading breaks with recent + changes to libraries. (LP: #524566, #530605) + * Made desktopcouch more robust when dealing with mergeable lists. + (LP: #555908) + * If the replication service gives a user_id, then include it in the + query string, so the service can shard access. + * Add bookmark records support. + * Handle cancelled keyring dialogs. (LP: #527036) + * Retry when starting couchdb fails. (LP: #530541) + * debian/patches/0-items-should-expose-private-data-for-now.patch + - Gwibber demands that some items that are private be exposed, namely + keys _id and _rev. These should properly be accessed as attributes + .record_id and .record_revision in some future release of gwibber. + + -- Chad MILLER Mon, 12 Apr 2010 23:02:01 -0400 + +desktopcouch (0.6.3-0ubuntu3) lucid; urgency=low + + * debian/patches/2-expire_log_files + - Make log files rotate away so they don't grow out of control. + * debian/patches/4-lp_524566_gui_in_main_thread + - Execute GUI operations in the main execution thread only. (LP: #524566) + + -- Ken VanDine Wed, 31 Mar 2010 09:46:47 -0400 + +desktopcouch (0.6.3-0ubuntu2) lucid; urgency=low + + * debian/patches/lp_534171.patch + - Don't parse all the _changes feed; work out update_seq from the DB info, + so we never request the whole feed, which is doom when the whole feed is + large. (LP: #534171) + + -- Ken VanDine Mon, 29 Mar 2010 21:24:15 -0400 + +desktopcouch (0.6.3-0ubuntu1) lucid; urgency=low + + * New upstream bugfix release. + - Provide more isolation in tests to avoid polluting the env when + running tests. + - Drop no_uri.patch and revert_dbus_getport.patch (included upstream) + - Don't depend on simplejson, use built in json (LP: #511427) + - Provide a method for clients to enable/disable replication of + arbitrary databases with Ubuntu One (needed to allow enabling and + disabling of gwibber and contact syncing). + + -- Elliot Murphy Wed, 10 Mar 2010 18:54:33 -0500 + +desktopcouch (0.6.2-0ubuntu3) lucid; urgency=low + + * debian/patches/no_uri.patch + - fix a place were replication was not fully qualifying its accesses to + Databases with a specific URL. + * debian/patches/revert_dbus_getport.patch + - Revert the change in 0.6.2 that completely relied on dbus to get the + port, this failed multithreaded execution in the client (LP: #530716) + + -- Ken VanDine Thu, 04 Mar 2010 14:09:34 -0500 + +desktopcouch (0.6.2-0ubuntu2) lucid; urgency=low + + * In the last upload, I incorrectly resolved the merge presented + after running bzr merge-upstream --version=0.6.2 + ../desktopcouch_0.6.2.orig.tar.gz. So, the last upload had incorrect + contents in the tarball for desktopcouch/records/server_base.py and + desktopcouch/replication.py. This revision restores the correct contents + of those two files to match what was shipped in the upstream tarball. + + -- Elliot Murphy Tue, 02 Mar 2010 15:28:45 -0500 + +desktopcouch (0.6.2-0ubuntu1) lucid; urgency=low + + * New upstream bugfix release. + - Include a new program bin/desktopcouch-get-port . + - Use DBus to get port, and thereby start the service daemon, on normal + Python access to the database. (LP: #519444) + - Update docs to be explicit about put_record(r) mutating r . + - Add new method put_records_batch(iterable_of_records) . + - Fix up apport collection. + - Fix a problem with couchdb mutating its INI file to store a hashed + password, which is useless for HTTP Basic auth in the bookmark file. + - Fix obscure bugs in couchdb startup regarding port availability. + - Update execute_view() ti take a dict of additional parameters for + execution. + - Add has_key() method to desktopcouch.record.RecordDict so that it + behaves more like a dictionary. + + -- Elliot Murphy Mon, 01 Mar 2010 11:47:53 -0500 + +desktopcouch (0.6.1-0ubuntu1) lucid; urgency=low + + * New upstream release. + - When logging replication events, replace all oauth secrets with a + string of the same length. + - Add CouchDatabase.report_changes() method. + - Don't remove the HTML file that bookmarks point to. + - Improve test coverage. + - Use an explicit test context for testing. + - For startup, loop over finding the port in case the port is not + available when the PID is. + - Ensure that the method that tests for the presence of a record does + not just check if the field is present but ensures that the value + is correct. + - Do not read from the keyring if we have a configuration file that + already has the info we need. + - Move record_id to be a property rather than an attribute. + - Improved pairing tool reliability by fixing race conditions. + - Make the database generate it's own record IDs at "put" time, avoiding + issues with non-idempotency of POST for doc creation. + - Add Record.record_revision attribute to make it easier to get a records + revision ID. + * debian/control + - bumped standards version to 3.8.3 + + -- Elliot Murphy Wed, 03 Feb 2010 14:09:55 -0500 + +desktopcouch (0.5-0ubuntu1) karmic; urgency=low + + * New upstream release. + + Fix remote-db-listing bug for SSL/HTTPS services. (LP: #458540) + + Fix OAuth signatures for SSL urls. + + Avoid couchdb bug where users' PID files are incorrectly interpreted as + valid by couchdb, and so after slightly different boot, desktopcouch can + never start couchdb, causing desktopcouch to quit. (LP: #442120) + + For dbus, do not resolve data for events signaling a service disappears, + and use explicit veriable-passing / references. (LP: #440072) + + Flip push/pull logic in replication information. + + When pulling from remote DB, do not try to access remote management DB. + + Use meaningful names for keyring access. (LP: #451333) + + -- Chad MILLER Thu, 22 Oct 2009 17:15:57 -0400 + +desktopcouch (0.4.4-0ubuntu1) karmic; urgency=low + + * New upstream release. + + Include doc "txt" and translation files in sources. + + couchgrid does not correctly retrieve record id (LP: #447512) + + couchgrid selected_records property is buggy and should be removed for + karmic if possible (LP: #448357) + + -- Chad MILLER Mon, 12 Oct 2009 10:17:50 -0400 + +desktopcouch (0.4.3-0ubuntu1) karmic; urgency=low + + * Include compulsory-auth INI file to be secure by default. + (LP: #438800) + * Make debhelper warn about files not installed to some package. + * Shorten debhelper install paths using dh_install exlusions. + * New upstream release: + + couchgrid did not correctly retrieve record id (LP: #447512) + + HTTP 401 for valid auth information when talking to couchdb over SSL + (LP: #446516) + + Support headless apps. (LP: #428681) + + desktopcouch-service "ValueError: dictionary update sequence..." on + stdout(LP: #446511) + + -- Chad Miller Mon, 12 Oct 2009 07:02:07 -0400 + +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.6.4.orig/debian/patches/0-items-should-expose-private-data-for-now.patch +++ desktopcouch-0.6.4/debian/patches/0-items-should-expose-private-data-for-now.patch @@ -0,0 +1,24 @@ +=== modified file 'desktopcouch/records/record.py' +--- old/desktopcouch/records/record.py 2010-03-18 19:12:33 +0000 ++++ new/desktopcouch/records/record.py 2010-04-08 16:06:20 +0000 +@@ -218,7 +218,18 @@ + self[key] = val + + def items(self): +- """Return all items.""" ++ """Return all items, even private or internal ones.""" ++ return self.all_items() ++ ++ def all_items(self): ++ """Return all items, even private or internal ones.""" ++ data = [] ++ for key, value in self._data.items(): ++ data.append((key, value)) ++ return data ++ ++ def public_items(self): ++ """Return items that are NOT internal or private structures.""" + return [(key, self[key]) for key in self] + + def keys(self): +