The following commit has been merged in the master branch: commit 4392e915fe15cfcd6eb437d01f1440759870d734 Author: Romain Beauxis <to...@rastageeks.org> Date: Mon Oct 17 03:01:50 2011 +0200
Prepared new upload diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..845ca06 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.pc diff --git a/Makefile.rules b/Makefile.rules index f0e216e..ea01606 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)))) diff --git a/debian/changelog b/debian/changelog index 927b877..71c4a76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +liquidsoap (1.0.0-2) unstable; urgency=low + + * Fixed gstreamer, lo and camlimages plugins: + - Build-dep on ocaml-gstreamer >= 0.1.3 (fixed + linking options order). + - Build-dep on camlimages >= 4.0.1-4 (fixed Sort + weirdness). + - Patch Makefile.rules to compute correct dependencies + for dynamically linked modules. + + -- Romain Beauxis <to...@rastageeks.org> Mon, 17 Oct 2011 00:17:59 +0200 + liquidsoap (1.0.0-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index f0cb0d7..1b91e32 100644 --- a/debian/control +++ b/debian/control @@ -47,10 +47,9 @@ Build-Depends: libmp3lame-ocaml-dev (>= 0.3.1), libdssi-ocaml-dev, liblo-ocaml-dev, - libcamlimages-ocaml-dev, + libcamlimages-ocaml-dev (>= 4.0.1-4), libyojson-ocaml-dev, - libgstreamer-ocaml-dev, - camlidl, + libgstreamer-ocaml-dev (>= 0.1.0-3), libgd-gd2-noxpm-ocaml-dev (>= 1.0~alpha5-3), ttf-liberation Standards-Version: 3.9.2 diff --git a/debian/patches/fix_dynamic_modules_deps.patch b/debian/patches/fix_dynamic_modules_deps.patch new file mode 100644 index 0000000..2af05f7 --- /dev/null +++ b/debian/patches/fix_dynamic_modules_deps.patch @@ -0,0 +1,13 @@ +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/series b/debian/patches/series new file mode 100644 index 0000000..6140717 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix_dynamic_modules_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