Merging debian version 3.6-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 18 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 29213b5..7603804 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+dmidecode (3.6-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #1069767).
+    - Rebase patches.
+    - Remove upstream applied patches:
+      + debian/patches/0155-use_read_file.patch
+      + debian/patches/0160-HPE_OEM_Firmware_change.patch
+  * debian/copyright:
+    - Add year 2024 to myself.
+    - Rebase to the new release.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 30 Jun 2024 20:32:37 +0200
+
 dmidecode (3.5-3~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/copyright b/debian/copyright
index f08d9fe..6a6a15f 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-2020 Jean Delvare <jdelvare@suse.de>
+Copyright: 2002-2024 Jean Delvare <jdelvare@suse.de>
            2002      Alan Cox <alan@redhat.com>
            2010      Anton Arapov <anton@redhat.com>
            2015      Xie XiuQi <xiexiuqi@huawei.com>
@@ -13,7 +13,7 @@ License: GPL-2+
 Files: debian/*
 Copyright: 2003-2007 Petter Reinholdtsen <pere@debian.org>
            2011-2012 Daniel Baumann <daniel.baumann@progress-technologies.net>
-           2014-2023 Jörg Frings-Fürst <debian@jff.email>
+           2014-2024 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/patches/0001-hurd.patch b/debian/patches/0001-hurd.patch
index 8f26387..0abfea9 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
-@@ -44,7 +44,7 @@ INSTALL_PROGRAM := $(INSTALL) -m 755
+@@ -45,7 +45,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 5219567..a923944 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,5 +11,5 @@
 #0130-use_DWORD_for_table_max_size.patch
 #0135-hide_fixup_msg.patch
 #0140-Fix_scan_entry_point.patch
-0155-use_read_file.patch
-0160-HPE_OEM_Firmware_change.patch
+#0155-use_read_file.patch
+#0160-HPE_OEM_Firmware_change.patch