evolution-data-server

Merge lp:~cyphermox/evolution-data-server/3.1.2 into lp:~ubuntu-desktop/evolution-data-server/ubuntu

  1. 3.1.2
  2. Merge into ubuntu
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: 91
Proposed branch: lp:~cyphermox/evolution-data-server/3.1.2
Merge into: lp:~ubuntu-desktop/evolution-data-server/ubuntu
Diff against target: 238 lines (+33/-51)
10 files modified
debian/changelog (+17/-1)
debian/control (+11/-39)
debian/libebook1.2-11.install (+1/-1)
debian/libecal1.2-9.install (+1/-1)
debian/libegroupwise1.2-13.install (+0/-2)
debian/libegroupwise1.2-dev.install (+0/-3)
debian/lintian/libebook1.2-11 (+1/-1)
debian/lintian/libecal1.2-9 (+1/-1)
debian/lintian/libegroupwise1.2-13 (+0/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~cyphermox/evolution-data-server/3.1.2
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+65807@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-06-23 19:38:02 +0000
+++ debian/changelog 2011-06-24 16:06:45 +0000
@@ -1,12 +1,28 @@
1evolution-data-server (3.1.2-0ubuntu1) UNRELEASED; urgency=low1evolution-data-server (3.1.2-0ubuntu1) UNRELEASED; urgency=low
22
3 * New upstream version3 * New upstream version
4 - bgo 589495 - Search folder by Size (KB) counts bytes, not KB (LP: #385859)
5 - bgo 649757 - Filtering on a source account always succeeded (LP: #781391)
6 - bgo 418954 - Add a separate entry combo for port numbers (LP: #160304)
7
8 [ Ken VanDine ]
4 * debian/libebook1.2-dev.install9 * debian/libebook1.2-dev.install
5 - Include EBook-1.2.gir10 - Include EBook-1.2.gir
6 * debian/control11 * debian/control
7 - Added gir1.2-ebook-1.2 binary12 - Added gir1.2-ebook-1.2 binary
813
9 -- Ken VanDine <ken.vandine@canonical.com> Thu, 23 Jun 2011 14:57:50 -040014 [ Mathieu Trudel-Lapierre ]
15 * debian/control: drop libegroupwise1.2-13, libegroupwise-dev, they are now
16 an independent module.
17 * debian/libegroupwise1.2-13.install,
18 debian/libegroupwise1.2-dev.install,
19 debian/lintian/libegroupwise1.2-13: dropped, see above.
20 * debian/control, debian/libe*.install, debian/lintian/libe*: rename and
21 update files where needed to follow upstream soname changes.
22 * debian/control: bump evolution-data-server's Depends to libcamel-1.2-26.
23 * debian/rules: update to use makeshlibs with the new libcamel soname.
24
25 -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Thu, 23 Jun 2011 17:40:41 -0400
1026
11evolution-data-server (3.0.2.1-0ubuntu1) oneiric; urgency=low27evolution-data-server (3.0.2.1-0ubuntu1) oneiric; urgency=low
1228
1329
=== modified file 'debian/control'
--- debian/control 2011-06-23 19:18:16 +0000
+++ debian/control 2011-06-24 16:06:45 +0000
@@ -56,7 +56,7 @@
56Depends: ${shlibs:Depends},56Depends: ${shlibs:Depends},
57 ${misc:Depends},57 ${misc:Depends},
58 evolution-data-server-common (= ${source:Version}),58 evolution-data-server-common (= ${source:Version}),
59 libcamel-1.2-23 (= ${binary:Version})59 libcamel-1.2-26 (= ${binary:Version})
60Suggests: evolution (>= 2.6.1),60Suggests: evolution (>= 2.6.1),
61 evolution-data-server-dbg (= ${binary:Version})61 evolution-data-server-dbg (= ${binary:Version})
62Replaces: evolution-data-server1.262Replaces: evolution-data-server1.2
@@ -135,7 +135,7 @@
135 library. It can be used by packages using the GIRepository format to 135 library. It can be used by packages using the GIRepository format to
136 generate dynamic bindings.136 generate dynamic bindings.
137137
138Package: libcamel-1.2-23138Package: libcamel-1.2-26
139Section: libs139Section: libs
140Architecture: any140Architecture: any
141Depends: ${shlibs:Depends},141Depends: ${shlibs:Depends},
@@ -152,7 +152,7 @@
152Package: libcamel1.2-dev152Package: libcamel1.2-dev
153Section: libdevel153Section: libdevel
154Architecture: any154Architecture: any
155Depends: libcamel-1.2-23 (= ${binary:Version}),155Depends: libcamel-1.2-26 (= ${binary:Version}),
156 ${misc:Depends},156 ${misc:Depends},
157 ${shlibs:Depends},157 ${shlibs:Depends},
158 libglib2.0-dev,158 libglib2.0-dev,
@@ -170,7 +170,7 @@
170 Evolution is the integrated mail, calendar, task and address book170 Evolution is the integrated mail, calendar, task and address book
171 distributed suite from Novell, Inc.171 distributed suite from Novell, Inc.
172172
173Package: libebook1.2-10173Package: libebook1.2-11
174Section: libs174Section: libs
175Architecture: any175Architecture: any
176Depends: ${shlibs:Depends},176Depends: ${shlibs:Depends},
@@ -184,7 +184,7 @@
184Package: libebook1.2-dev184Package: libebook1.2-dev
185Section: libdevel185Section: libdevel
186Architecture: any186Architecture: any
187Depends: libebook1.2-10 (= ${binary:Version}),187Depends: libebook1.2-11 (= ${binary:Version}),
188 ${misc:Depends},188 ${misc:Depends},
189 ${shlibs:Depends},189 ${shlibs:Depends},
190 libedataserver1.2-dev,190 libedataserver1.2-dev,
@@ -240,7 +240,7 @@
240 This package contains header files and static library for240 This package contains header files and static library for
241 libedataserverui.241 libedataserverui.
242242
243Package: libedata-book-1.2-9243Package: libedata-book-1.2-10
244Section: libs244Section: libs
245Architecture: any245Architecture: any
246Depends: ${shlibs:Depends},246Depends: ${shlibs:Depends},
@@ -254,7 +254,7 @@
254Package: libedata-book1.2-dev254Package: libedata-book1.2-dev
255Section: libdevel255Section: libdevel
256Architecture: any256Architecture: any
257Depends: libedata-book-1.2-9 (= ${binary:Version}),257Depends: libedata-book-1.2-10 (= ${binary:Version}),
258 ${misc:Depends},258 ${misc:Depends},
259 ${shlibs:Depends},259 ${shlibs:Depends},
260 libedataserver1.2-dev,260 libedataserver1.2-dev,
@@ -266,7 +266,7 @@
266 .266 .
267 This package contains header files and static library for libedata-book.267 This package contains header files and static library for libedata-book.
268268
269Package: libecal1.2-8269Package: libecal1.2-9
270Section: libs270Section: libs
271Architecture: any271Architecture: any
272Depends: ${shlibs:Depends},272Depends: ${shlibs:Depends},
@@ -280,7 +280,7 @@
280Package: libecal1.2-dev280Package: libecal1.2-dev
281Section: libdevel281Section: libdevel
282Architecture: any282Architecture: any
283Depends: libecal1.2-8 (= ${binary:Version}),283Depends: libecal1.2-9 (= ${binary:Version}),
284 ${misc:Depends},284 ${misc:Depends},
285 ${shlibs:Depends},285 ${shlibs:Depends},
286 libical-dev (>= 0.43),286 libical-dev (>= 0.43),
@@ -306,7 +306,7 @@
306 can be used by packages using the GIRepository format to generate 306 can be used by packages using the GIRepository format to generate
307 dynamic bindings.307 dynamic bindings.
308308
309Package: libedata-cal-1.2-11309Package: libedata-cal-1.2-12
310Section: libs310Section: libs
311Architecture: any311Architecture: any
312Depends: ${shlibs:Depends},312Depends: ${shlibs:Depends},
@@ -320,7 +320,7 @@
320Package: libedata-cal1.2-dev320Package: libedata-cal1.2-dev
321Section: libdevel321Section: libdevel
322Architecture: any322Architecture: any
323Depends: libedata-cal-1.2-11 (= ${binary:Version}),323Depends: libedata-cal-1.2-12 (= ${binary:Version}),
324 ${misc:Depends},324 ${misc:Depends},
325 ${shlibs:Depends},325 ${shlibs:Depends},
326 libical-dev (>= 0.43),326 libical-dev (>= 0.43),
@@ -333,34 +333,6 @@
333 .333 .
334 This package contains header files and static library for libedata-cal.334 This package contains header files and static library for libedata-cal.
335335
336Package: libegroupwise1.2-13
337Section: libs
338Architecture: any
339Depends: ${shlibs:Depends},
340 ${misc:Depends}
341Description: Client library for accessing groupwise POA through SOAP interface
342 This package is a client library for accessing groupwise POA through SOAP
343 interface of Evolution.
344 .
345 Evolution is the integrated mail, calendar, task and address book
346 distributed suite from Novell, Inc.
347
348Package: libegroupwise1.2-dev
349Section: libdevel
350Architecture: any
351Depends: libegroupwise1.2-13 (= ${binary:Version}),
352 ${misc:Depends},
353 ${shlibs:Depends},
354 libsoup2.4-dev
355Description: Development files for libegroupwise
356 This package contains header files and static library for libegroupwise.
357 .
358 libegroupwise is client library for accessing groupwise POA through SOAP
359 interface of Evolution.
360 .
361 Evolution is the integrated mail, calendar, task and address book
362 distributed suite from Novell, Inc.
363
364Package: libebackend-1.2-1336Package: libebackend-1.2-1
365Section: libs337Section: libs
366Architecture: any338Architecture: any
367339
=== renamed file 'debian/libcamel-1.2-23.install' => 'debian/libcamel-1.2-26.install'
=== renamed file 'debian/libebook1.2-10.install' => 'debian/libebook1.2-11.install'
--- debian/libebook1.2-10.install 2010-11-02 00:26:19 +0000
+++ debian/libebook1.2-11.install 2011-06-24 16:06:45 +0000
@@ -1,2 +1,2 @@
1debian/tmp/usr/lib/libebook-1.2.so.*1debian/tmp/usr/lib/libebook-1.2.so.*
2debian/lintian/libebook1.2-10 usr/share/lintian/overrides/2debian/lintian/libebook1.2-11 usr/share/lintian/overrides/
33
=== renamed file 'debian/libecal1.2-8.install' => 'debian/libecal1.2-9.install'
--- debian/libecal1.2-8.install 2010-11-02 00:26:19 +0000
+++ debian/libecal1.2-9.install 2011-06-24 16:06:45 +0000
@@ -1,2 +1,2 @@
1debian/tmp/usr/lib/libecal-1.2.so.*1debian/tmp/usr/lib/libecal-1.2.so.*
2debian/lintian/libecal1.2-8 usr/share/lintian/overrides/2debian/lintian/libecal1.2-9 usr/share/lintian/overrides/
33
=== renamed file 'debian/libedata-book-1.2-9.install' => 'debian/libedata-book-1.2-10.install'
=== renamed file 'debian/libedata-cal-1.2-11.install' => 'debian/libedata-cal-1.2-12.install'
=== removed file 'debian/libegroupwise1.2-13.install'
--- debian/libegroupwise1.2-13.install 2009-07-27 15:18:44 +0000
+++ debian/libegroupwise1.2-13.install 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1debian/tmp/usr/lib/libegroupwise-1.2.so.*
2debian/lintian/libegroupwise1.2-13 usr/share/lintian/overrides/
30
=== removed file 'debian/libegroupwise1.2-dev.install'
--- debian/libegroupwise1.2-dev.install 2011-05-18 15:16:46 +0000
+++ debian/libegroupwise1.2-dev.install 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1debian/tmp/usr/lib/pkgconfig/libegroupwise-1.2.pc
2debian/tmp/usr/lib/libegroupwise-1.2.so
3debian/tmp/usr/include/evolution-data-server-*/groupwise
40
=== renamed file 'debian/lintian/libebook1.2-10' => 'debian/lintian/libebook1.2-11'
--- debian/lintian/libebook1.2-10 2010-11-02 00:26:19 +0000
+++ debian/lintian/libebook1.2-11 2011-06-24 16:06:45 +0000
@@ -1,1 +1,1 @@
1libebook1.2-10: package-name-doesnt-match-sonames libebook-1.2-101libebook1.2-11: package-name-doesnt-match-sonames libebook-1.2-11
22
=== renamed file 'debian/lintian/libecal1.2-8' => 'debian/lintian/libecal1.2-9'
--- debian/lintian/libecal1.2-8 2010-11-02 00:26:19 +0000
+++ debian/lintian/libecal1.2-9 2011-06-24 16:06:45 +0000
@@ -1,1 +1,1 @@
1libecal1.2-8: package-name-doesnt-match-sonames libecal-1.2-81libecal1.2-9: package-name-doesnt-match-sonames libecal-1.2-9
22
=== removed file 'debian/lintian/libegroupwise1.2-13'
--- debian/lintian/libegroupwise1.2-13 2009-07-27 15:18:44 +0000
+++ debian/lintian/libegroupwise1.2-13 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1libegroupwise1.2-13: package-name-doesnt-match-sonames libegroupwise-1.2-13
20
=== modified file 'debian/rules'
--- debian/rules 2011-05-18 15:16:46 +0000
+++ debian/rules 2011-06-24 16:06:45 +0000
@@ -15,7 +15,7 @@
15DEB_SHLIBDEPS_INCLUDE += debian/tmp/usr/lib15DEB_SHLIBDEPS_INCLUDE += debian/tmp/usr/lib
1616
17DEB_DH_MAKESHLIBS_ARGS_ALL += -V17DEB_DH_MAKESHLIBS_ARGS_ALL += -V
18DEB_DH_MAKESHLIBS_ARGS_libcamel-1.2-23 += -V'libcamel-1.2-23 (>= $(DEB_GNOME_VERSION)), libcamel-1.2-23 (<< $(DEB_GNOME_NEXTVERSION))'18DEB_DH_MAKESHLIBS_ARGS_libcamel-1.2-26 += -V'libcamel-1.2-26 (>= $(DEB_GNOME_VERSION)), libcamel-1.2-26 (<< $(DEB_GNOME_NEXTVERSION))'
1919
20LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)20LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
21CFLAGS=$(shell dpkg-buildflags --get CFLAGS)21CFLAGS=$(shell dpkg-buildflags --get CFLAGS)

Subscribers

People subscribed via source and target branches