[Pkg-ocaml-maint-commits] [SCM] galax packaging branch, master, updated. debian/1.1-7-3-g40f32c7
The following commit has been merged in the master branch: commit 40f32c721f8fc13d7447b76bd241334d8e4aff43 Author: Stephane Glondu Date: Fri Jul 22 09:29:55 2011 +0200 Add d/s/local-options and .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..845ca06 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.pc 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 -- galax 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
[Pkg-ocaml-maint-commits] [SCM] galax packaging branch, master, updated. debian/1.1-7-3-g40f32c7
The following commit has been merged in the master branch: commit ae3fe0e28ebd0ea22a562d197c3dd43997fbf124 Author: Stephane Glondu Date: Fri Jul 22 09:18:01 2011 +0200 Fix build with ocamlnet 3.3.5 (not backward-compatible) diff --git a/debian/control b/debian/control index 696ed7c..a48d023 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: autotools-dev, camlp4, libpcre-ocaml-dev, - libocamlnet-ocaml-dev (>= 2.2.9-6~), + libocamlnet-ocaml-dev (>= 3.3.5), libpxp-ocaml-dev (>= 1.2.1-1~), libcamomile-ocaml-dev, hevea, diff --git a/debian/patches/0006-Compile-with-ocamlnet-3.3.5.patch b/debian/patches/0006-Compile-with-ocamlnet-3.3.5.patch new file mode 100644 index 000..b40130d --- /dev/null +++ b/debian/patches/0006-Compile-with-ocamlnet-3.3.5.patch @@ -0,0 +1,23 @@ +From: Stephane Glondu +Date: Fri, 22 Jul 2011 09:17:18 +0200 +Subject: Compile with ocamlnet 3.3.5 + +Signed-off-by: Stephane Glondu +--- + config/Makefile.galax |2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/config/Makefile.galax b/config/Makefile.galax +index f465ace..7c0bdb0 100644 +--- a/config/Makefile.galax b/config/Makefile.galax +@@ -1254,7 +1254,7 @@ str.cma \ + bigarray.cma \ + pcre.cma + ifeq ($(CONF_WITH_NETSYS), true) +-OCAML_LIBS+=netsys.cma ++OCAML_LIBS+=netsys_oothr.cma netsys.cma + endif + OCAML_LIBS+=\ + netstring.cma \ +-- diff --git a/debian/patches/series b/debian/patches/series index 02b4ec6..41987cf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 0003-port-code-to-build-against-PXP-1.2.patch 0004-fix-syntax-errors-in-ocamldoc-tags.patch 0005-Fix-some-typos.patch +0006-Compile-with-ocamlnet-3.3.5.patch -- galax 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
[Pkg-ocaml-maint-commits] [SCM] galax packaging branch, master, updated. debian/1.1-7-3-g40f32c7
The following commit has been merged in the master branch: commit afc1f4445519180834de8147f9064e8caa467a00 Author: Stephane Glondu Date: Fri Jul 22 09:17:43 2011 +0200 Refresh patches 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 index 8378396..29c7b64 100644 --- 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 @@ -1,6 +1,6 @@ From: Stefano Zacchiroli Date: Tue, 6 Oct 2009 22:43:58 +0200 -Subject: [PATCH] add a (empty) BUGS document as it is sourced by other TeX files +Subject: add a (empty) BUGS document as it is sourced by other TeX files --- BUGS |1 + diff --git a/debian/patches/0002-Make-OCaml-version-requirement-a-lower-bound.patch b/debian/patches/0002-Make-OCaml-version-requirement-a-lower-bound.patch index f02dd4a..93247a7 100644 --- a/debian/patches/0002-Make-OCaml-version-requirement-a-lower-bound.patch +++ b/debian/patches/0002-Make-OCaml-version-requirement-a-lower-bound.patch @@ -1,6 +1,6 @@ From: Stephane Glondu Date: Tue, 18 May 2010 17:54:37 +0200 -Subject: [PATCH] Make OCaml version requirement a lower bound +Subject: Make OCaml version requirement a lower bound --- configure |2 +- diff --git a/debian/patches/0003-port-code-to-build-against-PXP-1.2.patch b/debian/patches/0003-port-code-to-build-against-PXP-1.2.patch index a6cda9f..a1dc291 100644 --- a/debian/patches/0003-port-code-to-build-against-PXP-1.2.patch +++ b/debian/patches/0003-port-code-to-build-against-PXP-1.2.patch @@ -1,6 +1,6 @@ From: Stefano Zacchiroli Date: Tue, 6 Oct 2009 22:45:20 +0200 -Subject: [PATCH] port code to build against PXP 1.2 +Subject: port code to build against PXP 1.2 --- base/encoding.ml |8 diff --git a/debian/patches/0004-fix-syntax-errors-in-ocamldoc-tags.patch b/debian/patches/0004-fix-syntax-errors-in-ocamldoc-tags.patch index a611475..c6d628e 100644 --- a/debian/patches/0004-fix-syntax-errors-in-ocamldoc-tags.patch +++ b/debian/patches/0004-fix-syntax-errors-in-ocamldoc-tags.patch @@ -1,6 +1,6 @@ From: Stefano Zacchiroli Date: Wed, 7 Oct 2009 09:12:53 +0200 -Subject: [PATCH] fix syntax errors in ocamldoc @tags +Subject: fix syntax errors in ocamldoc @tags --- streaming/sax_annot.mli |4 ++-- diff --git a/debian/patches/0005-Fix-some-typos.patch b/debian/patches/0005-Fix-some-typos.patch index 6043687..916d3a9 100644 --- a/debian/patches/0005-Fix-some-typos.patch +++ b/debian/patches/0005-Fix-some-typos.patch @@ -1,6 +1,6 @@ From: Stephane Glondu Date: Tue, 18 May 2010 21:44:10 +0200 -Subject: [PATCH] Fix some typos +Subject: Fix some typos Submitted upstream. --- -- galax 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
