summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2024-06-30 20:20:54 +0200
committerJörg Frings-Fürst <debian@jff.email>2024-06-30 20:20:54 +0200
commit6a1dea8c35cd6fa8d2726fa3ccffa02d7d445144 (patch)
treed25c0b427eff004cf0a79e173e2e70399265c302
parentc38426c9a9dd4efb236ef21d0c281d341445102a (diff)
Rebase patches and debian/copyright
-rw-r--r--debian/changelog13
-rw-r--r--debian/copyright2
-rw-r--r--debian/patches/0001-hurd.patch2
-rw-r--r--debian/patches/series4
4 files changed, 17 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 1461a99..f4398ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+dmidecode (3.6-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ - 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:02:38 +0200
+
dmidecode (3.5-3) unstable; urgency=medium
* Add loong64 to architecture list (Closes: #1050154).
diff --git a/debian/copyright b/debian/copyright
index f08d9fe..5e46c5a 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>
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