[SCM] icecast2/master: Drop patches 1002 and 1003, applied upstream.
js at users.alioth.debian.org
js at users.alioth.debian.org
Wed Jun 13 00:24:40 UTC 2012
The following commit has been merged in the master branch:
commit a32dead6ca29b12cc76bd74abd5e36cf3d8a77aa
Author: Jonas Smedegaard <dr at jones.dk>
Date: Wed Jun 13 01:08:05 2012 +0200
Drop patches 1002 and 1003, applied upstream.
diff --git a/debian/patches/1002_add_missing_xspf_file b/debian/patches/1002_add_missing_xspf_file
deleted file mode 100644
index 218a423..0000000
--- a/debian/patches/1002_add_missing_xspf_file
+++ /dev/null
@@ -1,90 +0,0 @@
-Index: icecast2-2.3.2/admin/Makefile.am
-===================================================================
---- icecast2-2.3.2.orig/admin/Makefile.am 2005-07-04 00:11:55.000000000 +0200
-+++ icecast2-2.3.2/admin/Makefile.am 2009-07-31 03:02:07.000000000 +0200
-@@ -4,5 +4,5 @@
-
- admindir = $(pkgdatadir)/admin
- dist_admin_DATA = listclients.xsl listmounts.xsl moveclients.xsl response.xsl \
-- stats.xsl manageauth.xsl updatemetadata.xsl
-+ stats.xsl manageauth.xsl updatemetadata.xsl xspf.xsl
-
-Index: icecast2-2.3.2/admin/xspf.xsl
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ icecast2-2.3.2/admin/xspf.xsl 2009-07-31 03:02:07.000000000 +0200
-@@ -0,0 +1,74 @@
-+<!--
-+ XSPF xslt stylesheet for Icecast 2.3.2 and above
-+ Copyright (C) 2007 Thomas B. Ruecker, tbr at ruecker-itk.de
-+
-+ This program is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU General Public License
-+ as published by the Free Software Foundation; either version 2
-+ of the License, or (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the
-+ Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-+-->
-+
-+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-+<xsl:output omit-xml-declaration="no" media-type="application/xspf+xml"
-+ method="xml" indent="yes" encoding="UTF-8" />
-+<xsl:template match = "/icestats" >
-+<playlist version="1" xmlns="http://xspf.org/ns/0/">
-+ <title><xsl:value-of select="server" /></title>
-+ <creator><xsl:value-of select="server" /></creator>
-+ <trackList >
-+<!-- end of "header" -->
-+
-+<xsl:for-each select="source">
-+
-+<track>
-+ <location><xsl:value-of select="listenurl" /></location>
-+
-+
-+<xsl:if test="artist"><creator><xsl:value-of select="artist" /></creator></xsl:if>
-+<title><xsl:value-of select="title" /></title>
-+<!-- The <xsl:text>\n</xsl:text> elements in the following part are used
-+to enforce linebreaks this format seems to be expected by clients -->
-+<annotation>
-+<xsl:if test="server_name">Stream Title: <xsl:value-of select="server_name" /><xsl:text>
-+</xsl:text></xsl:if>
-+<xsl:if test="server_description">Stream Description: <xsl:value-of select="server_description" /></xsl:if>
-+Content Type:<xsl:value-of select="server_type" /><xsl:text>
-+</xsl:text>
-+<xsl:if test="bitrate">Bitrate: <xsl:value-of select="bitrate" /><xsl:text>
-+</xsl:text></xsl:if>
-+<xsl:if test="quality">Quality: <xsl:value-of select="quality" /><xsl:text>
-+</xsl:text></xsl:if>
-+<xsl:if test="video_quality">Video Quality: <xsl:value-of select="video_quality" /><xsl:text>
-+</xsl:text></xsl:if>
-+<xsl:if test="frame_size">Framesize: <xsl:value-of select="frame_size" /><xsl:text>
-+</xsl:text></xsl:if>
-+<xsl:if test="frame_rate">Framerate: <xsl:value-of select="frame_rate" /><xsl:text>
-+</xsl:text></xsl:if>
-+<xsl:if test="listeners">Current Listeners: <xsl:value-of select="listeners" /><xsl:text>
-+</xsl:text></xsl:if>
-+<xsl:if test="listener_peak">Peak Listeners: <xsl:value-of select="listener_peak" /><xsl:text>
-+</xsl:text></xsl:if>
-+<xsl:if test="genre">Stream Genre: <xsl:value-of select="genre" /></xsl:if>
-+</annotation>
-+
-+<xsl:if test="server_url"><info><xsl:value-of select="server_url" /></info></xsl:if>
-+
-+</track>
-+
-+</xsl:for-each>
-+</trackList>
-+</playlist>
-+
-+</xsl:template>
-+</xsl:stylesheet>
-+
diff --git a/debian/patches/1003_fix_memory_leak.patch b/debian/patches/1003_fix_memory_leak.patch
deleted file mode 100644
index 4774604..0000000
--- a/debian/patches/1003_fix_memory_leak.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: icecast2-2.3.2/src/stats.c
-===================================================================
---- icecast2-2.3.2.orig/src/stats.c 2009-12-09 09:53:27.000000000 -0600
-+++ icecast2-2.3.2/src/stats.c 2009-12-09 09:54:16.000000000 -0600
-@@ -973,7 +973,11 @@
- if (event->source)
- {
- if (show_mount && strcmp (event->source, show_mount) != 0)
-+ {
-+ xmlFree (value);
-+ xmlFree (name);
- break;
-+ }
- srcnode = _find_xml_node(event->source, &src_nodes, node);
- }
- else
diff --git a/debian/patches/series b/debian/patches/series
index f0b76f7..3903fa8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
1001_autotools_avoid_debian-subdir.patch
-1002_add_missing_xspf_file
-1003_fix_memory_leak.patch
--
icecast2 packaging
More information about the pkg-multimedia-commits
mailing list