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