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

unit193-guest at users.alioth.debian.org unit193-guest at users.alioth.debian.org
Sat Aug 30 11:19:37 UTC 2014 

The following commit has been merged in the master branch:
commit 9770c2c2512ccd050f2cd5802a8ff134d6c26570
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Sat Aug 30 07:19:25 2014 -0400

    Update d/copyright and d/copyright_hits.

diff --git a/debian/copyright b/debian/copyright
index 4dddcd1..b2c8b73 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ Copyright: 2000-2004, Jack Moffitt <jack at xiph.org>
   2000-2004, Michael Smith <msmith at xiph.org>
   2000-2004, oddsock <oddsock at xiph.org>
   2011, Dave 'justdave' Miller <justdave at mozilla.com>
-  2011, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
+  2011-2012, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
 License: GPL-2
 
 Files: src/net/*
@@ -21,6 +21,31 @@ Files: src/avl/*
 Copyright: 1995-1997, Sam Rushing <rushing at nightmare.com>
 License: MIT~Rushing
 
+Files: src/cfgfile.c
+Copyright: 2000-2004, Jack Moffitt <jack at xiph.org
+  2000-2004, Karl Heyes <karl at xiph.org>
+  2000-2004, Michael Smith <msmith at xiph.org>
+  2000-2004, oddsock <oddsock at xiph.org>
+  2011, Thomas B. "dm8tbr" Ruecker <thomas.ruecker at tieto.com>
+  2011-2012, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
+License: GPL-2
+
+Files: src/main.c
+Copyright: 2000-2004, Jack Moffitt <jack at xiph.org
+  2000-2004, Karl Heyes <karl at xiph.org>
+  2000-2004, Michael Smith <msmith at xiph.org>
+  2000-2004, oddsock <oddsock at xiph.org>
+  2011-2012, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
+  2014, Thomas B. Ruecker <thomas at ruecker.fi>
+License: GPL-2
+
+Files: src/format_speex.c
+Copyright: 2000-2004, Jack Moffitt <jack at xiph.org>
+  2000-2004, Karl Heyes <karl at xiph.org>
+  2000-2004, Michael Smith <msmith at xiph.org>
+  2000-2004, oddsock <oddsock at xiph.org>
+License: GPL-2
+
 Files: admin/vclt.xsl
  admin/xspf.xsl
 Copyright:
@@ -32,30 +57,46 @@ Files: src/net/sock.h
 Copyright: 1999, the icecast team
 License: GPL-2+
 
+Files: web/xml2json.xslt
+Copyright: 2006,2008, Doeke Zanstra
+License: BSD-2-clause
+
 Files: debian/po/fr.po
-Copyright: 2011, Debian French l10n team <debian-l10n-french at lists.debian.org>
+Copyright: 2011-2012, Debian French l10n team <debian-l10n-french at lists.debian.org>
 License: GPL-2+
 
 Files: debian/po/de.po
-Copyright: 2011, Erik Pfannenstein
+Copyright: 2011-2012, Erik Pfannenstein
 License: GPL-2+
 
 Files: debian/po/sv.po
-Copyright: 2011, Martin Bagge <brother at bsnet.se>
+Copyright: 2011-2012, Martin Bagge <brother at bsnet.se>
 License: GPL-2+
 
 Files: debian/po/cs.po
-Copyright: 2010, Michal Simunek <michal.simunek at gmail.com>
+Copyright: 2011-2012, Michal Simunek <michal.simunek at gmail.com>
 License: GPL-2+
 
 Files: debian/po/es.po
-Copyright: 2011, Software in the Public Interest
+Copyright: 2011-2012, Software in the Public Interest
 License: GPL-2+
 
 Files: debian/po/da.po
 Copyright: 2011, icecast2 & nedenstående oversættere
 License: GPL-2+
 
+Files: debian/po/pl.po
+Copyright: 2012, Michał Kułach <michal.kulach at gmail.com>
+License: GPL-2+
+
+Files: debian/po/it.po debian/po/sk.po
+Copyright: 2012, Icecast2 package holder
+License: GPL-2+
+
+Files: debian/po/pt.po debian/po/pt_BR.po debian/po/nl.po
+Copyright: 2011,2012, Icecast2 package holder
+License: GPL-2+
+
 Files: debian/rules
 Copyright: 2003-2009, 2012 Jonas Smedegaard <dr at jones.dk>
 License: GPL-2+
@@ -115,3 +156,24 @@ License: MIT~Rushing
  USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  PERFORMANCE OF THIS SOFTWARE.
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/copyright_hints b/debian/copyright_hints
index c03fdfe..30b5e7b 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -38,39 +38,29 @@ Files: AUTHORS
  debian/icecast2.doc-base
  debian/icecast2.init
  debian/icecast2.logrotate
+ debian/icecast2.maintscript
  debian/icecast2.postinst
  debian/icecast2.postrm
- debian/patches/1001_autotools_avoid_debian-subdir.patch
  debian/patches/README
- debian/patches/series
  debian/po/POTFILES.in
- debian/po/pt.po
  debian/source/format
  debian/templates
  debian/watch
- doc/Index.hhk
  doc/Makefile.am
- doc/icecast2.hhc
- doc/icecast2.hhp
  doc/icecast2_admin.html
+ doc/icecast2_auth.html
  doc/icecast2_basicsetup.html
  doc/icecast2_changes.html
  doc/icecast2_config_file.html
  doc/icecast2_faq.html
  doc/icecast2_glossary.html
  doc/icecast2_introduction.html
- doc/icecast2_listenerauth.html
  doc/icecast2_relay.html
  doc/icecast2_stats.html
  doc/icecast2_win32.html
  doc/icecast2_yp.html
  doc/index.html
- doc/index_win32.html
  doc/relay.png
- doc/style.css
- doc/win32_section1.html
- doc/win32_section2.html
- doc/win32_section3.html
  examples/Makefile.am
  icecast.spec
  m4/acx_pthread.m4
@@ -119,16 +109,11 @@ Files: AUTHORS
  src/timing/timing.h
  web/Makefile.am
  web/auth.xsl
- web/corner_bottomleft.jpg
- web/corner_bottomright.jpg
- web/corner_topleft.jpg
- web/corner_topright.jpg
  web/icecast.png
- web/key.gif
  web/key.png
  web/server_version.xsl
+ web/status-json.xsl
  web/status.xsl
- web/status2.xsl
  web/style.css
  web/tunein.png
  win32/ConfigTab.cpp
@@ -180,8 +165,6 @@ Files: src/admin.c
  src/auth_htpasswd.c
  src/auth_htpasswd.h
  src/auth_url.h
- src/client.c
- src/client.h
  src/compat.h
  src/connection.h
  src/event.c
@@ -194,7 +177,6 @@ Files: src/admin.c
  src/format_kate.h
  src/format_midi.c
  src/format_midi.h
- src/format_mp3.c
  src/format_mp3.h
  src/format_ogg.c
  src/format_ogg.h
@@ -208,13 +190,10 @@ Files: src/admin.c
  src/fserve.h
  src/global.c
  src/global.h
- src/logging.c
  src/logging.h
- src/main.c
  src/md5.h
  src/refbuf.c
  src/refbuf.h
- src/sighandler.c
  src/sighandler.h
  src/slave.c
  src/slave.h
@@ -222,7 +201,6 @@ Files: src/admin.c
  src/source.h
  src/stats.c
  src/stats.h
- src/util.c
  src/util.h
  src/xslt.c
  src/xslt.h
@@ -233,10 +211,14 @@ License: UNKNOWN
  FIXME
 
 Files: Makefile.in
+ aclocal.m4
  admin/Makefile.in
  conf/Makefile.in
  doc/Makefile.in
  examples/Makefile.in
+ m4/ltsugar.m4
+ m4/ltversion.m4
+ m4/lt~obsolete.m4
  src/Makefile.in
  src/avl/Makefile.in
  src/httpp/Makefile.in
@@ -247,7 +229,33 @@ Files: Makefile.in
  web/Makefile.in
  win32/Makefile.in
  win32/res/Makefile.in
-Copyright: 1994-2002
+Copyright: 1994-2013, 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, Free Software Foundation, Inc
+  2004-2005, 2007, 2009, Free Software Foundation, Inc
+  2004-2005, 2007-2008, Free Software Foundation, Inc
+  2004-2013, Free Software Foundation, Inc
+  2006-2013, Free Software Foundation, Inc
+  2009-2013, Free Software Foundation, Inc
+License: UNKNOWN
+ FIXME
+
+Files: src/client.c
+ src/client.h
+ src/connection.c
+ src/format_mp3.c
+ src/fserve.c
+ src/logging.c
+ src/sighandler.c
+ src/util.c
+Copyright: 2000-2004, Jack Moffitt <jack at xiph.org
+  2011, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
+  2011-2012, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
 License: UNKNOWN
  FIXME
 
@@ -258,26 +266,18 @@ 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: config.guess
- config.sub
- depcomp
- missing
-Copyright: 1992-1999,
-  1992-2000
-  1996-1997, 1999-2000, 2002-2006
-  1999-2000, 2003-2007, 2009-2010
-License: GPL-2+
+Files: src/format_ebml.c
+ src/format_ebml.h
+ src/format_opus.c
+ src/format_opus.h
+Copyright: 2012, David Richards, Mozilla Foundation
+License: UNKNOWN
  FIXME
 
 Files: src/net/resolver.c
@@ -295,14 +295,6 @@ Copyright:
 License: UNKNOWN
  FIXME
 
-Files: src/cfgfile.c
- src/connection.c
- src/fserve.c
-Copyright: 2000-2004, Jack Moffitt <jack at xiph.org
-  2011, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
-License: UNKNOWN
- FIXME
-
 Files: debian/po/ru.po
  debian/po/templates.pot
  debian/po/vi.po
@@ -310,10 +302,10 @@ Copyright: YEAR THE PACKAGE'S HOLDER
 License: UNKNOWN
  FIXME
 
-Files: src/auth_url.c
- src/format_speex.c
-Copyright: 2000-2004, Jack Moffitt <jack at xiph.org>
-License: UNKNOWN
+Files: config.guess
+ config.sub
+Copyright: 1992-2013, Free Software Foundation, Inc
+License: GPL GPL-3
  FIXME
 
 Files: src/avl/avl.c
@@ -323,38 +315,32 @@ Copyright: 1995, Sam Rushing <rushing at nightmare.com>
 License: UNKNOWN
  FIXME
 
+Files: web/xml2json.xslt
+Copyright: 2006,2008, Doeke Zanstra
+License: BSD-2-clause
+ FIXME
+
+Files: install-sh
+Copyright: 1994, X Consortium
+License: Expat
+ FIXME
+
+Files: missing
+Copyright: 1996-1997, 1999-2000, 2002-2006
+License: GPL-2+
+ FIXME
+
 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: aclocal.m4
-Copyright: 1996, 1998, 2000-2005, 2008
-  1996-1997, 2000-2001, 2003, 2005,
-  1996-1997, 2000-2001, 2003, 2005, 2008
-  1996-2001, 2003-2005
-  1996-2004,
-  1997, 1999-2001, 2003-2005, 2008
-  1997, 2000-2001, 2003-2006, 2008
-  1999-2005, 2008
-  1999-2006, 2009
-  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, 2011 Free Software
-  2003, 2005 Free Software Foundation, Inc
-  2003-2006, 2011 Free Software Foundation
-  2004, Free Software Foundation, Inc
-  2004-2005, 2007, 2009, Free Software Foundation, Inc
-  2004-2005, 2007-2008, Free Software Foundation, Inc
-  2004-2005, 2007-2009, Free Software Foundation
-  2004-2005, 2012 Free Software Foundation, Inc
-  2006, 2008, 2010, Free Software Foundation, Inc
+Files: m4/libtool.m4
+Copyright: 1996-2001, 2003-2005
   2011, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
@@ -365,6 +351,16 @@ Copyright: 1996-2001, 2003-2006
 License: GPL-2+
  FIXME
 
+Files: depcomp
+Copyright: 1999-2000, 2003-2007, 2009 Free
+License: GPL-2+
+ FIXME
+
+Files: compile
+Copyright: 1999-2013, Free Software Foundation, Inc
+License: GPL-2+
+ FIXME
+
 Files: debian/rules
 Copyright: 2003-2009, 2012 Jonas
 License: GPL-2+
@@ -377,7 +373,7 @@ License: GPL-2+
  FIXME
 
 Files: admin/xspf.xsl
-Copyright: 2007, Thomas B. Ruecker, tbr at ruecker-itk.de
+Copyright: 2007, Thomas B. Ruecker, thomas at ruecker.fi
 License: GPL-2+
  FIXME
 
@@ -389,11 +385,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
@@ -406,17 +398,22 @@ Copyright: 1999, the icecast team
 License: LGPL-2+
  FIXME
 
-Files: install-sh
-Copyright: 1994, X Consortium
-License: MIT/X11 (BSD like)
- FIXME
-
 Files: src/md5.c
 Copyright: 2000-2004, Jack Moffitt <jack at xiph.org
-  is claimed
 License: Public domain
  FIXME
 
+Files: debian/po/pl.po
+Copyright: 2012
+License: UNKNOWN
+ FIXME
+
+Files: examples/icecast_auth-1.0.tar.gz
+Copyright: šÓÉxÊA’t>î0IC¤E
+  *»A·TÃ[/O'þj‚NšeZŸb¶¨œÝ|*›Ȧà‡"	ÔŸ\æ¬ùxˆ‚¦ùxHlL),A*Ú'4ˆ‚R£$Ñ%™o) ¹vqM6d`Îãe>Kã9o¯õM£7
+License: UNKNOWN
+ FIXME
+
 Files: src/cfgfile.h
 Copyright: 2000-2004, Jack Moffitt <jack at xiph.org
   2011, Dave 'justdave' Miller <justdave at mozilla.com>
@@ -424,7 +421,9 @@ License: UNKNOWN
  FIXME
 
 Files: debian/po/fr.po
-Copyright: 2011, Debian French l10n team <debian-l10n-french at lists.debian.org>
+Copyright: 2011-2012, Debian French l10n team <debian-l10n-french at lists.debian.org>
+  la "
+  tant qu'ils ne seront pas configurÃs."
   à utiliser comme "
 License: UNKNOWN
  FIXME
@@ -434,13 +433,48 @@ Copyright: 2011, Erik Pfannenstein
 License: UNKNOWN
  FIXME
 
+Files: m4/ltoptions.m4
+Copyright: 2004-2005, 2007-2009, Free Software Foundation
+License: UNKNOWN
+ FIXME
+
+Files: debian/po/it.po
+Copyright: 2012, Icecast2 package holder
+License: UNKNOWN
+ FIXME
+
+Files: src/cfgfile.c
+Copyright: 2000-2004, Jack Moffitt <jack at xiph.org
+  2011, Thomas B. "dm8tbr" Ruecker <thomas.ruecker at tieto.com>
+  2011-2012, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
+License: UNKNOWN
+ FIXME
+
+Files: src/main.c
+Copyright: 2000-2004, Jack Moffitt <jack at xiph.org
+  2011-2012, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
+  2014, Thomas B. Ruecker <thomas at ruecker.fi>
+License: UNKNOWN
+ FIXME
+
+Files: src/format_speex.c
+Copyright: 2000-2004, Jack Moffitt <jack at xiph.org>
+License: UNKNOWN
+ FIXME
+
+Files: src/auth_url.c
+Copyright: 2000-2004, Jack Moffitt <jack at xiph.org>
+  2011-2012, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
+License: UNKNOWN
+ FIXME
+
 Files: debian/po/sv.po
-Copyright: 2011, Martin Bagge <brother at bsnet.se>
+Copyright: 2012, Martin Bagge <brother at bsnet.se>
 License: UNKNOWN
  FIXME
 
 Files: debian/po/cs.po
-Copyright: 2010, Michal Simunek <michal.simunek at gmail.com>
+Copyright: 2012, Michal Simunek <michal.simunek at gmail.com>
   domÃnovà jmÃno, kterà se má použít jako "
   rozhraní pro správu na adrese http://localhost:8000."
   se má použít k řízení přístupu k mediálním "
@@ -455,7 +489,24 @@ License: UNKNOWN
  FIXME
 
 Files: debian/po/nl.po
-Copyright: 2011, THE PACKAGE'S HOLDER
+Copyright: 2011-2012, THE PACKAGE'S HOLDER
+License: UNKNOWN
+ FIXME
+
+Files: debian/po/sk.po
+Copyright: 2012, THE icecast2'S HOLDER
+  domÃnovà meno, ktorà má byÅ¥ použità ako predpona pre "
+  má byť použità na riadenie prístupu k prúdovým "
+  má byť použità na riadenie prístupu k zdrojom "
+  má byť použità pre administráciu Icecast2."
+  preklady pre balík icecast2
+  rozhranie administrácie, na http://localhost:8000, možno použiť na "
+License: UNKNOWN
+ FIXME
+
+Files: debian/po/pt_BR.po
+Copyright: 2011, THE icecast2'S HOLDER
+  que as senhas sejam configuradas."
 License: UNKNOWN
  FIXME
 
@@ -465,7 +516,12 @@ License: UNKNOWN
  FIXME
 
 Files: debian/po/da.po
-Copyright: 2011, icecast2 & nedenstående oversættere
+Copyright: 2012, icecast2 & nedenstående oversættere
+License: UNKNOWN
+ FIXME
+
+Files: debian/po/pt.po
+Copyright: que "
 License: UNKNOWN
  FIXME
 

-- 
icecast2 packaging

More information about the pkg-multimedia-commits mailing list