diff -Nru xsensors-0.80/debian/changelog xsensors-0.80/debian/changelog
--- xsensors-0.80/debian/changelog 2023-09-23 12:56:46.000000000 +0000
+++ xsensors-0.80/debian/changelog 2023-12-29 15:43:07.000000000 +0000
@@ -1,3 +1,16 @@
+xsensors (0.80-1) unstable; urgency=medium
+
+ * Acknowledge NMU. Thanks to Bastian Germann for the upload!
+ (Closes: #853231, #967837)
+ * Update headers for forwarded patches
+ * Set Standards-Version to 4.6.2, no other changes
+ * Raise debhelper-compat level to 13
+ * Update watch file to version 4
+ * Update copyright author list and licenses
+ * Add patch to modernize appstream metadata
+
+ -- Ricardo Mones Fri, 29 Dec 2023 16:43:07 +0100
+
xsensors (0.80-0.1) unstable; urgency=medium
* Non-maintainer upload
diff -Nru xsensors-0.80/debian/control xsensors-0.80/debian/control
--- xsensors-0.80/debian/control 2023-09-23 12:56:46.000000000 +0000
+++ xsensors-0.80/debian/control 2023-12-29 15:43:07.000000000 +0000
@@ -2,8 +2,8 @@
Section: x11
Priority: optional
Maintainer: Ricardo Mones
-Build-Depends: debhelper-compat (= 12), libgtk-3-dev, libsensors-dev
-Standards-Version: 4.5.1
+Build-Depends: debhelper-compat (= 13), libgtk-3-dev, libsensors-dev
+Standards-Version: 4.6.2
Homepage: https://github.com/Mystro256/xsensors
Vcs-Git: https://salsa.debian.org/debian/xsensors.git
Vcs-Browser: https://salsa.debian.org/debian/xsensors
diff -Nru xsensors-0.80/debian/copyright xsensors-0.80/debian/copyright
--- xsensors-0.80/debian/copyright 2023-09-23 12:56:46.000000000 +0000
+++ xsensors-0.80/debian/copyright 2023-12-29 15:43:07.000000000 +0000
@@ -8,11 +8,17 @@
2002-2010 Kris Kersey
License: GPL-2+
+Files: xdg/xsensors.appdata.xml
+Copyright:
+ 2014 Jeremy Newton
+License: CC0-1.0
+
Files: debian/*
Copyright:
2002-2006 Nick Rusnov
2010-2013 Nanley Chery
- 2018-2019 Ricardo Mones
+ 2023 Bastian Germann
+ 2018-2023 Ricardo Mones
License: GPL-2+
License: GPL-2+
@@ -32,3 +38,31 @@
Comment:
On Debian systems, the complete text of the GNU General Public License
version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: CC0-1.0
+ A Work made available under CC0 may be protected by copyright and
+ related or neighboring rights ("Copyright and Related Rights").
+ Copyright and Related Rights include, but are not limited to, the
+ following:
+ .
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or
+ performer(s);
+ iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of
+ data in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of
+ the European Parliament and of the Council of 11 March 1996 on the
+ legal protection of databases, and under any national
+ implementation thereof, including any amended or successor version
+ of such directive); and
+ vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+Comment:
+ On Debian systems, the complete text of Creative Commons 0 License
+ version 1.0 can be found in '/usr/share/common-licenses/CC0-1.0'.
diff -Nru xsensors-0.80/debian/patches/modernize-appstream.patch xsensors-0.80/debian/patches/modernize-appstream.patch
--- xsensors-0.80/debian/patches/modernize-appstream.patch 1970-01-01 00:00:00.000000000 +0000
+++ xsensors-0.80/debian/patches/modernize-appstream.patch 2023-12-29 15:43:07.000000000 +0000
@@ -0,0 +1,58 @@
+Subject: modernize existing appstream metadata
+Author: Ricardo Mones
+Last-Update: 2023-12-26
+
+diff --git a/xdg/Makefile.am b/xdg/Makefile.am
+index 2a55b88..08187e8 100644
+--- a/xdg/Makefile.am
++++ b/xdg/Makefile.am
+@@ -23,7 +23,7 @@ desktopdir = $(datadir)/applications
+ desktop_DATA = \
+ xsensors.desktop
+
+-appdatadir = $(datadir)/appdata
++appdatadir = $(datadir)/metainfo
+
+ appdata_DATA = \
+ xsensors.appdata.xml
+diff --git a/xdg/xsensors.appdata.xml b/xdg/xsensors.appdata.xml
+index f9f998c..de48fea 100644
+--- a/xdg/xsensors.appdata.xml
++++ b/xdg/xsensors.appdata.xml
+@@ -1,7 +1,8 @@
+
+
+-
+- xsensors.desktop
++
++ com.github.mystro256.xsensors
++ xsensors.desktop
+ CC0-1.0
+ GPL-2.0+
+ XSensors
+@@ -14,9 +15,22 @@
+ This is a fork of an unmaintained project which can be found at linuxhardware.org.
+
+
++
++ System
++ Monitor
++
+
+- https://raw.githubusercontent.com/Mystro256/xsensors/master/screenshot.png
++
++ XSensors main window
++ https://raw.githubusercontent.com/Mystro256/xsensors/master/screenshot.png
++
+
+ https://github.com/Mystro256/xsensors
+- alexjnewt_at_hotmail.com
+-
++ alexjnewt_at_hotmail.com
++
++
++
++
++
++
++
diff -Nru xsensors-0.80/debian/patches/remove-gtk2-macro.patch xsensors-0.80/debian/patches/remove-gtk2-macro.patch
--- xsensors-0.80/debian/patches/remove-gtk2-macro.patch 2023-09-23 12:56:46.000000000 +0000
+++ xsensors-0.80/debian/patches/remove-gtk2-macro.patch 2023-12-29 15:43:07.000000000 +0000
@@ -1,6 +1,7 @@
From: Bastian Germann
-Date: Sat, 23 Sep 2023 12:54:10 +0000
Subject: Remove gtk2 macro
+Forwarded: https://github.com/Mystro256/xsensors/issues/10
+Last-Update: 2023-12-24
---
configure.ac | 4 ++--
diff -Nru xsensors-0.80/debian/patches/series xsensors-0.80/debian/patches/series
--- xsensors-0.80/debian/patches/series 2023-09-23 12:56:46.000000000 +0000
+++ xsensors-0.80/debian/patches/series 2023-12-29 15:43:07.000000000 +0000
@@ -1,2 +1,3 @@
specify-gui-failure.patch
remove-gtk2-macro.patch
+modernize-appstream.patch
diff -Nru xsensors-0.80/debian/patches/specify-gui-failure.patch xsensors-0.80/debian/patches/specify-gui-failure.patch
--- xsensors-0.80/debian/patches/specify-gui-failure.patch 2023-09-23 12:56:46.000000000 +0000
+++ xsensors-0.80/debian/patches/specify-gui-failure.patch 2023-12-29 15:43:07.000000000 +0000
@@ -2,8 +2,11 @@
The start_gui function only fails when no supported sensors are found;
update the error description to reflect that.
Author: Nanley Chery
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Forwarded: https://github.com/Mystro256/xsensors/issues/11
+Last-Update: 2023-12-29
+
+diff --git a/src/main.c b/src/main.c
+index 0d42566..b2f5939 100644
--- a/src/main.c
+++ b/src/main.c
@@ -214,7 +214,7 @@ int main( int argc, char **argv )
diff -Nru xsensors-0.80/debian/watch xsensors-0.80/debian/watch
--- xsensors-0.80/debian/watch 2023-09-23 12:56:46.000000000 +0000
+++ xsensors-0.80/debian/watch 2023-12-29 15:43:07.000000000 +0000
@@ -1,4 +1,2 @@
-# Compulsory line, this is a version 3 file
-version=3
-
-https://github.com/Mystro256/xsensors/tags .*/([\d\.]+)\.tar\.gz
+version=4
+https://github.com/Mystro256/xsensors/tags .*/@ANY_VERSION@@ARCHIVE_EXT@