This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch experimental/master
in repository dose3.
commit 6a500091007589487b7a7edc65fa74065bb81976
Author: Ralf Treinen <trei...@free.fr>
Date: Tue Feb 9 20:56:27 2016 +0100
new upstream 4.2
---
debian/changelog | 14 +++++++++-
debian/patches/binaries-prefix-edos | 44 +++++++++++++++----------------
debian/patches/cudf_max_int | 31 ----------------------
debian/patches/disable_dot | 8 +++---
debian/patches/fix_META | 12 ---------
debian/patches/fix_ftbfs_on_bytecode_arch | 11 --------
debian/patches/series | 3 ---
7 files changed, 39 insertions(+), 84 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 60a8336..8ea6a6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+dose3 (4.2-1) UNRELEASED; urgency=medium
+
+ * New upstream version:
+ - refreshed patches:
+ * binaries-prefix-edos
+ * disable_dot
+ - dropped patches integrated by upstream:
+ * fix_ftbfs_on_bytecode_arch
+ * fix_META
+ * cudf_max_int
+
+ -- Ralf Treinen <trei...@debian.org> Tue, 09 Feb 2016 21:31:47 +0100
+
dose3 (4.1-4) unstable; urgency=medium
* patch lexing-debian-fields: syntax of debian fields according to
@@ -37,7 +50,6 @@ dose3 (4.1-1) unstable; urgency=medium
* configure: explicit --bindir and --libdir
-- Ralf Treinen <trei...@debian.org> Thu, 07 Jan 2016 18:49:53 +0100
->>>>>>> master
dose3 (4.1~beta1-1) experimental; urgency=medium
diff --git a/debian/patches/binaries-prefix-edos
b/debian/patches/binaries-prefix-edos
index df84775..512885c 100644
--- a/debian/patches/binaries-prefix-edos
+++ b/debian/patches/binaries-prefix-edos
@@ -3,8 +3,8 @@ Description: all binaries have prefix dose-
Index: dose3/doc/manpages/distcheck.pod
===================================================================
---- dose3.orig/doc/manpages/distcheck.pod 2015-12-24 14:48:23.552855492
+0100
-+++ dose3/doc/manpages/distcheck.pod 2015-12-24 14:48:23.548855473 +0100
+--- dose3.orig/doc/manpages/distcheck.pod 2016-02-09 21:01:27.251169260
+0100
++++ dose3/doc/manpages/distcheck.pod 2016-02-09 21:04:51.788085555 +0100
@@ -1,25 +1,25 @@
=head1 NAME
@@ -48,15 +48,15 @@ Index: dose3/doc/manpages/distcheck.pod
containing the input. The package metadata found in that file must
correspond to the I<type> given in the URI.
--When invoked as I<typeB<check>> then the type of input is assumed to
-+When invoked as I<B<dose->typeB<check>> then the type of input is assumed to
- be I<type>, and repositories (in positional arguments or in the values of
- options B<--fg> and B<--bg>) are simply given in form of a pathname of a file
+-When invoked as I<typeB<check>> then the type of input is assumed to be
++When invoked as I<B<dose->typeB<check>> then the type of input is assumed to
be
+ I<type>, and repositories (in positional arguments or in the values of options
+ B<--fg> and B<--bg>) are simply given in form of a pathname of a file
containing the repository. If no positional argument is given then input is
--read from standard input. B<distcheck> also compressed files (.gz , .bz2) as
-+read from standard input. B<dose-distcheck> also compressed files (.gz ,
.bz2) as
- positional arguments. Input read on standard input cannot be in compressed
- form.
+-read from standard input. B<distcheck> also accepts compressed files (.gz ,
++read from standard input. B<dose-distcheck> also accepts compressed files
(.gz ,
+ .bz2) as positional arguments. Input read on standard input cannot be in
+ compressed form.
@@ -62,7 +62,7 @@
The input file has to contain stanzas in the format
@@ -94,11 +94,11 @@ Index: dose3/doc/manpages/distcheck.pod
project.
=cut
-Index: dose3/doc/manpages/buildcheck.pod
+Index: dose3/doc/manpages/deb-buildcheck.pod
===================================================================
---- dose3.orig/doc/manpages/buildcheck.pod 2015-12-24 14:48:23.552855492
+0100
-+++ dose3/doc/manpages/buildcheck.pod 2015-12-24 14:48:23.548855473 +0100
-@@ -283,7 +283,7 @@
+--- dose3.orig/doc/manpages/deb-buildcheck.pod 2016-02-09 21:01:27.251169260
+0100
++++ dose3/doc/manpages/deb-buildcheck.pod 2016-02-09 21:01:27.251169260
+0100
+@@ -284,7 +284,7 @@
=head1 SEE ALSO
L<B<deb-control>(5)>,
@@ -109,8 +109,8 @@ Index: dose3/doc/manpages/buildcheck.pod
<http://www.mancoosi.org> is the home page of the Mancoosi project.
Index: dose3/doc/manpages/outdated.pod
===================================================================
---- dose3.orig/doc/manpages/outdated.pod 2015-12-24 14:48:23.552855492
+0100
-+++ dose3/doc/manpages/outdated.pod 2015-12-24 14:48:23.548855473 +0100
+--- dose3.orig/doc/manpages/outdated.pod 2016-02-09 21:01:27.251169260
+0100
++++ dose3/doc/manpages/outdated.pod 2016-02-09 21:01:27.251169260 +0100
@@ -1,16 +1,16 @@
=head1 NAME
@@ -162,8 +162,8 @@ Index: dose3/doc/manpages/outdated.pod
Index: dose3/doc/manpages/challenged.pod
===================================================================
---- dose3.orig/doc/manpages/challenged.pod 2015-12-24 14:48:23.552855492
+0100
-+++ dose3/doc/manpages/challenged.pod 2015-12-24 14:48:23.548855473 +0100
+--- dose3.orig/doc/manpages/challenged.pod 2016-02-09 21:01:27.251169260
+0100
++++ dose3/doc/manpages/challenged.pod 2016-02-09 21:01:27.251169260 +0100
@@ -1,19 +1,19 @@
=head1 NAME
@@ -225,8 +225,8 @@ Index: dose3/doc/manpages/challenged.pod
Index: dose3/doc/manpages/debcoinstall.pod
===================================================================
---- dose3.orig/doc/manpages/debcoinstall.pod 2015-12-24 14:48:23.552855492
+0100
-+++ dose3/doc/manpages/debcoinstall.pod 2015-12-24 14:48:23.548855473
+0100
+--- dose3.orig/doc/manpages/debcoinstall.pod 2016-02-09 21:01:27.251169260
+0100
++++ dose3/doc/manpages/debcoinstall.pod 2016-02-09 21:01:27.251169260
+0100
@@ -1,19 +1,19 @@
=head1 NAME
@@ -268,8 +268,8 @@ Index: dose3/doc/manpages/debcoinstall.pod
--fg essential > essential_coinstall_src
Index: dose3/doc/manpages/ceve.pod
===================================================================
---- dose3.orig/doc/manpages/ceve.pod 2015-12-24 14:48:23.552855492 +0100
-+++ dose3/doc/manpages/ceve.pod 2015-12-24 14:48:23.548855473 +0100
+--- dose3.orig/doc/manpages/ceve.pod 2016-02-09 21:01:27.251169260 +0100
++++ dose3/doc/manpages/ceve.pod 2016-02-09 21:01:27.251169260 +0100
@@ -1,18 +1,18 @@
=head1 NAME
diff --git a/debian/patches/cudf_max_int b/debian/patches/cudf_max_int
deleted file mode 100644
index 0d90661..0000000
--- a/debian/patches/cudf_max_int
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/common/cudfAdd.ml
-+++ b/common/cudfAdd.ml
-@@ -140,6 +140,8 @@
- let l = (f false fields)@(f true default_fields) in
- (decode p,decode v,l)
-
-+let max32int = if Int32.to_int(Int32.max_int) < 0 then max_int else
Int32.to_int(Int32.max_int);;
-+
- let pp_vpkg pp fmt vpkg =
- let string_of_relop = function
- `Eq -> "="
-@@ -154,7 +156,7 @@
- let (p,_,_) =
- pp {Cudf.default_package with
- Cudf.package = p ;
-- version = Int32.to_int(Int32.max_int)}
-+ version = max32int}
- in
- Format.fprintf fmt "%s" p
- |(p,Some(c,v)) ->
---- a/deb/debcudf.ml
-+++ b/deb/debcudf.ml
-@@ -27,7 +27,7 @@
- let label = __label ;;
- include Util.Logging(struct let label = label end) ;;
-
--let max32int = Int32.to_int(Int32.max_int);;
-+let max32int = if Int32.to_int(Int32.max_int) < 0 then max_int else
Int32.to_int(Int32.max_int);;
-
- module SMap = Map.Make (String)
-
diff --git a/debian/patches/disable_dot b/debian/patches/disable_dot
index 1b82686..113b783 100644
--- a/debian/patches/disable_dot
+++ b/debian/patches/disable_dot
@@ -1,10 +1,10 @@
Index: dose3/Makefile
===================================================================
---- dose3.orig/Makefile 2016-01-07 18:38:09.663420357 +0100
-+++ dose3/Makefile 2016-01-07 18:38:34.951509185 +0100
-@@ -253,7 +253,7 @@
+--- dose3.orig/Makefile 2016-02-09 21:10:52.221693890 +0100
++++ dose3/Makefile 2016-02-09 21:10:52.221693890 +0100
+@@ -264,7 +264,7 @@
doc: all
- $(OCAMLBUILD) -package unix scripts/pack.native
+ $(OCAMLBUILD) -package unix scripts/pack.$(OCAMLEXT)
scripts/doc.sh $(OCAMLEXT)
- dot -Grotate=0 -Tsvg -o dose3.docdir/index.svg dose3.docdir/index.dot
+ #dot -Grotate=0 -Tsvg -o dose3.docdir/index.svg dose3.docdir/index.dot
diff --git a/debian/patches/fix_META b/debian/patches/fix_META
deleted file mode 100644
index 9d11359..0000000
--- a/debian/patches/fix_META
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/META.in
-+++ b/META.in
-@@ -1,7 +1,7 @@
- description = "Dose3 libraries"
- version = "@PACKAGE_VERSION@"
--archive(byte) = "common.cma algo.cma versioning.cma debian.cma csw.cma
pef.cma"
--archive(native) = "common.cmxa algo.cmxa versioning.cmxa debian.cmxa csw.cmxa
pef.cmxa"
-+archive(byte) = "common.cma algo.cma versioning.cma pef.cma debian.cma
csw.cma"
-+archive(native) = "common.cmxa algo.cmxa versioning.cmxa pef.cmxa debian.cmxa
csw.cmxa"
- requires = "extlib, re.pcre, cudf, @OCAMLGRAPH@, unix, @ZIP@, @BZ2@"
-
- package "common" (
diff --git a/debian/patches/fix_ftbfs_on_bytecode_arch
b/debian/patches/fix_ftbfs_on_bytecode_arch
deleted file mode 100644
index 3874187..0000000
--- a/debian/patches/fix_ftbfs_on_bytecode_arch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -251,7 +251,7 @@
- @git log --pretty=format:'%aN %aE' | LC_ALL=C sort -u | awk
-F'\t' '{printf("\t%s <%s>\n",$$1,$$2)}';
-
- doc: all
-- $(OCAMLBUILD) -package unix scripts/pack.native
-+ $(OCAMLBUILD) -package unix scripts/pack.$(OCAMLEXT)
- scripts/doc.sh $(OCAMLEXT)
- #dot -Grotate=0 -Tsvg -o dose3.docdir/index.svg dose3.docdir/index.dot
- (cd doc && $(MAKE) all)
diff --git a/debian/patches/series b/debian/patches/series
index fbaade7..c3339dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
binaries-prefix-edos
# librpm-4.12
disable_dot
-fix_ftbfs_on_bytecode_arch
-fix_META
-cudf_max_int
lexing-debian-fields
add-gnuhardened1-linux
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git
_______________________________________________
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
