[SCM] flumotion/master: Prepare for release: Update changelog and copyright hints.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c3b026a7b91a1aa8fbe0e56a2fb8af85eb395cdb
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu May 31 12:56:20 2012 +0200

    Prepare for release: Update changelog and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index 6f91582..56f0bd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+flumotion (0.10.0-2) unstable; urgency=low
+
+  * Add patch to fix override internal Twisted interface.
+    Closes: bug#672404. Thanks to John Bazik.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Thu, 31 May 2012 12:55:48 +0200
+
 flumotion (0.10.0-1) unstable; urgency=low
 
   * New upstream release. (Closes: #602828)
diff --git a/debian/copyright_hints b/debian/copyright_hints
index beca87f..020b1ec 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -680,6 +680,7 @@ Files: ABOUT-NLS
  debian/patches/manpage-fixes.patch
  debian/patches/preserve-umask.patch
  debian/patches/series
+ debian/patches/twisted_override.patch
  debian/planet.xml
  debian/source/format
  debian/watch

-- 
flumotion packaging