[Pkg-ocaml-maint-commits] [virt-top] 02/02: Import Debian patch 1.0.8-1
Guido Guenther
agx at moszumanska.debian.org
Fri Dec 23 16:39:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
agx pushed a commit to annotated tag debian/1.0.8-1
in repository virt-top.
commit 4aa7f4603cf2790a7abce4c5b0853495b84d4f75
Merge: 5f9ccd2 08fb2a0
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Sun Dec 18 00:43:49 2016 -0200
Import Debian patch 1.0.8-1
ChangeLog | 45 ++++
Make.rules.in | 18 +-
aclocal.m4 | 7 +-
configure | 236 +++++++++++----------
configure.ac | 2 +-
debian/README.source | 5 -
debian/changelog | 46 ++++
debian/clean | 8 +
debian/compat | 2 +-
debian/control | 49 +++--
debian/copyright | 58 ++---
debian/docs | 1 +
debian/install | 1 +
debian/lintian-overrides | 2 +
...h => 10_add-opt-and-byte-compile-targets.patch} | 0
debian/patches/20_fix-FTBFS-with-OCaml.patch | 21 ++
debian/patches/series | 3 +-
debian/rules | 23 +-
debian/source/format | 1 +
debian/watch | 5 +-
virt-top/.depend | 24 +--
virt-top/virt-top.1 | 98 ++++++++-
virt-top/virt-top.pod | 115 +++++++++-
virt-top/virt-top.txt | 78 ++++++-
virt-top/virt_top.ml | 92 ++++++--
virt-top/virt_top_main.ml | 38 +++-
26 files changed, 723 insertions(+), 255 deletions(-)
diff --cc debian/changelog
index a44f509,0000000..3f012cb
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,82 -1,0 +1,128 @@@
++virt-top (1.0.8-1) unstable; urgency=medium
++
++ * New upstream release.
++ * New co-maintainer.
++ * Ack for NMUs. (Closes: #789614, #809681)
++ * Migrations:
++ - debian/copyright to 1.0 format.
++ - debian/rules to (new) reduced format.
++ - DebSrc to 3.0.
++ - DH level to 10.
++ - Dropped CDBS.
++ - Using dh-autoreconf now.
++ * debian/clean: added to remove some files forgotten after the clean process.
++ * debian/control:
++ - Bumped relationship minimum version for libvirt-ocaml-dev to
++ '>= 0.6.1.4', needed by virt-top 1.0.8.
++ - Bumped Standards-Version to 3.9.8.
++ - Changed Priority from extra to optional.
++ - Improved the long description.
++ - Removed deprecated field DM-Upload-Allowed.
++ - Removed a MIA co-maintainer.
++ - Removed the unneeded minimal version from relationship for dh-ocaml
++ build dependency, because all current versions in Debian, since
++ old-old-stable, are newer.
++ - Removed the unneeded variable ${ocaml:Depends} from the binary.
++ - Updated the Vcs-* fields.
++ * debian/docs: added to install the TODO file.
++ * debian/install: created to install the main binary.
++ * debian/lintian-overrides: created to override a false positive.
++ * debian/README.source: obsolete. Removed.
++ * debian/watch: bumped to version 4.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org> Sun, 18 Dec 2016 00:43:49 -0200
++
++virt-top (1.0.7-1.1) unstable; urgency=medium
++
++ * Non-maintainer upload.
++ * Added the debian/patches/0005-fix-FTBFS-with-OCaml.patch to fix a FTBFS
++ with OCaml 4.02.2. Thanks to Stéphane Glondu <glondu at debian.org>.
++ (Closes: #789614)
++ * Bumped Standards-Version to 3.9.6.
++ * New upstream homepage. (Closes: #809681)
++ * Updated the debian/watch file to use the new upstream source place.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org> Sat, 02 Jan 2016 16:25:03 -0200
++
+virt-top (1.0.7-1) unstable; urgency=low
+
+ * [01344ee] Imported Upstream version 1.0.7
+ * [0eb6b4e] Drop patch
+ - 0002-Ensure-manpages-get-built-when-using-native-compiler.patch - fixed
+ upstream
+ * [32b2702] Bump libvirt-ocaml-dev build dependency version to 0.6.1.1
+ * [f0aee95] Bump Standards-Version to 3.9.3
+ * [87aa69d] Change maintainer to Debian Libvirt Maintainers
+
+ -- Laurent Léonard <laurent at open-minds.org> Sun, 22 Apr 2012 00:05:27 +0200
+
+virt-top (1.0.6-1) unstable; urgency=low
+
+ * [7c3e6a1] Imported Upstream version 1.0.6
+ * [f0a771b] Redo patch
+ * [6629856] Bump Standards-Version to 3.9.2
+ * [930eafd] New patch 0002-Ensure-manpages-get-built-when-using-native-
+ compiler.patch
+
+ -- Laurent Léonard <laurent at open-minds.org> Mon, 15 Aug 2011 23:19:06 +0200
+
+virt-top (1.0.5-1) unstable; urgency=low
+
+ * [ba445bb] Imported Upstream version 1.0.5
+ * [aa3c6e8] Remove debian/docs
+ * [93caddc] Bump Standards-Version to 3.9.1
+
+ -- Laurent Léonard <laurent at open-minds.org> Wed, 16 Feb 2011 10:26:08 +0100
+
+virt-top (1.0.4-2) unstable; urgency=low
+
+ * [9ed2d18] Add build dependency on libextlib-ocaml-dev. (Closes:
+ #573651)
+ * [8ed549b] Bump Standards-Version to 3.8.4.
+
+ -- Laurent Léonard <laurent at open-minds.org> Sat, 13 Mar 2010 23:24:12 +0100
+
+virt-top (1.0.4-1) unstable; urgency=low
+
+ [ Sylvain Le Gall ]
+ * New upstream release
+ * Use dh-ocaml features
+
+ [ Laurent Léonard ]
+ * [ace531c] Imported Upstream version 1.0.4
+ * [99145f2] Clean debian/rules.
+ * [3baed57] Allow DM upload and add myself as uploader.
+ * [ae48bd8] Redo patch 0001-add-opt-and-byte-compile-targets.patch.
+
+ -- Guido Günther <agx at sigxcpu.org> Sat, 26 Dec 2009 17:05:14 +0100
+
+virt-top (1.0.2-2+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add dh-ocaml build-dependency (rules/ocaml.mk)
+
+ -- Sylvain Le Gall <gildor at debian.org> Fri, 20 Mar 2009 12:52:49 +0100
+
+virt-top (1.0.2-2) unstable; urgency=low
+
+ [ Guido Guenther ]
+ * [a7cbb9d] fix build dependencies
+
+ -- Guido Guenther <agx at sigxcpu.org> Sat, 02 Aug 2008 03:15:55 +0200
+
+virt-top (1.0.2-1) unstable; urgency=low
+
+ * [ef74dca] new upstream version 1.0.2
+ * [0ea43a3] adjust add-opt-and-byte targets patch to new upstream version
+ * [7f39818] debian/rules: remove files generated during build
+ * [86fdc8b] debian/rules: add redo-patches target
+ * [9088360] add watch file
+
+ -- Guido Guenther <agx at sigxcpu.org> Wed, 23 Jul 2008 18:00:03 -0400
+
+virt-top (1.0.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #453955)
+
+ -- Guido Guenther <agx at sigxcpu.org> Fri, 27 Jun 2008 19:51:55 +0200
+
diff --cc debian/clean
index 0000000,0000000..ec1ff7b
new file mode 100644
--- /dev/null
+++ b/debian/clean
@@@ -1,0 -1,0 +1,8 @@@
++config.guess
++config.guess.cdbs-orig
++config.sub
++config.sub.cdbs-orig
++Make.rules
++po/Makefile
++virt-top/virt_top_gettext.ml
++virt-top/virt_top_version.ml
diff --cc debian/compat
index 7f8f011,0000000..f599e28
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++10
diff --cc debian/control
index c96766c,0000000..14e060f
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,33 -1,0 +1,32 @@@
+Source: virt-top
+Section: admin
- Priority: extra
++Priority: optional
+Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
- Uploaders: Guido Günther <agx at sigxcpu.org>, Laurent Léonard <laurent at open-minds.org>
- Build-Depends: cdbs,
- debhelper (>= 7),
- autotools-dev,
- ocaml-nox,
- ocaml-findlib,
- quilt,
- libvirt-ocaml-dev (>= 0.6.1.1),
- libcurses-ocaml-dev,
- libcsv-ocaml-dev,
- libgettext-ocaml-dev,
- libxml-light-ocaml-dev,
- dh-ocaml (>= 0.9.1),
- libextlib-ocaml-dev
- Standards-Version: 3.9.3
- Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/virt-top.git
- Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/virt-top.git
- Homepage: http://et.redhat.com/~rjones/virt-top/
- DM-Upload-Allowed: yes
++Uploaders: Guido Guenther <agx at debian.org>,
++ Joao Eriberto Mota Filho <eriberto at debian.org>
++Build-Depends: debhelper (>= 10),
++ dh-autoreconf,
++ dh-ocaml,
++ libcsv-ocaml-dev,
++ libcurses-ocaml-dev,
++ libextlib-ocaml-dev,
++ libgettext-ocaml-dev,
++ libvirt-ocaml-dev (>= 0.6.1.4),
++ libxml-light-ocaml-dev,
++ ocaml-findlib,
++ ocaml-nox
++Standards-Version: 3.9.8
++Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/virt-top.git
++Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/virt-top.git
++Homepage: http://people.redhat.com/~rjones/virt-top
+
+Package: virt-top
+Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}, ${ocaml:Depends}
++Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: show stats of virtualized domains
- virt-top is modelled after the "ordinary" top utility and many keys and
- command line options are the same.
++ 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.
+ .
- It uses libvirt so it capable of showing stats across a variety of
- different virtualization systems.
++ It uses libvirt so it capable of showing stats across a variety of different
++ virtualization systems (virtual machines or VM). Some supported systems are
++ KVM, XEN and QEMU.
diff --cc debian/copyright
index 3d49735,0000000..2d01e58
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,25 -1,0 +1,33 @@@
- This package was debianized by Guido Guenther <agx at sigxcpu.org> on
- Fri, 27 Jun 2008 19:51:55 +0200.
-
- It was downloaded from http://et.redhat.com/~rjones/virt-top/files/
-
- Upstream Author:
-
- Richard W.M. Jones <rjones at redhat.com>
-
- Copyright:
-
- Copyright (C) 2007 Red Hat Inc., Richard W.M. Jones
-
- License:
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- On Debian Systems, the full text of the license can be found on
- /usr/share/common-licenses/GPL-2
-
- The Debian packaging is (C) 2008, Guido Guenther <agx at sigxcpu.org> and
- is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: Virt-top
++Upstream-Contact: Richard W.M. Jones <rjones at redhat.com>
++Source: https://people.redhat.com/~rjones/virt-top
++
++Files: *
++Copyright: 2007-2009 Red Hat Inc.
++ 2007-2012 Richard W.M. Jones <rjones at redhat.com>
++License: GPL-2+
++
++Files: debian/*
++Copyright: 2008-2009 Guido Guenther <agx at debian.org>
++ 2009 Sylvain Le Gall <gildor at debian.org>
++ 2009-2012 Laurent Léonard <laurent at open-minds.org>
++ 2016 Joao Eriberto Mota Filho <eriberto at debian.org>
++License: GPL-2+
++
++License: GPL-2+
++ This package is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++ .
++ This package is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++ .
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <https://www.gnu.org/licenses/>
++ .
++ On Debian systems, the complete text of the GNU General
++ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --cc debian/docs
index 0000000,0000000..1333ed7
new file mode 100644
--- /dev/null
+++ b/debian/docs
@@@ -1,0 -1,0 +1,1 @@@
++TODO
diff --cc debian/install
index 0000000,0000000..f58d6d9
new file mode 100644
--- /dev/null
+++ b/debian/install
@@@ -1,0 -1,0 +1,1 @@@
++virt-top/virt-top usr/bin
diff --cc debian/lintian-overrides
index 0000000,0000000..5f461f5
new file mode 100644
--- /dev/null
+++ b/debian/lintian-overrides
@@@ -1,0 -1,0 +1,2 @@@
++# The following lintian is caused by ocaml-gettext. Please, see #848619.
++virt-top: spelling-error-in-binary usr/bin/virt-top approriate appropriate
diff --cc debian/patches/10_add-opt-and-byte-compile-targets.patch
index 9f0cc50,0000000..9f0cc50
mode 100644,000000..100644
--- a/debian/patches/10_add-opt-and-byte-compile-targets.patch
+++ b/debian/patches/10_add-opt-and-byte-compile-targets.patch
diff --cc debian/patches/20_fix-FTBFS-with-OCaml.patch
index 0000000,0000000..14b49bd
new file mode 100644
--- /dev/null
+++ b/debian/patches/20_fix-FTBFS-with-OCaml.patch
@@@ -1,0 -1,0 +1,21 @@@
++Description: fix a FTBFS with OCaml 4.02.2. (Closes: #789614)
++Author: Joao Eriberto Mota Filho <eriberto at debian.org>
++Last-Update: 2016-01-01
++Index: virt-top-1.0.7/virt-top/Makefile.in
++===================================================================
++--- virt-top-1.0.7.orig/virt-top/Makefile.in
+++++ virt-top-1.0.7/virt-top/Makefile.in
++@@ -64,11 +64,11 @@ OBJS += virt_top_main.cmo
++
++ XOBJS := $(OBJS:.cmo=.cmx)
++
++-OCAMLCFLAGS := -g -warn-error A
+++OCAMLCFLAGS := -g
++ OCAMLCLIBS := -linkpkg
++
++ OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
++-OCAMLOPTFLAGS := -warn-error A
+++OCAMLOPTFLAGS :=
++ OCAMLOPTLIBS := $(OCAMLCLIBS)
++
++ BYTE_TARGETS := virt-top
diff --cc debian/patches/series
index 613bed4,0000000..80d9fc3
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
- 0001-add-opt-and-byte-compile-targets.patch
++10_add-opt-and-byte-compile-targets.patch
++20_fix-FTBFS-with-OCaml.patch
diff --cc debian/rules
index d9b32c1,0000000..ed933e6
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,22 -1,0 +1,5 @@@
+#!/usr/bin/make -f
-
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/class/autotools.mk
- include /usr/share/cdbs/1/rules/ocaml.mk
- include /usr/share/cdbs/1/rules/patchsys-quilt.mk
++#export DH_VERBOSE=1
+
- DESTDIR = $(CURDIR)/debian/virt-top
-
- DEB_MAKE_CLEAN_TARGET = clean
- ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
- DEB_MAKE_BUILD_TARGET = opt
- DEB_MAKE_INSTALL_TARGET = install-opt
- else
- DEB_MAKE_BUILD_TARGET = all
- DEB_MAKE_INSTALL_TARGET = install-byte
- endif
- DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR)"
-
- clean::
- rm -f Make.rules Makefile config.h config.log config.status \
- po/Makefile virt-top/Makefile virt-top/virt_top_gettext.ml
++%:
++ dh $@
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
diff --cc debian/watch
index 0d0d574,0000000..73fee60
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,2 @@@
- version=3
-
- http://et.redhat.com/~rjones/virt-top/files/virt-top-(.*)\.tar\.gz
++version=4
++http://people.redhat.com/~rjones/virt-top/files/virt-top-(\d\S+)\.tar\.(?:bz2|gz|xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/virt-top.git
More information about the Pkg-ocaml-maint-commits
mailing list