The following commit has been merged in the master branch:
commit 61330658fdf4d530af4dbc4cae5ae168462e7727
Author: Romain Beauxis <to...@rastageeks.org>
Date: Fri Oct 21 21:34:01 2011 +0200
Several fixes..
diff --git a/Makefile.rules b/Makefile.rules
index ea01606..d5f3b3e 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -141,7 +141,7 @@ $(foreach plug,$($(PROG)_PLUGINS),$(call plug_deps,$(plug)))
# Compute plugins dependencies that are not already
# linked with liquidsoap
plug_packages = \
- $(if $(findstring " $(2)",$($(PROG)_ocamllflags)
$($(PROG)_ocamlcflags)),$(eval $(1)_dontlink += $(2)),$(eval $(1)_ocamllflags
+= -package $(2)))
+ $(if $(findstring $(2),$($(PROG)_ocamllflags) $($(PROG)_ocamlcflags)),$(eval
$(1)_dontlink += $(2)),$(eval $(1)_ocamllflags += -package $(2)))
$(foreach plug,$($(PROG)_PLUGINS),\
$(foreach package,$($(plug)_packages),$(call
plug_packages,$(plug),$(package))))
@@ -156,6 +156,10 @@ flac_dontlink += ogg
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/changelog b/debian/changelog
index 71c4a76..65abb14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+liquidsoap (1.0.0-4) UNRELEASED; urgency=low
+
+ * Removed wrong depedency on liquidsoap-plugin-ogg from
+ liquidsoap-plugin-oss.
+
+ -- Romain Beauxis <to...@rastageeks.org> Fri, 21 Oct 2011 21:32:51 +0200
+
+liquidsoap (1.0.0-3) unstable; urgency=low
+
+ * Better patch to compute lo dymanic plugin dependencies.
+
+ -- Romain Beauxis <to...@rastageeks.org> Tue, 18 Oct 2011 16:43:01 +0200
+
liquidsoap (1.0.0-2) unstable; urgency=low
* Fixed gstreamer, lo and camlimages plugins:
diff --git a/debian/control b/debian/control
index 1b91e32..4a5ad05 100644
--- a/debian/control
+++ b/debian/control
@@ -475,7 +475,6 @@ Description: audio streaming language -- Ogg plugin
Package: liquidsoap-plugin-oss
Architecture: any
Depends:
- liquidsoap-plugin-ogg (= ${binary:Version}),
${shlibs:Depends},
${ocaml:Depends},
${misc:Depends},
diff --git a/debian/patches/fix_dynamic_modules_deps.patch
b/debian/patches/fix_dynamic_modules_deps.patch
deleted file mode 100644
index 2af05f7..0000000
--- a/debian/patches/fix_dynamic_modules_deps.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: liquidsoap/Makefile.rules
-===================================================================
---- liquidsoap.orig/Makefile.rules 2011-10-17 00:42:51.917975028 +0200
-+++ liquidsoap/Makefile.rules 2011-10-17 00:43:52.472239868 +0200
-@@ -141,7 +141,7 @@
- # Compute plugins dependencies that are not already
- # linked with liquidsoap
- plug_packages = \
-- $(if $(findstring $(2),$($(PROG)_ocamllflags)
$($(PROG)_ocamlcflags)),$(eval $(1)_dontlink += $(2)),$(eval $(1)_ocamllflags
+= -package $(2)))
-+ $(if $(findstring " $(2)",$($(PROG)_ocamllflags)
$($(PROG)_ocamlcflags)),$(eval $(1)_dontlink += $(2)),$(eval $(1)_ocamllflags
+= -package $(2)))
- $(foreach plug,$($(PROG)_PLUGINS),\
- $(foreach package,$($(plug)_packages),$(call
plug_packages,$(plug),$(package))))
-
diff --git a/debian/patches/fix_lo_deps.patch b/debian/patches/fix_lo_deps.patch
new file mode 100644
index 0000000..f8bf67f
--- /dev/null
+++ b/debian/patches/fix_lo_deps.patch
@@ -0,0 +1,15 @@
+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 6140717..3af16ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fix_dynamic_modules_deps.patch
+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
