diff -Nru distcc-3.3.2/AUTHORS distcc-3.3.3/AUTHORS
--- distcc-3.3.2/AUTHORS 2018-07-27 05:08:29.000000000 +0000
+++ distcc-3.3.3/AUTHORS 2019-08-14 19:07:05.000000000 +0000
@@ -1,6 +1,6 @@
Author and maintainer emeritus of distcc:
- Martin Pool
+ Martin Pool
Authors of "pump" functionality, and maintainers of distcc:
diff -Nru distcc-3.3.2/configure.ac distcc-3.3.3/configure.ac
--- distcc-3.3.2/configure.ac 2018-07-27 05:08:29.000000000 +0000
+++ distcc-3.3.3/configure.ac 2019-08-14 19:07:05.000000000 +0000
@@ -10,7 +10,7 @@
# As of 0.6cvs, distcc no longer uses automake, only autoconf.
AC_PREREQ(2.69)
-AC_INIT(distcc, 3.3.2, distcc@lists.samba.org)
+AC_INIT(distcc, 3.3.3, distcc@lists.samba.org)
AC_CONFIG_HEADERS(src/config.h)
@@ -22,7 +22,7 @@
# either set CPPFLAGS and LDFLAGS when running configure, or use
# --with-extra-foo.
-# Check for socklen_t, and do something appropiate on systems
+# Check for socklen_t, and do something appropriate on systems
# that don't have it.
AC_CHECK_TYPE([socklen_t], ,[
AC_MSG_CHECKING([for socklen_t equivalent])
@@ -59,7 +59,7 @@
#include ])
dnl Android requires -llog for printf and friends
-dnl and will only run position independant executables
+dnl and will only run position independent executables
AC_MSG_CHECKING([if building on Android])
AC_TRY_COMPILE([
#ifdef __BIONIC__
diff -Nru distcc-3.3.2/debian/changelog distcc-3.3.3/debian/changelog
--- distcc-3.3.2/debian/changelog 2019-05-12 07:48:36.000000000 +0000
+++ distcc-3.3.3/debian/changelog 2019-08-15 15:09:56.000000000 +0000
@@ -1,3 +1,15 @@
+distcc (3.3.3-1) unstable; urgency=medium
+
+ * New upstream bugfix release.
+
+ -- Christian Marillat Thu, 15 Aug 2019 17:09:56 +0200
+
+distcc (3.3.2-11) unstable; urgency=medium
+
+ * Update French translation of debconf messages (Closes: #926451)
+
+ -- Christian Marillat Sun, 12 May 2019 10:12:18 +0200
+
distcc (3.3.2-10) unstable; urgency=medium
* Add Pre-Depends: field to fix
diff -Nru distcc-3.3.2/debian/control distcc-3.3.3/debian/control
--- distcc-3.3.2/debian/control 2019-05-12 07:48:23.000000000 +0000
+++ distcc-3.3.3/debian/control 2019-05-12 08:12:18.000000000 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Christian Marillat
Homepage: https://distcc.github.io/
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
Build-Depends: debhelper-compat (= 12), libpopt-dev, libgtk2.0-dev, po-debconf,
dh-python, libiberty-dev, python3-dev | python3.7-dev, libavahi-client-dev,
libkrb5-dev
diff -Nru distcc-3.3.2/debian/distcc.triggers.in distcc-3.3.3/debian/distcc.triggers.in
--- distcc-3.3.2/debian/distcc.triggers.in 2018-12-23 08:37:55.000000000 +0000
+++ distcc-3.3.3/debian/distcc.triggers.in 2019-05-12 08:12:18.000000000 +0000
@@ -1,2 +1,3 @@
interest /usr/lib/gcc
+interest /usr/lib/clang
interest /usr/lib/%DEB_HOST_MULTIARCH%/gcc
diff -Nru distcc-3.3.2/debian/patches/01_Makefile.am.patch distcc-3.3.3/debian/patches/01_Makefile.am.patch
--- distcc-3.3.2/debian/patches/01_Makefile.am.patch 2018-12-20 16:05:39.000000000 +0000
+++ distcc-3.3.3/debian/patches/01_Makefile.am.patch 2019-08-15 15:09:56.000000000 +0000
@@ -10,7 +10,7 @@
dist_dirs = m4 include_server/test_data
-@@ -1040,7 +1041,7 @@ showpaths:
+@@ -1037,7 +1038,7 @@ showpaths:
# tricky features so mkinstalldirs and cp will do
install: showpaths install-doc install-man install-programs \
@@ -19,7 +19,7 @@
install-programs: $(bin_PROGRAMS) $(sbin_PROGRAMS)
$(mkinstalldirs) "$(DESTDIR)$(bindir)"
-@@ -1083,7 +1084,7 @@ install-include-server: include-server p
+@@ -1080,7 +1081,7 @@ install-include-server: include-server p
--build-base="$(include_server_builddir)" \
--build-temp="$(include_server_builddir)" \
install \
@@ -28,7 +28,7 @@
--record="$(include_server_builddir)/install.log.pre" \
--root="$$DESTDIR" \
|| exit 1; \
-@@ -1095,7 +1096,7 @@ install-include-server: include-server p
+@@ -1092,7 +1093,7 @@ install-include-server: include-server p
cp -f "$(include_server_builddir)/install.log" "$(PYTHON_INSTALL_RECORD)"; \
fi; \
$(mkinstalldirs) "$(DESTDIR)$(bindir)" && \
@@ -36,8 +36,8 @@
+ INCLUDE_SERVER="/usr/lib/distcc-pump/include_server/include_server.py" && \
sed "s,^include_server='',include_server='$$INCLUDE_SERVER'," \
pump > "$(include_server_builddir)/pump" && \
- $(INSTALL_PROGRAM) "$(include_server_builddir)/pump" "$(DESTDIR)$(bindir)"; \
-@@ -1128,10 +1129,14 @@ install-example: $(example_DOCS)
+ $(INSTALL_SCRIPT) "$(include_server_builddir)/pump" "$(DESTDIR)$(bindir)"; \
+@@ -1125,10 +1126,14 @@ install-example: $(example_DOCS)
$(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(docdir)/example" || exit 1; \
done
@@ -56,7 +56,7 @@
done
install-conf: $(conf_files) $(default_files)
-@@ -1217,11 +1222,16 @@ uninstall-example:
+@@ -1214,11 +1219,16 @@ uninstall-example:
-rmdir "$(DESTDIR)$(docdir)/example"
uninstall-gnome-data:
diff -Nru distcc-3.3.2/debian/patches/04_rename-pump.patch distcc-3.3.3/debian/patches/04_rename-pump.patch
--- distcc-3.3.2/debian/patches/04_rename-pump.patch 2018-12-18 15:19:20.000000000 +0000
+++ distcc-3.3.3/debian/patches/04_rename-pump.patch 2019-08-15 15:09:56.000000000 +0000
@@ -39,7 +39,7 @@
.TP
.B ,auth
Enables GSSAPI-based mutual authentication for this host.
-@@ -974,7 +974,7 @@ Other known bugs may be documented on
+@@ -980,7 +980,7 @@ Other known bugs may be documented on
distcc was written by Martin Pool , with the
co-operation of many scholars including Wayne Davison, Frerich Raabe,
Dimitri Papadopoulos and others noted in the NEWS file. Please report
@@ -48,7 +48,7 @@
.SH "LICENCE"
You are free to use distcc. distcc (including this manual) may be
copied, modified or distributed only under the terms of the GNU
-@@ -982,7 +982,7 @@ General Public Licence version 2 or late
+@@ -988,7 +988,7 @@ General Public Licence version 2 or late
absolutely no warrany. A copy of the GPL is included in the file
COPYING.
.SH "SEE ALSO"
@@ -56,7 +56,7 @@
+\fBdistccd\fR(1), \fBdistcc-pump\fR(1), \fBinclude_server\fR(1), \fBgcc\fR(1),
\fBmake\fR(1), and \fBccache\fR(1).
.I http://code.google.com/p/distcc/
- .I http://ccache.samba.org/
+ .I https://ccache.dev/
--- a/man/pump.1
+++ b/man/pump.1
@@ -1,23 +1,23 @@
diff -Nru distcc-3.3.2/debian/po/fr.po distcc-3.3.3/debian/po/fr.po
--- distcc-3.3.2/debian/po/fr.po 2019-01-26 15:21:38.000000000 +0000
+++ distcc-3.3.3/debian/po/fr.po 2019-04-18 10:02:33.000000000 +0000
@@ -11,7 +11,7 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: distcc@packages.debian.org\n"
"POT-Creation-Date: 2018-12-22 18:41+0100\n"
-"PO-Revision-Date: 2019-01-18 12:53+0100\n"
+"PO-Revision-Date: 2019-02-25 18:57+0100\n"
"Last-Translator: Quentin LEJARD \n"
"Language-Team: French \n"
"Language: fr\n"
@@ -72,10 +72,6 @@
#. Type: string
#. Description
#: ../distcc.templates:2001
-#| msgid ""
-#| "You can list multiple hosts and/or networks, separated by spaces. Hosts "
-#| "are represented by their IP address, networks have to be in CIDR "
-#| "notation, f.e. \"192.168.1.0/24\"."
msgid ""
"You can list multiple hosts and/or networks, separated by spaces. Hosts are "
"represented by their IP address, networks have to be in CIDR notation, e.g. "
@@ -151,15 +147,19 @@
#. Type: string
#. Description
#: ../distcc.templates:4001
+#| msgid ""
+#| "You can start the distcc daemon with a nice level, to give it a low "
+#| "priority compared to other processes. The start script will only accept "
+#| "values between 0 and 20."
msgid ""
"You can start the distcc daemon with a nice level, to give it a low priority "
"compared to other processes. The start script will only accept values "
-"between 0 and 20."
+"between 0 and 20."
msgstr ""
"Il est possible de lancer le démon distcc avec un niveau de politesse "
"permettant qu'il s'exécute avec une priorité inférieure à celle d'autres "
-"processus. Cette valeur dans le script de démarrage doit être un "
-"nombre entier compris entre 0 et 20 inclus."
+"processus. Cette valeur dans le script de démarrage doit être un nombre "
+"entier compris entre 0 et 20 inclus."
#. Type: string
#. Description
diff -Nru distcc-3.3.2/doc/example/init distcc-3.3.3/doc/example/init
--- distcc-3.3.2/doc/example/init 2018-07-27 05:08:29.000000000 +0000
+++ distcc-3.3.3/doc/example/init 2019-08-14 19:07:05.000000000 +0000
@@ -1,7 +1,7 @@
#! /bin/sh
#
# chkconfig: - 60 20
-# description: The distcc deamon
+# description: The distcc daemon
# http://code.google.com/p/distcc/
#
# processname: distccd
diff -Nru distcc-3.3.2/doc/protocol-1.txt distcc-3.3.3/doc/protocol-1.txt
--- distcc-3.3.2/doc/protocol-1.txt 2018-07-27 05:08:29.000000000 +0000
+++ distcc-3.3.3/doc/protocol-1.txt 2019-08-14 19:07:05.000000000 +0000
@@ -117,7 +117,7 @@
[note: Sending the parameter as hexadecimal is redundant, because four
bytes would be sufficient to encode the 32-bit integer. Sending as
-hexadecimal serves as a futher check that the client and server are
+hexadecimal serves as a further check that the client and server are
synchronized. Incorrect values for the parameter are detected as a
program or network error.]
diff -Nru distcc-3.3.2/doc/protocol-3.txt distcc-3.3.3/doc/protocol-3.txt
--- distcc-3.3.2/doc/protocol-3.txt 2018-07-27 05:08:29.000000000 +0000
+++ distcc-3.3.3/doc/protocol-3.txt 2019-08-14 19:07:05.000000000 +0000
@@ -72,7 +72,7 @@
Notes
-----
-This protocol is most useful in conjuction with an "include server" that
+This protocol is most useful in conjunction with an "include server" that
discovers, for each compilation unit, the list of needed files without
actually preprocessing. The protocol for talking to the include server
is simple: distcc sends a CDIR packet, and an ARGC/ARGV sequence with the
diff -Nru distcc-3.3.2/doc/web/benchmark.html distcc-3.3.3/doc/web/benchmark.html
--- distcc-3.3.2/doc/web/benchmark.html 2018-07-27 05:08:29.000000000 +0000
+++ distcc-3.3.3/doc/web/benchmark.html 2019-08-14 19:07:05.000000000 +0000
@@ -35,7 +35,7 @@
diff -Nru distcc-3.3.2/doc/web/compared.html distcc-3.3.3/doc/web/compared.html
--- distcc-3.3.2/doc/web/compared.html 2018-07-27 05:08:29.000000000 +0000
+++ distcc-3.3.3/doc/web/compared.html 2019-08-14 19:07:05.000000000 +0000
@@ -47,7 +47,7 @@
diff -Nru distcc-3.3.2/doc/web/compilers.html distcc-3.3.3/doc/web/compilers.html
--- distcc-3.3.2/doc/web/compilers.html 2018-07-27 05:08:29.000000000 +0000
+++ distcc-3.3.3/doc/web/compilers.html 2019-08-14 19:07:05.000000000 +0000
@@ -47,7 +47,7 @@
diff -Nru distcc-3.3.2/doc/web/distcc-lca-2004.html distcc-3.3.3/doc/web/distcc-lca-2004.html
--- distcc-3.3.2/doc/web/distcc-lca-2004.html 2018-07-27 05:08:29.000000000 +0000
+++ distcc-3.3.3/doc/web/distcc-lca-2004.html 2019-08-14 19:07:05.000000000 +0000
@@ -114,7 +114,7 @@
preprocessed text plus the compiler command line completely specifies
the output. By running the preprocessor locally, distcc avoids any
requirement to have the same headers on all machines.
-Before distcc, the compilercache and ccache programs used this
+
Before distcc, the compilercache and ccache programs used this
observation to remember the results of building a particular source
file. This can be useful when trees are cleaned and rebuilt, or when
similar trees are built in different directories.
@@ -649,7 +649,7 @@
A few maxims about demonstration of software projects have been borne
out by distcc's development. Before development began, a feasibility
study demonstrated that the concept could work. The design is
-intentionally simple and the scope modestly focussed on a subset of
+intentionally simple and the scope modestly focused on a subset of
important problems. Strong logging helps get useful results from
distributed community testing. Performance features such as
compression and new network APIs were used selectively in places where
diff -Nru distcc-3.3.2/doc/web/faq.html distcc-3.3.3/doc/web/faq.html
--- distcc-3.3.2/doc/web/faq.html 2018-07-27 05:08:29.000000000 +0000
+++ distcc-3.3.3/doc/web/faq.html 2019-08-14 19:07:05.000000000 +0000
@@ -44,7 +44,7 @@
@@ -737,7 +737,7 @@
Programs that use gcc's DEPENDENCIES_OUTPUT option don't work with ccache.
- This should be fixed in ccache 2.3. There is no problem with distcc.
+ This should be fixed in ccache 2.3. There is no problem with distcc.
distcc fails to build on OS X
@@ -816,7 +816,7 @@
This can affect other programs which rely on debug stabs, such as
addr2line, and it results in object files not being
byte-for-byte identical when they include the source directory. The
-same bug affects ccache.
+same bug affects ccache.
TCP_CORK in linux-2.2
diff -Nru distcc-3.3.2/doc/web/index.html distcc-3.3.3/doc/web/index.html
--- distcc-3.3.2/doc/web/index.html 2018-07-27 05:08:29.000000000 +0000
+++ distcc-3.3.3/doc/web/index.html 2019-08-14 19:07:05.000000000 +0000
@@ -34,7 +34,7 @@
@@ -159,7 +159,7 @@
-
- ccache
+ ccache
caches compiler output to accelerate builds.
-
dmucs helps distcc select
diff -Nru distcc-3.3.2/doc/web/man/distcc_1.html distcc-3.3.3/doc/web/man/distcc_1.html
--- distcc-3.3.2/doc/web/man/distcc_1.html 2018-07-27 05:08:29.000000000 +0000
+++ distcc-3.3.3/doc/web/man/distcc_1.html 2019-08-14 19:07:05.000000000 +0000
@@ -1291,6 +1291,6 @@
distccd(1), pump(1), include_server(1), gcc(1),
make(1), and ccache(1). http://code.google.com/p/distcc/
-http://ccache.samba.org/
+https://ccache.dev/