This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch stretch in repository wine.
commit 1be4140e6a9a17fd2826536dff553d45ac72b865 Author: Jens Reyer <[email protected]> Date: Thu Jul 28 17:34:30 2016 +0200 Fix wineserver manpages for Debian's default persistence value. See: #816020. # Conflicts: # debian/changelog --- debian/changelog | 8 +++++ .../patches/manpages-wineserver-persistence.patch | 37 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 46 insertions(+) diff --git a/debian/changelog b/debian/changelog index 505b339..a1e0578 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +wine (1.8.3-3) UNRELEASED; urgency=medium + + * Cherrypick changes from master: + - Fix wineserver manpages for Debian's default persistence value (see: + #816020). + + -- Jens Reyer <[email protected]> Thu, 28 Jul 2016 17:33:38 +0200 + wine (1.8.3-2) unstable; urgency=medium * Backport upstream changes for building with Unicode 9.0 (closes: #829003). diff --git a/debian/patches/manpages-wineserver-persistence.patch b/debian/patches/manpages-wineserver-persistence.patch new file mode 100644 index 0000000..72feb03 --- /dev/null +++ b/debian/patches/manpages-wineserver-persistence.patch @@ -0,0 +1,37 @@ +description: fix wineserver manpages for Debian's default persistence value. + debian/scripts/wineserver sets -p0 +author: Jens Reyer <[email protected]> + +--- a/server/wineserver.de.UTF-8.man.in ++++ b/server/wineserver.de.UTF-8.man.in +@@ -44,7 +44,7 @@ SIGINT, gefolgt von einem SIGKILL gesend + Gibt die Dauer an, für die \fBwineserver\fR weiterläuft nachdem alle + Clientprozesse beendet sind. Das erspart den Rechenaufwand und Zeitverlust + eines Neustarts, wenn Anwendungen in schneller Abfolge gestartet werden. +-Die Verzögerung \fIn\fR ist anzugeben in Sekunden, der Standardwert ist 3. ++Die Verzögerung \fIn\fR ist anzugeben in Sekunden, der Standardwert ist 0. + Bei fehlender Angabe von \fIn\fR läuft der Server unbegrenzt weiter. + .TP + .BR \-v ", " --version +--- a/server/wineserver.fr.UTF-8.man.in ++++ b/server/wineserver.fr.UTF-8.man.in +@@ -47,7 +47,7 @@ temps pendant lequel le serveur continue + processus clients se sont terminés. Ceci évite le coût inhérent à l'arrêt + puis au redémarrage du serveur lorsque des programmes sont lancés successivement + à intervalle rapproché. +-Le délai d'attente \fIn\fR est exprimé en secondes (3 secondes par défaut). ++Le délai d'attente \fIn\fR est exprimé en secondes (0 secondes par défaut). + Si \fIn\fR n'est pas spécifié, le serveur s'exécute indéfiniment. + .TP + .BR \-v ", " --version +--- a/server/wineserver.man.in ++++ b/server/wineserver.man.in +@@ -47,7 +47,7 @@ Specify the \fBwineserver\fR persistence + time that the server will keep running when all client processes have + terminated. This avoids the cost of shutting down and starting again + when programs are launched in quick succession. The timeout \fIn\fR is +-in seconds, the default value is 3 seconds. If \fIn\fR is not ++in seconds, the default value is 0 seconds. If \fIn\fR is not + specified, the server stays around forever. + .TP + .BR \-v ", " --version diff --git a/debian/patches/series b/debian/patches/series index 21b58c4..fd442e2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,6 +5,7 @@ sfnt2fon.patch manpages.patch unicode-9.patch version-string.patch +manpages-wineserver-persistence.patch disable/addons-download.patch disable/shlib-exit-calls.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
