Ubuntu
evolution-couchdb package

Merge lp:~rodrigo-moya/ubuntu/lucid/evolution-couchdb/0-4-4-release into lp:ubuntu/lucid/evolution-couchdb

  1. Lucid (10.04)
  2. 0-4-4-release
  3. Merge into lucid
Proposed by Rodrigo Moya
Status: Merged
Merge reported by: Ken VanDine
Merged at revision: not available
Proposed branch: lp:~rodrigo-moya/ubuntu/lucid/evolution-couchdb/0-4-4-release
Merge into: lp:ubuntu/lucid/evolution-couchdb
Diff against target: 443 lines (+400/-0) (has conflicts)
8 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/changelog (+299/-0)
debian/compat (+1/-0)
debian/control (+27/-0)
debian/copyright (+30/-0)
debian/patches/01_create_u1_addressbook.patch (+27/-0)
debian/rules (+11/-0)
debian/watch (+3/-0)
Conflict adding file debian.  Moved existing file to debian.moved.
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/lucid/evolution-couchdb/0-4-4-release
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+22385@code.launchpad.net

Description of the change

Release 0.4.4

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

I have merged this into lp:~ubuntu-desktop/evolution-couchdb/ubuntu and uploaded

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2010-03-29 17:25:50 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+merge = True
8
9=== added directory 'debian'
10=== renamed directory 'debian' => 'debian.moved'
11=== added file 'debian/changelog'
12--- debian/changelog 1970-01-01 00:00:00 +0000
13+++ debian/changelog 2010-03-29 17:25:50 +0000
14@@ -0,0 +1,299 @@
15+evolution-couchdb (0.4.4-0ubuntu1) lucid; urgency=low
16+
17+ * New upstream release:
18+ - Add REV field to VCARDs for SyncEvolution compatibility (Rodrigo Moya)
19+ - Support E_CONTACT_REV (Rodrigo Moya) (LP:#479110)
20+ - Translations:
21+ - eu (Iñaki Larrañaga Murgoitio)
22+
23+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Mon, 29 Mar 2010 19:20:10 +0200
24+
25+evolution-couchdb (0.4.3-0ubuntu1) lucid; urgency=low
26+
27+ * New upstream release:
28+ - Fixed warning (Rodrigo Moya)
29+ - Translations:
30+ - da (Kenneth Nielsen)
31+ - gl (Fran Diéguez)
32+ - nb (Kjartan Maraas)
33+
34+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Thu, 18 Mar 2010 09:42:44 +0100
35+
36+evolution-couchdb (0.4.2-0ubuntu3) lucid; urgency=low
37+
38+ * Depend on newest couchdb-glib
39+ * Removed upstreamed patch
40+ * New upstream release (0.4.2): (LP: #524653)
41+ - Remove deprecated header file (Rodrigo Moya)
42+ * New upstream release (0.4.1):
43+ - Depend on couchdb-glib >= 0.6.1 (Rodrigo Moya)
44+ * New upstream release (0.4.0):
45+ - Use contacts record API from desktopcouch-glib (Rodrigo Moya)
46+ - Support categories for contacts (Rodrigo Moya)
47+ - Translations:
48+ - hu (Gabor Kelemen)
49+ * New upstream release (0.3.99):
50+ - Take into account the query passed to get_contact_list method to make
51+ searching work (Rodrigo Moya)
52+ - Update to couchdb-glib 0.5.99 API (Rodrigo Moya)
53+ - Use desktopcouch-glib instead of getting the port and OAuth credentials
54+ manually (Rodrigo Moya)
55+ - Translations:
56+ - ca (David Planella)
57+ - nds (Nils-Christoph)
58+
59+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Fri, 19 Feb 2010 21:41:12 +0100
60+
61+evolution-couchdb (0.3.4-0ubuntu2) karmic; urgency=low
62+
63+ * debian/patches/02_support_queries.patch: added patch to support queries.
64+
65+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Fri, 11 Dec 2009 00:02:14 +0100
66+
67+evolution-couchdb (0.3.4-0ubuntu1) karmic; urgency=low
68+
69+ * New upstream release:
70+ - Make sure email's descriptions are never NULL (LP: #453089)
71+ - Don't add empty URLs to the CouchDB record
72+ - Use the description field to know which kind of IM address we're dealing
73+ with when there is no 'protocol' field
74+ - Use e_contact_get for dates, since e_contact_get_const just works for
75+ strings, and make sure we never set empty dates on contact records
76+ (LP: #468672)
77+ - Add deleted flag to documents instead of removing them from the CouchDB
78+ database (only for desktopcouch) (LP: #472465)
79+ - Fix the losing of the postal addresses when saving contacts in Evolution
80+ which I broke by using e_contact_get_const instead of e_contact_get
81+ (LP: #451837)
82+ - Deal correctly with multiline address's streets
83+ - Don't lie saying we support contact lists (LP: #480213)
84+ - Translations: cs, zh_CN
85+
86+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Thu, 19 Nov 2009 19:35:31 +0100
87+
88+evolution-couchdb (0.3.3-0ubuntu1) karmic; urgency=low
89+
90+ * New upstream release (LP:#473960):
91+ - Get the UID from the iterated list item, not from the head of the list,
92+ which tries to delete all the time the first ID (LP: #444576)
93+ - Fixed removal of CouchDB addressbook options when switching to another
94+ addressbook backend and some UI tweaks (LP: #454248)
95+ - Notify Evolution of modified contacts from the documents stored in the
96+ database, not the original ones from Evolution
97+ - Check existence of needed .pc files for e-d-s/evolution plugins dirs
98+ - Don't try to convert empty dates, since Evolution will think they are
99+ 01/01/1000 (Rodrigo Moya)
100+ - Translations: el, es, sl, sv
101+ * debian/patches/02_delete_multiple_contacts.patch: Remove upstreamed patch
102+
103+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Wed, 04 Nov 2009 10:11:57 +0100
104+
105+evolution-couchdb (0.3.2-0ubuntu2) karmic; urgency=low
106+
107+ * Added upstream patch for allowing removal of multiple contacts at once
108+ (LP: #456024)
109+
110+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Thu, 22 Oct 2009 22:23:10 +0200
111+
112+evolution-couchdb (0.3.2-0ubuntu1) karmic; urgency=low
113+
114+ [ Rodrigo Moya ]
115+ * New upstream release:
116+ - Work around bug in e-d-s for live queries (LP: #447162)
117+ - Free the vcard when not calling e_data_book_view_notify_update_vcard
118+ - Translations: de, fr, pt_BR
119+
120+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 22 Oct 2009 10:27:47 -0400
121+
122+evolution-couchdb (0.3.1-0ubuntu1) karmic; urgency=low
123+
124+ * New upstream release:
125+ - Support IM addresses fields (LP: #415297)
126+ - Reworded CouchDB addressbook setup dialog strings
127+ * debian/control: Bump couchdb-glib build dependency to >= 0.5.1.
128+
129+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Mon, 05 Oct 2009 17:58:24 +0200
130+
131+evolution-couchdb (0.3.0-0ubuntu2) karmic; urgency=low
132+
133+ * Added patch to create addressbook pointing to Ubuntu One by default
134+ (LP: #432391)
135+
136+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Fri, 18 Sep 2009 12:25:52 +0200
137+
138+evolution-couchdb (0.3.0-0ubuntu1) karmic; urgency=low
139+
140+ [ Rodrigo Moya ]
141+ * New upstream bug fix release: (LP: #426892)
142+ - Listen for changes on contacts database. (LP: #420439)
143+ - Set the couchdb_instance property's default value to 'user', not
144+ 'system'. (LP: #422616)
145+ - Enable OAuth for desktopcouch instance when secrets available in the
146+ keyring. (LP: #423094)
147+ - Require couchdb-glib >= 0.5.0.
148+ * debian/control: Bump couchdb-glib build dependency to >= 0.5.0.
149+
150+ [ Martin Pitt ]
151+ * Import into bzr and set Vcs-Bzr: in debian/control.
152+ * debian/control: Wrap Build dependencies.
153+ * debian/control: Bump Standards-Version to 3.8.3 (no changes needed).
154+
155+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 10 Sep 2009 18:48:02 +0200
156+
157+evolution-couchdb (0.2.1-0ubuntu1) karmic; urgency=low
158+
159+ * Increment couchdb-glib build-dependency
160+ * Package 0.2.1 upstream release (LP: #419183)
161+ - Support a lot of new fields for contacts (Rodrigo Moya)
162+ - Don't return an error if the database is not found in CouchDB, since that
163+ prevented the database creation to be attempted (Rodrigo Moya)
164+ - Use 127.0.0.1 instead of localhost, since that resolves to :1 in machines
165+ with IPv6 enabled (Rodrigo Moya)
166+ - Support URL fields of contact records (Rodrigo Moya)
167+ - Set the couchdb_instance on the config dialog when defaulting to per-user
168+ CouchDB instance (Rodrigo Moya)
169+ - Require couchdb-glib >= 0.4.5 (Rodrigo Moya)
170+
171+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Wed, 26 Aug 2009 14:19:24 +0200
172+
173+evolution-couchdb (0.2.0-0ubuntu1) karmic; urgency=low
174+
175+ * Increment couchdb-glib build-dependency
176+ * Package 0.2.0 upstream release (LP: #416461)
177+ - Depend on couchdb-glib >= 0.4.4 (Rodrigo Moya)
178+ - Don't loose UUIDs when converting to EContact (Rodrigo Moya)
179+ - Store revision of document in EContact, so that updates work (Rodrigo
180+ Moya)
181+ - Add lots of new phone fields we support now (Rodrigo Moya)
182+ - Return the correct EContact when PUTing documents so that Evolution gets
183+ the document as it is in the database (Rodrigo Moya)
184+ - Add better error reporting from DBus calls (Rodrigo Moya)
185+ - Add support for application_annotations field (Rodrigo Moya)
186+ - Use couchdb_document_contact_new for creating contact documents (Rodrigo
187+ Moya)
188+
189+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Thu, 20 Aug 2009 16:28:46 +0200
190+
191+evolution-couchdb (0.1.4-0ubuntu4) karmic; urgency=low
192+
193+ * Add dependency on desktopcouch (LP: #414766)
194+
195+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Mon, 17 Aug 2009 13:33:39 +0200
196+
197+evolution-couchdb (0.1.4-0ubuntu3) karmic; urgency=low
198+
199+ * Build dep on couchdb-glib 0.4.3
200+
201+ -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 13 Aug 2009 15:45:18 +0100
202+
203+evolution-couchdb (0.1.4-0ubuntu2) karmic; urgency=low
204+
205+ * Add missing libdbus-glib-1-dev dependency
206+
207+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Sat, 08 Aug 2009 22:44:10 +0200
208+
209+evolution-couchdb (0.1.4-0ubuntu1) karmic; urgency=low
210+
211+ * Package 0.1.4 upstream release:
212+ - Set descriptions for mail addresses correctly (Rodrigo Moya)
213+ - Added UI for selecting different CouchDB instances (Rodrigo Moya)
214+ - Remove all .a and .la files from the package (Ken Van Dine)
215+ - Use the couchdb instance as specified on the ESource (Rodrigo Moya)
216+ - Remove unneeded .server file from install (Rodrigo Moya)
217+ - Pass NULL UUIDs to all contacts fields so that they get generated
218+ (Rodrigo Moya)
219+ - Clean up headers in the source files and the debian/copyright to
220+ make sure the license is consistently GPL-3 (Ken Van Dine)
221+
222+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Wed, 05 Aug 2009 17:55:49 +0200
223+
224+evolution-couchdb (0.1.3-0ubuntu3) karmic; urgency=low
225+
226+ * Version dependencies
227+ * Add Vcs-Bzr: header
228+ * Add DEB_DH_MAKESHLIBDEPS_ARGS to debian/rules
229+
230+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Fri, 24 Jul 2009 15:45:36 +0200
231+
232+evolution-couchdb (0.1.3-0ubuntu2) karmic; urgency=low
233+
234+ * Fixed Depends: line
235+
236+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Mon, 20 Jul 2009 16:45:02 +0200
237+
238+evolution-couchdb (0.1.3-0ubuntu1) karmic; urgency=low
239+
240+ * Fixes for REVU uploading
241+ * Package 0.1.3 upstream release:
242+ - Add missing API from evolution-data-server-2.27.x to make it compile
243+ and work on versions <= 2.26.x (Rodrigo Moya)
244+ - Add LICENSE file to upstream tarball (Rodrigo Moya)
245+
246+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Mon, 20 Jul 2009 16:27:52 +0200
247+
248+evolution-couchdb (0.1.2) karmic; urgency=low
249+
250+ * Package 0.1.2 upstream version
251+
252+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Wed, 01 Jul 2009 18:04:44 +0200
253+
254+evolution-couchdb (0.1.1-8) karmic; urgency=low
255+
256+ * Removed .install file, it's a single binary package
257+
258+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Wed, 01 Jul 2009 14:41:12 +0200
259+
260+evolution-couchdb (0.1.1-7) karmic; urgency=low
261+
262+ * Added missing dependencies
263+
264+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Wed, 01 Jul 2009 13:47:46 +0200
265+
266+evolution-couchdb (0.1.1-6) karmic; urgency=low
267+
268+ * Fixed control and copyright files under debian/
269+
270+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Tue, 30 Jun 2009 17:32:45 +0200
271+
272+evolution-couchdb (0.1.1-5) karmic; urgency=low
273+
274+ * Added missing dependencies for EPlugin
275+
276+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Fri, 26 Jun 2009 14:23:29 +0200
277+
278+evolution-couchdb (0.1.1-4) karmic; urgency=low
279+
280+ * Added missing *.install file
281+
282+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Fri, 26 Jun 2009 13:45:35 +0200
283+
284+evolution-couchdb (0.1.1-3) karmic; urgency=low
285+
286+ * Added missing build dependencies
287+
288+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Fri, 26 Jun 2009 12:49:52 +0200
289+
290+evolution-couchdb (0.1.1-2) karmic; urgency=low
291+
292+ * Package is for Karmic
293+
294+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Fri, 26 Jun 2009 12:17:19 +0200
295+
296+evolution-couchdb (0.1.1-1) jaunty; urgency=low
297+
298+ * Added missing dependencies
299+
300+ -- Rodrigo Moya <rodrigo.moya@icanonical.com> Thu, 25 Jun 2009 23:40:39 +0200
301+
302+evolution-couchdb (0.1.1) karmic; urgency=low
303+
304+ * Package 0.1.1 release
305+
306+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Thu, 25 Jun 2009 18:16:36 +0200
307+
308+evolution-couchdb (0.1) jaunty; urgency=low
309+
310+ * First version of the package
311+
312+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Sun, 3 May 2009 17:00:58 +0100
313+
314
315=== added file 'debian/compat'
316--- debian/compat 1970-01-01 00:00:00 +0000
317+++ debian/compat 2010-03-29 17:25:50 +0000
318@@ -0,0 +1,1 @@
319+5
320
321=== added file 'debian/control'
322--- debian/control 1970-01-01 00:00:00 +0000
323+++ debian/control 2010-03-29 17:25:50 +0000
324@@ -0,0 +1,27 @@
325+Source: evolution-couchdb
326+Section: gnome
327+Priority: optional
328+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
329+XSBC-Original-Maintainer: Rodrigo Moya <rodrigo.moya@canonical.com>
330+Standards-Version: 3.8.3
331+Build-Depends: debhelper (>= 5),
332+ cdbs,
333+ libedata-book1.2-dev (>= 2.27.0),
334+ libebook1.2-dev (>= 2.27.0),
335+ libcouchdb-glib-dev (>= 0.6.1),
336+ libdesktopcouch-glib-dev (>= 0.6.1),
337+ libgtk2.0-dev,
338+ evolution-dev (>= 2.27.0),
339+ evolution-data-server-dev (>= 2.27.0),
340+ libdbus-glib-1-dev
341+Homepage: https://launchpad.net/evolution-couchdb
342+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/evolution-couchdb/ubuntu
343+
344+Package: evolution-couchdb
345+Architecture: any
346+Depends: ${shlibs:Depends}, evolution (>= 2.27.0), ${misc:Depends}, desktopcouch
347+Description: Evolution support for CouchDB databases
348+ This package provides support for the Evolution mail and calendar program
349+ to access CouchDB databases (http://couchdb.apache.org), a replication and
350+ synchronization database of JSON documents, used by online services like
351+ UbuntuOne at http://ubuntuone.com
352
353=== added file 'debian/copyright'
354--- debian/copyright 1970-01-01 00:00:00 +0000
355+++ debian/copyright 2010-03-29 17:25:50 +0000
356@@ -0,0 +1,30 @@
357+This package was debianized by Rodrigo Moya <rodrigo.moya@canonical.com> on Sun, 03 May 2009 17:06:26 CEST +0100
358+
359+It was downloaded from:
360+ http://download.gnome.org/sources/evolution-couchdb/
361+
362+Upstream Author:
363+ Rodrigo Moya <rodrigo.moya@canonical.com>
364+
365+Copyright (C) 2009 Canonical Ltd
366+
367+License:
368+ This program is free software: you can redistribute it and/or modify
369+ it under the terms of the GNU General Public License as published by
370+ the Free Software Foundation, either version 3 of the License, or
371+ (at your option) any later version.
372+
373+ This program is distributed in the hope that it will be useful,
374+ but WITHOUT ANY WARRANTY; without even the implied warranty of
375+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
376+ GNU General Public License for more details.
377+
378+ You should have received a copy of the GNU General Public License
379+ along with this program. If not, see <http://www.gnu.org/licenses/>.
380+
381+On Debian systems, the complete text of the GNU General
382+Public License can be found in `/usr/share/common-licenses/GPL-3'.
383+
384+Packaging:
385+ The Debian packaging is by Rodrigo Moya <rodrigo.moya@canonical.com> and copyright Canonical Ltd.
386+ It is released under the GNU GPL 3 license, see above Rodrigo Moya <rodrigo.moya@canonical.com>
387
388=== added directory 'debian/patches'
389=== added file 'debian/patches/01_create_u1_addressbook.patch'
390--- debian/patches/01_create_u1_addressbook.patch 1970-01-01 00:00:00 +0000
391+++ debian/patches/01_create_u1_addressbook.patch 2010-03-29 17:25:50 +0000
392@@ -0,0 +1,27 @@
393+=== modified file 'plugins/couchdb-contacts-source.c'
394+--- plugins/couchdb-contacts-source.c 2009-09-02 11:14:44 +0000
395++++ plugins/couchdb-contacts-source.c 2009-09-18 10:18:31 +0000
396+@@ -108,7 +108,22 @@
397+
398+ source_list = e_source_list_new_for_gconf_default("/apps/evolution/addressbook/sources");
399+ if (source_list) {
400++ ESourceGroup *group;
401++ GSList *sources;
402++
403+ e_source_list_ensure_group (source_list, _("CouchDB"), COUCHDB_BASE_URI, FALSE);
404++ group = e_source_list_peek_group_by_base_uri (source_list, COUCHDB_BASE_URI);
405++ sources = e_source_group_peek_sources (group);
406++ if (sources == NULL) {
407++ ESource *ubuntuone_source;
408++
409++ /* Create Ubuntu One addressbook when there is no other CouchDB source */
410++ ubuntuone_source = e_source_new ("Ubuntu One", "127.0.0.1");
411++ e_source_set_property (ubuntuone_source, "couchdb_instance", "user");
412++ e_source_group_add_source (group, ubuntuone_source, -1);
413++
414++ g_object_unref (G_OBJECT (ubuntuone_source));
415++ }
416+
417+ g_object_unref (G_OBJECT (source_list));
418+ }
419+
420
421=== added file 'debian/rules'
422--- debian/rules 1970-01-01 00:00:00 +0000
423+++ debian/rules 2010-03-29 17:25:50 +0000
424@@ -0,0 +1,11 @@
425+#! /usr/bin/make -f
426+
427+include /usr/share/cdbs/1/rules/debhelper.mk
428+include /usr/share/cdbs/1/rules/simple-patchsys.mk
429+include /usr/share/cdbs/1/class/gnome.mk
430+
431+DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/evolution
432+
433+binary-post-install/evolution-couchdb::
434+ find debian/evolution-couchdb/usr/lib -name \*.la -exec rm {} \;
435+ find debian/evolution-couchdb/usr/lib -name \*.a -exec rm {} \;
436
437=== added file 'debian/watch'
438--- debian/watch 1970-01-01 00:00:00 +0000
439+++ debian/watch 2010-03-29 17:25:50 +0000
440@@ -0,0 +1,3 @@
441+#watch file for evolution-couchdb
442+version=3
443+http://download.gnome.org/sources/evolution-couchdb/([0-9.]+)/evolution-couchdb-([0-9.]+)\.tar\.gz debian

Subscribers

People subscribed via source and target branches

to all changes: