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 d32e302b04cbfb32dfd228c5f07bd51f5d2ce070 Merge: 4d53d68 d2c7e6e Author: Jens Reyer <[email protected]> Date: Mon Jan 30 23:20:54 2017 +0100 Merge branch 'stretch' into jessie-backports-1.8.x # Conflicts: # debian/changelog debian/README.debian | 90 +++++++---- debian/TODO | 1 + debian/changelog | 27 ++++ debian/clean | 4 - debian/control.in | 73 ++++----- debian/copyright | 11 ++ debian/libwineVERSION.docs | 1 + debian/libwineVERSION.lintian-overrides | 3 + debian/org.winehq.wine.appdata.xml | 52 +++++++ debian/patches/{ => binary-indep}/manpages.patch | 0 debian/patches/{ => binary-indep}/sfnt2fon.patch | 0 debian/patches/{ => debpaths}/addons.patch | 0 debian/patches/{ => debpaths}/makefile.patch | 16 -- debian/patches/debsuffix/winemenubuilder.patch | 2 +- debian/patches/disable/addons-download.patch | 1 + debian/patches/disable/rerun-configure.patch | 21 +++ debian/patches/disable/shlib-exit-calls.patch | 141 ----------------- .../winemenubuilder-blacklist-extensions.patch | 60 ++++++++ debian/patches/font-divbyzero.patch | 2 + .../patches/manpages-wineserver-persistence.patch | 3 +- debian/patches/openal.patch | 171 --------------------- debian/patches/printer-resolution.patch | 1 + debian/patches/series | 23 +-- debian/patches/upstream/check-winearch.patch | 25 +++ debian/patches/{ => upstream}/fontdir.patch | 2 +- debian/patches/{ => upstream}/kfreebsd.patch | 8 +- debian/patches/{ => upstream}/unicode-9.patch | 1 + debian/rules | 2 + debian/scripts/import | 2 +- debian/scripts/wine.in | 2 +- debian/wine32VERSION-tools.lintian-overrides | 2 +- debian/wine32VERSION.lintian-overrides | 2 +- debian/wine64VERSION-tools.lintian-overrides | 2 +- debian/wine64VERSION.lintian-overrides | 2 +- debian/wineVERSION.install | 3 +- debian/wineVERSION.postinst | 4 +- debian/wineVERSION.triggers | 6 +- 37 files changed, 338 insertions(+), 428 deletions(-) diff --cc debian/changelog index fd7e3e6,27401b1..61e2d5c --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,30 +1,37 @@@ + wine (1.8.6-3) unstable; urgency=medium + + * Fix AppStream metainfo file (closes: #848839). + + -- Jens Reyer <[email protected]> Thu, 19 Jan 2017 23:51:57 +0100 + + wine (1.8.6-2) unstable; urgency=medium + + [ Jens Reyer ] + * Cherrypick changes from master: + - Reorganize patches and add some metadata. + - Drop shlib-exit-calls.patch. + - Drop openal.patch, fixed upstream. + - Simplify the foreign-arch test in the wine script. + - Let wine suggest winbind. + - Change trigger interest to noawait (LP: 1652434). + - Documentation updates. + - Blacklist some extensions for native file type association + (closes: #845334). + * Sort packages in debian/control.in. + * Drop obsolete entries from d/clean. + * Check for invalid WINEARCH values (closes: #838474). + * Generate and install wine.svg icon. + * Add initial AppStream metainfo file (closes: #848839). + + -- Jens Reyer <[email protected]> Sat, 14 Jan 2017 02:01:07 +0100 + +wine (1.8.6-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + * No changes. + + -- Jens Reyer <[email protected]> Sat, 14 Jan 2017 14:28:33 +0100 + wine (1.8.6-1) unstable; urgency=medium * New upstream release 1.8.6, released Dec 19, 2016. -- 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
