[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, ubuntu, updated. debian/1.11.5-1ubuntu1
Iain Lane
laney at debian.org
Mon Aug 6 18:01:58 UTC 2012
The following commit has been merged in the ubuntu branch:
commit 78095f9233bc78298c32d576d7f5ad9db7afd70f
Merge: cc11a203d9942821a2efe3d692a3c5f0e2e59aa3 1eccd1693d3bea69acc72c6c3ae6e5cf440c3a42
Author: Iain Lane <laney at debian.org>
Date: Mon Aug 6 18:11:09 2012 +0100
Merge tag 'debian/1.11.5-1' into ubuntu
Debian release 1.11.5-1
Conflicts:
debian/patches/40_use_gmime_2.6.patch
diff --combined debian/changelog
index 59b1cb0,91b3dd0..dc02a2f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,13 +1,29 @@@
+ tomboy (1.11.5-1) experimental; urgency=low
+
+ * [b67c86c] Imported Upstream version 1.11.5
+ - Fix Evolution add-in gmime dependency
+ - Add match count in note search
+ - Sanitize sync url
+ * [3b08591] Delete 40_use_gmime_2.6.patch: applied upstream.
+
+ -- Iain Lane <laney at debian.org> Mon, 06 Aug 2012 17:56:45 +0100
+
+tomboy (1.11.2-1ubuntu1) quantal; urgency=low
+
+ * Merge with Debian unstable, remaining changes
+ + Use dh-translations
+ + Ubuntu patches:
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ - Set save button sensitive when needed
+ + autoreconf for some of the above changes
+ + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+ * [8f7dae7] Refresh patches to apply cleanly
+ * [81884e2] Deduplicate libgconf2-dev BD
+
+ -- Iain Lane <laney at ubuntu.com> Tue, 05 Jun 2012 22:05:14 +0100
+
tomboy (1.11.2-1) experimental; urgency=low
* [9be0acb] Imported Upstream version 1.11.2
@@@ -26,31 -20,6 +36,31 @@@
-- Iain Lane <laney at debian.org> Tue, 05 Jun 2012 14:28:12 +0100
+tomboy (1.11.1-1ubuntu2) quantal; urgency=low
+
+ * debian/control:
+ - Drop dependency on liblaunchpad-integration-cil-dev
+ * debian/patches/11_lpi.patch:
+ - Dropped, we no longer do Launchpad integration
+
+ -- Robert Ancell <robert.ancell at canonical.com> Tue, 15 May 2012 09:49:23 +1200
+
+tomboy (1.11.1-1ubuntu1) quantal; urgency=low
+
+ * [42fc674] Update gbp.conf for Ubuntu branch
+ * Merge with Debian, remaining changes
+ + Use dh-translations
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ - Set save button sensitive when needed
+ + autoreconf for some of the above changes
+ + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+
+ -- Iain Lane <laney at ubuntu.com> Thu, 03 May 2012 21:17:32 +0100
+
tomboy (1.11.1-1) experimental; urgency=low
* [decde44] gbp.conf back to exp branches
@@@ -62,27 -31,6 +72,27 @@@
-- Iain Lane <laney at debian.org> Thu, 03 May 2012 20:15:51 +0100
+tomboy (1.10.1-0ubuntu1) precise; urgency=low
+
+ * New upstream version
+
+ -- Sebastien Bacher <seb128 at ubuntu.com> Mon, 16 Apr 2012 21:06:48 +0200
+
+tomboy (1.10.0-1ubuntu1) precise; urgency=low
+
+ * Merge from unstable, remaining changes
+ + Use dh-translations
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ - Set save button sensitive when needed
+ + autoreconf for some of the above changes
+ + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+
+ -- Iain Lane <laney at ubuntu.com> Wed, 28 Mar 2012 22:49:23 +0100
+
tomboy (1.10.0-1) unstable; urgency=low
* [277fd7f] Imported Upstream version 1.10.0
@@@ -99,12 -47,6 +109,12 @@@ tomboy (1.9.10-1) unstable; urgency=lo
-- Iain Lane <laney at debian.org> Tue, 20 Mar 2012 22:34:39 +0000
+tomboy (1.9.10-0ubuntu1) precise; urgency=low
+
+ * New upstream version
+
+ -- Sebastien Bacher <seb128 at ubuntu.com> Tue, 20 Mar 2012 15:28:51 +0100
+
tomboy (1.9.9-2) experimental; urgency=low
* Merge from unstable
@@@ -124,52 -66,6 +134,52 @@@ tomboy (1.9.9-1) experimental; urgency=
-- Iain Lane <laney at debian.org> Tue, 06 Mar 2012 19:00:41 +0000
+tomboy (1.9.9-0ubuntu1) precise; urgency=low
+
+ * New upstream version
+
+ -- Sebastien Bacher <seb128 at ubuntu.com> Mon, 05 Mar 2012 22:44:28 +0100
+
+tomboy (1.9.8-0ubuntu1) precise; urgency=low
+
+ * New upstream version
+ * debian/control:
+ - updated libappindicator version requirement for set_title()
+ * debian/patches/04_app_indicator.patch:
+ - updated to set a title to the indicator ("Tomboy Notes"), mostly to
+ have it listed under its name in the unity-hud (lp: #943418)
+
+ -- Sebastien Bacher <seb128 at ubuntu.com> Wed, 29 Feb 2012 15:11:36 +0100
+
+tomboy (1.9.5-1ubuntu3) precise; urgency=low
+
+ * debian/WebSyncServiceAddin.dll.config: Bump libproxy SONAME.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Thu, 16 Feb 2012 10:20:55 +0100
+
+tomboy (1.9.5-1ubuntu2) precise; urgency=low
+
+ * No-change rebuild against libproxy1.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Thu, 16 Feb 2012 08:42:56 +0100
+
+tomboy (1.9.5-1ubuntu1) precise; urgency=low
+
+ * [42fc674] Update gbp.conf for Ubuntu branch
+ * [d407c7c] Drop git_logout_delay: upstreamed
+ * Merge with experimental, remaining changes:
+ + Use dh-translations
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ - Set save button sensitive when needed
+ + autoreconf for some of the above changes
+ + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+
+ -- Iain Lane <laney at ubuntu.com> Mon, 06 Feb 2012 14:18:43 +0000
+
tomboy (1.9.5-1) experimental; urgency=low
* [ceb1079] Update watchfile to look for xz tarballs
@@@ -216,48 -112,6 +226,48 @@@ tomboy (1.8.3-1) unstable; urgency=lo
-- Iain Lane <laney at debian.org> Wed, 16 Nov 2011 15:58:39 +0000
+tomboy (1.8.0-1ubuntu1.2) precise; urgency=low
+
+ * debian/patches/git_logout_delay.patch: upstream fix, should fix the issue
+ where tomboy is delaying the session logout (lp: #880299)
+
+ -- Sebastien Bacher <seb128 at ubuntu.com> Mon, 16 Jan 2012 18:39:47 +0100
+
+tomboy (1.8.0-1ubuntu1.1) oneiric-proposed; urgency=low
+
+ [ Iain Lane ]
+ * debian/control: Remove syncdaemon BD which is no longer required due to
+ the dropping of the SSO patch in 1.8.0-1ubuntu1
+
+ [ Ken VanDine ]
+ * debian/patches/02_sync_save_button_sensitive.patch
+ - Set save button sensitive when needed (LP: #845321)
+
+ -- Ken VanDine <ken.vandine at canonical.com> Fri, 14 Oct 2011 09:38:21 -0400
+
+tomboy (1.8.0-1ubuntu1) oneiric; urgency=low
+
+ [ Iain Lane ]
+ * Merge with Debian experimental, remaning changes:
+ + Use dh-translations
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ + autoreconf for some of the above changes
+ + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+
+ [ Rodrigo Moya ]
+ * [a6712fc] Disable U1 SSO patch & refresh u1_as_default_sync_source patch
+ * debian/patches/06_use_ubuntu_sso.patch:
+ - Disabled SSO patch, as it's not working on Oneiric, and also allows
+ to remove the dependency on libubuntuone.
+ * debian/patches/03_u1_as_default_sync.patch:
+ - Rebased
+
+ -- Iain Lane <laney at debian.org> Mon, 26 Sep 2011 23:39:59 +0100
+
tomboy (1.8.0-1) unstable; urgency=low
* Upload to unstable
@@@ -268,21 -122,6 +278,21 @@@
-- Iain Lane <laney at debian.org> Mon, 26 Sep 2011 22:26:48 +0100
+tomboy (1.7.6-1ubuntu1) oneiric; urgency=low
+
+ * Merge with Debian experimental, remaning changes:
+ + Use dh-translations
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Use Ubuntu One SSO
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ + autoreconf for some of the above changes
+ + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+
+ -- Iain Lane <laney at debian.org> Tue, 06 Sep 2011 17:28:04 +0100
+
tomboy (1.7.6-1) experimental; urgency=low
* [e29c8c1] Imported Upstream version 1.7.6
@@@ -290,24 -129,6 +300,24 @@@
-- Iain Lane <laney at debian.org> Tue, 06 Sep 2011 17:04:32 +0100
+tomboy (1.7.4-1ubuntu1) oneiric; urgency=low
+
+ * Merge with Debian experimental, remaning changes:
+ + Use dh-translations
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Use Ubuntu One SSO
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ + autoreconf for some of the above changes
+ + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+ * [268e4a9] Update 03_u1_as_default_sync to apply against new source
+ * [26f26a0] Update gbp.conf for Ubuntu branch
+ * [c61756e] Update 06_ubuntu_sso.patch for new SyncService interface
+
+ -- Iain Lane <laney at debian.org> Tue, 23 Aug 2011 22:47:32 +0100
+
tomboy (1.7.4-1) experimental; urgency=low
* [aae3ba7] Delete debian/ltmain-as-needed.sh. Not necessary any more.
@@@ -326,21 -147,6 +336,21 @@@
-- Iain Lane <laney at debian.org> Tue, 23 Aug 2011 22:09:33 +0100
+tomboy (1.7.3-1ubuntu1) oneiric; urgency=low
+
+ * Merge with Debian experimental, remaning changes:
+ + Use dh-translations instead of manually stripping schemas
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Use Ubuntu One SSO
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ + autoreconf for some of the above changes
+ * Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+
+ -- Iain Lane <laney at debian.org> Mon, 15 Aug 2011 23:09:48 +0100
+
tomboy (1.7.3-1) experimental; urgency=low
* [25db012] Imported Upstream version 1.7.3
@@@ -350,22 -156,6 +360,22 @@@
-- Iain Lane <laney at debian.org> Mon, 15 Aug 2011 22:20:55 +0100
+tomboy (1.7.2-1ubuntu1) oneiric; urgency=low
+
+ * Merge with Debian experimental, remaning changes:
+ + Use dh-translations instead of manually stripping schema
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Use Ubuntu One SSO
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ + autoreconf for some of the above changes
+ * Refresh patches that don't apply cleanly
+ * Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+
+ -- Iain Lane <laney at debian.org> Wed, 27 Jul 2011 10:46:04 +0100
+
tomboy (1.7.2-1) experimental; urgency=low
* [6a8551d] Imported Upstream version 1.7.2
@@@ -376,20 -166,6 +386,20 @@@
-- Iain Lane <laney at debian.org> Tue, 26 Jul 2011 16:44:05 +0100
+tomboy (1.7.1-1ubuntu1) oneiric; urgency=low
+
+ * Merge with Debian experimental, remaning changes:
+ + Use dh-translations instead of manually stripping schema
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Use Ubuntu One SSO
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ + autoreconf for some of the above changes
+
+ -- Iain Lane <laney at ubuntu.com> Wed, 06 Jul 2011 10:06:49 +0100
+
tomboy (1.7.1-1) experimental; urgency=low
* [dbee52f] Imported Upstream version 1.7.1
diff --combined debian/patches/series
index d490b81,de69945..3321877
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,2 +1,7 @@@
01_dllmaps.patch
+02_sync_save_button_sensitive.patch
+03_u1_as_default_sync.patch
+04_app_indicator.patch
+05_add_start_u1_note.patch
+#06_use_ubuntu_sso.patch
20_remove_pcfile_requires
- 40_use_gmime_2.6.patch
--
Tomboy - desktop note taking program using Wiki style links
More information about the Pkg-cli-apps-commits
mailing list