[Pkg-ocaml-maint-commits] [SCM] galax packaging branch, master, updated. debian/1.1-5-8-gdc44214
Stefano Zacchiroli
zack at upsilon.cc
Tue Oct 6 21:16:32 UTC 2009
The following commit has been merged in the master branch:
commit 82ce40061c5ae185569efafe10a34d0d6dc0f8fb
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date: Tue Oct 6 22:47:17 2009 +0200
switch to dh 7
debian/patches: port from dpatch to quilt for compatibility with dh7
diff --git a/debian/changelog b/debian/changelog
index 0bea4f3..a6db69c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,8 @@ galax (1.1-6) UNRELEASED; urgency=low
* debian/rules
- switch to dh_ocamldoc for API reference generation, stop relying on
ocamldoc-api-ref-config, which is gone (Closes: #549850)
- - switch {debhelper,dpatch}.mk: fix debian/*.log cleanup
+ - switch to dh 7
+ * debian/patches: port from dpatch to quilt (for dh 7 compatibility)
-- Stefano Zacchiroli <zack at debian.org> Tue, 06 Oct 2009 19:48:16 +0200
diff --git a/debian/control b/debian/control
index 36b89d5..60f45a1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,8 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Stefano Zacchiroli <zack at debian.org>
Build-Depends:
debhelper (>= 7),
- cdbs,
dh-ocaml,
- dpatch,
+ quilt,
ocaml-nox,
camlp4,
libpcre-ocaml-dev,
diff --git a/debian/galaxd.install b/debian/galaxd.install
index b768906..5b656fe 100644
--- a/debian/galaxd.install
+++ b/debian/galaxd.install
@@ -1,3 +1,3 @@
debian/tmp/usr/bin/galaxd usr/bin/
-debian/tmp/usr/bin/zerod usr/bin/
-debian/tmp/usr/bin/webgui usr/bin/
+debian/tmp/usr/bin/galax-zerod usr/bin/
+debian/tmp/usr/bin/galax-webgui usr/bin/
diff --git a/debian/patches/0001-add-a-empty-BUGS-document-as-it-is-sourced-by-other-.patch b/debian/patches/0001-add-a-empty-BUGS-document-as-it-is-sourced-by-other-.patch
new file mode 100644
index 0000000..8378396
--- /dev/null
+++ b/debian/patches/0001-add-a-empty-BUGS-document-as-it-is-sourced-by-other-.patch
@@ -0,0 +1,17 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Tue, 6 Oct 2009 22:43:58 +0200
+Subject: [PATCH] add a (empty) BUGS document as it is sourced by other TeX files
+
+---
+ BUGS | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+ create mode 100644 BUGS
+
+diff --git a/BUGS b/BUGS
+new file mode 100644
+index 0000000..8b13789
+--- /dev/null
++++ b/BUGS
+@@ -0,0 +1 @@
++
+--
diff --git a/debian/patches/0002-bump-expected-OCaml-version-to-3.11.patch b/debian/patches/0002-bump-expected-OCaml-version-to-3.11.patch
new file mode 100644
index 0000000..be48820
--- /dev/null
+++ b/debian/patches/0002-bump-expected-OCaml-version-to-3.11.patch
@@ -0,0 +1,22 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Tue, 6 Oct 2009 22:44:43 +0200
+Subject: [PATCH] bump expected OCaml version to 3.11
+
+---
+ configure | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 9a7fa2b..65863bd 100755
+--- a/configure
++++ b/configure
+@@ -18,7 +18,7 @@
+ # value 2: on by command line ("forced")
+
+ version="1.0"
+-ocaml_version="3.10"
++ocaml_version="3.11"
+ # Function: print_options()
+ # Description:
+ # Print the current values of all options
+--
diff --git a/debian/patches/build-pxp-1.2.dpatch b/debian/patches/0003-port-code-to-build-against-PXP-1.2.patch
old mode 100755
new mode 100644
similarity index 58%
rename from debian/patches/build-pxp-1.2.dpatch
rename to debian/patches/0003-port-code-to-build-against-PXP-1.2.patch
index 1ba0d74..a6cda9f
--- a/debian/patches/build-pxp-1.2.dpatch
+++ b/debian/patches/0003-port-code-to-build-against-PXP-1.2.patch
@@ -1,14 +1,20 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ocaml-3.11.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: port code to build against PXP 1.2
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Tue, 6 Oct 2009 22:45:20 +0200
+Subject: [PATCH] port code to build against PXP 1.2
- at DPATCH@
-diff -urNad galax~/base/encoding.ml galax/base/encoding.ml
---- galax~/base/encoding.ml 2008-07-19 22:21:07.000000000 +0200
-+++ galax/base/encoding.ml 2009-03-19 12:20:38.942492094 +0100
-@@ -131,14 +131,14 @@
+---
+ base/encoding.ml | 8 ++++----
+ regress/test_core.ml | 4 ++--
+ schema/schema_dtd_import.ml | 2 +-
+ schema/schema_import.mlp | 2 +-
+ streaming/streaming_parse.ml | 2 --
+ 5 files changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/base/encoding.ml b/base/encoding.ml
+index 270ec14..e9fa43f 100644
+--- a/base/encoding.ml
++++ b/base/encoding.ml
+@@ -131,14 +131,14 @@ let pxp_fix_write_data_string ~(from_enc:rep_encoding) ~to_enc os content =
let write_ascii s =
(* Write the ASCII-encoded string 's' *)
let s' = convert_ascii s in
@@ -25,7 +31,7 @@ diff -urNad galax~/base/encoding.ml galax/base/encoding.ml
else begin
let s' = Netconversion.recode_string
~in_enc:(from_enc :> encoding)
-@@ -147,7 +147,7 @@
+@@ -147,7 +147,7 @@ let pxp_fix_write_data_string ~(from_enc:rep_encoding) ~to_enc os content =
convert_ascii ("&#" ^ string_of_int n ^ ";"))
(String.sub content j l)
in
@@ -34,7 +40,7 @@ diff -urNad galax~/base/encoding.ml galax/base/encoding.ml
end
in
let i = ref 0 in
-@@ -197,6 +197,6 @@
+@@ -197,6 +197,6 @@ let character enc k =
try
Pxp_aux.character enc global_warner k
with
@@ -42,10 +48,11 @@ diff -urNad galax~/base/encoding.ml galax/base/encoding.ml
+ | Pxp_types.WF_error msg ->
raise (Query (Undefined msg))
-diff -urNad galax~/regress/test_core.ml galax/regress/test_core.ml
---- galax~/regress/test_core.ml 2008-07-19 22:21:07.000000000 +0200
-+++ galax/regress/test_core.ml 2009-03-19 12:28:41.646448174 +0100
-@@ -732,7 +732,7 @@
+diff --git a/regress/test_core.ml b/regress/test_core.ml
+index 590fa6e..6f4e95d 100644
+--- a/regress/test_core.ml
++++ b/regress/test_core.ml
+@@ -732,7 +732,7 @@ let compare_xml case output_file result compared_plan =
let expected_stream = typed_stream_of_io (File_Input output_file) in
compare_streams case output_file result_stream expected_stream compared_plan
with
@@ -54,7 +61,7 @@ diff -urNad galax~/regress/test_core.ml galax/regress/test_core.ml
if !(Conf.genresults)
then
begin
-@@ -755,7 +755,7 @@
+@@ -755,7 +755,7 @@ let compare_plan case output_file result compared_plan =
let expected_stream = typed_stream_of_io (File_Input output_file) in
compare_streams case output_file result_stream expected_stream compared_plan
with
@@ -63,9 +70,10 @@ diff -urNad galax~/regress/test_core.ml galax/regress/test_core.ml
if !(Conf.genresults)
then
begin
-diff -urNad galax~/schema/schema_dtd_import.ml galax/schema/schema_dtd_import.ml
---- galax~/schema/schema_dtd_import.ml 2008-07-19 22:21:07.000000000 +0200
-+++ galax/schema/schema_dtd_import.ml 2009-03-19 12:23:55.478444056 +0100
+diff --git a/schema/schema_dtd_import.ml b/schema/schema_dtd_import.ml
+index 9515b8f..5724516 100644
+--- a/schema/schema_dtd_import.ml
++++ b/schema/schema_dtd_import.ml
@@ -15,7 +15,7 @@
This module imports a DTD as a set of XML Schema declarations.
*)
@@ -75,10 +83,11 @@ diff -urNad galax~/schema/schema_dtd_import.ml galax/schema/schema_dtd_import.ml
open Pxp_dtd
open Error
-diff -urNad galax~/schema/schema_import.mlp galax/schema/schema_import.mlp
---- galax~/schema/schema_import.mlp 2008-07-19 22:21:07.000000000 +0200
-+++ galax/schema/schema_import.mlp 2009-03-19 12:15:47.310444622 +0100
-@@ -1075,7 +1075,7 @@
+diff --git a/schema/schema_import.mlp b/schema/schema_import.mlp
+index 80a03bb..83ef705 100644
+--- a/schema/schema_import.mlp
++++ b/schema/schema_import.mlp
+@@ -1075,7 +1075,7 @@ let global_simpleType ims = parser
end
let global_notation ims = parser
@@ -87,10 +96,11 @@ diff -urNad galax~/schema/schema_import.mlp galax/schema/schema_import.mlp
let global_attribute ims = parser
| [< (ims,atts,fi) = open_tag ims "attribute";
-diff -urNad galax~/streaming/streaming_parse.ml galax/streaming/streaming_parse.ml
---- galax~/streaming/streaming_parse.ml 2008-07-19 22:21:07.000000000 +0200
-+++ galax/streaming/streaming_parse.ml 2009-03-19 12:22:43.691238705 +0100
-@@ -130,8 +130,6 @@
+diff --git a/streaming/streaming_parse.ml b/streaming/streaming_parse.ml
+index 4248eaf..3a49684 100644
+--- a/streaming/streaming_parse.ml
++++ b/streaming/streaming_parse.ml
+@@ -130,8 +130,6 @@ let rec map_event fi_ref c pp event =
Some (fmkse_event (SAX_characters (make_text_desc data)) (!fi_ref))
| E_pinstr (target,value,entid) ->
Some (fmkse_event (SAX_processingInstruction (make_pi_desc target value)) (!fi_ref))
@@ -99,3 +109,4 @@ diff -urNad galax~/streaming/streaming_parse.ml galax/streaming/streaming_parse.
| E_comment content ->
Some (fmkse_event (SAX_comment (make_comment_desc content)) (!fi_ref))
(* Silently ignoring super root event *)
+--
diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf
deleted file mode 100644
index 685acc6..0000000
--- a/debian/patches/00dpatch.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../tarballs
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 70277b9..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-missing-BUGS-doc.dpatch
-build-ocaml-3.11.dpatch
-build-pxp-1.2.dpatch
diff --git a/debian/patches/build-ocaml-3.11.dpatch b/debian/patches/build-ocaml-3.11.dpatch
deleted file mode 100755
index 29fd798..0000000
--- a/debian/patches/build-ocaml-3.11.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ocaml-3.11.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: bump expected OCaml version to 3.11
-
- at DPATCH@
-diff -urNad galax~/configure galax/configure
---- galax~/configure 2008-07-19 22:21:07.000000000 +0200
-+++ galax/configure 2009-03-19 11:57:34.010444044 +0100
-@@ -18,7 +18,7 @@
- # value 2: on by command line ("forced")
-
- version="1.0"
--ocaml_version="3.10"
-+ocaml_version="3.11"
- # Function: print_options()
- # Description:
- # Print the current values of all options
diff --git a/debian/patches/missing-BUGS-doc.dpatch b/debian/patches/missing-BUGS-doc.dpatch
deleted file mode 100755
index 5e57a80..0000000
--- a/debian/patches/missing-BUGS-doc.dpatch
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## missing-BUGS-doc.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add a (empty) BUGS document as it is sourced by other TeX files
-
- at DPATCH@
-diff -urNad trunk~/BUGS trunk/BUGS
---- trunk~/BUGS 1970-01-01 01:00:00.000000000 +0100
-+++ trunk/BUGS 2008-03-26 16:15:43.000000000 +0100
-@@ -0,0 +1 @@
-+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8ee46cb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-add-a-empty-BUGS-document-as-it-is-sourced-by-other-.patch
+0002-bump-expected-OCaml-version-to-3.11.patch
+0003-port-code-to-build-against-PXP-1.2.patch
diff --git a/debian/rules b/debian/rules
index 9dfb6f8..3290b5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,65 +1,47 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
-
-PKGNAME = galax
-DEB_MAKE_BUILD_TARGET = world
- # $(LN) override so that we only install the best binary, instead of both .opt
- # and .byte together with the best symlink
-DEB_MAKE_INSTALL_TARGET = install LN=cp DESTDIR=$(CURDIR)/debian/tmp
-ifeq ($(OCAML_HAVE_OCAMLOPT),no)
-DEB_STRIP_EXCLUDE += usr/bin
-DEB_DH_GENCONTROL_ARGS += -VF:OCamlInterp="ocaml-base-nox-$(OCAML_ABI)"
-endif
-
-DEB_DH_INSTALL_ARGS += -XCVS -Xlicense.tex
-DEB_COMPRESS_EXCLUDE = .pdf
-
-# configuration flags (incrementally defined)
-CFGFLAGS =
-# FHS integration
-CFGFLAGS += -galax-camllib $(OCAML_STDLIB_DIR)/galax
-CFGFLAGS += -galax-home /usr
-CFGFLAGS += -galax-lib /usr/lib/galax
-CFGFLAGS += -galax-usecases /usr/share/doc/galax/usecases
-CFGFLAGS += -galax-regress /usr/share/doc/galax/regress
-CFGFLAGS += -galax-examples /usr/share/doc/galax/examples
-CFGFLAGS += -galax-config /usr/share/doc/galax/config
-CFGFLAGS += -galax-man /usr/share/man
-# features
-CFGFLAGS += -with-galaxd
-
-configure/$(PKGNAME):: debian/configure-stamp
-debian/configure-stamp:
- ./configure $(CFGFLAGS)
- # prefix installation directories with $(DESTDIR)
+include /usr/share/ocaml/ocamlvars.mk
+
+%:
+ dh --with quilt,ocaml $@
+
+override_dh_auto_configure:
+ ./configure -galax-camllib $(OCAML_STDLIB_DIR)/galax \
+ -galax-camllib $(OCAML_STDLIB_DIR)/galax -galax-home /usr \
+ -galax-lib /usr/lib/galax -galax-man /usr/share/man \
+ -galax-usecases /usr/share/doc/galax/usecases \
+ -galax-regress /usr/share/doc/galax/regress \
+ -galax-examples /usr/share/doc/galax/examples \
+ -galax-config /usr/share/doc/galax/config -with-galaxd
sed -i 's:^\(CONF_GALAX_\w\+\)=/:\1=$$(DESTDIR)/:' config/Makefile.conf
- touch debian/configure-stamp
-clean::
- rm -f debian/configure-stamp
-# fix wrong permissions (+x) on some .mli files
-binary-post-install/libgalax-ocaml-dev::
- chmod 644 debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/galax/*.mli
-# avoid cluttering usr/bin with too generic names
-binary-post-install/galaxd::
- mv debian/$(cdbs_curpkg)/usr/bin/zerod \
- debian/$(cdbs_curpkg)/usr/bin/galax-zerod
- mv debian/$(cdbs_curpkg)/usr/bin/webgui \
- debian/$(cdbs_curpkg)/usr/bin/galax-webgui
-
-build/galax-doc:: debian/galax-doc-stamp
-# ensure library part is installed before dh_ocamldoc is invoked on it
-debian/galax-doc-stamp: binary-install/libgalax-ocaml-dev
-debian/galax-doc-stamp:
+override_dh_auto_build:
+ $(MAKE) world
$(MAKE) -C doc/ manual.pdf manual.html
- touch $@
-clean::
- rm -f debian/galax-doc-stamp
# remove .depend created during clean as they cause FTBFSs with -rsudo
-clean::
+override_dh_auto_clean:
+ $(MAKE) clean
rm -f .depend tools/escaping/.depend tools/ucs2_to_utf8/.depend
+override_dh_auto_install:
+ # $(LN) override so that we only install the best binary, instead of
+ # both .opt and .byte together with the best symlink
+ $(MAKE) install LN=cp DESTDIR=$(CURDIR)/debian/tmp
+ # fix wrong permissions (+x) on some .mli files
+ chmod 644 debian/tmp$(OCAML_STDLIB_DIR)/galax/*.mli
+ # avoid cluttering usr/bin with too generic names
+ cp debian/tmp/usr/bin/zerod debian/tmp/usr/bin/galax-zerod
+ cp debian/tmp/usr/bin/webgui debian/tmp/usr/bin/galax-webgui
+
+ifeq ($(OCAML_HAVE_OCAMLOPT),no)
+override_dh_strip:
+ dh_strip -Xusr/bin
+override_dh_gencontrol:
+ dh_gencontrol -VF:OCamlInterp="ocaml-base-nox-$(OCAML_ABI)"
+endif
+
+override_dh_install:
+ dh_install -XCVS -Xlicense.tex
+override_dh_compress:
+ dh_compress -X.pdf
+
--
galax packaging
More information about the Pkg-ocaml-maint-commits
mailing list