The following commit has been merged in the master branch:
commit e99ea6ce6e3f0a69eec24d5a9aa715e4ba32c6df
Author: Samuel Mimram <smim...@gmail.com>
Date: Tue May 17 11:44:45 2011 +0200
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 369f9d3..2571b10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+liquidsoap (1.0.0~beta1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Removed patches, integrated upstream.
+
+ -- Samuel Mimram <smim...@debian.org> Mon, 16 May 2011 11:45:06 +0200
+
liquidsoap (0.9.3-3) unstable; urgency=low
* Upload to unstable.
diff --git a/debian/control b/debian/control
index d328568..c249b87 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
libcry-ocaml-dev (>= 0.1.5),
libogg-ocaml-dev (>= 0.4.1),
libvorbis-ocaml-dev (>= 0.5.1-2),
- libmad-ocaml-dev (>= 0.4.0),
+ libmad-ocaml-dev (>= 0.4.1),
libdtools-ocaml-dev (>= 0.2.1),
libtaglib-ocaml-dev (>= 0.1.3),
libcamomile-ocaml-dev,
@@ -24,14 +24,14 @@ Build-Depends:
python-support (>= 0.3),
libao-ocaml-dev (>= 0.2.0),
libduppy-ocaml-dev (>= 0.3.2),
- libalsa-ocaml-dev (>= 0.2.0) [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64],
+ libalsa-ocaml-dev (>= 0.2.1) [!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),
+ liblastfm-ocaml-dev (>= 0.3.0),
libspeex-ocaml-dev (>= 0.1.2-2),
- libgavl-ocaml-dev (>= 0.1.3),
+ libgavl-ocaml-dev (>= 0.1.4),
libtheora-ocaml-dev (>= 0.2.0-3),
libportaudio-ocaml-dev (>= 0.1.3),
libpulse-ocaml-dev (>= 0.1.1),
@@ -41,7 +41,7 @@ Build-Depends:
libbjack-ocaml-dev (>= 0.1.3),
libsdl-ocaml-dev,
libfaad-ocaml-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
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/
diff --git
a/debian/patches/0001-Enabled-non-custom-build-for-bytecode-compilation.patch
b/debian/patches/0001-Enabled-non-custom-build-for-bytecode-compilation.patch
deleted file mode 100644
index 193aca8..0000000
---
a/debian/patches/0001-Enabled-non-custom-build-for-bytecode-compilation.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From: Romain Beauxis <to...@rastageeks.org>
-Date: Tue, 28 Sep 2010 14:44:28 -0500
-Subject: [PATCH] Enabled non-custom build for bytecode compilation.
-
----
- Makefile.rules | 23 +++++++++++++++++++++--
- src/Makefile | 26 +++++++++++---------------
- 2 files changed, 32 insertions(+), 17 deletions(-)
-
-diff --git a/Makefile.rules b/Makefile.rules
-index d75494a..8a29a0b 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -78,12 +78,27 @@ $(PROG)_depend: $($(PROG)_sources) $($(PROG)_headers)
- $(V)$(OCAMLDEP) $(_DEP_OPTS) $(DEP_OPTS) \
- $($(PROG)_sources) $($(PROG)_headers) > $@
-
--$(PROG): $($(PROG)_sources:.ml=.$(o))
-+dll$(PROG).so: $($(PROG)_c_files:.c=.o)
-+ $(V)echo OCAMLMKLIB -o dll$(PROG).so
-+ $(V)ocamlmklib -o $(PROG) $($(PROG)_c_files:.c=.o)
-+
-+ifdef $(PROG)_c_files
-+ ifeq ($(BYTE),yes)
-+ c_objs=dll$(PROG).so $($(PROG)_c_files:.c=.o)
-+ c_link=-dllib dll$(PROG).so $($(PROG)_c_files:.c=.o)
-+ else
-+ c_objs=$($(PROG)_c_files:.c=.o)
-+ c_link=$(c_objs)
-+ endif
-+endif
-+
-+$(PROG): $($(PROG)_sources:.ml=.$(o)) $(c_objs)
- $(V)echo OCAMLC -o $(PROG)
- $(V)$(OCAMLC) -o $(PROG) \
- $(_OCAML_CFLAGS) $(OCAML_CFLAGS) \
- $(_OCAML_LFLAGS) $(OCAML_LFLAGS) \
-- $($(PROG)_sources:.ml=.$(o)) $($(PROG)_objs)
-+ $($(PROG)_sources:.ml=.$(o)) \
-+ $(c_link)
- endif
-
- %.ml: %.mll
-@@ -102,6 +117,10 @@ endif
- $(V)echo OCAMLC -c $<
- $(V)$(OCAMLC) $(_OCAML_CFLAGS) $(OCAML_CFLAGS) -c $<
-
-+%.o: %.c
-+ $(V)echo CC -c $<
-+ $(V)$(CC) $(CFLAGS) -c $< -o $@
-+
- #
- # dist
- #
-diff --git a/src/Makefile b/src/Makefile
-index 8c3f852..19b84d3 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -8,6 +8,13 @@ DISTFILES = $(wildcard *.mli) Makefile \
-
- ocaml_progs= liquidsoap
-
-+liquidsoap_c_files = \
-+ stream/rgb_c.c stream/float_pcm_c.c \
-+ $(if $(W_OSS),io/oss_io_c.c) \
-+ $(if $(W_V4L),io/v4l_io_c.c) \
-+ $(if $(NEED_TCP_NODELAY), tools/socket_stubs.c) \
-+ $(if $(W_OPAL),io/opal_io_c.c)
-+
- ogg_utils = \
- $(if $(W_OGG),ogg_demuxer.ml) \
- $(if $(W_OGG),ogg_encoder.ml) \
-@@ -114,27 +121,25 @@ outputs = outputs/output.ml outputs/file_output.ml \
- $(if $(W_SDL),outputs/sdl_out.ml) \
- $(if $(W_GRAPHICS),outputs/graphics_out.ml)
-
--io = $(if $(W_OSS),io/oss_io_c.c io/oss_io.ml) \
-+io = $(if $(W_OSS),io/oss_io.ml) \
- $(if $(W_ALSA),io/alsa_io.ml) \
- $(if $(W_PORTAUDIO),io/portaudio_io.ml) \
- $(if $(W_PULSEAUDIO),io/pulseaudio_io.ml) \
- $(if $(W_JACK),io/jack_io.ml) \
-- $(if $(W_V4L),io/v4l_io_c.c) \
- $(if $(W_V4L),io/v4l_io.ml) \
-- $(if $(W_OPAL),io/opal_io_c.o io/opal_io.ml) \
-+ $(if $(W_OPAL),io/opal_io.ml) \
- io/marshal_io.ml
-
- tools = tools/doc.ml tools/plug.ml tools/utils.ml \
- tools/rqueue.ml tools/ringbuffer.ml \
-- $(if $(NEED_TCP_NODELAY), tools/socket_stubs.c) \
- tools/liq_sockets.ml \
- tools/wav.ml $(if $(BYTE),tools/dynliq.ml) configure.ml \
- tools/tutils.ml tools/sutils.ml tools/http.ml
-
--stream = stream/midi.ml fmt.ml stream/rgb_c.c stream/RGB.ml \
-+stream = stream/midi.ml fmt.ml stream/RGB.ml \
- stream/frame.ml decoder.ml playlist_parser.ml \
- request.ml source.ml root.ml \
-- stream/float_pcm_c.c stream/float_pcm.ml \
-+ stream/float_pcm.ml \
- stream/aFrame.ml stream/vFrame.ml stream/mFrame.ml
-
- visualization = visualization/vumeter.ml \
-@@ -191,15 +196,6 @@ liquidsoap_doc_sources= \
- top_srcdir=..
- include $(top_srcdir)/Makefile.rules
-
--stream/float_pcm_c.o: stream/float_pcm_c.c
-- $(MAKE) -C stream float_pcm_c.o
--stream/rgb_c.o: stream/rgb_c.c
-- $(MAKE) -C stream rgb_c.o
--io/oss_io_c.o: io/oss_io_c.c
-- $(MAKE) -C io oss_io_c.o
--io/opal_io_c.o: io/opal_io_c.c
-- $(MAKE) -C io opal_io_c.o
--
- # Compute something like " (trunk/liquidsoap@rev1234)" when .svn is present,
- SVN.ml: Makefile $(liquidsoap_sources:SVN.ml=)
- if test -d .svn && which svn > /dev/null ; then \
---
diff --git a/debian/patches/0002-Update-faad-decoder.patch
b/debian/patches/0002-Update-faad-decoder.patch
deleted file mode 100644
index 06e2d6f..0000000
--- a/debian/patches/0002-Update-faad-decoder.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: liquidsoap/src/formats/aacformat.ml
-===================================================================
---- liquidsoap.orig/src/formats/aacformat.ml 2011-04-14 13:53:36.000000000
-0500
-+++ liquidsoap/src/formats/aacformat.ml 2011-04-14 13:53:56.000000000
-0500
-@@ -66,7 +66,6 @@
- | e -> Unix.close fd; raise e
- in
- let close (dec,fd,_,_,_,_,_) =
-- Faad.close dec;
- Unix.close fd
- in
- let decode (dec,_,aacbuf,fill_aacbuf,aacbufpos,sample_freq,pos) abg =
-@@ -112,7 +111,6 @@
- | e -> Unix.close fd; raise e
- in
- let close (dec,fd,_,_,_,_,_) =
-- Faad.close dec;
- Unix.close fd
- in
- let decode (dec,fd,track,mp4,sample,samples,sample_freq) abg =
-Index: liquidsoap/src/sources/http_aac.ml
-===================================================================
---- liquidsoap.orig/src/sources/http_aac.ml 2011-04-14 13:54:16.000000000
-0500
-+++ liquidsoap/src/sources/http_aac.ml 2011-04-14 13:54:31.000000000 -0500
-@@ -47,7 +47,6 @@
- Faad.find_frame !buf
- with Not_found ->
- sink.Http_source.close ();
-- Faad.close dec;
- raise Frame_not_found
- in
- buf := String.sub !buf n (String.length !buf - n);
-@@ -65,7 +64,6 @@
- | Faad.Error n as e ->
- aac_stream_log#f 2 "Faad error: %s" (Faad.error_message n);
- sink.Http_source.close ();
-- Faad.close dec;
- raise e
-
- let () =
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 231aacc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Enabled-non-custom-build-for-bytecode-compilation.patch
-0002-Update-faad-decoder.patch
--
liquidsoap packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
