desktopcouch

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

  1. lp-427036
  2. Merge into trunk
Proposed by Ken VanDine
Status: Rejected
Rejected by: dobey
Proposed branch: lp://qastaging/~ken-vandine/desktopcouch/lp-427036
Merge into: lp://qastaging/desktopcouch
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~ken-vandine/desktopcouch/lp-427036
Reviewer Review Type Date Requested Status
dobey (community) Disapprove
Review via email: mp+11986@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
dobey (dobey) wrote :

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

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

59. By Chad Miller

Add replication_services to python-desktopcouch package.

58. By Chad Miller

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

Merge from desktopcouch trunk for 0.4 release.

56. By Chad Miller

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

Release 0.3.1.

54. By Chad Miller

Merge fixes for getPort failures.

53. By Chad Miller

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1desktopcouch (0.4-0ubuntu2) karmic; urgency=low
2
3 * debian/control:
4 - Changed Depends from couchdb to couchdb-bin (LP: #427036)
5
6 -- Ken VanDine <ken.vandine@canonical.com> Thu, 17 Sep 2009 12:04:53 -0400
7
8desktopcouch (0.4-0ubuntu1) karmic; urgency=low
9
10 * Packaging: desktopcouch-tools installed by default in Karmic (LP: #427421)
11 * Forcing desktopcouch auth on. (LP: #427446)
12 * Requiring new version of couchdb that supports authentication properly.
13 * Pairing updates couchdb replication system. (LP: #397663)
14 * Added pairing of desktop Couches to desktopcouch-tools (LP: #404087)
15 * Admin users in the system couchdb are no longer inherited by desktopcouch
16 couchdbs (LP: #424330)
17 * Fixed failing tests in desktopcouch (LP: #405612)
18 * Creating login details on initial desktopcouch setup (LP: #416413)
19 * Starting replication to paired servers on desktopcouch startup.
20 (LP: #416581)
21 * Unpaired couchdb peers are reconciled with replication. (LP: #424386)
22 * At pairing time, changing couchdb pairing address to public. (LP: #419969)
23 * In replication daemon, verifying local couchdb bind address is not 127/8 .
24 (LP: #419973)
25 * getPort no longer suceeds when desktopcouch isn't running. (LP: #422127)
26
27 -- Chad Miller <chad.miller@canonical.com> Mon, 14 Sep 2009 19:24:08 -0400
28
29desktopcouch (0.3.1-0ubuntu1) karmic; urgency=low
30
31 [Ken VanDine]
32 * debian/control
33 - Added depends on python-desktopcouch-records. (LP: #422179)
34 [Chad Miller]
35 * New upstream release.
36 * Changed Vcs-Bzr links in control file.
37 * Changed version dependency on couchdb.
38 * Converting to a full-blown source-package branch.
39 * Fix getPort failure. (LP: #420911, LP: #422127)
40 * Check couchdb bind-port in replicator. (LP: #419973)
41 * Change couchdb bind-port in pairing tool. (LP: #419969)
42
43 -- Chad Miller <chad.miller@canonical.com> Tue, 01 Sep 2009 11:57:25 -0400
44
45desktopcouch (0.3-0ubuntu1) karmic; urgency=low
46
47 [ Ken VanDine ]
48 * New upstream release (LP: #416591)
49 - added unit tests for couchwidget, and then fixed bug #412266
50 - Change to freedesktop URL for record type spec.
51 - First version of the contacts picker, based on CouchWidget
52 - Adding the desktopcouch.contacts module.
53 - Use subprocess.Popen and ourselves to the wait()ing,
54 since subprocess.call() is buggy. There's still an EINTR bug
55 in subprocess, though.
56 - Occasionally stop couchdb in tests, so we exercise the automatic
57 starting code. This will lead to spurious errors because of the
58 aforementioned subprocess bug, but it's the right thing to do.
59 - Abstract away some of the linuxisms and complain if we're run on
60 an unsupported OS.
61 - Fix a race condition in the process-testing code.
62 - Replace the TestCase module with one that doesn't complain of dirty
63 twisted reactors.
64 - Add a means of stopping the desktop couchdb daemon.
65 - Add an additional check that a found PID and process named correctly
66 is indeed a process that this user started, so we don't try to talk
67 to other local users' desktop couchdbs.
68 - Get the port at function-call time, instead of storing a port at
69 start-time and giving that back. The info can be stale, the old
70 way.
71 - Don't create a view per record-type; instead, call the standard
72 return-all-records-keyed-by-record-type and use slice notation on
73 the viewresults to only get back the records with that type,
74 which does the same thing but more elegantly.
75 - Remove the unused/invalid "utils" import from test_server
76 - Change the name of a function tested to be what actually exists in
77 the code.
78 - Refactored server.py by renaming server.get_records_and_type to
79 server.get_records. Also modified the function to take a record
80 type param if desired to only create records of that type and
81 optionally create a view name "get_"+ record_type. (LP: #411475)
82 * debian/control
83 - Make python-desktopcouch depend on python-gtk2 and python-gnomekeyring
84 - Make python-desktopcouch-records depend on python-gtk2,
85 python-gnomekeyring, and python-oauth.
86 - Remove depends for python-distutils-extra
87 - Fixed Vcs-Browser tag
88
89 [Elliot Murphy]
90 * debian/control: added build-dep on python-setuptools
91
92
93 [ Martin Pitt ]
94 * debian/control: Fix Vcs-* links.
95
96 -- Ken VanDine <ken.vandine@canonical.com> Thu, 27 Aug 2009 15:32:11 +0200
97
98desktopcouch (0.2-0ubuntu1) karmic; urgency=low
99
100 * New upstream release
101 * Handle the case where the pid file is empty or doesn't exist (LP: #408796)
102
103 -- Ken VanDine <ken.vandine@canonical.com> Wed, 05 Aug 2009 02:17:47 +0100
104
105desktopcouch (0.1-0ubuntu1) karmic; urgency=low
106
107 * Initial release (LP: #397662)
108
109 -- Ken VanDine <ken.vandine@canonical.com> Fri, 31 Jul 2009 13:44:45 -0400
0110
=== 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 @@
16
02
=== 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 @@
1Source: desktopcouch
2Section: python
3Priority: optional
4Build-Depends: cdbs (>= 0.4.43),
5 debhelper (>= 6),
6 python,
7 python-central (>= 0.6.11),
8 python-distutils-extra (>= 2.8),
9 python-setuptools
10Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
11Standards-Version: 3.8.2
12XS-Python-Version: current
13Homepage: http://launchpad.net/desktopcouch
14Vcs-Bzr: https://code.launchpad.net/~ubuntuone-control-tower/ubuntu/karmic/desktopcouch/spb
15Vcs-Browser: http://bazaar.launchpad.net/~ubuntuone-control-tower/ubuntu/karmic/desktopcouch/spb
16
17Package: desktopcouch
18Architecture: all
19XB-Python-Version: ${python:Versions}
20Depends: ${misc:Depends},
21 ${python:Depends},
22 couchdb-bin (>= 0.10.0~svn8138),
23 python-dbus,
24 python-couchdb (>= 0.6),
25 python-twisted-core,
26 python-gobject,
27 python-avahi,
28 python-desktopcouch,
29 python-desktopcouch-records,
30 python-gtk2
31Description: Desktop CouchDB instance, specific to each user
32 Couchdb owned by regular users in their sessions, for management of personal
33 data.
34
35Package: desktopcouch-tools
36Architecture: all
37XB-Python-Version: ${python:Versions}
38Depends: ${misc:Depends},
39 ${python:Depends},
40 python-dbus,
41 python-twisted-core,
42 python-gobject,
43 python-avahi,
44 python-desktopcouch,
45 python-gtk2
46Description: Desktop CouchDB tools
47 Tools used to work with DesktopCouch database.
48
49Package: python-desktopcouch
50Architecture: all
51XB-Python-Version: ${python:Versions}
52Depends: ${misc:Depends},
53 ${python:Depends},
54 desktopcouch,
55 python-dbus,
56 python-couchdb,
57 python-xdg,
58 python-twisted-core,
59 python-gtk2,
60 python-gnomekeyring
61Description: Python Desktop CouchDB
62 A Python library for Desktop CouchDB.
63
64Package: python-desktopcouch-records
65Architecture: all
66XB-Python-Version: ${python:Versions}
67Depends: ${misc:Depends},
68 ${python:Depends},
69 python-dbus,
70 python-couchdb,
71 python-desktopcouch,
72 python-gtk2,
73 python-gnomekeyring,
74 python-oauth
75Description: Desktop CouchDB Records API
76 A Python library for the Desktop CouchDB Records API.
077
=== 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 @@
1Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
2Upstream-Name: desktopcouch
3Upstream-Maintainer: Stuart Langridge <stuart.langridge@canonical.com>
4Upstream-Source: https://launchpad.net/desktopcouch
5
6Files: *
7Copyright: (C) 2009 Canonical Ltd.
8
9License: LGPL-3
10 The full text of the LGPL is distributed in
11 /usr/share/common-licenses/LGPL-3 on Debian systems.
012
=== 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 @@
1debian/tmp/usr/share/applications/desktopcouch-pair.desktop
2debian/tmp/usr/bin/desktopcouch-pair
3debian/tmp/usr/share/man/man1/desktopcouch-pair.1
4#debian/tmp/usr/share/locale/*/LC_MESSAGES/desktopcouch.mo
05
=== 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 @@
1debian/tmp/usr/share/desktopcouch
2debian/tmp/usr/lib/desktopcouch/desktopcouch-{stop,service}
3debian/tmp/usr/share/dbus-1/services/org.desktopcouch.CouchDB.service
04
=== 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 @@
12
02
=== 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 @@
1debian/tmp/usr/share/doc/python-desktopcouch-records/api
2debian/tmp/usr/lib/*/*/desktopcouch/records/*
03
=== 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 @@
1debian/tmp/usr/lib/*/*/desktopcouch/*.py
2debian/tmp/usr/lib/*/*/desktopcouch/replication_services/*.py
3debian/tmp/usr/lib/*/*/desktopcouch/pair/{couchdb_pairing,__init__.py}
04
=== 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 @@
1#!/usr/bin/make -f
2
3DEB_PYTHON_SYSTEM := pycentral
4
5include /usr/share/cdbs/1/rules/debhelper.mk
6include /usr/share/cdbs/1/class/python-distutils.mk
7include /usr/share/cdbs/1/rules/langpack.mk
08
=== 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 @@
1version=3
2http://launchpad.net/desktopcouch/+download .*/desktopcouch-([0-9.]+)\.tar\.gz

Subscribers

People subscribed via source and target branches