[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, ubuntu, updated. debian/1.12.0-1ubuntu1-20-g2c0dee1
Iain Lane
laney at debian.org
Sun Jun 9 19:16:08 UTC 2013
The following commit has been merged in the ubuntu branch:
commit 35351cb583bdd4a819a7074b1a8654e17dab03fa
Merge: 4ac400ed6dae7620078275d400959ffb156ed8a4 b605be7c9db11ea2d4e313a3dc86ee724cfadbb8
Author: Iain Lane <laney at debian.org>
Date: Sun Jun 9 19:48:28 2013 +0100
Merge branch 'experimental' into ubuntu
diff --combined debian/changelog
index a09e78d,41487b1..8cebe27
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,29 +1,51 @@@
+ tomboy (1.15.2-1) experimental; urgency=low
+
+ * [91d5baf] Track unstable versions
+ * [6aa1bf6] Imported Upstream version 1.15.2
+ + Center Preferences and About window on screen
+ + Compatibility fix for Rainy
+ + Fix HTML export with colon
+ + Add preference for startup notes
+
+ -- Iain Lane <laney at debian.org> Sun, 09 Jun 2013 19:35:47 +0100
+
+ tomboy (1.14.1-1) unstable; urgency=low
+
+ * [5449ff8] debian/watch: Use GNOME ftp and track stable releases only
+ * [b0bcc4b] Imported Upstream version 1.14.1
+ + Improve note naming conflict dialog on sync
+ + Fix behavior of max. notes in tray preference
+ + Improved logic for window placement
+ + Update screenshots and links in docs
+ + Add missing documentation
+ + Accept command line args when Tomboy is running
+ + Preferences dialog should not be modal
+ * [a82a4c4] Bump S-V to 3.9.4; BD on debhelper >= 8.1.0 accordingly
+
+ -- Iain Lane <laney at debian.org> Sun, 09 Jun 2013 19:12:48 +0100
+
+tomboy (1.12.0-1ubuntu2) raring; urgency=low
+
+ * debian/patches/02_sync_save_button_sensitive.patch:
+ * debian/patches/03_u1_as_default_sync.patch:
+ * debian/patches/05_add_start_u1_note.patch:
+ * debian/patches/06_use_ubuntu_sso.patch:
+ - Remove patches to default to Ubuntu One for notes sync. (LP: #1115460)
+
+ -- Rodney Dawes <rodney.dawes at ubuntu.com> Mon, 04 Feb 2013 13:11:52 -0500
+
+tomboy (1.12.0-1ubuntu1) quantal; urgency=low
+
+ * Rebase on Debian experimental, 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
+
+ -- Iain Lane <laney at debian.org> Tue, 25 Sep 2012 11:01:34 +0100
+
tomboy (1.12.0-1) experimental; urgency=low
* [9c1e942] Compress deb data member with xz (Closes: #688706)
@@@ -28,18 -32,6 +54,18 @@@
-- Iain Lane <laney at debian.org> Tue, 25 Sep 2012 10:40:40 +0100
+tomboy (1.11.5-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
+
+ -- Iain Lane <laney at debian.org> Mon, 06 Aug 2012 18:13:55 +0100
+
tomboy (1.11.5-1) experimental; urgency=low
* [b67c86c] Imported Upstream version 1.11.5
@@@ -50,22 -42,6 +76,22 @@@
-- 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
@@@ -78,31 -54,6 +104,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
@@@ -114,33 -65,12 +140,33 @@@
-- 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-2) unstable; urgency=low
* [9c1e942] Compress deb data member with xz (Closes: #688706)
-- Iain Lane <laney at debian.org> Tue, 25 Sep 2012 09:56:42 +0100
+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
@@@ -157,12 -87,6 +183,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
@@@ -182,52 -106,6 +208,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
@@@ -274,48 -152,6 +300,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
@@@ -326,21 -162,6 +352,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
@@@ -348,24 -169,6 +374,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.
@@@ -384,21 -187,6 +410,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
@@@ -408,22 -196,6 +434,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
@@@ -434,20 -206,6 +460,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/control
index 3fb83dd,80fa921..e9f1abc
--- a/debian/control
+++ b/debian/control
@@@ -1,10 -1,9 +1,10 @@@
Source: tomboy
Section: gnome
Priority: optional
-Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Uploaders: Sebastian Dröge <slomo at debian.org>, Iain Lane <laney at debian.org>
- Build-Depends: debhelper (>= 7.0.50),
+ Build-Depends: debhelper (>= 8.1.0),
dh-autoreconf,
gnome-common,
intltool,
@@@ -25,9 -24,8 +25,9 @@@
libdbus-glib1.0-cil-dev (>= 0.3),
libmono-addins-cil-dev (>= 0.3),
libmono-addins-gui-cil-dev (>= 0.3),
+ libappindicator0.1-cil-dev (>= 0.4.90),
libproxy-dev
- Standards-Version: 3.9.3
+ Standards-Version: 3.9.4
Homepage: http://www.gnome.org/projects/tomboy/
Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/tomboy.git
Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/tomboy.git
--
Tomboy - desktop note taking program using Wiki style links
More information about the Pkg-cli-apps-commits
mailing list