[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. debian/0.9.5.9+git20110512-1-5-g321ba0a

[Timo Jyrinki]

The following commit has been merged in the debian branch:
commit 321ba0a194c757363547894e82085f4195e89911
Author: Timo Jyrinki <timo at debian.org>
Date:   Thu Oct 20 15:39:18 2011 +0000

    Restore uploaded -1 changelog entry, git history apparently overwritten.

diff --git a/debian/changelog b/debian/changelog
index 3c4753a..7c8b351 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ fso-frameworkd (0.9.5.9+git20110512-2) unstable; urgency=low
 
 fso-frameworkd (0.9.5.9+git20110512-1) unstable; urgency=low
 
+  [ Timo Jyrinki ]
+  * Add conflicts between fso-frameworkd-gta01 <-> gta02
+
+  [ Rico Rommel ]
   * new upstrem release
   * fixed lintian warnings
   * new package fso-frameworkd-gta01

-- 
FSO frameworkd Debian packaging