Merge ~paelzer/ubuntu/+source/virt-manager:merge-2.2.1-4-groovy into ubuntu/+source/virt-manager:ubuntu/groovy-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4077/+packages
Tags:
To ssh://git.launchpad.net/~paelzer/ubuntu/+source/virt-manager
 * [new tag] lp99999001/logical/1%2.2.1-3ubuntu2 -> lp99999001/logical/1%2.2.1-3ubuntu2
 * [new tag] lp99999001/new/debian -> lp99999001/new/debian
 * [new tag] lp99999001/old/debian -> lp99999001/old/debian
 * [new tag] lp99999001/old/ubuntu -> lp99999001/old/ubuntu
 * [new tag] lp99999001/reconstruct/1%2.2.1-3ubuntu2 -> lp99999001/reconstruct/1%2.2.1-3ubuntu2
 * [new tag] lp99999001/split/1%2.2.1-3ubuntu2 -> lp99999001/split/1%2.2.1-3ubuntu2

I spent some time to ensure all remaining Delta is on some way upstream, but other than that overall a trivial merge.

Unmerged commits

7c6c9aa... by Christian Ehrhardt  on 2020-05-28

update-maintainer

4922727... by Christian Ehrhardt  on 2020-05-28

reconstruct-changelog

317daeb... by Christian Ehrhardt  on 2020-05-28

merge-changelogs

708f81c... by Christian Ehrhardt  on 2020-05-28

d/p/legacy-images.patch: update header

Signed-off-by: Christian Ehrhardt <email address hidden>

71130ed... by Christian Ehrhardt  on 2020-05-28

Fix legacy-images path for focal. LP: #1872941

Upstream implemented it similar in
https://github.com/virt-manager/virt-manager/commit/b55b7e94622dd039d00b6e21b5d28d44ab944693
I also submitted the one missing bit
https://github.com/virt-manager/virt-manager/pull/115

Neither of the above is in a released version yet.
I'll extend the dep3 headers on the merge.

Signed-off-by: Christian Ehrhardt <email address hidden>

8f347ea... by Christian Ehrhardt  on 2017-08-09

    - d/p/mark-libvirt-lxc: Clearly mark the LXC connections as being
      libvirt-lxc, to avoid confusion due to differing features and
      configurations.

Signed-off-by: Christian Ehrhardt <email address hidden>

84e8aa6... by Guido Günther on 2020-04-26

Import patches-unapplied version 1:2.2.1-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 513062400d0adf7e8618c3aa361a9b1def08a597

New changelog entries:
  [ Christian Ehrhardt ]
  * Recommend gir1.2-appindicator3-0.1 for appindicator support.
  [ Debian Janitor ]
  * d/changelog: Trim trailing whitespace.
  * Set upstream metadata fields: Bug-Database, Bug-Submit, Name, Repository,
    Repository-Browse.

diff --git a/debian/changelog b/debian/changelog
index ac7ac09..bbb7352 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+<<<<<<< debian/changelog
+=======
+virt-manager (1:2.2.1-4ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/p/mark-libvirt-lxc: Clearly mark the LXC connections as being
+      libvirt-lxc, to avoid confusion due to differing features and
+      configurations.
+      [accepted upstream, but not yet released)
+    - Fix legacy-images path for focal. LP: 1872941
+      [updated patch headers with upstream status]
+  * Dropped changes:
+    - Depend on gir1.2-appindicator3-0.1 for appindicator support.
+      [accepted in Debian 1:2.2.1-4]
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 28 May 2020 09:39:44 +0200
+
+virt-manager (1:2.2.1-4) unstable; urgency=medium
+
+  [ Christian Ehrhardt ]
+  * Recommend gir1.2-appindicator3-0.1 for appindicator support.
+
+  [ Debian Janitor ]
+  * d/changelog: Trim trailing whitespace.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Name, Repository,
+    Repository-Browse.
+
+ -- Guido Günther <[e-mail]>  Sun, 26 Apr 2020 13:41:56 +0200
+
+>>>>>>> debian/changelog
 virt-manager (1:2.2.1-3ubuntu2) focal; urgency=medium
 
   * Fix legacy-images path for focal. LP: #1872941
@@ -384,7 +414,7 @@ virt-manager (1:1.4.0-3) unstable; urgency=medium
 
 virt-manager (1:1.4.0-2) unstable; urgency=medium
 
-  * Upload to unstable 
+  * Upload to unstable
 
  -- Guido Günther <[e-mail]>  Fri, 22 Jul 2016 10:27:06 +0200
 
@@ -900,14 +930,14 @@ virt-manager (0.8.4-8) unstable; urgency=low
 
   [ Laurent Léonard ]
   * [2254aba] Bump Standards-Version to 3.9.1
-  * [5c4e495] Update patch 
+  * [5c4e495] Update patch
         0003-Update-french-translation.patch.
     Fix origin URL, yse author, date and description from the upstream patch.
     Rename the file to match upstream patch description.
   * [be93227] New patch
          0007-Fix-livecd-customize-before-install-traceback.patch
     Closes: #591808
- 
+
  -- Guido Günther <[e-mail]>  Thu, 30 Sep 2010 13:32:01 +0200
 
 virt-manager (0.8.5-1) experimental; urgency=low
@@ -917,17 +947,17 @@ virt-manager (0.8.5-1) experimental; urgency=low
   * [cc1f7ce] Drop patches fixed upstream:
         0002-console-Don-t-throw-traceback-if-we-can-t-read-error.patch
            http://hg.fedorahosted.org/hg/virt-manager/rev/c206b12a8c7a
-        0003-Update-french-translation.patch 
+        0003-Update-french-translation.patch
            http://hg.fedorahosted.org/hg/virt-manager/rev/1f78c4ea0692
-        0004-create-Skip-post-install-restart-if-user-destroys-VM.patch 
+        0004-create-Skip-post-install-restart-if-user-destroys-VM.patch
            http://hg.fedorahosted.org/hg/virt-manager/rev/d8c0607c68dc
         0005-Add-conn-info-to-virtinst.VirtualGraphics.patch
            http://hg.fedorahosted.org/hg/virt-manager/rev/99cf13a133f3
-        0006-Fix-error-launching-create-wizard-on-qemu-session.patch 
+        0006-Fix-error-launching-create-wizard-on-qemu-session.patch
            http://hg.fedorahosted.org/hg/virt-manager/rev/ea94314da7d5
   * [f6cc98d] Bump virtinst dependency version to 0.500.4
   * [32e247c] Bump Standards-Version to 3.9.1
-  * [4d8c427] New patch 
+  * [4d8c427] New patch
         0002-l10n-Updates-to-French-fr-translation.patch
   * [66ebeaf] New patch
         0003-l10n-Updates-to-French-fr-translation.patch
@@ -1157,7 +1187,7 @@ virt-manager (0.7.0-1) unstable; urgency=low
   * [7ec628a] Imported Upstream version 0.7.0
         - e0f0b017caa9: ctrl-alt-backspace fixed (Closes: #520762)
         - 6126a50801de: migration uris fixed (Closes: #520772)
-  * [4b493f6] drop patches applied upstream: 
+  * [4b493f6] drop patches applied upstream:
           0002-remove-disambiguity-in-storage-dialog.patch
           0003-hint-to-ssh-askpass.patch
           0004-make-fullscreen-mode-more-useful.patch
@@ -1195,9 +1225,9 @@ virt-manager (0.6.1-2) experimental; urgency=low
 virt-manager (0.6.1-1) experimental; urgency=low
 
   * [31465dc] allow non root users for ssh connections
-  * [e43ed8a] Imported Upstream version 0.6.1 (Closes: #513290), 
+  * [e43ed8a] Imported Upstream version 0.6.1 (Closes: #513290),
     has our non-root ssh patch (Closes: #505936)
-  * [12f2cc7] drop patches 
+  * [12f2cc7] drop patches
         * fixed upstream:
               0007-populate-hostinfo-earlier-in-tick-function-so-it-isn.patch
         * applied ustream:
@@ -1328,7 +1358,7 @@ virt-manager (0.5.2+hg071220-2) experimental; urgency=low
 virt-manager (0.5.2+hg071220-1) experimental; urgency=low
 
   * new upstream version
-  * run autogen.sh 
+  * run autogen.sh
 
  -- Guido Guenther <[e-mail]>  Thu, 20 Dec 2007 19:32:56 +0100
 
@@ -1391,4 +1421,3 @@ virt-manager (0.4.0-0ubuntu0~ppa1) feisty; urgency=low
   * Initial release based on xenbr packages.
 
  -- Marcelo Boveto Shima <[e-mail]>  Thu,  7 Jun 2007 01:08:24 -0300
-
diff --git a/debian/control b/debian/control
index a08ef32..41215fa 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,7 @@ Depends:
  ${misc:Depends},
  ${python3:Depends},
 Recommends:
+ gir1.2-appindicator3-0.1,
  gir1.2-spiceclientglib-2.0,
  gir1.2-spiceclientgtk-3.0,
  libvirt-daemon-system (>= 1.2.7),
diff --git a/debian/patches/legacy-images.patch b/debian/patches/legacy-images.patch
index 0f6b65c..11714b9 100644
--- a/debian/patches/legacy-images.patch
+++ b/debian/patches/legacy-images.patch
@@ -2,6 +2,14 @@ Description: Fix legacy-images path for focal.
 Author: Dimitri John Ledkov <[e-mail]>
 Bug-Ubuntu: https://launchpad.net/bugs/1872941
 
+<<<<<<< debian/patches/legacy-images.patch
+=======
+To be droppable delta some day, here some further info:
+Upstream implemented it as
+  https://github.com/virt-manager/virt-manager/commit/b55b7e94622dd039d00b6e21b5d28d44ab944693
+Missing bit submitted in
+  https://github.com/virt-manager/virt-manager/pull/115
+>>>>>>> debian/patches/legacy-images.patch
 
 Index: virt-manager-2.2.1/virtinst/install/urldetect.py
 ===================================================================
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..a69d2a6
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+Name: virt-manager
+Bug-Database: https://github.com/virt-manager/virt-manager/issues
+Bug-Submit: https://github.com/virt-manager/virt-manager/issues/new
+Repository: https://github.com/virt-manager/virt-manager.git
+Repository-Browse: https://github.com/virt-manager/virt-manager