The following commit has been merged in the master branch:
commit ead1109a01eedc611b2cd70b1e7a222d13df2368
Author: Romain Beauxis <to...@rastageeks.org>
Date:   Wed Jul 4 01:48:46 2012 +0200

    Prepared new upstream release.

diff --git a/debian/changelog b/debian/changelog
index b450d5a..396941e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+liquidsoap (1.0.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * Fixed liquidsoap.install.in for armel. 
+  * Dropped fix_lo_deps.patch: applied upstream.
+
+ -- Romain Beauxis <to...@rastageeks.org>  Wed, 04 Jul 2012 00:41:16 +0200
+
 liquidsoap (1.0.0-4) unstable; urgency=low
 
   * Removed wrong depedency on liquidsoap-plugin-ogg from
diff --git a/debian/control b/debian/control
index 4a5ad05..e70cb39 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  libogg-ocaml-dev (>= 0.4.3),
  libvorbis-ocaml-dev (>= 0.6.1),
  libmad-ocaml-dev (>= 0.4.3),
- libdtools-ocaml-dev (>= 0.2.2),
+ libdtools-ocaml-dev (>= 0.3.0),
  libtaglib-ocaml-dev (>= 0.1.4),
  libcamomile-ocaml-dev,
  festival,
@@ -41,7 +41,7 @@ Build-Depends:
  libsdl-ocaml-dev,
  libfaad-ocaml-dev (>= 0.3.0),
  libmm-ocaml-dev (>= 0.2.0),
- libflac-ocaml-dev,
+ libflac-ocaml-dev (>= 0.1.1),
  libschroedinger-ocaml-dev,
  libvoaacenc-ocaml-dev,
  libmp3lame-ocaml-dev (>= 0.3.1),
diff --git a/debian/liquidsoap.install.in b/debian/liquidsoap.install.in
index 3b5cfc6..fada731 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: debian/tmp/@OCamlStdlibDir@/liquidsoap/dllliquidsoap.so @OCamlDllDir@
+NODYN: debian/tmp/@OCamlStdlibDir@/liquidsoap/dllliquidsoap.so @OCamlDllDir@
diff --git a/debian/patches/fix_lo_deps.patch b/debian/patches/fix_lo_deps.patch
deleted file mode 100644
index f8bf67f..0000000
--- a/debian/patches/fix_lo_deps.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: liquidsoap/Makefile.rules
-===================================================================
---- liquidsoap.orig/Makefile.rules     2011-10-17 00:42:51.917975028 +0200
-+++ liquidsoap/Makefile.rules  2011-10-18 16:42:23.722251534 +0200
-@@ -156,6 +156,10 @@
- flac_ogg_dontlink += ogg flac
- lastfm_dontlink += xmlm xmlplaylist
- 
-+# Lo name is too generic for the above test to pass
-+lo_dontlink =
-+lo_ocamllflags += -package lo
-+
- # Here is how compilation of .ml files work:
- # We concatenate all {C,L}FLAGS for .ml compilation.
- # However, when linking the final objects, we seperate them back.
diff --git a/debian/patches/series b/debian/patches/series
index 3af16ba..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-fix_lo_deps.patch

-- 
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