[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/1.1.1-4-3-g6fd3a34

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 6fd3a3400b50f64635233408626c0c7d956e2ce2
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Wed May 15 07:40:11 2013 -0500

    Drop SDL plugin for now..

diff --git a/debian/changelog b/debian/changelog
index 12d89b9..133851f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ liquidsoap (1.1.1-5) unstable; urgency=low
   * Switch GD build-dep to libgd-ocaml-dev. 
   * Provide alternative build-dep on libgd-gd2-ocaml-dev.
   * Bump build-dep on camlimages.
+  * Drop optional SDL plugin until SDL and gd become compatible
+    again (conflicts on libtiff{4,5}-dev). 
 
  -- Romain Beauxis <toots at rastageeks.org>  Wed, 15 May 2013 07:06:38 -0500
 
diff --git a/debian/control b/debian/control
index 7d03d7b..ce3bb8a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ 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.85~),
- quilt,
  debhelper (>= 7.0.1),
  ocaml-nox,
  dh-ocaml (>= 1.0.1),
@@ -41,7 +40,6 @@ Build-Depends:
  libxmlplaylist-ocaml-dev (>= 0.1.3),
  libmagic-ocaml-dev (>= 0.3.6),
  libbjack-ocaml-dev (>= 0.1.4),
- libsdl-ocaml-dev,
  libfaad-ocaml-dev (>= 0.3.2),
  libmm-ocaml-dev (>= 0.2.1),
  libflac-ocaml-dev (>= 0.1.1-3),
@@ -143,7 +141,6 @@ Depends:
  liquidsoap-plugin-pulseaudio,
  liquidsoap-plugin-samplerate,
  liquidsoap-plugin-schroedinger,
- liquidsoap-plugin-sdl,
  liquidsoap-plugin-shine,
  liquidsoap-plugin-soundtouch,
  liquidsoap-plugin-speex,
@@ -603,24 +600,6 @@ Description: audio streaming language -- Schroedinger plugin
  This package provides support ogg/dirac video decoding and encoding using
  libschroedinger in Liquidsoap.
 
-Package: liquidsoap-plugin-sdl
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${ocaml:Depends},
- ${misc:Depends},
- liquidsoap (= ${binary:Version})
-Recommends: ttf-liberation
-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-shine
 Architecture: any
 Depends:
diff --git a/debian/rules b/debian/rules
index 0b7f0f4..5b9a705 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ DEFAULT_FONT := /usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.
 DEB_CONFIGURE_EXTRA_FLAGS := \
   --enable-ogg-dynamic-plugin --enable-schroedinger-dynamic-plugin --enable-flac-dynamic-plugin \
   --enable-speex-dynamic-plugin --enable-vorbis-dynamic-plugin --enable-theora-dynamic-plugin \
-  --enable-sdl-dynamic-plugin --enable-gavl-dynamic-plugin --enable-mad-dynamic-plugin \
+  --enable-gavl-dynamic-plugin --enable-mad-dynamic-plugin \
   --enable-faad-dynamic-plugin --enable-xmlplaylist-dynamic-plugin --enable-lastfm-dynamic-plugin \
   --enable-voaacenc-dynamic-plugin --enable-taglib-dynamic-plugin --enable-cry-dynamic-plugin \
   --enable-portaudio-dynamic-plugin --enable-pulseaudio-dynamic-plugin --enable-ao-dynamic-plugin \
@@ -33,7 +33,7 @@ ifeq ($(OCAML_NATDYNLINK),no)
   export OCAMLINIT_SED := -e 's/^NODYN: //'
 else
   OCAML_DHOCAML_FLAGS := \
-    -Nliquidsoap-plugin-sdl -Nliquidsoap-plugin-alsa -Nliquidsoap-plugin-ao \
+    -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 \
@@ -77,7 +77,6 @@ binary-install/liguidsoap::
 
 clean::
 	dh_autoreconf_clean
-	quilt pop -a || true
 	rm -rf src/liquidsoap src/META radio.liq.example \
 	       src/SVN.ml src/io/liquidsoap_depend autodoc \
 	       doc/manual debian/liquidsoap.init src/dllliquidsoap.so \

-- 
liquidsoap packaging