[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.0-1-11-gda2f0b0
The following commit has been merged in the master branch: commit da2f0b049f1eb3921bf71fd26c4435143beb6154 Author: Nicolas Dandrimont Date: Thu May 19 22:58:23 2011 +0200 Add d/s/local-options diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 000..c4cf480 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ +abort-on-upstream-changes +unapply-patches -- ocaml-usb packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.0-1-11-gda2f0b0
The following commit has been merged in the master branch: commit bfa2d310b58889af2f47624e59ee917d4c2b894b Author: Nicolas Dandrimont Date: Thu May 19 22:56:56 2011 +0200 Bump Standards-Version to 3.9.2 diff --git a/debian/changelog b/debian/changelog index a65c681..2b79d5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ ocaml-usb (1.2.0-1) unstable; urgency=low - Drop 0001-Move-the-cmxs-rule-to-Before_rules.patch * Make the -dev package depend on libusb-1.0-0-dev * Add patch to fix the initialization of libusb + * Bump Standards-Version to 3.9.2 (no changes) - -- Nicolas Dandrimont Thu, 19 May 2011 22:49:34 +0200 + -- Nicolas Dandrimont Thu, 19 May 2011 22:53:18 +0200 ocaml-usb (1.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 592b704..ba69aa5 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.8.4 +Standards-Version: 3.9.2 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/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.0-1-11-gda2f0b0
The following commit has been merged in the master branch:
commit fad1a2e23b9bf99c5523ea89b44b53ac026588b5
Author: Nicolas Dandrimont
Date: Thu May 19 22:50:41 2011 +0200
Add patch to fix libusb initialization
diff --git a/debian/changelog b/debian/changelog
index 039c04a..a65c681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ ocaml-usb (1.2.0-1) unstable; urgency=low
- Bump required Lwt version to 2.3.0
- Drop 0001-Move-the-cmxs-rule-to-Before_rules.patch
* Make the -dev package depend on libusb-1.0-0-dev
+ * Add patch to fix the initialization of libusb
- -- Nicolas Dandrimont Thu, 19 May 2011
22:40:33 +0200
+ -- Nicolas Dandrimont Thu, 19 May 2011
22:49:34 +0200
ocaml-usb (1.0-1) unstable; urgency=low
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
new file mode 100644
index 000..0340bda
--- /dev/null
+++
b/debian/patches/0001-Register-the-pollfds-created-before-the-handlers-are.patch
@@ -0,0 +1,41 @@
+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/series b/debian/patches/series
new file mode 100644
index 000..ced054b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Register-the-pollfds-created-before-the-handlers-are.patch
--
ocaml-usb packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.0-1-11-gda2f0b0
The following commit has been merged in the master branch:
commit 654223285d59d16921dd30068844a8bd66ad3602
Author: Nicolas Dandrimont
Date: Thu May 19 22:41:32 2011 +0200
Add depends on libusb-1.0-0-dev to the -dev package
diff --git a/debian/changelog b/debian/changelog
index f357b4f..039c04a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ ocaml-usb (1.2.0-1) unstable; urgency=low
* New upstream release
- Bump required Lwt version to 2.3.0
- Drop 0001-Move-the-cmxs-rule-to-Before_rules.patch
+ * Make the -dev package depend on libusb-1.0-0-dev
- -- Nicolas Dandrimont Thu, 19 May 2011
17:03:34 +0200
+ -- Nicolas Dandrimont Thu, 19 May 2011
22:40:33 +0200
ocaml-usb (1.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 99e500c..592b704 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,8 @@ Architecture: any
Depends:
${ocaml:Depends},
${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
+ libusb-1.0-0-dev
Provides: ${ocaml:Provides}
Recommends:
ocaml-findlib
--
ocaml-usb packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.0-1-11-gda2f0b0
The following commit has been merged in the master branch: commit 003256ea8534bbf8684c977341beb51f49278db3 Author: Nicolas Dandrimont Date: Thu May 19 22:03:52 2011 +0200 Update debian/ files for new upstream release diff --git a/debian/libusb-ocaml-dev.install.in b/debian/libusb-ocaml-dev.install.in index ec3241b..40eca78 100644 --- a/debian/libusb-ocaml-dev.install.in +++ b/debian/libusb-ocaml-dev.install.in @@ -1,7 +1,5 @@ -_build/usb.docdir/*.html usr/share/doc/libusb-ocaml-dev/html/api -_build/usb.docdir/*.css usr/share/doc/libusb-ocaml-dev/html/api +usr/share/doc/libusb-ocaml-dev/html/api @OCamlStdlibDir@/usb/*.cmi @OCamlStdlibDir@/usb/*.mli @OCamlStdlibDir@/usb/*.a -OPT: @OCamlStdlibDir@/usb/*.cmx OPT: @OCamlStdlibDir@/usb/*.cmxa diff --git a/debian/libusb-ocaml.install.in b/debian/libusb-ocaml.install.in index 32bf0d0..100e99c 100644 --- a/debian/libusb-ocaml.install.in +++ b/debian/libusb-ocaml.install.in @@ -1,4 +1,4 @@ -@OCamlDllDir@/*.so +@OCamlStdlibDir@/usb/*.so @OCamlDllDir@ @OCamlStdlibDir@/usb/META @OCamlStdlibDir@/usb/*.cma OPT: @OCamlStdlibDir@/usb/*.cmxs diff --git a/debian/rules b/debian/rules index 372e348..6a3c8d8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,20 +1,40 @@ #!/usr/bin/make -f # -*- makefile -*- + +DESTDIR=$(CURDIR)/debian/tmp + include /usr/share/ocaml/ocamlvars.mk -export OCAMLFIND_DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR) +export OCAML_DLL_DIR +export OCAML_HAVE_OCAMLOPT +export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR) +export OCAMLFIND_LDCONF=ignore %: dh --with ocaml $@ -.PHONY: override_dh_auto_install -override_dh_auto_install: - install -d $(OCAMLFIND_DESTDIR) - install -d $(CURDIR)/debian/tmp/$(OCAML_DLL_DIR) - $(MAKE) install +.PHONY: override_dh_auto_configure +override_dh_auto_configure: + ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libusb-ocaml-dev/html .PHONY: override_dh_auto_build override_dh_auto_build: - $(MAKE) all - cp usb.mllib usb.odocl - $(MAKE) doc + ocaml setup.ml -build + ocaml setup.ml -doc + +.PHONY: override_dh_auto_test +override_dh_auto_test: + ocaml setup.ml -test + +.PHONY: override_dh_auto_install +override_dh_auto_install: + mkdir -p '$(OCAMLFIND_DESTDIR)' + ocaml setup.ml -install + +.PHONY: override_dh_install +override_dh_install: + dh_install --list-missing + +.PHONY: override_dh_auto_clean +override_dh_auto_clean: + ocaml setup.ml -distclean -- ocaml-usb packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.0-1-11-gda2f0b0
The following commit has been merged in the master branch: commit ee756289bd7a2268a6e275268ecdd5530d3a8eb1 Author: Nicolas Dandrimont Date: Thu May 19 17:03:54 2011 +0200 Drop 0001-Move-the-cmxs-rule-to-Before_rules.patch diff --git a/debian/changelog b/debian/changelog index d70e0a4..f357b4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ ocaml-usb (1.2.0-1) unstable; urgency=low * New upstream release - Bump required Lwt version to 2.3.0 +- Drop 0001-Move-the-cmxs-rule-to-Before_rules.patch - -- Nicolas Dandrimont Thu, 19 May 2011 16:44:01 +0200 + -- Nicolas Dandrimont Thu, 19 May 2011 17:03:34 +0200 ocaml-usb (1.0-1) unstable; urgency=low diff --git a/debian/patches/0001-Move-the-cmxs-rule-to-Before_rules.patch b/debian/patches/0001-Move-the-cmxs-rule-to-Before_rules.patch deleted file mode 100644 index d971a6b..000 --- a/debian/patches/0001-Move-the-cmxs-rule-to-Before_rules.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Stephane Glondu -Date: Thu, 29 Apr 2010 07:24:15 +0200 -Subject: [PATCH] Move the cmxs rule to Before_rules - -Move the cmxs rule to Before_rules, so that it overrides the built-in -rules (which are present in OCaml 3.12). - -Signed-off-by: Stephane Glondu - myocamlbuild.ml | 18 ++ - 1 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/myocamlbuild.ml b/myocamlbuild.ml -index 712e121..6bd3547 100644 a/myocamlbuild.ml -+++ b/myocamlbuild.ml -@@ -123,6 +123,16 @@ let _ = - Options.ocamldep := ocamlfind "ocamldep"; - Options.ocamldoc := S[A"ocamlfind"; A"ocamldoc"; A"-hide-warnings"] - -+| Before_rules -> -+ -+(* +-+ -+ | Shared libraries| -+ +-+ *) -+ -+rule "shared libraries (cmxs)" -+ ~dep:"%.cmxa" ~prod:"%.cmxs" -+ (fun env _ -> Cmd(S[!(Options.ocamlopt); A"-cclib"; A"-L."; A"-shared"; A"-linkall"; A(env "%.cmxa"); A"-o"; A(env "%.cmxs")])) -+ - | After_rules -> - - (* +-+ -@@ -138,14 +148,6 @@ let _ = - virtual_rule "native" & ["META"; "usb.cmxa"; "usb.cmxs"]; - - (* +-+ -- | Shared libraries| -- +-+ *) -- --rule "shared libraries (cmxs)" -- ~dep:"%.cmxa" ~prod:"%.cmxs" -- (fun env _ -> Cmd(S[!(Options.ocamlopt); A"-cclib"; A"-L."; A"-shared"; A"-linkall"; A(env "%.cmxa"); A"-o"; A(env "%.cmxs")])); -- --(* +-+ -| Ocamlfind stuff | -+-+ *) - --- diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index cb900f9..000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-Move-the-cmxs-rule-to-Before_rules.patch -- ocaml-usb packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.0-1-11-gda2f0b0
The following commit has been merged in the master branch: commit 5735cfc5167a7bc06c353c0768fa9d000c990fd4 Author: Nicolas Dandrimont Date: Thu May 19 16:44:11 2011 +0200 Bump required Lwt and Ocaml version diff --git a/debian/changelog b/debian/changelog index 5cec2d7..d70e0a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ ocaml-usb (1.2.0-1) unstable; urgency=low * New upstream release +- Bump required Lwt version to 2.3.0 - -- Nicolas Dandrimont Thu, 19 May 2011 16:42:15 +0200 + -- Nicolas Dandrimont Thu, 19 May 2011 16:44:01 +0200 ocaml-usb (1.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 244b240..99e500c 100644 --- a/debian/control +++ b/debian/control @@ -7,9 +7,9 @@ Build-Depends: dh-ocaml (>= 0.9), ocaml-findlib, pkg-config, - liblwt-ocaml-dev (>= 2.0.0), + liblwt-ocaml-dev (>= 2.3.0), libusb-1.0-0-dev, - ocaml-nox (>= 3.11.1-3~) + ocaml-nox (>= 3.12.0~) Standards-Version: 3.8.4 Section: ocaml Homepage: http://ocaml-usb.forge.ocamlcore.org/ -- ocaml-usb packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.0-1-11-gda2f0b0
The following commit has been merged in the master branch: commit a2d6eab789025d3f2d24c9e1578f7338e40d774c Author: Nicolas Dandrimont Date: Thu May 19 16:43:17 2011 +0200 Add myself to uploaders diff --git a/debian/control b/debian/control index 5673149..244b240 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: ocaml-usb Priority: optional Maintainer: Debian OCaml Maintainers -Uploaders: Stéphane Glondu +Uploaders: Stéphane Glondu , Nicolas Dandrimont Build-Depends: debhelper (>= 7.0.50~), dh-ocaml (>= 0.9), -- ocaml-usb packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.0-1-11-gda2f0b0
The following commit has been merged in the master branch: commit 390f312b8a34a6f56f8db237d8ba2b80a39ba0f2 Author: Nicolas Dandrimont Date: Thu May 19 16:42:36 2011 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 1621915..5cec2d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-usb (1.2.0-1) unstable; urgency=low + + * New upstream release + + -- Nicolas Dandrimont Thu, 19 May 2011 16:42:15 +0200 + ocaml-usb (1.0-1) unstable; urgency=low * New upstream release -- ocaml-usb packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.0-1-11-gda2f0b0
The following commit has been merged in the master branch: commit ac465e56e0ed2fb08a373728c660e34bf4b0a4a2 Merge: 6032225fe2d194bae62c86e3d49cc7280a197911 f196e384baa1ee173894f55537b5fdac313ad13a Author: Nicolas Dandrimont Date: Thu May 19 16:41:57 2011 +0200 Merge commit 'upstream/1.2.0' -- ocaml-usb packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
