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

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 26054f54fda3d2991db8263d2177fa99cd797c46
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Tue May 14 08:42:20 2013 -0500

    Added liquidsoap-plugin-fdkaac

diff --git a/debian/changelog b/debian/changelog
index 87eac69..e9e82d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ liquidsoap (1.1.1-3) unstable; urgency=low
 
   * Added liquidsoap emacs mode package. 
   * Merge changes from NMU 1.0.1+repack1-1.1
+  * Added liquidsoap-plugin-fdkaac
 
  -- Romain Beauxis <toots at rastageeks.org>  Tue, 14 May 2013 00:35:34 -0500
 
diff --git a/debian/control b/debian/control
index 96c311f..76f44c3 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Build-Depends:
  libpcre-ocaml-dev,
  libladspa-ocaml-dev (>= 0.1.4),
  sox,
+ libfdkaac-ocaml-dev,
  libsoundtouch-ocaml-dev (>= 0.1.7),
  libinotify-ocaml-dev [linux-any],
  liblastfm-ocaml-dev (>= 0.3.0),
@@ -121,6 +122,7 @@ Depends:
  liquidsoap-plugin-camlimages,
  liquidsoap-plugin-dssi,
  liquidsoap-plugin-faad,
+ liquidsoap-plugin-fdkaac,
  liquidsoap-plugin-flac,
  liquidsoap-plugin-frei0r,
  liquidsoap-plugin-gavl,
@@ -247,6 +249,25 @@ Description: audio streaming language -- FAAD plugin
  .
  This package provides support for decoding AAC and M4A files in liquidsoap.
 
+Package: liquidsoap-plugin-fdkaac
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${ocaml:Depends},
+ ${misc:Depends},
+ liquidsoap (= ${binary:Version})
+Section: contrib/sound
+Description: audio streaming language -- FDK AAC 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 in AAC format in liquidsoap using the
+ FDK AAC library.
+
 Package: liquidsoap-plugin-flac
 Architecture: any
 Depends:
diff --git a/debian/liquidsoap-plugin-fdkaac.install b/debian/liquidsoap-plugin-fdkaac.install
new file mode 100644
index 0000000..4d77d1b
--- /dev/null
+++ b/debian/liquidsoap-plugin-fdkaac.install
@@ -0,0 +1 @@
+usr/lib/liquidsoap/*/plugins/fdkaac.cm*
diff --git a/debian/rules b/debian/rules
index 287a670..b94c613 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
   --enable-dssi-dynamic-plugin --enable-lo-dynamic-plugin --enable-camlimages-dynamic-plugin \
   --enable-gstreamer-dynamic-plugin --enable-gd-dynamic-plugin --with-default-font=$(DEFAULT_FONT) \
   --enable-opus-dynamic-plugin --enable-frei0r-dynamic-plugin --enable-shine-dynamic-plugin \
-  --disable-custom
+  --enable-fdkaac-dynamic-plugin --disable-custom
 DEB_MAKE_BUILD_TARGET := all doc
 DEB_MAKE_INSTALL_TARGET := doc install DESTDIR=$(CURDIR)/debian/tmp/ OCAMLFIND_DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR) \
 		                       prefix=$(CURDIR)/debian/tmp/usr sysconfdir=$(CURDIR)/debian/tmp/etc \
@@ -38,7 +38,7 @@ else
     -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-pulseaudio -Nliquidsoap-plugin-samplerate -Nliquidsoap-plugin-fdkaac \
     -Nliquidsoap-plugin-schroedinger -Nliquidsoap-plugin-soundtouch -Nliquidsoap-plugin-speex \
     -Nliquidsoap-plugin-taglib -Nliquidsoap-plugin-theora -Nliquidsoap-plugin-voaacenc \
     -Nliquidsoap-plugin-vorbis -Nliquidsoap-plugin-xmlplaylist -Nliquidsoap-plugin-lame \

-- 
liquidsoap packaging