Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package virt-top

This fixes RC bug #973188 which causes FTBFS, and a lintian error on
missing OCaml depednencies.

I was misuploading this package without --delay, then I reupload the
package into DELAYED/2 queue.

[ Reason ]
 - Fixes FTBFS bug (#973188), by removing --runtime-variant _pic from
   OCAMLCLIBS
 - Add missing dependencies

[ Impact ]
This package would be blocked from release if not accepted.

[ Tests ]
This package was failed to build.  If removing --runtime-variant _pic,
it could build but with Lintian error on missing OCaml dependencies.

Both fixes are added in order to build without Lintian error.

Also manually tested the package and used virt-manager to control the
VM, virt-top correctly reflected the status of the virtual machines.

[ Risks ]
There should be minimal risks by introducing this changeset.

unblock virt-top/1.0.9-1.1
diff -Nru virt-top-1.0.9/debian/changelog virt-top-1.0.9/debian/changelog
--- virt-top-1.0.9/debian/changelog     2019-08-25 22:27:13.000000000 +0800
+++ virt-top-1.0.9/debian/changelog     2021-04-24 19:57:06.000000000 +0800
@@ -1,3 +1,12 @@
+virt-top (1.0.9-1.1) unstable; urgency=medium
+
+  * Non-maintainer Upload
+  * debian/patches/ocamlclibs-no-runtime-variant.patch: Do not supply
+    runtime-variant (Closes: #973188)
+  * debian/control: Fix missing dependencies
+
+ -- Yao Wei (魏銘廷) <m...@debian.org>  Sat, 24 Apr 2021 19:57:06 +0800
+
 virt-top (1.0.9-1) unstable; urgency=medium
 
   * Team upload
diff -Nru virt-top-1.0.9/debian/control virt-top-1.0.9/debian/control
--- virt-top-1.0.9/debian/control       2019-08-25 22:27:13.000000000 +0800
+++ virt-top-1.0.9/debian/control       2021-04-24 19:57:06.000000000 +0800
@@ -20,7 +20,11 @@
 
 Package: virt-top
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ocaml-base-nox | ocaml-base | ocaml-nox | ocaml,
+         libcurses-ocaml,
+         libgettext-ocaml,
+         libvirt-ocaml,
+         ${misc:Depends}, ${shlibs:Depends}
 Description: show stats of virtualized domains
  virt-top is a top-like utility for showing stats of virtualized domains. Many
  keys and command line options are the same as for ordinary top.
diff -Nru virt-top-1.0.9/debian/patches/ocamlclibs-no-runtime-variant.patch 
virt-top-1.0.9/debian/patches/ocamlclibs-no-runtime-variant.patch
--- virt-top-1.0.9/debian/patches/ocamlclibs-no-runtime-variant.patch   
1970-01-01 08:00:00.000000000 +0800
+++ virt-top-1.0.9/debian/patches/ocamlclibs-no-runtime-variant.patch   
2021-04-24 19:57:06.000000000 +0800
@@ -0,0 +1,21 @@
+From: =?utf-8?b?IllhbyBXZWkgKOmtj+mKmOW7tyki?= <m...@debian.org>
+Date: Sat, 24 Apr 2021 19:23:41 +0800
+Subject: Do not supply runtime-variant (Closes: #973188)
+
+---
+ src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index a2ac09b..a2a8883 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -65,7 +65,7 @@ OBJS         += main.cmo
+ XOBJS         := $(OBJS:.cmo=.cmx)
+ 
+ OCAMLCFLAGS   := -g -warn-error CDEFLMPSUVYZX-3 -ccopt '@CFLAGS@'
+-OCAMLCLIBS    := -linkpkg -runtime-variant _pic -cclib '@LDFLAGS@'
++OCAMLCLIBS    := -linkpkg -cclib '@LDFLAGS@'
+ 
+ OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
+ OCAMLOPTFLAGS := $(OCAMLCFLAGS)
diff -Nru virt-top-1.0.9/debian/patches/series 
virt-top-1.0.9/debian/patches/series
--- virt-top-1.0.9/debian/patches/series        2019-08-25 22:27:13.000000000 
+0800
+++ virt-top-1.0.9/debian/patches/series        2021-04-24 19:57:06.000000000 
+0800
@@ -1,2 +1,3 @@
 10_add-opt-and-byte-compile-targets.patch
 libvirt-Handle-VIR_DOMAIN_PMSUSPENDED-state.patch
+ocamlclibs-no-runtime-variant.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to