[pkg-wine-party] [wine] 01/08: Set bindir to usr/lib/wineVERSION.

Jens Reyer jreyer-guest at moszumanska.debian.org
Sun Feb 7 04:55:52 UTC 2016


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

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

commit 5acca6bfd9c27b589c57a943a9f672517f125848
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sun Feb 7 03:36:04 2016 +0100

    Set bindir to usr/lib/wineVERSION.
    
    Move everything from subdir wine one level up again.
---
 debian/rules                                     |  7 ++++---
 debian/wine32VERSION-preloader.install           |  2 +-
 debian/wine32VERSION-preloader.lintian-overrides |  2 +-
 debian/wine32VERSION.install                     |  4 ++--
 debian/wine32VERSION.links                       |  2 +-
 debian/wine64VERSION-preloader.install           |  2 +-
 debian/wine64VERSION-preloader.lintian-overrides |  2 +-
 debian/wine64VERSION.install                     |  4 ++--
 debian/wine64VERSION.links                       |  2 +-
 debian/wineVERSION.install                       |  6 +++---
 debian/wineVERSION.links                         | 20 ++++++++++----------
 11 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/debian/rules b/debian/rules
index 47d994a..8b228a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ DEB_BUILD_ARCH_BITS=$(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS)
 VERSION=$(shell dpkg-parsechangelog -S Source | sed s/wine//g)
 
 MANDIR=usr/share/man
+BINDIR=usr/lib/wine$(VERSION)
 DATDIR=usr/share/wine$(VERSION)
 INCDIR=usr/include/wine$(VERSION)
 LIBDIR=usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/wine$(VERSION)
@@ -33,7 +34,7 @@ CONFLAGS=--with-gnutls \
          --without-gstreamer \
          --disable-tests \
          --libdir=/$(LIBDIR) \
-         --bindir=/$(LIBDIR) \
+         --bindir=/$(BINDIR) \
          --mandir=/$(MANDIR) \
          --includedir=/$(INCDIR) \
          --datarootdir=/$(DATDIR) \
@@ -134,8 +135,8 @@ override_dh_auto_install-arch: $(INSTALLS)
 	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
-	test -f debian/tmp/$(LIBDIR)/wine-preloader || \
-	    cp debian/scripts/wine-preloader debian/tmp/$(LIBDIR)
+	test -f debian/tmp/$(BINDIR)/wine-preloader || \
+	    cp debian/scripts/wine-preloader debian/tmp/$(BINDIR)
 
 override_dh_strip:
 	dh_strip -Xwine-pthread -Xwine-kthread --ddeb-migration='libwine$(VERSION)-dbg (<< 1.9.0-1~)'
diff --git a/debian/wine32VERSION-preloader.install b/debian/wine32VERSION-preloader.install
index b15f338..d92948c 100644
--- a/debian/wine32VERSION-preloader.install
+++ b/debian/wine32VERSION-preloader.install
@@ -1 +1 @@
-usr/lib/*/*/wine-preloader usr/lib/wineVERSION/wine
+usr/lib/wineVERSION/wine-preloader
diff --git a/debian/wine32VERSION-preloader.lintian-overrides b/debian/wine32VERSION-preloader.lintian-overrides
index f3d7193..9ec1c2c 100644
--- a/debian/wine32VERSION-preloader.lintian-overrides
+++ b/debian/wine32VERSION-preloader.lintian-overrides
@@ -1,2 +1,2 @@
 # preloader binary is statically linked by definition
-statically-linked-binary usr/lib/wineVERSION/wine/wine-preloader
+statically-linked-binary usr/lib/wineVERSION/wine-preloader
diff --git a/debian/wine32VERSION.install b/debian/wine32VERSION.install
index 88ad6fa..3c27e14 100644
--- a/debian/wine32VERSION.install
+++ b/debian/wine32VERSION.install
@@ -1,2 +1,2 @@
-debian/tmp/wine32 usr/lib/wineVERSION/wine
-debian/tmp/wineserver32 usr/lib/wineVERSION/wine
+debian/tmp/wine32 usr/lib/wineVERSION
+debian/tmp/wineserver32 usr/lib/wineVERSION
diff --git a/debian/wine32VERSION.links b/debian/wine32VERSION.links
index a8b973a..fccc38c 100644
--- a/debian/wine32VERSION.links
+++ b/debian/wine32VERSION.links
@@ -1 +1 @@
-usr/lib/wineVERSION/wine/wine32 usr/bin/wine32VERSION
+usr/lib/wineVERSION/wine32 usr/bin/wine32VERSION
diff --git a/debian/wine64VERSION-preloader.install b/debian/wine64VERSION-preloader.install
index 9a1dfc9..1dcc293 100644
--- a/debian/wine64VERSION-preloader.install
+++ b/debian/wine64VERSION-preloader.install
@@ -1 +1 @@
-usr/lib/*/*/wine64-preloader usr/lib/wineVERSION/wine
+usr/lib/wineVERSION/wine64-preloader
diff --git a/debian/wine64VERSION-preloader.lintian-overrides b/debian/wine64VERSION-preloader.lintian-overrides
index 4fc84d7..6492218 100644
--- a/debian/wine64VERSION-preloader.lintian-overrides
+++ b/debian/wine64VERSION-preloader.lintian-overrides
@@ -1,2 +1,2 @@
 # preloader binary is statically linked by definition
-statically-linked-binary usr/lib/wineVERSION/wine/wine64-preloader
+statically-linked-binary usr/lib/wineVERSION/wine64-preloader
diff --git a/debian/wine64VERSION.install b/debian/wine64VERSION.install
index 0b45c3f..29dcfc7 100644
--- a/debian/wine64VERSION.install
+++ b/debian/wine64VERSION.install
@@ -1,2 +1,2 @@
-debian/tmp/wine64 usr/lib/wineVERSION/wine
-debian/tmp/wineserver64 usr/lib/wineVERSION/wine
+debian/tmp/wine64 usr/lib/wineVERSION
+debian/tmp/wineserver64 usr/lib/wineVERSION
diff --git a/debian/wine64VERSION.links b/debian/wine64VERSION.links
index b8114f1..a35d012 100644
--- a/debian/wine64VERSION.links
+++ b/debian/wine64VERSION.links
@@ -1 +1 @@
-usr/lib/wineVERSION/wine/wine64 usr/bin/wine64VERSION
+usr/lib/wineVERSION/wine64 usr/bin/wine64VERSION
diff --git a/debian/wineVERSION.install b/debian/wineVERSION.install
index f1e1139..4ccd65a 100644
--- a/debian/wineVERSION.install
+++ b/debian/wineVERSION.install
@@ -1,3 +1,3 @@
-debian/scripts/wine usr/lib/wineVERSION/wine
-debian/scripts/wineserver usr/lib/wineVERSION/wine
-debian/scripts/wineapploader usr/lib/wineVERSION/wine
+debian/scripts/wine usr/lib/wineVERSION
+debian/scripts/wineserver usr/lib/wineVERSION
+debian/scripts/wineapploader usr/lib/wineVERSION
diff --git a/debian/wineVERSION.links b/debian/wineVERSION.links
index a18676e..870a8cd 100644
--- a/debian/wineVERSION.links
+++ b/debian/wineVERSION.links
@@ -1,11 +1,11 @@
-usr/lib/wineVERSION/wine/wine usr/bin/wineVERSION
-usr/lib/wineVERSION/wine/wineserver usr/bin/wineserverVERSION
+usr/lib/wineVERSION/wine usr/bin/wineVERSION
+usr/lib/wineVERSION/wineserver usr/bin/wineserverVERSION
 
-usr/lib/wineVERSION/wine/wineapploader usr/bin/msiexecVERSION
-usr/lib/wineVERSION/wine/wineapploader usr/bin/regeditVERSION
-usr/lib/wineVERSION/wine/wineapploader usr/bin/winecfgVERSION
-usr/lib/wineVERSION/wine/wineapploader usr/bin/winedbgVERSION
-usr/lib/wineVERSION/wine/wineapploader usr/bin/winebootVERSION
-usr/lib/wineVERSION/wine/wineapploader usr/bin/winefileVERSION
-usr/lib/wineVERSION/wine/wineapploader usr/bin/regsvr32VERSION
-usr/lib/wineVERSION/wine/wineapploader usr/bin/wineconsoleVERSION
+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/regsvr32VERSION
+usr/lib/wineVERSION/wineapploader usr/bin/wineconsoleVERSION

-- 
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