[pkg-wine-party] [wine] 05/15: Adapt -tools to new bindir, but without coinstallability.

[Jens Reyer]

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

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

commit a8491cff3b1dc381b49faa54692db30c78c8067c
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sun Feb 7 02:31:09 2016 +0100

    Adapt -tools to new bindir, but without coinstallability.
---
 debian/rules                        |  5 ++---
 debian/scripts/winegcc              |  3 ---
 debian/wine32VERSION-tools.install  | 16 +++++++---------
 debian/wine32VERSION-tools.links    |  1 +
 debian/wine32VERSION-tools.manpages |  2 +-
 debian/wine64VERSION-tools.install  | 18 ++++++++----------
 debian/wine64VERSION-tools.links    |  1 +
 debian/wine64VERSION-tools.manpages |  2 +-
 8 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/debian/rules b/debian/rules
index 35dca3e..1711d0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -120,6 +120,7 @@ override_dh_auto_install-indep: $(INSTALLS)
 	    cp $$file debian/tmp/$$rename || true; \
 	    done
 	rm -f debian/tmp/*UTF-8*
+	rm -f debian/tmp/winegcc$(VERSION).1
 
 override_dh_auto_install-arch: $(INSTALLS)
 	mkdir -p debian/tmp
@@ -128,13 +129,11 @@ override_dh_auto_install-arch: $(INSTALLS)
 	cp loader/wine64 debian/tmp/wine64 || true
 	cp tools/winedump/README debian/tmp/README.winedump
 	cp server/wineserver debian/tmp/wineserver$(DEB_BUILD_ARCH_BITS)
-	sed 's|LIBDIR|$(LIBDIR)|g' < debian/scripts/winegcc > \
-	    debian/tmp/winegcc$(DEB_BUILD_ARCH_BITS)$(VERSION)
 	dh_auto_install
 	cp loader/wine.man debian/tmp/usr/share/man/man1/wine32$(VERSION).1
 	cp loader/wine.man debian/tmp/usr/share/man/man1/wine64$(VERSION).1
 	cd debian/tmp/usr/share/man/man1 && \
-	    cp winegcc.1 winegcc$(DEB_BUILD_ARCH_BITS)$(VERSION).1
+	    cp winegcc.1 winegcc$(VERSION).1 || true
 	test -f debian/tmp/$(BINDIR)/wine-preloader || \
 	    cp debian/scripts/wine-preloader debian/tmp/$(BINDIR)
 
diff --git a/debian/scripts/winegcc b/debian/scripts/winegcc
deleted file mode 100755
index e6e3d06..0000000
--- a/debian/scripts/winegcc
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-WINEBUILD=/LIBDIR/winebuild /LIBDIR/winegcc $@
diff --git a/debian/wine32VERSION-tools.install b/debian/wine32VERSION-tools.install
index 970b9be..abfec35 100644
--- a/debian/wine32VERSION-tools.install
+++ b/debian/wine32VERSION-tools.install
@@ -1,9 +1,7 @@
-debian/tmp/usr/lib/*/*/wmc
-debian/tmp/usr/lib/*/*/wrc
-debian/tmp/usr/lib/*/*/winegcc
-debian/tmp/usr/lib/*/*/wineg++
-debian/tmp/usr/lib/*/*/winedump
-debian/tmp/usr/lib/*/*/winebuild
-debian/tmp/usr/lib/*/*/winemaker
-
-debian/tmp/winegcc32VERSION usr/bin
+usr/lib/wineVERSION/wmc
+usr/lib/wineVERSION/wrc
+usr/lib/wineVERSION/winegcc
+usr/lib/wineVERSION/wineg++
+usr/lib/wineVERSION/winedump
+usr/lib/wineVERSION/winebuild
+usr/lib/wineVERSION/winemaker
diff --git a/debian/wine32VERSION-tools.links b/debian/wine32VERSION-tools.links
new file mode 100644
index 0000000..6d788e6
--- /dev/null
+++ b/debian/wine32VERSION-tools.links
@@ -0,0 +1 @@
+usr/lib/wineVERSION/winegcc usr/bin/winegccVERSION
diff --git a/debian/wine32VERSION-tools.manpages b/debian/wine32VERSION-tools.manpages
index b0c1e64..de0d8d2 100644
--- a/debian/wine32VERSION-tools.manpages
+++ b/debian/wine32VERSION-tools.manpages
@@ -1 +1 @@
-debian/tmp/usr/share/man/man1/winegcc32VERSION.1
+debian/tmp/usr/share/man/man1/winegccVERSION.1
diff --git a/debian/wine64VERSION-tools.install b/debian/wine64VERSION-tools.install
index f8e20ca..3d5db4f 100644
--- a/debian/wine64VERSION-tools.install
+++ b/debian/wine64VERSION-tools.install
@@ -1,10 +1,8 @@
-debian/tmp/usr/lib/*/*/wmc
-debian/tmp/usr/lib/*/*/wrc
-debian/tmp/usr/lib/*/*/winecpp
-debian/tmp/usr/lib/*/*/winegcc
-debian/tmp/usr/lib/*/*/wineg++
-debian/tmp/usr/lib/*/*/winedump
-debian/tmp/usr/lib/*/*/winebuild
-debian/tmp/usr/lib/*/*/winemaker
-
-debian/tmp/winegcc64VERSION usr/bin
+usr/lib/wineVERSION/wmc
+usr/lib/wineVERSION/wrc
+usr/lib/wineVERSION/winecpp
+usr/lib/wineVERSION/winegcc
+usr/lib/wineVERSION/wineg++
+usr/lib/wineVERSION/winedump
+usr/lib/wineVERSION/winebuild
+usr/lib/wineVERSION/winemaker
diff --git a/debian/wine64VERSION-tools.links b/debian/wine64VERSION-tools.links
new file mode 100644
index 0000000..6d788e6
--- /dev/null
+++ b/debian/wine64VERSION-tools.links
@@ -0,0 +1 @@
+usr/lib/wineVERSION/winegcc usr/bin/winegccVERSION
diff --git a/debian/wine64VERSION-tools.manpages b/debian/wine64VERSION-tools.manpages
index 42f04a2..de0d8d2 100644
--- a/debian/wine64VERSION-tools.manpages
+++ b/debian/wine64VERSION-tools.manpages
@@ -1 +1 @@
-debian/tmp/usr/share/man/man1/winegcc64VERSION.1
+debian/tmp/usr/share/man/man1/winegccVERSION.1

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