[SCM] icecast2/master: Update changelog, control and copyright_hints.

js at users.alioth.debian.org js at users.alioth.debian.org
Wed Jun 13 21:59:38 UTC 2012


The following commit has been merged in the master branch:
commit faa62d2deb27b20b08f9b46cb5ecc100594eb6a1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jun 13 23:59:33 2012 +0200

    Update changelog, control and copyright_hints.

diff --git a/debian/changelog b/debian/changelog
index 027a9b9..f9b1e56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ icecast2 (2.3.3-1) UNRELEASED; urgency=low
     to rules file.
   * Rewrite copyright file, using DEP5 format.
   * Bump standards-version to 3.9.3.
+  * Bump autotools to match versions used upstream.
+  * suppress copyright-check of some images.
+  * Put aside autogenerated files during build, and regenerate most
+    possible of them.
 
  -- Jonas Smedegaard <dr at jones.dk>  Wed, 13 Jun 2012 02:21:01 +0200
 
diff --git a/debian/control b/debian/control
index 4b7801b..aa585e5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: cdbs (>= 0.4.70~),
  autotools-dev,
  devscripts,
  libtool,
- automake1.10,
+ automake1.11,
  autoconf,
  debhelper,
  dh-buildinfo,
@@ -20,7 +20,8 @@ Build-Depends: cdbs (>= 0.4.70~),
  libcurl4-gnutls-dev,
  libtheora-dev (>= 0.0.0.alpha7),
  libspeex-dev,
- po-debconf
+ po-debconf,
+ autoconf-archive
 Vcs-Git: git://git.debian.org/pkg-multimedia/icecast2.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/icecast2.git
 Standards-Version: 3.9.3
diff --git a/debian/copyright_hints b/debian/copyright_hints
index ec66c7f..c03fdfe 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -367,7 +367,6 @@ License: GPL-2+
 
 Files: debian/rules
 Copyright: 2003-2009, 2012 Jonas
-  2004-2008, Jonas Smedegaard <dr at jones.dk>
 License: GPL-2+
  FIXME
 
@@ -418,19 +417,6 @@ Copyright: 2000-2004, Jack Moffitt <jack at xiph.org
 License: Public domain
  FIXME
 
-Files: win32/running.bmp
-Copyright: ýý º
.™'PEIVËýý5ˆ
-  ýýPE5ˆ
-  W4PEýýýýýýýýýýýýýýýýýýýýýýýýý5ˆ
-  k º
ýIVBfýýIVPEý º
kýýýk º
ý5ˆ
-License: UNKNOWN
- FIXME
-
-Files: doc/windowtitle.jpg
-Copyright: .e¸ÊG;j"0BÖ±­n@Lÿ jö¸Ä)ðóÖ§j'šS½._è7Ï6Iù´ðóÖ§j'šOK—ú
óÍ’~m<<õÚƒ‰æ“Òåþƒ|ódŸ›O=jv ây¤ô¹ ß<Ù'æÓÃÏZ¨8ži=._è7Ï6Iù´ðóÖ§j'šOK—ú
óÍ’~m<<õÚƒ‰æ“Òåþƒ|ódŸ›O=jv ây¤ô¹ ß<Ù'æÓÃÏZ¨8ži=._è7Ï6Iù´ðóÖ§j'šOK—ú
óÍ’~m<<õÚƒ‰æ“Òåþƒ|ódŸ›O=jv ây¤ô¹ ß<Ù'æÓÃÏZ¨8ži=._è7Ï6Iù´ðóÖ§j'šZËÝêEÅö–ŠÉyEºA–g’Û-µä^HÜ«•¼¬0­r²°éÓjtm^•Uµ´èÕ;SæîhÓxÒ¶åäñdµã8jö<dEG1ís®kš¹\Õ¬c»NŽ•;P·Í-†l–Ûd{fåŒ{KÐ𮬶‘ÒÒK†AI5@@òXyCÌêä7$ÙÉðóÖ§j'šZÈ›rÙË 1wZ
-License: UNKNOWN
- FIXME
-
 Files: src/cfgfile.h
 Copyright: 2000-2004, Jack Moffitt <jack at xiph.org
   2011, Dave 'justdave' Miller <justdave at mozilla.com>
@@ -488,18 +474,3 @@ Copyright: with newer release:
 License: UNKNOWN
  FIXME
 
-Files: doc/listener_auth2.jpg
-Copyright: ²·.‡d¹ºª†ï},¶¼´±ûvúnõ}vÀ±fuϪÙ'Œ›«¹ùEå­¯wóM°Ñ
-License: UNKNOWN
- FIXME
-
-Files: doc/stats1.jpg
-Copyright: ¨n1.$|ªÇt«FåQÌ£L2(Z=ìÀ×`fH±»ã1Næêòî›4àíY«¯ØñûÝÝg/kŠñÎ\¼-ÉÆÑK{`ÃlØ{.í¹ðà‡·cFÖažÎO,Ôð­ä½WµxbgÙ¢ª;UU
-License: UNKNOWN
- FIXME
-
-Files: examples/icecast_auth-1.0.tar.gz
-Copyright: Âø¡¼àÞ¶ÉA7<0bFàÒœ¹µg KuíÒtɲɱJž*NàC›¡3šç²ÄoQ¿c¹Õ¨«ýYkœ)N<ˆ¡¼«¿2>ú"â/z2­éÙÅ1­O>Û¶z¯[V¿­vÕSÌ™ªmoóÆïaƒHLiqvº{”*CÜýz÷2’‰âÇ­Z	ÂØ¡— NªàÙè{#i¯¬’!Tƒbå\kƒé‡\šîDÖ+ç.×ü%MÑ1¢…•£Oç̇Lþ¤´ë‘èT::R»®PAYâ
-License: UNKNOWN
- FIXME
-

-- 
icecast2 packaging



More information about the pkg-multimedia-commits mailing list