[pkg-wine-party] [wine] 03/18: Replace VERSION with DEBSUFFIX in user exposed files.

Jens Reyer jreyer-guest at moszumanska.debian.org
Thu Jul 28 22:43:33 UTC 2016 

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

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

commit 8cf6e3ffce8d0d6c3816c825fc7474fccd9e8c88
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Thu Jul 28 17:59:48 2016 +0200

    Replace VERSION with DEBSUFFIX in user exposed files.
    
    DEBSUFFIX is the same as VERSION, if VERSION is empty DEBSUFFIX
    is '-stable'. Package and directory names don't change.
    
    This is needed for the alternatives system for Wine which
    replaces these filenames from src:wine with links pointing to
    either the files in wine or wine-development.
    
    # Conflicts:
    #	debian/changelog
---
 debian/changelog                    |  4 ++++
 debian/rules                        | 21 +++++++++++++--------
 debian/wine32VERSION-tools.install  |  2 +-
 debian/wine32VERSION-tools.links    | 20 ++++++++++----------
 debian/wine32VERSION-tools.manpages | 18 +++++++++---------
 debian/wine64VERSION-tools.install  |  2 +-
 debian/wine64VERSION-tools.links    | 20 ++++++++++----------
 debian/wine64VERSION-tools.manpages | 18 +++++++++---------
 debian/wine64VERSION.links          |  2 +-
 debian/wine64VERSION.manpages       |  2 +-
 debian/wineVERSION.install          |  2 +-
 debian/wineVERSION.links            | 20 ++++++++++----------
 debian/wineVERSION.manpages         | 32 ++++++++++++++++----------------
 13 files changed, 86 insertions(+), 77 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9fdb0ba..7e41b86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ wine (1.8.3-3) UNRELEASED; urgency=medium
       #816020).
     - Drop alternative depends on perl:any (now handled by debhelper).
       Bump build-dep on debhelper version to >= 9.20160702.
+  * Implement the Debian alternatives system.
+    Partly cherrypicked from master:
+    - Replace VERSION (value is empty or '-development') with DEBSUFFIX
+      ('-stable' or '-development') in user exposed files.
 
  -- Jens Reyer <jre.winesim at gmail.com>  Thu, 28 Jul 2016 17:33:38 +0200
 
diff --git a/debian/rules b/debian/rules
index 09cc1f6..f889b44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,11 @@ DEB_BUILD_ARCH_OS=$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 DEB_BUILD_ARCH_BITS=$(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS)
 
 VERSION=$(shell dpkg-parsechangelog -S Source | sed s/wine//g)
+ifeq (x$(VERSION), x)
+DEBSUFFIX=-stable
+else
+DEBSUFFIX=$(VERSION)
+endif
 
 MANDIR=usr/share/man
 BINDIR=usr/lib/wine$(VERSION)
@@ -77,13 +82,13 @@ debian/control: debian/control.in
 	sed s/VERSION/$(VERSION)/g < $< > $@
 
 debian/wine$(VERSION)%: debian/wineVERSION%
-	sed s/VERSION/$(VERSION)/g < $< > $@
+	sed "s/VERSION/$(VERSION)/g;s/DEBSUFFIX/$(DEBSUFFIX)/g" < $< > $@
 
 debian/wine32$(VERSION)%: debian/wine32VERSION%
-	sed s/VERSION/$(VERSION)/g < $< > $@
+	sed "s/VERSION/$(VERSION)/g;s/DEBSUFFIX/$(DEBSUFFIX)/g" < $< > $@
 
 debian/wine64$(VERSION)%: debian/wine64VERSION%
-	sed s/VERSION/$(VERSION)/g < $< > $@
+	sed "s/VERSION/$(VERSION)/g;s/DEBSUFFIX/$(DEBSUFFIX)/g" < $< > $@
 
 debian/libwine$(VERSION)%: debian/libwineVERSION%
 	sed s/VERSION/$(VERSION)/g < $< > $@
@@ -122,7 +127,7 @@ override_dh_auto_install-indep: $(INSTALLS)
 	mkdir -p debian/tmp
 	cp ANNOUNCE debian/tmp/changelog
 	cp programs/winedbg/README debian/tmp/README.winedbg
-	cp debian/scripts/wine debian/tmp/wine$(VERSION)
+	cp debian/scripts/wine debian/tmp/wine$(DEBSUFFIX)
 	for dir in loader server programs/msiexec programs/winedbg \
 	    programs/wineconsole programs/regedit programs/regsvr32 \
 	    programs/wineboot programs/winefile programs/winepath \
@@ -131,7 +136,7 @@ override_dh_auto_install-indep: $(INSTALLS)
 	    make -C $$dir install-man; \
 	    done
 	for file in $$(find . ! -path "./debian/*" -name \*.man); do \
-	    rename=$$(basename $$file | sed "s/\\./$(VERSION)./;s/UTF-8\\.//"); \
+	    rename=$$(basename $$file | sed "s/\\./$(DEBSUFFIX)./;s/UTF-8\\.//"); \
 	    cp $$file debian/tmp/$$rename || true; \
 	    done
 
@@ -140,13 +145,13 @@ override_dh_auto_install-arch: $(INSTALLS)
 	cp ANNOUNCE debian/tmp/changelog
 	cp tools/winedump/README debian/tmp/README.winedump
 	cp server/wineserver debian/tmp/wineserver$(DEB_BUILD_ARCH_BITS)
-	sed "s|BINDIR|$(BINDIR)|g" debian/scripts/winegcc > debian/tmp/winegcc$(VERSION)
+	sed "s|BINDIR|$(BINDIR)|g" debian/scripts/winegcc > debian/tmp/winegcc$(DEBSUFFIX)
 	dh_auto_install
 	for file in $$(find . ! -path "./debian/*" -name \*.man); do \
-	    rename=$$(basename $$file | sed "s/\\./$(VERSION)./;s/UTF-8\\.//"); \
+	    rename=$$(basename $$file | sed "s/\\./$(DEBSUFFIX)./;s/UTF-8\\.//"); \
 	    cp $$file debian/tmp/$$rename || true; \
 	    done
-	cp loader/wine.man debian/tmp/usr/share/man/man1/wine64$(VERSION).1
+	cp loader/wine.man debian/tmp/usr/share/man/man1/wine64$(DEBSUFFIX).1
 	test -f debian/tmp/$(BINDIR)/wine-preloader || \
 	    cp debian/scripts/wine-preloader debian/tmp/$(BINDIR)
 
diff --git a/debian/wine32VERSION-tools.install b/debian/wine32VERSION-tools.install
index da6a13c..49c92ed 100644
--- a/debian/wine32VERSION-tools.install
+++ b/debian/wine32VERSION-tools.install
@@ -8,4 +8,4 @@ usr/lib/wineVERSION/winedump
 usr/lib/wineVERSION/winebuild
 usr/lib/wineVERSION/winemaker
 
-debian/tmp/winegccVERSION usr/bin
+debian/tmp/winegccDEBSUFFIX usr/bin
diff --git a/debian/wine32VERSION-tools.links b/debian/wine32VERSION-tools.links
index 2935130..1bfbb2f 100644
--- a/debian/wine32VERSION-tools.links
+++ b/debian/wine32VERSION-tools.links
@@ -1,12 +1,12 @@
-usr/lib/wineVERSION/wmc usr/bin/wmcVERSION
-usr/lib/wineVERSION/wrc usr/bin/wrcVERSION
-usr/lib/wineVERSION/widl usr/bin/widlVERSION
-usr/lib/wineVERSION/winedump usr/bin/winedumpVERSION
-usr/lib/wineVERSION/winebuild usr/bin/winebuildVERSION
-usr/lib/wineVERSION/winemaker usr/bin/winemakerVERSION
+usr/lib/wineVERSION/wmc usr/bin/wmcDEBSUFFIX
+usr/lib/wineVERSION/wrc usr/bin/wrcDEBSUFFIX
+usr/lib/wineVERSION/widl usr/bin/widlDEBSUFFIX
+usr/lib/wineVERSION/winedump usr/bin/winedumpDEBSUFFIX
+usr/lib/wineVERSION/winebuild usr/bin/winebuildDEBSUFFIX
+usr/lib/wineVERSION/winemaker usr/bin/winemakerDEBSUFFIX
 
-usr/bin/winegccVERSION usr/bin/winecppVERSION
-usr/bin/winegccVERSION usr/bin/wineg++VERSION
+usr/bin/winegccDEBSUFFIX usr/bin/winecppDEBSUFFIX
+usr/bin/winegccDEBSUFFIX usr/bin/wineg++DEBSUFFIX
 
-usr/share/man/man1/winegccVERSION.1.gz usr/share/man/man1/winecppVERSION.1.gz
-usr/share/man/man1/winegccVERSION.1.gz usr/share/man/man1/wineg++VERSION.1.gz
+usr/share/man/man1/winegccDEBSUFFIX.1.gz usr/share/man/man1/winecppDEBSUFFIX.1.gz
+usr/share/man/man1/winegccDEBSUFFIX.1.gz usr/share/man/man1/wineg++DEBSUFFIX.1.gz
diff --git a/debian/wine32VERSION-tools.manpages b/debian/wine32VERSION-tools.manpages
index dec8250..4e7e6d7 100644
--- a/debian/wine32VERSION-tools.manpages
+++ b/debian/wine32VERSION-tools.manpages
@@ -1,9 +1,9 @@
-debian/tmp/wmcVERSION.man
-debian/tmp/wrcVERSION.man
-debian/tmp/widlVERSION.man
-debian/tmp/winegccVERSION.man
-debian/tmp/winedumpVERSION.man
-debian/tmp/winebuildVERSION.man
-debian/tmp/winemakerVERSION.man
-debian/tmp/winemakerVERSION.de.man
-debian/tmp/winemakerVERSION.fr.man
+debian/tmp/wmcDEBSUFFIX.man
+debian/tmp/wrcDEBSUFFIX.man
+debian/tmp/widlDEBSUFFIX.man
+debian/tmp/winegccDEBSUFFIX.man
+debian/tmp/winedumpDEBSUFFIX.man
+debian/tmp/winebuildDEBSUFFIX.man
+debian/tmp/winemakerDEBSUFFIX.man
+debian/tmp/winemakerDEBSUFFIX.de.man
+debian/tmp/winemakerDEBSUFFIX.fr.man
diff --git a/debian/wine64VERSION-tools.install b/debian/wine64VERSION-tools.install
index da6a13c..49c92ed 100644
--- a/debian/wine64VERSION-tools.install
+++ b/debian/wine64VERSION-tools.install
@@ -8,4 +8,4 @@ usr/lib/wineVERSION/winedump
 usr/lib/wineVERSION/winebuild
 usr/lib/wineVERSION/winemaker
 
-debian/tmp/winegccVERSION usr/bin
+debian/tmp/winegccDEBSUFFIX usr/bin
diff --git a/debian/wine64VERSION-tools.links b/debian/wine64VERSION-tools.links
index 2935130..1bfbb2f 100644
--- a/debian/wine64VERSION-tools.links
+++ b/debian/wine64VERSION-tools.links
@@ -1,12 +1,12 @@
-usr/lib/wineVERSION/wmc usr/bin/wmcVERSION
-usr/lib/wineVERSION/wrc usr/bin/wrcVERSION
-usr/lib/wineVERSION/widl usr/bin/widlVERSION
-usr/lib/wineVERSION/winedump usr/bin/winedumpVERSION
-usr/lib/wineVERSION/winebuild usr/bin/winebuildVERSION
-usr/lib/wineVERSION/winemaker usr/bin/winemakerVERSION
+usr/lib/wineVERSION/wmc usr/bin/wmcDEBSUFFIX
+usr/lib/wineVERSION/wrc usr/bin/wrcDEBSUFFIX
+usr/lib/wineVERSION/widl usr/bin/widlDEBSUFFIX
+usr/lib/wineVERSION/winedump usr/bin/winedumpDEBSUFFIX
+usr/lib/wineVERSION/winebuild usr/bin/winebuildDEBSUFFIX
+usr/lib/wineVERSION/winemaker usr/bin/winemakerDEBSUFFIX
 
-usr/bin/winegccVERSION usr/bin/winecppVERSION
-usr/bin/winegccVERSION usr/bin/wineg++VERSION
+usr/bin/winegccDEBSUFFIX usr/bin/winecppDEBSUFFIX
+usr/bin/winegccDEBSUFFIX usr/bin/wineg++DEBSUFFIX
 
-usr/share/man/man1/winegccVERSION.1.gz usr/share/man/man1/winecppVERSION.1.gz
-usr/share/man/man1/winegccVERSION.1.gz usr/share/man/man1/wineg++VERSION.1.gz
+usr/share/man/man1/winegccDEBSUFFIX.1.gz usr/share/man/man1/winecppDEBSUFFIX.1.gz
+usr/share/man/man1/winegccDEBSUFFIX.1.gz usr/share/man/man1/wineg++DEBSUFFIX.1.gz
diff --git a/debian/wine64VERSION-tools.manpages b/debian/wine64VERSION-tools.manpages
index dec8250..4e7e6d7 100644
--- a/debian/wine64VERSION-tools.manpages
+++ b/debian/wine64VERSION-tools.manpages
@@ -1,9 +1,9 @@
-debian/tmp/wmcVERSION.man
-debian/tmp/wrcVERSION.man
-debian/tmp/widlVERSION.man
-debian/tmp/winegccVERSION.man
-debian/tmp/winedumpVERSION.man
-debian/tmp/winebuildVERSION.man
-debian/tmp/winemakerVERSION.man
-debian/tmp/winemakerVERSION.de.man
-debian/tmp/winemakerVERSION.fr.man
+debian/tmp/wmcDEBSUFFIX.man
+debian/tmp/wrcDEBSUFFIX.man
+debian/tmp/widlDEBSUFFIX.man
+debian/tmp/winegccDEBSUFFIX.man
+debian/tmp/winedumpDEBSUFFIX.man
+debian/tmp/winebuildDEBSUFFIX.man
+debian/tmp/winemakerDEBSUFFIX.man
+debian/tmp/winemakerDEBSUFFIX.de.man
+debian/tmp/winemakerDEBSUFFIX.fr.man
diff --git a/debian/wine64VERSION.links b/debian/wine64VERSION.links
index a35d012..83b5d72 100644
--- a/debian/wine64VERSION.links
+++ b/debian/wine64VERSION.links
@@ -1 +1 @@
-usr/lib/wineVERSION/wine64 usr/bin/wine64VERSION
+usr/lib/wineVERSION/wine64 usr/bin/wine64DEBSUFFIX
diff --git a/debian/wine64VERSION.manpages b/debian/wine64VERSION.manpages
index 7365fac..c52f26e 100644
--- a/debian/wine64VERSION.manpages
+++ b/debian/wine64VERSION.manpages
@@ -1 +1 @@
-debian/tmp/usr/share/man/man1/wine64VERSION.1
+debian/tmp/usr/share/man/man1/wine64DEBSUFFIX.1
diff --git a/debian/wineVERSION.install b/debian/wineVERSION.install
index 7e54516..b477db7 100644
--- a/debian/wineVERSION.install
+++ b/debian/wineVERSION.install
@@ -1,4 +1,4 @@
-debian/tmp/wineVERSION usr/bin
+debian/tmp/wineDEBSUFFIX usr/bin
 
 debian/scripts/wineserver usr/lib/wineVERSION
 debian/scripts/wineapploader usr/lib/wineVERSION
diff --git a/debian/wineVERSION.links b/debian/wineVERSION.links
index 86300f9..54f083e 100644
--- a/debian/wineVERSION.links
+++ b/debian/wineVERSION.links
@@ -1,11 +1,11 @@
-usr/lib/wineVERSION/wineserver usr/bin/wineserverVERSION
+usr/lib/wineVERSION/wineserver usr/bin/wineserverDEBSUFFIX
 
-usr/lib/wineVERSION/wineapploader usr/bin/msiexecVERSION
-usr/lib/wineVERSION/wineapploader usr/bin/regeditVERSION
-usr/lib/wineVERSION/wineapploader usr/bin/winecfgVERSION
-usr/lib/wineVERSION/wineapploader usr/bin/winedbgVERSION
-usr/lib/wineVERSION/wineapploader usr/bin/winebootVERSION
-usr/lib/wineVERSION/wineapploader usr/bin/winefileVERSION
-usr/lib/wineVERSION/wineapploader usr/bin/winepathVERSION
-usr/lib/wineVERSION/wineapploader usr/bin/regsvr32VERSION
-usr/lib/wineVERSION/wineapploader usr/bin/wineconsoleVERSION
+usr/lib/wineVERSION/wineapploader usr/bin/msiexecDEBSUFFIX
+usr/lib/wineVERSION/wineapploader usr/bin/regeditDEBSUFFIX
+usr/lib/wineVERSION/wineapploader usr/bin/winecfgDEBSUFFIX
+usr/lib/wineVERSION/wineapploader usr/bin/winedbgDEBSUFFIX
+usr/lib/wineVERSION/wineapploader usr/bin/winebootDEBSUFFIX
+usr/lib/wineVERSION/wineapploader usr/bin/winefileDEBSUFFIX
+usr/lib/wineVERSION/wineapploader usr/bin/winepathDEBSUFFIX
+usr/lib/wineVERSION/wineapploader usr/bin/regsvr32DEBSUFFIX
+usr/lib/wineVERSION/wineapploader usr/bin/wineconsoleDEBSUFFIX
diff --git a/debian/wineVERSION.manpages b/debian/wineVERSION.manpages
index 03f8521..69da9b8 100644
--- a/debian/wineVERSION.manpages
+++ b/debian/wineVERSION.manpages
@@ -1,18 +1,18 @@
-debian/tmp/wineVERSION.man
-debian/tmp/wineVERSION.de.man
-debian/tmp/wineVERSION.fr.man
-debian/tmp/wineVERSION.pl.man
+debian/tmp/wineDEBSUFFIX.man
+debian/tmp/wineDEBSUFFIX.de.man
+debian/tmp/wineDEBSUFFIX.fr.man
+debian/tmp/wineDEBSUFFIX.pl.man
 
-debian/tmp/wineserverVERSION.man
-debian/tmp/wineserverVERSION.de.man
-debian/tmp/wineserverVERSION.fr.man
+debian/tmp/wineserverDEBSUFFIX.man
+debian/tmp/wineserverDEBSUFFIX.de.man
+debian/tmp/wineserverDEBSUFFIX.fr.man
 
-debian/tmp/msiexecVERSION.man
-debian/tmp/regeditVERSION.man
-debian/tmp/winecfgVERSION.man
-debian/tmp/winedbgVERSION.man
-debian/tmp/winebootVERSION.man
-debian/tmp/winefileVERSION.man
-debian/tmp/winepathVERSION.man
-debian/tmp/regsvr32VERSION.man
-debian/tmp/wineconsoleVERSION.man
+debian/tmp/msiexecDEBSUFFIX.man
+debian/tmp/regeditDEBSUFFIX.man
+debian/tmp/winecfgDEBSUFFIX.man
+debian/tmp/winedbgDEBSUFFIX.man
+debian/tmp/winebootDEBSUFFIX.man
+debian/tmp/winefileDEBSUFFIX.man
+debian/tmp/winepathDEBSUFFIX.man
+debian/tmp/regsvr32DEBSUFFIX.man
+debian/tmp/wineconsoleDEBSUFFIX.man

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

More information about the pkg-wine-party mailing list