This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch master
in repository dose3.
commit 3bab9cd83b5eea3d53d550ac3d13ac51984612b5
Author: Ralf Treinen <trei...@free.fr>
Date: Sun Oct 16 15:34:15 2016 +0200
accept input from xz-files
---
debian/changelog | 9 ++++++--
debian/control | 6 ++---
debian/patches/input-xz-files | 54 +++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 65 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a02e9b1..c87e091 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-dose3 (5.0.1-2) UNRELEASED; urgency=medium
+dose3 (5.0.1-2) unstable; urgency=medium
+ [ Johannes Schauer ]
* Backport more commits from upstream to fix remaining bugs considering
- the handling of Essential:yes packages:
0003-applications-distcheck.ml-Consider-essential-package.patch
@@ -10,7 +11,11 @@ dose3 (5.0.1-2) UNRELEASED; urgency=medium
0005-algo-depsolver.ml-reset-progress-bar-after-univcheck.patch
0006-algo-depsolver.ml-set-correct-value-for-Util.Progres.patch
- -- Johannes Schauer <jo...@debian.org> Sun, 16 Oct 2016 12:26:59 +0200
+ [ Ralf Treinen ]
+ * Patch input-xz-files: accept input from xz-compressed files.
+ Add dependency on xz-utils.
+
+ -- Ralf Treinen <trei...@debian.org> Sun, 16 Oct 2016 19:36:29 +0200
dose3 (5.0.1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index afcab9e..c4ffada 100644
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,7 @@ Description: OCaml libraries for package dependencies
(runtime files)
Package: dose-distcheck
Section: devel
Architecture: any
-Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}, xz-utils
Breaks: dose3-distcheck (<< 2.9.13)
Replaces: dose3-distcheck (<< 2.9.13)
Description: Checks whether dependencies of packages can be satisfied
@@ -78,7 +78,7 @@ Description: Checks whether dependencies of packages can be
satisfied
Package: dose-builddebcheck
Section: devel
Architecture: any
-Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}, xz-utils
Breaks: dose3-builddebcheck (<< 2.9.13)
Replaces: dose3-builddebcheck (<< 2.9.13)
Description: Checks whether build-dependencies can be satisfied
@@ -93,7 +93,7 @@ Architecture: any
Provides: ceve
Breaks: ceve (<< 2.9.10)
Replaces: ceve (<< 2.9.10)
-Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}, xz-utils
Description: Extra QA tools from the Dose3-library
This package contains extra tools for analyzing meta-data of software
packages:
diff --git a/debian/patches/input-xz-files b/debian/patches/input-xz-files
new file mode 100644
index 0000000..d4cf5b0
--- /dev/null
+++ b/debian/patches/input-xz-files
@@ -0,0 +1,54 @@
+Author: Ralf Treinen <trei...@debian.org>
+Description: Accept input from xz-compressed files
+
+diff --git a/common/input.ml b/common/input.ml
+index 9bd639b..49f8fc4 100644
+--- a/common/input.ml
++++ b/common/input.ml
+@@ -29,7 +29,16 @@ let gzip_open_file file =
+ fatal "gzip not supported. re-configure with --with-zip"
+ #endif
+ ;;
+-
++
++let xz_open_file file =
++ let ch = Unix.open_process_in ("xzcat "^ file) in
++ let read ch = try input ch with End_of_file -> raise IO.No_more_input in
++ IO.create_in
++ ~read:(fun () -> input_char ch)
++ ~input:(read ch)
++ ~close:(fun () -> close_in ch)
++;;
++
+ let bzip_open_file file =
+ #ifdef HASBZ2
+ (* workaround to avoid segfault :
+@@ -85,7 +94,7 @@ let open_file file =
+ | 0x37 -> (match input_byte ch with
+ | 0x7a -> (match input_byte ch with
+ | 0x58 -> (match input_byte ch with
+- | 0x5a -> fatal "xz not supported."
++ | 0x5a -> xz_open_file
+ | _ -> std_open_file)
+ | _ -> std_open_file)
+ | _ -> std_open_file)
+diff --git a/doc/manpages/distcheck.pod b/doc/manpages/distcheck.pod
+index 4361cf9..8985b62 100644
+--- a/doc/manpages/distcheck.pod
++++ b/doc/manpages/distcheck.pod
+@@ -231,13 +231,13 @@ B<opam>
+ =item .
+
+ B<deb> for Debian binary package files, also known as Packages files. Possibly
+-compressed with L<gzip(1)> or L<bzip2(1)>, depending on compile-time options
++compressed with L<gzip(1)>, L<bzip2(1)> or L<xz(1)>, depending on
compile-time options
+ for dose3.
+
+ =item .
+
+ B<debsrc> for Debian source package files, also knows as Sources files.
+-Possibly compressed with L<gzip(1)> or L<bzip2(1)>, depending on compile-time
++Possibly compressed with L<gzip(1)>, L<bzip2(1)> or L<xz>(1), depending on
compile-time
+ options for dose3.
+
+ =item .
diff --git a/debian/patches/series b/debian/patches/series
index 2aea94f..ecef88b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ binaries-prefix-edos
0006-algo-depsolver.ml-set-correct-value-for-Util.Progres.patch
0007-applications-deb-buildcheck.ml-fix-regression-that-l.patch
0008-Catch-expection-in-diagnostic.ml.patch
+input-xz-files
--
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
