[pkg-wine-party] [wine] 01/03: Revert "Add +dfsg suffix to the upstream 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 2c80fd49be399793ee1b137fd5a1f64b1c94ad3b
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Thu Apr 6 13:04:11 2017 +0200

    Revert "Add +dfsg suffix to the upstream version."
    
    Revert change as this is no team consensus.
    
    This reverts commit 6b6b5c6f036b9669fd8c56a0c700cd8e74fb07fc.
    
    # Conflicts:
    #	debian/changelog
---
 debian/changelog | 3 +--
 debian/watch     | 7 +------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3467c9f..064ff09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wine-development (2.5+dfsg-1) UNRELEASED; urgency=medium
+wine-development (2.5-1) UNRELEASED; urgency=medium
 
   * New upstream release 2.5, released Mar 31, 2017.
     - Support for message-mode named pipes.
@@ -9,7 +9,6 @@ wine-development (2.5+dfsg-1) UNRELEASED; urgency=medium
     - More improvements to the XML reader.
     - Various bug fixes.
   * Refresh patches.
-  * Add +dfsg suffix to the upstream version.
   * Document purpose of the sonames2elf script.
   * Support stable release 2.0 in import script.
   * Fix typo to clarify license LGPL-2.1 *or later* in import scripts.
diff --git a/debian/watch b/debian/watch
index 9237031..91c8000 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,8 +1,3 @@
 version=3
-opts="\
-repacksuffix=+dfsg,\
-dversionmangle=s/\+dfsg(\.?\d+)?$//,\
-uversionmangle=s/-rc/~rc/,\
-pgpsigurlmangle=s/$/.sign/,\
-" \
+opts="uversionmangle=s/-rc/~rc/,pgpsigurlmangle=s/$/.sign/" \
 ftp://ftp.winehq.org/pub/wine/source/(\d).x/wine-(\d.*)\.tar\.xz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git