[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/0.3.8.1+2-2-15-g94a0109
Romain Beauxis
toots at rastageeks.org
Thu Apr 2 09:53:04 UTC 2009
The following commit has been merged in the master branch:
commit 94a0109e279d58a412620269e8ecb33b6c51ae8b
Author: Romain Beauxis <toots at rastageeks.org>
Date: Thu Apr 2 11:52:46 2009 +0200
Prepared new upstream package..
diff --git a/debian/changelog b/debian/changelog
index d6068d7..c3949e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-liquidsoap (0.3.8.1+2-3) UNRELEASED; urgency=low
+liquidsoap (0.9.0-1) unstable; urgency=low
[ Stephane Glondu ]
* Switch packaging to git.
@@ -7,7 +7,14 @@ liquidsoap (0.3.8.1+2-3) UNRELEASED; urgency=low
* Build with OCaml 3.11.
* Update compat to 7.
- -- Samuel Mimram <smimram at debian.org> Mon, 09 Mar 2009 15:23:55 +0100
+ [ Romain Beauxis ]
+ * New Upstream Version.
+ * Build and upload against current
+ modules. Will re-upload when new modules
+ are accepted.
+ * Dropped patch applied upstream.
+
+ -- Romain Beauxis <toots at rastageeks.org> Thu, 02 Apr 2009 11:48:34 +0200
liquidsoap (0.3.8.1+2-2) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 2e8d5e6..da472ff 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,17 @@ Section: sound
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 7), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27),
- ocaml-nox (>= 3.11), ocaml-findlib (>= 1.2.4), libshout-ocaml-dev (>= 0.2.6-3),
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 7.0.1),
+ ocaml-nox, ocaml-findlib, libshout-ocaml-dev,
libogg-ocaml-dev (>= 0.3.0), libvorbis-ocaml-dev (>= 0.5.0),
- libmad-ocaml-dev (>= 0.3.5-2), libdtools-ocaml-dev (>= 0.1.6-3), libtaglib-ocaml-dev (>= 0.1.2-3),
- libcamomile-ocaml-dev (>= 0.7.1-5), festival, libxml-dom-perl, python-gtk2-dev,
- python, python-support (>= 0.3), libao-ocaml-dev (>= 0.1.9-3), libduppy-ocaml-dev (>= 0.2.0),
- libalsa-ocaml-dev (>= 0.1.3-3) [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64],
- libpcre-ocaml-dev (>= 5.15.1), libxml-light-ocaml-dev (>= 2.2-11), libladspa-ocaml-dev (>= 0.1.1-3),
- libsoundtouch-ocaml-dev (>= 0.1.4-3), liblastfm-ocaml-dev (>= 0.1.3-2), sox,
- libxmlplaylist-ocaml-dev (>= 0.1.1-4), libmagic-ocaml-dev (>= 0.7.3-4), libbjack-ocaml-dev (>= 0.1.2)
-Standards-Version: 3.8.0
+ libmad-ocaml-dev (>= 0.3.4), libdtools-ocaml-dev (>= 0.1.4), libtaglib-ocaml-dev,
+ libcamomile-ocaml-dev, festival, libxml-dom-perl, python-gtk2-dev,
+ 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,
+ libsoundtouch-ocaml-dev, liblastfm-ocaml-dev, sox,
+ libxmlplaylist-ocaml-dev, libmagic-ocaml-dev, libbjack-ocaml-dev (>= 0.1.1)
+Standards-Version: 3.8.1
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/liquidsoap.git
Homepage: http://savonet.sourceforge.net/
@@ -53,3 +53,4 @@ Description: control GUI for liquidsoap
* mixing table
.
It can control a running instance of liquidsoap or launch its own instance.
+
diff --git a/debian/control.in b/debian/control.in
index 05e6b6a..3bc3e25 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.org>
Build-Depends: @cdbs@,
ocaml-nox, ocaml-findlib, libshout-ocaml-dev,
- libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0),
+ libogg-ocaml-dev (>= 0.3.0), libvorbis-ocaml-dev (>= 0.5.0),
libmad-ocaml-dev (>= 0.3.4), libdtools-ocaml-dev (>= 0.1.4), libtaglib-ocaml-dev,
libcamomile-ocaml-dev, festival, libxml-dom-perl, python-gtk2-dev,
python, python-support (>= 0.3), libao-ocaml-dev, libduppy-ocaml-dev (>= 0.1.2+2),
@@ -13,9 +13,9 @@ Build-Depends: @cdbs@,
libpcre-ocaml-dev, libxml-light-ocaml-dev, libladspa-ocaml-dev,
libsoundtouch-ocaml-dev, liblastfm-ocaml-dev, sox,
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
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/
+Standards-Version: 3.8.1
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/liquidsoap.git
Homepage: http://savonet.sourceforge.net/
Package: liquidsoap
diff --git a/debian/patches/fix_tmp_file.patch b/debian/patches/fix_tmp_file.patch
deleted file mode 100644
index 7b5944b..0000000
--- a/debian/patches/fix_tmp_file.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-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:
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6fe38c7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_tmp_file.patch
diff --git a/debian/rules b/debian/rules
index 2db4213..845f586 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
--
liquidsoap packaging
More information about the Pkg-ocaml-maint-commits
mailing list