Package: libnatpmp-dev
Version: libnatpmp-dev
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu mantic ubuntu-patch
The recent version update makes rhythmbox fail to build
https://launchpadlibrarian.net/685172815/buildlog_ubuntu-mantic-amd64.transmission_4.0.2-1ubuntu3_BUILDING.txt.gz
The issue is that natpmp.h includes natpmp_declspec.h now but that file
isn't getting installed. The attached patch fixes the issuediff -Nru tlp-1.6.0/debian/changelog tlp-1.6.0/debian/changelog
--- tlp-1.6.0/debian/changelog 2023-08-30 15:02:39.000000000 +0200
+++ tlp-1.6.0/debian/changelog 2023-09-04 20:43:27.000000000 +0200
@@ -1,3 +1,10 @@
+tlp (1.6.0-2) UNRELEASED; urgency=medium
+
+ * Remove the conflicts with power-profile-daemon, the new version
+ has been made to adapt its behaviour when the service is installed
+
+ -- Sebastien Bacher <seb...@ubuntu.com> Mon, 04 Sep 2023 20:43:27 +0200
+
tlp (1.6.0-1) unstable; urgency=medium
* New upstream version 1.6.0
diff -Nru tlp-1.6.0/debian/control tlp-1.6.0/debian/control
--- tlp-1.6.0/debian/control 2023-08-30 15:02:24.000000000 +0200
+++ tlp-1.6.0/debian/control 2023-09-04 20:43:10.000000000 +0200
@@ -13,7 +13,7 @@
Depends: hdparm, iw, pciutils, rfkill, usbutils, ${misc:Depends}
Recommends: tlp-rdw, ethtool
Suggests: tp-smapi-dkms, smartmontools, ${dist:Suggests}
-Conflicts: laptop-mode-tools, power-profiles-daemon
+Conflicts: laptop-mode-tools
Description: Optimize laptop battery life
TLP is a feature-rich command-line utility, saving laptop battery power
without the need to delve deeper into technical details.
diff -Nru libnatpmp-20230423/debian/changelog libnatpmp-20230423/debian/changelog
--- libnatpmp-20230423/debian/changelog 2023-08-06 04:55:08.000000000 +0200
+++ libnatpmp-20230423/debian/changelog 2023-09-11 13:13:49.000000000 +0200
@@ -1,3 +1,11 @@
+libnatpmp (20230423-2) UNRELEASED; urgency=medium
+
+ * debian/patches/install-extra-header.patch:
+ - install an extra header which is included by natpmp.h since the new
+ version but not added to the list of files to install
+
+ -- Sebastien Bacher <seb...@ubuntu.com> Mon, 11 Sep 2023 13:13:49 +0200
+
libnatpmp (20230423-1) unstable; urgency=medium
* New upstream release.
diff -Nru libnatpmp-20230423/debian/patches/install-extra-header.patch libnatpmp-20230423/debian/patches/install-extra-header.patch
--- libnatpmp-20230423/debian/patches/install-extra-header.patch 1970-01-01 01:00:00.000000000 +0100
+++ libnatpmp-20230423/debian/patches/install-extra-header.patch 2023-09-11 13:12:55.000000000 +0200
@@ -0,0 +1,13 @@
+Index: libnatpmp-20230423/Makefile
+===================================================================
+--- libnatpmp-20230423.orig/Makefile 2023-09-11 13:11:03.000000000 +0200
++++ libnatpmp-20230423/Makefile 2023-09-11 13:11:48.025966300 +0200
+@@ -56,7 +56,7 @@
+ endif
+ endif
+
+-HEADERS = natpmp.h
++HEADERS = natpmp.h natpmp_declspec.h
+
+ EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
+
diff -Nru libnatpmp-20230423/debian/patches/series libnatpmp-20230423/debian/patches/series
--- libnatpmp-20230423/debian/patches/series 2023-08-06 04:55:08.000000000 +0200
+++ libnatpmp-20230423/debian/patches/series 2023-09-11 13:13:41.000000000 +0200
@@ -1,3 +1,4 @@
makefile-fix-os-detect-and-ldflags.patch
python-module-3.patch
python-module-use-shared-lib.patch
+install-extra-header.patch
