[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.2.0-2-8-geb06948

2013-05-09 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit eb069481b90436156ebb5c93c0be6313a77f8ac0
Author: Stephane Glondu 
Date:   Thu May 9 23:41:02 2013 +0200

Update changelog and prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 9bfd926..1649c10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-ocaml-usb (1.3.0-1) UNRELEASED; urgency=low
+ocaml-usb (1.3.0-1) unstable; urgency=low
 
   * New upstream release
+  * Use format version 1.0 in debian/copyright
+  * Bump Standards-Version to 3.9.4
+  * Bump debhelper compat level to 8
 
- -- Stéphane Glondu   Thu, 09 May 2013 23:37:08 +0200
+ -- Stéphane Glondu   Thu, 09 May 2013 23:40:59 +0200
 
 ocaml-usb (1.2.0-2) unstable; urgency=low
 

-- 
ocaml-usb 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-usb packaging branch, master, updated. debian/1.2.0-2-8-geb06948

2013-05-09 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit bb3e82b548a19935ce2056f73ea64af520c7aa7e
Merge: bbdc7657f3a8f28a74efcbfef6ec5acb2937ed04 
43d24b101fe63ea72632c77b9b519ccd86768a26
Author: Stephane Glondu 
Date:   Thu May 9 23:36:50 2013 +0200

Merge tag 'upstream/1.3.0'

Upstream version 1.3.0


-- 
ocaml-usb 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-usb packaging branch, master, updated. debian/1.2.0-2-8-geb06948

2013-05-09 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 34881867955322654ba19dc5ba91c9f9d870d622
Author: Stephane Glondu 
Date:   Thu May 9 23:37:10 2013 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 0717a7c..9bfd926 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-usb (1.3.0-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Stéphane Glondu   Thu, 09 May 2013 23:37:08 +0200
+
 ocaml-usb (1.2.0-2) unstable; urgency=low
 
   * Add patch to include stdint.h before libusb.h (fixes FTBFS on

-- 
ocaml-usb 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-usb packaging branch, master, updated. debian/1.2.0-2-8-geb06948

2013-05-09 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit c97ad76faa599ae5d27750839d05f5949d861ba3
Author: Stephane Glondu 
Date:   Thu May 9 23:40:06 2013 +0200

Bump debhelper compat level to 8

diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 936eb67..e44891d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers 
 Uploaders: Stéphane Glondu , Nicolas Dandrimont 

 Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 8),
  dh-ocaml (>= 0.9),
  ocaml-findlib,
  pkg-config,
diff --git a/debian/rules b/debian/rules
index 6a3c8d8..60ccfe8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
 export OCAMLFIND_LDCONF=ignore
 
 %:
-   dh --with ocaml $@
+   dh $@ --with ocaml
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:

-- 
ocaml-usb 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-usb packaging branch, master, updated. debian/1.2.0-2-8-geb06948

2013-05-09 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit f74ef44cb864ea162e31865799248e6dab165111
Author: Stephane Glondu 
Date:   Thu May 9 23:39:31 2013 +0200

Bump Standards-Version to 3.9.4

diff --git a/debian/control b/debian/control
index 1fb5aed..936eb67 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  liblwt-ocaml-dev (>= 2.3.0),
  libusb-1.0-0-dev,
  ocaml-nox (>= 3.12.0~)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Section: ocaml
 Homepage: http://ocaml-usb.forge.ocamlcore.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-usb.git

-- 
ocaml-usb 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-usb packaging branch, master, updated. debian/1.2.0-2-8-geb06948

2013-05-09 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit e1474b04b43f8167a78e68cf533dfef61673
Author: Stephane Glondu 
Date:   Thu May 9 23:39:15 2013 +0200

Use format version 1.0 in debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 4b16877..4f184d8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,40 +1,42 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Packaged-By: Stéphane Glondu 
 Packaged-Date: Sat, 07 Nov 2009 16:16:21 +0100
-Original-Source-Location: http://ocaml-usb.forge.ocamlcore.org/
-Upstream-Author: Jérémie Dimino 
+Source: http://ocaml-usb.forge.ocamlcore.org/
+Upstream-Contact: Jérémie Dimino 
 
 Files: *
-Copyright: © 2009 Jérémie Dimino 
+Copyright: 2009-2013, Jérémie Dimino 
 License: BSD-C3
 
-  All rights reserved.
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the following
-  disclaimer in the documentation and/or other materials provided
-  with the distribution.
-* Neither the name of Jeremie Dimino nor the names of his
-  contributors may be used to endorse or promote products derived
-  from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR AND
-  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-  SUCH DAMAGE.
-
 Files: debian/*
-Copyright: © 2009 Stéphane Glondu 
+Copyright: 2009-2013, Stéphane Glondu 
+License: BSD-C3
+
 License: BSD-C3
+ All rights reserved.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+   * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+   * Neither the name of Jeremie Dimino nor the names of his
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR AND
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.

-- 
ocaml-usb 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-usb packaging branch, master, updated. debian/1.2.0-2-8-geb06948

2013-05-09 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit dc63d578943386828e55ce4b2dc5634e988a5f79
Author: Stephane Glondu 
Date:   Thu May 9 23:38:07 2013 +0200

Remove obsolete patches

diff --git 
a/debian/patches/0001-Register-the-pollfds-created-before-the-handlers-are.patch
 
b/debian/patches/0001-Register-the-pollfds-created-before-the-handlers-are.patch
deleted file mode 100644
index 0340bda..000
--- 
a/debian/patches/0001-Register-the-pollfds-created-before-the-handlers-are.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Nicolas Dandrimont 
-Date: Thu, 19 May 2011 22:47:16 +0200
-Subject: Register the pollfds created before the handlers are registered
-
-Patch forwarded (and applied) upstream in
-https://forge.ocamlcore.org/plugins/scmdarcs/cgi-bin/darcsweb.cgi?r=ocaml-usb/ocaml-usb;a=commit;h=20110519163209-c41ad-dd065e2dac213cf793b1cf9a3ee193bea88177cc.gz
-https://forge.ocamlcore.org/plugins/scmdarcs/cgi-bin/darcsweb.cgi?r=ocaml-usb/ocaml-usb;a=commit;h=20110519193825-c41ad-4b108fe46b693e4b262442602c8f761bd5bedbd4.gz

- src/usb_stubs.c |   15 +++
- 1 files changed, 15 insertions(+), 0 deletions(-)
-
-diff --git a/src/usb_stubs.c b/src/usb_stubs.c
-index b9f0e9d..a072c7f 100644
 a/src/usb_stubs.c
-+++ b/src/usb_stubs.c
-@@ -140,9 +140,24 @@ static void ml_usb_remove_pollfd(int fd, void *user_data)
- 
- CAMLprim value ml_usb_init()
- {
-+
-+  const struct libusb_pollfd** pollfds = NULL;
-+
-+  int i = 0;
-+
-   int res = libusb_init(NULL);
-   if (res) ml_usb_error(res, "init");
- 
-+  pollfds = libusb_get_pollfds(NULL);
-+
-+
-+  if (pollfds) {
-+for (i = 0; pollfds[i] != NULL; i++ ) {
-+  ml_usb_add_pollfd(pollfds[i]->fd, pollfds[i]->events, NULL);
-+}
-+free(pollfds);
-+  }
-+
-   libusb_set_pollfd_notifiers(NULL,
-   ml_usb_add_pollfd,
-   ml_usb_remove_pollfd,
--- 
diff --git a/debian/patches/0002-Include-stdint.h-before-libusb.h.patch 
b/debian/patches/0002-Include-stdint.h-before-libusb.h.patch
deleted file mode 100644
index da81643..000
--- a/debian/patches/0002-Include-stdint.h-before-libusb.h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Stephane Glondu 
-Date: Sat, 2 Jul 2011 12:16:03 +0200
-Subject: Include stdint.h before libusb.h
-
-Fixes FTBFS on kfreebsd-*.

- src/usb_stubs.c |1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/usb_stubs.c b/src/usb_stubs.c
-index a072c7f..c6a3a38 100644
 a/src/usb_stubs.c
-+++ b/src/usb_stubs.c
-@@ -14,6 +14,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e8e97f9..000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Register-the-pollfds-created-before-the-handlers-are.patch
-0002-Include-stdint.h-before-libusb.h.patch

-- 
ocaml-usb 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