[pkg-wine-party] [wine] 04/08: Revert "Move wine manpage to wine32."

Jens Reyer jreyer-guest at moszumanska.debian.org
Sun Jan 3 18:12:46 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 fd70107acb9525eb5b50bbd17ac7d6937314af6d
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sun Jan 3 02:07:41 2016 +0100

    Revert "Move wine manpage to wine32."
    
    This reverts commit 3a270bb5f8f2001deeef3ec3ebe025c2cf188c15.
---
 debian/control.in             | 4 +---
 debian/rules                  | 6 ++++++
 debian/wine32VERSION.manpages | 1 -
 debian/wineVERSION.manpages   | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index 85f9578..cc71423 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -135,10 +135,8 @@ Recommends:
 Suggests:
  wine32VERSION-preloader (= ${binary:Version}),
 Breaks:
- wineVERSION (<< 1.8-2~),
+ wineVERSION (<< 1.7.50-3~),
  wine32VERSION-preloader (<< 1.7.51-2~),
-Replaces:
- wineVERSION (<< 1.8-2~),
 Description: Windows API implementation - 32-bit binary loader
  Wine is a free MS-Windows API implementation.
  This is still a work in progress and many applications may still not work.
diff --git a/debian/rules b/debian/rules
index c2e08bc..a87c29e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,6 +98,12 @@ override_dh_auto_configure:
 	ln -s /usr/share/misc/config.guess tools || true
 	./configure $(CONFLAGS)
 
+override_dh_auto_build-indep:
+ifneq ($(DEB_BUILD_ARCH_BITS), 32)
+	@echo "error: wine's arch:all packages do not build on $(DEB_BUILD_ARCH_BITS)-bit architectures"
+	@exit 1
+endif
+
 override_dh_install: $(INSTALLS)
 	mkdir -p debian/tmp
 	cp ANNOUNCE debian/tmp/changelog
diff --git a/debian/wine32VERSION.manpages b/debian/wine32VERSION.manpages
deleted file mode 100644
index f50fc0e..0000000
--- a/debian/wine32VERSION.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/wineVERSION.1
diff --git a/debian/wineVERSION.manpages b/debian/wineVERSION.manpages
index e98b616..ca54838 100644
--- a/debian/wineVERSION.manpages
+++ b/debian/wineVERSION.manpages
@@ -1,3 +1,5 @@
+debian/tmp/usr/share/man/man1/wineVERSION.1
+
 debian/tmp/usr/share/man/man1/msiexecVERSION.1
 debian/tmp/usr/share/man/man1/winecfgVERSION.1
 debian/tmp/usr/share/man/man1/winedbgVERSION.1

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