[pkg-wine-party] [wine] 01/06: Change version string to display vendor and version.

[Jens Reyer]

This is an automated email from the git hooks/post-receive script.

jreyer-guest pushed a commit to branch master
in repository wine.

commit 6af4e899f5d72e0d615ff9899a08fc16a0a5127e
Author: Jens Reyer <jre.winesim at gmail.com>
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)
---
 debian/changelog                    | 3 ++-
 debian/patches/version-string.patch | 2 +-
 debian/rules                        | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a08816..42e275d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,9 @@ wine-development (1.9.9-1) UNRELEASED; urgency=medium
     Thanks to Javier Serrano Polo (see: #824715).
   * Add bugnumbers from other branch to changelog since 1.9.1-1.
   * Drop obsolete dh_strip exclusion of some files.
+  * Change version string to display vendor and version.
 
- -- Jens Reyer <jre.winesim at gmail.com>  Sun, 22 May 2016 03:15:14 +0200
+ -- Jens Reyer <jre.winesim at gmail.com>  Sun, 29 May 2016 21:13:50 +0200
 
 wine-development (1.9.8-1) unstable; urgency=medium
 
diff --git a/debian/patches/version-string.patch b/debian/patches/version-string.patch
index 6257c91..477d14b 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 aef0476..a868249 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