This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch stretch in repository wine.
commit bcd12cd0548e70aa40269cb674e5396ae8982601 Author: Jens Reyer <[email protected]> Date: Sun May 29 23:05:37 2016 +0200 Change version string to display vendor and version. Example output for "wine --version": wine-1.8.2 (Debian 1.8.2-1) wine-1.8.2 (Ubuntu 1.8.2-1) wine-1.8.2 (Ubuntu 1.8.2-1ubuntu2) # Conflicts: # debian/changelog --- debian/changelog | 1 + debian/patches/version-string.patch | 2 +- debian/rules | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e0415ad..1c607d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ wine (1.8.2-2) UNRELEASED; urgency=medium Thanks to Andrey Gursky (see: #824671). - Fix winegcc script to call wineg++/cpp based on its basename. Thanks to Javier Serrano Polo (closes: #824715). + - Change version string to display vendor and version. -- Jens Reyer <[email protected]> Mon, 06 Jun 2016 03:35:43 +0200 diff --git a/debian/patches/version-string.patch b/debian/patches/version-string.patch index 31e99e8..bc1dd59 100644 --- a/debian/patches/version-string.patch +++ b/debian/patches/version-string.patch @@ -9,7 +9,7 @@ Forwarded: not-needed version.c: dummy - version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) -+ version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Debian)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) ++ version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 ($(VENDOR))";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) dummy: .PHONY: dummy diff --git a/debian/rules b/debian/rules index 9be0f25..dc88e6a 100755 --- a/debian/rules +++ b/debian/rules @@ -15,6 +15,8 @@ LIBDIR=usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/wine$(VERSION) NCURSES=$(shell ./debian/scripts/dpkg-depgrep ncurses) FREETYPE=$(shell ./debian/scripts/dpkg-depgrep freetype) +export VENDOR=$(shell dpkg-vendor --query Vendor && dpkg-parsechangelog -S Version) + # enable verbose build log export DH_VERBOSE=1 -- 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
