This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch jessie-backports-1.9.x in repository wine.
commit a70a8eb8466e6df6b3ed30edcf79341ec6a64a95 Merge: 04c34df 51f48d3 Author: Jens Reyer <[email protected]> Date: Sun Feb 5 19:15:01 2017 +0100 Merge branch 'master' into jessie-backports-1.9.x # Conflicts: # debian/changelog debian/changelog | 13 +++++++++++++ debian/control.in | 2 +- debian/rules | 6 ++++++ debian/scripts/sonames2elf | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) diff --cc debian/changelog index 5843141,4389f68..1cf958d --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,16 +1,23 @@@ + wine-development (2.0-3) unstable; urgency=medium + + * Enable oss on kfreebsd, explicitly disable it on other archs. + * Create the sonames2elf binary without -nostdlib (cf. #853793). + + -- Jens Reyer <[email protected]> Thu, 02 Feb 2017 18:14:48 +0100 + + wine-development (2.0-2) unstable; urgency=medium + + * Remove outdated oss4 build dependency (closes: #852989). + + -- Michael Gilbert <[email protected]> Tue, 31 Jan 2017 04:59:25 +0000 + +wine-development (2.0-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + * No changes. + + -- Jens Reyer <[email protected]> Tue, 31 Jan 2017 22:05:17 +0100 + wine-development (2.0-1) unstable; urgency=medium * New upstream release 2.0, released Jan 24, 2017. -- 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
