[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, ubuntu, updated. debian/1.11.1-1ubuntu1
Iain Lane
laney at debian.org
Thu May 3 22:55:51 UTC 2012
The following commit has been merged in the ubuntu branch:
commit 56f02f7de4f1236aa138519edc71f58e7faf03bb
Merge: 5683d84d4b54750d43b6ac49b67d3ce4142411ce 3d60fcc1a5a3957b31aecb31d28c3ab9d598b856
Author: Iain Lane <laney at debian.org>
Date: Thu May 3 21:11:56 2012 +0100
Merge tag 'debian/1.11.1-1' into ubuntu
Debian release 1.11.1-1
diff --combined debian/changelog
index 7e4284f,7e7f53f..a360995
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,14 +1,35 @@@
+ tomboy (1.11.1-1) experimental; urgency=low
+
+ * [decde44] gbp.conf back to exp branches
+ * [4e4e74f] Imported Upstream version 1.11.1
+ - Allow cmdline args to be passed to add-ins
+ - Fix for multi-monitor configurations and notes off the screen
+ - Fix Typo in manpage '---note-path'
+ - Fix for RemoveBrokenLinks-with-search
+
+ -- 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
@@@ -35,12 -25,6 +46,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
@@@ -60,52 -44,6 +71,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
@@@ -152,48 -90,6 +163,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
@@@ -204,21 -100,6 +215,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
@@@ -226,24 -107,6 +237,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.
@@@ -262,21 -125,6 +273,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
@@@ -286,22 -134,6 +297,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
@@@ -312,20 -144,6 +323,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 d2fb56a,948c11d..1d4c744
--- a/debian/control
+++ b/debian/control
@@@ -1,18 -1,16 +1,18 @@@
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),
dh-autoreconf,
- dh-translations,
gnome-common,
intltool,
pngquant,
mono-devel (>= 2.4.3),
+ libgconf2-dev,
libgtk2.0-cil-dev (>= 2.10.4),
+ libgconf2-dev,
libgconf2.0-cil-dev (>= 2.24),
libgtkspell-dev (>= 2.0.9),
cli-common-dev (>= 0.5.7),
@@@ -26,8 -24,6 +26,8 @@@
libdbus-glib1.0-cil-dev (>= 0.3),
libmono-addins-cil-dev (>= 0.3),
libmono-addins-gui-cil-dev (>= 0.3),
+ liblaunchpad-integration-cil-dev,
+ libappindicator0.1-cil-dev (>= 0.4.90),
libproxy-dev
Standards-Version: 3.9.3
Homepage: http://www.gnome.org/projects/tomboy/
diff --combined debian/patches/series
index 51b2a89,3d4256a..fcf30f4
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,11 -1,4 +1,10 @@@
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
+11_lpi.patch
20_remove_pcfile_requires
30_fix_manpage_syntax
- 31_prevent_inadvertent_deletion_of_notes.patch
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