Author: toots
Date: Mon Nov 10 17:12:00 2008
New Revision: 6030
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6030
Log:
* Started lenny branch
* Applied patch to fix deterministic scrip file name in trunk/ and lenny/
* Removed portaudio from the build dependencies, since this feature is not
mature enough
Added:
trunk/packages/liquidsoap/lenny/
- copied from r6029, tags/packages/liquidsoap/0.3.6-4/
trunk/packages/liquidsoap/lenny/debian/patches/fix_tmp_file.patch
trunk/packages/liquidsoap/tarballs/liquidsoap_0.3.6.orig.tar.gz (with
props)
trunk/packages/liquidsoap/trunk/debian/patches/
trunk/packages/liquidsoap/trunk/debian/patches/fix_tmp_file.patch
trunk/packages/liquidsoap/trunk/debian/patches/series
Modified:
trunk/packages/liquidsoap/lenny/debian/changelog
trunk/packages/liquidsoap/lenny/debian/control
trunk/packages/liquidsoap/lenny/debian/control.in
trunk/packages/liquidsoap/lenny/debian/patches/series
trunk/packages/liquidsoap/trunk/debian/changelog
trunk/packages/liquidsoap/trunk/debian/control
trunk/packages/liquidsoap/trunk/debian/control.in
trunk/packages/liquidsoap/trunk/debian/rules
Modified: trunk/packages/liquidsoap/lenny/debian/changelog
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/lenny/debian/changelog?rev=6030&op=diff
==============================================================================
--- trunk/packages/liquidsoap/lenny/debian/changelog (original)
+++ trunk/packages/liquidsoap/lenny/debian/changelog Mon Nov 10 17:12:00 2008
@@ -1,3 +1,13 @@
+liquidsoap (0.3.6-4lenny1) testing-security; urgency=high
+
+ * Added patch to fix liquigsoap's temporary file creation.
+ Thanks to Tobias Klauser for providing a patch.
+ Closes: #496360
+ * Desactivated portaudio option, since it is buggy and should
+ be tested more.
+
+ -- Romain Beauxis <[EMAIL PROTECTED]> Mon, 10 Nov 2008 17:32:30 +0100
+
liquidsoap (0.3.6-4) unstable; urgency=high
* Updated fix for smartcross
Modified: trunk/packages/liquidsoap/lenny/debian/control
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/lenny/debian/control?rev=6030&op=diff
==============================================================================
--- trunk/packages/liquidsoap/lenny/debian/control (original)
+++ trunk/packages/liquidsoap/lenny/debian/control Mon Nov 10 17:12:00 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Liquidsoap Debian Packaging <[EMAIL PROTECTED]>
Uploaders: Romain Beauxis <[EMAIL PROTECTED]>, Samuel Mimram <[EMAIL
PROTECTED]>
-Build-Depends: debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>=
0.4.27), ocaml-nox, ocaml-findlib, libshout-ocaml-dev, libogg-ocaml-dev (>=
0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev (>= 0.3.2),
libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4), libcamomile-ocaml-dev,
festival, wget, libxml-dom-perl, texlive, python-gtk2-dev, python,
python-support (>= 0.3), libao-ocaml-dev, libalsa-ocaml-dev (>= 0.1.2),
libpcre-ocaml-dev, libxml-light-ocaml-dev, libextlib-ocaml-dev,
libladspa-ocaml-dev, libportaudio-ocaml-dev, libsoundtouch-ocaml-dev
+Build-Depends: debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>=
0.4.27), ocaml-nox, ocaml-findlib, libshout-ocaml-dev, libogg-ocaml-dev (>=
0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev (>= 0.3.2),
libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4), libcamomile-ocaml-dev,
festival, wget, libxml-dom-perl, texlive, python-gtk2-dev, python,
python-support (>= 0.3), libao-ocaml-dev, libalsa-ocaml-dev (>= 0.1.2),
libpcre-ocaml-dev, libxml-light-ocaml-dev, libextlib-ocaml-dev,
libladspa-ocaml-dev, libsoundtouch-ocaml-dev
Standards-Version: 3.7.3
Vcs-Svn:
svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk
Vcs-Browser:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/
Modified: trunk/packages/liquidsoap/lenny/debian/control.in
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/lenny/debian/control.in?rev=6030&op=diff
==============================================================================
--- trunk/packages/liquidsoap/lenny/debian/control.in (original)
+++ trunk/packages/liquidsoap/lenny/debian/control.in Mon Nov 10 17:12:00 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Liquidsoap Debian Packaging <[EMAIL PROTECTED]>
Uploaders: Romain Beauxis <[EMAIL PROTECTED]>, Samuel Mimram <[EMAIL
PROTECTED]>
-Build-Depends: @cdbs@, ocaml-nox, ocaml-findlib, libshout-ocaml-dev,
libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev
(>= 0.3.2), libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4),
libcamomile-ocaml-dev, festival, wget, libxml-dom-perl, texlive,
python-gtk2-dev, python, python-support (>= 0.3), libao-ocaml-dev,
libalsa-ocaml-dev (>= 0.1.2), libpcre-ocaml-dev, libxml-light-ocaml-dev,
libextlib-ocaml-dev, libladspa-ocaml-dev, libportaudio-ocaml-dev,
libsoundtouch-ocaml-dev
+Build-Depends: @cdbs@, ocaml-nox, ocaml-findlib, libshout-ocaml-dev,
libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev
(>= 0.3.2), libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4),
libcamomile-ocaml-dev, festival, wget, libxml-dom-perl, texlive,
python-gtk2-dev, python, python-support (>= 0.3), libao-ocaml-dev,
libalsa-ocaml-dev (>= 0.1.2), libpcre-ocaml-dev, libxml-light-ocaml-dev,
libextlib-ocaml-dev, libladspa-ocaml-dev, libsoundtouch-ocaml-dev
Standards-Version: 3.7.3
Vcs-Svn:
svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk
Vcs-Browser:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/
Added: trunk/packages/liquidsoap/lenny/debian/patches/fix_tmp_file.patch
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/lenny/debian/patches/fix_tmp_file.patch?rev=6030&op=file
==============================================================================
--- trunk/packages/liquidsoap/lenny/debian/patches/fix_tmp_file.patch (added)
+++ trunk/packages/liquidsoap/lenny/debian/patches/fix_tmp_file.patch Mon Nov
10 17:12:00 2008
@@ -1,0 +1,81 @@
+Index: liquidsoap-0.3.6/gui/liguidsoap.py
+===================================================================
+--- liquidsoap-0.3.6.orig/gui/liguidsoap.py 2007-12-17 16:47:32.000000000
+0100
++++ liquidsoap-0.3.6/gui/liguidsoap.py 2008-11-10 17:30:56.000000000 +0100
+@@ -8,6 +8,8 @@
+ import threading, socket, sys, os, time, re
+ import getopt
+
++import tempfile
++
+ from client import LiqClient
+ from widgets import View
+
+@@ -104,6 +106,7 @@
+ # liquidsoap runs liquidsoap with a fixed script
+ # a few parameteres are available
+ def liquidsoap(
++ scriptfile,
+ host='localhost',port=1234,mount='emission.ogg',
+ backup=''):
+ if backup=='':
+@@ -111,7 +114,7 @@
+ else:
+ addbackup=';"backup"'
+
+- os.system("""cat > /tmp/liguidsoap.liq <<__EOL__
++ os.system("""cat > %s <<__EOL__
+ set("log.file.path","/tmp/lig.<pid>.log")
+ set("log.stdout",true)
+ set("server.telnet",true)
+@@ -132,10 +135,10 @@
+ id="broadcast",
+ host="%s",port=%d,mount="%s",start=false,mixer)
+ output.file.vorbis(id="backup",start=false,"%s",mixer)
+-""" % (host, port, mount, backup))
++""" % (scriptfile, host, port, mount, backup))
+ pid = os.fork()
+ if pid==0:
+- os.execlp("liquidsoap","liquidsoap","/tmp/liguidsoap.liq")
++ os.execlp("liquidsoap","liquidsoap",scriptfile)
+ else:
+ print "Running liquidsoap..."
+ return pid
+@@ -162,10 +165,11 @@
+ ehost=eport=erun=dialog=None
+ icehost=iceport=icemount=backup=None
+
+- def exit(pid):
++ def exit(pid, scriptfile):
+ if pid!=None:
+ os.kill(pid,15)
+ os.waitpid(pid,0)
++ os.remove(scriptfile)
+ gtk.main_quit()
+
+ # This startup function can be used to start the GUI directly
+@@ -173,12 +177,15 @@
+ def start(response=None):
+ # Dialog stuff
+ liquid_pid=None
++ scriptfile=None
+ if response!=None:
+ if response!=gtk.RESPONSE_ACCEPT:
+ sys.exit()
+ if erun.get_active():
+ host,port = 'localhost',1234
++ __unused, scriptfile = tempfile.mkstemp('.liq', 'liquidsoap')
+ liquid_pid=liquidsoap(
++ scriptfile,
+ host=icehost.get_text(),
+ port=iceport.get_value(),
+ mount=icemount.get_text(),
+@@ -195,7 +202,7 @@
+ win = gtk.Window()
+ win.set_border_width(10)
+ win.connect("delete_event", lambda w,e: False)
+- win.connect("destroy", lambda osb: exit(liquid_pid))
++ win.connect("destroy", lambda osb: exit(liquid_pid,scriptfile))
+ win.set_title('Liquidsoap on '+host+':'+str(port))
+ win.resize(700,300)
+ try:
Modified: trunk/packages/liquidsoap/lenny/debian/patches/series
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/lenny/debian/patches/series?rev=6030&op=diff
==============================================================================
--- trunk/packages/liquidsoap/lenny/debian/patches/series (original)
+++ trunk/packages/liquidsoap/lenny/debian/patches/series Mon Nov 10 17:12:00
2008
@@ -1,2 +1,3 @@
ladspa_backport.patch
fix_smart_crossfade.patch
+fix_tmp_file.patch
Added: trunk/packages/liquidsoap/tarballs/liquidsoap_0.3.6.orig.tar.gz
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/tarballs/liquidsoap_0.3.6.orig.tar.gz?rev=6030&op=file
==============================================================================
Binary file - no diff available.
Propchange: trunk/packages/liquidsoap/tarballs/liquidsoap_0.3.6.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: trunk/packages/liquidsoap/trunk/debian/changelog
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/changelog?rev=6030&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/changelog (original)
+++ trunk/packages/liquidsoap/trunk/debian/changelog Mon Nov 10 17:12:00 2008
@@ -1,3 +1,13 @@
+liquidsoap (0.3.8.1+2-2) unstable; urgency=high
+
+ * Fix liguidsoap temporary file name.
+ Thanks to Tobias Klauser for providing a patch.
+ Closes: #496360
+ * Desactivated portaudio option since it is buggy
+ and should be more tested.
+
+ -- Romain Beauxis <[EMAIL PROTECTED]> Mon, 11 Aug 2008 14:36:31 +0200
+
liquidsoap (0.3.8.1+2-1) unstable; urgency=low
* There was a mistake with previous source tarball.
Modified: trunk/packages/liquidsoap/trunk/debian/control
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/control?rev=6030&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/control (original)
+++ trunk/packages/liquidsoap/trunk/debian/control Mon Nov 10 17:12:00 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OCaml Maintainers <[EMAIL PROTECTED]>
Uploaders: Romain Beauxis <[EMAIL PROTECTED]>, Samuel Mimram <[EMAIL
PROTECTED]>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0),
+Build-Depends: debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>=
0.4.27),
ocaml-nox, ocaml-findlib, libshout-ocaml-dev,
libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0),
libmad-ocaml-dev (>= 0.3.4), libdtools-ocaml-dev (>= 0.1.4),
libtaglib-ocaml-dev,
@@ -11,7 +11,7 @@
python, python-support (>= 0.3), libao-ocaml-dev, libduppy-ocaml-dev (>=
0.1.2+2),
libalsa-ocaml-dev (>= 0.1.2) [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64],
libpcre-ocaml-dev, libxml-light-ocaml-dev, libladspa-ocaml-dev,
- libportaudio-ocaml-dev, libsoundtouch-ocaml-dev, liblastfm-ocaml-dev,
+ libsoundtouch-ocaml-dev, liblastfm-ocaml-dev,
libxmlplaylist-ocaml-dev, libmagic-ocaml-dev, libbjack-ocaml-dev (>= 0.1.1)
Standards-Version: 3.8.0
Vcs-Svn:
svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk
Modified: trunk/packages/liquidsoap/trunk/debian/control.in
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/control.in?rev=6030&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/control.in (original)
+++ trunk/packages/liquidsoap/trunk/debian/control.in Mon Nov 10 17:12:00 2008
@@ -11,7 +11,7 @@
python, python-support (>= 0.3), libao-ocaml-dev, libduppy-ocaml-dev (>=
0.1.2+2),
libalsa-ocaml-dev (>= 0.1.2) [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64],
libpcre-ocaml-dev, libxml-light-ocaml-dev, libladspa-ocaml-dev,
- libportaudio-ocaml-dev, libsoundtouch-ocaml-dev, liblastfm-ocaml-dev,
+ libsoundtouch-ocaml-dev, liblastfm-ocaml-dev,
libxmlplaylist-ocaml-dev, libmagic-ocaml-dev, libbjack-ocaml-dev (>= 0.1.1)
Standards-Version: 3.8.0
Vcs-Svn:
svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk
Added: trunk/packages/liquidsoap/trunk/debian/patches/fix_tmp_file.patch
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/fix_tmp_file.patch?rev=6030&op=file
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/fix_tmp_file.patch (added)
+++ trunk/packages/liquidsoap/trunk/debian/patches/fix_tmp_file.patch Mon Nov
10 17:12:00 2008
@@ -1,0 +1,81 @@
+Index: liquidsoap-0.3.6/gui/liguidsoap.py
+===================================================================
+--- liquidsoap-0.3.6.orig/gui/liguidsoap.py 2007-12-17 16:47:32.000000000
+0100
++++ liquidsoap-0.3.6/gui/liguidsoap.py 2008-11-10 17:30:56.000000000 +0100
+@@ -8,6 +8,8 @@
+ import threading, socket, sys, os, time, re
+ import getopt
+
++import tempfile
++
+ from client import LiqClient
+ from widgets import View
+
+@@ -104,6 +106,7 @@
+ # liquidsoap runs liquidsoap with a fixed script
+ # a few parameteres are available
+ def liquidsoap(
++ scriptfile,
+ host='localhost',port=1234,mount='emission.ogg',
+ backup=''):
+ if backup=='':
+@@ -111,7 +114,7 @@
+ else:
+ addbackup=';"backup"'
+
+- os.system("""cat > /tmp/liguidsoap.liq <<__EOL__
++ os.system("""cat > %s <<__EOL__
+ set("log.file.path","/tmp/lig.<pid>.log")
+ set("log.stdout",true)
+ set("server.telnet",true)
+@@ -132,10 +135,10 @@
+ id="broadcast",
+ host="%s",port=%d,mount="%s",start=false,mixer)
+ output.file.vorbis(id="backup",start=false,"%s",mixer)
+-""" % (host, port, mount, backup))
++""" % (scriptfile, host, port, mount, backup))
+ pid = os.fork()
+ if pid==0:
+- os.execlp("liquidsoap","liquidsoap","/tmp/liguidsoap.liq")
++ os.execlp("liquidsoap","liquidsoap",scriptfile)
+ else:
+ print "Running liquidsoap..."
+ return pid
+@@ -162,10 +165,11 @@
+ ehost=eport=erun=dialog=None
+ icehost=iceport=icemount=backup=None
+
+- def exit(pid):
++ def exit(pid, scriptfile):
+ if pid!=None:
+ os.kill(pid,15)
+ os.waitpid(pid,0)
++ os.remove(scriptfile)
+ gtk.main_quit()
+
+ # This startup function can be used to start the GUI directly
+@@ -173,12 +177,15 @@
+ def start(response=None):
+ # Dialog stuff
+ liquid_pid=None
++ scriptfile=None
+ if response!=None:
+ if response!=gtk.RESPONSE_ACCEPT:
+ sys.exit()
+ if erun.get_active():
+ host,port = 'localhost',1234
++ __unused, scriptfile = tempfile.mkstemp('.liq', 'liquidsoap')
+ liquid_pid=liquidsoap(
++ scriptfile,
+ host=icehost.get_text(),
+ port=iceport.get_value(),
+ mount=icemount.get_text(),
+@@ -195,7 +202,7 @@
+ win = gtk.Window()
+ win.set_border_width(10)
+ win.connect("delete_event", lambda w,e: False)
+- win.connect("destroy", lambda osb: exit(liquid_pid))
++ win.connect("destroy", lambda osb: exit(liquid_pid,scriptfile))
+ win.set_title('Liquidsoap on '+host+':'+str(port))
+ win.resize(700,300)
+ try:
Added: trunk/packages/liquidsoap/trunk/debian/patches/series
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/series?rev=6030&op=file
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/series (added)
+++ trunk/packages/liquidsoap/trunk/debian/patches/series Mon Nov 10 17:12:00
2008
@@ -1,0 +1,1 @@
+fix_tmp_file.patch
Modified: trunk/packages/liquidsoap/trunk/debian/rules
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/rules?rev=6030&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/rules (original)
+++ trunk/packages/liquidsoap/trunk/debian/rules Mon Nov 10 17:12:00 2008
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
# In order to regenerate 'debian/control' :
# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
