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

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit b9bb704925c94ea7e09eccf1b8aa33d79f969da2
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Thu Feb 16 08:42:56 2012 +0100

    Imported Debian patch 1.9.5-1ubuntu2

diff --git a/debian/changelog b/debian/changelog
index 657a597..a2f958e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 821625e..a716ccb 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
 debian-branch = ubuntu
-upstream-branch = upstream
+upstream-branch = upstream-experimental
 compression = xz
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches

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