diff -Nru geary-0.8.2/debian/changelog geary-0.8.2/debian/changelog --- geary-0.8.2/debian/changelog 2014-11-05 22:37:56.000000000 -0800 +++ geary-0.8.2/debian/changelog 2014-11-06 23:35:24.000000000 -0800 @@ -1,9 +1,25 @@ +geary (0.8.2-1ubuntu1) vivid; urgency=medium + + * Merge from debian (LP: #1390344). Remaining changes: + - debian/control: Add build-depends on libmessaging-menu-dev and + libunity-dev for Unity integration. + + -- Vincent Cheng Thu, 06 Nov 2014 23:33:20 -0800 + geary (0.8.2-1) unstable; urgency=medium * New upstream release. -- Vincent Cheng Wed, 05 Nov 2014 22:37:42 -0800 +geary (0.8.1-1ubuntu1) vivid; urgency=medium + + * Merge from debian (LP: #1387009). Remaining changes: + - debian/control: Add build-depends on libmessaging-menu-dev and + libunity-dev for Unity integration. + + -- Vincent Cheng Wed, 29 Oct 2014 00:05:58 -0700 + geary (0.8.1-1) unstable; urgency=medium * New upstream release. @@ -18,6 +34,14 @@ -- Vincent Cheng Sat, 20 Sep 2014 13:18:51 -0700 +geary (0.6.3-1ubuntu1) utopic; urgency=medium + + * Merge from debian. Remaining changes: + - debian/control: Add build-depends on libmessaging-menu-dev and + libunity-dev for Unity integration. + + -- Jackson Doak Wed, 10 Sep 2014 07:13:14 +1000 + geary (0.6.3-1) unstable; urgency=medium * New upstream release. @@ -27,18 +51,49 @@ -- Vincent Cheng Wed, 03 Sep 2014 22:58:57 -0700 +geary (0.6.2-1ubuntu1) utopic; urgency=medium + + * Merge from debian. Remaining changes: + - debian/control: Add build-depends on libmessaging-menu-dev and + libunity-dev for Unity integration. + + -- Jackson Doak Mon, 25 Aug 2014 16:28:57 +1000 + geary (0.6.2-1) unstable; urgency=medium * New upstream release. -- Vincent Cheng Wed, 20 Aug 2014 23:32:20 -0700 +geary (0.6.1-1ubuntu2) utopic; urgency=medium + + * No-change rebuild against new vala to fix bug with previous GMutex + implementation. + + -- Iain Lane Tue, 19 Aug 2014 10:03:16 +0100 + +geary (0.6.1-1ubuntu1) utopic; urgency=medium + + * Merge from debian. Remaining changes: + - debian/control: Add build-depends on libmessaging-menu-dev and + libunity-dev for Unity integration. + + -- Vincent Cheng Thu, 03 Jul 2014 23:32:55 -0700 + geary (0.6.1-1) unstable; urgency=medium * New upstream release. -- Vincent Cheng Wed, 02 Jul 2014 22:42:30 -0700 +geary (0.6.0-3ubuntu1) utopic; urgency=medium + + * Merge from debian. Remaining changes: + - debian/control: Add build-depends on libmessaging-menu-dev and + libunity-dev for Unity integration. + + -- Vincent Cheng Tue, 01 Jul 2014 17:44:29 -0700 + geary (0.6.0-3) unstable; urgency=medium * Replace dependency on kwallet (which doesn't exist) with kwalletmanager. @@ -65,16 +120,73 @@ -- Vincent Cheng Thu, 26 Jun 2014 22:24:33 -0700 -geary (0.4.2-1) unstable; urgency=low +geary (0.6.0-0ubuntu2) trusty; urgency=medium + + * debian/control: build-depends on gnome-doc-utils + + -- Sebastien Bacher Fri, 21 Mar 2014 18:15:16 +0100 + +geary (0.6.0-0ubuntu1) trusty; urgency=medium + + * New upstream version + + -- Sebastien Bacher Fri, 21 Mar 2014 18:01:44 +0100 + +geary (0.5.3-0ubuntu1) trusty; urgency=medium + + * New upstream version + + -- Sebastien Bacher Mon, 10 Mar 2014 11:50:41 +0100 + +geary (0.5.1-0ubuntu1) trusty; urgency=medium + + * New upstream version + + -- Sebastien Bacher Wed, 05 Feb 2014 17:08:29 +0000 + +geary (0.4.1-0ubuntu1) trusty; urgency=low + + * New upstream version + + -- Sebastien Bacher Tue, 12 Nov 2013 23:33:28 +0100 + +geary (0.4.0-0ubuntu1) saucy; urgency=low + + * New stable version + + -- Sebastien Bacher Thu, 10 Oct 2013 17:40:37 +0200 + +geary (0.4.0~pr2-0ubuntu1) saucy; urgency=low + + * New upstream version + + -- Sebastien Bacher Tue, 24 Sep 2013 16:09:06 +0200 + +geary (0.4.0~pr1-0ubuntu2) saucy; urgency=low + + * debian/contro: build-depends on desktop-file-utils, not on libindicate + + -- Sebastien Bacher Thu, 29 Aug 2013 13:48:23 +0200 + +geary (0.4.0~pr1-0ubuntu1) saucy; urgency=low + + * New upstream beta version + * debian/control: updated build-depends for new version requirements + + -- Sebastien Bacher Wed, 28 Aug 2013 11:26:42 +0200 + +geary (0.3.1-1ubuntu2) saucy; urgency=low + + * Build with default vala (Closes: #711395) + + -- Jeremy Bicha Sat, 24 Aug 2013 16:24:57 -0400 + +geary (0.3.1-1ubuntu1) saucy; urgency=low - * Upload to unstable. - * New upstream release (Closes: #703964). - * debian/control: update Build-Depends field to match new - minimum requirements (Closes: #711395). - * Update debian/copyright file. - * Bump Standards-Version to 3.9.5. + * Rebase on Debian, remaining ubuntu differences: + * debian/control: build-depends on libmessaging-menu-dev - -- Devid Antonio Filoni Sun, 15 Dec 2013 21:24:02 +0100 + -- Sebastien Bacher Fri, 03 May 2013 11:39:39 -0700 geary (0.3.1-1) experimental; urgency=low diff -Nru geary-0.8.2/debian/control geary-0.8.2/debian/control --- geary-0.8.2/debian/control 2014-10-08 00:16:33.000000000 -0700 +++ geary-0.8.2/debian/control 2014-11-06 23:36:09.000000000 -0800 @@ -1,7 +1,8 @@ Source: geary Section: mail Priority: optional -Maintainer: Vincent Cheng +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Vincent Cheng Build-Depends: cmake (>= 2.8.0), debhelper (>= 9.20120417), @@ -16,10 +17,12 @@ libgmime-2.6-dev (>= 2.6.0), libgnome-keyring-dev (>= 3.2.2), libgtk-3-dev (>= 3.10.0), + libmessaging-menu-dev, libnotify-dev (>= 0.7.5), libsecret-1-dev (>= 0.11), libsqlite3-dev (>= 3.7.4), libunique-3.0-dev (>= 3.0.0), + libunity-dev, libwebkitgtk-3.0-dev (>= 2.3.0), libxml2-dev (>= 2.7.8), valac (>= 0.22.1)