From d637b66a28e92e35d520ffd9b58ec7aa49561366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 17 Oct 2020 09:55:16 +0200 Subject: Remove/Refresh patches --- debian/changelog | 10 ++++++++++ debian/patches/0001-hurd.patch | 2 +- debian/patches/series | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 93c7256..0250bd8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +dmidecode (3.3-1) UNRELEASED; urgency=medium + + * New upstream release. + - Remove upstream applied patches: + + debian/patches/0140-Fix_scan_entry_point.patch + + debian/patches/0005-build.patch + + Refresh debian/patches/0001-hurd.patch. + + -- Jörg Frings-Fürst Sat, 17 Oct 2020 09:31:22 +0200 + dmidecode (3.2-4) unstable; urgency=medium * Add "Restrictions: superficial" to debian/tests/control (Closes: #969819). diff --git a/debian/patches/0001-hurd.patch b/debian/patches/0001-hurd.patch index 236cdea..8f26387 100644 --- a/debian/patches/0001-hurd.patch +++ b/debian/patches/0001-hurd.patch @@ -5,7 +5,7 @@ Index: trunk/Makefile =================================================================== --- trunk.orig/Makefile +++ trunk/Makefile -@@ -43,7 +43,7 @@ INSTALL_PROGRAM := $(INSTALL) -m 755 +@@ -44,7 +44,7 @@ INSTALL_PROGRAM := $(INSTALL) -m 755 RM := rm -f # BSD make provides $MACHINE, but GNU make doesn't diff --git a/debian/patches/series b/debian/patches/series index fb5d205..b13a143 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,6 @@ 0100-ansi-c.patch 0001-hurd.patch -0005-build.patch +#0005-build.patch #0105-dmidecode-avoid-sigbus.patch #0110-nosysfs.patch #0115-no_smbios_DMI_entry_point.patch @@ -8,4 +8,4 @@ #0125-use_read_file_to_read_DMI_table_from_sysfs.patch #0130-use_DWORD_for_table_max_size.patch #0135-hide_fixup_msg.patch -0140-Fix_scan_entry_point.patch +#0140-Fix_scan_entry_point.patch -- cgit v1.2.3 From 7e46f08dfb18fc928aaca9ee232c649280a7e6b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 17 Oct 2020 09:57:19 +0200 Subject: Declare compliance with Debian Policy 4.5.0 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0250bd8..a6259f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ dmidecode (3.3-1) UNRELEASED; urgency=medium + debian/patches/0140-Fix_scan_entry_point.patch + debian/patches/0005-build.patch + Refresh debian/patches/0001-hurd.patch. + * Declare compliance with Debian Policy 4.5.0 (No changes needed). -- Jörg Frings-Fürst Sat, 17 Oct 2020 09:31:22 +0200 diff --git a/debian/control b/debian/control index 81ebc58..45b03fd 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: debhelper-compat (= 12) -Standards-Version: 4.4.1.2 +Standards-Version: 4.5.0 Rules-Requires-Root: no Vcs-Git: git://jff.email/opt/git/dmidecode.git Vcs-Browser: https://jff.email/cgit/dmidecode.git/ -- cgit v1.2.3 From d817888604706aa649f8809968d84f67c77bcb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 17 Oct 2020 10:02:33 +0200 Subject: Migrate to debhelper 13 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a6259f7..c3379fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ dmidecode (3.3-1) UNRELEASED; urgency=medium + debian/patches/0005-build.patch + Refresh debian/patches/0001-hurd.patch. * Declare compliance with Debian Policy 4.5.0 (No changes needed). + * Migrate to debhelper 13: + - Bump debhelper-compat version in debian/control to = 13. -- Jörg Frings-Fürst Sat, 17 Oct 2020 09:31:22 +0200 diff --git a/debian/control b/debian/control index 45b03fd..2905d75 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: dmidecode Section: utils Priority: optional Maintainer: Jörg Frings-Fürst -Build-Depends: debhelper-compat (= 12) +Build-Depends: debhelper-compat (= 13) Standards-Version: 4.5.0 Rules-Requires-Root: no Vcs-Git: git://jff.email/opt/git/dmidecode.git -- cgit v1.2.3 From 2e52bde97820f10f720204c98fcf4add19e06ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 17 Oct 2020 10:09:50 +0200 Subject: Remove unused debian/source/include-binaries --- debian/changelog | 1 + debian/source/include-binaries | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 debian/source/include-binaries (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c3379fd..91d348c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ dmidecode (3.3-1) UNRELEASED; urgency=medium * Declare compliance with Debian Policy 4.5.0 (No changes needed). * Migrate to debhelper 13: - Bump debhelper-compat version in debian/control to = 13. + * Remove unused debian/source/include-binaries. -- Jörg Frings-Fürst Sat, 17 Oct 2020 09:31:22 +0200 diff --git a/debian/source/include-binaries b/debian/source/include-binaries deleted file mode 100644 index a610508..0000000 --- a/debian/source/include-binaries +++ /dev/null @@ -1 +0,0 @@ -debian/upstream/signing-key.pgp -- cgit v1.2.3 From ea0d3509aa629af504f511e5570ca6683c9ce6ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 17 Oct 2020 10:13:54 +0200 Subject: Remove superficial test --- debian/changelog | 1 + debian/tests/control | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 debian/tests/control (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 91d348c..abb78d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ dmidecode (3.3-1) UNRELEASED; urgency=medium * Migrate to debhelper 13: - Bump debhelper-compat version in debian/control to = 13. * Remove unused debian/source/include-binaries. + * Remove superficial test. -- Jörg Frings-Fürst Sat, 17 Oct 2020 09:31:22 +0200 diff --git a/debian/tests/control b/debian/tests/control deleted file mode 100644 index 1b92f83..0000000 --- a/debian/tests/control +++ /dev/null @@ -1,4 +0,0 @@ -# smoke test -Test-Command: /usr/sbin/dmidecode -V -Depends: dmidecode -Restrictions: superficial -- cgit v1.2.3 From 1fb5623da4dd3c6f8ae6e4121473f0a4cb3e10de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 17 Oct 2020 10:17:21 +0200 Subject: d/copyright: Add year 2020 to Jean Delvare and myself --- debian/changelog | 2 ++ debian/copyright | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index abb78d4..488999d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ dmidecode (3.3-1) UNRELEASED; urgency=medium - Bump debhelper-compat version in debian/control to = 13. * Remove unused debian/source/include-binaries. * Remove superficial test. + * debian/copyright: + - Add year 2020 to Jean Delvare and myself. -- Jörg Frings-Fürst Sat, 17 Oct 2020 09:31:22 +0200 diff --git a/debian/copyright b/debian/copyright index 2578c43..a7f582a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: dmidecode-devel@nongnu.org Source: http://download.savannah.gnu.org/releases/demidecode/ Files: * -Copyright: 2002-2019 Jean Delvare +Copyright: 2002-2020 Jean Delvare 2002 Alan Cox 2010 Anton Arapov 2015 Xie XiuQi @@ -13,7 +13,7 @@ License: GPL-2+ Files: debian/* Copyright: 2003-2007 Petter Reinholdtsen 2011-2012 Daniel Baumann - 2014-2019 Jörg Frings-Fürst + 2014-2020 Jörg Frings-Fürst License: GPL-2+ License: GPL-2+ -- cgit v1.2.3 From 6b9dcbb04abee53b6561d690c077c048795c3874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 17 Oct 2020 10:33:41 +0200 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 488999d..207025c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dmidecode (3.3-1) UNRELEASED; urgency=medium +dmidecode (3.3-1) unstable; urgency=medium * New upstream release. - Remove upstream applied patches: @@ -13,7 +13,7 @@ dmidecode (3.3-1) UNRELEASED; urgency=medium * debian/copyright: - Add year 2020 to Jean Delvare and myself. - -- Jörg Frings-Fürst Sat, 17 Oct 2020 09:31:22 +0200 + -- Jörg Frings-Fürst Sat, 17 Oct 2020 10:31:23 +0200 dmidecode (3.2-4) unstable; urgency=medium -- cgit v1.2.3