Hello László, Am Mon, Jul 29, 2024 at 03:20:55PM +0200 schrieb László Böszörményi (GCS): > Nice to see you again at DebConf.
Sorry, I'm not there.
> On Mon, Jul 29, 2024 at 3:18 PM Helge Kreutzmann <deb...@helgefjell.de> wrote:
> > I intent to NMU apt-src to fix its trivial FTFBS bug (essentially a
> > recode latin1..utf8 is the fix).
> Please just provide all the patches and I can review those. Then I
> will upload the package, giving you all the credits of course.
Sure.
Here is it step by step:
* Recode French addendum into UTF-8 (closes: 1073483).
Simply execute
recode latin1..utf8 ./man/apt-src.add.fr
* Add German man page translation (closes: 1026782).
Drop the file provided in bug 1026782 into ./man/po/
You will need to update both Makefile.PL as well man/po4a.cfg, the
complete patch is below (for all languages).
* And also add German addendum.
This I wrote from scratch because I realized that it sensible to have,
I attached this file.
* Add Dutch man page translation (closes: 1070916).
Drop the file provided in bug 1070916 into ./man/po/ and gunzip it.
You will need to update both Makefile.PL as well man/po4a.cfg, the
complete patch is below (for all languages).
* Add Portuguese man page translation (closes: 980162).
Drop the file provided in bug 980162 into ./man/po/ and gunzip it.
You will need to update both Makefile.PL as well man/po4a.cfg, the
complete patch is below (for all languages).
The build system of apt-src is not very flexible regarding po4a.
Instead of replacing it with a flexible version I simply updated the
current build code as follows:
--- apt-src-0.25.3/Makefile.PL 2021-01-10 13:41:24.000000000 +0100
+++ apt-src-0.25.3.1/Makefile.PL 2024-07-29 13:47:47.904304104 +0200
@@ -5,7 +5,10 @@
'EXE_FILES' => ['apt-src'],
'MAN1PODS' =>
{ 'man/apt-src.pod' => 'man/apt-src.1',
+ 'man/apt-src.de.pod' => 'man/apt-src.de.1',
'man/apt-src.es.pod' => 'man/apt-src.es.1',
+ 'man/apt-src.nl.pod' => 'man/apt-src.nl.1',
+ 'man/apt-src.pt.pod' => 'man/apt-src.pt.1',
'man/apt-src.fr.pod' => 'man/apt-src.fr.1', },
'clean' =>
{ FILES => "man/apt-src*.1 man/apt-src.*.pod"},
--- apt-src-0.25.3/man/po4a.cfg 2021-01-10 13:41:24.000000000 +0100
+++ apt-src-0.25.3.1/man/po4a.cfg 2024-07-29 13:48:37.548494119 +0200
@@ -1,3 +1,7 @@
-[po4a_paths] man/po/apt-src.pot fr:man/po/fr.po es:man/po/es.po
+[po4a_paths] man/po/apt-src.pot de:man/po/de.po es:man/po/es.po
fr:man/po/fr.po nl:man/po/nl.po pt:man/po/pt.po
[type: pod] man/apt-src.pod fr:man/apt-src.fr.pod add_fr:man/apt-src.add.fr \
- es:man/apt-src.es.pod add_es:man/apt-src.add.es
+ es:man/apt-src.es.pod add_es:man/apt-src.add.es \
+ de:man/apt-src.de.pod add_de:man/apt-src.add.de \
+ nl:man/apt-src.nl.pod \
+ pt:man/apt-src.pt.pod
* Resolve issues in apt-src man page (closes: 1026896).
I basically implemented the patch described in 1026896, however, with
some further tweaks.
I attached the patch.
Mostly editorial, but the pine → mutt change and my (small) change
regarding make-kpkg might draw your attention.
If you are fine with this patch (or a derived version of it) then
I will provide you with two more changes:
* Unfuzzy all translations
Currently, you build fails because all translations are outdated. Most
changes proposed, however, can be easily updated for all langauges. It
is just a bit of routine work, and you will get patches for all po
files.
* Requeste updates from translators
Very few updated strings (maybe only one or two) require attention
from a real translator. I would ask them to send in the updates. I
would give them ~ 2 weeks to make these small updates, and then could
can upload.
There is one more change I would like to do. debian/copyright is not
in the modern format, but instead of researching all contributors I
would like to propose the following patch (which needs updates, once
the translators responded):
--- apt-src-0.25.3/debian/copyright 2003-10-15 04:24:26.000000000 +0200
+++ apt-src-0.25.3.1/debian/copyright 2024-07-29 13:31:03.523369786 +0200
@@ -7,3 +7,12 @@
On Debian systems, the complete text of the GPL is in the file
/usr/share/common-licenses/GPL
+
+The man page of apt-src was translated into the following languages:
+Dutch Frans Spiesschaert <frans.spiesscha...@yucom.be> 2024
+French Valery Perrin <valery.perrin.deb...@free.fr> 2003
+ Julien Louis <arthu...@ifrance.com> 2007
+German Helge Kreutzmann <deb...@helgefjell.de> 2022,2024
+Portuguese Américo Monteiro <a_monte...@gmx.com> 2021
+Spanish Ruben Porras <naho...@telefonica.net> 2003,2004
That's it.
If you have any questions please let me know.
Greetings
Helge
--
Dr. Helge Kreutzmann deb...@helgefjell.de
Dipl.-Phys. http://www.helgefjell.de/debian.php
64bit GNU powered gpg signed mail preferred
Help keep free software "libre": http://www.ffii.de/
PO4A-HEADER:mode=after;position=AUTOR;beginboundary=^head1 =head1 ÜBERSETZUNG Diese Handbuchseite wurde von Helge Kreutzmann <deb...@helgefjell.de> übersetzt. Diese Übersetzung ist Freie Dokumentation; lesen Sie die https://www.gnu.org/licenses/gpl-3.0.html GNU General Public License Version 3 oder neuer bezüglich der Copyright-Bedingungen. Es wird KEINE HAFTUNG übernommen. Wenn Sie Fehler in der Übersetzung dieser Handbuchseite finden, schicken Sie bitte eine E-Mail an die Mailingliste der Übersetzer: debian-l10n-ger...@lists.debian.org Um die englische Originalversion der Handbuchseite anzuzeigen, rufen Sie bitte S<« man -L en apt-src »> auf. =cut
--- apt-src-0.25.3/man/apt-src.pod 2021-01-10 13:41:24.000000000 +0100 +++ apt-src-0.25.3.1/man/apt-src.pod 2024-07-29 14:55:36.320728827 +0200 @@ -6,13 +6,13 @@ B<apt-src> [S<I<options>>] S<I<command>> -B<apt-src> [S<I<options>>] S<I<install|remove>> pkg1 [pkg2 ...] +B<apt-src> [S<I<options>>] S<B<install|remove>> pkg1 [pkg2 ...] B<apt-src> S<I<location>> pkg =head1 DESCRIPTION -apt-src is a command line interface for downloading, installing, upgrading, +B<apt-src> is a command line interface for downloading, installing, upgrading, and tracking debian source packages. It can be run as a normal user, or as root. @@ -30,7 +30,7 @@ =item update -Update the lists of available packages. Identical to apt-get update, really, +Update the lists of available packages. Identical to B<apt-get update>, really, and must be run as root in the default configuration. =item install @@ -40,7 +40,7 @@ to upgrade it. This command will accept the names of binary packages, or source packages. -Just like with apt-get install, you can prefix the name with =version or +Just like with B<apt-get install>, you can prefix the name with =version or /release to specify what version to install or what release to take the source from. @@ -48,7 +48,7 @@ satisfied. If the --location option is given, the source package will be installed or -upgraded into the given location instead of the current directory. +upgraded into the given I<location> instead of the current directory. If the --build option is given, each newly installed or upgraded package will be compiled. @@ -58,7 +58,7 @@ Upgrade all installed source packages, or, if the --location or --here options are used, update only source packages in the specified directory. -If the --patch option is given (the default), apt-src will attempt to +If the --patch option is given (the default), B<apt-src> will attempt to generate a patch containing any local changes made to the source package, and will apply this patch to the updated tree. This will allow your local changes to be preserved across package upgrades, but it may not always work, @@ -84,9 +84,9 @@ =item import -Use this option to let apt-src know about an existing, unpacked source +Use this option to let B<apt-src> know about an existing, unpacked source tree. Besides the name under which it should be imported, you must specify -the location of the source tree (with --location), and you may need to tell +the I<location> of the source tree (with --location), and you may need to tell the version of the source (with --version). Don't expect the build command to work on this source, unless it has a debian/ directory. @@ -126,13 +126,13 @@ All command line options may be set using the configuration file, the descriptions indicate the configuration option to set. For boolean options you can override the defaults file by using something like --f-,--no-f, -f=no or several other variations. +-f-, --no-f, -f=no or several other variations. =over 4 =item B<-h>, B<--help> -Show this help text. +Show a help text. =item B<-b>, B<--build>, B<--compile> @@ -185,7 +185,7 @@ =item B<-q>, B<--quiet> -Direct all command output to /dev/null unless a command fails to run as +Direct all command output to I</dev/null> unless a command fails to run as expected. Configuration item: APT::Src::Quiet =item B<-t>, B<--trace> @@ -195,7 +195,7 @@ =back In addition to the above options, some less-used configuration items may only -be specified in the config files, /etc/apt/apt.conf and ~/.apt-src/config. +be specified in the config files, I</etc/apt/apt.conf> and I<~/.apt-src/config>. They are: =over 4 @@ -203,17 +203,17 @@ =item APT::Src::BuildCommand The command to use to build a tree. Run in the tree to build, it defaults to -"dpkg-buildpackage -b -us -uc", with "-rfakeroot" appended for non-root users. +"B<dpkg-buildpackage -b -us -uc>", with "-rfakeroot" appended for non-root users. =item APT::Src::RootCommand The command to use if a non-root user needs to become root. This is used for, -example, to satisfy build-deps. sudo is a good choice and the default. -If you want to use su, you'll need to set it to "su -c". +example, to satisfy build-deps. L<sudo(8)> is a good choice and the default. +If you want to use L<su(1)>, you'll need to set it to "B<su -c>". =item APT::Src::BuildDeps -Controls whether apt-src makes sure a source package's build dependencies are +Controls whether B<apt-src> makes sure a source package's build dependencies are installed when installing or upgrading it. Defaults to true, if you turn it off, packages may fail to build due to missing build dependencies. @@ -228,7 +228,7 @@ installing a new source package. The rest of the time, when dealing with already installed packages, you -currently have to use the source package names (this may later changes). +currently have to use the source package names (this may later change). However, you may use regexps as part of the names. =head1 ENVIRONMENT @@ -237,15 +237,15 @@ =head1 EXAMPLES -To install the source to pine to /usr/src, build it, and install +To install the source to L<mutt(1)> to I</usr/src>, build it, and install the resulting debs: - apt-src install --location=/usr/src -i pine + apt-src install --location=/usr/src -i mutt -To track changes to said installed pine source package, and install debs +To track changes to said installed L<mutt(1)> source package, and install debs whenever a new version comes out: - apt-src install -i pine + apt-src install -i mutt To install a local copy of package foo, which you are going to apply a local patch to: @@ -260,15 +260,15 @@ apt-src install -i foo -To import the source tree in /usr/src/linux, which you unpacked from -a ftp.kernel.org tarball (or from the kernel-source package) into -apt-src, so it knows about it: +To import the source tree in I</usr/src/linux>, which you unpacked from +a www.kernel.org tarball (or from the kernel-source package) into +B<apt-src>, so it knows about it: apt-src import kernel --location=/usr/src/linux --version=2.4.18 -In a debian/rules of a kernel module package that needs to figure out if it is -being built by apt-src, and if so set the KVERS, KSRC. and KDREV variables that -make-kpkg normally sets: +In a I<debian/rules> of a kernel module package that needs to figure out if it is +being built by B<apt-src>, and if so set the KVERS, KSRC and KDREV variables that +L<make-kpkg(1)> used to set: ifdef APT_SRC_BUILD KDREV=$(shell apt-src version kernel\(-source.\*\)\?) @@ -286,15 +286,15 @@ =item ~/.apt-src/status -apt-src's status file, lists installed packages. +B<apt-src>'s status file, lists installed packages. =item /etc/apt/apt.conf -Global config file for apt-src (and apt). +Global config file for B<apt-src> (and L<apt(8)>). =item ~/.apt-src/config -Per-user config file for apt-src. +Per-user config file for B<apt-src>. =back
signature.asc
Description: PGP signature
