The following commit has been merged in the master branch:
commit 311f9aa414086e07399b201030d7be1fe5ee93a3
Author: Stephane Glondu <st...@glondu.net>
Date:   Sat Jul 30 13:17:24 2011 +0200

    Refresh patches

diff --git 
a/debian/patches/0002-Disable-the-tests-that-need-a-working-dbus-daemon.patch 
b/debian/patches/0001-Disable-the-tests-that-need-a-working-dbus-daemon.patch
similarity index 100%
rename from 
debian/patches/0002-Disable-the-tests-that-need-a-working-dbus-daemon.patch
rename to 
debian/patches/0001-Disable-the-tests-that-need-a-working-dbus-daemon.patch
diff --git a/debian/patches/0001-Fix-for-type-conv-2.3.0.patch 
b/debian/patches/0001-Fix-for-type-conv-2.3.0.patch
deleted file mode 100644
index fe7c455..0000000
--- a/debian/patches/0001-Fix-for-type-conv-2.3.0.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-From: Nicolas Dandrimont <nicolas.dandrim...@crans.org>
-Date: Sat, 11 Jun 2011 23:31:23 +0200
-Subject: Fix for type-conv >= 2.3.0~
-
-The type-conv.syntax module was renamed type-conv
----
- _oasis   |    8 ++++----
- _tags    |   62 +++++++++++++++++++++++++++++++-------------------------------
- setup.ml |    6 +++---
- src/META |    2 +-
- 4 files changed, 39 insertions(+), 39 deletions(-)
-
-diff --git a/_oasis b/_oasis
-index 2cbf922..a56cd99 100644
---- a/_oasis
-+++ b/_oasis
-@@ -61,7 +61,7 @@ Library obus
-     OBus_util,
-     OBus_xml_parser,
-     OBus_config
--  BuildDepends: lwt.unix, lwt.react, lwt.syntax, lwt.syntax.log, 
type-conv.syntax, xmlm
-+  BuildDepends: lwt.unix, lwt.react, lwt.syntax, lwt.syntax.log, type-conv, 
xmlm
-   BuildTools: obus-gen-interface
-   XMETARequires: lwt.unix, lwt.react, xmlm
-   XMETADescription: Pure OCaml implementation of D-Bus
-@@ -86,10 +86,10 @@ Library "obus-syntax"
-   InternalModules: Pa_obus
-   FindlibName: syntax
-   FindlibParent: obus
--  BuildDepends: type-conv.syntax, camlp4.lib, camlp4.quotations.o
-+  BuildDepends: type-conv, camlp4.lib, camlp4.quotations.o
-   CompiledObject: byte
-   XMETAType: syntax
--  XMETARequires: camlp4, type-conv.syntax
-+  XMETARequires: camlp4, type-conv
-   XMETADescription: Syntactic sugars for defining D-Bus errors
- 
- # +-------------------------------------------------------------------+
-@@ -185,7 +185,7 @@ Executable "obus-gen-interface"
-   Install: true
-   CompiledObject: best
-   MainIs: obus_gen_interface.ml
--  BuildDepends: lwt.unix, lwt.react, lwt.syntax, lwt.syntax.log, 
type-conv.syntax, xmlm, camlp4.quotations.o, camlp4.extend, camlp4.lib
-+  BuildDepends: lwt.unix, lwt.react, lwt.syntax, lwt.syntax.log, type-conv, 
xmlm, camlp4.quotations.o, camlp4.extend, camlp4.lib
- 
- Executable "obus-dump"
-   Path: tools
-diff --git a/_tags b/_tags
-index 8e40807..3880c41 100644
---- a/_tags
-+++ b/_tags
-@@ -5,10 +5,10 @@
- <syntax/*.ml>: -pa_obus
- 
- # OASIS_START
--# DO NOT EDIT (digest: f199336746b3cb0dc2249cddbc36e0d8)
-+# DO NOT EDIT (digest: 210739cec55f01e17bfec3c9bc0592d3)
- # Executable obus-gen-interface
- <tools/obus_gen_interface.{native,byte}>: pkg_xmlm
--<tools/obus_gen_interface.{native,byte}>: pkg_type-conv.syntax
-+<tools/obus_gen_interface.{native,byte}>: pkg_type-conv
- <tools/obus_gen_interface.{native,byte}>: pkg_lwt.unix
- <tools/obus_gen_interface.{native,byte}>: pkg_lwt.syntax.log
- <tools/obus_gen_interface.{native,byte}>: pkg_lwt.syntax
-@@ -23,7 +23,7 @@
- "bindings/upower/obus-upower.cmxs": use_obus-upower
- <bindings/upower/*.ml{,i}>: use_obus
- <bindings/upower/*.ml{,i}>: pkg_xmlm
--<bindings/upower/*.ml{,i}>: pkg_type-conv.syntax
-+<bindings/upower/*.ml{,i}>: pkg_type-conv
- <bindings/upower/*.ml{,i}>: pkg_lwt.unix
- <bindings/upower/*.ml{,i}>: pkg_lwt.syntax.log
- <bindings/upower/*.ml{,i}>: pkg_lwt.syntax
-@@ -33,7 +33,7 @@
- "src/obus-idl.cmxs": use_obus-idl
- <src/*.ml{,i}>: use_obus
- <src/*.ml{,i}>: pkg_xmlm
--<src/*.ml{,i}>: pkg_type-conv.syntax
-+<src/*.ml{,i}>: pkg_type-conv
- <src/*.ml{,i}>: pkg_lwt.unix
- <src/*.ml{,i}>: pkg_lwt.syntax.log
- <src/*.ml{,i}>: pkg_lwt.syntax
-@@ -45,7 +45,7 @@
- "bindings/network-manager/obus-network-manager.cmxs": use_obus-network-manager
- <bindings/network-manager/*.ml{,i}>: use_obus
- <bindings/network-manager/*.ml{,i}>: pkg_xmlm
--<bindings/network-manager/*.ml{,i}>: pkg_type-conv.syntax
-+<bindings/network-manager/*.ml{,i}>: pkg_type-conv
- <bindings/network-manager/*.ml{,i}>: pkg_lwt.unix
- <bindings/network-manager/*.ml{,i}>: pkg_lwt.syntax.log
- <bindings/network-manager/*.ml{,i}>: pkg_lwt.syntax
-@@ -55,7 +55,7 @@
- "bindings/notification/obus-notification.cmxs": use_obus-notification
- <bindings/notification/*.ml{,i}>: use_obus
- <bindings/notification/*.ml{,i}>: pkg_xmlm
--<bindings/notification/*.ml{,i}>: pkg_type-conv.syntax
-+<bindings/notification/*.ml{,i}>: pkg_type-conv
- <bindings/notification/*.ml{,i}>: pkg_lwt.unix
- <bindings/notification/*.ml{,i}>: pkg_lwt.syntax.log
- <bindings/notification/*.ml{,i}>: pkg_lwt.syntax
-@@ -63,14 +63,14 @@
- # Executable tests
- <tests/main.{native,byte}>: use_obus
- <tests/main.{native,byte}>: pkg_xmlm
--<tests/main.{native,byte}>: pkg_type-conv.syntax
-+<tests/main.{native,byte}>: pkg_type-conv
- <tests/main.{native,byte}>: pkg_lwt.unix
- <tests/main.{native,byte}>: pkg_lwt.syntax.log
- <tests/main.{native,byte}>: pkg_lwt.syntax
- <tests/main.{native,byte}>: pkg_lwt.react
- <tests/*.ml{,i}>: use_obus
- <tests/*.ml{,i}>: pkg_xmlm
--<tests/*.ml{,i}>: pkg_type-conv.syntax
-+<tests/*.ml{,i}>: pkg_type-conv
- <tests/*.ml{,i}>: pkg_lwt.unix
- <tests/*.ml{,i}>: pkg_lwt.syntax.log
- <tests/*.ml{,i}>: pkg_lwt.syntax
-@@ -80,7 +80,7 @@
- "bindings/hal/obus-hal.cmxs": use_obus-hal
- <bindings/hal/*.ml{,i}>: use_obus
- <bindings/hal/*.ml{,i}>: pkg_xmlm
--<bindings/hal/*.ml{,i}>: pkg_type-conv.syntax
-+<bindings/hal/*.ml{,i}>: pkg_type-conv
- <bindings/hal/*.ml{,i}>: pkg_lwt.unix
- <bindings/hal/*.ml{,i}>: pkg_lwt.syntax.log
- <bindings/hal/*.ml{,i}>: pkg_lwt.syntax
-@@ -88,7 +88,7 @@
- # Executable obus-introspect
- <tools/obus_introspect.{native,byte}>: use_obus
- <tools/obus_introspect.{native,byte}>: pkg_xmlm
--<tools/obus_introspect.{native,byte}>: pkg_type-conv.syntax
-+<tools/obus_introspect.{native,byte}>: pkg_type-conv
- <tools/obus_introspect.{native,byte}>: pkg_lwt.unix
- <tools/obus_introspect.{native,byte}>: pkg_lwt.syntax.log
- <tools/obus_introspect.{native,byte}>: pkg_lwt.syntax
-@@ -97,7 +97,7 @@
- <examples/battery_monitoring.{native,byte}>: use_obus-upower
- <examples/battery_monitoring.{native,byte}>: use_obus
- <examples/battery_monitoring.{native,byte}>: pkg_xmlm
--<examples/battery_monitoring.{native,byte}>: pkg_type-conv.syntax
-+<examples/battery_monitoring.{native,byte}>: pkg_type-conv
- <examples/battery_monitoring.{native,byte}>: pkg_lwt.unix
- <examples/battery_monitoring.{native,byte}>: pkg_lwt.syntax.log
- <examples/battery_monitoring.{native,byte}>: pkg_lwt.syntax
-@@ -107,7 +107,7 @@
- <tools/obus_gen_server.{native,byte}>: use_obus-idl
- <tools/obus_gen_server.{native,byte}>: use_obus
- <tools/obus_gen_server.{native,byte}>: pkg_xmlm
--<tools/obus_gen_server.{native,byte}>: pkg_type-conv.syntax
-+<tools/obus_gen_server.{native,byte}>: pkg_type-conv
- <tools/obus_gen_server.{native,byte}>: pkg_lwt.unix
- <tools/obus_gen_server.{native,byte}>: pkg_lwt.syntax.log
- <tools/obus_gen_server.{native,byte}>: pkg_lwt.syntax
-@@ -118,7 +118,7 @@
- # Executable bus-functions
- <examples/bus_functions.{native,byte}>: use_obus
- <examples/bus_functions.{native,byte}>: pkg_xmlm
--<examples/bus_functions.{native,byte}>: pkg_type-conv.syntax
-+<examples/bus_functions.{native,byte}>: pkg_type-conv
- <examples/bus_functions.{native,byte}>: pkg_lwt.unix
- <examples/bus_functions.{native,byte}>: pkg_lwt.syntax.log
- <examples/bus_functions.{native,byte}>: pkg_lwt.syntax
-@@ -126,7 +126,7 @@
- # Executable list-services
- <examples/list_services.{native,byte}>: use_obus
- <examples/list_services.{native,byte}>: pkg_xmlm
--<examples/list_services.{native,byte}>: pkg_type-conv.syntax
-+<examples/list_services.{native,byte}>: pkg_type-conv
- <examples/list_services.{native,byte}>: pkg_lwt.unix
- <examples/list_services.{native,byte}>: pkg_lwt.syntax.log
- <examples/list_services.{native,byte}>: pkg_lwt.syntax
-@@ -136,7 +136,7 @@
- "bindings/policykit/obus-policykit.cmxs": use_obus-policykit
- <bindings/policykit/*.ml{,i}>: use_obus
- <bindings/policykit/*.ml{,i}>: pkg_xmlm
--<bindings/policykit/*.ml{,i}>: pkg_type-conv.syntax
-+<bindings/policykit/*.ml{,i}>: pkg_type-conv
- <bindings/policykit/*.ml{,i}>: pkg_lwt.unix
- <bindings/policykit/*.ml{,i}>: pkg_lwt.syntax.log
- <bindings/policykit/*.ml{,i}>: pkg_lwt.syntax
-@@ -145,7 +145,7 @@
- <tools/obus_xml2idl.{native,byte}>: use_obus-idl
- <tools/obus_xml2idl.{native,byte}>: use_obus
- <tools/obus_xml2idl.{native,byte}>: pkg_xmlm
--<tools/obus_xml2idl.{native,byte}>: pkg_type-conv.syntax
-+<tools/obus_xml2idl.{native,byte}>: pkg_type-conv
- <tools/obus_xml2idl.{native,byte}>: pkg_lwt.unix
- <tools/obus_xml2idl.{native,byte}>: pkg_lwt.syntax.log
- <tools/obus_xml2idl.{native,byte}>: pkg_lwt.syntax
-@@ -156,7 +156,7 @@
- # Executable ping
- <examples/ping.{native,byte}>: use_obus
- <examples/ping.{native,byte}>: pkg_xmlm
--<examples/ping.{native,byte}>: pkg_type-conv.syntax
-+<examples/ping.{native,byte}>: pkg_type-conv
- <examples/ping.{native,byte}>: pkg_lwt.unix
- <examples/ping.{native,byte}>: pkg_lwt.syntax.log
- <examples/ping.{native,byte}>: pkg_lwt.syntax
-@@ -165,7 +165,7 @@
- <examples/network_manager.{native,byte}>: use_obus-network-manager
- <examples/network_manager.{native,byte}>: use_obus
- <examples/network_manager.{native,byte}>: pkg_xmlm
--<examples/network_manager.{native,byte}>: pkg_type-conv.syntax
-+<examples/network_manager.{native,byte}>: pkg_type-conv
- <examples/network_manager.{native,byte}>: pkg_lwt.unix
- <examples/network_manager.{native,byte}>: pkg_lwt.syntax.log
- <examples/network_manager.{native,byte}>: pkg_lwt.syntax
-@@ -174,13 +174,13 @@
- # Library obus-syntax
- "syntax": include
- "syntax/obus-syntax.cmxs": use_obus-syntax
--<syntax/*.ml{,i}>: pkg_type-conv.syntax
-+<syntax/*.ml{,i}>: pkg_type-conv
- <syntax/*.ml{,i}>: pkg_camlp4.quotations.o
- <syntax/*.ml{,i}>: pkg_camlp4.lib
- # Executable pong
- <examples/pong.{native,byte}>: use_obus
- <examples/pong.{native,byte}>: pkg_xmlm
--<examples/pong.{native,byte}>: pkg_type-conv.syntax
-+<examples/pong.{native,byte}>: pkg_type-conv
- <examples/pong.{native,byte}>: pkg_lwt.unix
- <examples/pong.{native,byte}>: pkg_lwt.syntax.log
- <examples/pong.{native,byte}>: pkg_lwt.syntax
-@@ -189,7 +189,7 @@
- <examples/notify.{native,byte}>: use_obus-notification
- <examples/notify.{native,byte}>: use_obus
- <examples/notify.{native,byte}>: pkg_xmlm
--<examples/notify.{native,byte}>: pkg_type-conv.syntax
-+<examples/notify.{native,byte}>: pkg_type-conv
- <examples/notify.{native,byte}>: pkg_lwt.unix
- <examples/notify.{native,byte}>: pkg_lwt.syntax.log
- <examples/notify.{native,byte}>: pkg_lwt.syntax
-@@ -199,7 +199,7 @@
- <tools/obus_gen_client.{native,byte}>: use_obus-idl
- <tools/obus_gen_client.{native,byte}>: use_obus
- <tools/obus_gen_client.{native,byte}>: pkg_xmlm
--<tools/obus_gen_client.{native,byte}>: pkg_type-conv.syntax
-+<tools/obus_gen_client.{native,byte}>: pkg_type-conv
- <tools/obus_gen_client.{native,byte}>: pkg_lwt.unix
- <tools/obus_gen_client.{native,byte}>: pkg_lwt.syntax.log
- <tools/obus_gen_client.{native,byte}>: pkg_lwt.syntax
-@@ -210,7 +210,7 @@
- # Executable obus-dump
- <tools/obus_dump.{native,byte}>: use_obus
- <tools/obus_dump.{native,byte}>: pkg_xmlm
--<tools/obus_dump.{native,byte}>: pkg_type-conv.syntax
-+<tools/obus_dump.{native,byte}>: pkg_type-conv
- <tools/obus_dump.{native,byte}>: pkg_lwt.unix
- <tools/obus_dump.{native,byte}>: pkg_lwt.syntax.log
- <tools/obus_dump.{native,byte}>: pkg_lwt.syntax
-@@ -219,7 +219,7 @@
- <examples/eject.{native,byte}>: use_obus-hal
- <examples/eject.{native,byte}>: use_obus
- <examples/eject.{native,byte}>: pkg_xmlm
--<examples/eject.{native,byte}>: pkg_type-conv.syntax
-+<examples/eject.{native,byte}>: pkg_type-conv
- <examples/eject.{native,byte}>: pkg_lwt.unix
- <examples/eject.{native,byte}>: pkg_lwt.syntax.log
- <examples/eject.{native,byte}>: pkg_lwt.syntax
-@@ -228,7 +228,7 @@
- <examples/signals.{native,byte}>: use_obus-hal
- <examples/signals.{native,byte}>: use_obus
- <examples/signals.{native,byte}>: pkg_xmlm
--<examples/signals.{native,byte}>: pkg_type-conv.syntax
-+<examples/signals.{native,byte}>: pkg_type-conv
- <examples/signals.{native,byte}>: pkg_lwt.unix
- <examples/signals.{native,byte}>: pkg_lwt.syntax.log
- <examples/signals.{native,byte}>: pkg_lwt.syntax
-@@ -237,7 +237,7 @@
- # Executable monitor
- <examples/monitor.{native,byte}>: use_obus
- <examples/monitor.{native,byte}>: pkg_xmlm
--<examples/monitor.{native,byte}>: pkg_type-conv.syntax
-+<examples/monitor.{native,byte}>: pkg_type-conv
- <examples/monitor.{native,byte}>: pkg_lwt.unix
- <examples/monitor.{native,byte}>: pkg_lwt.syntax.log
- <examples/monitor.{native,byte}>: pkg_lwt.syntax
-@@ -247,7 +247,7 @@
- "bindings/udisks/obus-udisks.cmxs": use_obus-udisks
- <bindings/udisks/*.ml{,i}>: use_obus
- <bindings/udisks/*.ml{,i}>: pkg_xmlm
--<bindings/udisks/*.ml{,i}>: pkg_type-conv.syntax
-+<bindings/udisks/*.ml{,i}>: pkg_type-conv
- <bindings/udisks/*.ml{,i}>: pkg_lwt.unix
- <bindings/udisks/*.ml{,i}>: pkg_lwt.syntax.log
- <bindings/udisks/*.ml{,i}>: pkg_lwt.syntax
-@@ -256,7 +256,7 @@
- <tools/obus_idl2xml.{native,byte}>: use_obus-idl
- <tools/obus_idl2xml.{native,byte}>: use_obus
- <tools/obus_idl2xml.{native,byte}>: pkg_xmlm
--<tools/obus_idl2xml.{native,byte}>: pkg_type-conv.syntax
-+<tools/obus_idl2xml.{native,byte}>: pkg_type-conv
- <tools/obus_idl2xml.{native,byte}>: pkg_lwt.unix
- <tools/obus_idl2xml.{native,byte}>: pkg_lwt.syntax.log
- <tools/obus_idl2xml.{native,byte}>: pkg_lwt.syntax
-@@ -267,7 +267,7 @@
- <tools/*.ml{,i}>: use_obus-idl
- <tools/*.ml{,i}>: use_obus
- <tools/*.ml{,i}>: pkg_xmlm
--<tools/*.ml{,i}>: pkg_type-conv.syntax
-+<tools/*.ml{,i}>: pkg_type-conv
- <tools/*.ml{,i}>: pkg_lwt.unix
- <tools/*.ml{,i}>: pkg_lwt.syntax.log
- <tools/*.ml{,i}>: pkg_lwt.syntax
-@@ -278,14 +278,14 @@
- # Executable hello
- <examples/hello.{native,byte}>: use_obus
- <examples/hello.{native,byte}>: pkg_xmlm
--<examples/hello.{native,byte}>: pkg_type-conv.syntax
-+<examples/hello.{native,byte}>: pkg_type-conv
- <examples/hello.{native,byte}>: pkg_lwt.unix
- <examples/hello.{native,byte}>: pkg_lwt.syntax.log
- <examples/hello.{native,byte}>: pkg_lwt.syntax
- <examples/hello.{native,byte}>: pkg_lwt.react
- <examples/*.ml{,i}>: use_obus
- <examples/*.ml{,i}>: pkg_xmlm
--<examples/*.ml{,i}>: pkg_type-conv.syntax
-+<examples/*.ml{,i}>: pkg_type-conv
- <examples/*.ml{,i}>: pkg_lwt.unix
- <examples/*.ml{,i}>: pkg_lwt.syntax.log
- <examples/*.ml{,i}>: pkg_lwt.syntax
-diff --git a/setup.ml b/setup.ml
-index fd96a8a..6e8cf56 100644
---- a/setup.ml
-+++ b/setup.ml
-@@ -5727,7 +5727,7 @@ let setup_t =
-                            FindlibPackage ("lwt.react", None);
-                            FindlibPackage ("lwt.syntax", None);
-                            FindlibPackage ("lwt.syntax.log", None);
--                           FindlibPackage ("type-conv.syntax", None);
-+                           FindlibPackage ("type-conv", None);
-                            FindlibPackage ("xmlm", None);
-                            FindlibPackage ("camlp4.quotations.o", None);
-                            FindlibPackage ("camlp4.extend", None);
-@@ -5764,7 +5764,7 @@ let setup_t =
-                            FindlibPackage ("lwt.react", None);
-                            FindlibPackage ("lwt.syntax", None);
-                            FindlibPackage ("lwt.syntax.log", None);
--                           FindlibPackage ("type-conv.syntax", None);
-+                           FindlibPackage ("type-conv", None);
-                            FindlibPackage ("xmlm", None)
-                         ];
-                       bs_build_tools =
-@@ -6381,7 +6381,7 @@ let setup_t =
-                       bs_compiled_object = Byte;
-                       bs_build_depends =
-                         [
--                           FindlibPackage ("type-conv.syntax", None);
-+                           FindlibPackage ("type-conv", None);
-                            FindlibPackage ("camlp4.lib", None);
-                            FindlibPackage ("camlp4.quotations.o", None)
-                         ];
-diff --git a/src/META b/src/META
-index b63a720..549a1bb 100644
---- a/src/META
-+++ b/src/META
-@@ -18,7 +18,7 @@ package "udisks" (
- package "syntax" (
-  version = "1.1.2"
-  description = "Syntactic sugars for defining D-Bus errors"
-- requires = "camlp4 type-conv.syntax"
-+ requires = "camlp4 type-conv"
-  archive(syntax,preprocessor) = "obus-syntax.cma"
-  archive(syntax,toploop) = "obus-syntax.cma"
-  exists_if = "obus-syntax.cma"
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 1fc4b46..0b1b594 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Fix-for-type-conv-2.3.0.patch
-0002-Disable-the-tests-that-need-a-working-dbus-daemon.patch
+0001-Disable-the-tests-that-need-a-working-dbus-daemon.patch

-- 
obus 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

Reply via email to