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

Proposed by Ken VanDine on 2009-09-17
Status: Rejected
Rejected by: dobey on 2009-09-18
Proposed branch: lp:~ken-vandine/desktopcouch/lp-427036
Merge into: lp:desktopcouch
Diff against target: None lines
To merge this branch: bzr merge lp:~ken-vandine/desktopcouch/lp-427036
Reviewer Review Type Date Requested Status
dobey (community) 2009-09-17 Disapprove on 2009-09-18
Review via email: mp+11986@code.launchpad.net
To post a comment you must log in.
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 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>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'debian'
2=== added file 'debian/changelog'
3--- debian/changelog 1970-01-01 00:00:00 +0000
4+++ debian/changelog 2009-09-17 16:05:27 +0000
5@@ -0,0 +1,109 @@
6+desktopcouch (0.4-0ubuntu2) karmic; urgency=low
7+
8+ * debian/control:
9+ - Changed Depends from couchdb to couchdb-bin (LP: #427036)
10+
11+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 17 Sep 2009 12:04:53 -0400
12+
13+desktopcouch (0.4-0ubuntu1) karmic; urgency=low
14+
15+ * Packaging: desktopcouch-tools installed by default in Karmic (LP: #427421)
16+ * Forcing desktopcouch auth on. (LP: #427446)
17+ * Requiring new version of couchdb that supports authentication properly.
18+ * Pairing updates couchdb replication system. (LP: #397663)
19+ * Added pairing of desktop Couches to desktopcouch-tools (LP: #404087)
20+ * Admin users in the system couchdb are no longer inherited by desktopcouch
21+ couchdbs (LP: #424330)
22+ * Fixed failing tests in desktopcouch (LP: #405612)
23+ * Creating login details on initial desktopcouch setup (LP: #416413)
24+ * Starting replication to paired servers on desktopcouch startup.
25+ (LP: #416581)
26+ * Unpaired couchdb peers are reconciled with replication. (LP: #424386)
27+ * At pairing time, changing couchdb pairing address to public. (LP: #419969)
28+ * In replication daemon, verifying local couchdb bind address is not 127/8 .
29+ (LP: #419973)
30+ * getPort no longer suceeds when desktopcouch isn't running. (LP: #422127)
31+
32+ -- Chad Miller <chad.miller@canonical.com> Mon, 14 Sep 2009 19:24:08 -0400
33+
34+desktopcouch (0.3.1-0ubuntu1) karmic; urgency=low
35+
36+ [Ken VanDine]
37+ * debian/control
38+ - Added depends on python-desktopcouch-records. (LP: #422179)
39+ [Chad Miller]
40+ * New upstream release.
41+ * Changed Vcs-Bzr links in control file.
42+ * Changed version dependency on couchdb.
43+ * Converting to a full-blown source-package branch.
44+ * Fix getPort failure. (LP: #420911, LP: #422127)
45+ * Check couchdb bind-port in replicator. (LP: #419973)
46+ * Change couchdb bind-port in pairing tool. (LP: #419969)
47+
48+ -- Chad Miller <chad.miller@canonical.com> Tue, 01 Sep 2009 11:57:25 -0400
49+
50+desktopcouch (0.3-0ubuntu1) karmic; urgency=low
51+
52+ [ Ken VanDine ]
53+ * New upstream release (LP: #416591)
54+ - added unit tests for couchwidget, and then fixed bug #412266
55+ - Change to freedesktop URL for record type spec.
56+ - First version of the contacts picker, based on CouchWidget
57+ - Adding the desktopcouch.contacts module.
58+ - Use subprocess.Popen and ourselves to the wait()ing,
59+ since subprocess.call() is buggy. There's still an EINTR bug
60+ in subprocess, though.
61+ - Occasionally stop couchdb in tests, so we exercise the automatic
62+ starting code. This will lead to spurious errors because of the
63+ aforementioned subprocess bug, but it's the right thing to do.
64+ - Abstract away some of the linuxisms and complain if we're run on
65+ an unsupported OS.
66+ - Fix a race condition in the process-testing code.
67+ - Replace the TestCase module with one that doesn't complain of dirty
68+ twisted reactors.
69+ - Add a means of stopping the desktop couchdb daemon.
70+ - Add an additional check that a found PID and process named correctly
71+ is indeed a process that this user started, so we don't try to talk
72+ to other local users' desktop couchdbs.
73+ - Get the port at function-call time, instead of storing a port at
74+ start-time and giving that back. The info can be stale, the old
75+ way.
76+ - Don't create a view per record-type; instead, call the standard
77+ return-all-records-keyed-by-record-type and use slice notation on
78+ the viewresults to only get back the records with that type,
79+ which does the same thing but more elegantly.
80+ - Remove the unused/invalid "utils" import from test_server
81+ - Change the name of a function tested to be what actually exists in
82+ the code.
83+ - Refactored server.py by renaming server.get_records_and_type to
84+ server.get_records. Also modified the function to take a record
85+ type param if desired to only create records of that type and
86+ optionally create a view name "get_"+ record_type. (LP: #411475)
87+ * debian/control
88+ - Make python-desktopcouch depend on python-gtk2 and python-gnomekeyring
89+ - Make python-desktopcouch-records depend on python-gtk2,
90+ python-gnomekeyring, and python-oauth.
91+ - Remove depends for python-distutils-extra
92+ - Fixed Vcs-Browser tag
93+
94+ [Elliot Murphy]
95+ * debian/control: added build-dep on python-setuptools
96+
97+
98+ [ Martin Pitt ]
99+ * debian/control: Fix Vcs-* links.
100+
101+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 27 Aug 2009 15:32:11 +0200
102+
103+desktopcouch (0.2-0ubuntu1) karmic; urgency=low
104+
105+ * New upstream release
106+ * Handle the case where the pid file is empty or doesn't exist (LP: #408796)
107+
108+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 05 Aug 2009 02:17:47 +0100
109+
110+desktopcouch (0.1-0ubuntu1) karmic; urgency=low
111+
112+ * Initial release (LP: #397662)
113+
114+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 31 Jul 2009 13:44:45 -0400
115
116=== added file 'debian/compat'
117--- debian/compat 1970-01-01 00:00:00 +0000
118+++ debian/compat 2009-09-01 15:46:56 +0000
119@@ -0,0 +1,1 @@
120+6
121
122=== added file 'debian/control'
123--- debian/control 1970-01-01 00:00:00 +0000
124+++ debian/control 2009-09-17 16:05:27 +0000
125@@ -0,0 +1,76 @@
126+Source: desktopcouch
127+Section: python
128+Priority: optional
129+Build-Depends: cdbs (>= 0.4.43),
130+ debhelper (>= 6),
131+ python,
132+ python-central (>= 0.6.11),
133+ python-distutils-extra (>= 2.8),
134+ python-setuptools
135+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
136+Standards-Version: 3.8.2
137+XS-Python-Version: current
138+Homepage: http://launchpad.net/desktopcouch
139+Vcs-Bzr: https://code.launchpad.net/~ubuntuone-control-tower/ubuntu/karmic/desktopcouch/spb
140+Vcs-Browser: http://bazaar.launchpad.net/~ubuntuone-control-tower/ubuntu/karmic/desktopcouch/spb
141+
142+Package: desktopcouch
143+Architecture: all
144+XB-Python-Version: ${python:Versions}
145+Depends: ${misc:Depends},
146+ ${python:Depends},
147+ couchdb-bin (>= 0.10.0~svn8138),
148+ python-dbus,
149+ python-couchdb (>= 0.6),
150+ python-twisted-core,
151+ python-gobject,
152+ python-avahi,
153+ python-desktopcouch,
154+ python-desktopcouch-records,
155+ python-gtk2
156+Description: Desktop CouchDB instance, specific to each user
157+ Couchdb owned by regular users in their sessions, for management of personal
158+ data.
159+
160+Package: desktopcouch-tools
161+Architecture: all
162+XB-Python-Version: ${python:Versions}
163+Depends: ${misc:Depends},
164+ ${python:Depends},
165+ python-dbus,
166+ python-twisted-core,
167+ python-gobject,
168+ python-avahi,
169+ python-desktopcouch,
170+ python-gtk2
171+Description: Desktop CouchDB tools
172+ Tools used to work with DesktopCouch database.
173+
174+Package: python-desktopcouch
175+Architecture: all
176+XB-Python-Version: ${python:Versions}
177+Depends: ${misc:Depends},
178+ ${python:Depends},
179+ desktopcouch,
180+ python-dbus,
181+ python-couchdb,
182+ python-xdg,
183+ python-twisted-core,
184+ python-gtk2,
185+ python-gnomekeyring
186+Description: Python Desktop CouchDB
187+ A Python library for Desktop CouchDB.
188+
189+Package: python-desktopcouch-records
190+Architecture: all
191+XB-Python-Version: ${python:Versions}
192+Depends: ${misc:Depends},
193+ ${python:Depends},
194+ python-dbus,
195+ python-couchdb,
196+ python-desktopcouch,
197+ python-gtk2,
198+ python-gnomekeyring,
199+ python-oauth
200+Description: Desktop CouchDB Records API
201+ A Python library for the Desktop CouchDB Records API.
202
203=== added file 'debian/copyright'
204--- debian/copyright 1970-01-01 00:00:00 +0000
205+++ debian/copyright 2009-09-01 15:46:56 +0000
206@@ -0,0 +1,11 @@
207+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
208+Upstream-Name: desktopcouch
209+Upstream-Maintainer: Stuart Langridge <stuart.langridge@canonical.com>
210+Upstream-Source: https://launchpad.net/desktopcouch
211+
212+Files: *
213+Copyright: (C) 2009 Canonical Ltd.
214+
215+License: LGPL-3
216+ The full text of the LGPL is distributed in
217+ /usr/share/common-licenses/LGPL-3 on Debian systems.
218
219=== added file 'debian/desktopcouch-tools.install'
220--- debian/desktopcouch-tools.install 1970-01-01 00:00:00 +0000
221+++ debian/desktopcouch-tools.install 2009-09-01 15:46:56 +0000
222@@ -0,0 +1,4 @@
223+debian/tmp/usr/share/applications/desktopcouch-pair.desktop
224+debian/tmp/usr/bin/desktopcouch-pair
225+debian/tmp/usr/share/man/man1/desktopcouch-pair.1
226+#debian/tmp/usr/share/locale/*/LC_MESSAGES/desktopcouch.mo
227
228=== added file 'debian/desktopcouch.install'
229--- debian/desktopcouch.install 1970-01-01 00:00:00 +0000
230+++ debian/desktopcouch.install 2009-09-01 15:46:56 +0000
231@@ -0,0 +1,3 @@
232+debian/tmp/usr/share/desktopcouch
233+debian/tmp/usr/lib/desktopcouch/desktopcouch-{stop,service}
234+debian/tmp/usr/share/dbus-1/services/org.desktopcouch.CouchDB.service
235
236=== added file 'debian/pycompat'
237--- debian/pycompat 1970-01-01 00:00:00 +0000
238+++ debian/pycompat 2009-09-01 15:46:56 +0000
239@@ -0,0 +1,1 @@
240+2
241
242=== added file 'debian/python-desktopcouch-records.install'
243--- debian/python-desktopcouch-records.install 1970-01-01 00:00:00 +0000
244+++ debian/python-desktopcouch-records.install 2009-09-01 15:46:56 +0000
245@@ -0,0 +1,2 @@
246+debian/tmp/usr/share/doc/python-desktopcouch-records/api
247+debian/tmp/usr/lib/*/*/desktopcouch/records/*
248
249=== added file 'debian/python-desktopcouch.install'
250--- debian/python-desktopcouch.install 1970-01-01 00:00:00 +0000
251+++ debian/python-desktopcouch.install 2009-09-15 05:02:20 +0000
252@@ -0,0 +1,3 @@
253+debian/tmp/usr/lib/*/*/desktopcouch/*.py
254+debian/tmp/usr/lib/*/*/desktopcouch/replication_services/*.py
255+debian/tmp/usr/lib/*/*/desktopcouch/pair/{couchdb_pairing,__init__.py}
256
257=== added file 'debian/rules'
258--- debian/rules 1970-01-01 00:00:00 +0000
259+++ debian/rules 2009-09-01 15:46:56 +0000
260@@ -0,0 +1,7 @@
261+#!/usr/bin/make -f
262+
263+DEB_PYTHON_SYSTEM := pycentral
264+
265+include /usr/share/cdbs/1/rules/debhelper.mk
266+include /usr/share/cdbs/1/class/python-distutils.mk
267+include /usr/share/cdbs/1/rules/langpack.mk
268
269=== added file 'debian/watch'
270--- debian/watch 1970-01-01 00:00:00 +0000
271+++ debian/watch 2009-09-01 15:46:56 +0000
272@@ -0,0 +1,2 @@
273+version=3
274+http://launchpad.net/desktopcouch/+download .*/desktopcouch-([0-9.]+)\.tar\.gz

Subscribers

People subscribed via source and target branches