[SCM] flumotion/master: Regenerated debian/{control,copyright_hints}

zmoelnig-guest at users.alioth.debian.org zmoelnig-guest at users.alioth.debian.org
Fri Jan 31 16:28:03 UTC 2014 

The following commit has been merged in the master branch:
commit 326a14011ad7d9b50d13f47e77560854abe425cf
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Fri Jan 31 17:23:04 2014 +0100

    Regenerated debian/{control,copyright_hints}

diff --git a/debian/control b/debian/control
index b3c761c..7b3d19b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Loic Minier <lool at dooz.org>,
  Marc-André Lureau <mlureau at flumotion.com>,
- IOhannes m zmoelnig (gpg-key at iem) <zmoelnig at iem.at>,
+ IOhannes m zmölnig <zmoelnig at iem.at>,
  Jonas Smedegaard <dr at jones.dk>
-Build-Depends: autotools-dev,
+Build-Depends: cdbs (>= 0.4.97~),
+ autotools-dev,
  gnulib,
  devscripts,
  python,
- cdbs (>= 0.4.97~),
  python-all-dev,
  debhelper,
  dh-buildinfo,
@@ -22,7 +22,7 @@ Build-Depends: autotools-dev,
                python-rrdtool,
                python-gst0.10,
                libgstreamer-plugins-base0.10-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Homepage: http://flumotion.net/
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/flumotion
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/flumotion.git
@@ -50,7 +50,9 @@ Depends: ${python:Depends},
          gstreamer0.10-plugins-good,
          gstreamer0.10-schroedinger,
          gstreamer0.10-ffmpeg
-Recommends: python-gnome2
+Recommends: python-gnome2,
+         gstreamer0.10-alsa [linux-any]
+Suggests: sudo
 Description: Fluendo Streaming Server - manager, worker and admin
  Flumotion is a modern streaming media server built with a modular
  distributed design. This gives you unprecedented stability and
diff --git a/debian/copyright_hints b/debian/copyright_hints
index e33ba54..710c95c 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -662,6 +662,7 @@ Files: ABOUT-NLS
  data/upgrade-to-0.5.3.xsl
  data/upgrade-to-0.6.0.xsl
  debian/README.Debian
+ debian/README.source
  debian/TODO.Debian
  debian/compat
  debian/default.xml
@@ -675,13 +676,11 @@ Files: ABOUT-NLS
  debian/flumotion.postrm
  debian/flumotion.rtupdate
  debian/gbp.conf
- debian/patches/assert_ssl.patch
- debian/patches/buildflag-fixes.patch
  debian/patches/desktop-encoding-key.patch
+ debian/patches/fix_autoreconf.patch
  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
@@ -937,8 +936,7 @@ Copyright: *No copyright*
 License: UNKNOWN
  FIXME
 
-Files: INSTALL
- Makefile.in
+Files: Makefile.in
  bin/Makefile.in
  common/Makefile.in
  conf/Makefile.in
@@ -1042,8 +1040,7 @@ Files: INSTALL
  pkgconfig/Makefile.in
  tests/Makefile.in
  tests/integration/Makefile.in
-Copyright: 1994-1996, 1999-2002, 2004-2005
-  1994-2002
+Copyright: 1994-2002
 License: UNKNOWN
  FIXME
 
@@ -1068,10 +1065,14 @@ License: UNKNOWN
 
 Files: config.guess
  config.sub
+ depcomp
  missing
 Copyright: 1992-1999
+  1992-1999,
+  1992-2000
   1992-2000,
   1996-1997, 1999-2000, 2002-2006
+  1999-2000, 2003-2007, 2009-2010
 License: GPL-2+
  FIXME
 
@@ -1112,6 +1113,30 @@ Copyright: 2004-2009, Fluendo, S.L
 License: UNKNOWN
  FIXME
 
+Files: INSTALL
+ m4/ltoptions.m4
+Copyright: 1994-1996, 1999-2002, 2004-2011, Free Software Foundation
+  2004-2005, 2007-2009, Free Software Foundation
+License: UNKNOWN
+ FIXME
+
+Files: flumotion/common/manhole.py
+Copyright: 2001-2007, Paul
+  2004-2009, Fluendo, S.L
+  2010-2011, Flumotion Services, S.A
+License: Expat
+ FIXME
+
+Files: common/pep8.py
+Copyright: 2006, Johann C. Rocholl <johann at browsershots.org>
+License: Expat
+ FIXME
+
+Files: install-sh
+Copyright: 1994, X Consortium
+License: Expat
+ FIXME
+
 Files: flumotion/admin/gtk/about.py
 Copyright: 2004-2009, Fluendo S.L.\n'
   2004-2009, Fluendo, S.L
@@ -1145,15 +1170,15 @@ License: GPL-2
 Files: configure
 Copyright: (ISLOWER ? 'A' + ( - 'a') : )
   (ISLOWER ? ( | 0x40) : )
-  1992-1996, 1998-2001,
-  1996-2001, 2003-2005
-  2010, Free Software Foundation, Inc
+  1992-1996, 1998-2012, Free Software Foundation, Inc
+  1996-2001, 2003-2005,
+  2012, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
 Files: m4/libtool.m4
 Copyright: 1996-2001, 2003-2005
-  2010, Free Software Foundation, Inc
+  2011, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
@@ -1168,13 +1193,8 @@ Copyright: 2001, Eazel, Inc
 License: GPL-2+
  FIXME
 
-Files: depcomp
-Copyright: 1999-2000, 2003-2007, 2009 Free
-License: GPL-2+
- FIXME
-
 Files: py-compile
-Copyright: 2000-2001, 2003-2005, 2008-2009, Free Software
+Copyright: 2000-2001, 2003-2005, 2008-2009, 2011 Free
 License: GPL-2+
  FIXME
 
@@ -1200,37 +1220,13 @@ License: LGPL-2+
 Files: LICENSE.LGPL
 Copyright: 1991, 1999 Free Software Foundation, Inc
   <year> <name of author>
-  HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-  HOLDERS AND/OR
   disclaimer" for the library, if
-  holder or
-  holder who places the Library under this License may add
   interest in the
   law: that is to say, a work containing the Library or a
-  notices, you must include the
   the
 License: LGPL-ever
  FIXME
 
-Files: flumotion/common/manhole.py
-Copyright: 2001-2007, Paul
-  2004-2009, Fluendo, S.L
-  2010-2011, Flumotion Services, S.A
-  HOLDERS BE
-License: MIT/X11 (BSD like)
- FIXME
-
-Files: common/pep8.py
-Copyright: 2006, Johann C. Rocholl <johann at browsershots.org>
-  HOLDERS
-License: MIT/X11 (BSD like)
- FIXME
-
-Files: install-sh
-Copyright: 1994, X Consortium
-License: MIT/X11 (BSD like)
- FIXME
-
 Files: aclocal.m4
 Copyright: 1996-1997, 2000-2001, 2003, 2005, 2008
   1996-2004,
@@ -1239,21 +1235,20 @@ Copyright: 1996-1997, 2000-2001, 2003, 2005, 2008
   1999-2005, 2008
   1999-2005, 2008-2009,
   1999-2006, 2009
-  2001, 2003, 2005, 2008 Free Software Foundation, Inc
-  2001, 2003, 2005, Free Software Foundation, Inc
-  2001-2003, 2005, 2008, Free Software Foundation, Inc
+  2001, 2003, 2005, 2008, 2011, Free Software Foundation
+  2001, 2003, 2005, 2011 Free Software Foundation, Inc
+  2001-2003, 2005, 2008, 2010 Free Software
   2001-2003, 2005, 2009, Free Software Foundation, Inc
-  2002-2003, 2005-2008, Free Software Foundation, Inc
+  2002-2003, 2005-2008, 2011 Free Software
   2003, 2005 Free Software Foundation, Inc
-  2003-2006, Free Software Foundation, Inc
-  2004-2005, Free Software Foundation, Inc
-  2006, 2008 Free Software Foundation, Inc
+  2003-2006, 2011 Free Software Foundation
+  2004-2005, 2012 Free Software Foundation, Inc
+  2006, 2008, 2010, Free Software Foundation, Inc
 License: UNKNOWN
  FIXME
 
 Files: flumotion/extern/unixcrypt.py
 Copyright: & 0x3f
-  << 1, plaintext)
 License: UNKNOWN
  FIXME
 
@@ -1379,15 +1374,17 @@ Copyright: 2004-2009, Fluendo, S.L
 License: UNKNOWN
  FIXME
 
-Files: flumotion/common/boot.py
+Files: flumotion/manager/base.py
 Copyright: 2004-2009, Fluendo, S.L
   2010-2011, Flumotion Services, S.A
-  import version
+  for c in classes
 License: UNKNOWN
  FIXME
 
-Files: m4/ltoptions.m4
-Copyright: 2004-2005, 2007-2009, Free Software Foundation
+Files: flumotion/common/boot.py
+Copyright: 2004-2009, Fluendo, S.L
+  2010-2011, Flumotion Services, S.A
+  import version
 License: UNKNOWN
  FIXME
 
@@ -1415,16 +1412,8 @@ Copyright: 1995-1997, Ulrich Drepper <drepper at gnu.ai.mit.edu>
 License: UNKNOWN
  FIXME
 
-Files: flumotion/manager/base.py
-Copyright: for c in classes
-License: UNKNOWN
- FIXME
-
 Files: po/Makevars
 Copyright: for their translations to this person
-  holder of the package.) Translators are
-  holder of the surrounding
-  holder that gets inserted into the header of the
 License: UNKNOWN
  FIXME
 

-- 
flumotion packaging

More information about the pkg-multimedia-commits mailing list