[Pkg-ocaml-maint-commits] [dose3] 04/05: dropped old patches, refreshed remaining patches
Ralf Treinen
treinen at moszumanska.debian.org
Sat Apr 23 15:44:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch experimental/master
in repository dose3.
commit 01b2d3092bd9ec6fae2bc6b3599b98a421b87b0e
Author: Ralf Treinen <treinen at pps.univ-paris-diderot.fr>
Date: Sat Apr 23 17:16:43 2016 +0200
dropped old patches, refreshed remaining patches
---
debian/changelog | 3 +-
debian/patches/add-gnuhardened1-linux | 15 --------
debian/patches/cudfSolver-fix-leaking-fds | 21 -----------
debian/patches/lexing-debian-fields | 62 -------------------------------
debian/patches/librpm-4.12 | 35 -----------------
debian/patches/series | 3 --
6 files changed, 2 insertions(+), 137 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1ebb60d..c525e62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
dose3 (4.3-1) experimental; urgency=medium
* New upstream version.
+ * Drop patch lexing-debian-fields: applied upstream
- -- Ralf Treinen <treinen at debian.org> Sat, 23 Apr 2016 17:12:57 +0200
+ -- Ralf Treinen <treinen at debian.org> Sat, 23 Apr 2016 17:16:26 +0200
dose3 (4.2-2) unstable; urgency=medium
diff --git a/debian/patches/add-gnuhardened1-linux b/debian/patches/add-gnuhardened1-linux
deleted file mode 100644
index 6cee4c5..0000000
--- a/debian/patches/add-gnuhardened1-linux
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Balint Reczey <balint at balintreczey.hu>
-Description: add support for hardened1-linux-amd64
-Debian-bug: 812786
-Upstream-commit: 21fe9e264454323c3fe917bbbe95da5d6adf777b
-
---- a/deb/architecture.ml
-+++ b/deb/architecture.ml
-@@ -52,6 +52,7 @@
- (("gnuabi64","linux","mips64"), "mips64"); (* line 15 *)
- (("gnuspe","linux","powerpc"), "powerpcspe");
- (("gnux32","linux","amd64"), "x32");
-+ (("gnuhardened1","linux","<cpu>"), "hardened1-linux-<cpu>");
- (("gnu","linux","<cpu>"), "<cpu>");
- (("gnu","kfreebsd","<cpu>"), "kfreebsd-<cpu>");
- (("gnu","knetbsd","<cpu>"), "knetbsd-<cpu>"); (* line 20 *)
diff --git a/debian/patches/cudfSolver-fix-leaking-fds b/debian/patches/cudfSolver-fix-leaking-fds
deleted file mode 100644
index 346d8b4..0000000
--- a/debian/patches/cudfSolver-fix-leaking-fds
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Johannes Schauer <josch at debian.org>
-Description: cudfSolver.ml: workaround for libcudf fd leak:
- https://gforge.inria.fr/tracker/index.php?func=detail&aid=18789&group_id=4385&atid=13811
-Origin: commit:73a6c13b73b37efa084686673c6948b653fde01f
-
-diff --git a/common/cudfSolver.ml b/common/cudfSolver.ml
-index a33aa7e..46c86cd 100644
---- a/common/cudfSolver.ml
-+++ b/common/cudfSolver.ml
-@@ -132,9 +132,8 @@ let execsolver exec_pat criteria cudf =
- raise Unsat
- else
- try begin
-- let cudf_parser = Cudf_parser.from_file solver_out in
-- Sys.remove solver_in; Sys.remove solver_out ;
-- try Cudf_parser.load_solution cudf_parser universe with
-+ let f p = Cudf_parser.load_solution_from_file p universe in
-+ try finally (fun () -> Sys.remove solver_in; Sys.remove solver_out) f solver_out with
- |Cudf_parser.Parse_error _
- |Cudf.Constraint_violation _ ->
- fatal "(CRASH) Solution file contains an invalid solution"
diff --git a/debian/patches/lexing-debian-fields b/debian/patches/lexing-debian-fields
deleted file mode 100644
index b7648d0..0000000
--- a/debian/patches/lexing-debian-fields
+++ /dev/null
@@ -1,62 +0,0 @@
-Author: Pietro Abate <pietro.abate at pps.univ-paris-diderot.fr>
-Description: Parsing Debian field names: accept any characters that are
- authorized by Debian Policy
-Debian-bug: 811569
-Upstream-commit: 24d2fa5f924e2159b3e395adfbbf5bcde4ee7e91
-
-Index: dose3/common/format822_lexer.mll
-===================================================================
---- dose3.orig/common/format822_lexer.mll 2016-01-30 15:10:19.296935779 +0100
-+++ dose3/common/format822_lexer.mll 2016-01-30 15:10:19.296935779 +0100
-@@ -12,6 +12,17 @@
- (* library, see the COPYING file for more information. *)
- (*****************************************************************************)
-
-+(*
-+Debian Policy : https://www.debian.org/doc/debian-policy/ch-controlfields.html
-+
-+Each paragraph consists of a series of data fields. Each field consists of the
-+field name followed by a colon and then the data/value associated with that
-+field. The field name is composed of US-ASCII characters excluding control
-+characters, space, and colon (i.e., characters in the ranges 33-57 and 59-126,
-+inclusive). Field names must not begin with the comment character, #, nor with
-+the hyphen character, -.
-+*)
-+
- {
- open Format822_parser
-
-@@ -29,19 +40,20 @@
- let letter = lower_letter | upper_letter
- let digit = [ '0' - '9' ]
- let blank = [ ' ' '\t' ]
--let ident = (letter | digit | '-')+
-+let ident = ( [ '!' - '9'] | [';' - '~' ] )+
-+let identnosharphypen = ( '!' | '"' | [ '$' - ',' ] | [ '.' - '9'] | [';' - '~' ] )
-+(* conform to the Debian Policy *)
-+let fieldname = (identnosharphypen ident)
-
- rule token_822 = parse
-- | "-----BEGIN PGP SIGNED MESSAGE-----" { PGPHEAD }
-- | "-----BEGIN PGP SIGNATURE-----" { pgpsignature lexbuf }
-- | (ident as field) ':' blank*
-- ([^'\n']* as rest) { FIELD(field, (get_range lexbuf, rest)) }
-- | blank ([^'\n']* as rest) { CONT(get_range lexbuf, rest) }
--(* | '#' [^'\n']* ('\n'|eof) { token_822 lexbuf } *)
-- | blank* '\n' { Lexing.new_line lexbuf; BLANKLINE }
-- | eof { EOF }
-- | _ as c { raise_error lexbuf c }
-+ | "-----BEGIN PGP SIGNED MESSAGE-----" { PGPHEAD }
-+ | "-----BEGIN PGP SIGNATURE-----" { pgpsignature lexbuf }
-+ | '#' [^'\n']* ('\n'|eof) { token_822 lexbuf }
-+ | (fieldname as field) ':' blank* ([^'\n']* as rest) { FIELD(field, (get_range lexbuf, rest)) }
-+ | blank ([^'\n']* as rest) { CONT(get_range lexbuf, rest) }
-+ | blank* '\n' { Lexing.new_line lexbuf; BLANKLINE }
-+ | eof { EOF }
-+ | _ as c { raise_error lexbuf c }
- and pgpsignature = parse
-- | "-----END PGP SIGNATURE-----" { token_822 lexbuf }
-- | _ { pgpsignature lexbuf }
--
-+ | "-----END PGP SIGNATURE-----" { token_822 lexbuf }
-+ | _ { pgpsignature lexbuf }
diff --git a/debian/patches/librpm-4.12 b/debian/patches/librpm-4.12
deleted file mode 100644
index 7fdd782..0000000
--- a/debian/patches/librpm-4.12
+++ /dev/null
@@ -1,35 +0,0 @@
-Author: Pietro Abate <pietro.abate at pps.jussieu.fr>
-Description: Fix 'RPMTAG_SUGGESTSNAME' undeclared with librpm 4.12
-Debian-bug: #78935
-
-Index: dose3/rpm/librpm4_stubs.c
-===================================================================
---- dose3.orig/rpm/librpm4_stubs.c 2015-06-23 14:08:04.862539087 +0200
-+++ dose3/rpm/librpm4_stubs.c 2015-06-23 14:08:04.854539012 +0200
-@@ -218,12 +218,12 @@
- tl = append(hd,tl);
-
- k = caml_copy_string("Suggests");
-- v = get_deps(h,RPMTAG_SUGGESTSNAME);
-+ v = get_deps(h,RPMTAG_SUGGESTNAME);
- hd = tuple(k,list_variant_D(v));
- tl = append(hd,tl);
-
- k = caml_copy_string("Enhances");
-- v = get_deps(h,RPMTAG_ENHANCESNAME);
-+ v = get_deps(h,RPMTAG_ENHANCENAME);
- hd = tuple(k,list_variant_D(v));
- tl = append(hd,tl);
-
-Index: dose3/rpm/version.ml
-===================================================================
---- dose3.orig/rpm/version.ml 2015-06-23 14:08:04.862539087 +0200
-+++ dose3/rpm/version.ml 2015-06-23 14:08:04.854539012 +0200
-@@ -13,6 +13,7 @@
- (** compare epoch:version-release strings *)
- (* external rpmEVRcmp : string -> string -> int = "rpm_EVRcmp" *)
- module Str = Re_str
-+open Common
-
- (** compare only version strings *)
- external rpmvercmp : string -> string -> int = "rpm_vercmp"
diff --git a/debian/patches/series b/debian/patches/series
index c3339dc..44a42d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
binaries-prefix-edos
-# librpm-4.12
disable_dot
-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
More information about the Pkg-ocaml-maint-commits
mailing list