diff -pruN 42.3-1/debian/changelog 42.3-1ubuntu1/debian/changelog --- 42.3-1/debian/changelog 2022-08-02 20:01:37.000000000 +0000 +++ 42.3-1ubuntu1/debian/changelog 2022-08-02 20:09:25.000000000 +0000 @@ -1,3 +1,11 @@ +gnome-boxes (42.3-1ubuntu1) kinetic; urgency=medium + + * Sync with Debian. Remaining changes: + - Update recommended-downloads patch to only feature Ubuntu + - Use dh_migrations to remove the old cached Ubuntu logo + + -- Jeremy Bicha Tue, 02 Aug 2022 16:09:25 -0400 + gnome-boxes (42.3-1) unstable; urgency=medium * New upstream release @@ -9,6 +17,24 @@ gnome-boxes (42.3-1) unstable; urgency=m -- Jeremy Bicha Tue, 02 Aug 2022 16:01:37 -0400 +gnome-boxes (42.2-1ubuntu2) kinetic; urgency=medium + + * Cherry-pick Port-to-libsoup-3.patch + * Update Build-Depends to build against libsoup3 + * Add temporary patch to stop using tracker until we are ready to switch + it & everything using evolution-data-server to libsoup3 + * debian/control.in: Temporarily drop tracker Depends & Build-Depends + + -- Jeremy Bicha Sun, 17 Jul 2022 08:07:15 +0200 + +gnome-boxes (42.2-1ubuntu1) kinetic; urgency=medium + + * Sync with Debian (LP: #1980416). Remaining changes: + - Update recommended-downloads patch to only feature Ubuntu + - Use dh_migrations to remove the old cached Ubuntu logo + + -- Jeremy Bicha Fri, 01 Jul 2022 09:09:50 -0400 + gnome-boxes (42.2-1) unstable; urgency=medium * New upstream release @@ -16,6 +42,19 @@ gnome-boxes (42.2-1) unstable; urgency=m -- Jeremy Bicha Fri, 01 Jul 2022 08:53:33 -0400 +gnome-boxes (42.1-1ubuntu1) kinetic; urgency=medium + + [ Nathan Pratta Teodosio ] + * Sync with Debian. Remaining change: + - Add patch to only feature Ubuntu and GNOME OS + + [ Jeremy Bicha ] + * Update-recommended-download.patch: Drop GNOME OS. + A UEFI Firmware issue prevents it from booting + * Use dh_migrations to remove the old cached Ubuntu logo + + -- Jeremy Bicha Tue, 31 May 2022 14:48:46 -0400 + gnome-boxes (42.1-1) unstable; urgency=medium * New upstream release @@ -28,12 +67,25 @@ gnome-boxes (42.0.1-2) unstable; urgency -- Jeremy Bicha Thu, 07 Apr 2022 16:29:35 -0400 +gnome-boxes (42.0.1-1ubuntu1) jammy; urgency=medium + + * Sync with Debian. Remaining change: + - Add patch to only feature Ubuntu and GNOME OS + + -- Jeremy Bicha Mon, 21 Mar 2022 13:21:30 -0400 + gnome-boxes (42.0.1-1) unstable; urgency=medium * New upstream release -- Jeremy Bicha Mon, 21 Mar 2022 13:19:32 -0400 +gnome-boxes (42~rc-1ubuntu1) jammy; urgency=medium + + * Add patch to only feature Ubuntu and GNOME OS + + -- Jeremy Bicha Fri, 11 Mar 2022 16:11:45 -0500 + gnome-boxes (42~rc-1) unstable; urgency=medium * New upstream release diff -pruN 42.3-1/debian/control 42.3-1ubuntu1/debian/control --- 42.3-1/debian/control 2022-08-02 20:01:37.000000000 +0000 +++ 42.3-1ubuntu1/debian/control 2022-08-02 20:09:25.000000000 +0000 @@ -5,8 +5,9 @@ Source: gnome-boxes Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Iain Lane , Jeremy Bicha , Laurent Bigonville , Michael Biebl , Sebastien Bacher +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Iain Lane , Jeremy Bicha Build-Depends: appstream-util , debhelper-compat (= 13), desktop-file-utils , @@ -37,8 +38,10 @@ Build-Depends: appstream-util Rules-Requires-Root: no Standards-Version: 4.6.0 X-Ubuntu-Use-Langpack: yes -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-boxes -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-boxes.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-boxes +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-boxes.git +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-boxes.git -b ubuntu/master +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-boxes/tree/ubuntu/master Homepage: https://wiki.gnome.org/Apps/Boxes Package: gnome-boxes diff -pruN 42.3-1/debian/control.in 42.3-1ubuntu1/debian/control.in --- 42.3-1/debian/control.in 2022-08-02 20:01:37.000000000 +0000 +++ 42.3-1ubuntu1/debian/control.in 2022-08-02 20:09:25.000000000 +0000 @@ -1,7 +1,8 @@ Source: gnome-boxes Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: appstream-util , debhelper-compat (= 13), @@ -33,8 +34,10 @@ Build-Depends: appstream-util Rules-Requires-Root: no Standards-Version: 4.6.0 X-Ubuntu-Use-Langpack: yes -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-boxes -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-boxes.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-boxes +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-boxes.git +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-boxes.git -b ubuntu/master +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-boxes/tree/ubuntu/master Homepage: https://wiki.gnome.org/Apps/Boxes Package: gnome-boxes diff -pruN 42.3-1/debian/gbp.conf 42.3-1ubuntu1/debian/gbp.conf --- 42.3-1/debian/gbp.conf 2022-08-02 20:01:37.000000000 +0000 +++ 42.3-1ubuntu1/debian/gbp.conf 2022-08-02 20:09:25.000000000 +0000 @@ -1,6 +1,7 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master +debian-branch = ubuntu/master +debian-tag=ubuntu/%(version)s upstream-branch = upstream/latest [buildpackage] diff -pruN 42.3-1/debian/migrations 42.3-1ubuntu1/debian/migrations --- 42.3-1/debian/migrations 1970-01-01 00:00:00.000000000 +0000 +++ 42.3-1ubuntu1/debian/migrations 2022-08-02 20:09:25.000000000 +0000 @@ -0,0 +1 @@ +debian/ubuntu-logo-cleanup.sh diff -pruN 42.3-1/debian/patches/Update-recommended-downloads.patch 42.3-1ubuntu1/debian/patches/Update-recommended-downloads.patch --- 42.3-1/debian/patches/Update-recommended-downloads.patch 2022-08-02 20:01:37.000000000 +0000 +++ 42.3-1ubuntu1/debian/patches/Update-recommended-downloads.patch 2022-08-02 20:09:25.000000000 +0000 @@ -1,16 +1,16 @@ -From: Jeremy Bicha +From: Jeremy Bicha Date: Fri, 11 Mar 2022 16:09:07 -0500 Subject: Update recommended downloads --- - data/recommended-downloads.xml | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) + data/recommended-downloads.xml | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/data/recommended-downloads.xml b/data/recommended-downloads.xml -index 6502791..4cdc6c5 100644 +index 6502791..dd0660f 100644 --- a/data/recommended-downloads.xml +++ b/data/recommended-downloads.xml -@@ -9,14 +9,7 @@ +@@ -9,14 +9,6 @@ available. --> @@ -18,12 +18,11 @@ index 6502791..4cdc6c5 100644 - http://rockylinux.org/rocky/ - http://fedoraproject.org/fedora/ - http://fedoraproject.org/silverblue/ -- http://ubuntu.com/ubuntu/ + http://ubuntu.com/ubuntu/ - http://opensuse.org/opensuse/15.4 - http://opensuse.org/opensuse/tumbleweed - http://debian.org/debian/ - http://endlessos.com/eos/ -+ http://debian.org/debian/testing -+ http://debian.org/debian/11 - http://gnome.org/gnome/nightly +- http://gnome.org/gnome/nightly ++ http://ubuntu.com/ubuntu/20.04 diff -pruN 42.3-1/debian/ubuntu-logo-cleanup.sh 42.3-1ubuntu1/debian/ubuntu-logo-cleanup.sh --- 42.3-1/debian/ubuntu-logo-cleanup.sh 1970-01-01 00:00:00.000000000 +0000 +++ 42.3-1ubuntu1/debian/ubuntu-logo-cleanup.sh 2022-08-02 20:09:25.000000000 +0000 @@ -0,0 +1,5 @@ +#!/bin/sh + +# GNOME Boxes hasn't implemented a way to invalidate the cache +# so we do it manually once to get the new Ubuntu & Fedora logos +rm .cache/gnome-boxes/logos/*.svg