[Pkg-ocaml-maint-commits] r2390 - in
trunk/packages/gmetadom/trunk/debian: . patches
Stefano Zacchiroli
zack at costa.debian.org
Sat Jan 7 11:05:16 UTC 2006
Author: zack
Date: 2006-01-07 11:05:15 +0000 (Sat, 07 Jan 2006)
New Revision: 2390
Added:
trunk/packages/gmetadom/trunk/debian/patches/04_caml_encoding.dpatch
trunk/packages/gmetadom/trunk/debian/patches/07_careful_inst.dpatch
Modified:
trunk/packages/gmetadom/trunk/debian/changelog
trunk/packages/gmetadom/trunk/debian/control
trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.dirs
trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.install
trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.dirs
trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.install
trunk/packages/gmetadom/trunk/debian/patches/00list
Log:
- ported to ocaml 3.09.1
- added wishslist patch for save with user-specified encofing
- added patch for better installation target
Modified: trunk/packages/gmetadom/trunk/debian/changelog
===================================================================
--- trunk/packages/gmetadom/trunk/debian/changelog 2006-01-07 10:52:27 UTC (rev 2389)
+++ trunk/packages/gmetadom/trunk/debian/changelog 2006-01-07 11:05:15 UTC (rev 2390)
@@ -1,3 +1,14 @@
+gmetadom (0.2.3-5) unstable; urgency=low
+
+ * Rebuilt against OCaml 3.09.1, bumped deps accordingly.
+ * Added patch 04_caml_encoding from YANG Shouxun which enable saving
+ in user-specified encoding (closes: #341071)
+ * Added patch 07_careful_inst from Julien Cristau which provide more
+ careful Makefile installation target which wont ignore errors
+ (closes: #345946)
+
+ -- Stefano Zacchiroli <zack at debian.org> Sat, 7 Jan 2006 11:56:03 +0100
+
gmetadom (0.2.3-4) unstable; urgency=low
* debian/control
Modified: trunk/packages/gmetadom/trunk/debian/control
===================================================================
--- trunk/packages/gmetadom/trunk/debian/control 2006-01-07 10:52:27 UTC (rev 2389)
+++ trunk/packages/gmetadom/trunk/debian/control 2006-01-07 11:05:15 UTC (rev 2390)
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 4.1.0), ocaml-nox (>= 3.09.0), ocaml-findlib (>= 1.1), libgdome2-dev (>= 0.8.1), pkg-config, dpatch, cdbs
+Build-Depends: debhelper (>= 4.1.0), ocaml-nox (>= 3.09.1), ocaml-findlib (>= 1.1), libgdome2-dev (>= 0.8.1), pkg-config, dpatch, cdbs
Standards-Version: 3.6.2
Package: libgdome2-cpp-smart0c2a
Modified: trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.dirs
===================================================================
--- trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.dirs 2006-01-07 10:52:27 UTC (rev 2389)
+++ trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.dirs 2006-01-07 11:05:15 UTC (rev 2390)
@@ -1 +1 @@
-usr/lib/ocaml/3.09.0/gdome2
+usr/lib/ocaml/3.09.1/gdome2
Modified: trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.install
===================================================================
--- trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.install 2006-01-07 10:52:27 UTC (rev 2389)
+++ trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.install 2006-01-07 11:05:15 UTC (rev 2390)
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/ocaml/3.09.0/gdome2/ usr/lib/ocaml/3.09.0/
-debian/tmp/usr/lib/ocaml/3.09.0/stublibs/*.owner usr/lib/ocaml/3.09.0/stublibs/
+debian/tmp/usr/lib/ocaml/3.09.1/gdome2/ usr/lib/ocaml/3.09.1/
+debian/tmp/usr/lib/ocaml/3.09.1/stublibs/*.owner usr/lib/ocaml/3.09.1/stublibs/
Modified: trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.dirs
===================================================================
--- trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.dirs 2006-01-07 10:52:27 UTC (rev 2389)
+++ trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.dirs 2006-01-07 11:05:15 UTC (rev 2390)
@@ -1 +1 @@
-usr/lib/ocaml/3.09.0/stublibs
+usr/lib/ocaml/3.09.1/stublibs
Modified: trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.install
===================================================================
--- trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.install 2006-01-07 10:52:27 UTC (rev 2389)
+++ trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.install 2006-01-07 11:05:15 UTC (rev 2390)
@@ -1 +1 @@
-debian/tmp/usr/lib/ocaml/3.09.0/stublibs/*.so usr/lib/ocaml/3.09.0/stublibs/
+debian/tmp/usr/lib/ocaml/3.09.1/stublibs/*.so usr/lib/ocaml/3.09.1/stublibs/
Modified: trunk/packages/gmetadom/trunk/debian/patches/00list
===================================================================
--- trunk/packages/gmetadom/trunk/debian/patches/00list 2006-01-07 10:52:27 UTC (rev 2389)
+++ trunk/packages/gmetadom/trunk/debian/patches/00list 2006-01-07 11:05:15 UTC (rev 2390)
@@ -1 +1,3 @@
03_tests_makefile.dpatch
+04_caml_encoding.dpatch
+07_careful_inst.dpatch
Added: trunk/packages/gmetadom/trunk/debian/patches/04_caml_encoding.dpatch
===================================================================
--- trunk/packages/gmetadom/trunk/debian/patches/04_caml_encoding.dpatch 2006-01-07 10:52:27 UTC (rev 2389)
+++ trunk/packages/gmetadom/trunk/debian/patches/04_caml_encoding.dpatch 2006-01-07 11:05:15 UTC (rev 2390)
@@ -0,0 +1,182 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_caml_encoding.dpatch by Yang Shouxun <yang.shx at fltrp.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -aruN gmetadom-0.2.3.orig/src/gdome_caml gmetadom-0.2.3/src/gdome_caml
+--- gmetadom-0.2.3.orig/src/gdome_caml/iDOMImplementation.ml 2003-09-13 22:14:42.000000000 +0800
++++ gmetadom-0.2.3/src/gdome_caml/iDOMImplementation.ml 2005-11-28 15:37:39.000000000 +0800
+@@ -65,6 +65,11 @@
+ let saveDocumentToFile ~this ~doc ~name ?(indent=false) () =
+ raw_saveDocumentToFile ~this ~doc ~name ~mode:(if indent then 1 else 0)
+ ;;
++
++external raw_saveDocumentToFileEnc : this:TDOMImplementation.t -> doc:[> `Document] GdomeT.t -> name:string -> encoding:string -> mode:int -> bool = "ml_gdome_di_saveDocumentToFileEnc"
++let saveDocumentToFileEnc ~this ~doc ~name ~encoding ?(indent=false) () =
++ raw_saveDocumentToFileEnc ~this ~doc ~name ~encoding ~mode:(if indent then 1 else 0)
++;;
+
+ external raw_saveDocumentToMemory :
+ this:TDOMImplementation.t ->
+@@ -76,6 +81,17 @@
+ raw_saveDocumentToMemory ~this ~doc ~mode:(if indent then 1 else 0)
+ ;;
+
++external raw_saveDocumentToMemoryEnc :
++ this:TDOMImplementation.t ->
++ doc:[> `Document] GdomeT.t ->
++ encoding:string ->
++ mode:int ->
++ string = "ml_gdome_di_saveDocumentToMemoryEnc"
++
++let saveDocumentToMemoryEnc ~this ~doc ~encoding ?(indent=false) () =
++ raw_saveDocumentToMemoryEnc ~this ~doc ~encoding ~mode:(if indent then 1 else 0)
++;;
++
+ external enableEvent :
+ this:TDOMImplementation.t ->
+ doc:[> `Document] GdomeT.t ->
+--- gmetadom-0.2.3.orig/src/gdome_caml/iDOMImplementation.mli 2003-09-13 22:14:42.000000000 +0800
++++ gmetadom-0.2.3/src/gdome_caml/iDOMImplementation.mli 2005-11-28 15:38:50.000000000 +0800
+@@ -50,12 +50,22 @@
+ this:TDOMImplementation.t ->
+ doc:[> `Document] GdomeT.t -> name:string ->
+ ?indent:bool -> unit -> bool
++
++val saveDocumentToFileEnc :
++ this:TDOMImplementation.t ->
++ doc:[> `Document] GdomeT.t -> name:string -> encoding:string ->
++ ?indent:bool -> unit -> bool
+
+ val saveDocumentToMemory :
+ this:TDOMImplementation.t ->
+ doc:[> `Document] GdomeT.t ->
+ ?indent:bool -> unit -> string
+
++val saveDocumentToMemoryEnc :
++ this:TDOMImplementation.t ->
++ doc:[> `Document] GdomeT.t -> encoding:string ->
++ ?indent:bool -> unit -> string
++
+ val enableEvent :
+ this:TDOMImplementation.t ->
+ doc:[> `Document] GdomeT.t ->
+--- gmetadom-0.2.3.orig/src/gdome_caml/ml_DOMImplementation.c 2003-09-13 22:14:42.000000000 +0800
++++ gmetadom-0.2.3/src/gdome_caml/ml_DOMImplementation.c 2005-11-28 15:33:51.000000000 +0800
+@@ -143,6 +143,17 @@
+ }
+
+ value
++ml_gdome_di_saveDocumentToFileEnc(value self, value doc, value name, value encoding, value mode)
++{
++ CAMLparam5(self, doc, name, encoding, mode);
++ GdomeException exc_;
++ GdomeBoolean res_;
++ res_ = gdome_di_saveDocToFileEnc(DOMImplementation_val(self), Document_val(doc), String_val(name), String_val(encoding), Int_val(mode), &exc_);
++ if (exc_ != 0) throw_exception(exc_, "DOMImplementation.saveDocToFileEnc");
++ CAMLreturn(Val_bool(res_));
++}
++
++value
+ ml_gdome_di_saveDocumentToMemory(value self, value doc, value mode)
+ {
+ CAMLparam3(self, doc, mode);
+@@ -178,6 +189,42 @@
+ }
+
+ value
++ml_gdome_di_saveDocumentToMemoryEnc(value self, value doc, value encoding, value mode)
++{
++ CAMLparam4(self, doc, encoding, mode);
++ GdomeException exc_;
++ char *c_string = NULL;
++ CAMLlocal1(caml_string);
++ gdome_di_saveDocToMemoryEnc(DOMImplementation_val(self),
++ Document_val(doc),
++ &c_string,
++ String_val(encoding),
++ Int_val(mode),
++ &exc_);
++ /*
++ * ### XXX The buffer returned by gdome_di_saveDocToMemory should
++ * really be freed using a GDome function that calls the free() from
++ * the DOM library that allocated the buffer. For now, just use
++ * free(), since libxml2 normally uses malloc() to allocate the
++ * memory.
++ */
++#define my_free free
++
++ if (exc_ != 0) {
++ if (c_string) {
++ my_free(c_string);
++ }
++ throw_exception(exc_, "DOMImplementation.saveDocToMemoryEnc");
++ }
++ if (!c_string) raise_out_of_memory();
++ caml_string = copy_string(c_string);
++
++ my_free(c_string);
++
++ CAMLreturn(caml_string);
++}
++
++value
+ ml_gdome_di_enableEvent(value self, value doc, value name)
+ {
+ CAMLparam3(self, doc, name);
+--- gmetadom-0.2.3.orig/src/gdome_caml/ocaml/gdome.ml 2005-07-07 17:19:42.000000000 +0800
++++ gmetadom-0.2.3/src/gdome_caml/ocaml/gdome.ml 2005-11-28 15:41:46.000000000 +0800
+@@ -45,8 +45,12 @@
+ method createDocumentFromMemory ~doc ?validatingMode ?keepEntities () = new document (IDOMImplementation.createDocumentFromMemory ~this:obj ~doc:((doc : domString)#as_DOMString) ?validatingMode ?keepEntities ())
+ method saveDocumentToFile ~(doc : document) =
+ IDOMImplementation.saveDocumentToFile ~this:obj ~doc:((doc : document)#as_Document)
++ method saveDocumentToFileEnc ~(doc : document) =
++ IDOMImplementation.saveDocumentToFileEnc ~this:obj ~doc:((doc : document)#as_Document)
+ method saveDocumentToMemory ~(doc : document) =
+ IDOMImplementation.saveDocumentToMemory ~this:obj ~doc:((doc : document)#as_Document)
++ method saveDocumentToMemoryEnc ~(doc : document) =
++ IDOMImplementation.saveDocumentToMemoryEnc ~this:obj ~doc:((doc : document)#as_Document)
+ method enableEvent ~doc ~name = IDOMImplementation.enableEvent ~this:obj ~doc:((doc : document)#as_Document) ~name
+ method disableEvent ~doc ~name = IDOMImplementation.disableEvent ~this:obj ~doc:((doc : document)#as_Document) ~name
+ method eventIsEnabled ~doc ~name = IDOMImplementation.eventIsEnabled ~this:obj ~doc:((doc : document)#as_Document) ~name
+--- gmetadom-0.2.3.orig/src/gdome_caml/ocaml/gdome.mli 2005-07-07 17:54:24.000000000 +0800
++++ gmetadom-0.2.3/src/gdome_caml/ocaml/gdome.mli 2005-11-28 15:44:17.000000000 +0800
+@@ -153,6 +153,17 @@
+ (* [true] if the operation was succesful, [false] otherwise. *)
+ method saveDocumentToFile : doc:document -> name:string -> ?indent:bool -> unit -> bool
+
++ (* Saves an XML [document] to disk. *)
++ (* Parameters: *)
++ (* doc: The XML [document] to be saved. *)
++ (* name: The name of the destination file. *)
++ (* encoding: The name of the encoding. *)
++ (* indent: if true, the document is pretty-printed indenting lines. *)
++ (* The default is to not indent the document. *)
++ (* Result: *)
++ (* [true] if the operation was succesful, [false] otherwise. *)
++ method saveDocumentToFileEnc : doc:document -> name:string -> encoding:string -> ?indent:bool -> unit -> bool
++
+ (* Saves an XML [document] to a string. *)
+ (* Parameters: *)
+ (* doc: The XML [document] to be saved. *)
+@@ -164,6 +175,18 @@
+ (* DOMImplException: if an error occurs during parsing. *)
+ method saveDocumentToMemory : doc:document -> ?indent:bool -> unit -> string
+
++ (* Saves an XML [document] to a string. *)
++ (* Parameters: *)
++ (* doc: The XML [document] to be saved. *)
++ (* encoding: The name of the encoding. *)
++ (* indent: if true, the document is pretty-printed indenting lines. *)
++ (* The default is to not indent the document. *)
++ (* Result: *)
++ (* A new [string] containing the document. *)
++ (* Exceptions Raised: *)
++ (* DOMImplException: if an error occurs during parsing. *)
++ method saveDocumentToMemoryEnc : doc:document -> encoding:string -> ?indent:bool -> unit -> string
++
+ (* Enables a DOM Event. *)
+ (* Parameters: *)
+ (* doc: The XML [document] *)
Added: trunk/packages/gmetadom/trunk/debian/patches/07_careful_inst.dpatch
===================================================================
--- trunk/packages/gmetadom/trunk/debian/patches/07_careful_inst.dpatch 2006-01-07 10:52:27 UTC (rev 2389)
+++ trunk/packages/gmetadom/trunk/debian/patches/07_careful_inst.dpatch 2006-01-07 11:05:15 UTC (rev 2390)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_careful_inst.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/src/gdome_caml/Makefile.am trunk/src/gdome_caml/Makefile.am
+--- trunk~/src/gdome_caml/Makefile.am 2005-07-07 11:48:53.000000000 +0200
++++ trunk/src/gdome_caml/Makefile.am 2006-01-07 12:02:46.000000000 +0100
+@@ -81,10 +81,10 @@
+ fi \
+ done
+ if [ "x$(OCAMLFIND)" != "x" ]; then \
+- mv $(OCAMLINSTALLDIR) $(OCAMLINSTALLDIR).saved; \
+- $(mkinstalldirs) $(DESTDIR)$(OCAML_LIB_PREFIX)/; \
+- $(OCAMLFIND) install -destdir $(DESTDIR)$(OCAML_LIB_PREFIX)/ $(PKGNAME) META $(DLL); \
+- $(INSTALL_DATA) $(OCAMLINSTALLDIR).saved/* $(OCAMLINSTALLDIR)/; \
++ mv $(OCAMLINSTALLDIR) $(OCAMLINSTALLDIR).saved && \
++ $(mkinstalldirs) $(DESTDIR)$(OCAML_LIB_PREFIX)/ && \
++ $(OCAMLFIND) install -destdir $(DESTDIR)$(OCAML_LIB_PREFIX)/ $(PKGNAME) META $(DLL) && \
++ $(INSTALL_DATA) $(OCAMLINSTALLDIR).saved/* $(OCAMLINSTALLDIR)/ && \
+ rm -rf $(OCAMLINSTALLDIR).saved/; \
+ else \
+ $(INSTALL_DATA) $(DLL) $(STUBSDIR); \
Property changes on: trunk/packages/gmetadom/trunk/debian/patches/07_careful_inst.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-ocaml-maint-commits
mailing list