[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, ubuntu, updated. debian/1.7.3-1ubuntu1-8-g7bfd11b

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit 470a474f98f758b1f1aa53232430bf39cbb4a935
Merge: d22a3187129c9e3017a73a6b9ba6570d50a05cca 600f4dbb95f0b673125573fe6e4835f39b850332
Author: Iain Lane <laney at debian.org>
Date:   Tue Aug 23 22:46:32 2011 +0100

    Merge branch 'experimental' into ubuntu

diff --combined debian/changelog
index dd57bae,5b5543e..a9ccd7a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,21 +1,36 @@@
+ tomboy (1.7.4-1) experimental; urgency=low
+ 
+   * [aae3ba7] Delete debian/ltmain-as-needed.sh. Not necessary any more.
+   * [d4687c3] Remove Ubuntu customisation from debian/rules; done differently now
+   * [6e75a5b] Imported Upstream version 1.7.4
+     + Name note being deleted in confirmation dialog
+     + Autolinking notes should not update modification time
+     + Fix translation string in Export All Notes Addin
+     + Don't create nested links
+     + Save button in Sync Preferences should be insensitive until fields a
+       filled
+     + Tune down autosync frequency
+     + Keep selection after Notebook rename
+     + Allow renaming of template notes
+     + Improve template note functionality
+ 
+  -- 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
@@@ -22,22 -25,6 +40,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
@@@ -48,20 -35,6 +66,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
@@@ -221,6 -194,7 +239,6 @@@ tomboy (1.3.1-1) experimental; urgency=
    * [2fe5306] Increase Standards-Version to 3.9.0, no changes required
  
   -- Iain Lane <laney at ubuntu.com>  Sun, 04 Jul 2010 19:07:59 +0100
 ->>>>>>> master-devel
  
  tomboy (1.2.1-1) unstable; urgency=low
  

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