This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch master in repository wine.
commit 089fc18ce591089f6c4614848a59f547a0f979e6 Author: Jens Reyer <[email protected]> Date: Sun Jan 3 02:06:57 2016 +0100 Revert "Merge packages wine32|64-tools to wine-tools." This reverts commit d4663e15c76633d527310d1758af9145a1b68b68. --- debian/control.in | 34 +++++++++++++--------- debian/rules | 4 ++- ...VERSION-tools.docs => wine32VERSION-tools.docs} | 0 ...N-tools.install => wine32VERSION-tools.install} | 2 +- ...rides => wine32VERSION-tools.lintian-overrides} | 0 debian/wine32VERSION-tools.manpages | 1 + ...VERSION-tools.docs => wine64VERSION-tools.docs} | 0 ...N-tools.install => wine64VERSION-tools.install} | 3 +- ...rides => wine64VERSION-tools.lintian-overrides} | 0 debian/wine64VERSION-tools.manpages | 1 + debian/wineVERSION-tools.manpages | 1 - 11 files changed, 28 insertions(+), 18 deletions(-) diff --git a/debian/control.in b/debian/control.in index 7e6c66d..3520355 100644 --- a/debian/control.in +++ b/debian/control.in @@ -181,9 +181,8 @@ Description: Windows API implementation - prelinked 64-bit binary loader . This package provides the prelinked loader for 64-bit Windows applications. -Package: wineVERSION-tools -Architecture: amd64 any-i386 any-powerpc armel armhf arm64 -Multi-Arch: no +Package: wine32VERSION-tools +Architecture: any-i386 any-powerpc armel armhf Section: libdevel Built-Using: ${built:Using} Depends: @@ -192,20 +191,27 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libwineVERSION-dev (= ${binary:Version}), -Provides: - wine32VERSION-tools, - wine64VERSION-tools, -Breaks: - wine32VERSION-tools (<< 1.8-2~), - wine64VERSION-tools (<< 1.8-2~), -Replaces: - wine32VERSION-tools (<< 1.8-2~), - wine64VERSION-tools (<< 1.8-2~), Description: Windows API implementation - 32-bit developer tools Wine is a free MS-Windows API implementation. This is still a work in progress and many applications may still not work. . - This package provides wine's developer tools. + This package provides wine's 32-bit developer tools. + +Package: wine64VERSION-tools +Architecture: amd64 arm64 +Section: libdevel +Built-Using: ${built:Using} +Depends: + gcc, + ${perl:Depends}, + ${misc:Depends}, + ${shlibs:Depends}, + libwineVERSION-dev (= ${binary:Version}), +Description: Windows API implementation - 64-bit developer tools + Wine is a free MS-Windows API implementation. + This is still a work in progress and many applications may still not work. + . + This package provides wine's 64-bit developer tools. Package: fonts-wineVERSION Section: fonts @@ -257,7 +263,7 @@ Depends: libwineVERSION (= ${binary:Version}), libc6-dev, Recommends: - wineVERSION-tools (= ${binary:Version}), + wine32VERSION-tools (= ${binary:Version}) | wine64VERSION-tools (= ${binary:Version}), Description: Windows API implementation - development files 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 d542812..c2e08bc 100755 --- a/debian/rules +++ b/debian/rules @@ -101,7 +101,7 @@ override_dh_auto_configure: override_dh_install: $(INSTALLS) mkdir -p debian/tmp cp ANNOUNCE debian/tmp/changelog - sed 's|LIBDIR|$(LIBDIR)|g' < debian/scripts/winegcc > debian/tmp/winegcc$(VERSION) + sed 's|LIBDIR|$(LIBDIR)|g' < debian/scripts/winegcc > debian/tmp/winegcc$(DEB_BUILD_ARCH_BITS)$(VERSION) cp tools/winedump/README debian/tmp/README.winedump cp programs/winedbg/README debian/tmp/README.winedbg cp debian/tmp/$(LIBDIR)/winecfg debian/tmp/wineapploader @@ -112,6 +112,8 @@ override_dh_install: $(INSTALLS) rename=$$(echo $$file | sed s/\\.1/$(VERSION)\\.1/); \ cp $$file $$rename || true; \ done + cd debian/tmp/usr/share/man/man1 && \ + cp winegcc.1 winegcc$(DEB_BUILD_ARCH_BITS)$(VERSION).1 dh_install override_dh_strip: diff --git a/debian/wineVERSION-tools.docs b/debian/wine32VERSION-tools.docs similarity index 100% copy from debian/wineVERSION-tools.docs copy to debian/wine32VERSION-tools.docs diff --git a/debian/wineVERSION-tools.install b/debian/wine32VERSION-tools.install similarity index 85% copy from debian/wineVERSION-tools.install copy to debian/wine32VERSION-tools.install index dfb69b0..970b9be 100644 --- a/debian/wineVERSION-tools.install +++ b/debian/wine32VERSION-tools.install @@ -6,4 +6,4 @@ debian/tmp/usr/lib/*/*/winedump debian/tmp/usr/lib/*/*/winebuild debian/tmp/usr/lib/*/*/winemaker -debian/tmp/winegccVERSION usr/bin +debian/tmp/winegcc32VERSION usr/bin diff --git a/debian/wineVERSION-tools.lintian-overrides b/debian/wine32VERSION-tools.lintian-overrides similarity index 100% copy from debian/wineVERSION-tools.lintian-overrides copy to debian/wine32VERSION-tools.lintian-overrides diff --git a/debian/wine32VERSION-tools.manpages b/debian/wine32VERSION-tools.manpages new file mode 100644 index 0000000..b0c1e64 --- /dev/null +++ b/debian/wine32VERSION-tools.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/winegcc32VERSION.1 diff --git a/debian/wineVERSION-tools.docs b/debian/wine64VERSION-tools.docs similarity index 100% rename from debian/wineVERSION-tools.docs rename to debian/wine64VERSION-tools.docs diff --git a/debian/wineVERSION-tools.install b/debian/wine64VERSION-tools.install similarity index 76% rename from debian/wineVERSION-tools.install rename to debian/wine64VERSION-tools.install index dfb69b0..f8e20ca 100644 --- a/debian/wineVERSION-tools.install +++ b/debian/wine64VERSION-tools.install @@ -1,9 +1,10 @@ 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/winegccVERSION usr/bin +debian/tmp/winegcc64VERSION usr/bin diff --git a/debian/wineVERSION-tools.lintian-overrides b/debian/wine64VERSION-tools.lintian-overrides similarity index 100% rename from debian/wineVERSION-tools.lintian-overrides rename to debian/wine64VERSION-tools.lintian-overrides diff --git a/debian/wine64VERSION-tools.manpages b/debian/wine64VERSION-tools.manpages new file mode 100644 index 0000000..42f04a2 --- /dev/null +++ b/debian/wine64VERSION-tools.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/winegcc64VERSION.1 diff --git a/debian/wineVERSION-tools.manpages b/debian/wineVERSION-tools.manpages deleted file mode 100644 index de0d8d2..0000000 --- a/debian/wineVERSION-tools.manpages +++ /dev/null @@ -1 +0,0 @@ -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 _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
