[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, master-devel, updated. debian/0.15.2-1-10-g823f0ef

[Iain Lane]

The following commit has been merged in the master-devel branch:
commit 823f0efd3943a4060d1913df5119d9c0d8f36d70
Merge: b9536be59211125600f5b1cef73347901c04006b 81c6827d22640dde391e1eda9674ab491e7fc511
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed Jul 15 21:08:08 2009 +0100

    Merge branch 'master' into master-devel
    
    Conflicts:
    	ChangeLog
    	NEWS
    	configure
    	configure.in
    	debian/changelog
    	debian/control
    	help/es/es.po
    	help/es/tomboy.xml
    	tomboy.spec

diff --combined debian/changelog
index b27ca8a,e606a01..ca820c3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,72 -1,10 +1,74 @@@
 +tomboy (0.15.3-1) UNRELEASED; urgency=low
 +
 +  * New upstream rersion 0.15.3:
 +   - New underline formatting add-in (disabled by default) from Mark Wakim.
 +   - Add ctrl +/- shortcuts for changing font size (Stefan Schweizer).
 +   - Fix bullet display in HTML export (Stefan Schweizer).
 +   - Update WebSync to use OAuth for authentication, and use the latest REST API.
 +   - Fix i18n issue in WebSync (Anders Petersson).
 +   - Add "Get More Add-Ins..." link in the Add-Ins tab of Preferences.
 +   - Reduce command line output when not running Tomboy with --debug.
 +   - Fix tarball for those that need panelapplet-sharp bundled.
 +   - Documentation updates (Paul Culter).
 +   - New Translations: vi
 +   - Translation updates: bn_IN, es, et, he, sv, ta, th, uk, zh_CN
 +
 + -- Iain Lane <laney at ubuntu.com>  Wed, 15 Jul 2009 19:46:45 +0100
 +
 +tomboy (0.15.2-1) experimental; urgency=low
 +
 +  * New upstream release 0.15.1:
 +   - New WebSync add-in syncs to any server that implements the Tomboy Web REST API,
 +     such as Snowy [http://live.gnome.org/Snowy].  Baby-eating preview release.
 +   - Require Mono 1.9.1 to *build* Tomboy. Should still run on older Mono.
 +   - Prevent PATH problems on Windows from breaking Tomboy.
 +   - Search for phrases by quoting search text.
 +   - Fix drag&drop & middle-click paste of linked text.
 +   - Save width of notebook pane in Search window.
 +   - Disable sync menu items until backend configured.
 +   - Close note find bar on escape, even when not focused.
 +   - Support FUSE being built-in to kernel.
 +   - Prevent crashes when reading unexpected note XML.
 +   - Change "Open New Note Template" LinkButton to Button to prevent error.
 +   - Focus search field every time Search window summoned.
 +   - Only show Start Here note on first run if not running as applet.
 +   - HIG compliance in Sync preferences.
 +   - Use correct "info" icon in add-in info windows.
 +   - Use relative path to load help.
 +   - Cache frequently-used text tags in one place instead of five.
 +   - Documentation updates.
 +   - Translation updates: el, es, et, gl
 +  * New upstream release 0.15.2:
 +   - Fix HTML Export on Mac OS X.
 +   - Translation updates: es, et, nb, sv, zh_CN
 +  * debian/control: Add help/ as GFDL 1.1+ 
 +  * debian/rules: Remove --repack; not necessary as upstream is a .tar.gz and
 +    could cause rule to be nondeterministic
 +
 + -- Iain Lane <laney at ubuntu.com>  Mon, 01 Jun 2009 22:08:22 +0100
 +
 +tomboy (0.15.0-0ubuntu1) karmic; urgency=low
 +
 +  * New upstream release
 +  * debian/rules:
 +    + Add get-orig-source rule
 +  * debian/watch:
 +    + Do not run "uupdate" as it does not permit preparing Debian
 +      revision on Ubuntu
 +  * debian/patches/02_configurable_compiler.patch:
 +    + Deleted, merged upstream
 +  * debian/patches/03_03_sm-name.patch:
 +    + Deleted, no longer relevant
 +
 + -- Jo Shields <directhex at apebox.org>  Wed, 06 May 2009 23:37:55 +0100
 +
- tomboy (0.14.2-3) UNRELEASED; urgency=low
+ tomboy (0.14.3-1) unstable; urgency=low
  
    [ Stefan Ebner ]
    * Replace the tomboy icon misery with a proper method:
-     + debian/control: Replace b-p on shareutils with imagemagick.
+     + debian/control: 
+       - Replace b-p on shareutils with imagemagick.
+       - Bump Standards-Version to 3.8.2
      + debian/rules: Convert the icons at build time.
      + Delete tomboy.dirs and tomboy-{16/32}.xpm.uu.
      + Add debian/tomboy.install to install the generated icons properly.
@@@ -75,8 -13,13 +77,13 @@@
    [ Iain Lane ]
    * debian/rules: Remove --repack; not necessary as upstream is a .tar.gz
      and this could cause rule to be nondeterministic
+   * Update watch file to scan for stable releases only 
+   * New upstrem release 0.14.3
+     - Fix build for those with gnome-sharp < 2.23.90 (Stefan Schweizer).
+     - Fix HTML Export add-in on Mac OS X.
+     - Translation updates: el, es
  
-  -- Stefan Ebner <sebner at ubuntu.com>  Sat, 13 Jun 2009 18:24:29 +0200
+  -- Iain Lane <laney at ubuntu.com>  Mon, 13 Jul 2009 18:32:54 +0100
  
  tomboy (0.14.2-2) unstable; urgency=low
  

-- 
Tomboy - desktop note taking program using Wiki style links