[Pkg-ocaml-maint-commits] [liquidsoap] branch master updated (02a6e0d - b90915a)
This is an automated email from the git hooks/post-receive script. toots pushed a change to branch master in repository liquidsoap. from 02a6e0d Prepare new package. new b90915a Refresh patches. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/patches/fdkaad-dynlink.patch | 78 ++--- debian/patches/shine_abi_3 | 4 +- src/encoder/shine_encoder.ml| 2 +- 3 files changed, 40 insertions(+), 44 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git ___ 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] [liquidsoap] 01/01: Refresh patches.
This is an automated email from the git hooks/post-receive script. toots pushed a commit to branch master in repository liquidsoap. commit b90915a0a80ee3a70985ec50d9c9bfb2f5b758bc Author: Romain Beauxis to...@rastageeks.org Date: Mon Aug 11 20:25:25 2014 -0500 Refresh patches. --- debian/patches/fdkaad-dynlink.patch | 78 ++--- debian/patches/shine_abi_3 | 4 +- src/encoder/shine_encoder.ml| 2 +- 3 files changed, 40 insertions(+), 44 deletions(-) diff --git a/debian/patches/fdkaad-dynlink.patch b/debian/patches/fdkaad-dynlink.patch index 02c54b1..77469ae 100644 --- a/debian/patches/fdkaad-dynlink.patch +++ b/debian/patches/fdkaad-dynlink.patch @@ -1,8 +1,8 @@ -diff --git a/Makefile.defs.in b/Makefile.defs.in -index 9135d41..f221ad0 100644 a/Makefile.defs.in -+++ b/Makefile.defs.in -@@ -79,6 +79,7 @@ W_AACPLUS=@W_AACPLUS@ +Index: liquidsoap/Makefile.defs.in +=== +--- liquidsoap.orig/Makefile.defs.in 2014-08-11 20:25:00.054875908 -0500 liquidsoap/Makefile.defs.in2014-08-11 20:25:00.014869874 -0500 +@@ -79,6 +79,7 @@ W_AACPLUS_DYN=@W_AACPLUS_DYN@ W_VOAACENC=@W_VOAACENC@ W_FDKAAC=@W_FDKAAC@ @@ -10,11 +10,11 @@ index 9135d41..f221ad0 100644 W_ALSA=@W_ALSA@ W_BJACK=@W_BJACK@ W_AO=@W_AO@ -diff --git a/configure.ac b/configure.ac -index 9a2ba66..09e6cc6 100644 a/configure.ac -+++ b/configure.ac -@@ -484,6 +484,15 @@ AC_CHECK_OCAML_BINDING([voaacenc],[0.1.0]) +Index: liquidsoap/configure.ac +=== +--- liquidsoap.orig/configure.ac 2014-08-11 20:25:00.054875908 -0500 liquidsoap/configure.ac2014-08-11 20:25:00.014869874 -0500 +@@ -484,6 +484,15 @@ # AC_CHECK_OCAML_BINDING([fdkaac],[0.1.0]) @@ -30,11 +30,11 @@ index 9a2ba66..09e6cc6 100644 # # Theora -diff --git a/src/Makefile b/src/Makefile -index b6851fb..e9af43d 100644 a/src/Makefile -+++ b/src/Makefile -@@ -156,9 +156,11 @@ analyze = analyze/analyze_rms.ml +Index: liquidsoap/src/Makefile +=== +--- liquidsoap.orig/src/Makefile 2014-08-11 20:25:00.054875908 -0500 liquidsoap/src/Makefile2014-08-11 20:25:00.014869874 -0500 +@@ -156,9 +156,11 @@ encoders = \ encoder/wav_encoder.ml \ encoder/lame_encoder.ml \ @@ -46,7 +46,7 @@ index b6851fb..e9af43d 100644 $(if $(W_AACPLUS_DYN),encoder/aacplus_encoder_dynlink.ml) $(call conditional_compilation,encoders,$(W_SHINE),encoder/shine_encoder.ml) -@@ -166,7 +168,7 @@ $(call conditional_compilation,encoders,$(W_LAME),encoder/lame_encoder_builtin.m +@@ -166,7 +168,7 @@ $(call conditional_compilation,encoders,$(W_FLAC),encoder/flac_encoder.ml) $(call conditional_compilation,encoders,$(W_AACPLUS),encoder/aacplus_encoder_builtin.ml) $(call conditional_compilation,encoders,$(W_VOAACENC),encoder/voaacenc_encoder.ml) @@ -55,7 +55,7 @@ index b6851fb..e9af43d 100644 $(call conditional_compilation,encoders,$(W_TAGLIB),encoder/taglib_id3v2.ml) outputs = outputs/output.ml \ -@@ -188,6 +190,7 @@ tools = tools/stdlib.ml tools/doc.ml tools/plug.ml tools/utils.ml \ +@@ -188,6 +190,7 @@ $(if $(W_DYNLINK),tools/dyntools.ml) \ tools/rqueue.ml \ $(if $(W_LAME_DYN),tools/lame_dynlink.ml) \ @@ -63,10 +63,10 @@ index b6851fb..e9af43d 100644 $(if $(W_AACPLUS_DYN),tools/aacplus_dynlink.ml) \ tools/wav.ml tools/tutils.ml \ tools/file_watcher.ml tools/file_watcher_mtime.ml \ -diff --git a/src/encoder/fdkaac_encoder.ml b/src/encoder/fdkaac_encoder.ml -index 11b6363..8580906 100644 a/src/encoder/fdkaac_encoder.ml -+++ b/src/encoder/fdkaac_encoder.ml +Index: liquidsoap/src/encoder/fdkaac_encoder.ml +=== +--- liquidsoap.orig/src/encoder/fdkaac_encoder.ml 2014-08-11 20:25:00.054875908 -0500 liquidsoap/src/encoder/fdkaac_encoder.ml 2014-08-11 20:25:00.018870477 -0500 @@ -1,106 +1,156 @@ (* - @@ -309,11 +309,10 @@ index 11b6363..8580906 100644 + | Encoder.FdkAacEnc m - Some (fun _ _ - encoder m) + | _ - None) +end -diff --git a/src/encoder/fdkaac_encoder_builtin.ml b/src/encoder/fdkaac_encoder_builtin.ml -new file mode 100644 -index 000..62fa319 /dev/null -+++ b/src/encoder/fdkaac_encoder_builtin.ml +Index: liquidsoap/src/encoder/fdkaac_encoder_builtin.ml +=== +--- /dev/null 1970-01-01 00:00:00.0 + liquidsoap/src/encoder/fdkaac_encoder_builtin.ml 2014-08-11 20:25:00.018870477 -0500 @@ -0,0 +1,28 @@ +(* + @@ -343,11 +342,10 @@ index 000..62fa319 + +let
[Pkg-ocaml-maint-commits] [liquidsoap] annotated tag debian/1.1.1-7 created (now 5d2e728)
This is an automated email from the git hooks/post-receive script. toots pushed a change to annotated tag debian/1.1.1-7 in repository liquidsoap. at 5d2e728 (tag) tagging b90915a0a80ee3a70985ec50d9c9bfb2f5b758bc (commit) replaces debian/1.1.1-6 tagged by Romain Beauxis on Mon Aug 11 20:26:25 2014 -0500 - Log - liquidsoap Debian release 1.1.1-7 Romain Beauxis (2): Prepare new package. Refresh patches. --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git ___ 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] [liquidsoap] 01/01: Prepare new package.
This is an automated email from the git hooks/post-receive script. toots pushed a commit to branch master in repository liquidsoap. commit 02a6e0dafccfa2bb3cfa1b35a7dd72c48b3006c4 Author: Romain Beauxis to...@rastageeks.org Date: Mon Aug 11 20:08:37 2014 -0500 Prepare new package. --- debian/changelog | 6 ++ debian/patches/series | 1 + debian/patches/shine_abi_3 | 13 + 3 files changed, 20 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8a70fa1..5a50fb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +liquidsoap (1.1.1-7) unstable; urgency=medium + + * Patch shine encoder to adapt to new ABI. + + -- Romain Beauxis to...@rastageeks.org Mon, 11 Aug 2014 20:07:58 -0500 + liquidsoap (1.1.1-6) unstable; urgency=low * Bring back SDL plugin. diff --git a/debian/patches/series b/debian/patches/series index 159b2ac..60cd0b2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fdkaad-dynlink.patch +shine_abi_3 diff --git a/debian/patches/shine_abi_3 b/debian/patches/shine_abi_3 new file mode 100644 index 000..69c933c --- /dev/null +++ b/debian/patches/shine_abi_3 @@ -0,0 +1,13 @@ +Index: liquidsoap/src/encoder/shine_encoder.ml +=== +--- liquidsoap.orig/src/encoder/shine_encoder.ml 2013-03-27 12:42:12.133673540 -0500 liquidsoap/src/encoder/shine_encoder.ml2014-08-11 20:06:59.063843307 -0500 +@@ -45,7 +45,7 @@ + let src_freq = float (Frame.audio_of_seconds 1.) in + let dst_freq = float samplerate in + (* Shine accepts data of a fixed length.. *) +- let samples = Shine.samples_per_frame in ++ let samples = Shine.samples_per_pass enc in + let data = Audio.create channels samples in + let buf = G.create () in + let encoded = Buffer.create 1024 in -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git ___ 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] [liquidsoap] branch master updated (08b13ac - 02a6e0d)
This is an automated email from the git hooks/post-receive script. toots pushed a change to branch master in repository liquidsoap. from 08b13ac Bump changelog. new 02a6e0d Prepare new package. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++ debian/patches/series | 1 + debian/patches/shine_abi_3 | 13 + 3 files changed, 20 insertions(+) create mode 100644 debian/patches/shine_abi_3 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git ___ 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] [mingw32-ocaml] 04/05: Updated packaging for OCaml 4.01
This is an automated email from the git hooks/post-receive script.
toots pushed a commit to branch master
in repository mingw32-ocaml.
commit 11006a8b3624e6f7db3b1289f3cc71e19ced230d
Author: Romain Beauxis to...@rastageeks.org
Date: Mon Jan 27 05:51:48 2014 -0600
Updated packaging for OCaml 4.01
---
debian/changelog | 8
debian/control | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4bf44ba..0298450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mingw-ocaml (4.01.0~20140328-1) unstable; urgency=medium
+
+ * Update to OCaml 4.01.0.
+ * Fix ocaml-mingw-w64 dependencies.
+ Closes: #736171
+
+ -- Romain Beauxis to...@rastageeks.org Mon, 27 Jan 2014 05:48:17 -0600
+
mingw-ocaml (4.00.1~20130426-3) unstable; urgency=low
* Add Breaks: mingw-ocaml ( 4.00.1~20130426-1~)
diff --git a/debian/control b/debian/control
index c971cb6..d8f4cd4 100644
--- a/debian/control
+++ b/debian/control
@@ -18,13 +18,13 @@ Description: ocaml-mingw-w64 transitional dummy package
It can safely be removed.
Package: ocaml-mingw-w64
-Architecture: all
+Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386
Replaces: mingw-ocaml ( 4.00.1~20130426-1~)
Breaks: mingw-ocaml ( 4.00.1~20130426-1~)
Depends:
${misc:Depends},
ocaml-mingw-w64-i686,
- ocaml-mingw-w64-x86-64
+ ocaml-mingw-w64-x86-64 [amd64 kfreebsd-amd64]
Description: OCaml cross-compiler based on mingw -- Meta-package
Objective Caml (OCaml) is an implementation of the ML language, based on
the Caml Light dialect extended with a complete class-based object system
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git
___
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] [mingw32-ocaml] 02/05: Imported Upstream version 4.01.0~20140328
This is an automated email from the git hooks/post-receive script. toots pushed a commit to branch master in repository mingw32-ocaml. commit f1f401b29226106147addd5d12b2809b7b74c2dc Author: Romain Beauxis to...@rastageeks.org Date: Mon Jan 27 06:51:13 2014 -0600 Imported Upstream version 4.01.0~20140328 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git ___ 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] [mingw32-ocaml] 05/05: Fix lintian warnings.
This is an automated email from the git hooks/post-receive script. toots pushed a commit to branch master in repository mingw32-ocaml. commit f644e0a8c26048424ec86bdec542f4c89243173b Author: Romain Beauxis to...@rastageeks.org Date: Mon Jan 27 08:02:11 2014 -0600 Fix lintian warnings. --- debian/control | 2 +- debian/mingw-ocaml.lintian-overrides| 5 ++--- debian/ocaml-mingw-w64-i686.lintian-overrides | 2 ++ debian/ocaml-mingw-w64-x86-64.lintian-overrides | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index d8f4cd4..02670d8 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Romain Beauxis to...@rastageeks.org Build-Depends: debhelper (= 7.0.50~), quilt, mingw-w64, gcc-multilib [amd64 kfreebsd-amd64], ocaml-nox, camlp4, m4 -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mingw32-ocaml.git diff --git a/debian/mingw-ocaml.lintian-overrides b/debian/mingw-ocaml.lintian-overrides index 4e3d257..dee8f1e 100644 --- a/debian/mingw-ocaml.lintian-overrides +++ b/debian/mingw-ocaml.lintian-overrides @@ -1,3 +1,2 @@ -mingw-ocaml source: non-native-package-with-native-version -mingw-ocaml source: quilt-build-dep-but-no-series-file -mingw-ocaml source: patch-system-but-no-source-readme +mingw-ocaml source: outdated-autotools-helper-file ocaml/config/gnu/config.guess 2011-11-11 +mingw-ocaml source: outdated-autotools-helper-file ocaml/config/gnu/config.sub 2011-11-11 diff --git a/debian/ocaml-mingw-w64-i686.lintian-overrides b/debian/ocaml-mingw-w64-i686.lintian-overrides index 7d0ee3e..159a06d 100644 --- a/debian/ocaml-mingw-w64-i686.lintian-overrides +++ b/debian/ocaml-mingw-w64-i686.lintian-overrides @@ -2,6 +2,8 @@ ocaml-mingw-w64-i686: hardening-no-relro usr/bin/i686-w64-mingw32-ocamlrun ocaml-mingw-w64-i686: hardening-no-fortify-functions usr/bin/i686-w64-mingw32-ocamlrun ocaml-mingw-w64-i686: ocaml-custom-executable usr/bin/i686-w64-mingw32-ocamlrun ocaml-mingw-w64-i686: non-standard-dir-in-usr usr/i686-w64-mingw32/ +ocaml-mingw-w64-i686: file-in-unusual-dir usr/i686-w64-mingw32/lib/ocaml/compiler-libs/META +ocaml-mingw-w64-i686: file-in-unusual-dir usr/i686-w64-mingw32/lib/ocaml/labltk/META ocaml-mingw-w64-i686: file-in-unusual-dir usr/i686-w64-mingw32/lib/ocaml/arg.cmi ocaml-mingw-w64-i686: file-in-unusual-dir usr/i686-w64-mingw32/lib/ocaml/arg.cmx ocaml-mingw-w64-i686: file-in-unusual-dir usr/i686-w64-mingw32/lib/ocaml/arg.ml diff --git a/debian/ocaml-mingw-w64-x86-64.lintian-overrides b/debian/ocaml-mingw-w64-x86-64.lintian-overrides index 63f9bbb..5942cfe 100644 --- a/debian/ocaml-mingw-w64-x86-64.lintian-overrides +++ b/debian/ocaml-mingw-w64-x86-64.lintian-overrides @@ -2,6 +2,8 @@ ocaml-mingw-w64-x86-64: hardening-no-relro usr/bin/x86_64-w64-mingw32-ocamlrun ocaml-mingw-w64-x86-64: hardening-no-fortify-functions usr/bin/x86_64-w64-mingw32-ocamlrun ocaml-mingw-w64-x86-64: ocaml-custom-executable usr/bin/x86_64-w64-mingw32-ocamlrun ocaml-mingw-w64-x86-64: non-standard-dir-in-usr usr/x86_64-w64-mingw32/ +ocaml-mingw-w64-x86-64: file-in-unusual-dir usr/x86_64-w64-mingw32/lib/ocaml/compiler-libs/META +ocaml-mingw-w64-x86-64: file-in-unusual-dir usr/x86_64-w64-mingw32/lib/ocaml/labltk/META ocaml-mingw-w64-x86-64: file-in-unusual-dir usr/x86_64-w64-mingw32/lib/ocaml/arg.cmi ocaml-mingw-w64-x86-64: file-in-unusual-dir usr/x86_64-w64-mingw32/lib/ocaml/arg.cmx ocaml-mingw-w64-x86-64: file-in-unusual-dir usr/x86_64-w64-mingw32/lib/ocaml/arg.ml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git ___ 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] [mingw32-ocaml] 01/02: Enable on any arch.
This is an automated email from the git hooks/post-receive script.
toots pushed a commit to branch master
in repository mingw32-ocaml.
commit 2834748cb50b18ee490609e194cd71227da08540
Author: Romain Beauxis to...@rastageeks.org
Date: Wed May 15 07:19:43 2013 -0500
Enable on any arch.
---
debian/changelog |7 +++
debian/control |8
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3fcba68..cf1ab8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mingw-ocaml (4.00.1~20130426-3) unstable; urgency=low
+
+ * Enable on any arch.
+ Closes: #574717
+
+ -- Romain Beauxis to...@rastageeks.org Wed, 15 May 2013 07:18:54 -0500
+
mingw-ocaml (4.00.1~20130426-2) unstable; urgency=low
* Upload to unstable.
diff --git a/debian/control b/debian/control
index eadd530..83050ea 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
Uploaders: Romain Beauxis to...@rastageeks.org
-Build-Depends: debhelper (= 7.0.50~), quilt, mingw-w64, gcc-multilib [amd64
kfreebsd-amd64],
+Build-Depends: debhelper (= 7.0.50~), quilt, mingw-w64, gcc-multilib,
ocaml-nox, camlp4, m4
Standards-Version: 3.9.4
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git
@@ -49,7 +49,7 @@ Description: OCaml cross-compiler based on mingw --
Meta-package
windows targets.
Package: flexdll
-Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386
+Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends}
@@ -77,7 +77,7 @@ Description: OCaml cross-compiler based on mingw -- FlexDLL
linker
on windows.
Package: ocaml-mingw-w64-i686
-Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386
+Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -111,7 +111,7 @@ Description: OCaml cross-compiler based on mingw -- 32 bit
compiler
to be executed under 32 bit windows.
Package: ocaml-mingw-w64-x86-64
-Architecture: amd64 kfreebsd-amd64
+Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git
___
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] [mingw32-ocaml] 02/02: Revert previous change, fix conflict with previous package.
This is an automated email from the git hooks/post-receive script.
toots pushed a commit to branch master
in repository mingw32-ocaml.
commit 5c69071bd3c03e900752dc0b297eb93424cd1159
Author: Romain Beauxis to...@rastageeks.org
Date: Wed May 15 07:50:38 2013 -0500
Revert previous change, fix conflict with previous package.
---
debian/changelog |8 +---
debian/control | 10 ++
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cf1ab8e..4bf44ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
mingw-ocaml (4.00.1~20130426-3) unstable; urgency=low
- * Enable on any arch.
- Closes: #574717
+ * Add Breaks: mingw-ocaml ( 4.00.1~20130426-1~)
+to avoid conflicts with previous version of the
+package.
+ Closes: #709088
- -- Romain Beauxis to...@rastageeks.org Wed, 15 May 2013 07:18:54 -0500
+ -- Romain Beauxis to...@rastageeks.org Wed, 15 May 2013 07:48:18 -0500
mingw-ocaml (4.00.1~20130426-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 83050ea..c971cb6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
Uploaders: Romain Beauxis to...@rastageeks.org
-Build-Depends: debhelper (= 7.0.50~), quilt, mingw-w64, gcc-multilib,
+Build-Depends: debhelper (= 7.0.50~), quilt, mingw-w64, gcc-multilib [amd64
kfreebsd-amd64],
ocaml-nox, camlp4, m4
Standards-Version: 3.9.4
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git
@@ -49,7 +49,8 @@ Description: OCaml cross-compiler based on mingw --
Meta-package
windows targets.
Package: flexdll
-Architecture: any
+Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386
+Breaks: mingw-ocaml ( 4.00.1~20130426-1~)
Depends:
${shlibs:Depends},
${misc:Depends}
@@ -77,7 +78,8 @@ Description: OCaml cross-compiler based on mingw -- FlexDLL
linker
on windows.
Package: ocaml-mingw-w64-i686
-Architecture: any
+Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386
+Breaks: mingw-ocaml ( 4.00.1~20130426-1~)
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -111,7 +113,7 @@ Description: OCaml cross-compiler based on mingw -- 32 bit
compiler
to be executed under 32 bit windows.
Package: ocaml-mingw-w64-x86-64
-Architecture: any
+Architecture: amd64 kfreebsd-amd64
Depends:
${shlibs:Depends},
${misc:Depends},
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git
___
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] [mingw32-ocaml] branch master updated (8a68a27 - 5c69071)
This is an automated email from the git hooks/post-receive script. toots pushed a change to branch master in repository mingw32-ocaml. from 8a68a27 Upload to unstable, add transitional package. new 2834748 Enable on any arch. new 5c69071 Revert previous change, fix conflict with previous package. The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog |9 + debian/control |4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git ___ 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] [mingw32-ocaml] annotated tag debian/4.00.1_20130426-3 created (now b48358c)
This is an automated email from the git hooks/post-receive script. toots pushed a change to annotated tag debian/4.00.1_20130426-3 in repository mingw32-ocaml. at b48358c (tag) tagging 5c69071bd3c03e900752dc0b297eb93424cd1159 (commit) replaces debian/4.00.1_20130426-2 tagged by Romain Beauxis on Fri Jun 14 06:38:13 2013 -0500 - Log - mingw-ocaml Debian release 4.00.1~20130426-3 Romain Beauxis (2): Enable on any arch. Revert previous change, fix conflict with previous package. --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git ___ 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.1.1-6, created. debian/1.1.1-6
The annotated tag, debian/1.1.1-6 has been created at ef648cdfefae085547175087305904fd47307353 (tag) tagging 08b13acafe2a22c6ece8f5012d877cf079308f7f (commit) replaces debian/1.1.1-5 tagged by Romain Beauxis on Tue Jun 11 18:38:40 2013 -0500 - Shortlog liquidsoap Debian release 1.1.1-6 Romain Beauxis (3): Bring back SDL plugin. Committed patch diff. Bump changelog. --- -- 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.1.1-5-3-g08b13ac
The following commit has been merged in the master branch:
commit c3df4d08eed28199d9fcb95a6d1d293dea2dc586
Author: Romain Beauxis to...@rastageeks.org
Date: Tue Jun 11 18:10:46 2013 -0500
Committed patch diff.
diff --git a/Makefile.defs.in b/Makefile.defs.in
index 9135d41..f221ad0 100644
--- a/Makefile.defs.in
+++ b/Makefile.defs.in
@@ -79,6 +79,7 @@ W_AACPLUS=@W_AACPLUS@
W_AACPLUS_DYN=@W_AACPLUS_DYN@
W_VOAACENC=@W_VOAACENC@
W_FDKAAC=@W_FDKAAC@
+W_FDKAAC_DYN=@W_FDKAAC_DYN@
W_ALSA=@W_ALSA@
W_BJACK=@W_BJACK@
W_AO=@W_AO@
diff --git a/configure.ac b/configure.ac
index f35b1e9..60a16a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -484,6 +484,15 @@ AC_CHECK_OCAML_BINDING([voaacenc],[0.1.0])
#
AC_CHECK_OCAML_BINDING([fdkaac],[0.1.0])
+if test -z ${W_FDKAAC}; then
+ if test -n ${W_DYNLINK}; then
+if test -n ${OCAML_HAS_FIRST_CLASS_MODULES}; then
+ W_FDKAAC_DYN=yes
+ w_FDKAAC=detected at runtime
+fi
+ fi
+fi
+AC_SUBST(W_FDKAAC_DYN)
#
# Theora
diff --git a/src/Makefile b/src/Makefile
index b6851fb..e9af43d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -156,9 +156,11 @@ analyze = analyze/analyze_rms.ml
encoders = \
encoder/wav_encoder.ml \
encoder/lame_encoder.ml \
+ encoder/fdkaac_encoder.ml \
encoder/aacplus_encoder.ml \
$(if ($(OS_TYPE):Win32=),encoder/external_encoder.ml) \
$(if $(W_LAME_DYN),encoder/lame_encoder_dynlink.ml) \
+ $(if $(W_FDKAAC_DYN),encoder/fdkaac_encoder_dynlink.ml) \
$(if $(W_AACPLUS_DYN),encoder/aacplus_encoder_dynlink.ml)
$(call conditional_compilation,encoders,$(W_SHINE),encoder/shine_encoder.ml)
@@ -166,7 +168,7 @@ $(call
conditional_compilation,encoders,$(W_LAME),encoder/lame_encoder_builtin.m
$(call conditional_compilation,encoders,$(W_FLAC),encoder/flac_encoder.ml)
$(call
conditional_compilation,encoders,$(W_AACPLUS),encoder/aacplus_encoder_builtin.ml)
$(call
conditional_compilation,encoders,$(W_VOAACENC),encoder/voaacenc_encoder.ml)
-$(call conditional_compilation,encoders,$(W_FDKAAC),encoder/fdkaac_encoder.ml)
+$(call
conditional_compilation,encoders,$(W_FDKAAC),encoder/fdkaac_encoder_builtin.ml)
$(call conditional_compilation,encoders,$(W_TAGLIB),encoder/taglib_id3v2.ml)
outputs = outputs/output.ml \
@@ -188,6 +190,7 @@ tools = tools/stdlib.ml tools/doc.ml tools/plug.ml
tools/utils.ml \
$(if $(W_DYNLINK),tools/dyntools.ml) \
tools/rqueue.ml \
$(if $(W_LAME_DYN),tools/lame_dynlink.ml) \
+ $(if $(W_FDKAAC_DYN),tools/fdkaac_dynlink.ml) \
$(if $(W_AACPLUS_DYN),tools/aacplus_dynlink.ml) \
tools/wav.ml tools/tutils.ml \
tools/file_watcher.ml tools/file_watcher_mtime.ml \
diff --git a/src/encoder/fdkaac_encoder.ml b/src/encoder/fdkaac_encoder.ml
index 11b6363..8580906 100644
--- a/src/encoder/fdkaac_encoder.ml
+++ b/src/encoder/fdkaac_encoder.ml
@@ -1,106 +1,156 @@
(*
-
+
Liquidsoap, a programmable audio stream generator.
Copyright 2003-2013 Savonet team
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details, fully stated in the COPYING
file at the root of the liquidsoap distribution.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+
*)
-
+
(** FDK-AAC encoder *)
-module G = Generator.Generator
-
-let create_encoder params =
- let encoder =
-Fdkaac.Encoder.create params.Encoder.FdkAacEnc.channels
- in
- let params = [
-`Aot params.Encoder.FdkAacEnc.aot;
-`Bitrate (params.Encoder.FdkAacEnc.bitrate*1000);
-`Samplerate params.Encoder.FdkAacEnc.samplerate;
-`Transmux params.Encoder.FdkAacEnc.transmux ] @ (
- if params.Encoder.FdkAacEnc.aot = `Mpeg_4 `AAC_ELD then
-[`Sbr_mode params.Encoder.FdkAacEnc.sbr_mode]
- else [])
- in
- List.iter (Fdkaac.Encoder.set encoder) params;
- encoder
-
-let encoder aac =
- let enc = create_encoder aac in
- let channels = aac.Encoder.FdkAacEnc.channels in
- let samplerate = aac.Encoder.FdkAacEnc.samplerate in
- let samplerate_converter =
-Audio_converter.Samplerate.create channels
- in
- let src_freq = float (Frame.audio_of_seconds 1.) in
- let dst_freq = float samplerate in
- let n = 1024 in
- let buf = Buffer.create n in
- let encode frame start
[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/1.1.1-5-3-g08b13ac
The following commit has been merged in the master branch:
commit 58c32329d9ce8fe9f8fb9ef0a2dd08ac3e031a69
Author: Romain Beauxis to...@rastageeks.org
Date: Tue Jun 11 18:03:16 2013 -0500
Bring back SDL plugin.
diff --git a/debian/changelog b/debian/changelog
index 133851f..15822e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ liquidsoap (1.1.1-5) unstable; urgency=low
* Provide alternative build-dep on libgd-gd2-ocaml-dev.
* Bump build-dep on camlimages.
* Drop optional SDL plugin until SDL and gd become compatible
-again (conflicts on libtiff{4,5}-dev).
+again (conflicts on libtiff{4,5}-dev).
-- Romain Beauxis to...@rastageeks.org Wed, 15 May 2013 07:06:38 -0500
diff --git a/debian/control b/debian/control
index ce3bb8a..762e012 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,7 @@ Build-Depends:
libxmlplaylist-ocaml-dev (= 0.1.3),
libmagic-ocaml-dev (= 0.3.6),
libbjack-ocaml-dev (= 0.1.4),
+ libsdl-ocaml-dev,
libfaad-ocaml-dev (= 0.3.2),
libmm-ocaml-dev (= 0.2.1),
libflac-ocaml-dev (= 0.1.1-3),
@@ -141,6 +142,7 @@ Depends:
liquidsoap-plugin-pulseaudio,
liquidsoap-plugin-samplerate,
liquidsoap-plugin-schroedinger,
+ liquidsoap-plugin-sdl,
liquidsoap-plugin-shine,
liquidsoap-plugin-soundtouch,
liquidsoap-plugin-speex,
@@ -600,6 +602,24 @@ Description: audio streaming language -- Schroedinger
plugin
This package provides support ogg/dirac video decoding and encoding using
libschroedinger in Liquidsoap.
+Package: liquidsoap-plugin-sdl
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${ocaml:Depends},
+ ${misc:Depends},
+ liquidsoap (= ${binary:Version})
+Recommends: ttf-liberation
+Description: audio streaming language -- SDL plugin
+ Liquidsoap is a powerful tool for building complex audio streaming systems,
+ typically targeting internet radios (e.g. icecast streams).
+ .
+ It consists of a simple script language, in which you can create, combine and
+ transform audio sources. Its design makes liquidsoap flexible and easily
+ extensible.
+ .
+ This package provides SDL support for liquidsoap.
+
Package: liquidsoap-plugin-shine
Architecture: any
Depends:
diff --git a/debian/rules b/debian/rules
index 5b9a705..740ac5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ DEFAULT_FONT :=
/usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.
DEB_CONFIGURE_EXTRA_FLAGS := \
--enable-ogg-dynamic-plugin --enable-schroedinger-dynamic-plugin
--enable-flac-dynamic-plugin \
--enable-speex-dynamic-plugin --enable-vorbis-dynamic-plugin
--enable-theora-dynamic-plugin \
- --enable-gavl-dynamic-plugin --enable-mad-dynamic-plugin \
+ --enable-sdl-dynamic-plugin --enable-gavl-dynamic-plugin
--enable-mad-dynamic-plugin \
--enable-faad-dynamic-plugin --enable-xmlplaylist-dynamic-plugin
--enable-lastfm-dynamic-plugin \
--enable-voaacenc-dynamic-plugin --enable-taglib-dynamic-plugin
--enable-cry-dynamic-plugin \
--enable-portaudio-dynamic-plugin --enable-pulseaudio-dynamic-plugin
--enable-ao-dynamic-plugin \
@@ -33,7 +33,7 @@ ifeq ($(OCAML_NATDYNLINK),no)
export OCAMLINIT_SED := -e 's/^NODYN: //'
else
OCAML_DHOCAML_FLAGS := \
--Nliquidsoap-plugin-alsa -Nliquidsoap-plugin-ao \
+-Nliquidsoap-plugin-sdl -Nliquidsoap-plugin-alsa -Nliquidsoap-plugin-ao \
-Nliquidsoap-plugin-jack -Nliquidsoap-plugin-icecast
-Nliquidsoap-plugin-faad \
-Nliquidsoap-plugin-flac -Nliquidsoap-plugin-gavl
-Nliquidsoap-plugin-graphics \
-Nliquidsoap-plugin-ladspa -Nliquidsoap-plugin-lastfm
-Nliquidsoap-plugin-mad \
--
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.1.1-5-3-g08b13ac
The following commit has been merged in the master branch: commit 08b13acafe2a22c6ece8f5012d877cf079308f7f Author: Romain Beauxis to...@rastageeks.org Date: Tue Jun 11 18:18:00 2013 -0500 Bump changelog. diff --git a/debian/changelog b/debian/changelog index 15822e2..8a70fa1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +liquidsoap (1.1.1-6) unstable; urgency=low + + * Bring back SDL plugin. + + -- Romain Beauxis to...@rastageeks.org Tue, 11 Jun 2013 18:17:55 -0500 + liquidsoap (1.1.1-5) unstable; urgency=low * Switch GD build-dep to libgd-ocaml-dev. -- 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] gdo packaging branch, master, updated. debian/1.0_alpha5-6-2-gd912d07
The following commit has been merged in the master branch:
commit d9352b3a038a1e7308ff3bc8fe674caa176ec01a
Author: Romain Beauxis to...@rastageeks.org
Date: Wed May 15 09:19:52 2013 -0500
New upload.
diff --git a/Makefile.orig b/Makefile.orig
deleted file mode 100644
index f5463df..000
--- a/Makefile.orig
+++ /dev/null
@@ -1,63 +0,0 @@
-# You might have to change these.
-OCAMLC=ocamlc
-OCAMLOPT=ocamlopt
-OCAMLMKLIB=ocamlmklib
-OCAMLLIB=`$(OCAMLC) -where`
-CINCLUDES=-I$(OCAMLLIB) -I/usr/include
-CC=gcc
-
-# If you don't have libjpeg, remove the -DHAVE_JPEG and -cclib -ljpeg parts of
-# the following lines.
-CFLAGS=$(CINCLUDES) -DHAVE_JPEG -W -Wall -Wno-unused
-LIBS=-lgd -lpng -lz -ljpeg
-OCAMLCFLAGS=-labels -unsafe
-OCAMLOPTFLAGS=-inline 1
-
-OPT_FILES=gd.cmxa
-INSTALL_FILES=gd.cmi gd.cma libocamlgd.a dllocamlgd.so
-
-.PHONY : all opt install install-opt clean realclean
-
-all: gd.cma gdtest
-
-opt: gd.cmxa gdtest.opt
-
-
-install: all
- cp -f $(INSTALL_FILES) $(OCAMLLIB)
-
-install-opt: all
- cp -f gd.cmxa libocamlgd.a $(OCAMLLIB)
-
-gd.cma: gd.cmi gd.cmo gdstubs.o
- ocamlmklib -o gd gd.cmo gdstubs.o -oc ocamlgd $(LIBS)
-
-gd.cmxa: gd.cmi gd.cmx gdstubs.o
- ocamlmklib -o gd gd.cmx gdstubs.o -oc ocamlgd $(LIBS)
-
-gd.cmx: gd.cmi gd.ml
- $(OCAMLOPT) $(OCAMLCFLAGS) -c gd.ml
-
-gd.cmo: gd.cmi gd.ml
- $(OCAMLC) $(OCAMLCFLAGS) -c gd.ml
-
-gd.cmi: gd.mli
- $(OCAMLC) $(OCAMLCFLAGS) -c gd.mli
-
-gdtest: gd.cma gdtest.cmo
- $(OCAMLC) -o gdtest -dllpath . gd.cma gdtest.cmo
-
-gdtest.opt: gd.cmxa gdtest.ml
- $(OCAMLOPT) $(OCAMLCFLAGS) -o gdtest.opt gd.cmxa gdtest.ml
-
-gdstubs.o: gdstubs.c
- $(CC) $(CFLAGS) -c gdstubs.c
-
-gdtest.cmo: gd.cmi gdtest.ml
- $(OCAMLC) $(OCAMLCFLAGS) -c gdtest.ml
-
-clean :
- -rm -f *.cmi *.cmo *.cmx *.o
-
-realclean : clean
- -rm -f *.a *.so *.cma *.cmxa
diff --git a/debian/changelog b/debian/changelog
index 5705d07..4013188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gd4o (1.0~alpha5-7) unstable; urgency=low
+
+ * Added BreaksL libgd-gd2-noxpm-ocaml ( 1.0~alpha5-6~)
+to libgd-ocaml-dev.
+ Closes: #709858
+ * Added debian/tmp/usr/lib/ocaml to libgd-ocaml.dirs
+ Closes: #709853
+
+ -- Romain Beauxis to...@rastageeks.org Wed, 15 May 2013 09:19:41 -0500
+
gd4o (1.0~alpha5-6) unstable; urgency=low
* Rebuild against new libgd.
diff --git a/debian/control b/debian/control
index b04b37c..db0c41e 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Package: libgd-ocaml
Architecture: any
Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: ${ocaml:Provides}
+Breaks: libgd-gd2-noxpm-ocaml ( 1.0~alpha5-6~)
Description: OCaml interface to the GD library -- runtime files
This package provides an interface to the GD library for
OCaml programmers.
diff --git a/debian/libgd-ocaml.dirs b/debian/libgd-ocaml.dirs
new file mode 100644
index 000..18a6cae
--- /dev/null
+++ b/debian/libgd-ocaml.dirs
@@ -0,0 +1 @@
+debian/tmp/usr/lib/ocaml
--
gdo 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] gdo packaging branch, master, updated. debian/1.0_alpha5-6-2-gd912d07
The following commit has been merged in the master branch: commit d912d074e7458bed2d09057c0281bfc3b9517aae Author: Romain Beauxis to...@rastageeks.org Date: Wed May 15 10:19:52 2013 -0500 New upload again. diff --git a/debian/changelog b/debian/changelog index 4013188..f4332a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gd4o (1.0~alpha5-8) unstable; urgency=low + + * Really fix #709853 + + -- Romain Beauxis to...@rastageeks.org Wed, 15 May 2013 10:19:47 -0500 + gd4o (1.0~alpha5-7) unstable; urgency=low * Added BreaksL libgd-gd2-noxpm-ocaml ( 1.0~alpha5-6~) diff --git a/debian/libgd-ocaml.dirs b/debian/libgd-ocaml.dirs deleted file mode 100644 index 18a6cae..000 --- a/debian/libgd-ocaml.dirs +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/ocaml diff --git a/debian/rules b/debian/rules index ee192df..e4c27ae 100755 --- a/debian/rules +++ b/debian/rules @@ -13,5 +13,5 @@ ifeq ($(OCAML_HAVE_OCAMLOPT),yes) DEB_MAKE_BUILD_TARGET += opt endif -build/libgd-gd2-noxpm-ocaml-dev:: +makebuilddir:: mkdir -p $(DESTDIR) -- gdo 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] gdo packaging annotated tag, debian/1.0_alpha5-7, created. debian/1.0_alpha5-7
The annotated tag, debian/1.0_alpha5-7 has been created at 79fff656332d35224a244bdb596c8686d89ea1c2 (tag) tagging d9352b3a038a1e7308ff3bc8fe674caa176ec01a (commit) replaces debian/1.0_alpha5-6 tagged by Romain Beauxis on Wed May 15 09:22:30 2013 -0500 - Shortlog gd4o Debian release 1.0~alpha5-7 Romain Beauxis (1): New upload. --- -- gdo 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] gdo packaging annotated tag, debian/1.0_alpha5-8, created. debian/1.0_alpha5-8
The annotated tag, debian/1.0_alpha5-8 has been created at 8b09f3179fb57bf41cb366f9bf1076d9233f8e9c (tag) tagging d912d074e7458bed2d09057c0281bfc3b9517aae (commit) replaces debian/1.0_alpha5-7 tagged by Romain Beauxis on Mon May 27 13:26:09 2013 -0500 - Shortlog gd4o Debian release 1.0~alpha5-8 Romain Beauxis (1): New upload again. --- -- gdo 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.1.1-4-3-g6fd3a34
The following commit has been merged in the master branch:
commit 6fd3a3400b50f64635233408626c0c7d956e2ce2
Author: Romain Beauxis to...@rastageeks.org
Date: Wed May 15 07:40:11 2013 -0500
Drop SDL plugin for now..
diff --git a/debian/changelog b/debian/changelog
index 12d89b9..133851f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ liquidsoap (1.1.1-5) unstable; urgency=low
* Switch GD build-dep to libgd-ocaml-dev.
* Provide alternative build-dep on libgd-gd2-ocaml-dev.
* Bump build-dep on camlimages.
+ * Drop optional SDL plugin until SDL and gd become compatible
+again (conflicts on libtiff{4,5}-dev).
-- Romain Beauxis to...@rastageeks.org Wed, 15 May 2013 07:06:38 -0500
diff --git a/debian/control b/debian/control
index 7d03d7b..ce3bb8a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian OCaml Maintainers
debian-ocaml-ma...@lists.debian.org
Uploaders: Romain Beauxis to...@rastageeks.org, Samuel Mimram
smim...@debian.org
Build-Depends:
cdbs (= 0.4.85~),
- quilt,
debhelper (= 7.0.1),
ocaml-nox,
dh-ocaml (= 1.0.1),
@@ -41,7 +40,6 @@ Build-Depends:
libxmlplaylist-ocaml-dev (= 0.1.3),
libmagic-ocaml-dev (= 0.3.6),
libbjack-ocaml-dev (= 0.1.4),
- libsdl-ocaml-dev,
libfaad-ocaml-dev (= 0.3.2),
libmm-ocaml-dev (= 0.2.1),
libflac-ocaml-dev (= 0.1.1-3),
@@ -143,7 +141,6 @@ Depends:
liquidsoap-plugin-pulseaudio,
liquidsoap-plugin-samplerate,
liquidsoap-plugin-schroedinger,
- liquidsoap-plugin-sdl,
liquidsoap-plugin-shine,
liquidsoap-plugin-soundtouch,
liquidsoap-plugin-speex,
@@ -603,24 +600,6 @@ Description: audio streaming language -- Schroedinger
plugin
This package provides support ogg/dirac video decoding and encoding using
libschroedinger in Liquidsoap.
-Package: liquidsoap-plugin-sdl
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${ocaml:Depends},
- ${misc:Depends},
- liquidsoap (= ${binary:Version})
-Recommends: ttf-liberation
-Description: audio streaming language -- SDL plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides SDL support for liquidsoap.
-
Package: liquidsoap-plugin-shine
Architecture: any
Depends:
diff --git a/debian/rules b/debian/rules
index 0b7f0f4..5b9a705 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ DEFAULT_FONT :=
/usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.
DEB_CONFIGURE_EXTRA_FLAGS := \
--enable-ogg-dynamic-plugin --enable-schroedinger-dynamic-plugin
--enable-flac-dynamic-plugin \
--enable-speex-dynamic-plugin --enable-vorbis-dynamic-plugin
--enable-theora-dynamic-plugin \
- --enable-sdl-dynamic-plugin --enable-gavl-dynamic-plugin
--enable-mad-dynamic-plugin \
+ --enable-gavl-dynamic-plugin --enable-mad-dynamic-plugin \
--enable-faad-dynamic-plugin --enable-xmlplaylist-dynamic-plugin
--enable-lastfm-dynamic-plugin \
--enable-voaacenc-dynamic-plugin --enable-taglib-dynamic-plugin
--enable-cry-dynamic-plugin \
--enable-portaudio-dynamic-plugin --enable-pulseaudio-dynamic-plugin
--enable-ao-dynamic-plugin \
@@ -33,7 +33,7 @@ ifeq ($(OCAML_NATDYNLINK),no)
export OCAMLINIT_SED := -e 's/^NODYN: //'
else
OCAML_DHOCAML_FLAGS := \
--Nliquidsoap-plugin-sdl -Nliquidsoap-plugin-alsa -Nliquidsoap-plugin-ao \
+-Nliquidsoap-plugin-alsa -Nliquidsoap-plugin-ao \
-Nliquidsoap-plugin-jack -Nliquidsoap-plugin-icecast
-Nliquidsoap-plugin-faad \
-Nliquidsoap-plugin-flac -Nliquidsoap-plugin-gavl
-Nliquidsoap-plugin-graphics \
-Nliquidsoap-plugin-ladspa -Nliquidsoap-plugin-lastfm
-Nliquidsoap-plugin-mad \
@@ -77,7 +77,6 @@ binary-install/liguidsoap::
clean::
dh_autoreconf_clean
- quilt pop -a || true
rm -rf src/liquidsoap src/META radio.liq.example \
src/SVN.ml src/io/liquidsoap_depend autodoc \
doc/manual debian/liquidsoap.init src/dllliquidsoap.so \
--
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.1.1-4-3-g6fd3a34
The following commit has been merged in the master branch: commit eef0fd695d494128cbc9cbf6ed4b7e5eadb7f39a Author: Romain Beauxis to...@rastageeks.org Date: Wed May 15 07:07:09 2013 -0500 Bump build-dep on camlimages. diff --git a/debian/changelog b/debian/changelog index ef58fec..12d89b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -liquidsoap (1.1.1-5) UNRELEASED; urgency=low +liquidsoap (1.1.1-5) unstable; urgency=low * Switch GD build-dep to libgd-ocaml-dev. + * Provide alternative build-dep on libgd-gd2-ocaml-dev. + * Bump build-dep on camlimages. - -- Romain Beauxis to...@rastageeks.org Tue, 14 May 2013 20:15:06 -0500 + -- Romain Beauxis to...@rastageeks.org Wed, 15 May 2013 07:06:38 -0500 liquidsoap (1.1.1-4) unstable; urgency=low diff --git a/debian/control b/debian/control index 4297ce2..7d03d7b 100644 --- a/debian/control +++ b/debian/control @@ -53,10 +53,10 @@ Build-Depends: libmp3lame-ocaml-dev (= 0.3.2), libdssi-ocaml-dev (= 0.1.1), liblo-ocaml-dev, - libcamlimages-ocaml-dev (= 4.0.1-4), + libcamlimages-ocaml-dev (= 4.0.1-6), libyojson-ocaml-dev, libgstreamer-ocaml-dev (= 0.2.0), - libgd-ocaml-dev, + libgd-ocaml-dev | libgd-gd2-noxpm-ocaml-dev, ttf-liberation Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git -- 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.1.1-5, created. debian/1.1.1-5
The annotated tag, debian/1.1.1-5 has been created at d6835a4c33dfaa2c63fee87c0fcc16d0f3fb5274 (tag) tagging 6fd3a3400b50f64635233408626c0c7d956e2ce2 (commit) replaces debian/1.1.1-4 tagged by Romain Beauxis on Wed May 15 08:15:18 2013 -0500 - Shortlog liquidsoap Debian release 1.1.1-5 Romain Beauxis (3): Switch build-dep Bump build-dep on camlimages. Drop SDL plugin for now.. --- -- 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.1.1-4-1-ge7e6b2d
The following commit has been merged in the master branch: commit e7e6b2da83e850a39f808a75c5a6fb77476ad4ee Author: Romain Beauxis to...@rastageeks.org Date: Tue May 14 20:15:37 2013 -0500 Switch build-dep diff --git a/debian/changelog b/debian/changelog index e1d9703..ef58fec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +liquidsoap (1.1.1-5) UNRELEASED; urgency=low + + * Switch GD build-dep to libgd-ocaml-dev. + + -- Romain Beauxis to...@rastageeks.org Tue, 14 May 2013 20:15:06 -0500 + liquidsoap (1.1.1-4) unstable; urgency=low * Added patch to enable dynamically loaded diff --git a/debian/control b/debian/control index 5542bdf..4297ce2 100644 --- a/debian/control +++ b/debian/control @@ -56,7 +56,7 @@ Build-Depends: libcamlimages-ocaml-dev (= 4.0.1-4), libyojson-ocaml-dev, libgstreamer-ocaml-dev (= 0.2.0), - libgd-gd2-noxpm-ocaml-dev (= 1.0~alpha5-3), + libgd-ocaml-dev, ttf-liberation Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git -- 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] gdo packaging branch, master, updated. debian/1.0_alpha5-5-1-g9901501
The following commit has been merged in the master branch:
commit 99015014ecd743750ce761bc050ccb31127ff901
Author: Romain Beauxis to...@rastageeks.org
Date: Tue May 14 19:54:51 2013 -0500
New upload, following libgd transition.
diff --git a/debian/changelog b/debian/changelog
index 14ff051..5705d07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gd4o (1.0~alpha5-6) unstable; urgency=low
+
+ * Rebuild against new libgd.
+ * Replace xpm/noxpm packages with dummy
+transitional packages.
+ * Bump standards version to 3.9.4
+
+ -- Romain Beauxis to...@rastageeks.org Tue, 14 May 2013 19:49:38 -0500
+
gd4o (1.0~alpha5-5) unstable; urgency=low
* Team upload
diff --git a/debian/control b/debian/control
index dbf30a7..b04b37c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,18 +9,15 @@ Build-Depends:
dh-buildinfo,
ocaml-nox,
dh-ocaml (= 0.9),
- libgd2-noxpm-dev,
- libjpeg8-dev,
- libfreetype6-dev,
- libpng-dev,
+ libgd-dev,
ocaml-findlib (= 1.2.4),
pkg-config
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Homepage: http://matt.gushee.net/software/gd4o/
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/gd4o.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/gd4o.git
-Package: libgd-gd2-noxpm-ocaml
+Package: libgd-ocaml
Architecture: any
Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: ${ocaml:Provides}
@@ -34,16 +31,13 @@ Description: OCaml interface to the GD library -- runtime
files
This is particularly useful in World Wide Web applications, where PNG is
one of the formats accepted for inline images by most browsers.
.
- This is the full development version of the library, built without XPM
- (X pixmap) or fontconfig support.
- .
This package contains only the shared runtime stub libraries.
-Package: libgd-gd2-noxpm-ocaml-dev
+Package: libgd-ocaml-dev
Architecture: any
Depends: ${ocaml:Depends},
- libgd2-noxpm-dev,
- libgd-gd2-noxpm-ocaml (= ${binary:Version}), ocaml-findlib,
${misc:Depends}
+ libgd-dev,
+ libgd-ocaml (= ${binary:Version}), ocaml-findlib, ${misc:Depends}
Provides: ${ocaml:Provides}
Description: OCaml interface to the GD library -- developpement files
This package provides an interface to the GD library for
@@ -55,8 +49,19 @@ Description: OCaml interface to the GD library --
developpement files
This is particularly useful in World Wide Web applications, where PNG is
one of the formats accepted for inline images by most browsers.
.
- This is the full development version of the library, built without XPM
- (X pixmap) or fontconfig support.
- .
This package contains all the development stuff you need to develop
OCaml programs which use this module.
+
+Package: libgd-gd2-noxpm-ocaml
+Architecture: all
+Depends: libgd-ocaml
+Description: OCaml interface to the GD library -- transitional package
+ This is a transitional dummy package to install libgd-gd2-noxpm-ocaml.
+ It can safely be removed.
+
+Package: libgd-gd2-noxpm-ocaml-dev
+Architecture: all
+Depends: libgd-ocaml-dev
+Description: OCaml interface to the GD library -- transitional package
+ This is a transitional dummy package to install libgd-gd2-noxpm-ocaml-dev.
+ It can safely be removed.
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index d1d3887..000
--- a/debian/control.in
+++ /dev/null
@@ -1,58 +0,0 @@
-Source: gd4o
-Section: ocaml
-Priority: optional
-Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
-Uploaders: Samuel Mimram smim...@debian.org, Romain Beauxis
to...@rastageeks.org
-Build-Depends:
- @cdbs@,
- libgd2-noxpm-dev,
- libjpeg8-dev,
- libfreetype6-dev,
- libpng12-dev,
- ocaml-findlib (= 1.2.4),
- pkg-config
-Standards-Version: 3.9.2
-Homepage: http://matt.gushee.net/software/gd4o/
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/gd4o.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/gd4o.git
-
-Package: libgd-gd2-noxpm-ocaml
-Architecture: any
-Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${ocaml:Provides}
-Description: OCaml interface to the GD library -- runtime files
- This package provides an interface to the GD library for
- OCaml programmers.
- .
- GD is a graphics library. It allows your code to quickly draw images
- complete with lines, arcs, text, multiple colours, cut and paste from
- other images, flood fills, and write out the result as a PNG file.
- This is particularly useful in World Wide Web applications, where PNG is
- one of the formats accepted for inline images by most browsers.
- .
- This is the full development version of the library, built without XPM
- (X pixmap) or fontconfig support.
- .
- This package contains only the shared runtime stub libraries.
-
-Package: libgd-gd2-noxpm-ocaml-dev
-Architecture: any
-Depends: ${ocaml:Depends},
- libgd2-noxpm-dev,
- libgd-gd2-noxpm-ocaml
[Pkg-ocaml-maint-commits] [SCM] gdo packaging annotated tag, debian/1.0_alpha5-6, created. debian/1.0_alpha5-6
The annotated tag, debian/1.0_alpha5-6 has been created at 827dc552150f3074d455d21003ff6cb0ae1adf5b (tag) tagging 99015014ecd743750ce761bc050ccb31127ff901 (commit) replaces debian/1.0_alpha5-5 tagged by Romain Beauxis on Tue May 14 20:14:49 2013 -0500 - Shortlog gd4o Debian release 1.0~alpha5-6 Romain Beauxis (1): New upload, following libgd transition. --- -- gdo 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] camlimages packaging annotated tag, debian/1%4.0.1-5, created. debian/1%4.0.1-5
The annotated tag, debian/1%4.0.1-5 has been created at 5fe2c1383f50bf187709e92c905566ab70a12241 (tag) tagging 0d80f98d8a1d98768632d6600fb525e5d80bfe0b (commit) replaces debian/1%4.0.1-4 tagged by Romain Beauxis on Tue May 14 20:46:03 2013 -0500 - Shortlog camlimages Debian release 1:4.0.1-5 Romain Beauxis (1): Switch build-dep on libtiff5-dev from libtiff4-dev, Stephane Glondu (1): Build-Depend on libpng-dev instead of libpng12-dev --- -- camlimages 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.1.1-3-1-gab3e2f0
The following commit has been merged in the master branch:
commit ab3e2f0e4b5a8c546ba450d4e8732d7f9c2cb15d
Author: Romain Beauxis to...@rastageeks.org
Date: Tue May 14 17:23:42 2013 -0500
Switch fdkaac enocder to dynamic load
diff --git a/debian/changelog b/debian/changelog
index e9e82d9..e1d9703 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+liquidsoap (1.1.1-4) unstable; urgency=low
+
+ * Added patch to enable dynamically loaded
+fdkaac encoder.
+ * Dropped liquidsoap-plugin-fdkaac.
+ Closes: #708602
+
+ -- Romain Beauxis to...@rastageeks.org Tue, 14 May 2013 17:19:49 -0500
+
liquidsoap (1.1.1-3) unstable; urgency=low
* Added liquidsoap emacs mode package.
diff --git a/debian/control b/debian/control
index 76f44c3..5542bdf 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,11 @@ Maintainer: Debian OCaml Maintainers
debian-ocaml-ma...@lists.debian.org
Uploaders: Romain Beauxis to...@rastageeks.org, Samuel Mimram
smim...@debian.org
Build-Depends:
cdbs (= 0.4.85~),
+ quilt,
debhelper (= 7.0.1),
ocaml-nox,
dh-ocaml (= 1.0.1),
+ dh-autoreconf,
ocaml-findlib,
libcry-ocaml-dev (= 0.2.2),
libogg-ocaml-dev (= 0.4.5),
@@ -27,7 +29,6 @@ Build-Depends:
libpcre-ocaml-dev,
libladspa-ocaml-dev (= 0.1.4),
sox,
- libfdkaac-ocaml-dev,
libsoundtouch-ocaml-dev (= 0.1.7),
libinotify-ocaml-dev [linux-any],
liblastfm-ocaml-dev (= 0.3.0),
@@ -122,7 +123,6 @@ Depends:
liquidsoap-plugin-camlimages,
liquidsoap-plugin-dssi,
liquidsoap-plugin-faad,
- liquidsoap-plugin-fdkaac,
liquidsoap-plugin-flac,
liquidsoap-plugin-frei0r,
liquidsoap-plugin-gavl,
@@ -249,25 +249,6 @@ Description: audio streaming language -- FAAD plugin
.
This package provides support for decoding AAC and M4A files in liquidsoap.
-Package: liquidsoap-plugin-fdkaac
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${ocaml:Depends},
- ${misc:Depends},
- liquidsoap (= ${binary:Version})
-Section: contrib/sound
-Description: audio streaming language -- FDK AAC plugin
- Liquidsoap is a powerful tool for building complex audio streaming systems,
- typically targeting internet radios (e.g. icecast streams).
- .
- It consists of a simple script language, in which you can create, combine and
- transform audio sources. Its design makes liquidsoap flexible and easily
- extensible.
- .
- This package provides support for in AAC format in liquidsoap using the
- FDK AAC library.
-
Package: liquidsoap-plugin-flac
Architecture: any
Depends:
diff --git a/debian/liquidsoap-plugin-fdkaac.install
b/debian/liquidsoap-plugin-fdkaac.install
deleted file mode 100644
index 4d77d1b..000
--- a/debian/liquidsoap-plugin-fdkaac.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/liquidsoap/*/plugins/fdkaac.cm*
diff --git a/debian/patches/fdkaad-dynlink.patch
b/debian/patches/fdkaad-dynlink.patch
new file mode 100644
index 000..02c54b1
--- /dev/null
+++ b/debian/patches/fdkaad-dynlink.patch
@@ -0,0 +1,511 @@
+diff --git a/Makefile.defs.in b/Makefile.defs.in
+index 9135d41..f221ad0 100644
+--- a/Makefile.defs.in
b/Makefile.defs.in
+@@ -79,6 +79,7 @@ W_AACPLUS=@W_AACPLUS@
+ W_AACPLUS_DYN=@W_AACPLUS_DYN@
+ W_VOAACENC=@W_VOAACENC@
+ W_FDKAAC=@W_FDKAAC@
++W_FDKAAC_DYN=@W_FDKAAC_DYN@
+ W_ALSA=@W_ALSA@
+ W_BJACK=@W_BJACK@
+ W_AO=@W_AO@
+diff --git a/configure.ac b/configure.ac
+index 9a2ba66..09e6cc6 100644
+--- a/configure.ac
b/configure.ac
+@@ -484,6 +484,15 @@ AC_CHECK_OCAML_BINDING([voaacenc],[0.1.0])
+ #
+
+ AC_CHECK_OCAML_BINDING([fdkaac],[0.1.0])
++if test -z ${W_FDKAAC}; then
++ if test -n ${W_DYNLINK}; then
++if test -n ${OCAML_HAS_FIRST_CLASS_MODULES}; then
++ W_FDKAAC_DYN=yes
++ w_FDKAAC=detected at runtime
++fi
++ fi
++fi
++AC_SUBST(W_FDKAAC_DYN)
+
+ #
+ # Theora
+diff --git a/src/Makefile b/src/Makefile
+index b6851fb..e9af43d 100644
+--- a/src/Makefile
b/src/Makefile
+@@ -156,9 +156,11 @@ analyze = analyze/analyze_rms.ml
+ encoders = \
+ encoder/wav_encoder.ml \
+ encoder/lame_encoder.ml \
++ encoder/fdkaac_encoder.ml \
+ encoder/aacplus_encoder.ml \
+ $(if ($(OS_TYPE):Win32=),encoder/external_encoder.ml) \
+ $(if $(W_LAME_DYN),encoder/lame_encoder_dynlink.ml) \
++ $(if $(W_FDKAAC_DYN),encoder/fdkaac_encoder_dynlink.ml) \
+ $(if $(W_AACPLUS_DYN),encoder/aacplus_encoder_dynlink.ml)
+
+ $(call conditional_compilation,encoders,$(W_SHINE),encoder/shine_encoder.ml)
+@@ -166,7 +168,7 @@ $(call
conditional_compilation,encoders,$(W_LAME),encoder/lame_encoder_builtin.m
+ $(call conditional_compilation,encoders,$(W_FLAC),encoder/flac_encoder.ml)
+ $(call
conditional_compilation,encoders,$(W_AACPLUS),encoder/aacplus_encoder_builtin.ml)
+ $(call
conditional_compilation,encoders,$(W_VOAACENC),encoder/voaacenc_encoder.ml)
+-$(call conditional_compilation,encoders,$(W_FDKAAC),encoder/fdkaac_encoder.ml)
++$(call
conditional_compilation,encoders,$(W_FDKAAC),encoder/fdkaac_encoder_builtin.ml)
+ $(call
[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging annotated tag, debian/1.1.1-4, created. debian/1.1.1-4
The annotated tag, debian/1.1.1-4 has been created at 9acbd6a93ef9b1d52d164939853ba6010ca6e6c3 (tag) tagging ab3e2f0e4b5a8c546ba450d4e8732d7f9c2cb15d (commit) replaces debian/1.1.1-3 tagged by Romain Beauxis on Tue May 14 18:49:18 2013 -0500 - Shortlog liquidsoap Debian release 1.1.1-4 Romain Beauxis (1): Switch fdkaac enocder to dynamic load --- -- 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.1.1-2-2-g450df02
The following commit has been merged in the master branch:
commit 450df027933b58a030c997f498f3db19a644fcc4
Author: Romain Beauxis to...@rastageeks.org
Date: Tue May 14 07:20:34 2013 -0500
Updated emacsen files.
diff --git a/debian/emacsen-remove b/debian/emacsen-remove
deleted file mode 100644
index c979e02..000
--- a/debian/emacsen-remove
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-# /usr/lib/emacsen-common/packages/remove/liquidsoap-mode
-
-FLAVOR=$1
-PACKAGE=liquidsoap-mode
-
-if [ ${FLAVOR} != emacs ]; then
-if test -x /usr/sbin/install-info-altdir; then
-echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
-install-info-altdir --quiet --remove --dirname=${FLAVOR}
/usr/info/liquidsoap-mode.info.gz
-fi
-
-echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
-rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-fi
diff --git a/debian/emacsen-startup b/debian/emacsen-startup
deleted file mode 100644
index c57e1ed..000
--- a/debian/emacsen-startup
+++ /dev/null
@@ -1,22 +0,0 @@
-;; -*-emacs-lisp-*-
-;;
-;; Emacs startup file for the Debian GNU/Linux liquidsoap-mode package
-;;
-;; Originally contributed by Nils Naumann naum...@unileoben.ac.at
-;; Modified by Dirk Eddelbuettel e...@debian.org
-;; Adapted for dh-make by Jim Van Zandt j...@vanzandt.mv.com
-
-;; The liquidsoap-mode package follows the Debian/GNU Linux 'emacsen' policy
and
-;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
-;; xemacs19, emacs20, xemacs20...). The compiled code is then
-;; installed in a subdirectory of the respective site-lisp directory.
-;; We have to add this to the load-path:
-(let ((package-dir (concat /usr/share/
- (symbol-name flavor)
- /site-lisp/liquidsoap-mode)))
- (when (file-directory-p package-dir)
-(setq load-path (cons package-dir load-path))
-(autoload 'liquidsoap-mode liquidsoap-mode Liquidsoap editing mode. t)
-(setq auto-mode-alist
- (cons (cons \\.t$ 'liquidsoap-mode)
- auto-mode-alist
diff --git a/debian/emacsen-install b/debian/liquidsoap-mode.emacsen-install
similarity index 75%
rename from debian/emacsen-install
rename to debian/liquidsoap-mode.emacsen-install
index cda3a57..c0ab814 100644
--- a/debian/emacsen-install
+++ b/debian/liquidsoap-mode.emacsen-install
@@ -12,18 +12,12 @@ if [ ${FLAVOR} = emacs ]; then exit 0; fi
echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
-#FLAVORTEST=`echo $FLAVOR | cut -c-6`
-#if [ ${FLAVORTEST} = xemacs ] ; then
-#SITEFLAG=-no-site-file
-#else
-#SITEFLAG=--no-site-file
-#fi
FLAGS=${SITEFLAG} -q -batch -l path.el -f batch-byte-compile
-
ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+RELELDIR=../../../emacs/site-lisp/${PACKAGE}
-# Install-info-altdir does not actually exist.
+# Install-info-altdir does not actually exist.
# Maybe somebody will write it.
if test -x /usr/sbin/install-info-altdir; then
echo install/${PACKAGE}: install Info links for ${FLAVOR}
@@ -33,13 +27,26 @@ fi
install -m 755 -d ${ELCDIR}
cd ${ELDIR}
FILES=`echo *.el`
-cp ${FILES} ${ELCDIR}
cd ${ELCDIR}
+ln -sf ${RELELDIR}/*.el .
cat EOF path.el
(setq load-path (cons . load-path) byte-compile-warnings nil)
EOF
-${FLAVOR} ${FLAGS} ${FILES}
-rm -f *.el path.el
+
+case ${FLAVOR} in
+xemacs21)
+;;
+emacs*)
+${FLAVOR} ${FLAGS} ${FILES}
+;;
+esac
+
+rm -f path.el
+
+cd ${ELCDIR}
+for f in ${FILES} ; do
+ln -sf ${RELELDIR}/$f .
+done
exit 0
diff --git a/debian/liquidsoap-mode.emacsen-remove
b/debian/liquidsoap-mode.emacsen-remove
new file mode 100644
index 000..81274a9
--- /dev/null
+++ b/debian/liquidsoap-mode.emacsen-remove
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+# /usr/lib/emacsen-common/packages/remove/liquidsoap-mode
+
+FLAVOR=$1
+PACKAGE=liquidsoap-mode
+
+if [ ${FLAVOR} != emacs ]; then
+echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi
diff --git a/debian/liquidsoap-mode.emacsen-startup
b/debian/liquidsoap-mode.emacsen-startup
new file mode 100644
index 000..eba5ad3
--- /dev/null
+++ b/debian/liquidsoap-mode.emacsen-startup
@@ -0,0 +1,10 @@
+(add-to-list 'auto-mode-alist '(\\.liq\\' . liquidsoap-mode))
+(autoload 'liquidsoap-mode liquidsoap-mode Major mode for editing
Liquidsoap code t)
+(debian-pkg-add-load-path-item
+ (concat /usr/share/
+(symbol-name debian-emacs-flavor)
+/site-lisp/liquidsoap-mode))
+
+
+
+
--
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.1.1-2-3-g26054f5
The following commit has been merged in the master branch:
commit 26054f54fda3d2991db8263d2177fa99cd797c46
Author: Romain Beauxis to...@rastageeks.org
Date: Tue May 14 08:42:20 2013 -0500
Added liquidsoap-plugin-fdkaac
diff --git a/debian/changelog b/debian/changelog
index 87eac69..e9e82d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ liquidsoap (1.1.1-3) unstable; urgency=low
* Added liquidsoap emacs mode package.
* Merge changes from NMU 1.0.1+repack1-1.1
+ * Added liquidsoap-plugin-fdkaac
-- Romain Beauxis to...@rastageeks.org Tue, 14 May 2013 00:35:34 -0500
diff --git a/debian/control b/debian/control
index 96c311f..76f44c3 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Build-Depends:
libpcre-ocaml-dev,
libladspa-ocaml-dev (= 0.1.4),
sox,
+ libfdkaac-ocaml-dev,
libsoundtouch-ocaml-dev (= 0.1.7),
libinotify-ocaml-dev [linux-any],
liblastfm-ocaml-dev (= 0.3.0),
@@ -121,6 +122,7 @@ Depends:
liquidsoap-plugin-camlimages,
liquidsoap-plugin-dssi,
liquidsoap-plugin-faad,
+ liquidsoap-plugin-fdkaac,
liquidsoap-plugin-flac,
liquidsoap-plugin-frei0r,
liquidsoap-plugin-gavl,
@@ -247,6 +249,25 @@ Description: audio streaming language -- FAAD plugin
.
This package provides support for decoding AAC and M4A files in liquidsoap.
+Package: liquidsoap-plugin-fdkaac
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${ocaml:Depends},
+ ${misc:Depends},
+ liquidsoap (= ${binary:Version})
+Section: contrib/sound
+Description: audio streaming language -- FDK AAC plugin
+ Liquidsoap is a powerful tool for building complex audio streaming systems,
+ typically targeting internet radios (e.g. icecast streams).
+ .
+ It consists of a simple script language, in which you can create, combine and
+ transform audio sources. Its design makes liquidsoap flexible and easily
+ extensible.
+ .
+ This package provides support for in AAC format in liquidsoap using the
+ FDK AAC library.
+
Package: liquidsoap-plugin-flac
Architecture: any
Depends:
diff --git a/debian/liquidsoap-plugin-fdkaac.install
b/debian/liquidsoap-plugin-fdkaac.install
new file mode 100644
index 000..4d77d1b
--- /dev/null
+++ b/debian/liquidsoap-plugin-fdkaac.install
@@ -0,0 +1 @@
+usr/lib/liquidsoap/*/plugins/fdkaac.cm*
diff --git a/debian/rules b/debian/rules
index 287a670..b94c613 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
--enable-dssi-dynamic-plugin --enable-lo-dynamic-plugin
--enable-camlimages-dynamic-plugin \
--enable-gstreamer-dynamic-plugin --enable-gd-dynamic-plugin
--with-default-font=$(DEFAULT_FONT) \
--enable-opus-dynamic-plugin --enable-frei0r-dynamic-plugin
--enable-shine-dynamic-plugin \
- --disable-custom
+ --enable-fdkaac-dynamic-plugin --disable-custom
DEB_MAKE_BUILD_TARGET := all doc
DEB_MAKE_INSTALL_TARGET := doc install DESTDIR=$(CURDIR)/debian/tmp/
OCAMLFIND_DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR) \
prefix=$(CURDIR)/debian/tmp/usr
sysconfdir=$(CURDIR)/debian/tmp/etc \
@@ -38,7 +38,7 @@ else
-Nliquidsoap-plugin-flac -Nliquidsoap-plugin-gavl
-Nliquidsoap-plugin-graphics \
-Nliquidsoap-plugin-ladspa -Nliquidsoap-plugin-lastfm
-Nliquidsoap-plugin-mad \
-Nliquidsoap-plugin-ogg -Nliquidsoap-plugin-oss
-Nliquidsoap-plugin-portaudio \
--Nliquidsoap-plugin-pulseaudio -Nliquidsoap-plugin-samplerate \
+-Nliquidsoap-plugin-pulseaudio -Nliquidsoap-plugin-samplerate
-Nliquidsoap-plugin-fdkaac \
-Nliquidsoap-plugin-schroedinger -Nliquidsoap-plugin-soundtouch
-Nliquidsoap-plugin-speex \
-Nliquidsoap-plugin-taglib -Nliquidsoap-plugin-theora
-Nliquidsoap-plugin-voaacenc \
-Nliquidsoap-plugin-vorbis -Nliquidsoap-plugin-xmlplaylist
-Nliquidsoap-plugin-lame \
--
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.1.1-2-8-gd382d78
The following commit has been merged in the master branch:
commit 3096fc64862d150fb5169af6e56d3d7a6e60f6e5
Author: Romain Beauxis to...@rastageeks.org
Date: Tue May 14 07:20:34 2013 -0500
Updated emacsen files.
diff --git a/debian/emacsen-remove b/debian/emacsen-remove
deleted file mode 100644
index c979e02..000
--- a/debian/emacsen-remove
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-# /usr/lib/emacsen-common/packages/remove/liquidsoap-mode
-
-FLAVOR=$1
-PACKAGE=liquidsoap-mode
-
-if [ ${FLAVOR} != emacs ]; then
-if test -x /usr/sbin/install-info-altdir; then
-echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
-install-info-altdir --quiet --remove --dirname=${FLAVOR}
/usr/info/liquidsoap-mode.info.gz
-fi
-
-echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
-rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-fi
diff --git a/debian/emacsen-startup b/debian/emacsen-startup
deleted file mode 100644
index c57e1ed..000
--- a/debian/emacsen-startup
+++ /dev/null
@@ -1,22 +0,0 @@
-;; -*-emacs-lisp-*-
-;;
-;; Emacs startup file for the Debian GNU/Linux liquidsoap-mode package
-;;
-;; Originally contributed by Nils Naumann naum...@unileoben.ac.at
-;; Modified by Dirk Eddelbuettel e...@debian.org
-;; Adapted for dh-make by Jim Van Zandt j...@vanzandt.mv.com
-
-;; The liquidsoap-mode package follows the Debian/GNU Linux 'emacsen' policy
and
-;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
-;; xemacs19, emacs20, xemacs20...). The compiled code is then
-;; installed in a subdirectory of the respective site-lisp directory.
-;; We have to add this to the load-path:
-(let ((package-dir (concat /usr/share/
- (symbol-name flavor)
- /site-lisp/liquidsoap-mode)))
- (when (file-directory-p package-dir)
-(setq load-path (cons package-dir load-path))
-(autoload 'liquidsoap-mode liquidsoap-mode Liquidsoap editing mode. t)
-(setq auto-mode-alist
- (cons (cons \\.t$ 'liquidsoap-mode)
- auto-mode-alist
diff --git a/debian/emacsen-install b/debian/liquidsoap-mode.emacsen-install
similarity index 75%
rename from debian/emacsen-install
rename to debian/liquidsoap-mode.emacsen-install
index cda3a57..c0ab814 100644
--- a/debian/emacsen-install
+++ b/debian/liquidsoap-mode.emacsen-install
@@ -12,18 +12,12 @@ if [ ${FLAVOR} = emacs ]; then exit 0; fi
echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
-#FLAVORTEST=`echo $FLAVOR | cut -c-6`
-#if [ ${FLAVORTEST} = xemacs ] ; then
-#SITEFLAG=-no-site-file
-#else
-#SITEFLAG=--no-site-file
-#fi
FLAGS=${SITEFLAG} -q -batch -l path.el -f batch-byte-compile
-
ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+RELELDIR=../../../emacs/site-lisp/${PACKAGE}
-# Install-info-altdir does not actually exist.
+# Install-info-altdir does not actually exist.
# Maybe somebody will write it.
if test -x /usr/sbin/install-info-altdir; then
echo install/${PACKAGE}: install Info links for ${FLAVOR}
@@ -33,13 +27,26 @@ fi
install -m 755 -d ${ELCDIR}
cd ${ELDIR}
FILES=`echo *.el`
-cp ${FILES} ${ELCDIR}
cd ${ELCDIR}
+ln -sf ${RELELDIR}/*.el .
cat EOF path.el
(setq load-path (cons . load-path) byte-compile-warnings nil)
EOF
-${FLAVOR} ${FLAGS} ${FILES}
-rm -f *.el path.el
+
+case ${FLAVOR} in
+xemacs21)
+;;
+emacs*)
+${FLAVOR} ${FLAGS} ${FILES}
+;;
+esac
+
+rm -f path.el
+
+cd ${ELCDIR}
+for f in ${FILES} ; do
+ln -sf ${RELELDIR}/$f .
+done
exit 0
diff --git a/debian/liquidsoap-mode.emacsen-remove
b/debian/liquidsoap-mode.emacsen-remove
new file mode 100644
index 000..81274a9
--- /dev/null
+++ b/debian/liquidsoap-mode.emacsen-remove
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+# /usr/lib/emacsen-common/packages/remove/liquidsoap-mode
+
+FLAVOR=$1
+PACKAGE=liquidsoap-mode
+
+if [ ${FLAVOR} != emacs ]; then
+echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi
diff --git a/debian/liquidsoap-mode.emacsen-startup
b/debian/liquidsoap-mode.emacsen-startup
new file mode 100644
index 000..eba5ad3
--- /dev/null
+++ b/debian/liquidsoap-mode.emacsen-startup
@@ -0,0 +1,10 @@
+(add-to-list 'auto-mode-alist '(\\.liq\\' . liquidsoap-mode))
+(autoload 'liquidsoap-mode liquidsoap-mode Major mode for editing
Liquidsoap code t)
+(debian-pkg-add-load-path-item
+ (concat /usr/share/
+(symbol-name debian-emacs-flavor)
+/site-lisp/liquidsoap-mode))
+
+
+
+
--
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.1.1-2-8-gd382d78
The following commit has been merged in the master branch:
commit 726f6998ff77ca6727ba79bc6d779c1f592afe73
Author: Romain Beauxis to...@rastageeks.org
Date: Tue May 14 01:12:15 2013 -0500
Emacs mode + backport previous NMU changes. Emacs stuff needs testing!
diff --git a/debian/changelog b/debian/changelog
index cb701ad..87eac69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+liquidsoap (1.1.1-3) unstable; urgency=low
+
+ * Added liquidsoap emacs mode package.
+ * Merge changes from NMU 1.0.1+repack1-1.1
+
+ -- Romain Beauxis to...@rastageeks.org Tue, 14 May 2013 00:35:34 -0500
+
liquidsoap (1.1.1-2) unstable; urgency=low
* Set inotify build-dep to linux-only.
@@ -23,6 +30,16 @@ liquidsoap (1.1.0-1) experimental; urgency=low
-- Romain Beauxis to...@rastageeks.org Sat, 20 Apr 2013 11:37:55 -0500
+liquidsoap (1.0.1+repack1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix missing versioned depend on libcamomile-ocaml-data:
+make (build) dependency on libcamomile-ocaml-{dev,data} versioned
+[(= 0.8)]. Thanks, Paul van Tilburg.
+(Closes: #685632)
+
+ -- gregor herrmann gre...@debian.org Sat, 20 Oct 2012 19:21:43 +0200
+
liquidsoap (1.0.1+repack1-1) unstable; urgency=low
* Repacked upstream tarball to remove unecessary
diff --git a/debian/control b/debian/control
index 3fdbade..96c311f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
libmad-ocaml-dev (= 0.4.3),
libdtools-ocaml-dev (= 0.3.1),
libtaglib-ocaml-dev (= 0.3.1),
- libcamomile-ocaml-dev,
+ libcamomile-ocaml-dev (= 0.8),
festival,
libxml-dom-perl,
python-gtk2-dev,
@@ -68,7 +68,7 @@ Depends:
${misc:Depends},
${ocaml:Depends},
${perl:Depends},
- libcamomile-ocaml-data,
+ libcamomile-ocaml-data (= 0.8),
wget,
sox,
adduser
@@ -779,3 +779,19 @@ Description: control GUI for liquidsoap
.
It can control a running instance of liquidsoap or launch its own instance.
+
+Package: liquidsoap-mode
+Architecture: all
+Depends: ${misc:Depends}, emacsen-common
+Suggests: liquidsoap
+Section: editors
+Description: Emacs mode for editing Liquidsoap code
+ Liquidsoap is a powerful tool for building complex audio streaming systems,
+ typically targeting internet radios (e.g. icecast streams).
+ .
+ It consists of a simple script language, in which you can create, combine and
+ transform audio sources. Its design makes liquidsoap flexible and easily
+ extensible.
+ .
+ This package provides an (X)Emacs mode which makes it easier to edit
+ Liquidsoap source code.
diff --git a/debian/emacsen-install b/debian/emacsen-install
new file mode 100644
index 000..cda3a57
--- /dev/null
+++ b/debian/emacsen-install
@@ -0,0 +1,45 @@
+#! /bin/sh -e
+# /usr/lib/emacsen-common/packages/install/liquidsoap-mode
+
+# Written by Jim Van Zandt j...@vanzandt.mv.com, borrowing heavily
+# from the install scripts for gettext by Santiago Vila
+# sanv...@ctv.es and octave by Dirk Eddelbuettel e...@debian.org.
+
+FLAVOR=$1
+PACKAGE=liquidsoap-mode
+
+if [ ${FLAVOR} = emacs ]; then exit 0; fi
+
+echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
+
+#FLAVORTEST=`echo $FLAVOR | cut -c-6`
+#if [ ${FLAVORTEST} = xemacs ] ; then
+#SITEFLAG=-no-site-file
+#else
+#SITEFLAG=--no-site-file
+#fi
+FLAGS=${SITEFLAG} -q -batch -l path.el -f batch-byte-compile
+
+ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+
+# Install-info-altdir does not actually exist.
+# Maybe somebody will write it.
+if test -x /usr/sbin/install-info-altdir; then
+echo install/${PACKAGE}: install Info links for ${FLAVOR}
+install-info-altdir --quiet --section --dirname=${FLAVOR}
/usr/info/${PACKAGE}.info.gz
+fi
+
+install -m 755 -d ${ELCDIR}
+cd ${ELDIR}
+FILES=`echo *.el`
+cp ${FILES} ${ELCDIR}
+cd ${ELCDIR}
+
+cat EOF path.el
+(setq load-path (cons . load-path) byte-compile-warnings nil)
+EOF
+${FLAVOR} ${FLAGS} ${FILES}
+rm -f *.el path.el
+
+exit 0
diff --git a/debian/emacsen-remove b/debian/emacsen-remove
new file mode 100644
index 000..c979e02
--- /dev/null
+++ b/debian/emacsen-remove
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+# /usr/lib/emacsen-common/packages/remove/liquidsoap-mode
+
+FLAVOR=$1
+PACKAGE=liquidsoap-mode
+
+if [ ${FLAVOR} != emacs ]; then
+if test -x /usr/sbin/install-info-altdir; then
+echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
+install-info-altdir --quiet --remove --dirname=${FLAVOR}
/usr/info/liquidsoap-mode.info.gz
+fi
+
+echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi
diff --git a/debian/emacsen-startup b/debian/emacsen-startup
new file mode 100644
index 000..c57e1ed
--- /dev/null
+++ b/debian/emacsen-startup
@@ -0,0 +1,22 @@
+;; -*-emacs-lisp-*-
+;;
+;; Emacs startup file for the Debian GNU/Linux liquidsoap-mode package
+;;
+;; Originally contributed by Nils
[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/1.1.1-2-8-gd382d78
The following commit has been merged in the master branch: commit 437d9763a89a173e7317ce3463529c1856c97d30 Merge: be92e6693f1cea7b16b755ed98280a6a0f0763a1 26054f54fda3d2991db8263d2177fa99cd797c46 Author: Romain Beauxis to...@rastageeks.org Date: Tue May 14 09:04:15 2013 -0500 Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap -- 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.1.1-2-8-gd382d78
The following commit has been merged in the master branch:
commit be92e6693f1cea7b16b755ed98280a6a0f0763a1
Author: Romain Beauxis to...@rastageeks.org
Date: Tue May 14 08:42:20 2013 -0500
Added liquidsoap-plugin-fdkaac
diff --git a/debian/changelog b/debian/changelog
index 87eac69..e9e82d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ liquidsoap (1.1.1-3) unstable; urgency=low
* Added liquidsoap emacs mode package.
* Merge changes from NMU 1.0.1+repack1-1.1
+ * Added liquidsoap-plugin-fdkaac
-- Romain Beauxis to...@rastageeks.org Tue, 14 May 2013 00:35:34 -0500
diff --git a/debian/control b/debian/control
index 96c311f..76f44c3 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Build-Depends:
libpcre-ocaml-dev,
libladspa-ocaml-dev (= 0.1.4),
sox,
+ libfdkaac-ocaml-dev,
libsoundtouch-ocaml-dev (= 0.1.7),
libinotify-ocaml-dev [linux-any],
liblastfm-ocaml-dev (= 0.3.0),
@@ -121,6 +122,7 @@ Depends:
liquidsoap-plugin-camlimages,
liquidsoap-plugin-dssi,
liquidsoap-plugin-faad,
+ liquidsoap-plugin-fdkaac,
liquidsoap-plugin-flac,
liquidsoap-plugin-frei0r,
liquidsoap-plugin-gavl,
@@ -247,6 +249,25 @@ Description: audio streaming language -- FAAD plugin
.
This package provides support for decoding AAC and M4A files in liquidsoap.
+Package: liquidsoap-plugin-fdkaac
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${ocaml:Depends},
+ ${misc:Depends},
+ liquidsoap (= ${binary:Version})
+Section: contrib/sound
+Description: audio streaming language -- FDK AAC plugin
+ Liquidsoap is a powerful tool for building complex audio streaming systems,
+ typically targeting internet radios (e.g. icecast streams).
+ .
+ It consists of a simple script language, in which you can create, combine and
+ transform audio sources. Its design makes liquidsoap flexible and easily
+ extensible.
+ .
+ This package provides support for in AAC format in liquidsoap using the
+ FDK AAC library.
+
Package: liquidsoap-plugin-flac
Architecture: any
Depends:
diff --git a/debian/liquidsoap-plugin-fdkaac.install
b/debian/liquidsoap-plugin-fdkaac.install
new file mode 100644
index 000..4d77d1b
--- /dev/null
+++ b/debian/liquidsoap-plugin-fdkaac.install
@@ -0,0 +1 @@
+usr/lib/liquidsoap/*/plugins/fdkaac.cm*
diff --git a/debian/rules b/debian/rules
index 287a670..b94c613 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
--enable-dssi-dynamic-plugin --enable-lo-dynamic-plugin
--enable-camlimages-dynamic-plugin \
--enable-gstreamer-dynamic-plugin --enable-gd-dynamic-plugin
--with-default-font=$(DEFAULT_FONT) \
--enable-opus-dynamic-plugin --enable-frei0r-dynamic-plugin
--enable-shine-dynamic-plugin \
- --disable-custom
+ --enable-fdkaac-dynamic-plugin --disable-custom
DEB_MAKE_BUILD_TARGET := all doc
DEB_MAKE_INSTALL_TARGET := doc install DESTDIR=$(CURDIR)/debian/tmp/
OCAMLFIND_DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR) \
prefix=$(CURDIR)/debian/tmp/usr
sysconfdir=$(CURDIR)/debian/tmp/etc \
@@ -38,7 +38,7 @@ else
-Nliquidsoap-plugin-flac -Nliquidsoap-plugin-gavl
-Nliquidsoap-plugin-graphics \
-Nliquidsoap-plugin-ladspa -Nliquidsoap-plugin-lastfm
-Nliquidsoap-plugin-mad \
-Nliquidsoap-plugin-ogg -Nliquidsoap-plugin-oss
-Nliquidsoap-plugin-portaudio \
--Nliquidsoap-plugin-pulseaudio -Nliquidsoap-plugin-samplerate \
+-Nliquidsoap-plugin-pulseaudio -Nliquidsoap-plugin-samplerate
-Nliquidsoap-plugin-fdkaac \
-Nliquidsoap-plugin-schroedinger -Nliquidsoap-plugin-soundtouch
-Nliquidsoap-plugin-speex \
-Nliquidsoap-plugin-taglib -Nliquidsoap-plugin-theora
-Nliquidsoap-plugin-voaacenc \
-Nliquidsoap-plugin-vorbis -Nliquidsoap-plugin-xmlplaylist
-Nliquidsoap-plugin-lame \
--
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.1.1-2-8-gd382d78
The following commit has been merged in the master branch: commit d382d789b435a2605df1d1bc585e87e718fdfa98 Author: Romain Beauxis to...@rastageeks.org Date: Tue May 14 09:05:16 2013 -0500 Revert harbor_output.ml to upstream version. diff --git a/src/outputs/harbor_output.ml b/src/outputs/harbor_output.ml index d078aa6..e2270cf 100644 --- a/src/outputs/harbor_output.ml +++ b/src/outputs/harbor_output.ml @@ -361,8 +361,7 @@ class output ~kind p = let login user password = let (user, - password) -= + password) = let f = Configure. recode_tag @@ -565,8 +564,7 @@ class output ~kind p = s) in let (metaint, -icyheader) -= +icyheader) = try (assert (((List. @@ -901,8 +899,7 @@ class output ~kind p = (acc, 0) in let (data, -pos) -= +pos) = f [] 0 (b :: (List.rev @@ -1070,8 +1067,7 @@ class output ~kind p = ^(.+)\\?(.+)$ in let (base_uri, -args) -= +args) = try let sub = -- 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.1.1-3, created. debian/1.1.1-3
The annotated tag, debian/1.1.1-3 has been created at fb002a5663cca37acf2f9ba9e1ec2c42ec24c225 (tag) tagging d382d789b435a2605df1d1bc585e87e718fdfa98 (commit) replaces debian/1.1.1-2 tagged by Romain Beauxis on Tue May 14 09:35:43 2013 -0500 - Shortlog liquidsoap Debian release 1.1.1-3 Romain Beauxis (8): Emacs mode + backport previous NMU changes. Emacs stuff needs testing! Updated emacsen files. Added liquidsoap-plugin-fdkaac Emacs mode + backport previous NMU changes. Emacs stuff needs testing! Updated emacsen files. Added liquidsoap-plugin-fdkaac Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap Revert harbor_output.ml to upstream version. --- -- 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.1.1-2-1-ga4ce0d2
The following commit has been merged in the master branch:
commit a4ce0d2e254a323a1c0a7dc14e91b04ffa0cd2ee
Author: Romain Beauxis to...@rastageeks.org
Date: Tue May 14 01:12:15 2013 -0500
Emacs mode + backport previous NMU changes. Emacs stuff needs testing!
diff --git a/debian/changelog b/debian/changelog
index cb701ad..87eac69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+liquidsoap (1.1.1-3) unstable; urgency=low
+
+ * Added liquidsoap emacs mode package.
+ * Merge changes from NMU 1.0.1+repack1-1.1
+
+ -- Romain Beauxis to...@rastageeks.org Tue, 14 May 2013 00:35:34 -0500
+
liquidsoap (1.1.1-2) unstable; urgency=low
* Set inotify build-dep to linux-only.
@@ -23,6 +30,16 @@ liquidsoap (1.1.0-1) experimental; urgency=low
-- Romain Beauxis to...@rastageeks.org Sat, 20 Apr 2013 11:37:55 -0500
+liquidsoap (1.0.1+repack1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix missing versioned depend on libcamomile-ocaml-data:
+make (build) dependency on libcamomile-ocaml-{dev,data} versioned
+[(= 0.8)]. Thanks, Paul van Tilburg.
+(Closes: #685632)
+
+ -- gregor herrmann gre...@debian.org Sat, 20 Oct 2012 19:21:43 +0200
+
liquidsoap (1.0.1+repack1-1) unstable; urgency=low
* Repacked upstream tarball to remove unecessary
diff --git a/debian/control b/debian/control
index 3fdbade..96c311f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
libmad-ocaml-dev (= 0.4.3),
libdtools-ocaml-dev (= 0.3.1),
libtaglib-ocaml-dev (= 0.3.1),
- libcamomile-ocaml-dev,
+ libcamomile-ocaml-dev (= 0.8),
festival,
libxml-dom-perl,
python-gtk2-dev,
@@ -68,7 +68,7 @@ Depends:
${misc:Depends},
${ocaml:Depends},
${perl:Depends},
- libcamomile-ocaml-data,
+ libcamomile-ocaml-data (= 0.8),
wget,
sox,
adduser
@@ -779,3 +779,19 @@ Description: control GUI for liquidsoap
.
It can control a running instance of liquidsoap or launch its own instance.
+
+Package: liquidsoap-mode
+Architecture: all
+Depends: ${misc:Depends}, emacsen-common
+Suggests: liquidsoap
+Section: editors
+Description: Emacs mode for editing Liquidsoap code
+ Liquidsoap is a powerful tool for building complex audio streaming systems,
+ typically targeting internet radios (e.g. icecast streams).
+ .
+ It consists of a simple script language, in which you can create, combine and
+ transform audio sources. Its design makes liquidsoap flexible and easily
+ extensible.
+ .
+ This package provides an (X)Emacs mode which makes it easier to edit
+ Liquidsoap source code.
diff --git a/debian/emacsen-install b/debian/emacsen-install
new file mode 100644
index 000..cda3a57
--- /dev/null
+++ b/debian/emacsen-install
@@ -0,0 +1,45 @@
+#! /bin/sh -e
+# /usr/lib/emacsen-common/packages/install/liquidsoap-mode
+
+# Written by Jim Van Zandt j...@vanzandt.mv.com, borrowing heavily
+# from the install scripts for gettext by Santiago Vila
+# sanv...@ctv.es and octave by Dirk Eddelbuettel e...@debian.org.
+
+FLAVOR=$1
+PACKAGE=liquidsoap-mode
+
+if [ ${FLAVOR} = emacs ]; then exit 0; fi
+
+echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
+
+#FLAVORTEST=`echo $FLAVOR | cut -c-6`
+#if [ ${FLAVORTEST} = xemacs ] ; then
+#SITEFLAG=-no-site-file
+#else
+#SITEFLAG=--no-site-file
+#fi
+FLAGS=${SITEFLAG} -q -batch -l path.el -f batch-byte-compile
+
+ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+
+# Install-info-altdir does not actually exist.
+# Maybe somebody will write it.
+if test -x /usr/sbin/install-info-altdir; then
+echo install/${PACKAGE}: install Info links for ${FLAVOR}
+install-info-altdir --quiet --section --dirname=${FLAVOR}
/usr/info/${PACKAGE}.info.gz
+fi
+
+install -m 755 -d ${ELCDIR}
+cd ${ELDIR}
+FILES=`echo *.el`
+cp ${FILES} ${ELCDIR}
+cd ${ELCDIR}
+
+cat EOF path.el
+(setq load-path (cons . load-path) byte-compile-warnings nil)
+EOF
+${FLAVOR} ${FLAGS} ${FILES}
+rm -f *.el path.el
+
+exit 0
diff --git a/debian/emacsen-remove b/debian/emacsen-remove
new file mode 100644
index 000..c979e02
--- /dev/null
+++ b/debian/emacsen-remove
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+# /usr/lib/emacsen-common/packages/remove/liquidsoap-mode
+
+FLAVOR=$1
+PACKAGE=liquidsoap-mode
+
+if [ ${FLAVOR} != emacs ]; then
+if test -x /usr/sbin/install-info-altdir; then
+echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
+install-info-altdir --quiet --remove --dirname=${FLAVOR}
/usr/info/liquidsoap-mode.info.gz
+fi
+
+echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi
diff --git a/debian/emacsen-startup b/debian/emacsen-startup
new file mode 100644
index 000..c57e1ed
--- /dev/null
+++ b/debian/emacsen-startup
@@ -0,0 +1,22 @@
+;; -*-emacs-lisp-*-
+;;
+;; Emacs startup file for the Debian GNU/Linux liquidsoap-mode package
+;;
+;; Originally contributed by Nils
[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. debian/4.00.1_20130426-1-1-g8a68a27
The following commit has been merged in the master branch:
commit 8a68a271548e9d295db5368b0e8f0b346b716f6c
Author: Romain Beauxis to...@rastageeks.org
Date: Tue May 14 01:47:40 2013 -0500
Upload to unstable, add transitional package.
diff --git a/debian/changelog b/debian/changelog
index 48c9364..3fcba68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mingw-ocaml (4.00.1~20130426-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * Fix conflict with previous mingw-ocaml binary package.
+
+ -- Romain Beauxis to...@rastageeks.org Tue, 14 May 2013 01:42:43 -0500
+
mingw-ocaml (4.00.1~20130426-1) experimental; urgency=low
* New package, based on github project.
diff --git a/debian/control b/debian/control
index b2670ce..eadd530 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,18 @@ Standards-Version: 3.9.4
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git
Vcs-Browser:
http://git.debian.org/?p=pkg-ocaml-maint/packages/mingw32-ocaml.git
+Package: mingw-ocaml
+Depends: ocaml-mingw-w64, ${misc:Depends}
+Architecture: all
+Section: oldlibs
+Description: ocaml-mingw-w64 transitional dummy package
+ This is a transitional dummy package to install ocaml-mingw-w64.
+ It can safely be removed.
+
Package: ocaml-mingw-w64
Architecture: all
-Replaces: mingw-ocaml
+Replaces: mingw-ocaml ( 4.00.1~20130426-1~)
+Breaks: mingw-ocaml ( 4.00.1~20130426-1~)
Depends:
${misc:Depends},
ocaml-mingw-w64-i686,
--
mingw32-ocaml 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] mingw32-ocaml packaging annotated tag, debian/4.00.1_20130426-2, created. debian/4.00.1_20130426-2
The annotated tag, debian/4.00.1_20130426-2 has been created at f377fb4c6fdec471f252b2b355e60539c8e26633 (tag) tagging 8a68a271548e9d295db5368b0e8f0b346b716f6c (commit) replaces debian/4.00.1_20130426-1 tagged by Romain Beauxis on Tue May 14 04:40:28 2013 -0500 - Shortlog mingw-ocaml Debian release 4.00.1~20130426-2 Romain Beauxis (1): Upload to unstable, add transitional package. --- -- mingw32-ocaml 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.1.1-1-1-gbbce85c
The following commit has been merged in the master branch: commit bbce85c3eeb1631c02dbe28f66db873ee54a6440 Author: Romain Beauxis to...@rastageeks.org Date: Thu Mar 28 15:22:57 2013 -0500 Set inotify build-dep as linux-only diff --git a/debian/changelog b/debian/changelog index 3ac2586..cb701ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +liquidsoap (1.1.1-2) unstable; urgency=low + + * Set inotify build-dep to linux-only. + + -- Romain Beauxis to...@rastageeks.org Wed, 27 Mar 2013 13:37:29 -0500 + liquidsoap (1.1.1-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 192ef55..3fdbade 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Build-Depends: libladspa-ocaml-dev (= 0.1.4), sox, libsoundtouch-ocaml-dev (= 0.1.7), - libinotify-ocaml-dev, + libinotify-ocaml-dev [linux-any], liblastfm-ocaml-dev (= 0.3.0), libspeex-ocaml-dev (= 0.2.0-3), libgavl-ocaml-dev (= 0.1.5), -- 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.1.1-2, created. debian/1.1.1-2
The annotated tag, debian/1.1.1-2 has been created at 9a15382273331398d885a5eed20dbbd7708d03f5 (tag) tagging bbce85c3eeb1631c02dbe28f66db873ee54a6440 (commit) replaces debian/1.1.1-1 tagged by Romain Beauxis on Tue May 14 00:10:18 2013 -0500 - Shortlog liquidsoap Debian release 1.1.1-2 Romain Beauxis (1): Set inotify build-dep as linux-only --- -- 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] ocaml-lastfm packaging branch, master, updated. debian/0.3.0-2-1-g538bf75
The following commit has been merged in the master branch:
commit 538bf75591b8d07e6178369de7e78f60fc0ba7b7
Author: Romain Beauxis to...@rastageeks.org
Date: Wed Mar 27 12:39:43 2013 -0500
New upload.
diff --git a/debian/changelog b/debian/changelog
index 745ebfb..d2e8d7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-lastfm (0.3.0-3) unstable; urgency=low
+
+ * Rebuild against latest packages.
+ * Update standards version to 3.9.4
+
+ -- Romain Beauxis to...@rastageeks.org Wed, 27 Mar 2013 12:35:55 -0500
+
ocaml-lastfm (0.3.0-2) unstable; urgency=low
* Rebuild against xmlplaylist 0.1.3
diff --git a/debian/control b/debian/control
index 73e4eec..be5515f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Samuel Mimram smim...@debian.org, Romain Beauxis
toots@rastageeks.
Build-Depends: cdbs (= 0.4.53), debhelper (= 7.0.1), ocaml-nox, dh-ocaml (=
0.9),
ocaml-findlib (= 1.2.4), libxmlplaylist-ocaml-dev (= 0.1.3),
libocamlnet-ocaml-dev (= 2.2.9-7~), libpcre-ocaml-dev (=
6.0.1-2~)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-lastfm.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-lastfm.git
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 3921d64..000
--- a/debian/control.in
+++ /dev/null
@@ -1,21 +0,0 @@
-Source: ocaml-lastfm
-Section: ocaml
-Priority: optional
-Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
-Uploaders: Samuel Mimram smim...@debian.org, Romain Beauxis
to...@rastageeks.org
-Build-Depends: @cdbs@,
- ocaml-findlib (= 1.2.4), libxmlplaylist-ocaml-dev (= 0.1.3),
- libocamlnet-ocaml-dev (= 2.2.9-7~), libpcre-ocaml-dev (=
6.0.1-2~)
-Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-lastfm.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-lastfm.git
-
-Package: liblastfm-ocaml-dev
-Architecture: any
-Homepage: http://savonet.sourceforge.net/
-Depends: ${ocaml:Depends}, ocaml-findlib, ${misc:Depends}
-Provides: ${ocaml:Provides}
-Description: OCaml interface to audioscrobbler and lastfm radios
- This OCaml module provides an API to audioscrobbler, the lastfm
- submission protocol, as well as the radio API, which allows one to
- listen to lastfm streams/radios.
diff --git a/debian/rules b/debian/rules
index 0319b58..53c110c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/ocaml.mk
-# In order to regenerate 'debian/control' :
-# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
-# Then check manually if everything's ok
-
DEB_CONFIGURE_EXTRA_FLAGS := --enable-debugging
DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR)
OCAMLFIND_LDCONF=ignore
--
ocaml-lastfm 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] ocaml-lastfm packaging annotated tag, debian/0.3.0-3, created. debian/0.3.0-3
The annotated tag, debian/0.3.0-3 has been created at e5d45d8adb717a407dbfc853f9097bbd371831df (tag) tagging 538bf75591b8d07e6178369de7e78f60fc0ba7b7 (commit) replaces debian/0.3.0-2 tagged by Romain Beauxis on Wed Mar 27 12:41:19 2013 -0500 - Shortlog ocaml-lastfm Debian release 0.3.0-3 Romain Beauxis (1): New upload. --- -- ocaml-lastfm 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] ocaml-bjack packaging branch, master, updated. debian/0.1.4-1-1-g9ef434b
The following commit has been merged in the master branch: commit 9ef434b0cca7c649171135799513d14d85052399 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 18:51:24 2013 -0500 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 76bfc9d..06b1962 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-bjack (0.1.4-2) unstable; urgency=low + + * Upload to unstable. + + -- Romain Beauxis to...@rastageeks.org Wed, 08 May 2013 18:51:04 -0500 + ocaml-bjack (0.1.4-1) experimental; urgency=low * New upstream release. -- ocaml-bjack 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] ocaml-bjack packaging annotated tag, debian/0.1.4-2, created. debian/0.1.4-2
The annotated tag, debian/0.1.4-2 has been created at 9840d963f57587cd50bbba40335170a56ff0d7f1 (tag) tagging 9ef434b0cca7c649171135799513d14d85052399 (commit) replaces debian/0.1.4-1 tagged by Romain Beauxis on Wed May 8 18:52:28 2013 -0500 - Shortlog Debian release 0.1.4-2 Romain Beauxis (1): Upload to unstable. --- -- ocaml-bjack 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] ocaml-duppy packaging branch, master, updated. debian/0.5.0-1-6-gb988c94
The following commit has been merged in the master branch: commit 2a6ec81aa2b72a7c07c99b627cb0ad16c2fc2987 Merge: dfe8006376b3f2cbf163cda89cd422028c691a51 c4bfa358a86bdd9ee2911b30d9283b9ac26ca465 Author: Romain Beauxis to...@rastageeks.org Date: Mon Mar 4 23:28:34 2013 -0600 Merge tag 'upstream/0.5.0' Upstream version 0.5.0 -- ocaml-duppy 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] ocaml-duppy packaging branch, master, updated. debian/0.5.0-1-6-gb988c94
The following commit has been merged in the master branch:
commit 8a6d6c8b0dbf5d491f71cabb884c8fcf6657f169
Author: Romain Beauxis to...@rastageeks.org
Date: Wed May 8 18:55:47 2013 -0500
Imported Upstream version 0.5.1
diff --git a/CHANGES b/CHANGES
index 87fd795..8519488 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+0.5.1 (05-08-2013)
+=
+* Removed win32 select work-around: patch applied upstream.
+
0.5.0 (04-03-2013)
=
* Remove Panic exception and let original exception bubble through.
diff --git a/configure b/configure
index d2503fe..d18d7a1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ocaml-duppy 0.5.0.
+# Generated by GNU Autoconf 2.69 for ocaml-duppy 0.5.1.
#
# Report bugs to savonet-us...@lists.sourceforge.net.
#
@@ -639,8 +639,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ocaml-duppy'
PACKAGE_TARNAME='ocaml-duppy'
-PACKAGE_VERSION='0.5.0'
-PACKAGE_STRING='ocaml-duppy 0.5.0'
+PACKAGE_VERSION='0.5.1'
+PACKAGE_STRING='ocaml-duppy 0.5.1'
PACKAGE_BUGREPORT='savonet-us...@lists.sourceforge.net'
PACKAGE_URL=''
@@ -673,9 +673,11 @@ OCAMLLEXDOTOPT
OCAMLLEX
CAMLIDL
OCAMLBUILD
+OCAMLDOCOPT
OCAMLDOC
OCAMLMKLIB
OCAMLMKTOP
+OCAMLDEPOPT
OCAMLDEP
OCAML
OCAMLOPTDOTOPT
@@ -1309,7 +1311,7 @@ if test $ac_init_help = long; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat _ACEOF
-\`configure' configures ocaml-duppy 0.5.0 to adapt to many kinds of systems.
+\`configure' configures ocaml-duppy 0.5.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1374,7 +1376,7 @@ fi
if test -n $ac_init_help; then
case $ac_init_help in
- short | recursive ) echo Configuration of ocaml-duppy 0.5.0:;;
+ short | recursive ) echo Configuration of ocaml-duppy 0.5.1:;;
esac
cat \_ACEOF
@@ -1478,7 +1480,7 @@ fi
test -n $ac_init_help exit $ac_status
if $ac_init_version; then
cat \_ACEOF
-ocaml-duppy configure 0.5.0
+ocaml-duppy configure 0.5.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1564,7 +1566,7 @@ cat config.log _ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ocaml-duppy $as_me 0.5.0, which was
+It was created by ocaml-duppy $as_me 0.5.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3956,6 +3958,48 @@ fi
if test $OCAMLDEP = no; then
as_fn_error $? Cannot find ocamlmklib. $LINENO 5
+ else
+# Extract the first word of ${ac_tool_prefix}ocamldep.opt, so it can be
a program name with args.
+set dummy ${ac_tool_prefix}ocamldep.opt; ac_word=$2
+{ $as_echo $as_me:${as_lineno-$LINENO}: checking for $ac_word 5
+$as_echo_n checking for $ac_word... 6; }
+if ${ac_cv_prog_OCAMLDEPOPT+:} false; then :
+ $as_echo_n (cached) 6
+else
+ if test -n $OCAMLDEPOPT; then
+ ac_cv_prog_OCAMLDEPOPT=$OCAMLDEPOPT # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z $as_dir as_dir=.
+for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p $as_dir/$ac_word$ac_exec_ext; then
+ac_cv_prog_OCAMLDEPOPT=${ac_tool_prefix}ocamldep.opt
+$as_echo $as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext
5
+break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z $ac_cv_prog_OCAMLDEPOPT ac_cv_prog_OCAMLDEPOPT=no
+fi
+fi
+OCAMLDEPOPT=$ac_cv_prog_OCAMLDEPOPT
+if test -n $OCAMLDEPOPT; then
+ { $as_echo $as_me:${as_lineno-$LINENO}: result: $OCAMLDEPOPT 5
+$as_echo $OCAMLDEPOPT 6; }
+else
+ { $as_echo $as_me:${as_lineno-$LINENO}: result: no 5
+$as_echo no 6; }
+fi
+
+
+if test $OCAMLDEPOPT != no; then
+ OCAMLDEP=$OCAMLDEPOPT
+fi
fi
@@ -4140,6 +4184,103 @@ else
OCAMLDOC=$ac_cv_prog_OCAMLDOC
fi
+ if test $OCAMLDOC != no; then
+if test -n $ac_tool_prefix; then
+ # Extract the first word of ${ac_tool_prefix}ocamldoc.opt, so it can be a
program name with args.
+set dummy ${ac_tool_prefix}ocamldoc.opt; ac_word=$2
+{ $as_echo $as_me:${as_lineno-$LINENO}: checking for $ac_word 5
+$as_echo_n checking for $ac_word... 6; }
+if ${ac_cv_prog_OCAMLDOCOPT+:} false; then :
+ $as_echo_n (cached) 6
+else
+ if test -n $OCAMLDOCOPT; then
+ ac_cv_prog_OCAMLDOCOPT=$OCAMLDOCOPT # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z $as_dir as_dir=.
+for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p $as_dir/$ac_word$ac_exec_ext; then
+ac_cv_prog_OCAMLDOCOPT=${ac_tool_prefix}ocamldoc.opt
+$as_echo $as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext
5
[Pkg-ocaml-maint-commits] [SCM] ocaml-duppy packaging branch, master, updated. debian/0.5.0-1-6-gb988c94
The following commit has been merged in the master branch: commit b360bd0036eb883a83e49d05f2a05ad985c6638b Merge: 2a6ec81aa2b72a7c07c99b627cb0ad16c2fc2987 8a6d6c8b0dbf5d491f71cabb884c8fcf6657f169 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 18:55:48 2013 -0500 Merge tag 'upstream/0.5.1' Upstream version 0.5.1 -- ocaml-duppy 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] ocaml-duppy packaging branch, master, updated. debian/0.5.0-1-6-gb988c94
The following commit has been merged in the master branch: commit 4745a10760700723b2b50eaa0ba2117bbd9110a5 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 18:56:40 2013 -0500 New upstream release. diff --git a/debian/changelog b/debian/changelog index 651cf03..73c18bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-duppy (0.5.1-1) unstable; urgency=low + + * New upstream release. + + -- Romain Beauxis to...@rastageeks.org Wed, 08 May 2013 18:55:54 -0500 + ocaml-duppy (0.4.2-1) unstable; urgency=low * New upstream release. -- ocaml-duppy 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] ocaml-duppy packaging branch, pristine-tar, updated. 8de83c3c674f3eaa2f3d4c280d035788c9801c26
The following commit has been merged in the pristine-tar branch: commit 88d475c3569b56b1321d57a7bd33add7694621e5 Author: Romain Beauxis to...@rastageeks.org Date: Mon Mar 4 23:28:33 2013 -0600 pristine-tar data for ocaml-duppy_0.5.0.orig.tar.gz diff --git a/ocaml-duppy_0.5.0.orig.tar.gz.delta b/ocaml-duppy_0.5.0.orig.tar.gz.delta new file mode 100644 index 000..5f756e7 Binary files /dev/null and b/ocaml-duppy_0.5.0.orig.tar.gz.delta differ diff --git a/ocaml-duppy_0.5.0.orig.tar.gz.id b/ocaml-duppy_0.5.0.orig.tar.gz.id new file mode 100644 index 000..14f05ae --- /dev/null +++ b/ocaml-duppy_0.5.0.orig.tar.gz.id @@ -0,0 +1 @@ +555c800a1382b41bd5730eaecd29fb9f553d8714 -- ocaml-duppy 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] ocaml-duppy packaging branch, pristine-tar, updated. 8de83c3c674f3eaa2f3d4c280d035788c9801c26
The following commit has been merged in the pristine-tar branch: commit 1c13a5c47990f046e29ffd186592756de5fdcbda Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 18:55:47 2013 -0500 pristine-tar data for ocaml-duppy_0.5.1.orig.tar.gz diff --git a/ocaml-duppy_0.5.1.orig.tar.gz.delta b/ocaml-duppy_0.5.1.orig.tar.gz.delta new file mode 100644 index 000..31779df Binary files /dev/null and b/ocaml-duppy_0.5.1.orig.tar.gz.delta differ diff --git a/ocaml-duppy_0.5.1.orig.tar.gz.id b/ocaml-duppy_0.5.1.orig.tar.gz.id new file mode 100644 index 000..b5b1bb5 --- /dev/null +++ b/ocaml-duppy_0.5.1.orig.tar.gz.id @@ -0,0 +1 @@ +901409500ffe5a1dfe28a87d8b3719174713b8c3 -- ocaml-duppy 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] ocaml-duppy packaging branch, pristine-tar, updated. 8de83c3c674f3eaa2f3d4c280d035788c9801c26
The following commit has been merged in the pristine-tar branch: commit 8de83c3c674f3eaa2f3d4c280d035788c9801c26 Merge: 1c13a5c47990f046e29ffd186592756de5fdcbda d275606a619e15cc0f8fdfbde9ee439b0ae2c79d Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:01:01 2013 -0500 Merge branch 'pristine-tar' of git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-duppy into pristine-tar -- ocaml-duppy 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] ocaml-duppy packaging branch, upstream, updated. upstream/0.5.0-3-g68fa9f0
The following commit has been merged in the upstream branch: commit 68fa9f0ed802fb804a82c3754aa6ba8be893043b Merge: 8a6d6c8b0dbf5d491f71cabb884c8fcf6657f169 0606ca88badfe2c2ab9015af8496ec2f2ec55056 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:01:11 2013 -0500 Merge branch 'upstream' of git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-duppy into upstream -- ocaml-duppy 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] ocaml-duppy packaging annotated tag, upstream/0.5.1, created. upstream/0.5.1
The annotated tag, upstream/0.5.1 has been created at 8406679cec6ad9e5e1e68b0387d4c78e6cb17095 (tag) tagging 8a6d6c8b0dbf5d491f71cabb884c8fcf6657f169 (commit) replaces upstream/0.4.2 tagged by Romain Beauxis on Wed May 8 18:55:47 2013 -0500 - Shortlog Upstream version 0.5.1 Romain Beauxis (2): Imported Upstream version 0.5.0 Imported Upstream version 0.5.1 --- -- ocaml-duppy 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] ocaml-gavl packaging branch, master, updated. debian/0.1.5-1-1-ga0aef73
The following commit has been merged in the master branch: commit a0aef7372fa8441eba20846b8a45f6e17bbd663c Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:07:14 2013 -0500 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 96c33e4..29692df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-gavl (0.1.5-2) unstable; urgency=low + + * Upload to unstable. + + -- Romain Beauxis to...@rastageeks.org Wed, 08 May 2013 19:06:33 -0500 + ocaml-gavl (0.1.5-1) experimental; urgency=low * New upstream release. -- ocaml-gavl 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] ocaml-gavl packaging annotated tag, debian/0.1.5-2, created. debian/0.1.5-2
The annotated tag, debian/0.1.5-2 has been created at 368cb66f09c42df27fb5a95075423c9a1a874b41 (tag) tagging a0aef7372fa8441eba20846b8a45f6e17bbd663c (commit) replaces debian/0.1.5-1 tagged by Romain Beauxis on Wed May 8 19:08:33 2013 -0500 - Shortlog Debian release 0.1.5-2 Romain Beauxis (1): Upload to unstable --- -- ocaml-gavl 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] ocaml-mm packaging branch, master, updated. debian/0.2.1-1-5-g73bd6ce
The following commit has been merged in the master branch: commit 5767d81446ea3f4cc7c0db30430d8e587d966944 Merge: b6cbf08e13574ab8e74ff2d75e8730e4c1373b41 e86b532da3cc662ce90acd61c5b6e7d10b82e09d Author: Romain Beauxis to...@rastageeks.org Date: Mon Mar 4 23:25:22 2013 -0600 Merge tag 'upstream/0.2.1' Upstream version 0.2.1 -- ocaml-mm 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] ocaml-mm packaging branch, master, updated. debian/0.2.1-1-5-g73bd6ce
The following commit has been merged in the master branch: commit ed663daf7fccaac0953a1fbc9e299a421cf5621d Merge: 5767d81446ea3f4cc7c0db30430d8e587d966944 474576deb9cd304a20ce6d439c99b8f8d692ac0b Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:09:22 2013 -0500 Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-mm -- ocaml-mm 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] ocaml-mm packaging branch, master, updated. debian/0.2.1-1-5-g73bd6ce
The following commit has been merged in the master branch: commit 31ce2c636041881bffb8361682d103ad115d57ec Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:10:04 2013 -0500 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 683794e..a61a533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-mm (0.2.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Romain Beauxis to...@rastageeks.org Wed, 08 May 2013 19:09:40 -0500 + ocaml-mm (0.2.1-1) experimental; urgency=low * New upstream release. -- ocaml-mm 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] ocaml-mm packaging branch, master, updated. debian/0.2.1-1-5-g73bd6ce
The following commit has been merged in the master branch: commit 73bd6ce5169edf22c129c150891bf52b5edfb721 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:10:26 2013 -0500 Upload to unstable diff --git a/external/Makefile.defs b/external/Makefile.defs deleted file mode 100644 index 6f0c28e..000 --- a/external/Makefile.defs +++ /dev/null @@ -1,30 +0,0 @@ -OCAMLFLAGS = -OCAMLNCFLAGS = -OCAMLLDFLAGS = -linkall -CFLAGS = -g -O2 -I.. -g -Wall -O3 -INCDIRS = .. /usr/lib/ocaml/alsa /usr/lib/ocaml/ao /usr/lib/ocaml/pulseaudio /usr/lib/ocaml/gstreamer /usr/lib/ocaml/mad /usr/lib/ocaml/ogg /usr/lib/ocaml/sdl /usr/lib/ocaml/theora -NO_CUSTOM = yes -OCAMLDOCFLAGS = -sort -stars -ANNOTATE = yes - -OCAMLMAKEFILE = OCamlMakefile -OCAMLFIND = ocamlfind -OCAMLFIND_LDCONF = -OCAMLC = ocamlc.opt -OCAMLOPT = ocamlopt.opt -OCAMLMKTOP = ocamlmktop -OCAMLMKLIB = ocamlmklib -OCAMLCP = @OCAMLCP@ -OCAMLDEP = ocamldep -OCAMLLEX = ocamllex.opt -OCAMLYACC = ocamlyacc -OCAMLDOC = ocamldoc -CC = gcc -AR = ar -LATEX = @LATEX@ -DVIPS = @DVIPS@ -PS2PDF = @PS2PDF@ -OCAMLLIBPATH = /usr/lib/ocaml -OCAMLBEST = byte opt - -INCDIRS+= .. /usr/lib/ocaml/alsa /usr/lib/ocaml/ao /usr/lib/ocaml/pulseaudio /usr/lib/ocaml/gstreamer /usr/lib/ocaml/mad /usr/lib/ocaml/ogg /usr/lib/ocaml/sdl /usr/lib/ocaml/theora -- ocaml-mm 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] ocaml-mm packaging branch, upstream, updated. upstream/0.2.1-2-g880a869
The following commit has been merged in the upstream branch: commit 880a869bc7d34bfef8d581e52ec4d0df71b1924d Merge: e86b532da3cc662ce90acd61c5b6e7d10b82e09d 5d4d248073638585781a3e7e59bf8ce337b61dfd Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:13:57 2013 -0500 Merge branch 'upstream' of git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-mm into upstream -- ocaml-mm 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] ocaml-mm packaging annotated tag, debian/0.2.1-2, created. debian/0.2.1-2
The annotated tag, debian/0.2.1-2 has been created at 054b427ee132a2bebea08fd38c27ea80f9fb6181 (tag) tagging 73bd6ce5169edf22c129c150891bf52b5edfb721 (commit) replaces debian/0.2.1-1 tagged by Romain Beauxis on Wed May 8 19:12:55 2013 -0500 - Shortlog Debian release 0.2.1-2 Romain Beauxis (5): Imported Upstream version 0.2.1 Merge tag 'upstream/0.2.1' Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-mm Upload to unstable Upload to unstable --- -- ocaml-mm 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] ocaml-ogg packaging branch, pristine-tar, updated. 57f954aa1679dfc4525a047d0f0b3fa15abbe491
The following commit has been merged in the pristine-tar branch: commit 57f954aa1679dfc4525a047d0f0b3fa15abbe491 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:11:56 2013 -0500 pristine-tar data for ocaml-ogg_0.4.5.orig.tar.gz diff --git a/ocaml-ogg_0.4.5.orig.tar.gz.delta b/ocaml-ogg_0.4.5.orig.tar.gz.delta new file mode 100644 index 000..c590331 Binary files /dev/null and b/ocaml-ogg_0.4.5.orig.tar.gz.delta differ diff --git a/ocaml-ogg_0.4.5.orig.tar.gz.id b/ocaml-ogg_0.4.5.orig.tar.gz.id new file mode 100644 index 000..40599b7 --- /dev/null +++ b/ocaml-ogg_0.4.5.orig.tar.gz.id @@ -0,0 +1 @@ +7de260c06d14b15da95fa3c0e97a6f2df5cd917f -- ocaml-ogg 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] ocaml-ogg packaging branch, master, updated. debian/0.4.4-1-3-ga4328ca
The following commit has been merged in the master branch: commit a4328cad30cfc597138e36fffc31e164b63769e7 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:12:45 2013 -0500 New upstream release diff --git a/debian/changelog b/debian/changelog index 1f5b05c..7edb4bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ocaml-ogg (0.4.5-1) unstable; urgency=low + + * New upstream release. + * Upload to unstable. + + -- Romain Beauxis to...@rastageeks.org Wed, 08 May 2013 19:12:06 -0500 + ocaml-ogg (0.4.4-1) experimental; urgency=low * New upstream release. -- ocaml-ogg 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] ocaml-ogg packaging branch, master, updated. debian/0.4.4-1-3-ga4328ca
The following commit has been merged in the master branch: commit 0a47248d61060fc674ab65103325ae001fe31631 Merge: 8ddfe52c22fcaa304588632aeff3a39e5b96f8c7 97e1795b967480be2a6b3559e0ba34e5b5589fa5 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:11:57 2013 -0500 Merge tag 'upstream/0.4.5' Upstream version 0.4.5 -- ocaml-ogg 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] ocaml-ogg packaging annotated tag, debian/0.4.5-1, created. debian/0.4.5-1
The annotated tag, debian/0.4.5-1 has been created at c5caa8b67bb61c5182353bc0a627f8947c0c7c77 (tag) tagging a4328cad30cfc597138e36fffc31e164b63769e7 (commit) replaces debian/0.4.4-1 tagged by Romain Beauxis on Wed May 8 19:14:18 2013 -0500 - Shortlog Debian release 0.4.5-1 Romain Beauxis (3): Imported Upstream version 0.4.5 Merge tag 'upstream/0.4.5' New upstream release --- -- ocaml-ogg 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] ocaml-ogg packaging annotated tag, upstream/0.4.5, created. upstream/0.4.5
The annotated tag, upstream/0.4.5 has been created at 3af1d20276cb5b14e091c9de13f7b591b736739d (tag) tagging 97e1795b967480be2a6b3559e0ba34e5b5589fa5 (commit) replaces upstream/0.4.4 tagged by Romain Beauxis on Wed May 8 19:11:56 2013 -0500 - Shortlog Upstream version 0.4.5 Romain Beauxis (1): Imported Upstream version 0.4.5 --- -- ocaml-ogg 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] ocaml-samplerate packaging branch, master, updated. debian/0.1.2-1-1-gf34732a
The following commit has been merged in the master branch: commit f34732a8296efaf5c5928023dfbd5af92b54e1a8 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:17:24 2013 -0500 New upstream release diff --git a/debian/changelog b/debian/changelog index c344ea3..932f815 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-samplerate (0.1.2-2) unstable; urgency=low + + * Upload to unstable + + -- Romain Beauxis to...@rastageeks.org Wed, 08 May 2013 19:17:24 -0500 + ocaml-samplerate (0.1.2-1) experimental; urgency=low * New upstream release. -- ocaml-samplerate 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] ocaml-samplerate packaging annotated tag, debian/0.1.2-2, created. debian/0.1.2-2
The annotated tag, debian/0.1.2-2 has been created at 6a67ced23f05eca39fadc6e55a41278cc2ad25a1 (tag) tagging f34732a8296efaf5c5928023dfbd5af92b54e1a8 (commit) replaces debian/0.1.2-1 tagged by Romain Beauxis on Wed May 8 19:18:58 2013 -0500 - Shortlog Debian release 0.1.2-2 Romain Beauxis (1): New upstream release --- -- ocaml-samplerate 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] ocaml-speex packaging branch, master, updated. debian/0.1.2-3-7-g4372d15
The following commit has been merged in the master branch: commit d171f8b419b2d3d6d6054d306d6a004b2f792cd7 Author: Romain Beauxis to...@rastageeks.org Date: Sat Apr 20 11:21:34 2013 -0500 Updated packaging. diff --git a/debian/changelog b/debian/changelog index fe82087..f025578 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ocaml-speex (0.1.2-4) experimental; urgency=low + + * Upload to experimental to rebuild against +ocaml-ogg 0.4.4. + * Bumped standards version to 3.9.4 + + -- Romain Beauxis to...@rastageeks.org Sat, 20 Apr 2013 11:21:08 -0500 + ocaml-speex (0.1.2-3) unstable; urgency=low * Upload to unstable. diff --git a/debian/control b/debian/control index 171327d..904184d 100644 --- a/debian/control +++ b/debian/control @@ -4,9 +4,9 @@ Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Samuel Mimram smim...@debian.org, Romain Beauxis to...@rastageeks.org Build-Depends: cdbs (= 0.4.53), debhelper (= 7.0.1), ocaml-nox, dh-ocaml (= 0.9), - libspeex-dev, libogg-ocaml-dev (= 0.4.1), + libspeex-dev, libogg-ocaml-dev (= 0.4.4), ocaml-findlib (= 1.2.4), pkg-config -Standards-Version: 3.9.1 +Standards-Version: 3.9.4 Homepage: http://savonet.sourceforge.net/ Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-speex.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-speex.git -- ocaml-speex 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] ocaml-speex packaging branch, master, updated. debian/0.1.2-3-7-g4372d15
The following commit has been merged in the master branch: commit 6f23e21040db88fd8cedab120e9cd9a4b0c3933a Author: Romain Beauxis to...@rastageeks.org Date: Sat Apr 20 11:43:14 2013 -0500 Revert Updated packaging. This reverts commit d171f8b419b2d3d6d6054d306d6a004b2f792cd7. diff --git a/debian/changelog b/debian/changelog index f025578..fe82087 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,3 @@ -ocaml-speex (0.1.2-4) experimental; urgency=low - - * Upload to experimental to rebuild against -ocaml-ogg 0.4.4. - * Bumped standards version to 3.9.4 - - -- Romain Beauxis to...@rastageeks.org Sat, 20 Apr 2013 11:21:08 -0500 - ocaml-speex (0.1.2-3) unstable; urgency=low * Upload to unstable. diff --git a/debian/control b/debian/control index 904184d..171327d 100644 --- a/debian/control +++ b/debian/control @@ -4,9 +4,9 @@ Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Samuel Mimram smim...@debian.org, Romain Beauxis to...@rastageeks.org Build-Depends: cdbs (= 0.4.53), debhelper (= 7.0.1), ocaml-nox, dh-ocaml (= 0.9), - libspeex-dev, libogg-ocaml-dev (= 0.4.4), + libspeex-dev, libogg-ocaml-dev (= 0.4.1), ocaml-findlib (= 1.2.4), pkg-config -Standards-Version: 3.9.4 +Standards-Version: 3.9.1 Homepage: http://savonet.sourceforge.net/ Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-speex.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-speex.git -- ocaml-speex 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] ocaml-speex packaging branch, master, updated. debian/0.1.2-3-7-g4372d15
The following commit has been merged in the master branch:
commit 50ad41d608af03f1fc828c9fed139d29956f57ca
Merge: 6f23e21040db88fd8cedab120e9cd9a4b0c3933a
5a0612fe1b45f87d73fbbe01b2d35900ae84b841
Author: Romain Beauxis to...@rastageeks.org
Date: Tue Jul 5 12:26:02 2011 -0500
Imported Debian patch 0.2.0-1
diff --combined debian/changelog
index fe82087,000..1d83967
mode 100644,00..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,44 -1,0 +1,52 @@@
++ocaml-speex (0.2.0-1) unstable; urgency=low
++
++ * New upstream release.
++ * Switch to 3.0 (quilt) package format.
++ * Bumped standards version to 3.9.2
++
++ -- Romain Beauxis to...@rastageeks.org Tue, 05 Jul 2011 12:26:02 -0500
++
+ocaml-speex (0.1.2-3) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Romain Beauxis to...@rastageeks.org Thu, 03 Mar 2011 13:49:17 -0600
+
+ocaml-speex (0.1.2-2) experimental; urgency=low
+
+ * Rebuild against ocaml-ogg 0.4.1 from experimental.
+ * Bumped standards version.
+
+ -- Romain Beauxis to...@rastageeks.org Tue, 07 Sep 2010 18:56:10 -0500
+
+ocaml-speex (0.1.2-1) unstable; urgency=low
+
+ [ Stephane Glondu ]
+ * Use ocaml.mk as a CDBS rules file (Closes: #549840)
+
+ [ Romain Beauxis ]
+ * New upstream release.
+ * Bumped standards version to 3.8.3
+ * Enabled debugging.
+ * Use new dependency system.
+ * Added doc-base registration.
+
+ -- Romain Beauxis to...@rastageeks.org Wed, 14 Oct 2009 17:29:16 -0500
+
+ocaml-speex (0.1.1-2) unstable; urgency=low
+
+ * Added missing .a files to libspeex-ocaml-dev.
+
+ -- Romain Beauxis to...@rastageeks.org Mon, 18 May 2009 23:28:19 +1100
+
+ocaml-speex (0.1.1-1) unstable; urgency=low
+
+ * New upstream release, fixes license inconsistency.
+
+ -- Romain Beauxis to...@rastageeks.org Mon, 30 Mar 2009 18:48:09 +0200
+
+ocaml-speex (0.1.0-1) unstable; urgency=low
+
+ * Initial upload to unstable (Closes: #515810)
+
+ -- Romain Beauxis to...@rastageeks.org Mon, 30 Mar 2009 17:01:09 +0200
diff --combined debian/control
index 171327d,000..95171e0
mode 100644,00..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,40 -1,0 +1,47 @@@
+Source: ocaml-speex
+Section: ocaml
+Priority: optional
+Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
+Uploaders: Samuel Mimram smim...@debian.org, Romain Beauxis
to...@rastageeks.org
- Build-Depends: cdbs (= 0.4.53), debhelper (= 7.0.1), ocaml-nox, dh-ocaml
(= 0.9),
-libspeex-dev, libogg-ocaml-dev (= 0.4.1),
-ocaml-findlib (= 1.2.4), pkg-config
- Standards-Version: 3.9.1
++Build-Depends:
++ cdbs (= 0.4.85~),
++ debhelper (= 7.0.1),
++ dh-buildinfo,
++ ocaml-nox,
++ dh-ocaml (= 0.9),
++ libspeex-dev,
++ libogg-ocaml-dev (= 0.4.2),
++ ocaml-findlib (= 1.2.4),
++ pkg-config
++Standards-Version: 3.9.2
+Homepage: http://savonet.sourceforge.net/
+Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-speex.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-speex.git
+
+Package: libspeex-ocaml
+Architecture: any
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: OCaml interface to the speex library
+ This package provides an interface to the speex library for
+ OCaml programmers.
+ .
+ Speex is an audio codec especially designed for compressing voice at low
+ bit-rates for applications such as voice over IP (VoIP).
+ .
+ This package contains only the shared runtime stub libraries.
+
+Package: libspeex-ocaml-dev
+Architecture: any
+Depends: ${ocaml:Depends}, libspeex-dev, libogg-ocaml-dev (= 0.3.0-1),
+ libspeex-ocaml (= ${binary:Version}), ocaml-findlib, ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: OCaml interface to the speex library
+ This package provides an interface to the speex library for
+ OCaml programmers.
+ .
+ Speex is an audio codec especially designed for compressing voice at low
+ bit-rates for applications such as voice over IP (VoIP).
+ .
+ This package contains all the development stuff you need to develop
+ OCaml programs which use ocaml-speex.
diff --combined debian/control.in
index 3a66c52,000..545a3f8
mode 100644,00..100644
--- a/debian/control.in
+++ b/debian/control.in
@@@ -1,40 -1,0 +1,43 @@@
+Source: ocaml-speex
+Section: ocaml
+Priority: optional
+Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
+Uploaders: Samuel Mimram smim...@debian.org, Romain Beauxis
to...@rastageeks.org
- Build-Depends: @cdbs@,
-libspeex-dev, libogg-ocaml-dev (= 0.4.1),
-ocaml-findlib (= 1.2.4), pkg-config
- Standards-Version: 3.9.1
++Build-Depends:
++ @cdbs@,
++ libspeex-dev,
++ libogg-ocaml-dev (= 0.4.2),
++ ocaml-findlib (= 1.2.4),
++ pkg-config
++Standards-Version: 3.9.2
+Homepage: http://savonet.sourceforge.net/
+Vcs-Git: git://git.debian.org/pkg-ocaml-maint
[Pkg-ocaml-maint-commits] [SCM] ocaml-speex packaging branch, master, updated. debian/0.1.2-3-7-g4372d15
The following commit has been merged in the master branch:
commit 4372d151051332673db36ec210a92ff73711a4d3
Author: Romain Beauxis to...@rastageeks.org
Date: Wed May 8 19:23:39 2013 -0500
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index eb244c4..53e27fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-speex (0.2.0-3) unstable; urgency=low
+
+ * Upload to unstable
+ * Force build-dep on ocaml-ogg = 0.4.5
+
+ -- Romain Beauxis to...@rastageeks.org Wed, 08 May 2013 19:22:47 -0500
+
ocaml-speex (0.2.0-2) experimental; urgency=low
* Upload to experimental to rebuild against
diff --git a/debian/control b/debian/control
index d3f9d83..dc78fbd 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
ocaml-nox,
dh-ocaml (= 0.9),
libspeex-dev,
- libogg-ocaml-dev (= 0.4.4),
+ libogg-ocaml-dev (= 0.4.5),
ocaml-findlib (= 1.2.4),
pkg-config
Standards-Version: 3.9.2
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 545a3f8..000
--- a/debian/control.in
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: ocaml-speex
-Section: ocaml
-Priority: optional
-Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
-Uploaders: Samuel Mimram smim...@debian.org, Romain Beauxis
to...@rastageeks.org
-Build-Depends:
- @cdbs@,
- libspeex-dev,
- libogg-ocaml-dev (= 0.4.2),
- ocaml-findlib (= 1.2.4),
- pkg-config
-Standards-Version: 3.9.2
-Homepage: http://savonet.sourceforge.net/
-Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-speex.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-speex.git
-
-Package: libspeex-ocaml
-Architecture: any
-Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${ocaml:Provides}
-Description: OCaml interface to the speex library
- This package provides an interface to the speex library for
- OCaml programmers.
- .
- Speex is an audio codec especially designed for compressing voice at low
- bit-rates for applications such as voice over IP (VoIP).
- .
- This package contains only the shared runtime stub libraries.
-
-Package: libspeex-ocaml-dev
-Architecture: any
-Depends: ${ocaml:Depends}, libspeex-dev, libogg-ocaml-dev (= 0.3.0-1),
- libspeex-ocaml (= ${binary:Version}), ocaml-findlib, ${misc:Depends}
-Provides: ${ocaml:Provides}
-Description: OCaml interface to the speex library
- This package provides an interface to the speex library for
- OCaml programmers.
- .
- Speex is an audio codec especially designed for compressing voice at low
- bit-rates for applications such as voice over IP (VoIP).
- .
- This package contains all the development stuff you need to develop
- OCaml programs which use ocaml-speex.
diff --git a/debian/rules b/debian/rules
index e335709..d072a82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/ocaml.mk
-# In order to regenerate 'debian/control' :
-# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
-# Then check manually if everything's ok
-
DEB_CONFIGURE_EXTRA_FLAGS := --enable-debugging
DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR)
OCAMLFIND_LDCONF=ignore
--
ocaml-speex 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] ocaml-speex packaging branch, master, updated. debian/0.1.2-3-7-g4372d15
The following commit has been merged in the master branch: commit 168ed32d1725aa1dd6ebfd10b430589a5323df12 Author: Romain Beauxis to...@rastageeks.org Date: Sat Apr 20 11:45:13 2013 -0500 Updated packaging. diff --git a/debian/changelog b/debian/changelog index 1d83967..eb244c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ocaml-speex (0.2.0-2) experimental; urgency=low + + * Upload to experimental to rebuild against +ocaml-ogg 0.4.4. + * Bumped standards version to 3.9.4 + + -- Romain Beauxis to...@rastageeks.org Sat, 20 Apr 2013 11:44:16 -0500 + ocaml-speex (0.2.0-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 95171e0..d3f9d83 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: ocaml-nox, dh-ocaml (= 0.9), libspeex-dev, - libogg-ocaml-dev (= 0.4.2), + libogg-ocaml-dev (= 0.4.4), ocaml-findlib (= 1.2.4), pkg-config Standards-Version: 3.9.2 -- ocaml-speex 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] ocaml-speex packaging annotated tag, debian/0.1.2-4, created. debian/0.1.2-4
The annotated tag, debian/0.1.2-4 has been created at a1a784fe96f4f4fe3941a79fd7475219334a5cc4 (tag) tagging d171f8b419b2d3d6d6054d306d6a004b2f792cd7 (commit) replaces debian/0.1.2-3 tagged by Romain Beauxis on Sat Apr 20 11:22:59 2013 -0500 - Shortlog Debian release 0.1.2-4 Romain Beauxis (1): Updated packaging. --- -- ocaml-speex 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] ocaml-speex packaging annotated tag, debian/0.2.0-1, created. debian/0.2.0-1
The annotated tag, debian/0.2.0-1 has been created at f3ed721a333423d179b28603c2a54c1ca52e1762 (tag) tagging 50ad41d608af03f1fc828c9fed139d29956f57ca (commit) replaces debian/0.1.2-4 tagged by Romain Beauxis on Sat Apr 20 11:44:11 2013 -0500 - Shortlog Debian release 0.2.0-1 Romain Beauxis (3): Revert Updated packaging. Imported Upstream version 0.2.0 Imported Debian patch 0.2.0-1 --- -- ocaml-speex 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] ocaml-speex packaging annotated tag, debian/0.2.0-3, created. debian/0.2.0-3
The annotated tag, debian/0.2.0-3 has been created at 988039d52bd639af53e978a28bc2435324fdd6c6 (tag) tagging 4372d151051332673db36ec210a92ff73711a4d3 (commit) replaces debian/0.2.0-2 tagged by Romain Beauxis on Wed May 8 19:26:24 2013 -0500 - Shortlog Debian release 0.2.0-3 Romain Beauxis (1): Upload to unstable. --- -- ocaml-speex 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] ocaml-speex packaging annotated tag, debian/0.2.0-2, created. debian/0.2.0-2
The annotated tag, debian/0.2.0-2 has been created at 378bfb975cb3132192bdb46bb2bed59cec4fa6fb (tag) tagging 168ed32d1725aa1dd6ebfd10b430589a5323df12 (commit) replaces debian/0.2.0-1 tagged by Romain Beauxis on Sat Apr 20 11:52:15 2013 -0500 - Shortlog Debian release 0.2.0-2 Romain Beauxis (1): Updated packaging. --- -- ocaml-speex 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] ocaml-speex packaging annotated tag, upstream/0.2.0, created. upstream/0.2.0
The annotated tag, upstream/0.2.0 has been created at eb73f6f117773ed3d11b21e145933d55dbe5043e (tag) tagging 5a0612fe1b45f87d73fbbe01b2d35900ae84b841 (commit) replaces upstream/0.1.2 tagged by Romain Beauxis on Sat Apr 20 11:44:11 2013 -0500 - Shortlog Upstream version 0.2.0 Romain Beauxis (1): Imported Upstream version 0.2.0 --- -- ocaml-speex 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] ocaml-taglib packaging branch, master, updated. debian/0.3.0-1-3-g5ce9953
The following commit has been merged in the master branch: commit 39310b72064ea08ef460a210f033635f158df6c3 Merge: 9bb4eaff020fde108af01c8b949a1297b0c93a08 9a1cefde8f1c0070e6291aa5491029a1644ccef7 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:25:08 2013 -0500 Merge tag 'upstream/0.3.1' Upstream version 0.3.1 -- ocaml-taglib 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] ocaml-taglib packaging branch, master, updated. debian/0.3.0-1-3-g5ce9953
The following commit has been merged in the master branch: commit 5ce9953a28e4d14a3c26219d6887d6e9731f15f8 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:25:29 2013 -0500 New upstream release. diff --git a/debian/changelog b/debian/changelog index eb6cb3e..bc3beed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ocaml-taglib (0.3.1-1) unstable; urgency=low + + * New upstream release. + * Upload to unstable. + + -- Romain Beauxis to...@rastageeks.org Wed, 08 May 2013 19:25:14 -0500 + ocaml-taglib (0.3.0-1) experimental; urgency=low * New upstream release. -- ocaml-taglib 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] ocaml-taglib packaging branch, pristine-tar, updated. 61d046c08d0eac46a007900186d5c15e588b463b
The following commit has been merged in the pristine-tar branch: commit 61d046c08d0eac46a007900186d5c15e588b463b Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:25:08 2013 -0500 pristine-tar data for ocaml-taglib_0.3.1.orig.tar.gz diff --git a/ocaml-taglib_0.3.1.orig.tar.gz.delta b/ocaml-taglib_0.3.1.orig.tar.gz.delta new file mode 100644 index 000..f338c38 Binary files /dev/null and b/ocaml-taglib_0.3.1.orig.tar.gz.delta differ diff --git a/ocaml-taglib_0.3.1.orig.tar.gz.id b/ocaml-taglib_0.3.1.orig.tar.gz.id new file mode 100644 index 000..9b19657 --- /dev/null +++ b/ocaml-taglib_0.3.1.orig.tar.gz.id @@ -0,0 +1 @@ +c6875154f63ae2812a5670b04406c5153e91b03b -- ocaml-taglib 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] ocaml-taglib packaging annotated tag, debian/0.3.1-1, created. debian/0.3.1-1
The annotated tag, debian/0.3.1-1 has been created at fd7564b9ec53a79f7d9f9509a1454ee42a093953 (tag) tagging 5ce9953a28e4d14a3c26219d6887d6e9731f15f8 (commit) replaces debian/0.3.0-1 tagged by Romain Beauxis on Wed May 8 19:30:23 2013 -0500 - Shortlog Debian release 0.3.1-1 Romain Beauxis (3): Imported Upstream version 0.3.1 Merge tag 'upstream/0.3.1' New upstream release. --- -- ocaml-taglib 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] ocaml-taglib packaging annotated tag, upstream/0.3.1, created. upstream/0.3.1
The annotated tag, upstream/0.3.1 has been created at a21512b701e5e54d9d3bdf8a2455f3a3b0861dcc (tag) tagging 9a1cefde8f1c0070e6291aa5491029a1644ccef7 (commit) replaces upstream/0.3.0 tagged by Romain Beauxis on Wed May 8 19:25:08 2013 -0500 - Shortlog Upstream version 0.3.1 Romain Beauxis (1): Imported Upstream version 0.3.1 --- -- ocaml-taglib 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] ocaml-theora packaging branch, master, updated. debian/0.3.0-2-4-g8206c4a
The following commit has been merged in the master branch:
commit 8206c4a1cf0b696204b589a7dac434062ac88f57
Author: Romain Beauxis to...@rastageeks.org
Date: Wed May 8 19:29:54 2013 -0500
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index d6b9872..386bfe3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-theora (0.3.0-3) unstable; urgency=low
+
+ * Upload to unstable.
+ * Force build-dep on ocaml-ogg = 0.4.5
+
+ -- Romain Beauxis to...@rastageeks.org Wed, 08 May 2013 19:29:07 -0500
+
ocaml-theora (0.3.0-2) experimental; urgency=low
* Upload to experimental to rebuild against
diff --git a/debian/control b/debian/control
index 659f8d5..06e72e4 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
ocaml-nox,
dh-ocaml (= 0.9),
libtheora-dev (= 1.1),
- libogg-ocaml-dev (= 0.4.4),
+ libogg-ocaml-dev (= 0.4.5),
ocaml-findlib (= 1.2.4),
pkg-config
Standards-Version: 3.9.4
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index c2720a3..000
--- a/debian/control.in
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: ocaml-theora
-Section: ocaml
-Priority: optional
-Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
-Uploaders: Samuel Mimram smim...@debian.org, Romain Beauxis
to...@rastageeks.org
-Build-Depends:
- @cdbs@,
- libtheora-dev (= 1.1),
- libogg-ocaml-dev (= 0.4.2),
- ocaml-findlib (= 1.2.4),
- pkg-config
-Standards-Version: 3.9.2
-Homepage: http://savonet.sourceforge.net/
-Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-theora.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-theora.git
-
-Package: libtheora-ocaml
-Architecture: any
-Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${ocaml:Provides}
-Description: OCaml interface to the theora library
- This package provides an interface to the theora library for
- OCaml programmers.
- .
- Theora is a fully open, non-proprietary, patent-and-royalty-free,
- general-purpose compressed video format.
- .
- This package contains only the shared runtime stub libraries.
-
-Package: libtheora-ocaml-dev
-Architecture: any
-Depends: ${ocaml:Depends}, libtheora-dev, libogg-ocaml-dev (= 0.3.0-1),
- libtheora-ocaml (= ${binary:Version}), ocaml-findlib, ${misc:Depends}
-Provides: ${ocaml:Provides}
-Description: OCaml interface to the theora library
- This package provides an interface to the theora library for
- OCaml programmers.
- .
- Theora is a fully open, non-proprietary, patent-and-royalty-free,
- general-purpose compressed video format.
- .
- This package contains all the development stuff you need to develop
- OCaml programs which use ocaml-theora.
diff --git a/debian/rules b/debian/rules
index 092ca6a..6fe617a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/ocaml.mk
-# In order to regenerate 'debian/control' :
-# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
-# Then check manually if everything's ok
-
DEB_CONFIGURE_EXTRA_FLAGS := --enable-debugging
DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR)
OCAMLFIND_LDCONF=ignore
--
ocaml-theora 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] ocaml-theora packaging branch, master, updated. debian/0.3.0-2-4-g8206c4a
The following commit has been merged in the master branch: commit f618661405020a86e5bd78e238ca9f4615ff5624 Merge: e031232d0002458e1c8dd8cc8b7b3790eb907add daaab259af260aa202208f4c3e453ce8545999bb Author: Romain Beauxis to...@rastageeks.org Date: Sat Apr 20 11:54:59 2013 -0500 Merge tag 'upstream/0.3.0' Upstream version 0.3.0 -- ocaml-theora 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] ocaml-theora packaging annotated tag, upstream/0.3.0, updated. upstream/0.3.0
The annotated tag, upstream/0.3.0 has been updated to 5574014f6798a46183b1453b84aee84a38cac81d (tag) from d1a0de22d2e2da26ad8ae0a253d94af79aaaf564 (which is now obsolete) tagging daaab259af260aa202208f4c3e453ce8545999bb (commit) replaces upstream/0.3.0_20110523+hgb02e02b1cf7c tagged by Romain Beauxis on Sat Apr 20 11:54:59 2013 -0500 - Shortlog Upstream version 0.3.0 Romain Beauxis (2): Imported Upstream version 0.3.0 Imported Upstream version 0.3.0 --- -- ocaml-theora 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] ocaml-theora packaging annotated tag, debian/0.3.0-3, created. debian/0.3.0-3
The annotated tag, debian/0.3.0-3 has been created at 26fad7b71fbacc9ec7fb7372988e265304d33baa (tag) tagging 8206c4a1cf0b696204b589a7dac434062ac88f57 (commit) replaces debian/0.3.0-2 tagged by Romain Beauxis on Wed May 8 19:32:31 2013 -0500 - Shortlog Debian release 0.3.0-3 Romain Beauxis (3): Imported Upstream version 0.3.0 Merge tag 'upstream/0.3.0' Upload to unstable. --- -- ocaml-theora 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] ocaml-vorbis packaging branch, master, updated. debian/0.6.1-2-1-g5915db3
The following commit has been merged in the master branch:
commit 5915db39a7c1af1c4d422edb3f1122a4c96d2b08
Author: Romain Beauxis to...@rastageeks.org
Date: Wed May 8 19:31:53 2013 -0500
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 8ad2028..f9a64f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-vorbis (0.6.1-3) unstable; urgency=low
+
+ * Upload to unstable.
+ * Force build-dep on ocaml-ogg = 0.4.5
+
+ -- Romain Beauxis to...@rastageeks.org Wed, 08 May 2013 19:31:06 -0500
+
ocaml-vorbis (0.6.1-2) experimental; urgency=low
* Upload to experimental to rebuild against
diff --git a/debian/control b/debian/control
index d15cc7b..52550a0 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
pkg-config,
libvorbis-dev,
ocaml-findlib (= 1.2.4),
- libogg-ocaml-dev (= 0.4.4)
+ libogg-ocaml-dev (= 0.4.5)
Standards-Version: 3.9.4
Homepage: http://savonet.sourceforge.net/
Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-vorbis.git
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index afcd484..000
--- a/debian/control.in
+++ /dev/null
@@ -1,47 +0,0 @@
-Source: ocaml-vorbis
-Section: ocaml
-Priority: optional
-Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
-Uploaders: Samuel Mimram smim...@debian.org, Romain Beauxis
to...@rastageeks.org
-Build-Depends:
- @cdbs@,
- pkg-config,
- libvorbis-dev,
- ocaml-findlib (= 1.2.4),
- libogg-ocaml-dev (= 0.4.3)
-Standards-Version: 3.9.2
-Homepage: http://savonet.sourceforge.net/
-Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-vorbis.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-vorbis.git
-
-Package: libvorbis-ocaml
-Architecture: any
-Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${ocaml:Provides}
-Description: OCaml bindings for vorbis library
- This OCaml library interfaces the vorbis C library. It can be used to
- decode from or encode to the Ogg Vorbis compressed audio format as well
- as to get informations about an Ogg Vorbis file.
- .
- Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
- general-purpose compressed audio format for audio and music at fixed
- and variable bitrates from 16 to 128 kbps/channel.
- .
- This package contains only the shared runtime stub libraries.
-
-Package: libvorbis-ocaml-dev
-Architecture: any
-Depends: ${ocaml:Depends}, ${misc:Depends},
- libvorbis-dev, libvorbis-ocaml (= ${binary:Version}), libogg-ocaml-dev
-Provides: ${ocaml:Provides}
-Description: OCaml bindings for the vorbis library
- This OCaml library interfaces the vorbis C library. It can be used to
- decode from or encode to the Ogg Vorbis compressed audio format as well
- as to get informations about an Ogg Vorbis file.
- .
- Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
- general-purpose compressed audio format for audio and music at fixed
- and variable bitrates from 16 to 128 kbps/channel.
- .
- This package contains all the development stuff you need to use ocaml-vorbis
- in your programs.
diff --git a/debian/rules b/debian/rules
index ee85532..c2128e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/ocaml.mk
-# In order to regenerate 'debian/control' :
-# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
-# Then check manually if everything's ok
-
DEB_CONFIGURE_EXTRA_FLAGS := --enable-debugging
DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR)
OCAMLFIND_LDCONF=ignore
--
ocaml-vorbis 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] ocaml-vorbis packaging annotated tag, debian/0.6.1-3, created. debian/0.6.1-3
The annotated tag, debian/0.6.1-3 has been created at 016790ad54942053ec74e58ddcd6db42774bb56d (tag) tagging 5915db39a7c1af1c4d422edb3f1122a4c96d2b08 (commit) replaces debian/0.6.1-2 tagged by Romain Beauxis on Wed May 8 19:34:53 2013 -0500 - Shortlog Debian release 0.6.1-3 Romain Beauxis (1): Upload to unstable. --- -- ocaml-vorbis 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] ocaml-dtools packaging branch, master, updated. debian/0.3.0-1-3-gf13e5ee
The following commit has been merged in the master branch:
commit f13e5ee267311edb3666c2175a7d774b37f6a44a
Author: Romain Beauxis to...@rastageeks.org
Date: Wed May 8 19:55:10 2013 -0500
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 204aeab..0b8a820 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-dtools (0.3.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Romain Beauxis to...@rastageeks.org Wed, 08 May 2013 19:54:35 -0500
+
ocaml-dtools (0.3.0-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 5ca1dc2..7dde75e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
Uploaders: Romain Beauxis to...@rastageeks.org, Samuel Mimram
smim...@debian.org
Build-Depends: cdbs (= 0.4.53), debhelper (= 7.0.1), ocaml-nox, dh-ocaml (=
0.9), ocaml-findlib (= 1.2.4), libsyslog-ocaml-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://liquidsoap.fm/
Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-dtools.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-dtools.git
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 06e8f6a..000
--- a/debian/control.in
+++ /dev/null
@@ -1,23 +0,0 @@
-Source: ocaml-dtools
-Section: ocaml
-Priority: optional
-Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
-Uploaders: Romain Beauxis to...@rastageeks.org, Samuel Mimram
smim...@debian.org
-Build-Depends: @cdbs@, ocaml-findlib (= 1.2.4), libsyslog-ocaml-dev
-Standards-Version: 3.9.3
-Homepage: http://liquidsoap.fm/
-Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-dtools.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-dtools.git
-
-Package: libdtools-ocaml-dev
-Architecture: any
-Depends: ${ocaml:Depends}, ocaml-findlib, ${misc:Depends}
-Provides: ${ocaml:Provides}
-Description: library for writing daemons in OCaml
- dtools is a set of useful functions for writing daemon services in OCaml.
- .
- It includes support for:
- * configuration options
- * logging
- * detaching and writing PID file
- * start-up and shutdown task manager
diff --git a/debian/rules b/debian/rules
index 1f874b3..aea9cf5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/ocaml.mk
-# In order to regenerate 'debian/control' :
-# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
-# Then check manually if everything's ok
-
DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR)
OCAMLFIND_LDCONF=ignore
--
ocaml-dtools 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] ocaml-dtools packaging branch, master, updated. debian/0.3.0-1-3-gf13e5ee
The following commit has been merged in the master branch: commit 71d4500ae1bbdeeb261c62d6a62a5eb0e13e9e24 Merge: d34ae1f30c46e02ad33f05cffd8a19189982a86d 95a99b7b4e981b5cde4245d1f0702e57f3da22de Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:54:31 2013 -0500 Merge tag 'upstream/0.3.1' Upstream version 0.3.1 -- ocaml-dtools 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] ocaml-dtools packaging branch, pristine-tar, updated. 9844a308aa716418a66d4558a8280b4df612138c
The following commit has been merged in the pristine-tar branch: commit 9844a308aa716418a66d4558a8280b4df612138c Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:54:31 2013 -0500 pristine-tar data for ocaml-dtools_0.3.1.orig.tar.gz diff --git a/ocaml-dtools_0.3.1.orig.tar.gz.delta b/ocaml-dtools_0.3.1.orig.tar.gz.delta new file mode 100644 index 000..573369c Binary files /dev/null and b/ocaml-dtools_0.3.1.orig.tar.gz.delta differ diff --git a/ocaml-dtools_0.3.1.orig.tar.gz.id b/ocaml-dtools_0.3.1.orig.tar.gz.id new file mode 100644 index 000..0803df7 --- /dev/null +++ b/ocaml-dtools_0.3.1.orig.tar.gz.id @@ -0,0 +1 @@ +d29ba7ed41e320f90469703805faa2cebf807854 -- ocaml-dtools 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] ocaml-dtools packaging annotated tag, upstream/0.3.1, created. upstream/0.3.1
The annotated tag, upstream/0.3.1 has been created at dee9966063fa9b573d4df2c45acc3ee3553e26f8 (tag) tagging 95a99b7b4e981b5cde4245d1f0702e57f3da22de (commit) replaces upstream/0.3.0 tagged by Romain Beauxis on Wed May 8 19:54:31 2013 -0500 - Shortlog Upstream version 0.3.1 Romain Beauxis (1): Imported Upstream version 0.3.1 --- -- ocaml-dtools 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.1.0-1-3-g5e18d62
The following commit has been merged in the master branch: commit 1575af7b3d141329cd9e7ba7c9988b6ec79b4668 Merge: ec24e0ec9290ecef83cb670a3a2125fd7da1333e 65204608a7baadc7edafb3624973eb1c3b9dae21 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:48:00 2013 -0500 Merge tag 'upstream/1.1.1' Upstream version 1.1.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.1.0-1-3-g5e18d62
The following commit has been merged in the master branch: commit 5e18d62f2e0cbc01f949ca1a0a166259bff57b79 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:56:02 2013 -0500 Prepared new upstream release. diff --git a/debian/changelog b/debian/changelog index 83614b4..3ac2586 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +liquidsoap (1.1.1-1) unstable; urgency=low + + * New upstream release. + * Upload to unstable. + + -- Romain Beauxis to...@rastageeks.org Wed, 08 May 2013 19:48:12 -0500 + liquidsoap (1.1.0-1) experimental; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 4251732..192ef55 100644 --- a/debian/control +++ b/debian/control @@ -10,11 +10,11 @@ Build-Depends: dh-ocaml (= 1.0.1), ocaml-findlib, libcry-ocaml-dev (= 0.2.2), - libogg-ocaml-dev (= 0.4.4), - libvorbis-ocaml-dev (= 0.6.1-2), + libogg-ocaml-dev (= 0.4.5), + libvorbis-ocaml-dev (= 0.6.1-3), libmad-ocaml-dev (= 0.4.3), - libdtools-ocaml-dev (= 0.3.0), - libtaglib-ocaml-dev (= 0.1.4), + libdtools-ocaml-dev (= 0.3.1), + libtaglib-ocaml-dev (= 0.3.1), libcamomile-ocaml-dev, festival, libxml-dom-perl, @@ -22,7 +22,7 @@ Build-Depends: python, python-support (= 0.3), libao-ocaml-dev (= 0.2.0), - libduppy-ocaml-dev (= 0.5.0), + libduppy-ocaml-dev (= 0.5.1), libalsa-ocaml-dev (= 0.2.1) [linux-any], libpcre-ocaml-dev, libladspa-ocaml-dev (= 0.1.4), @@ -30,9 +30,9 @@ Build-Depends: libsoundtouch-ocaml-dev (= 0.1.7), libinotify-ocaml-dev, liblastfm-ocaml-dev (= 0.3.0), - libspeex-ocaml-dev (= 0.2.0-2), + libspeex-ocaml-dev (= 0.2.0-3), libgavl-ocaml-dev (= 0.1.5), - libtheora-ocaml-dev (= 0.3.0), + libtheora-ocaml-dev (= 0.3.0-3), libportaudio-ocaml-dev (= 0.2.0), libpulse-ocaml-dev (= 0.1.2), libsamplerate-ocaml-dev (= 0.1.2), @@ -42,13 +42,13 @@ Build-Depends: libsdl-ocaml-dev, libfaad-ocaml-dev (= 0.3.2), libmm-ocaml-dev (= 0.2.1), - libflac-ocaml-dev (= 0.1.1-2), - libschroedinger-ocaml-dev (= 0.1.0-2), + libflac-ocaml-dev (= 0.1.1-3), + libschroedinger-ocaml-dev (= 0.1.0-3), libopus-ocaml-dev, libfrei0r-ocaml-dev, libshine-ocaml-dev, libvoaacenc-ocaml-dev, - libmp3lame-ocaml-dev (= 0.3.1), + libmp3lame-ocaml-dev (= 0.3.2), libdssi-ocaml-dev (= 0.1.1), liblo-ocaml-dev, libcamlimages-ocaml-dev (= 4.0.1-4), -- 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.1.1-1, created. debian/1.1.1-1
The annotated tag, debian/1.1.1-1 has been created at dc07b09723771f16034d5e755d62438418886a5c (tag) tagging 5e18d62f2e0cbc01f949ca1a0a166259bff57b79 (commit) replaces debian/1.1.0-1 tagged by Romain Beauxis on Wed May 8 20:13:35 2013 -0500 - Shortlog Debian release 1.1.1-1 Romain Beauxis (3): Imported Upstream version 1.1.1 Merge tag 'upstream/1.1.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.1.1, created. upstream/1.1.1
The annotated tag, upstream/1.1.1 has been created at cb011e0015b7e62a3fa62a0eab6da526c2b1b233 (tag) tagging 65204608a7baadc7edafb3624973eb1c3b9dae21 (commit) replaces upstream/1.1.0 tagged by Romain Beauxis on Wed May 8 19:48:00 2013 -0500 - Shortlog Upstream version 1.1.1 Romain Beauxis (1): Imported Upstream version 1.1.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] ocaml-theora packaging branch, master, updated. debian/0.3.0-1-1-ge031232
The following commit has been merged in the master branch: commit e031232d0002458e1c8dd8cc8b7b3790eb907add Author: Romain Beauxis to...@rastageeks.org Date: Sat Apr 20 11:20:37 2013 -0500 Updated packaging. diff --git a/debian/changelog b/debian/changelog index bddbb03..d6b9872 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ocaml-theora (0.3.0-2) experimental; urgency=low + + * Upload to experimental to rebuild against +ocaml-ogg 0.4.4. + * Bumped standards version to 3.9.4 + + -- Romain Beauxis to...@rastageeks.org Sat, 20 Apr 2013 11:19:55 -0500 + ocaml-theora (0.3.0-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index ac35a15..659f8d5 100644 --- a/debian/control +++ b/debian/control @@ -10,10 +10,10 @@ Build-Depends: ocaml-nox, dh-ocaml (= 0.9), libtheora-dev (= 1.1), - libogg-ocaml-dev (= 0.4.2), + libogg-ocaml-dev (= 0.4.4), ocaml-findlib (= 1.2.4), pkg-config -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Homepage: http://savonet.sourceforge.net/ Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-theora.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-theora.git -- ocaml-theora 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
