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

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit 9aeb677f7c154a47202233a13899e65795f39e91
Merge: f33e381b8dc8a588774cffd7033c120a8d36635f 120d70b9bfc31758495f56b6bc315ec84fa9d06d
Author: Iain Lane <laney at debian.org>
Date:   Mon Sep 26 23:29:01 2011 +0100

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/gbp.conf

diff --combined debian/changelog
index 0ab741e,433d6f9..435f913
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,13 +1,28 @@@
+ tomboy (1.8.0-1) unstable; urgency=low
+ 
+   * Upload to unstable
+   * [74507b7] Imported Upstream stable version 1.8.0
+     + Translation Updates
+   * [9ccc75f] Remove merge conflict marker in debian/changelog
+   * [d583cfa] Change branches in gbp.conf to unstable
+ 
+  -- 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
@@@ -20,24 -15,6 +30,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.
@@@ -56,21 -33,6 +66,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
@@@ -80,22 -42,6 +90,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
@@@ -106,20 -52,6 +116,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/gbp.conf
index a5d64c4,d51eb67..0af4a0d
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,4 -1,4 +1,4 @@@
  [DEFAULT]
 -debian-branch = master
 +debian-branch = ubuntu
- upstream-branch = upstream-experimental
+ upstream-branch = upstream
  compression = bzip2

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