[Pkg-ocaml-maint-commits] [dose3] 01/01: fix FTBFS with librpm 4.12

[Ralf Treinen]

This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch master
in repository dose3.

commit f7c5a0d797435b36e477dd2463cd7672cfb2c70f
Author: Ralf Treinen <treinen at pps.univ-paris-diderot.fr>
Date:   Tue Jun 23 14:14:15 2015 +0200

    fix FTBFS with librpm 4.12
---
 debian/changelog           |  5 ++++-
 debian/control             |  2 +-
 debian/patches/librpm-4.12 | 35 +++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a81c415..38067fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ dose3 (3.3-4) UNRELEASED; urgency=medium
 
   * update patch binaries-prefix-edos: fix name of dose-deb-coinstall
     (closes: #789331).
+  * patch librpm-4.12: Fix FTBFS with librpm-dev 4.12. Patch extracted
+    from upstream git, commit 1d0ed0a. Bump build-dependency on librpm-dev
+    to >= 4.12 (closes: #789354).
 
- -- Ralf Treinen <treinen at debian.org>  Sun, 21 Jun 2015 19:04:16 +0200
+ -- Ralf Treinen <treinen at debian.org>  Tue, 23 Jun 2015 14:12:19 +0200
 
 dose3 (3.3-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 6c292f1..9a64924 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7.0.50~), dh-ocaml (>= 0.9~),
  libextlib-ocaml-dev,
  libocamlgraph-ocaml-dev (>= 1.8.5),
  libcudf-ocaml-dev (>= 0.7),
- libzip-ocaml-dev, libbz2-ocaml-dev, librpm-dev (>= 4.8),
+ libzip-ocaml-dev, libbz2-ocaml-dev, librpm-dev (>= 4.12),
  perl, graphviz, hevea, texlive-latex-base, texlive-latex-extra
 Standards-Version: 3.9.6
 Homepage: http://www.mancoosi.org/software/
diff --git a/debian/patches/librpm-4.12 b/debian/patches/librpm-4.12
new file mode 100644
index 0000000..7fdd782
--- /dev/null
+++ b/debian/patches/librpm-4.12
@@ -0,0 +1,35 @@
+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 5614a8f..32c4176 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ coinstall-binary-name
 cudfSolver-fix-leaking-fds
 encode-package-name-in-cudf_extras
 remove_src_prefix_from_name
+librpm-4.12

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git