[Pkg-ocaml-maint-commits] [SCM] ocaml-bjack packaging branch, master, updated. debian/0.1.3-4-10-gabd8b1e

[Romain Beauxis]

The following commit has been merged in the master branch:
commit abd8b1e08a70f640ba5eeb78133d63c42f824681
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Mon Apr 15 21:47:41 2013 -0500

    Updated debian package

diff --git a/debian/changelog b/debian/changelog
index aa52127..76bfc9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ocaml-bjack (0.1.4-1) experimental; urgency=low
+
+  * New upstream release.
+  * Upload to experimental. 
+  * Dropped patch applied upstream.
+  * Bumped standards version to 3.9.4
+
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 15 Apr 2013 21:43:27 -0500
+
 ocaml-bjack (0.1.3-4) experimental; urgency=low
 
   * Added patch to avoid FTBFS on hurd caused by conflicts
diff --git a/debian/control b/debian/control
index 92e16ac..a09a9b1 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  libsamplerate0-dev,
  ocaml-findlib,
  pkg-config,
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://savonet.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-bjack.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-bjack.git
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 0fda0b3..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,53 +0,0 @@
-Source: ocaml-bjack
-Section: ocaml
-Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders:
- Samuel Mimram <smimram at debian.org>,
- Romain Beauxis <toots at rastageeks.org>,
- Mehdi Dogguy <mehdi at debian.org>
-Build-Depends:
- @cdbs@,
- libjack-jackd2-dev | libjack-dev,
- libsamplerate0-dev,
- ocaml-findlib,
- pkg-config,
-Standards-Version: 3.9.2
-Homepage: http://savonet.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-bjack/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-bjack/trunk/
-
-Package: libbjack-ocaml
-Architecture: any
-Depends:
- ${ocaml:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Provides:
- ${ocaml:Provides}
-Description: OCaml blocking interface to jack audio connection kit
- ocaml-bjack is a blocking interface to jack audio connection kit.
- Using it, you can create a jack device and read/write from it
- much like with ALSA or OSS.
- .
- This package contains only the shared runtime stub libraries.
-
-Package: libbjack-ocaml-dev
-Architecture: any
-Depends:
- ${ocaml:Depends},
- ${shlibs:Depends},
- libjack-dev,
- libsamplerate0-dev,
- libbjack-ocaml (= ${binary:Version}),
- ocaml-findlib,
- ${misc:Depends}
-Provides:
- ${ocaml:Provides}
-Description: OCaml blocking interface to jack audio connection kit
- ocaml-bjack is a blocking interface to jack audio connection kit.
- Using it, you can create a jack device and read/write from it
- much like with ALSA or OSS. 
- .
- This package contains all the development stuff you need to develop
- OCaml programs which use ocaml-bjack.
diff --git a/debian/patches/errnum.patch b/debian/patches/errnum.patch
deleted file mode 100644
index f4ea327..0000000
--- a/debian/patches/errnum.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-using errno causes troubles when compiling on hurd.
-See #623337
-
---- a/src/jack_stubs.c
-+++ b/src/jack_stubs.c
-@@ -50,9 +50,9 @@
- #include <caml/memory.h>
- #include <caml/signals.h>
- 
--static value caml_bjack_handle_error(int errno)
-+static value caml_bjack_handle_error(int errnum)
- {
--  switch (errno)
-+  switch (errnum)
-     {
-     case ERR_OPENING_JACK:
-       caml_raise_constant(*caml_named_value("bio2jack_exn_open"));
-@@ -146,12 +146,12 @@
-   int jack_ports_flags = Int_val(_jack_port_flags);
- 
- 
--  int errno = JACK_Open(drv,Int_val(bit_per_sample),&r,String_val(name),String_val(server),
-+  int errnum = JACK_Open(drv,Int_val(bit_per_sample),&r,String_val(name),String_val(server),
-                           Int_val(input_channels),Int_val(output_channels),
-                           jack_ports_flags, Int_val(size));
- 
--  if (errno != ERR_SUCCESS)
--    caml_bjack_handle_error(errno) ;
-+  if (errnum != ERR_SUCCESS)
-+    caml_bjack_handle_error(errnum) ;
- 
-   driver = caml_alloc_custom(&bjack_drv_ops, sizeof(jack_driver_t*), 1, 0);
-   Bjack_drv_val(driver) = drv;
-@@ -168,9 +168,9 @@
- {
-   CAMLparam1(device);
-   jack_driver_t *drv = Bjack_drv_val(device);
--  int errno = JACK_Close(drv);
--  if (errno != ERR_SUCCESS)
--    caml_bjack_handle_error(errno) ;
-+  int errnum = JACK_Close(drv);
-+  if (errnum != ERR_SUCCESS)
-+    caml_bjack_handle_error(errnum) ;
-   CAMLreturn(Val_unit);
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6caadb4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-errnum.patch
diff --git a/debian/rules b/debian/rules
index 8ab6f64..0041b72 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
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp

-- 
ocaml-bjack packaging