diff -Nru wine-1.8.5/debian/changelog wine-1.8.5/debian/changelog --- wine-1.8.5/debian/changelog 2016-10-10 14:30:13.000000000 +0200 +++ wine-1.8.5/debian/changelog 2016-11-23 16:05:35.000000000 +0200 @@ -1,3 +1,11 @@ +wine (1.8.5-1ubuntu1~ubuntu16.04.1~ppa1) xenial; urgency=medium + + * Backport from yakkety. + * Disable unicode-9.patch for unicode-data 8. + * Adjust perl dependency for debhelper 9. + + -- Graham Inggs Wed, 23 Nov 2016 15:58:31 +0200 + wine (1.8.5-1ubuntu1) yakkety; urgency=medium * Merge with Debian unstable, remaining changes: diff -Nru wine-1.8.5/debian/control wine-1.8.5/debian/control --- wine-1.8.5/debian/control 2016-10-10 14:30:13.000000000 +0200 +++ wine-1.8.5/debian/control 2016-11-23 16:25:14.000000000 +0200 @@ -8,7 +8,7 @@ Stephen Kitt , Jens Reyer , Build-Depends: - debhelper (>= 9.20160702), + debhelper (>= 9), dh-autoreconf, libxi-dev, libxt-dev, @@ -35,7 +35,7 @@ sharutils, dctrl-tools, khronos-api, - unicode-data (>= 9.0), + unicode-data (>= 8.0), libpng-dev, libssl-dev, libxml2-dev, @@ -198,7 +198,7 @@ Built-Using: ${built:Using} Depends: gcc | gcc-multilib:amd64 [i386], - ${perl:Depends}, + ${perl:Depends} | perl:any [i386], ${misc:Depends}, ${shlibs:Depends}, libwine-dev (= ${binary:Version}), diff -Nru wine-1.8.5/debian/control.in wine-1.8.5/debian/control.in --- wine-1.8.5/debian/control.in 2016-10-10 14:30:13.000000000 +0200 +++ wine-1.8.5/debian/control.in 2016-11-23 16:07:57.000000000 +0200 @@ -8,7 +8,7 @@ Stephen Kitt , Jens Reyer , Build-Depends: - debhelper (>= 9.20160702), + debhelper (>= 9), dh-autoreconf, libxi-dev, libxt-dev, @@ -35,7 +35,7 @@ sharutils, dctrl-tools, khronos-api, - unicode-data (>= 9.0), + unicode-data (>= 8.0), libpng-dev, libssl-dev, libxml2-dev, @@ -198,7 +198,7 @@ Built-Using: ${built:Using} Depends: gcc | gcc-multilib:amd64 [i386], - ${perl:Depends}, + ${perl:Depends} | perl:any [i386], ${misc:Depends}, ${shlibs:Depends}, libwineVERSION-dev (= ${binary:Version}), diff -Nru wine-1.8.5/debian/patches/generate/unicode.patch wine-1.8.5/debian/patches/generate/unicode.patch --- wine-1.8.5/debian/patches/generate/unicode.patch 2016-10-10 14:30:13.000000000 +0200 +++ wine-1.8.5/debian/patches/generate/unicode.patch 2016-11-23 16:08:45.000000000 +0200 @@ -10,7 +10,7 @@ -# base URLs for www.unicode.org files +# Locations of unicode files my $MAPPINGS = "http://www.unicode.org/Public/MAPPINGS"; --my $UNIDATA = "http://www.unicode.org/Public/9.0.0/ucd"; +-my $UNIDATA = "http://www.unicode.org/Public/8.0.0/ucd"; +my $UNIDATA = "/usr/share/unicode"; my $REPORTS = "http://www.unicode.org/reports"; -my $RFCS = "http://www.rfc-editor.org/rfc"; diff -Nru wine-1.8.5/debian/patches/series wine-1.8.5/debian/patches/series --- wine-1.8.5/debian/patches/series 2016-10-10 14:30:13.000000000 +0200 +++ wine-1.8.5/debian/patches/series 2016-11-23 16:08:17.000000000 +0200 @@ -3,7 +3,7 @@ kfreebsd.patch sfnt2fon.patch manpages.patch -unicode-9.patch +#unicode-9.patch version-string.patch manpages-wineserver-persistence.patch