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

[Jo Shields]

The following commit has been merged in the master branch:
commit c5b3010beaacfc9deb6166e17a4856e34d910e42
Merge: 875cebeea696defa03ccb346078e5ad780355d45 c87a2bf4a6a545ec3f11b3a7f3ea0282153ce77b
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Oct 2 21:49:27 2009 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-cli-apps/packages/tomboy

diff --combined debian/changelog
index cb781af,1c2312b..3437fe8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,16 @@@
 -tomboy (1.0.0-2) UNRELEASED; urgency=low
 +tomboy (1.0.0-2) unstable; urgency=low
  
+   [ Iain Lane ]
    * debian/rules: Update the translation template after the build, doesn't
      affect Debian but is required for Ubuntu. Reduces the delta.
  
-  -- Iain Lane <laney at ubuntu.com>  Wed, 30 Sep 2009 21:06:20 +0100
+   [ Stefan Ebner ]
+   * debian/rules:
+     + Directly convert and install the icon
+     + Remove debian/clean
+     + Remove debian/tomboy.install
+ 
+  -- Stefan Ebner <sebner at ubuntu.com>  Fri, 02 Oct 2009 22:46:01 +0200
  
  tomboy (1.0.0-1) unstable; urgency=low
  

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