Merge lp:~ken-vandine/desktopcouch/lp-427036 into lp:desktopcouch

[Ken VanDine]

[dobey (dobey)]

I think you're proposing this for merging into the wrong branch, no? lp:desktopcouch doesn't have the packaging info in it. Source package branch should be elsewhere (but I don't know where it is, outside of the ~ubuntu-desktop one).

review: Disapprove

Unmerged revisions

60. By Ken VanDine on 2009-09-17

* debian/control:
  - Changed Depends from couchdb to couchdb-bin (LP: #427036)

59. By Chad Miller on 2009-09-15

Add replication_services to python-desktopcouch package.

58. By Chad Miller on 2009-09-14

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 <email address hidden>Mon, 14 Sep 2009 19:24:08 -0400

57. By Chad Miller on 2009-09-14

Merge from desktopcouch trunk for 0.4 release.

56. By Chad Miller on 2009-09-01

desktopcouch (0.3.1-0ubuntu1) karmic; urgency=low
  - Added depends on python-desktopcouch-records. (LP: #422179)
* New upstream release.
* Fix getPort failure. (LP: #420911, LP: #422127)
* Check couchdb bind-port in replicator. (LP: #419973)
* Change couchdb bind-port in pairing tool. (LP: #419969)

55. By Chad Miller on 2009-09-01

Release 0.3.1.

54. By Chad Miller on 2009-09-01

Merge fixes for getPort failures.

53. By Chad Miller on 2009-09-01

desktopcouch (0.3.1-0ubuntu1) UNRELEASED; urgency=low
[Ken VanDine]
* debian/control
[Chad Miller]
* Changed Vcs-Bzr links in control file.
* Changed version dependency on couchdb.
* Converting to a full-blown source-package branch.
 -- Chad Miller <email address hidden>Tue, 01 Sep 2009 11:57:25 -0400

52. By Chad Miller on 2009-09-01

Taking over packaging branch from
lp:~ubuntu-desktop/ubuntu/karmic/desktopcouch/karmic at revno:82,
revid:<email address hidden>

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2009-09-17 16:05:27 +0000
@@ -0,0 +1,109 @@
+desktopcouch (0.4-0ubuntu2) karmic; urgency=low
+
+  * debian/control:
+    - Changed Depends from couchdb to couchdb-bin (LP: #427036) 
+
+ -- Ken VanDine <[e-mail]>  Thu, 17 Sep 2009 12:04:53 -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 <[e-mail]>  Mon, 14 Sep 2009 19:24:08 -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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Wed, 05 Aug 2009 02:17:47 +0100
+
+desktopcouch (0.1-0ubuntu1) karmic; urgency=low
+
+  * Initial release (LP: #397662)
+
+ -- Ken VanDine <[e-mail]>  Fri, 31 Jul 2009 13:44:45 -0400

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2009-09-01 15:46:56 +0000
@@ -0,0 +1,1 @@
+6

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2009-09-17 16:05:27 +0000
@@ -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 <[e-mail]>
+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~svn8138),
+ python-dbus,
+ python-couchdb (>= 0.6),
+ python-twisted-core,
+ python-gobject,
+ python-avahi,
+ python-desktopcouch,
+ python-desktopcouch-records,
+ python-gtk2
+Description: Desktop CouchDB instance, specific to each user
+ Couchdb owned by regular users in their sessions, for management of personal
+ data.
+
+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-gtk2
+Description: Desktop CouchDB tools
+ Tools used to work with DesktopCouch database.
+
+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.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2009-09-01 15:46:56 +0000
@@ -0,0 +1,11 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Name: desktopcouch
+Upstream-Maintainer: Stuart Langridge <[e-mail]>
+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.

=== added file 'debian/desktopcouch-tools.install'
--- debian/desktopcouch-tools.install	1970-01-01 00:00:00 +0000
+++ debian/desktopcouch-tools.install	2009-09-01 15:46:56 +0000
@@ -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

=== added file 'debian/desktopcouch.install'
--- debian/desktopcouch.install	1970-01-01 00:00:00 +0000
+++ debian/desktopcouch.install	2009-09-01 15:46:56 +0000
@@ -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

=== added file 'debian/pycompat'
--- debian/pycompat	1970-01-01 00:00:00 +0000
+++ debian/pycompat	2009-09-01 15:46:56 +0000
@@ -0,0 +1,1 @@
+2

=== added file 'debian/python-desktopcouch-records.install'
--- debian/python-desktopcouch-records.install	1970-01-01 00:00:00 +0000
+++ debian/python-desktopcouch-records.install	2009-09-01 15:46:56 +0000
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/doc/python-desktopcouch-records/api
+debian/tmp/usr/lib/*/*/desktopcouch/records/*

=== added file 'debian/python-desktopcouch.install'
--- debian/python-desktopcouch.install	1970-01-01 00:00:00 +0000
+++ debian/python-desktopcouch.install	2009-09-15 05:02:20 +0000
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/*/*/desktopcouch/*.py
+debian/tmp/usr/lib/*/*/desktopcouch/replication_services/*.py
+debian/tmp/usr/lib/*/*/desktopcouch/pair/{couchdb_pairing,__init__.py}

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2009-09-01 15:46:56 +0000
@@ -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

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2009-09-01 15:46:56 +0000
@@ -0,0 +1,2 @@
+version=3
+http://launchpad.net/desktopcouch/+download .*/desktopcouch-([0-9.]+)\.tar\.gz