[pkg-wine-party] [wine] 01/04: Merge tag 'debian/1.8.3-3' into jessie-backports-1.8.x
Jens Reyer
jreyer-guest at moszumanska.debian.org
Fri Aug 19 12:37:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
jreyer-guest pushed a commit to branch jessie-backports-1.8.x
in repository wine.
commit 6728a732f7a17add6983b6d5ee91515f88dcd552
Merge: a0d99d9 b11f7a2
Author: Jens Reyer <jre.winesim at gmail.com>
Date: Tue Aug 16 00:28:16 2016 +0200
Merge tag 'debian/1.8.3-3' into jessie-backports-1.8.x
wine Debian release 1.8.3-3
# gpg: Signature made Mon 08 Aug 2016 06:22:11 PM CEST
# gpg: using RSA key 0x608412032B573076
# gpg: Good signature from "Jens Reyer <jens.reyer at gmail.com>" [full]
# gpg: aka "Jens Reyer <jreyer-guest at alioth.debian.org>" [full]
# gpg: aka "Jens Reyer <jre.winesim at gmail.com>" [full]
# Primary key fingerprint: 8826 EBE8 FCF7 26EE 182E 23D7 79C4 3E62 0B03 9B35
# Subkey fingerprint: A3EE 0468 03C0 E83E 6386 AA3D 6084 1203 2B57 3076
# Conflicts:
# debian/changelog
debian/NEWS | 16 +++++
debian/README.debian | 33 ++++++++--
debian/bug-script | 7 ++
debian/changelog | 26 ++++++++
debian/control.in | 15 +++--
debian/patches/debsuffix/winemenubuilder.patch | 46 +++++++++++++
debian/patches/development/winegcc.patch | 14 ----
debian/patches/development/winemenubuilder.patch | 23 -------
debian/patches/gnutls.patch | 23 +++++++
.../patches/manpages-wineserver-persistence.patch | 37 +++++++++++
debian/patches/series | 5 +-
debian/rules | 26 +++++---
debian/scripts/{wine => wine.in} | 13 ++--
debian/scripts/{wineapploader => wineapploader.in} | 3 +-
debian/scripts/{winegcc => winegcc.in} | 0
debian/scripts/{wineserver => wineserver.in} | 6 +-
.../{wineVERSION-binfmt.docs => wine-binfmt.docs} | 0
...eVERSION-binfmt.install => wine-binfmt.install} | 0
debian/wine32VERSION-tools.install | 2 +-
debian/wine32VERSION-tools.links | 20 +++---
debian/wine32VERSION-tools.manpages | 18 ++---
debian/wine64VERSION-tools.install | 2 +-
debian/wine64VERSION-tools.links | 20 +++---
debian/wine64VERSION-tools.manpages | 18 ++---
debian/wine64VERSION.links | 2 +-
debian/wine64VERSION.manpages | 2 +-
debian/wineVERSION.install | 6 +-
debian/wineVERSION.links | 20 +++---
debian/wineVERSION.manpages | 32 ++++-----
debian/wineVERSION.postinst | 76 ++++++++++++++++++++++
debian/wineVERSION.prerm | 13 ++++
debian/wineVERSION.triggers | 10 +++
32 files changed, 391 insertions(+), 143 deletions(-)
diff --cc debian/changelog
index b231f4a,ad85d02..6fd2320
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,29 +1,36 @@@
+ wine (1.8.3-3) unstable; urgency=medium
+
+ * Cherrypick changes from master:
+ - Fix wineserver manpages for Debian's default persistence value (see:
+ #816020).
+ - Drop alternative depends on perl:any (now handled by debhelper).
+ Bump build-dep on debhelper version to >= 9.20160702.
+ - Add removal instructions for binfmt support to README.debian.
+ - Add Recommends g++ or g++-multilib to the -tools (closes: #832041).
+ * Implement the Debian alternatives system (see: #758291).
+ Partly cherrypicked from master:
+ - Replace VERSION (value is empty or '-development') with DEBSUFFIX
+ ('-stable' or '-development') in user exposed files.
+ - Generate scripts (wine, wineserver, wineapploader, winegcc) with
+ hardcoded paths/names instead of using runtime detection.
+ - Export DEBSUFFIX from d/rules.
+ - Drop now obsolete development/winegcc.patch.
+ - Use variable instead of '-development' in winemenubuilder.patch, and
+ enable it.
+ - Let the -tools packages recommend wineVERSION.
+ - Add bug script to show the target of the /usr/bin/wine link.
+ * Make wine-binfmt M-A:foreign.
+ * Add gnutls.patch to fix FTBFS against gnutls 3.5 (closes: #832275).
+
+ -- Jens Reyer <jre.winesim at gmail.com> Mon, 08 Aug 2016 14:36:29 +0200
+
+wine (1.8.3-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Drop dbgsym workaround, now handled by new debhelper in backports.
+
+ -- Jens Reyer <jre.winesim at gmail.com> Mon, 18 Jul 2016 02:04:02 +0200
+
wine (1.8.3-2) unstable; urgency=medium
* Backport upstream changes for building with Unicode 9.0 (closes: #829003).
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git
More information about the pkg-wine-party
mailing list