[SCM] frei0r/master: Regenerated debian/(control|copyright_hints)

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1e7ea0b6deba371d3b4d0971468cbb46f84029c2
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed May 21 10:11:55 2014 +0200

    Regenerated debian/(control|copyright_hints)

diff --git a/debian/control b/debian/control
index 34dbb6e..96aaf76 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>,
  IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>
-Vcs-Git: git://git.debian.org/git/pkg-multimedia/frei0r
+Vcs-Git: git://anonscm.debian.org/pkg-multimedia/frei0r
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/frei0r.git
 Homepage: http://www.piksel.org/frei0r
 Build-Depends: pkg-config,
@@ -21,11 +21,10 @@ Build-Depends-Indep: doxygen
 Standards-Version: 3.9.5
 
 Package: frei0r-plugins
-Section: video
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Conflicts: frei0r (<= 1.1.22)
+Breaks: frei0r (<= 1.1.22)
 Replaces: frei0r
 Description: minimalistic plugin API for video effects, plugins collection
  frei0r is a minimalistic plugin API for video sources and filters. The
@@ -43,7 +42,7 @@ Package: frei0r-plugins-dev
 Section: devel
 Architecture: any
 Depends: ${misc:Depends}
-Conflicts: frei0r-dev (<= 1.1.22)
+Breaks: frei0r-dev (<= 1.1.22)
 Replaces: frei0r-dev
 Description: minimalistic plugin API for video effects, header files
  frei0r is a minimalistic plugin API for video sources and filters. The
@@ -62,7 +61,7 @@ Package: frei0r-plugins-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: frei0r-doc (<= 1.1.22)
+Breaks: frei0r-doc (<= 1.1.22)
 Replaces: frei0r-doc
 Description: minimalistic plugin API for video effects, API documentation
  frei0r is a minimalistic plugin API for video sources and filters. The
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 6f86268..8cb57df 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -7,6 +7,7 @@ Disclaimer: Autogenerated by CDBS
 Files: AUTHORS
  CMakeLists.txt
  ChangeLog
+ INSTALL
  NEWS
  README
  TODO
@@ -33,6 +34,7 @@ Files: AUTHORS
  debian/patches/020140427~fc84121.patch
  debian/patches/1-AM_INIT_AUTOMAKE.patch
  debian/patches/1-build-doc.patch
+ debian/patches/1-fix-spelling.patch
  debian/patches/README
  debian/patches/series
  debian/rules
@@ -456,6 +458,15 @@ Copyright: 2006, Jerry Huxtable
 License: GPL-2+
  FIXME
 
+Files: Makefile.in
+ doc/Makefile.in
+ include/Makefile.in
+ src/Makefile.in
+Copyright: 1994-2012, Free Software Foundation, Inc
+  2007, Richard Spindler <richard.spindler AT gmail.com>
+License: UNKNOWN
+ FIXME
+
 Files: Makefile.am
  doc/Makefile.am
  include/Makefile.am
@@ -496,6 +507,13 @@ Copyright: 1992-1999
 License: GPL GPL-3
  FIXME
 
+Files: depcomp
+ missing
+Copyright: 1996-2013, Free Software Foundation, Inc
+  1999-2013, Free Software Foundation, Inc
+License: GPL-2+
+ FIXME
+
 Files: include/blur.h
  src/filter/squareblur/squareblur.c
 Copyright: 2004--2005, Mathieu Guindon
@@ -519,6 +537,27 @@ Copyright: 1994, X Consortium
 License: Expat
  FIXME
 
+Files: configure
+Copyright: (ISLOWER ? 'A' + ( - 'a') : )
+  (ISLOWER ? ( | 0x40) : )
+  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
+  2011, Free Software Foundation, Inc
+License: GPL-2+
+ FIXME
+
+Files: ltmain.sh
+Copyright: 1996-2001, 2003-2006,
+  all begin with the string "--lt-"
+License: GPL-2+
+ FIXME
+
 Files: src/filter/vectorscope/vectorscope.c
 Copyright: 2008, Albert Frisch (albert.frisch AT gmail.com)
   2008, Richard Spindler (richard.spindler AT gmail.com)
@@ -542,6 +581,21 @@ Copyright: 2004-2005, Pawel T. Jochym <Jochym jochym at ifj edu pl>
 License: GPL-2+
  FIXME
 
+Files: aclocal.m4
+Copyright: 1996-2012, Free Software Foundation, Inc
+  1996-2013, Free Software Foundation, Inc
+  1997-2013, Free Software Foundation, Inc
+  1999-2013, Free Software Foundation, Inc
+  2001-2013, Free Software Foundation, Inc
+  2002-2013, Free Software Foundation, Inc
+  2003-2013, Free Software Foundation, Inc
+  2004, Scott James Remnant <scott at netsplit.com>
+  2004-2013, Free Software Foundation, Inc
+  2006-2013, Free Software Foundation, Inc
+  2009-2013, Free Software Foundation, Inc
+License: GPL-2+
+ FIXME
+
 Files: src/filter/colorize/colorize.c
 Copyright: 1995, Spencer Kimball and Peter Mattis
   2007, Michael Natterer

-- 
frei0r packaging