Merge branch 'release/debian/1.8.19-7'HEADdebian/1.8.19-7master

6 files changed, 44 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 3dbba87..318a110 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ipmitool (1.8.19-7) unstable; urgency=medium
+
+  * debian/watch, debian/copyright, debian.control:
+    - Change URLs to the new homepage codeberg.org.
+  * New debian/patches/0625-manpage_wrong_time_set.patch:
+    - Fix wrong description of "sel time set" (Closes: #1058711).
+  * debian/changelog:
+    - Add Upstream-Contact.
+    - Change Duncan Laurie email.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 17 Dec 2023 12:29:04 +0100
+
 ipmitool (1.8.19-6) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index dd6d497..e070785 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Standards-Version: 4.6.2.0
 Rules-Requires-Root: no
 Vcs-Git: git://git.jff.email/ipmitool.git
 Vcs-Browser: https://git.jff.email/cgit/ipmitool.git
-Homepage: https://github.com/ipmitool/ipmitool
+Homepage: https://codeberg.org/IPMITool/ipmitool
 
 Package: ipmitool
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 26520f2..24432f1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,14 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
-Source: https://github.com/ipmitool/ipmitool
+Source: https://codeberg.org/IPMITool/ipmitool
+Upstream-Contact: Duncan Laurie <duncan@iceblink.org>
+
 
 Files: *
 Copyright: 1999-2002 Aladdin Enterprises
            2002-2008 Intel Corporation
            2003      Elmar Hoffmann 
            2003-2007 Kontron Canada, Inc.
-           2003      Ducan Laurie
+           2003      Duncan Laurie <duncan@iceblink.org>
            2003-2004 Fredrik Ohrn
            2003-2005 Sun Microsystems, Inc.
            2004-2008 Dell Inc.
@@ -20,7 +22,7 @@ Copyright: 1999-2002 Aladdin Enterprises
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2003-2005 Duncan Laurie <duncan@sun.com>
+Copyright: 2003-2005 Duncan Laurie <duncan@iceblink.org>
            2005      Seth Goldberg <sethmeisterg@hotmail.com>
            2005-2007 Petter Reinholdtsen <pere@debian.org>
            2007      Julien Cristau <jcristau@debian.org>
diff --git a/debian/patches/0625-manpage_wrong_time_set.patch b/debian/patches/0625-manpage_wrong_time_set.patch
new file mode 100644
index 0000000..41d6b48
--- /dev/null
+++ b/debian/patches/0625-manpage_wrong_time_set.patch
@@ -0,0 +1,24 @@
+Description: Fix description of "sel time set"
+Author: Jörg Frings-Fürst <debian@jff.email>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1058711
+Forwarded: https://codeberg.org/IPMITool/ipmitool/issues/18
+Last-Update: 2023-12-17
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/doc/ipmitool.1.in
+===================================================================
+--- trunk.orig/doc/ipmitool.1.in
++++ trunk/doc/ipmitool.1.in
+@@ -3077,9 +3077,9 @@ Displays the SEL clock's current time.
+ .br 
+ 
+ Sets the SEL clock.  Future SEL entries will use the time
+-set by this command.  <\fBtime string\fR> is of the
+-form "MM/DD/YYYY HH:MM:SS".  Note that hours are in 24\-hour
+-form.  It is recommended that the SEL be cleared before
++set by this command.  <\fBtime string\fR> is using the
++locale's date / time format. It is
++recommended that the SEL be cleared before
+ setting the time.
+ .RE
+ .RE
diff --git a/debian/patches/series b/debian/patches/series
index 2af2f95..9d62f03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0010-utf8.patch
 0110-unpdate_IANA_URL.patch
 0115-hurd_PATH_MAX.patch
+0625-manpage_wrong_time_set.patch
diff --git a/debian/watch b/debian/watch
index 616229c..040c2a4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -3,7 +3,7 @@ opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;s/\-/\./g;s/\_/\./g,\
 filenamemangle=s/(?:.*?)?(?:rel|v|ipmitool|IPMITOOL)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/ipmitool-$1.$2/ \
-https://github.com/ipmitool/ipmitool/tags \
+https://codeberg.org/ipmitool/ipmitool/tags \
 (?:.*?/)?(?:rel|v|ipmitool|IPMITOOL)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) \