summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 10:28:19 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 10:28:19 +0000
commit9045d73e82f0bdf66ef4b91ccfdbd7663e998444 (patch)
tree6290b97a5089074ce3c528bb7d2bad8b48c61625 /debian
parentMerging upstream version 3.6. (diff)
downloaddmidecode-debian.tar.xz
dmidecode-debian.zip
Adding debian version 3.6-1.debian/3.6-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog13
-rw-r--r--debian/copyright4
-rw-r--r--debian/patches/0001-hurd.patch2
-rw-r--r--debian/patches/series4
4 files changed, 18 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 1461a99..9754bbe 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) unstable; urgency=medium
* Add loong64 to architecture list (Closes: #1050154).
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