[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. debian/1.4.1-1-1-gca7c20a

[Ralf Treinen]

The following commit has been merged in the master branch:
commit ca7c20a09a4a7d0332fe53950e334e973ccccdae
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon Jun 15 22:08:44 2009 +0200

    fix FTBFS against librpm 4.7

diff --git a/debian/changelog b/debian/changelog
index eae8209..5dafa26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dose2 (1.4.1-2) unstable; urgency=low
+
+  * Remove reference to the lead datastructure from rpm 4.4 (closes: #533165).
+
+ -- Ralf Treinen <treinen at debian.org>  Mon, 15 Jun 2009 22:00:54 +0200
+
 dose2 (1.4.1-1) unstable; urgency=low
 
   * New upstream version
diff --git a/ocamlrpm/ocamlrpm_stubs.c b/ocamlrpm/ocamlrpm_stubs.c
index e02bd0d..a3c5da3 100644
--- a/ocamlrpm/ocamlrpm_stubs.c
+++ b/ocamlrpm/ocamlrpm_stubs.c
@@ -782,9 +782,7 @@ value ocamlrpm_read_package (value locale, value file_name)
 {
 	FD_t fd;
 	Header header;
-#if RPM_FORMAT_VERSION < 5
-	struct rpmlead lead;
-#endif 
+
 	CAMLparam2 (locale, file_name);
 	CAMLlocal1 (retval);
 
@@ -792,11 +790,6 @@ value ocamlrpm_read_package (value locale, value file_name)
 	if (!fd)
 		caml_failwith (strerror (errno));
 
-#if RPM_FORMAT_VERSION < 5
-	readLead (fd, &lead);
-	rpmReadSignature (fd, NULL, lead.signature_type);
-	header = headerRead (fd, lead.major >= 3 ? HEADER_MAGIC_YES : HEADER_MAGIC_NO);
-#endif
 	retval = ocamlize_header (header, String_val (locale));	
 	fdClose (fd);
 	CAMLreturn (retval);

-- 
dose2 packaging