diff -Nru virt-what-1.18/debian/changelog virt-what-1.18/debian/changelog --- virt-what-1.18/debian/changelog 2017-08-02 18:20:55.000000000 +0000 +++ virt-what-1.18/debian/changelog 2018-01-29 09:15:34.000000000 +0000 @@ -1,3 +1,13 @@ +virt-what (1.18-2) unstable; urgency=medium + + * Determine architecture via 'uname -m' (Closes: #888690) + * Add myself to uploaders + * Bump standards version to 4.1.3 + * Drop dh-autoreconf build-dep + * Move to salsa.d.o + + -- Guido Günther Mon, 29 Jan 2018 10:15:34 +0100 + virt-what (1.18-1) unstable; urgency=medium * [3d21237] New upstream version 1.18 diff -Nru virt-what-1.18/debian/control virt-what-1.18/debian/control --- virt-what-1.18/debian/control 2017-08-02 17:08:03.000000000 +0000 +++ virt-what-1.18/debian/control 2018-01-29 09:10:25.000000000 +0000 @@ -2,11 +2,11 @@ Section: admin Priority: optional Maintainer: Debian Libvirt Maintainers -Uploaders: Joao Eriberto Mota Filho -Build-Depends: debhelper (>= 10), dh-autoreconf -Standards-Version: 3.9.8 -Vcs-Git: https://anonscm.debian.org/git/pkg-libvirt/virt-what.git -Vcs-Browser: https://anonscm.debian.org/git/pkg-libvirt/virt-what.git +Uploaders: Joao Eriberto Mota Filho , Guido Günther +Build-Depends: debhelper (>= 10) +Standards-Version: 4.1.3 +Vcs-Git: https://salsa.debian.org/libvirt-team/virt-what.git +Vcs-Browser: https://salsa.debian.org/libvirt-team/virt-what Homepage: https://people.redhat.com/~rjones/virt-what/ Package: virt-what diff -Nru virt-what-1.18/debian/patches/Determine-architecture-via-uname-m.patch virt-what-1.18/debian/patches/Determine-architecture-via-uname-m.patch --- virt-what-1.18/debian/patches/Determine-architecture-via-uname-m.patch 1970-01-01 00:00:00.000000000 +0000 +++ virt-what-1.18/debian/patches/Determine-architecture-via-uname-m.patch 2018-01-29 08:54:59.000000000 +0000 @@ -0,0 +1,28 @@ +From: =?utf-8?q?Guido_G=C3=BCnther?= +Date: Sat, 27 Jan 2018 13:11:36 +0100 +Subject: Determine architecture via 'uname -m' + +'uname -p' only gives unknown on x86_64, i386, arm6l (rpi) and aarch64 +(scaleways). + +Closes: #888690 +--- + virt-what.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/virt-what.in b/virt-what.in +index 56af1ad..97ebd79 100644 +--- a/virt-what.in ++++ b/virt-what.in +@@ -102,9 +102,9 @@ cpuid=$(virt-what-cpuid-helper) + dmi=$(LANG=C dmidecode 2>&1) + + # Architecture. +-# Note for the purpose of testing, we only call uname with -p option. ++# Note for the purpose of testing, we only call uname with -m option. + +-arch=$(uname -p | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/') ++arch=$(uname -m | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/') + + # Check for VMware. + # cpuid check added by Chetan Loke. diff -Nru virt-what-1.18/debian/patches/Remove-bashisms.patch virt-what-1.18/debian/patches/Remove-bashisms.patch --- virt-what-1.18/debian/patches/Remove-bashisms.patch 2017-08-02 18:20:37.000000000 +0000 +++ virt-what-1.18/debian/patches/Remove-bashisms.patch 2018-01-29 08:54:59.000000000 +0000 @@ -1,6 +1,6 @@ -From: =?utf-8?q?Guido_G=C3=BCnther_agx=40sigxcpu=2Eorg?= -Date: =?utf-8?q?Wed=2C_2_Aug_2017_14=3A16=3A07_-0300?= -Subject: =?utf-8?q?Remove_bashisms?= +From: =?utf-8?q?Guido_G=C3=BCnther?= +Date: Wed, 2 Aug 2017 14:16:07 -0300 +Subject: Remove bashisms Use [ instead of [[ and -a instead of && so we fall back to test if necessary: diff -Nru virt-what-1.18/debian/patches/series virt-what-1.18/debian/patches/series --- virt-what-1.18/debian/patches/series 2017-08-02 18:20:37.000000000 +0000 +++ virt-what-1.18/debian/patches/series 2018-01-29 08:54:59.000000000 +0000 @@ -1 +1,2 @@ Remove-bashisms.patch +Determine-architecture-via-uname-m.patch