[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/1.0.0-4-3-gead1109
The following commit has been merged in the master branch: commit 95eff4782bb4c95a20dff15daff921e3c7a4c067 Merge: 86e3f73ee4e83f5b9fc461ddfab71027789626e2 545fbd00bee1180bba75cac2bf895ffc59f3c9b8 Author: Romain Beauxis to...@rastageeks.org Date: Wed Jul 4 00:41:00 2012 +0200 Merge tag 'upstream/1.0.1' Upstream version 1.0.1 -- 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
[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/1.0.0-4-3-gead1109
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..000
--- 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
[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, pristine-tar, updated. 4818d69fafaf5c35fb7742240a3221ede7a39925
The following commit has been merged in the pristine-tar branch: commit 4818d69fafaf5c35fb7742240a3221ede7a39925 Author: Romain Beauxis to...@rastageeks.org Date: Wed Jul 4 00:40:59 2012 +0200 pristine-tar data for liquidsoap_1.0.1.orig.tar.bz2 diff --git a/liquidsoap_1.0.1.orig.tar.bz2.delta b/liquidsoap_1.0.1.orig.tar.bz2.delta new file mode 100644 index 000..ec568ae Binary files /dev/null and b/liquidsoap_1.0.1.orig.tar.bz2.delta differ diff --git a/liquidsoap_1.0.1.orig.tar.bz2.id b/liquidsoap_1.0.1.orig.tar.bz2.id new file mode 100644 index 000..2495375 --- /dev/null +++ b/liquidsoap_1.0.1.orig.tar.bz2.id @@ -0,0 +1 @@ +72d65f228418fb9234a1edfafdf9ab0e11a634f4 -- 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
[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging annotated tag, debian/1.0.1-1, created. debian/1.0.1-1
The annotated tag, debian/1.0.1-1 has been created at 3e8e3a20cdb61493d56f206f6d138959c25d13bc (tag) tagging ead1109a01eedc611b2cd70b1e7a222d13df2368 (commit) replaces debian/1.0.0-4 tagged by Romain Beauxis on Wed Jul 4 01:49:11 2012 +0200 - Shortlog Debian release 1.0.1-1 Romain Beauxis (3): Imported Upstream version 1.0.1 Merge tag 'upstream/1.0.1' Prepared new upstream release. --- -- 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
[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging annotated tag, upstream/1.0.1, created. upstream/1.0.1
The annotated tag, upstream/1.0.1 has been created at c68182aa46218102ada212b90cbbc30c7a58ed06 (tag) tagging 545fbd00bee1180bba75cac2bf895ffc59f3c9b8 (commit) replaces upstream/1.0.0 tagged by Romain Beauxis on Wed Jul 4 00:40:59 2012 +0200 - Shortlog Upstream version 1.0.1 Romain Beauxis (1): Imported Upstream version 1.0.1 --- -- 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
