Merge ~ahasenack/ubuntu/+source/pppconfig:oracular-pppconfig-ftbfs-po4a into ubuntu/+source/pppconfig:ubuntu/devel

[Andreas Hasenack]

Part 1 of the fix for LP: #2078254. Source of the patch is in the commit message.

The second part is in the po4a package, subject to another PR.

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/ftbfs-oracular/+packages

[Athos Ribeiro (athos)]

LGTM; I added an inline comment for the changelog: I do not think we do need the author name in brackets in the beginning of the changelog given they are the only author here.

Feel free to upload after evaluating and possibly acting upon the comment though :)

review: Approve

[Andreas Hasenack (ahasenack)]

This can only be uploaded after po4a (https://code.launchpad.net/~ahasenack/ubuntu/+source/po4a/+git/po4a/+merge/472166 is in proposed.

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: ahasenack, athos-ribeiro
Uploaders: ahasenack, athos-ribeiro
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

Uploaded after po4a got published:
Uploading pppconfig_2.3.28ubuntu1.dsc
Uploading pppconfig_2.3.28ubuntu1.tar.xz
Uploading pppconfig_2.3.28ubuntu1_source.buildinfo
Uploading pppconfig_2.3.28ubuntu1_source.changes

diff --git a/debian/changelog b/debian/changelog
index 344ecaa..3786177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pppconfig (2.3.28ubuntu1) oracular; urgency=medium
+
+  * man/po/pppconfig.pot, man/po4a.cfg: specify that the french addendum has
+    encoding iso-8859-1. Fixes build with new po4a (Closes: #107260
+    LP: #2078254)
+
+ -- Alessandro Astone <[e-mail]>  Tue, 20 Aug 2024 15:20:42 +0200
+
 pppconfig (2.3.28) unstable; urgency=medium
 
   * QA upload.
diff --git a/debian/control b/debian/control
index d9e270d..2363e72 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: pppconfig
 Section: admin
 Priority: optional
-Maintainer: Debian QA Group <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian QA Group <[e-mail]>
 Standards-Version: 3.9.2
 Build-Depends-Indep: debianutils (>= 2.10.3)
 Build-Depends: debhelper-compat (= 10), pkgconf, po4a, systemd-dev
diff --git a/man/po/pppconfig.pot b/man/po/pppconfig.pot
index f9ec2dc..a127789 100644
--- a/man/po/pppconfig.pot
+++ b/man/po/pppconfig.pot
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-07 20:27+0300\n"
+"POT-Creation-Date: 2024-08-20 15:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: TH
diff --git a/man/po4a.cfg b/man/po4a.cfg
index d8df7dc..9f4c756 100644
--- a/man/po4a.cfg
+++ b/man/po4a.cfg
@@ -1,2 +1,3 @@
 [po4a_paths] man/po/pppconfig.pot fr:man/po/fr.po de:man/po/de.po pt:man/po/pt.po
-[type: man] man/pppconfig.8 fr:man/pppconfig.fr.8 add_fr:man/pppconfig.add.fr de:man/pppconfig.de.8 add_de:man/pppconfig.add.de pt:man/pppconfig.pt.8
+[type: man] man/pppconfig.8 fr:man/pppconfig.fr.8 add_fr:man/pppconfig.add.fr de:man/pppconfig.de.8 add_de:man/pppconfig.add.de pt:man/pppconfig.pt.8 \
+            opt_fr:"--addendum-charset iso-8859-1"