[Pkg-libvirt-commits] [Git][libvirt-team/virt-manager][debian/experimental] 10 commits: Remove all the patches, backported from upstream.

Wed Oct 14 08:46:49 BST 2020

Guido Günther pushed to branch debian/experimental at Libvirt Packaging Team / virt-manager


Commits:
a9cf672f by Pino Toscano at 2020-10-14T09:26:34+02:00
Remove all the patches, backported from upstream.

- - - - -
c9f0a8da by Pino Toscano at 2020-10-14T09:26:34+02:00
Update the build dependencies according to the upstream build system:

- add python3-docutils, needed for rst2man
- drop intltool, no more needed now

- - - - -
3c567b2f by Pino Toscano at 2020-10-14T09:26:34+02:00
Update and sort the install files

- - - - -
a430600e by Pino Toscano at 2020-10-14T09:26:34+02:00
Remove a no more needed lintian override

- - - - -
9dd5914b by Pino Toscano at 2020-10-14T09:26:34+02:00
Remove virt-convert from the virtinst description

It was dropped upstream.

- - - - -
023093c6 by Pino Toscano at 2020-10-14T09:26:34+02:00
Bump debhelper-compat to 13; no changes required

- - - - -
9e188195 by Pino Toscano at 2020-10-14T09:26:34+02:00
Run the upstream test suite, which seems to work fine now:

- add the genisoimage, python3-argcomplete, and python3-pytest build
  dependencies
- run pytest-3 on dh_auto_test

- - - - -
be6ca048 by Pino Toscano at 2020-10-14T09:26:34+02:00
Wrap a too long old changelog entry

- - - - -
2c11b9a1 by Pino Toscano at 2020-10-14T09:26:34+02:00
help autopkgtest: remove virt-convert

It was dropped upstream.

- - - - -
9c830e75 by Guido Günther at 2020-10-14T09:34:28+02:00
Document changes and release 1:3.0.0-1

- - - - -


9 changed files:

- debian/changelog
- debian/control
- − debian/patches/series
- − debian/patches/upstream_urldetect-Deal-with-ubuntu-20.04-legacy-installer.patch
- debian/rules
- debian/tests/help.sh
- debian/virt-manager.install
- debian/virtinst.install
- − debian/virtinst.lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
@@ -1,18 +1,33 @@
-virt-manager (1:3.0.0-1~2.gbp92ba4a) UNRELEASED; urgency=medium
-
-  ** SNAPSHOT build @92ba4a2ed15e2bf14e833d99bd772b859d67e20c **
+virt-manager (1:3.0.0-1) experimental; urgency=medium
 
+  [ Pino Toscano ]
   * New upstream version 3.0.0
-
- -- Guido Günther <agx at sigxcpu.org>  Wed, 14 Oct 2020 09:19:21 +0200
+  * Remove all the patches, backported from upstream.
+  * Update the build dependencies according to the upstream build system:
+    - add python3-docutils, needed for rst2man
+    - drop intltool, no more needed now
+  * Update and sort the install files
+  * Remove a no more needed lintian override
+  * Remove virt-convert from the virtinst description.
+    It was dropped upstream.
+  * Bump debhelper-compat to 13; no changes required
+  * Run the upstream test suite, which seems to work fine now:
+    - add the genisoimage, python3-argcomplete, and python3-pytest build
+      dependencies
+    - run pytest-3 on dh_auto_test
+  * Wrap a too long old changelog entry
+  * help autopkgtest: remove virt-convert.
+    It was dropped upstream.
+
+ -- Guido Günther <agx at sigxcpu.org>  Wed, 14 Oct 2020 09:27:24 +0200
 
 virt-manager (1:2.2.1-5) unstable; urgency=medium
 
   [ Pino Toscano ]
   * Install 10_virt-manager.gschema.override directly w/ virt-manager.install
   * 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:
+    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


=====================================
debian/control
=====================================
@@ -10,20 +10,23 @@ Vcs-Git: https://salsa.debian.org/libvirt-team/virt-manager.git
 Vcs-Browser: https://salsa.debian.org/libvirt-team/virt-manager
 Homepage: https://virt-manager.org/
 Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
  dh-python,
  gettext,
- intltool,
  python3,
+ python3-docutils,
 # for the tests
  cpio <!nocheck>,
+ genisoimage <!nocheck>,
  gir1.2-libosinfo-1.0 <!nocheck>,
  gir1.2-libvirt-glib-1.0 <!nocheck>,
  libglib2.0-bin <!nocheck>,
  libvirt-daemon <!nocheck>,
+ python3-argcomplete <!nocheck>,
  python3-gi <!nocheck>,
  python3-libvirt <!nocheck>,
  python3-libxml2 <!nocheck>,
+ python3-pytest <!nocheck>,
  python3-requests <!nocheck>,
  unzip <!nocheck>,
 Rules-Requires-Root: no
@@ -88,7 +91,6 @@ Description: utilities to create and edit virtual machines
   - 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/patches/series deleted
=====================================
@@ -1 +0,0 @@
-upstream_urldetect-Deal-with-ubuntu-20.04-legacy-installer.patch


=====================================
debian/patches/upstream_urldetect-Deal-with-ubuntu-20.04-legacy-installer.patch deleted
=====================================
@@ -1,71 +0,0 @@
-From b55b7e94622dd039d00b6e21b5d28d44ab944693 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio at redhat.com>
-Date: Thu, 21 May 2020 17:41:18 +0200
-Subject: [PATCH] urldetect: Deal with ubuntu 20.04 legacy installer
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Ubuntu 20.04 has a new installer, which is yet not supported by
-virt-install / osinfo-db, and this made ubuntu switch their URLs
-for the old installer to current/legacy-images/... instead of
-current/images/...
-
-Let's adapt URL detect so it can deal with this new "legacy"
-style.
-
-Reviewed-by: Cole Robinson <crobinso at redhat.com>
-Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
----
- tests/test_urls.ini      | 7 ++++++-
- virtinst/install/urldetect.py | 4 ++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_urls.ini b/tests/test_urls.ini
-index dc3e148b..184ca7b8 100644
---- a/tests/test_urls.ini
-+++ b/tests/test_urls.ini
-@@ -177,12 +177,17 @@ testshortcircuit = 1
- [ubuntu16.04]
- url = http://us.archive.ubuntu.com/ubuntu/dists/xenial/main/installer-amd64
- distro = ubuntu16.04
--# Latest release.
- # Check for xen for full coverage
- [ubuntu19.04]
- url = http://us.archive.ubuntu.com/ubuntu/dists/disco/main/installer-amd64
- testxen = 1
- distro = ubuntu19.04
-+# Latest release.
-+# Check for legacy-images for full coverage
-+[ubuntu20.04]
-+url = http://archive.ubuntu.com/ubuntu/dists/focal/main/installer-amd64
-+kernelregex = current/legacy-images/netboot/ubuntu-installer/.*
-+distro = ubuntu20.04
- 
- 
- 
-diff --git a/virtinst/install/urldetect.py b/virtinst/install/urldetect.py
-index 12cec1b9..c64ab6ed 100644
---- a/virtinst/install/urldetect.py
-+++ b/virtinst/install/urldetect.py
-@@ -648,6 +648,8 @@ class _DebianDistro(_DistroTree):
-         media_type = None
-         if check_manifest("current/images/MANIFEST"):
-             media_type = "url"
-+        elif check_manifest("current/legacy-images/MANIFEST"):
-+            media_type = "legacy_url"
-         elif check_manifest("daily/MANIFEST"):
-             media_type = "daily"
-         elif cache.content_regex(".disk/info",
-@@ -705,6 +707,8 @@ class _DebianDistro(_DistroTree):
-             url_prefix = "daily"
-         elif self.cache.debian_media_type == "mounted_iso_url":
-             url_prefix = "install"
-+        elif self.cache.debian_media_type == "legacy_url":
-+            url_prefix = "current/legacy-images"
- 
-         tree_arch = self._find_treearch()
-         hvmroot = "%s/netboot/%s-installer/%s/" % (url_prefix,

--- 
-2.28.0
-


=====================================
debian/rules
=====================================
@@ -7,11 +7,7 @@ override_dh_python3:
 	dh_python3 usr/share/virt-manager
 
 override_dh_auto_test:
-ifneq (,$(filter check,$(DEB_BUILD_OPTIONS)))
-	python3 setup.py test
-else
-	@echo "Checks disabled atm"
-endif
+	pytest-3 -v -rs
 
 override_dh_auto_install:
 	python3 setup.py --no-update-icon-cache --no-compile-schemas install --force --root=debian/tmp --no-compile -O0


=====================================
debian/tests/help.sh
=====================================
@@ -4,6 +4,6 @@ set -e
 
 # At least check we can execute the main binary
 # to catch missing python dependenies
-for p in install xml convert clone; do
+for p in install xml clone; do
     virt-$p --help
 done


=====================================
debian/virt-manager.install
=====================================
@@ -1,12 +1,11 @@
 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/
-usr/share/appdata/virt-manager.appdata.xml
 usr/share/applications
 usr/share/glib-2.0
+usr/share/icons/
 usr/share/locale
+usr/share/man/man1/virt-manager.1
+usr/share/metainfo/virt-manager.appdata.xml
 usr/share/virt-manager/icons
 usr/share/virt-manager/ui
-usr/share/virt-manager/virt-manager
 usr/share/virt-manager/virtManager


=====================================
debian/virtinst.install
=====================================
@@ -1,15 +1,8 @@
 usr/bin/virt-clone
-usr/bin/virt-convert
 usr/bin/virt-install
 usr/bin/virt-xml
 usr/share/bash-completion/completions/
-usr/share/man/man1/virt-install.1
-usr/share/man/man1/virt-convert.1
 usr/share/man/man1/virt-clone.1
+usr/share/man/man1/virt-install.1
 usr/share/man/man1/virt-xml.1
-usr/share/virt-manager/virt-clone
-usr/share/virt-manager/virt-convert
-usr/share/virt-manager/virt-install
-usr/share/virt-manager/virt-xml
-usr/share/virt-manager/virtconv
 usr/share/virt-manager/virtinst


=====================================
debian/virtinst.lintian-overrides deleted
=====================================
@@ -1,2 +0,0 @@
-# example of a long command line argument, cannot be split/wrapped
-virtinst: groff-message usr/share/man/man1/virt-install.1.gz *



View it on GitLab: https://salsa.debian.org/libvirt-team/virt-manager/-/compare/a71a8da585989e7b2546f4110059e9322a355012...9c830e75af9d16c8ec92aa41af98169793b3e707

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/virt-manager/-/compare/a71a8da585989e7b2546f4110059e9322a355012...9c830e75af9d16c8ec92aa41af98169793b3e707
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/20201014/bd02a590/attachment-0001.html>
