The following commit has been merged in the master branch:
commit c89947f40cf5593699ddc943ef67a5f8248d5fda
Author: Romain Beauxis <to...@rastageeks.org>
Date:   Wed Jun 22 22:01:24 2011 -0500

    Fixed plugins dependencies :)

diff --git a/debian/changelog b/debian/changelog
index d973682..3bb8065 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ liquidsoap (1.0.0~beta1+20110527~hgac5e0ed299ff-1) 
experimental; urgency=low
   * Disable liquidsoap-plugin-alsa for BSD architectures. 
   * Compile in bytecode on armel since dynlink.cmxa is not
     available.
+  * Fixed automatic dependency computation for plugins 
+    using dh-ocaml >= 1.0.1
 
- -- Romain Beauxis <toots@leroy>  Fri, 27 May 2011 23:39:06 -0500
+ -- Romain Beauxis <to...@rastageeks.org>  Wed, 22 Jun 2011 22:00:22 -0500
 
 liquidsoap (1.0.0~beta1+20110525~hgbcdbe01d2de5-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index ae116c0..3028cc4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  debhelper (>= 7.0.1),
  dh-buildinfo,
  ocaml-nox,
- dh-ocaml (>= 0.9),
+ dh-ocaml (>= 1.0.1),
  ocaml-findlib,
  libcry-ocaml-dev (>= 0.2.0~20110523+hgb02e02b1cf7c),
  libogg-ocaml-dev (>= 0.4.1),
@@ -80,6 +80,8 @@ Suggests:
  liguidsoap,
  liquidsoap-plugin-samplerate,
  liquidsoap-plugin-xmlplaylist
+Provides:
+ ${ocaml:Provides}
 Description: audio streaming language
  Liquidsoap is a powerful tool for building complex audio streaming systems,
  typically targeting internet radios (e.g. icecast streams).
@@ -100,6 +102,7 @@ Package: liquidsoap-plugin-sdl
 Architecture: any
 Depends:
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- SDL plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -115,6 +118,7 @@ Package: liquidsoap-plugin-alsa
 Architecture: [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64]
 Depends:
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- ALSA plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -130,6 +134,7 @@ Package: liquidsoap-plugin-ao
 Architecture: any
 Depends:
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- AO plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -145,6 +150,7 @@ Package: liquidsoap-plugin-jack
 Architecture: any
 Depends:
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- JACK plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -160,6 +166,7 @@ Package: liquidsoap-plugin-icecast
 Architecture: any
 Depends:
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Icecast plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -175,6 +182,7 @@ Package: liquidsoap-plugin-faad
 Architecture: any
 Depends:
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- FAAD plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -191,6 +199,7 @@ Architecture: any
 Depends:
  liquidsoap-plugin-ogg (= ${binary:Version}),
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- FLAC plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -207,6 +216,7 @@ Package: liquidsoap-plugin-gavl
 Architecture: any
 Depends: 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Gavl plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -222,6 +232,7 @@ Package: liquidsoap-plugin-graphics
 Architecture: any
 Depends: 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Graphics plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -238,6 +249,7 @@ Package: liquidsoap-plugin-ladspa
 Architecture: any
 Depends: 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- LADSPA plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -254,6 +266,7 @@ Architecture: any
 Depends: 
  liquidsoap-plugin-xmlplaylist (= ${binary:Version}),
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Lastfm plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -270,6 +283,7 @@ Package: liquidsoap-plugin-mad
 Architecture: any
 Depends: 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Mad plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -285,6 +299,7 @@ Package: liquidsoap-plugin-ogg
 Architecture: any
 Depends: 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Ogg plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -303,6 +318,7 @@ Architecture: any
 Depends:
  liquidsoap-plugin-ogg (= ${binary:Version}), 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- OSS plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -318,6 +334,7 @@ Package: liquidsoap-plugin-portaudio
 Architecture: any
 Depends: 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Portaudio plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -333,6 +350,7 @@ Package: liquidsoap-plugin-pulseaudio
 Architecture: any
 Depends: 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Pulseaudio plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -348,6 +366,7 @@ Package: liquidsoap-plugin-samplerate
 Architecture: any
 Depends: 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Samplerate plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -364,6 +383,7 @@ Package: liquidsoap-plugin-schroedinger
 Architecture: any
 Depends: 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Schroedinger plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -380,6 +400,7 @@ Package: liquidsoap-plugin-soundtouch
 Architecture: any
 Depends: 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Soundtouch plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -397,6 +418,7 @@ Architecture: any
 Depends:
  liquidsoap-plugin-ogg (= ${binary:Version}), 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Speex plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -413,6 +435,7 @@ Package: liquidsoap-plugin-taglib
 Architecture: any
 Depends: 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Taglib plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -430,6 +453,7 @@ Architecture: any
 Depends: 
  liquidsoap-plugin-ogg (= ${binary:Version}),
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Theora plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -446,6 +470,7 @@ Package: liquidsoap-plugin-voaacenc
 Architecture: any
 Depends: 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Voaacenc plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -462,6 +487,7 @@ Architecture: any
 Depends: 
  liquidsoap-plugin-ogg (= ${binary:Version}),
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Vorbis plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
@@ -478,6 +504,7 @@ Package: liquidsoap-plugin-xmlplaylist
 Architecture: any
 Depends: 
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: audio streaming language -- Xmlplaylist plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index e109b91..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,502 +0,0 @@
-Source: liquidsoap
-Section: sound
-Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
-Uploaders: Romain Beauxis <to...@rastageeks.org>, Samuel Mimram 
<smim...@debian.org>
-Build-Depends:
- @cdbs@,
- ocaml-findlib,
- libcry-ocaml-dev (>= 0.2.0~20110523+hgb02e02b1cf7c),
- libogg-ocaml-dev (>= 0.4.1),
- libvorbis-ocaml-dev (>= 0.5.1-2),
- libmad-ocaml-dev (>= 0.4.0),
- libdtools-ocaml-dev (>= 0.2.1),
- libtaglib-ocaml-dev (>= 0.1.3),
- libcamomile-ocaml-dev,
- festival,
- libxml-dom-perl,
- python-gtk2-dev,
- python,
- python-support (>= 0.3),
- libao-ocaml-dev (>= 0.2.0),
- libduppy-ocaml-dev (>= 0.4.0~20110523+hg644dd3b27614),
- libalsa-ocaml-dev (>= 0.2.0) [!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.3.0),
- libspeex-ocaml-dev (>= 0.1.2-2),
- libgavl-ocaml-dev (>= 0.1.3),
- libtheora-ocaml-dev (>= 0.3.0~20110523+hgb02e02b1cf7c),
- 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),
- libsdl-ocaml-dev,
- libfaad-ocaml-dev (>= 0.3.0~20110523+hgb02e02b1cf7c),
- libmm-ocaml-dev (>= 0.1.0~20110532+hgc70543a111b9),
- libflac-ocaml-dev,
- libschroedinger-ocaml-dev,
- libvoaacenc-ocaml-dev
-Standards-Version: 3.9.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},
- ${ocaml:Depends},
- ${perl:Depends},
- libcamomile-ocaml-data,
- wget,
- sox,
- adduser
-Recommends:
- logrotate,
- mp3gain,
- vorbisgain,
- vorbis-tools,
- liquidsoap-plugin-mad,
- liquidsoap-plugin-taglib,
- liquidsoap-plugin-vorbis,
- liquidsoap-plugin-flac,
- liquidsoap-plugin-voaacenc,
- liquidsoap-plugin-icecast,
- liquidsoap-plugin-faad
-Suggests:
- icecast2,
- festival,
- mplayer,
- liguidsoap,
- liquidsoap-plugin-samplerate,
- liquidsoap-plugin-xmlplaylist
-Description: audio streaming language
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- Some of the typical uses are:
-  * dynamically generating playlists depending on the time or other factors
-  * having smooth transitions between songs
-  * adding jingles periodically
-  * applying effects on the sound like volume normalization
-  * reencoding the stream at various qualities
-  * remotely controlling the stream
-
-Package: liquidsoap-plugin-sdl
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- SDL plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides SDL support for liquidsoap.
-
-Package: liquidsoap-plugin-alsa
-Architecture: [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64]
-Depends:
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- ALSA plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides ALSA support for liquidsoap.
-
-Package: liquidsoap-plugin-ao
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- AO plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides AO support for liquidsoap.
-
-Package: liquidsoap-plugin-jack
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- JACK plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides JACK support for liquidsoap.
-
-Package: liquidsoap-plugin-icecast
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Icecast plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for Icecast output in liquidsoap.
-
-Package: liquidsoap-plugin-faad
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- FAAD plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for decoding AAC and M4A files in liquidsoap.
-
-Package: liquidsoap-plugin-flac
-Architecture: any
-Depends:
- liquidsoap-plugin-ogg (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- FLAC plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for decoding and encoding native
- and ogg-encapsulated FLAC data in liquidsoap.
-
-Package: liquidsoap-plugin-gavl
-Architecture: any
-Depends: 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Gavl plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for gavl video manipulation in Liquidsoap.
-
-Package: liquidsoap-plugin-graphics
-Architecture: any
-Depends: 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Graphics plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for Video visualisation operators using
- OCaml graphics module in Liquidsoap.
-
-Package: liquidsoap-plugin-ladspa
-Architecture: any
-Depends: 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- LADSPA plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for LADSPA audio effects in Liquidsoap.
-
-Package: liquidsoap-plugin-lastfm
-Architecture: any
-Depends: 
- liquidsoap-plugin-xmlplaylist (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Lastfm plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for Lastfm submission and radio streaming
- in Liquidsoap.
-
-Package: liquidsoap-plugin-mad
-Architecture: any
-Depends: 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Mad plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for MP3 audio data decoding in Liquidsoap.
-
-Package: liquidsoap-plugin-ogg
-Architecture: any
-Depends: 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Ogg plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for Ogg stream decoding and encoding in 
- Liquidsoap. This plugin is only useful when used with one of vorbis,
- speex, flac, theora or schroedinger plugin.
-
-Package: liquidsoap-plugin-oss
-Architecture: any
-Depends:
- liquidsoap-plugin-ogg (= ${binary:Version}), 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- OSS plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for OSS audio output in Liquidsoap.
-
-Package: liquidsoap-plugin-portaudio
-Architecture: any
-Depends: 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Portaudio plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for portaudio audio input and output in 
Liquidsoap.
-
-Package: liquidsoap-plugin-pulseaudio
-Architecture: any
-Depends: 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Pulseaudio plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for pulseaudio audio input and output in 
Liquidsoap.
-
-Package: liquidsoap-plugin-samplerate
-Architecture: any
-Depends: 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Samplerate plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for audio samplerate conversion using 
- libsamplerate in Liquidsoap.
-
-Package: liquidsoap-plugin-schroedinger
-Architecture: any
-Depends: 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Schroedinger plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support ogg/dirac video decoding and encoding using
- libschroedinger in Liquidsoap.
-
-Package: liquidsoap-plugin-soundtouch
-Architecture: any
-Depends: 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Soundtouch plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for audio manipulation using libsoundtouch 
- in Liquidsoap.
-
-Package: liquidsoap-plugin-speex
-Architecture: any
-Depends:
- liquidsoap-plugin-ogg (= ${binary:Version}), 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Speex plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for ogg/speex audio decoding and encoding
- in Liquidsoap.
-
-Package: liquidsoap-plugin-taglib
-Architecture: any
-Depends: 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Taglib plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for file metadata reading using taglib in 
- Liquidsoap.
-
-Package: liquidsoap-plugin-theora
-Architecture: any
-Depends: 
- liquidsoap-plugin-ogg (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Theora plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for ogg/theora video decoding and encoding 
- in Liquidsoap.
-
-Package: liquidsoap-plugin-voaacenc
-Architecture: any
-Depends: 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Voaacenc plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support AAC audio encoding in Liquidsoap.
-
-Package: liquidsoap-plugin-vorbis
-Architecture: any
-Depends: 
- liquidsoap-plugin-ogg (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Vorbis plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for ogg/vorbis audio decoding and encoding 
- in Liquidsoap.
-
-Package: liquidsoap-plugin-xmlplaylist
-Architecture: any
-Depends: 
- ${shlibs:Depends},
- ${misc:Depends}
-Description: audio streaming language -- Xmlplaylist plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for various XML playlist formats in Liquidsoap.
-
-Package: liguidsoap
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-gtk2
-Recommends: liquidsoap (= ${binary:Version})
-Description: control GUI for liquidsoap
- Liguidsoap is a GUI for controlling liquidsoap, using pyGTK.
- .
- It allows one to interact in various ways with:
-  * outputs
-  * playlists
-  * queues
-  * mixing table
- .
- It can control a running instance of liquidsoap or launch its own instance.
-
diff --git a/debian/liquidsoap-plugin-ao.onodefined 
b/debian/liquidsoap-plugin-ao.onodefined
new file mode 100644
index 0000000..4f5ee63
--- /dev/null
+++ b/debian/liquidsoap-plugin-ao.onodefined
@@ -0,0 +1 @@
+Ao
diff --git a/debian/liquidsoap-plugin-faad.onodefined 
b/debian/liquidsoap-plugin-faad.onodefined
new file mode 100644
index 0000000..46d78a1
--- /dev/null
+++ b/debian/liquidsoap-plugin-faad.onodefined
@@ -0,0 +1 @@
+Faad
diff --git a/debian/liquidsoap-plugin-flac.onodefined 
b/debian/liquidsoap-plugin-flac.onodefined
new file mode 100644
index 0000000..a9d8224
--- /dev/null
+++ b/debian/liquidsoap-plugin-flac.onodefined
@@ -0,0 +1,2 @@
+Ogg_flac
+Flac
diff --git a/debian/liquidsoap-plugin-gavl.onodefined 
b/debian/liquidsoap-plugin-gavl.onodefined
new file mode 100644
index 0000000..c6a51d4
--- /dev/null
+++ b/debian/liquidsoap-plugin-gavl.onodefined
@@ -0,0 +1 @@
+Gavl
diff --git a/debian/liquidsoap-plugin-graphics.onodefined 
b/debian/liquidsoap-plugin-graphics.onodefined
new file mode 100644
index 0000000..4db4798
--- /dev/null
+++ b/debian/liquidsoap-plugin-graphics.onodefined
@@ -0,0 +1,2 @@
+Graphics
+GraphicsX11
diff --git a/debian/liquidsoap-plugin-icecast.onodefined 
b/debian/liquidsoap-plugin-icecast.onodefined
new file mode 100644
index 0000000..7859136
--- /dev/null
+++ b/debian/liquidsoap-plugin-icecast.onodefined
@@ -0,0 +1 @@
+Cry
diff --git a/debian/liquidsoap-plugin-jack.onodefined 
b/debian/liquidsoap-plugin-jack.onodefined
new file mode 100644
index 0000000..974e5a7
--- /dev/null
+++ b/debian/liquidsoap-plugin-jack.onodefined
@@ -0,0 +1 @@
+Bjack
diff --git a/debian/liquidsoap-plugin-ladspa.onodefined 
b/debian/liquidsoap-plugin-ladspa.onodefined
new file mode 100644
index 0000000..725492e
--- /dev/null
+++ b/debian/liquidsoap-plugin-ladspa.onodefined
@@ -0,0 +1 @@
+Ladspa
diff --git a/debian/liquidsoap-plugin-lastfm.onodefined 
b/debian/liquidsoap-plugin-lastfm.onodefined
new file mode 100644
index 0000000..a141fa4
--- /dev/null
+++ b/debian/liquidsoap-plugin-lastfm.onodefined
@@ -0,0 +1,35 @@
+Netsys
+Equeue
+Unixqueue
+Uq_engines
+Uq_socks5
+Netconst
+Netstring_pcre
+Netstring_str
+Netbuffer
+Netaux
+Netchannels
+Netdate
+Netdb
+Netmappings
+Netconversion
+Netulex
+Netencoding
+Netstream
+Mimestring
+Nethtml_scanner
+Nethtml
+Neturl
+Netaddress
+Netmime
+Netsendmail
+Nethttp
+Netaccel
+Netaccel_link
+Http_client
+Telnet_client
+Ftp_data_endpoint
+Ftp_client
+Lastfm_constants
+Lastfm_generic
+Lastfm
diff --git a/debian/liquidsoap-plugin-mad.onodefined 
b/debian/liquidsoap-plugin-mad.onodefined
new file mode 100644
index 0000000..2820d07
--- /dev/null
+++ b/debian/liquidsoap-plugin-mad.onodefined
@@ -0,0 +1 @@
+Mad
diff --git a/debian/liquidsoap-plugin-ogg.onodefined 
b/debian/liquidsoap-plugin-ogg.onodefined
new file mode 100644
index 0000000..4ed63f7
--- /dev/null
+++ b/debian/liquidsoap-plugin-ogg.onodefined
@@ -0,0 +1 @@
+Ogg
diff --git a/debian/liquidsoap-plugin-oss.install.in 
b/debian/liquidsoap-plugin-oss.install.in
index fc75d92..fc04018 100644
--- a/debian/liquidsoap-plugin-oss.install.in
+++ b/debian/liquidsoap-plugin-oss.install.in
@@ -1,2 +1,2 @@
 usr/lib/liquidsoap/*/plugins/oss.cm*
-BYTE: @OCamlStdlibDir@/liquidsoap/dllliquidsoap_oss.so @OCamlDllDir@
+NODYN: debian/tmp/@OCamlStdlibDir@/liquidsoap/dllliquidsoap_oss.so 
@OCamlDllDir@
diff --git a/debian/liquidsoap-plugin-portaudio.onodefined 
b/debian/liquidsoap-plugin-portaudio.onodefined
new file mode 100644
index 0000000..5614f99
--- /dev/null
+++ b/debian/liquidsoap-plugin-portaudio.onodefined
@@ -0,0 +1 @@
+Portaudio
diff --git a/debian/liquidsoap-plugin-pulseaudio.onodefined 
b/debian/liquidsoap-plugin-pulseaudio.onodefined
new file mode 100644
index 0000000..7a1430b
--- /dev/null
+++ b/debian/liquidsoap-plugin-pulseaudio.onodefined
@@ -0,0 +1 @@
+Pulseaudio
diff --git a/debian/liquidsoap-plugin-samplerate.onodefined 
b/debian/liquidsoap-plugin-samplerate.onodefined
new file mode 100644
index 0000000..5ba3bb1
--- /dev/null
+++ b/debian/liquidsoap-plugin-samplerate.onodefined
@@ -0,0 +1 @@
+Samplerate
diff --git a/debian/liquidsoap-plugin-schroedinger.onodefined 
b/debian/liquidsoap-plugin-schroedinger.onodefined
new file mode 100644
index 0000000..220b5d8
--- /dev/null
+++ b/debian/liquidsoap-plugin-schroedinger.onodefined
@@ -0,0 +1 @@
+Schroedinger
diff --git a/debian/liquidsoap-plugin-sdl.onodefined 
b/debian/liquidsoap-plugin-sdl.onodefined
new file mode 100644
index 0000000..197be43
--- /dev/null
+++ b/debian/liquidsoap-plugin-sdl.onodefined
@@ -0,0 +1,13 @@
+Sdl
+Sdltimer
+Sdlmouse
+Sdlwm
+Sdlcdrom
+Sdlvideo
+Sdlttf
+Sdlloader
+Sdlmixer
+Sdlkey
+Sdlevent
+Sdljoystick
+Sdlgl
diff --git a/debian/liquidsoap-plugin-soundtouch.onodefined 
b/debian/liquidsoap-plugin-soundtouch.onodefined
new file mode 100644
index 0000000..3d41286
--- /dev/null
+++ b/debian/liquidsoap-plugin-soundtouch.onodefined
@@ -0,0 +1 @@
+Soundtouch
diff --git a/debian/liquidsoap-plugin-speex.onodefined 
b/debian/liquidsoap-plugin-speex.onodefined
new file mode 100644
index 0000000..4c6c766
--- /dev/null
+++ b/debian/liquidsoap-plugin-speex.onodefined
@@ -0,0 +1 @@
+Speex
diff --git a/debian/liquidsoap-plugin-taglib.onodefined 
b/debian/liquidsoap-plugin-taglib.onodefined
new file mode 100644
index 0000000..f45b1cc
--- /dev/null
+++ b/debian/liquidsoap-plugin-taglib.onodefined
@@ -0,0 +1 @@
+Taglib
diff --git a/debian/liquidsoap-plugin-theora.onodefined 
b/debian/liquidsoap-plugin-theora.onodefined
new file mode 100644
index 0000000..15967a0
--- /dev/null
+++ b/debian/liquidsoap-plugin-theora.onodefined
@@ -0,0 +1 @@
+Theora
diff --git a/debian/liquidsoap-plugin-voaacenc.onodefined 
b/debian/liquidsoap-plugin-voaacenc.onodefined
new file mode 100644
index 0000000..e96c7d1
--- /dev/null
+++ b/debian/liquidsoap-plugin-voaacenc.onodefined
@@ -0,0 +1 @@
+Voaacenc
diff --git a/debian/liquidsoap-plugin-vorbis.onodefined 
b/debian/liquidsoap-plugin-vorbis.onodefined
new file mode 100644
index 0000000..2197d30
--- /dev/null
+++ b/debian/liquidsoap-plugin-vorbis.onodefined
@@ -0,0 +1 @@
+Vorbis
diff --git a/debian/liquidsoap-plugin-xmlplaylist.onodefined 
b/debian/liquidsoap-plugin-xmlplaylist.onodefined
new file mode 100644
index 0000000..c42a106
--- /dev/null
+++ b/debian/liquidsoap-plugin-xmlplaylist.onodefined
@@ -0,0 +1,2 @@
+Xmlm
+Xmlplaylist
diff --git a/debian/liquidsoap.install.in b/debian/liquidsoap.install.in
index 51fa2f8..3b5cfc6 100644
--- a/debian/liquidsoap.install.in
+++ b/debian/liquidsoap.install.in
@@ -2,4 +2,4 @@ debian/tmp/usr/bin/liquidsoap
 debian/tmp/usr/lib/liquidsoap
 debian/tmp/etc/logrotate.d/liquidsoap
 examples/radio.liq               etc/liquidsoap
-BYTE: @OCamlStdlibDir@/liquidsoap/dllliquidsoap.so @OCamlDllDir@
+BYTE: debian/tmp/@OCamlStdlibDir@/liquidsoap/dllliquidsoap.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index c758acb..c754f44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/ocaml.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 := \
   --enable-ogg-plugin --enable-schroedinger-plugin --enable-flac-plugin \
   --enable-speex-plugin --enable-vorbis-plugin --enable-theora-plugin \
@@ -25,22 +21,14 @@ DEB_MAKE_INSTALL_TARGET := doc install 
DESTDIR=$(CURDIR)/debian/tmp/ OCAMLFIND_D
 DEB_INSTALL_MANPAGES_liquidsoap := doc/liquidsoap.1
 DEB_COMPRESS_EXCLUDE := .pdf
 DEB_DH_INSTALL_ARGS_liquidsoap := -Xplugins
-OCAML_DHOCAML_FLAGS := \
-  -Nliquidsoap-plugin-sdl -Nliquidsoap-plugin-alsa -Nliquidsoap-plugin-ao \
-  -Nliquidsoap-plugin-jack -Nliquidsoap-plugin-icecast 
-Nliquidsoap-plugin-faad \
-  -Nliquidsoap-plugin-flac -Nliquidsoap-plugin-gavl 
-Nliquidsoap-plugin-graphics \
-  -Nliquidsoap-plugin-ladspa -Nliquidsoap-plugin-lastfm 
-Nliquidsoap-plugin-mad \
-  -Nliquidsoap-plugin-ogg -Nliquidsoap-plugin-oss 
-Nliquidsoap-plugin-portaudio \
-  -Nliquidsoap-plugin-pulseaudio -Nliquidsoap-plugin-samplerate \
-  -Nliquidsoap-plugin-schroedinger -Nliquidsoap-plugin-soundtouch 
-Nliquidsoap-plugin-speex \
-  -Nliquidsoap-plugin-taglib -Nliquidsoap-plugin-theora 
-Nliquidsoap-plugin-voaacenc \
-  -Nliquidsoap-plugin-vorbis -Nliquidsoap-plugin-xmlplaylist
 
 # Compile in bytecode on armel..
-ifeq ($(DEB_HOST_ARCH),armel)
+#ifeq ($(OCAML_NATDYNLINK),no)
   DEB_CONFIGURE_EXTRA_FLAGS += --disable-nativecode
-  export OCAMLINIT_SED := " -e '/^OPT: /d' -e 's/^BYTE: //'"
-endif
+  export OCAMLINIT_SED := -e 's/^NODYN: //'
+#else
+#  export OCAMLINIT_SED := -e '/^DYN: /d'
+#endif
 
 makebuilddir/liquidsoap::
        [ ! -f src/configure.ml ] || [ -f src/configure.ml.cdbs-backup ] || \

-- 
liquidsoap packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to