[SCM] ices2/master: Update d/copyright and d/copyright_hits.

Wed Oct 29 04:18:38 UTC 2014

The following commit has been merged in the master branch:
commit 172872df9d6e030b6b6e7fc3f53126a674924757
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Tue Oct 28 19:36:00 2014 -0400

    Update d/copyright and d/copyright_hits.

diff --git a/debian/copyright b/debian/copyright
index 1d82ed8..a18fcd4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,7 +20,7 @@ Files: compile
  depcomp
  ltmain.sh
  missing
-Copyright: 1996-2003, Free Software Foundation, Inc
+Copyright: 1996-2005, Free Software Foundation, Inc
 License: GPL-2+ with Autoconf exception
  As a special exception to the GNU General Public License, if you
  distribute this file as part of a program that contains a configuration
@@ -36,11 +36,11 @@ Copyright: 1995-1997, Sam Rushing <rushing at nightmare.com>
 License: MIT~Rushing
 
 Files: configure
-Copyright:  1996-2001, 2003, Free Software Foundation, Inc
+Copyright:  1996-2001, 2006, Free Software Foundation, Inc
 License: GAP~configure
 
 Files: aclocal.m4
-Copyright: 1996-2002, Free Software Foundation, Inc
+Copyright: 1996-2005, Free Software Foundation, Inc
 License: GAP
 
 Files: src/resample.h
@@ -51,7 +51,7 @@ License: LGPL-2
  (LICENCE.LGPL).
 
 Files: install-sh
-Copyright: 1991, the Massachusetts Institute of Technology
+Copyright: 1994, the Massachusetts Institute of Technology
 License: MIT
 
 Files: debian/*
@@ -59,12 +59,6 @@ Copyright: 2003, Keegan Quinn <ice at thebasement.org>
  2004-2008,2011-2012, Jonas Smedegaard <dr at jones.dk>
 License: GPL-2+
 
-Files: debian/patches/0*
-Copyright: 2001-2002, Michael Smith <msmith at xiph.org>
-  2001-2004, The IceS Development Team <team at icecast.org>
-  2009-2012, Philipp Schafft <lion at lion.leolix.org>
-License: GPL-2
-
 License: GPL-2
  This program is distributed under the terms of the GNU General Public
  License, version 2. You may use, modify, and redistribute it under the
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 9c8514e..567b728 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -15,8 +15,8 @@ Files: AUTHORS
  conf/ices-roar.xml
  config.h.in
  configure.in
- contrib/run_ices
  debian/README.Debian
+ debian/README.source
  debian/compat
  debian/control
  debian/control.in
@@ -27,8 +27,7 @@ Files: AUTHORS
  debian/ices2.docs
  debian/patches/1001_allow_repeat.patch
  debian/patches/1002_fix_OSS-ALSA_confusion_in_comments.patch
- debian/patches/1003_no_Makefile_in_debian_subdir.patch
- debian/patches/1004_explicit_ogg_link.patch
+ debian/patches/1003_explicit_ogg_link.patch
  debian/patches/README
  debian/patches/series
  debian/source/format
@@ -47,7 +46,6 @@ Files: AUTHORS
  m4/vorbis.m4
  m4/xiph_compiler.m4
  m4/xiph_xml2.m4
- mkinstalldirs
  src/Makefile.am
  src/avl/BUILDING
  src/avl/Makefile.am
@@ -76,8 +74,6 @@ License: UNKNOWN
 
 Files: src/audio.c
  src/audio.h
- src/cfgparse.c
- src/cfgparse.h
  src/encode.c
  src/encode.h
  src/event.h
@@ -108,7 +104,7 @@ Files: src/audio.c
  src/stream.h
  src/stream_shared.c
  src/stream_shared.h
-Copyright: 2001, Michael Smith <msmith at labyrinth.net.au>
+Copyright: 2001, Michael Smith <msmith at xiph.org>
 License: GPL-2
  FIXME
 
@@ -124,22 +120,14 @@ Copyright: 1994-2002
 License: UNKNOWN
  FIXME
 
-Files: src/output.c
- src/process.c
- src/process.h
- src/registry.h
- src/savefile.c
- src/stream_rewrite.c
-Copyright: 2001, Michael Smith <msmith at xiph.org>
-  2001-2002, Michael Smith <msmith at xiph.org>
-License: GPL-2
- FIXME
-
-Files: compile
- depcomp
+Files: config.guess
+ config.sub
  missing
-Copyright: 1996-1997, 1999-2000, 2002 Free Software Foundation, Inc
-  1999-2000, Free Software Foundation, Inc
+Copyright: 1992-1999
+  1992-1999,
+  1992-2005
+  1992-2005,
+  1996-1997, 1999-2000, 2002-2005
 License: GPL-2+
  FIXME
 
@@ -148,29 +136,29 @@ Files: src/avl/COPYING
  src/timing/COPYING
 Copyright: 1991, 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 other authorized
-  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
 License: LGPL-ever
  FIXME
 
+Files: src/cfgparse.c
+ src/cfgparse.h
+Copyright: 2001, Michael Smith <msmith at xiph.org>
+  2006, Eric Faurot
+License: GPL-2
+ FIXME
+
 Files: src/im_roar.c
  src/im_roar.h
 Copyright: 2001, Michael Smith <msmith at labyrinth.net.au>
-  2009, Philipp Schafft <lion at lion.leolix.org>
   2009-2012, Philipp Schafft <lion at lion.leolix.org>
 License: GPL-2
  FIXME
 
-Files: config.guess
- config.sub
-Copyright: 1992-1999,
-  1992-2001
+Files: compile
+ depcomp
+Copyright: 1999-2000, 2003-2005, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
@@ -187,17 +175,13 @@ Copyright: 1995, Sam Rushing <rushing at nightmare.com>
 License: UNKNOWN
  FIXME
 
-Files: debian/patches/0001_sync_upstream_VCS.patch
-Copyright: 2001, Michael Smith <msmith at labyrinth.net.au>
-  2001, Michael Smith <msmith at xiph.org>
-  2001-2002, Michael Smith <msmith at xiph.org>
-  2009, Philipp Schafft <lion at lion.leolix.org>
-  2009-2012, Philipp Schafft <lion at lion.leolix.org>
-License: GPL-2
+Files: install-sh
+Copyright: 1994, X Consortium
+License: Expat
  FIXME
 
 Files: src/ices.c
-Copyright: 2001-2002, Michael Smith <msmith at labyrinth.net.au>
+Copyright: 2001-2002, Michael Smith <msmith at xiph.org>
   2001-2004, The IceS Development Team <team at icecast.org>\n"
 License: GPL-2
  FIXME
@@ -205,30 +189,34 @@ License: GPL-2
 Files: configure
 Copyright: (ISLOWER ? 'A' + ( - 'a') : )
   (ISLOWER ? ( | 0x40) : )
+  1992-1996, 1998-2001,
   1996-2001,
-  2003, Free Software Foundation, Inc
+  2006, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
 Files: aclocal.m4
-Copyright: 1996, 1998, 2000-2001, Free Software Foundation, Inc
-  1996-1997, 2000-2001, Free Software Foundation, Inc
+Copyright: 1996, 1998, 2000-2005,
+  1996-1997, 2000-2001, 2003, 2005,
   1996-2001,
-  1996-2002,
-  1997, 1999-2001, Free Software Foundation, Inc
-  1997, 2000-2001, Free Software Foundation, Inc
-  1999-2001, Free Software Foundation, Inc
-  1999-2002, Free Software Foundation, Inc
-  2001, Free Software Foundation, Inc
-  2001, Free Software Foundation, Inc. -*- Autoconf -*-
-  2001-2002, Free Software Foundation, Inc
-  2002, Free Software Foundation, Inc
+  1996-2004,
+  1996-2005,
+  1997, 1999-2001, 2003, 2005,
+  1997, 2000-2001, 2003-2005,
+  1999-2005,
+  2001, 2003, 2005, Free Software Foundation, Inc
+  2001-2003, 2005 Free Software Foundation, Inc
+  2002-2003, 2005 Free Software Foundation, Inc
+  2003, 2005 Free Software Foundation, Inc
+  2003-2005, Free Software Foundation, Inc
+  2004, Scott James Remnant <scott at netsplit.com>
+  2004-2005, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
 Files: ltmain.sh
-Copyright: 1996-2001, 2003-2004
-  2003, Free Software Foundation, Inc."
+Copyright: 1996-2001, 2003-2005
+  2005, Free Software Foundation, Inc."
 License: GPL-2+
  FIXME
 
@@ -241,11 +229,7 @@ License: GPL-2+
 Files: COPYING
 Copyright: 1989, 1991 Free Software Foundation, Inc
   <year> <name of author>
-  HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-  HOLDERS AND/OR OTHER PARTIES
   disclaimer" for the program, if
-  holder saying it may be distributed
-  holder who places the Program under this License
   interest in the program
   law:
   the software, and
@@ -258,8 +242,3 @@ Copyright: 2002, Simon Hosie <gumboot at clear.net.nz>
 License: UNKNOWN
  FIXME
 
-Files: install-sh
-Copyright: 1991, the Massachusetts Institute of Technology
-License: UNKNOWN
- FIXME
-

-- 
ices2 packaging

