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

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d0c83f82529d0be362ac3da9c81275eb4678a28d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jul 18 18:05:03 2012 +0200

    Prepare for release: Update changelog, control and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index 059f061..680d73d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
 flumotion (0.10.0-3) unstable; urgency=low
 
-  * Updated patch to fix override internal Twisted interface.
+  [ IOhannes m zmoelnig ]
+  * Update patch to fix override internal Twisted interface.
     Closes: bug#679318. Thanks again to John Bazik.
 
- -- IOhannes m zmoelnig (gpg-key at iem) <zmoelnig at iem.at>  Fri, 29 Jun 2012 13:36:21 +0200
+  [ Jonas Smedegaard ]
+  * Update copyright file:
+    + Fix refer to versioned license in License section GPL-2+.
+    + Fix use pseudo-comment-in-license field for non-verbatim parts of
+      License sections: File format 1.0 mandates License field to either
+      be single-line or include all licensing info.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Wed, 18 Jul 2012 18:03:34 +0200
 
 flumotion (0.10.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 04b2c54..b3c761c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Loic Minier <lool at dooz.org>,
 Build-Depends: autotools-dev,
  gnulib,
  devscripts,
- python (>= 2.6.5),
+ python,
  cdbs (>= 0.4.97~),
  python-all-dev,
  debhelper,
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 020b1ec..e33ba54 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -676,6 +676,7 @@ Files: ABOUT-NLS
  debian/flumotion.rtupdate
  debian/gbp.conf
  debian/patches/assert_ssl.patch
+ debian/patches/buildflag-fixes.patch
  debian/patches/desktop-encoding-key.patch
  debian/patches/manpage-fixes.patch
  debian/patches/preserve-umask.patch
@@ -1111,13 +1112,6 @@ Copyright: 2004-2009, Fluendo, S.L
 License: UNKNOWN
  FIXME
 
-Files: intltool-merge.in
-Copyright: 2000, 2003 Free Software Foundation
-  2000-2001, Eazel, Inc
-  2000-2003, Free Software Foundation, Inc
-License: GPL
- FIXME
-
 Files: flumotion/admin/gtk/about.py
 Copyright: 2004-2009, Fluendo S.L.\n'
   2004-2009, Fluendo, S.L
@@ -1135,10 +1129,17 @@ Copyright: 2004-2009, Fluendo, S.L
 License: GPL
  FIXME
 
+Files: intltool-merge.in
+Copyright: 2000, 2003 Free Software Foundation
+  2000-2001, Eazel, Inc
+  2000-2003, Free Software Foundation, Inc
+License: GPL-2
+ FIXME
+
 Files: intltool-update.in
 Copyright: 2000-2003, Free Software Foundation
   2000-2003, Free Software Foundation, Inc
-License: GPL
+License: GPL-2
  FIXME
 
 Files: configure
@@ -1208,7 +1209,7 @@ Copyright: 1991, 1999 Free Software Foundation, Inc
   law: that is to say, a work containing the Library or a
   notices, you must include the
   the
-License: LGPL-2.1+
+License: LGPL-ever
  FIXME
 
 Files: flumotion/common/manhole.py

-- 
flumotion packaging