[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/0.9.1-1-5-g153053a
Romain Beauxis
toots at rastageeks.org
Fri Oct 30 20:29:38 UTC 2009
The following commit has been merged in the master branch:
commit 9f20c6340ddbac1fce6c2d13a5a2718a0a381dfb
Author: Romain Beauxis <toots at rastageeks.org>
Date: Fri Oct 30 15:28:40 2009 -0500
Prepared new upstream release
diff --git a/debian/changelog b/debian/changelog
index 1f9c0eb..b76eabb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+liquidsoap (0.9.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Build against the latest ocaml-lastfm API.
+ Closes: #551245
+ * Ship upstream's version of the init script
+ with correct dependencies.
+ Closes: #541635
+ * Bumped standards version to 3.8.3
+ * Versioned ocaml build dependencies.
+ * Add ocaml.mk support with new automatic dependency
+ tracking.
+
+ -- Romain Beauxis <toots at rastageeks.org> Fri, 30 Oct 2009 12:18:05 -0500
+
liquidsoap (0.9.1-1) unstable; urgency=low
* New Upstream Version
diff --git a/debian/control b/debian/control
index 7b576a5..7982401 100644
--- a/debian/control
+++ b/debian/control
@@ -3,28 +3,30 @@ 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: 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.4), libdtools-ocaml-dev (>= 0.1.4), libtaglib-ocaml-dev (>= 0.1.3),
+Build-Depends: cdbs (>= 0.4.53), debhelper (>= 7.0.1), ocaml-nox, dh-ocaml (>= 0.9), quilt, patchutils (>= 0.2.25),
+ ocaml-findlib, libcry-ocaml-dev (>= 0.1.1),
+ libogg-ocaml-dev (>= 0.3.1), libvorbis-ocaml-dev (>= 0.5.1),
+ libmad-ocaml-dev (>= 0.3.6), libdtools-ocaml-dev (>= 0.1.6), libtaglib-ocaml-dev (>= 0.1.3),
libcamomile-ocaml-dev, festival, libxml-dom-perl, python-gtk2-dev,
- python, python-support (>= 0.3), libao-ocaml-dev, libduppy-ocaml-dev (>= 0.3.0),
- 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,
- libspeex-ocaml-dev (>= 0.1.1-2), libgavl-ocaml-dev, libtheora-ocaml-dev (>= 0.1.1-2),
- libportaudio-ocaml-dev, libpulse-ocaml-dev, libsamplerate-ocaml-dev,
- libxmlplaylist-ocaml-dev, libmagic-ocaml-dev, libbjack-ocaml-dev (>= 0.1.1)
-Standards-Version: 3.8.2
+ python, python-support (>= 0.3), libao-ocaml-dev (>= 0.1.10), libduppy-ocaml-dev (>= 0.3.1),
+ libalsa-ocaml-dev (>= 0.1.4) [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64],
+ libpcre-ocaml-dev, libladspa-ocaml-dev (>= 0.1.2), sox,
+ libsoundtouch-ocaml-dev (>= 0.1.5), liblastfm-ocaml-dev (>= 0.2.0),
+ libspeex-ocaml-dev (>= 0.1.2), libgavl-ocaml-dev (>= 0.1.2), libtheora-ocaml-dev (>= 0.1.2),
+ libportaudio-ocaml-dev (>= 0.1.3), libpulse-ocaml-dev (>= 0.1.1),
+ libsamplerate-ocaml-dev (>= 0.1.1), libxmlplaylist-ocaml-dev (>= 0.1.2),
+ libmagic-ocaml-dev (>= 0.3.6), libbjack-ocaml-dev (>= 0.1.3)
+Standards-Version: 3.8.3
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
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcamomile-ocaml-data, wget, sox, adduser
-Recommends: logrotate
-Suggests: icecast2, festival, mplayer, liguidsoap
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends},
+ libcamomile-ocaml-data, wget, sox, adduser
+Recommends: logrotate, mp3gain, vorbisgain, vorbis-tools
+Suggests: icecast2, festival, mplayer, liguidsoap, faad, flac
Description: audio streaming language
Liquidsoap is a powerful tool for building complex audio streaming systems,
typically targeting internet radios (e.g. icecast streams).
diff --git a/debian/control.in b/debian/control.in
index 421b85c..90f1922 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,27 +4,29 @@ 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: @cdbs@,
- ocaml-nox, ocaml-findlib, libshout-ocaml-dev,
- 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 (>= 0.1.3),
+ ocaml-findlib, libcry-ocaml-dev (>= 0.1.1),
+ libogg-ocaml-dev (>= 0.3.1), libvorbis-ocaml-dev (>= 0.5.1),
+ libmad-ocaml-dev (>= 0.3.6), libdtools-ocaml-dev (>= 0.1.6), libtaglib-ocaml-dev (>= 0.1.3),
libcamomile-ocaml-dev, festival, libxml-dom-perl, python-gtk2-dev,
- python, python-support (>= 0.3), libao-ocaml-dev, libduppy-ocaml-dev (>= 0.3.0),
- 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,
- libspeex-ocaml-dev (>= 0.1.1-2), libgavl-ocaml-dev, libtheora-ocaml-dev (>= 0.1.1-2),
- libportaudio-ocaml-dev, libpulse-ocaml-dev, libsamplerate-ocaml-dev,
- libxmlplaylist-ocaml-dev, libmagic-ocaml-dev, libbjack-ocaml-dev (>= 0.1.1)
-Standards-Version: 3.8.2
+ python, python-support (>= 0.3), libao-ocaml-dev (>= 0.1.10), libduppy-ocaml-dev (>= 0.3.1),
+ libalsa-ocaml-dev (>= 0.1.4) [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64],
+ libpcre-ocaml-dev, libladspa-ocaml-dev (>= 0.1.2), sox,
+ libsoundtouch-ocaml-dev (>= 0.1.5), liblastfm-ocaml-dev (>= 0.2.0),
+ libspeex-ocaml-dev (>= 0.1.2), libgavl-ocaml-dev (>= 0.1.2), libtheora-ocaml-dev (>= 0.1.2),
+ libportaudio-ocaml-dev (>= 0.1.3), libpulse-ocaml-dev (>= 0.1.1),
+ libsamplerate-ocaml-dev (>= 0.1.1), libxmlplaylist-ocaml-dev (>= 0.1.2),
+ libmagic-ocaml-dev (>= 0.3.6), libbjack-ocaml-dev (>= 0.1.3)
+Standards-Version: 3.8.3
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
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcamomile-ocaml-data, wget, sox, adduser
-Recommends: logrotate
-Suggests: icecast2, festival, mplayer, liguidsoap
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends},
+ libcamomile-ocaml-data, wget, sox, adduser
+Recommends: logrotate, mp3gain, vorbisgain, vorbis-tools
+Suggests: icecast2, festival, mplayer, liguidsoap, faad, flac
Description: audio streaming language
Liquidsoap is a powerful tool for building complex audio streaming systems,
typically targeting internet radios (e.g. icecast streams).
diff --git a/debian/liquidsoap.doc-base b/debian/liquidsoap.doc-base
new file mode 100644
index 0000000..41470af
--- /dev/null
+++ b/debian/liquidsoap.doc-base
@@ -0,0 +1,9 @@
+Document: liquidsoap
+Title: Liquidsoap documentation
+Author: The Savonet Team
+Abstract: Liquidsoap documentation
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/liquidsoap/html/index.html
+Files: /usr/share/doc/liquidsoap/html/*
diff --git a/debian/liquidsoap.init b/debian/liquidsoap.init
deleted file mode 100644
index 1064fef..0000000
--- a/debian/liquidsoap.init
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: liquidsoap
-# Required-Start:
-# Required-Stop:
-# Should-Start:
-# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Starts the liquidsoap daemon
-# Description:
-### END INIT INFO
-
-user=liquidsoap
-group=liquidsoap
-prefix=/usr
-exec_prefix=${prefix}
-confdir=/etc/liquidsoap
-liquidsoap=${exec_prefix}/bin/liquidsoap
-rundir=/var/run/liquidsoap
-
-# Test if $rundir exists
-if [ ! -d $rundir ]; then
- mkdir -p $rundir;
- chown $user:$group $rundir
-fi
-
-case "$1" in
- stop)
- echo -n "Stopping channels:"
- cd $rundir
- for liq in *.pid ; do
- if test $liq != '*.pid' ; then
- echo -n " $liq"
- start-stop-daemon --stop --quiet --pidfile $liq
- fi
- done
- echo "."
- ;;
-
- start)
- echo -n "Starting channels:"
- cd $confdir
- for liq in *.liq ; do
- if test $liq != '*.liq' ; then
- echo -n " $liq "
- start-stop-daemon --start --quiet --pidfile $rundir/${liq%.liq}.pid \
- --chuid $user:$group --exec $liquidsoap -- -d $confdir/$liq
- fi
- done
- echo "."
- ;;
-
- restart|force-reload)
- $0 stop
- sleep 4
- $0 start
- ;;
-
- *)
- echo "Usage: $0 {start|stop|restart|force-reload}"
- exit 1
- ;;
-esac
diff --git a/debian/patches/move_portaudio_low_in_in.patch b/debian/patches/move_portaudio_low_in_in.patch
new file mode 100644
index 0000000..6312883
--- /dev/null
+++ b/debian/patches/move_portaudio_low_in_in.patch
@@ -0,0 +1,23 @@
+Index: liquidsoap/scripts/utils.liq
+===================================================================
+--- liquidsoap.orig/scripts/utils.liq 2009-10-30 15:10:08.000000000 -0500
++++ liquidsoap/scripts/utils.liq 2009-10-30 15:10:34.000000000 -0500
+@@ -157,14 +157,14 @@
+ %ifdef input.oss
+ in = fun () -> input.oss(id="oss_mic")
+ %endif
+-%ifdef input.alsa
+- in = fun () -> input.alsa(id="alsa_mic")
+-%endif
+ %ifdef input.portaudio
+ in = fun () -> input.portaudio(id="pa_mic")
+ %endif
++%ifdef input.alsa
++ in = fun () -> input.alsa(id="alsa_mic")
++%endif
+ # Create a source from the first available input driver in this list:
+-# portaudio, alsa, oss, blank
++# alsa, portaudio, oss, blank
+ # @category Source / Input
+ def in()
+ in()
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..88dd262
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+move_portaudio_low_in_in.patch
diff --git a/debian/rules b/debian/rules
index dd70487..b2c304c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,14 @@
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/ocaml.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
# Then check manually if everything's ok
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-gl --disable-graphics --disable-lame --disable-mp3id3 --disable-rtp
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-gl --disable-graphics --disable-lame
DEB_MAKE_BUILD_TARGET := all doc
DEB_MAKE_INSTALL_TARGET := doc install DESTDIR=$(CURDIR)/debian/tmp/ DEBIAN=yes prefix=$(CURDIR)/debian/tmp/usr sysconfdir=$(CURDIR)/debian/tmp/etc
DEB_INSTALL_MANPAGES_liquidsoap := doc/liquidsoap.1
@@ -20,11 +21,14 @@ makebuilddir/liquidsoap::
[ ! -f src/configure.ml ] || [ -f src/configure.ml.cdbs-backup ] || \
cp -f src/configure.ml src/configure.ml.cdbs-backup
+install/liquidsoap::
+ cp $(CURDIR)/scripts/liquidsoap.initd $(CURDIR)/debian/liquidsoap.init
+
binary-install/liquidsoap::
make doc
mv $(CURDIR)/debian/liquidsoap/etc/liquidsoap/radio.liq $(CURDIR)/debian/liquidsoap/etc/liquidsoap/radio.liq.example
chmod +x $(CURDIR)/debian/liquidsoap/etc/liquidsoap/radio.liq.example
- chmod -x $(CURDIR)/debian/liquidsoap/usr/share/doc/liquidsoap/examples/fallible.liq
+ chmod -x $(CURDIR)/debian/liquidsoap/usr/share/doc/liquidsoap/examples/*.liq
binary-install/liguidsoap::
sed -e s#/usr/lib/python.*/site-packages/liquidsoap#/var/lib/liguidsoap#g -i $(CURDIR)/debian/liguidsoap/usr/bin/liguidsoap
@@ -37,5 +41,5 @@ cleanbuilddir/liquidsoap::
clean::
rm -rf src/liquidsoap src/META radio.liq.example \
src/SVN.ml src/io/liquidsoap_depend autodoc \
- doc/manual
+ doc/manual debian/liquidsoap.init
[ ! -f src/configure.ml.cdbs-backup ] || mv -f src/configure.ml.cdbs-backup src/configure.ml
--
liquidsoap packaging
More information about the Pkg-ocaml-maint-commits
mailing list