From 9cf908d4c2c09daef8e8b5ba8c271485ec88f99d Mon Sep 17 00:00:00 2001
From: Wengier <wengierwu@yahoo.com>
Date: Tue, 28 Dec 2021 22:38:44 -0500
Subject: [PATCH] more

---
 CHANGELOG                                           | 10 +++++-----
 contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in |  4 ++--
 include/build_timestamp.h                           |  4 ++--
 update-build-timestamp.pl                           |  5 +++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 69364a533..c4ad6fdcb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,4 @@
 0.83.21
-  - Fix IPL1 partition choice debug message to actually
-    show the partition index chosen, not the -partidx
-    option variable, which if not given by the user, is
-    -1 and was reported as a very large unsigned
-    number. (joncampbell123)
   - Improved clipboard copying & pasting for different
     code pages including box-drawing characters in DBCS
     code pages. Also, for the J-3100 mode, the selected
@@ -135,6 +130,11 @@
     segment. It is once again possible to make Mac OS X
     ARM releases and to use dylib files from Brew doing
     so. (joncampbell123)
+  - Fix IPL1 partition choice debug message to actually
+    show the partition index chosen, not the -partidx
+    option variable, which if not given by the user, is
+    -1 and was reported as a very large unsigned
+    number. (joncampbell123)
   - Fixed command-line options -starttool & -startmapper
     not showing messages from specified language file
     for Configuration Tool and Mapper Editor. (Wengier)
diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
index 49b4fdc8e..e313a475c 100644
--- a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
+++ b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2011-2021 Jonathan Campbell -->
+<!-- Copyright 2011-2022 Jonathan Campbell -->
 <component type="desktop">
   <id>com.dosbox_x.DOSBox-X</id>
   <project_license>GPL-2.0</project_license>
@@ -10,7 +10,7 @@
     <category>Emulation</category>
   </categories>
   <releases>
-          <release version="@PACKAGE_VERSION@" date="2021-12-26"/>
+          <release version="@PACKAGE_VERSION@" date="2021-12-28"/>
   </releases>
   <screenshots>
 	  <screenshot type="default">
diff --git a/include/build_timestamp.h b/include/build_timestamp.h
index 8e99885a2..54f9f5eed 100644
--- a/include/build_timestamp.h
+++ b/include/build_timestamp.h
@@ -1,4 +1,4 @@
 /*auto-generated*/
-#define UPDATED_STR "Dec 26, 2021 3:48:19pm"
-#define GIT_COMMIT_HASH "290e004"
+#define UPDATED_STR "Dec 28, 2021 10:34:45pm"
+#define GIT_COMMIT_HASH "f3caf64"
 #define COPYRIGHT_END_YEAR "2022"
diff --git a/update-build-timestamp.pl b/update-build-timestamp.pl
index a0a0b47cf..8f99b1226 100755
--- a/update-build-timestamp.pl
+++ b/update-build-timestamp.pl
@@ -7,6 +7,7 @@ my $hour = $t[2];
 my $mday = $t[3];
 my $mon  = $t[4] + 1;
 my $year = $t[5] + 1900;
+my $yearn = $year + ($mon == 12 && $mday == 31 ? 1 : 0);
 
 my @months = qw( Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec );
 
@@ -19,7 +20,7 @@ open(X,">","include/build_timestamp.h") || die;
 print X "/*auto-generated*/\n";
 print X "#define UPDATED_STR \"$tmp\"\n";
 print X "#define GIT_COMMIT_HASH \"$commit\"\n";
-print X "#define COPYRIGHT_END_YEAR \"$year\"\n";
+print X "#define COPYRIGHT_END_YEAR \"$yearn\"\n";
 close(X);
 
 # why perl....
@@ -34,7 +35,7 @@ while (my $line = <FILE>) {
 	if ($line =~ /date=/) {
 		push @lines, ("          <release version=\"\@PACKAGE_VERSION\@\" date=\"" . $year . "-" . $mon . "-" . $mday . "\"/>\n");
 	} elsif ($line =~ /<!-- Copyright/) {
-		push @lines, ("<!-- Copyright 2011-$year Jonathan Campbell -->\n");
+		push @lines, ("<!-- Copyright 2011-$yearn Jonathan Campbell -->\n");
 	} else {
 		push @lines, $line;
 	}