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

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit 064453aa89e11b576e3b5f9c324e0a2b9fa26665
Merge: 7bfd11b97f551dc0ad27b12d7364656651806bf9 fe6332f823db84ff44fe2d6e5f7cc011aecbdcd1
Author: Iain Lane <laney at debian.org>
Date:   Tue Sep 6 17:26:09 2011 +0100

    Merge branch 'experimental' into ubuntu

diff --combined debian/changelog
index 9540b27,b367dff..a64635d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,10 +1,28 @@@
+ tomboy (1.7.6-1) experimental; urgency=low
+ 
+   * [e29c8c1] Imported Upstream version 1.7.6
+     + Translation updates
+ 
+  -- 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.
@@@ -34,21 -23,6 +41,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
@@@ -58,22 -32,6 +65,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
@@@ -84,20 -42,6 +91,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
@@@ -257,6 -201,7 +264,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