[Pkg-libvirt-commits] [Git][libvirt-team/virt-manager][debian/sid] 18 commits: Install 10_virt-manager.gschema.override directly w/ virt-manager.install
Guido Günther
gitlab at salsa.debian.org
Thu Aug 20 10:47:28 BST 2020
Guido Günther pushed to branch debian/sid at Libvirt Packaging Team / virt-manager
Commits:
3e23fe7a by Pino Toscano at 2020-07-19T10:32:30+02:00
Install 10_virt-manager.gschema.override directly w/ virt-manager.install
- - - - -
0353a91a by Pino Toscano at 2020-07-19T11:47:31+02:00
Pass /usr/share/virt-manager to dh_python3
This way it is used for all the packages, and shebangs are properly replaced;
as a result:
- Use-usr-bin-python.patch is dropped, as not needed anymore
- the manual "python3" dependency in virtinst is dropped, as it is added
automatically
- - - - -
80f8deb0 by Pino Toscano at 2020-07-19T11:48:06+02:00
Remove no more used _dh_python2 override
- - - - -
f8a6057e by Pino Toscano at 2020-07-19T11:48:06+02:00
Ship the upstream NEWS.md file
Closes: #783886
- - - - -
62e25577 by Pino Toscano at 2020-07-19T11:48:06+02:00
Drop debian/README, obsolete
Replaced by debian/README.Debian.
- - - - -
67e48f69 by Pino Toscano at 2020-07-19T20:13:41+02:00
Annotate the test build dependencies as !nocheck
- - - - -
092271bb by Pino Toscano at 2020-07-19T20:15:04+02:00
Replace the python3-all build dependency with python3
virt-manager does not build Python modules, and it needs only the
default version of Python.
- - - - -
9dc9c1cb by Pino Toscano at 2020-07-19T20:15:06+02:00
Drop the empty ${shlibs:Depends} substvar from virtinst
It is a arch:all package.
- - - - -
33576fb6 by Pino Toscano at 2020-07-19T20:15:06+02:00
Revert setup.py as pristine upstream
There is no need to change the upstream setup.py, and furthermore newer
dpkg versions will complain about local direct changes without patches.
Git-Dch: ignore
- - - - -
39cf9e8d by Pino Toscano at 2020-07-19T20:15:06+02:00
Add Rules-Requires-Root: no
It builds fine as user.
- - - - -
bd23a420 by Pino Toscano at 2020-07-19T20:15:30+02:00
Explicitly add the gettext build dependency
It is used to build the translations.
- - - - -
8885bead by Pino Toscano at 2020-07-19T22:57:40+02:00
Update the description using the upstream texts
Closes: #887136
- - - - -
8f182630 by Pino Toscano at 2020-07-19T23:00:34+02:00
Use https for links
- - - - -
f8028a61 by Pino Toscano at 2020-07-20T08:23:04+02:00
Bump Standards-Version to 4.5.0, no changes required
- - - - -
8e3a6770 by Pino Toscano at 2020-08-20T11:32:38+02:00
Rewrite/update copyright as copyright-format v1.0
Closes: #944467
- - - - -
163bfedb by Pino Toscano at 2020-08-20T11:33:01+02:00
Switch from the debhelper build dependency to debhelper-compat
- - - - -
a66d63a3 by Pino Toscano at 2020-08-20T11:33:01+02:00
Override a lintian warning for a log option in documentation
- - - - -
6ebcff75 by Guido Günther at 2020-08-20T09:47:20+00:00
Merge branch 'misc-changes' into 'debian/sid'
Various misc changes
See merge request libvirt-team/virt-manager!5
- - - - -
16 changed files:
- − debian/README
- debian/bug-presubj
- − debian/compat
- debian/control
- debian/copyright
- − debian/patches/Use-usr-bin-python.patch
- − debian/patches/series
- debian/rules
- debian/virt-manager.install
- + debian/virtinst.lintian-overrides
- setup.py
- virt-clone
- virt-convert
- virt-install
- virt-manager
- virt-xml
Changes:
=====================================
debian/README deleted
=====================================
@@ -1,9 +0,0 @@
-Access Control
-==============
-Access to the libvirt socket is controlled by membership in the "libvirt"
-group. If you want to manage virtual machines as non root you need to add your
-user to that group or you have to use the session uris like qemu:///session.
-
-See also /usr/share/doc/libvirt-bin/README.Debian.
-
- -- Guido Guenther <agx at sigxcpu.org> Thu, 04 Jun 2010 11:46:03 +0100
=====================================
debian/bug-presubj
=====================================
@@ -4,5 +4,5 @@ When reporting issues regarding virt-manager please run the program using the
Often the problem isn't related to virt-manager at all. Please also check the
libvirt and VM logfiles and try to reproduce with virsh or virt-install.
-http://wiki.debian.org/libvirt/Debugging has more information on howto provide
+https://wiki.debian.org/libvirt/Debugging has more information on howto provide
debugging information for the virt-* tools.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-12
=====================================
debian/control
=====================================
@@ -5,26 +5,28 @@ Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.deb
Uploaders:
Guido Günther <agx at sigxcpu.org>,
Laurent Léonard <laurent at open-minds.org>,
-Standards-Version: 4.4.0
+Standards-Version: 4.5.0
Vcs-Git: https://salsa.debian.org/libvirt-team/virt-manager.git
Vcs-Browser: https://salsa.debian.org/libvirt-team/virt-manager
-Homepage: http://virt-manager.org/
+Homepage: https://virt-manager.org/
Build-Depends:
- debhelper (>= 12~),
+ debhelper-compat (= 12),
dh-python,
+ gettext,
intltool,
- libglib2.0-bin,
- python3-all,
+ python3,
# for the tests
- cpio,
- gir1.2-libosinfo-1.0,
- gir1.2-libvirt-glib-1.0,
- libvirt-daemon,
- python3-gi,
- python3-libvirt,
- python3-libxml2,
- python3-requests,
- unzip,
+ cpio <!nocheck>,
+ gir1.2-libosinfo-1.0 <!nocheck>,
+ gir1.2-libvirt-glib-1.0 <!nocheck>,
+ libglib2.0-bin <!nocheck>,
+ libvirt-daemon <!nocheck>,
+ python3-gi <!nocheck>,
+ python3-libvirt <!nocheck>,
+ python3-libxml2 <!nocheck>,
+ python3-requests <!nocheck>,
+ unzip <!nocheck>,
+Rules-Requires-Root: no
Package: virt-manager
Architecture: all
@@ -55,14 +57,13 @@ Suggests:
ssh-askpass,
virt-viewer,
Description: desktop application for managing virtual machines
- It presents a summary view of running domains and their live performance &
- resource utilization statistics. A detailed view presents graphs showing
- performance & utilization over time. Ultimately it will allow creation of new
- domains, and configuration & adjustment of a domain's resource allocation &
- virtual hardware. Finally an embedded VNC client viewer presents a full
- graphical console to the guest domain.
- .
- NOTE: the GUI is still considered experimental.
+ The virt-manager application is a desktop user interface for managing virtual
+ machines through libvirt. It primarily targets KVM VMs, but also manages Xen
+ and LXC (Linux containers). It presents a summary view of running domains,
+ their live performance & resource utilization statistics. Wizards enable the
+ creation of new domains, and configuration & adjustment of a domain's resource
+ allocation & virtual hardware. An embedded VNC and SPICE client viewer
+ presents a full graphical console to the guest domain.
Package: virtinst
Architecture: all
@@ -70,7 +71,6 @@ Depends:
e2fsprogs,
genisoimage,
gir1.2-libosinfo-1.0,
- python3,
python3-distutils,
python3-gi,
python3-libvirt (>= 0.4.6),
@@ -78,15 +78,17 @@ Depends:
python3-requests,
${misc:Depends},
${python3:Depends},
- ${shlibs:Depends},
Recommends:
qemu-utils,
virt-viewer,
-Description: Programs to create and clone virtual machines
- Virtinst is a set of commandline tools to create virtual machines using
- libvirt:
+Description: utilities to create and edit virtual machines
+ This package contains some command line utilities to create and edit virtual
+ machines:
.
- virt-install: provision new virtual machines
- virt-clone: clone existing virtual machines
- virt-xml: edit libvirt XML using command line options.
- virt-convert: convert virtual machines between formats
+ - virt-clone: cloning existing inactive guests; it copies the disk images,
+ and defines a config with new name, UUID and MAC address pointing to the
+ copied disks
+ - virt-convert: convert virtual machines between formats
+ - virt-install: provision operating systems into new virtual machines
+ - virt-xml: easily edit libvirt domain XML using virt-install's command line
+ options
=====================================
debian/copyright
=====================================
@@ -1,67 +1,31 @@
-This is the Ubuntu / Debian GNU/Linux prepackaged version of the
-Virtual Machine Manger.
-
-Packaged by Marcelo Boveto Shima <marceloshima at gmail.com>
- and Guido Guenther <agx at sigxcpu.org>
-
-Downloaded from http://virt-manager.et.redhat.com/download.html
-
-Upstream Author:
-
- Daniel Berrange <berrange-at-redhat-dot-com>
- Hugh O. Brock <hbrock-at-redhat-dot-com>
- Jeremy Katz <katzj-at-redhat-dot-com>
-
-Copyright:
-
- Daniel Berrange <berrange-at-redhat-dot-com>
- Red Hat, Inc.
-
-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; version 2 dated June, 1991.
-
-This program 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, write to the Free Software Foundation, Inc., 51 Franklin
-St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Ubuntu / Debian GNU/Linux systems, the complete text of the GNU
-General Public License can be found in `/usr/share/common-licenses/GPL'.
-
-src/graphWidgets:
-
- Copyright (C) 2005-2006 Red Hat, Inc., David Malcolm <dmalcolm at redhat.com>
- Copyright (C) 2006 Daniel P. Berrange <berrange at redhat.com>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-You should have received a copy of the GNU Library General Public License with
-this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Ubuntu / Debian GNU/Linux systems, the complete text of the GNU
-General Library Public License can be found in
-`/usr/share/common-licenses/LGPL-2'.
-
-help/:
-
- Copyright 2007 Red Hat Inc., and Hugh Brock
-
- Permission is granted to copy, distribute and/or modify this
- document under the terms of the GNU Free Documentation
- License (GFDL), Version 1.1 or any later version published
- by the Free Software Foundation with no Invariant Sections,
- no Front-Cover Texts, and no Back-Cover Texts.
-
-On Ubuntu / Debian GNU/Linux systems, the complete text of the GNU Free
-Documentation License can be found in `/usr/share/common-licenses/GFDL'.
-
-
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: virt-manager
+Source: https://virt-manager.org/download/
+
+Files: *
+Copyright: 2005-2019, Red Hat, Inc.
+ 2006-2007, Daniel P. Berrange <berrange at redhat.com>
+ 2006, Hugh O. Brock <hbrock at redhat.com>
+ 2007, 2013-2014, FUJITSU Limited
+ 2008-2013, Cole Robinson <crobinso at redhat.com>
+ 2008, Sun Microsystems, Inc. All rights reserved.
+ 2010, Marc-Andre Lureau <marcandre.lureau at redhat.com>
+ 2013, IBM Corporation
+ 2014, 2016, SUSE LINUX Products GmbH, Nuernberg, Germany.
+ 2018, Oracle and/or its affiliates. All rights reserved.
+ 2018, VMware, Inc.
+License: GPL-2+
+
+Files: virtinst/progress.py
+Copyright: 2002-2004 Michael D. Stenner, Ryan Tomayko
+License: GPL-2+
+
+Files: debian/*
+Copyright: Marcelo Boveto Shima <marceloshima at gmail.com>
+ 2007-2020, Guido Günther <agx at sigxcpu.org>
+License: GPL-2+
+
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 or 3 can be found in
+ "/usr/share/common-licenses/GPL-2" and "/usr/share/common-licenses/GPL-3".
=====================================
debian/patches/Use-usr-bin-python.patch deleted
=====================================
@@ -1,79 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 24 Dec 2016 01:18:30 +0100
-Subject: Use /usr/bin/python3
-
-so we don't have to worry about picking up the wrong version
----
- setup.py | 3 +--
- virt-clone | 2 +-
- virt-convert | 2 +-
- virt-install | 2 +-
- virt-manager | 2 +-
- virt-xml | 2 +-
- 6 files changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 275087b..1f7aa98 100755
---- a/setup.py
-+++ b/setup.py
-@@ -1,9 +1,8 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- #
- # This work is licensed under the GNU GPLv2 or later.
- # See the COPYING file in the top-level directory.
-
--
- import sys
- if sys.version_info.major < 3:
- print("virt-manager is python3 only. Run this as ./setup.py")
-diff --git a/virt-clone b/virt-clone
-index 472bd3e..79355da 100755
---- a/virt-clone
-+++ b/virt-clone
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- #
- # Copyright(c) FUJITSU Limited 2007.
- #
-diff --git a/virt-convert b/virt-convert
-index df7fa84..ca4f212 100755
---- a/virt-convert
-+++ b/virt-convert
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- #
- # Copyright 2008, 2013, 2014 Red Hat, Inc.
- #
-diff --git a/virt-install b/virt-install
-index af6c75b..0cd5da7 100755
---- a/virt-install
-+++ b/virt-install
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- #
- # Copyright 2005-2014 Red Hat, Inc.
- #
-diff --git a/virt-manager b/virt-manager
-index ca6a593..b4b7eb2 100755
---- a/virt-manager
-+++ b/virt-manager
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- #
- # Copyright (C) 2006, 2014 Red Hat, Inc.
- # Copyright (C) 2006 Daniel P. Berrange <berrange at redhat.com>
-diff --git a/virt-xml b/virt-xml
-index 71445c9..de5cd2d 100755
---- a/virt-xml
-+++ b/virt-xml
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- #
- # Copyright 2013-2014 Red Hat, Inc.
- #
=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-Use-usr-bin-python.patch
=====================================
debian/rules
=====================================
@@ -3,9 +3,8 @@
%:
dh $@ --with python3 --buildsystem=pybuild
-override_dh_python2:
- dh_python3 -O--buildsystem=python_distutils
- dh_python3 -p virtinst usr/share/virt-manager
+override_dh_python3:
+ dh_python3 usr/share/virt-manager
override_dh_auto_test:
ifneq (,$(filter check,$(DEB_BUILD_OPTIONS)))
@@ -16,9 +15,10 @@ endif
override_dh_auto_install:
python3 setup.py --no-update-icon-cache --no-compile-schemas install --force --root=debian/tmp --no-compile -O0
- dh_install debian/10_virt-manager.gschema.override \
- /usr/share/glib-2.0/schemas/
override_dh_auto_clean:
dh_auto_clean
rm -f data/gschemas.compiled
+
+override_dh_installdocs:
+ dh_installdocs --all NEWS.md
=====================================
debian/virt-manager.install
=====================================
@@ -1,3 +1,4 @@
+debian/10_virt-manager.gschema.override /usr/share/glib-2.0/schemas/
usr/bin/virt-manager
usr/share/man/man1/virt-manager.1
usr/share/icons/
=====================================
debian/virtinst.lintian-overrides
=====================================
@@ -0,0 +1,2 @@
+# example of a long command line argument, cannot be split/wrapped
+virtinst: groff-message usr/share/man/man1/virt-install.1.gz *
=====================================
setup.py
=====================================
@@ -1,8 +1,9 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
#
# This work is licensed under the GNU GPLv2 or later.
# See the COPYING file in the top-level directory.
+
import sys
if sys.version_info.major < 3:
print("virt-manager is python3 only. Run this as ./setup.py")
=====================================
virt-clone
=====================================
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
#
# Copyright(c) FUJITSU Limited 2007.
#
=====================================
virt-convert
=====================================
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
#
# Copyright 2008, 2013, 2014 Red Hat, Inc.
#
=====================================
virt-install
=====================================
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
#
# Copyright 2005-2014 Red Hat, Inc.
#
=====================================
virt-manager
=====================================
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
#
# Copyright (C) 2006, 2014 Red Hat, Inc.
# Copyright (C) 2006 Daniel P. Berrange <berrange at redhat.com>
=====================================
virt-xml
=====================================
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
#
# Copyright 2013-2014 Red Hat, Inc.
#
View it on GitLab: https://salsa.debian.org/libvirt-team/virt-manager/-/compare/5517d65ac07c23849235726abfc3744b052769a4...6ebcff75de620b1eeef1ead237482f51ae3ef9c9
--
View it on GitLab: https://salsa.debian.org/libvirt-team/virt-manager/-/compare/5517d65ac07c23849235726abfc3744b052769a4...6ebcff75de620b1eeef1ead237482f51ae3ef9c9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20200820/59c2c903/attachment-0001.html>
More information about the Pkg-libvirt-commits
mailing list