[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. upstream/0.20090401-111-ga2a0a5c
Stefano Zacchiroli
zack at upsilon.cc
Sat Nov 14 11:57:30 UTC 2009
The following commit has been merged in the master branch:
commit 2f73c2f098d67be62d054e1c8e0001dc013b2e19
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date: Sat Nov 14 12:48:01 2009 +0100
move away from TopGit to dom-{save,apply}-patches
- update README.source to reflect this change
- debian/rules: get rit of TopGit .mk snippet
- rename patches to follow dom-save-patches naming convention
diff --git a/.gitignore b/.gitignore
index 4639a88..a846b6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-debian/patches/
*~
_build
Makefile
diff --git a/debian/README.source b/debian/README.source
index d7700f2..c6b5225 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -5,10 +5,9 @@ This source package uses quilt to apply and remove its patches. Please
refer to `/usr/share/doc/quilt/README.source' for information about
how to use quilt for source packages.
-The quilt series is generated from the Git repository, using TopGit
-(from the `topgit' Debian package). This process is documented in
-`/usr/share/doc/topgit/HOWTO-tg2quilt.gz'.
+The quilt series is generated from the Git repository, using
+dom-{apply,save}-patches, from the dh-ocaml (>= 0.5) package. Please
+refer to the appendix about Git in the Debian OCaml Packaging Policy
+(from the same package).
-The branch layout is those described in the aforementioned document.
-
- -- Stefano Zacchiroli <zack at debian.org>, Wed, 1 Apr 2009 15:55:50 +0200
+ -- Stefano Zacchiroli <zack at debian.org>, Sat, 14 Nov 2009 12:47:28 +0100
diff --git a/debian/changelog b/debian/changelog
index e8c51c9..c9674ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ocaml-batteries (0.20090405+beta1-4) UNRELEASED; urgency=low
+
+ * Get rid of TopGit for packaging, use dom-{save,apply}-patches to
+ manage quilt series. Document that in README.source. Patch names are
+ now as follows:
+ - 0001-debian-specific-installation-paths
+ - 0002-debian-specific-info-on-doc-availability
+
+ -- Stefano Zacchiroli <zack at debian.org> Sat, 14 Nov 2009 12:45:12 +0100
+
ocaml-batteries (0.20090405+beta1-3) unstable; urgency=low
* debian/control
diff --git a/debian/patches/0001-debian-specific-installation-paths.patch b/debian/patches/0001-debian-specific-installation-paths.patch
new file mode 100644
index 0000000..8977d24
--- /dev/null
+++ b/debian/patches/0001-debian-specific-installation-paths.patch
@@ -0,0 +1,22 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Sat, 14 Nov 2009 12:49:57 +0100
+Subject: [PATCH] debian-specific installation paths
+
+Patch batteries toolchain command wrappers to rely on
+`ocamlc -where`/batteries/ as the installation place where the
+wrappers will be available upon installation.
+
+Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
+---
+ src/batteries_toolchain/ocaml.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/batteries_toolchain/ocaml.in b/src/batteries_toolchain/ocaml.in
+index 002fd04..2d8e9f0 100755
+--- a/src/batteries_toolchain/ocaml.in
++++ b/src/batteries_toolchain/ocaml.in
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-"@DESTDIR@/batteries/toplevel.top" "@DESTDIR@/batteries/top.ml" $@
++"@OCAMLLIBDIR@/batteries/toplevel.top" "@OCAMLLIBDIR@/batteries/top.ml" $@
+--
diff --git a/debian/patches/0002-debian-specific-info-on-doc-availability.patch b/debian/patches/0002-debian-specific-info-on-doc-availability.patch
new file mode 100644
index 0000000..554499a
--- /dev/null
+++ b/debian/patches/0002-debian-specific-info-on-doc-availability.patch
@@ -0,0 +1,71 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Sat, 14 Nov 2009 12:50:41 +0100
+Subject: [PATCH] debian-specific info on doc availability
+
+Provides Debian-specific info on how to install the documentation (needed for
+
+Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
+---
+ src/batteries_toolchain/batteries_help.ml | 32 ++++++++++++++++++++++------
+ 1 files changed, 25 insertions(+), 7 deletions(-)
+
+diff --git a/src/batteries_toolchain/batteries_help.ml b/src/batteries_toolchain/batteries_help.ml
+index be9696f..08aa133 100644
+--- a/src/batteries_toolchain/batteries_help.ml
++++ b/src/batteries_toolchain/batteries_help.ml
+@@ -108,6 +108,17 @@ let append_to_table table k v =
+ in
+ RefList.push found v
+
++let debian_doc_hint_warn =
++ "Warning: help will not be available, because Batteries documentation\n"
++ ^ "is not installed.\n"
++
++let debian_doc_hint_req =
++ "You have requested Batteries-specific help, but Batteries documentation\n"
++ ^ "is not installed.\n"
++
++let debian_doc_hint_inst =
++ "To fix this: please install the `libbatteries-ocaml-doc' Debian package\n"
++ ^ "(which ships Batteries documentation and its indexes) and try again.\n"
+
+ (**
+ {6 Browsing}
+@@ -204,12 +215,16 @@ let get_table =
+ result
+
+ with e ->
+- Printf.eprintf
+- "While initializing the on-line help, error in root doc file %S\n%s\n%!" root_file
+- (Printexc.to_string e);
+- let result = {suggestions = Hashtbl.create 0; completions = Hashtbl.create 0} in
+- Hashtbl.add tables kind result;
+- result
++ let result = {suggestions = Hashtbl.create 0; completions = Hashtbl.create 0} in
++ Hashtbl.add tables kind result;
++ (match e with
++ | Sys_error msg when String.ends_with msg "No such file or directory" ->
++ Printf.eprintf "%s%s%!" debian_doc_hint_warn debian_doc_hint_inst
++ | e ->
++ Printf.eprintf
++ "While initializing the on-line help, error in root doc file %S\n%s\n%!" root_file
++ (Printexc.to_string e));
++ result
+
+
+
+@@ -365,9 +380,12 @@ let helpers =
+
+ (**Launch the introductory help text.*)
+ let help () =
++ try
+ File.with_file_in (Batteries_config.documentation_root ^ "/toplevel.help")
+ (fun file -> copy file stdout);
+- flush stdout;;
++ flush stdout
++ with Sys_error msg when String.ends_with msg "No such file or directory" ->
++ Printf.eprintf "%s%s%!" debian_doc_hint_req debian_doc_hint_inst
+
+ (**Print the signature of a module.*)
+ let print_module name =
+--
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4838d1b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-debian-specific-installation-paths.patch
+0002-debian-specific-info-on-doc-availability.patch
diff --git a/debian/rules b/debian/rules
index c77bf95..6e73895 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,11 @@ include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/ocaml.mk
--include /usr/share/topgit/tg2quilt.mk
LIB_NAME = batteries
DEV_PKG_NAME = lib$(LIB_NAME)-ocaml-dev
DOC_PKG_NAME = lib$(LIB_NAME)-ocaml-doc
DEST_DIR = $(CURDIR)/debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)
-QUILT_PATCH_DIR ?= debian/patches # can be removed once #513952 gets fixed
DEB_AUTO_UPDATE_AUTOCONF = yes
OCAMLBUILD_FLAGS = -classic-display
--
ocaml-batteries packaging
More information about the Pkg-ocaml-maint-commits
mailing list