diff -Nru acpica-unix-20200925/debian/acpica-tools.postinst acpica-unix-20200925/debian/acpica-tools.postinst --- acpica-unix-20200925/debian/acpica-tools.postinst 2021-03-21 19:46:41.000000000 +0000 +++ acpica-unix-20200925/debian/acpica-tools.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -#!/bin/sh -set -e - -BINDIR=/usr/bin -MANDIR=/usr/share/man - -case $1 in -configure) update-alternatives --install $BINDIR/acpixtract acpixtract \ - $BINDIR/acpixtract-acpica 100 \ - --slave $MANDIR/man1/acpixtract.1.gz acpixtract.1.gz \ - $MANDIR/man1/acpixtract-acpica.1.gz - update-alternatives --install $BINDIR/acpidump acpidump \ - $BINDIR/acpidump-acpica 100 \ - --slave $MANDIR/man1/acpidump.1.gz acpidump.1.gz \ - $MANDIR/man1/acpidump-acpica.1.gz - ;; - -*) ;; -esac - -#DEBHELPER# - -exit 0 diff -Nru acpica-unix-20200925/debian/acpica-tools.preinst acpica-unix-20200925/debian/acpica-tools.preinst --- acpica-unix-20200925/debian/acpica-tools.preinst 1970-01-01 00:00:00.000000000 +0000 +++ acpica-unix-20200925/debian/acpica-tools.preinst 2021-09-13 19:19:09.000000000 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Upgrade code from before bookworm. Could be removed in bookworm+1. +BINDIR=/usr/bin +update-alternatives --remove acpixtract $BINDIR/acpixtract-acpica +update-alternatives --remove acpidump $BINDIR/acpidump-acpica + +#DEBHELPER# + +exit 0 diff -Nru acpica-unix-20200925/debian/acpica-tools.prerm acpica-unix-20200925/debian/acpica-tools.prerm --- acpica-unix-20200925/debian/acpica-tools.prerm 2021-03-21 19:46:41.000000000 +0000 +++ acpica-unix-20200925/debian/acpica-tools.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#!/bin/sh -set -e - -BINDIR=/usr/bin -case $1 in -remove|upgrade|deconfigure) - update-alternatives --remove acpixtract $BINDIR/acpixtract-acpica - update-alternatives --remove acpidump $BINDIR/acpidump-acpica - ;; - -*) - echo "prerm called with an unknown argument \'$1\'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff -Nru acpica-unix-20200925/debian/changelog acpica-unix-20200925/debian/changelog --- acpica-unix-20200925/debian/changelog 2021-05-24 08:52:30.000000000 +0000 +++ acpica-unix-20200925/debian/changelog 2021-09-13 19:47:09.000000000 +0000 @@ -1,3 +1,29 @@ +acpica-unix (20200925-6) unstable; urgency=medium + + * QA upload. + * debian/control: Use correct Vcs-* fields. + * debian/control: Bump Standards-Version to 4.6.0 (no changes needed). + + -- Boyuan Yang Mon, 13 Sep 2021 15:47:09 -0400 + +acpica-unix (20200925-5) unstable; urgency=medium + + * QA upload. + * Brown paper bag update for #986308: Actually install binaries using + non-suffixed names. + + -- Chris Hofstaedtler Sat, 21 Aug 2021 11:17:44 +0000 + +acpica-unix (20200925-4) unstable; urgency=medium + + * QA upload. + * Point Vcs- URLs to salsa.debian.org + * Remove alternatives support. + The other packages are already gone in Debian, and Replaces/Conflicts + are already present on acpica-tools. (Closes: #986308) + + -- Chris Hofstaedtler Fri, 20 Aug 2021 18:05:32 +0000 + acpica-unix (20200925-3) unstable; urgency=medium * QA upload. @@ -11,7 +37,7 @@ acpica-unix (20200925-2) unstable; urgency=medium * ACK for the NMUs: thank you! - * Orphaning the package. + * Orphaning the package. -- Al Stone Sun, 21 Mar 2021 13:46:41 -0600 @@ -34,7 +60,7 @@ acpica-unix (20200925-1) unstable; urgency=medium - * Upgrade to 20200925 upstream + * Upgrade to 20200925 upstream * Upgrade to 20200717 upstream (not released) * Refresh patches and test results as needed * Big-endian (aka s390x) support has been completely revamped; if @@ -45,7 +71,7 @@ acpica-unix (20200528-1) unstable; urgency=medium - * Upgrade to 20200528 upstream + * Upgrade to 20200528 upstream * Refresh patches and test results as needed * Remove acpinames utility since upstream removed it as no longer needed * Update Standards-Version to 4.5.0 @@ -54,23 +80,23 @@ acpica-unix (20200430-1) unstable; urgency=medium - * Upgrade to 20200430 upstream + * Upgrade to 20200430 upstream * Refresh patches as needed - * Add in dbtest.patch that fixes s390 build. Closes: #958491 + * Add in dbtest.patch that fixes s390 build. Closes: #958491 * Tested and verified builds work properly with GCC 10. Closes: #956980 -- Al Stone Sun, 31 May 2020 17:16:52 -0600 acpica-unix (20200326-1) unstable; urgency=medium - * Upgrade to 20200326 upstream + * Upgrade to 20200326 upstream * Refresh patches as needed -- Al Stone Tue, 31 Mar 2020 20:15:17 -0600 acpica-unix (20200214-2) unstable; urgency=medium - * Add patch for FACP defaults + * Add patch for FACP defaults * Add patches to accommodate future use of -fno-common by default * Add patches to work better with GCC being stricter about the use of strings and expecting null terminators @@ -83,7 +109,7 @@ acpica-unix (20200214-1) unstable; urgency=medium - * Upgrade to 20200214 upstream + * Upgrade to 20200214 upstream * Refresh patches as needed -- Al Stone Tue, 18 Feb 2020 20:34:25 -0700 @@ -244,7 +270,7 @@ * Refresh patches as needed * CVE-2017-13693: operand cache leak in dsutils.c (patch from github applied) - * CVE-2017-13694: acpi parse and parseext cache leak in psobjects.c + * CVE-2017-13694: acpi parse and parseext cache leak in psobjects.c (patch from github applied) * CVE-2017-13695: operand cache leak in nseval.c (patch from github applied) @@ -306,28 +332,28 @@ acpica-unix (20170303-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. -- Al Stone Tue, 04 Apr 2017 12:06:55 -0600 acpica-unix (20160930-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. -- Al Stone Tue, 04 Oct 2016 16:41:11 -0600 acpica-unix (20160831-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. -- Al Stone Thu, 01 Sep 2016 12:28:36 -0600 acpica-unix (20160729-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. -- Al Stone Tue, 02 Aug 2016 17:08:49 -0600 @@ -341,7 +367,7 @@ acpica-unix (20160527-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. * Update Standards-Version to most recent @@ -349,7 +375,7 @@ acpica-unix (20160422-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. * Update Standards-Version to most recent @@ -357,14 +383,14 @@ acpica-unix (20160318-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. -- Al Stone Sat, 19 Mar 2016 15:44:00 -0600 acpica-unix (20160212-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. * Fix silly typo in Vcs-* entries in debian/control @@ -372,7 +398,7 @@ acpica-unix (20160108-2) unstable; urgency=medium - * Closes: #757791 -- use proper Vcs-* lines in the control file. + * Closes: #757791 -- use proper Vcs-* lines in the control file. * Closes: #731761 -- add changelog info on turbostat: unfortunately, during the transition to using only the ACPICA upstream source tree, I forgot to mention that turbostat was not part of that source but @@ -402,21 +428,21 @@ acpica-unix (20160108-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. -- ahs3 Mon, 11 Jan 2016 17:45:19 -0700 acpica-unix (20151218-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. -- ahs3 Thu, 07 Jan 2016 13:00:33 -0700 acpica-unix (20151124-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. * Add back in a patch to fix a file name that upstream inadvertently left in camel case. @@ -425,7 +451,7 @@ acpica-unix (20150930-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. -- ahs3 Thu, 15 Oct 2015 12:30:33 -0600 @@ -446,7 +472,7 @@ acpica-unix (20150717-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. * Add new patch to correct AAPITS makefile after source file name changes @@ -454,7 +480,7 @@ acpica-unix (20150619-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. Patches for NFIT UUIDs, ARM GICs, and /dev/mem removed as no longer needed. @@ -469,9 +495,9 @@ acpica-unix (20150515-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. - * Add correction patch for NFIT UUIDs (from mailing list) + * Add correction patch for NFIT UUIDs (from mailing list) * Update Standards-Version to 3.9.6 * Add patch from Linaro to remove reliance on /dev/mem for some tables. * Add patch to correct ARM GICs in MADT (from mailing list) @@ -481,28 +507,28 @@ acpica-unix (20150410-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. -- ahs3 Mon, 13 Apr 2015 20:24:58 -0600 acpica-unix (20150408-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. -- ahs3 Wed, 08 Apr 2015 19:43:17 -0600 acpica-unix (20150204-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Refresh patches as needed. -- ahs3 Mon, 02 Mar 2015 16:41:10 -0700 acpica-unix (20141107-1) unstable; urgency=medium - * Upgrade to latest upsteam + * Upgrade to latest upsteam * Refresh patches as needed. -- ahs3 Mon, 17 Nov 2014 18:06:06 -0700 @@ -533,13 +559,13 @@ acpica-unix (20140424-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. -- Al Stone Wed, 07 May 2014 14:30:05 -0600 acpica-unix (20140325-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Closes: #743011 -- don't rely on uname to determine word size; just used the patch supplied in the BTS @@ -556,7 +582,7 @@ acpica-unix (20140114-1) unstable; urgency=medium - * Upgrade to latest upstream. + * Upgrade to latest upstream. * Remove temporary patch for forgotten Makefile. * Add patch to fix aapits test suite Makefile. @@ -588,7 +614,7 @@ acpica-unix (20131115-1) unstable; urgency=low - * Update to latest upstream. + * Update to latest upstream. -- Al Stone Mon, 25 Nov 2013 15:31:42 -0700 @@ -600,25 +626,25 @@ acpica-unix (20130823-2) unstable; urgency=low - * Fix the run-misc-tests.sh script to enable running on s390x. + * Fix the run-misc-tests.sh script to enable running on s390x. -- Al Stone Tue, 10 Sep 2013 20:41:19 -0600 acpica-unix (20130823-1) unstable; urgency=low - * Update to latest upstream. + * Update to latest upstream. -- Al Stone Mon, 26 Aug 2013 13:36:15 -0600 acpica-unix (20130725-1) unstable; urgency=low - * Update to latest upstream. + * Update to latest upstream. -- Al Stone Sun, 18 Aug 2013 15:02:45 -0600 acpica-unix (20130626-1) unstable; urgency=low - * Update to latest upstream. + * Update to latest upstream. * Closes: bug#704822 -- properly clean up alternatives after purge; all the suggestions made in the bug have been applied * Closes: bug#714426 -- acpidump has been implemented for Linux @@ -667,7 +693,7 @@ acpica-unix (20130214-0.2) unstable; urgency=low * Non-maintainer upload. - * New upstream (since the last attempt at NMU). + * New upstream (since the last attempt at NMU). * Clarify the licensing: this is being released under GPLv2 as allowed under the original dual-licensing from Intel. * Corrected integer to pointer conversion resulting from an incorrect @@ -773,67 +799,67 @@ * Fix FTBFS on Debian/KFreeBsd. (Closes: #401617) * high urgency due to the RC bug being closed in -2. - + -- Mattia Dongili Mon, 04 Dec 2006 23:40:28 +0100 acpica-unix (20060912-2) unstable; urgency=high * Fix segfault compiling qemu's DSDT on powerpc (Closes: #401153) * high urgency due to the RC bug being closed. - + -- Mattia Dongili Mon, 04 Dec 2006 19:25:28 +0100 acpica-unix (20060912-1) unstable; urgency=low * New upstream release. * build-arch set to any as requested. (Closes: #389512) - + -- Mattia Dongili Mon, 02 Oct 2006 19:00:06 +0200 acpica-unix (20060707-1) unstable; urgency=low * New upstream release. - + -- Mattia Dongili Tue, 22 Aug 2006 19:29:39 +0200 - + acpica-unix (20060608-1) unstable; urgency=low * New upstream release. - + -- Mattia Dongili Tue, 27 Jun 2006 21:23:46 +0200 - + acpica-unix (20060421-1) unstable; urgency=low * New upstream release. * Upstream included the GNU/kFreeBSD patch * Added kfreebsd-amd64 architecture (Closes: #361610) - + -- Mattia Dongili Sat, 29 Apr 2006 09:16:49 +0200 - + acpica-unix (20060317-1) unstable; urgency=low * New upstream release. - + -- Mattia Dongili Tue, 28 Mar 2006 19:08:16 +0200 - + acpica-unix (20060217-1) unstable; urgency=low * New upstream release. - + -- Mattia Dongili Mon, 06 Mar 2006 19:53:22 +0100 - + acpica-unix (20060113-1) unstable; urgency=low * New upstream release. - + -- Mattia Dongili Sun, 22 Jan 2006 10:54:55 +0100 - + acpica-unix (20051216-1) unstable; urgency=low * New upstream release. - + -- Mattia Dongili Sun, 08 Jan 2006 16:25:12 +0100 - + acpica-unix (20051117-1) unstable; urgency=low * New upstream release. @@ -847,4 +873,3 @@ * Initial release Closes: #333603 -- Mattia Dongili Fri, 14 Oct 2005 19:16:28 +0200 - diff -Nru acpica-unix-20200925/debian/control acpica-unix-20200925/debian/control --- acpica-unix-20200925/debian/control 2021-03-21 19:46:41.000000000 +0000 +++ acpica-unix-20200925/debian/control 2021-09-13 19:19:09.000000000 +0000 @@ -3,9 +3,9 @@ Priority: optional Maintainer: Debian QA Group Build-Depends: debhelper (>= 10~), flex, bison -Standards-Version: 4.5.0 -Vcs-Git: https://github.com/ahs3/acpica-tools.git -Vcs-Browser: https://github.com/ahs3/acpica-tools +Standards-Version: 4.6.0 +Vcs-Git: https://salsa.debian.org/debian/acpica-unix.git +Vcs-Browser: https://salsa.debian.org/debian/acpica-unix Homepage: http://www.acpica.org Package: acpica-tools @@ -37,4 +37,3 @@ for specific environments -- acpixtract: extract binary ACPI tables from acpidump output (see also the pmtools package) - diff -Nru acpica-unix-20200925/debian/rules acpica-unix-20200925/debian/rules --- acpica-unix-20200925/debian/rules 2021-03-21 19:46:41.000000000 +0000 +++ acpica-unix-20200925/debian/rules 2021-09-13 19:19:09.000000000 +0000 @@ -48,24 +48,20 @@ # Commands to install the package into debian/acpica-tools install -m 755 generate/unix/bin/iasl $(DESTDIR)/usr/bin install -m 755 generate/unix/bin/acpibin $(DESTDIR)/usr/bin - install -m 755 generate/unix/bin/acpidump \ - $(DESTDIR)/usr/bin/acpidump-acpica + install -m 755 generate/unix/bin/acpidump $(DESTDIR)/usr/bin install -m 755 generate/unix/bin/acpiexec $(DESTDIR)/usr/bin install -m 755 generate/unix/bin/acpihelp $(DESTDIR)/usr/bin install -m 755 generate/unix/bin/acpisrc $(DESTDIR)/usr/bin - install -m 755 generate/unix/bin/acpixtract \ - $(DESTDIR)/usr/bin/acpixtract-acpica + install -m 755 generate/unix/bin/acpixtract $(DESTDIR)/usr/bin install -m 0644 debian/iasl.1 $(DESTDIR)/usr/share/man/man1 install -m 0644 debian/acpibin.1 $(DESTDIR)/usr/share/man/man1 - install -m 0644 debian/acpidump.1 \ - $(DESTDIR)/usr/share/man/man1/acpidump-acpica.1 + install -m 0644 debian/acpidump.1 $(DESTDIR)/usr/share/man/man1 install -m 0644 debian/acpiexamples.1 $(DESTDIR)/usr/share/man/man1 install -m 0644 debian/acpiexec.1 $(DESTDIR)/usr/share/man/man1 install -m 0644 debian/acpihelp.1 $(DESTDIR)/usr/share/man/man1 install -m 0644 debian/acpisrc.1 $(DESTDIR)/usr/share/man/man1 - install -m 0644 debian/acpixtract.1 \ - $(DESTDIR)/usr/share/man/man1/acpixtract-acpica.1 + install -m 0644 debian/acpixtract.1 $(DESTDIR)/usr/share/man/man1 override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))