This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch master in repository wine.
commit d4663e15c76633d527310d1758af9145a1b68b68 Author: Jens Reyer <[email protected]> Date: Sat Jan 2 21:12:31 2016 +0100 Merge packages wine32|64-tools to wine-tools. --- debian/control.in | 34 +++++++++------------- debian/rules | 4 +-- debian/wine32VERSION-tools.manpages | 1 - debian/wine64VERSION-tools.docs | 2 -- debian/wine64VERSION-tools.install | 10 ------- debian/wine64VERSION-tools.lintian-overrides | 4 --- debian/wine64VERSION-tools.manpages | 1 - ...32VERSION-tools.docs => wineVERSION-tools.docs} | 0 ...ION-tools.install => wineVERSION-tools.install} | 2 +- ...errides => wineVERSION-tools.lintian-overrides} | 0 debian/wineVERSION-tools.manpages | 1 + 11 files changed, 17 insertions(+), 42 deletions(-) diff --git a/debian/control.in b/debian/control.in index 3520355..7e6c66d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -181,8 +181,9 @@ Description: Windows API implementation - prelinked 64-bit binary loader . This package provides the prelinked loader for 64-bit Windows applications. -Package: wine32VERSION-tools -Architecture: any-i386 any-powerpc armel armhf +Package: wineVERSION-tools +Architecture: amd64 any-i386 any-powerpc armel armhf arm64 +Multi-Arch: no Section: libdevel Built-Using: ${built:Using} Depends: @@ -191,27 +192,20 @@ 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 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. + This package provides wine's developer tools. Package: fonts-wineVERSION Section: fonts @@ -263,7 +257,7 @@ Depends: libwineVERSION (= ${binary:Version}), libc6-dev, Recommends: - wine32VERSION-tools (= ${binary:Version}) | wine64VERSION-tools (= ${binary:Version}), + wineVERSION-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 c2e08bc..d542812 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$(DEB_BUILD_ARCH_BITS)$(VERSION) + sed 's|LIBDIR|$(LIBDIR)|g' < debian/scripts/winegcc > debian/tmp/winegcc$(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,8 +112,6 @@ 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/wine32VERSION-tools.manpages b/debian/wine32VERSION-tools.manpages deleted file mode 100644 index b0c1e64..0000000 --- a/debian/wine32VERSION-tools.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/share/man/man1/winegcc32VERSION.1 diff --git a/debian/wine64VERSION-tools.docs b/debian/wine64VERSION-tools.docs deleted file mode 100644 index 1242b00..0000000 --- a/debian/wine64VERSION-tools.docs +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/changelog -debian/tmp/README.winedump diff --git a/debian/wine64VERSION-tools.install b/debian/wine64VERSION-tools.install deleted file mode 100644 index f8e20ca..0000000 --- a/debian/wine64VERSION-tools.install +++ /dev/null @@ -1,10 +0,0 @@ -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 diff --git a/debian/wine64VERSION-tools.lintian-overrides b/debian/wine64VERSION-tools.lintian-overrides deleted file mode 100644 index e230008..0000000 --- a/debian/wine64VERSION-tools.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -# unfortunately wine doesn't doesn't do fortify hardening -hardening-no-fortify-functions -# incorrectly flagged -spelling-error-in-binary diff --git a/debian/wine64VERSION-tools.manpages b/debian/wine64VERSION-tools.manpages deleted file mode 100644 index 42f04a2..0000000 --- a/debian/wine64VERSION-tools.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/share/man/man1/winegcc64VERSION.1 diff --git a/debian/wine32VERSION-tools.docs b/debian/wineVERSION-tools.docs similarity index 100% rename from debian/wine32VERSION-tools.docs rename to debian/wineVERSION-tools.docs diff --git a/debian/wine32VERSION-tools.install b/debian/wineVERSION-tools.install similarity index 85% rename from debian/wine32VERSION-tools.install rename to debian/wineVERSION-tools.install index 970b9be..dfb69b0 100644 --- a/debian/wine32VERSION-tools.install +++ b/debian/wineVERSION-tools.install @@ -6,4 +6,4 @@ debian/tmp/usr/lib/*/*/winedump debian/tmp/usr/lib/*/*/winebuild debian/tmp/usr/lib/*/*/winemaker -debian/tmp/winegcc32VERSION usr/bin +debian/tmp/winegccVERSION usr/bin diff --git a/debian/wine32VERSION-tools.lintian-overrides b/debian/wineVERSION-tools.lintian-overrides similarity index 100% rename from debian/wine32VERSION-tools.lintian-overrides rename to debian/wineVERSION-tools.lintian-overrides diff --git a/debian/wineVERSION-tools.manpages b/debian/wineVERSION-tools.manpages new file mode 100644 index 0000000..de0d8d2 --- /dev/null +++ b/debian/wineVERSION-tools.manpages @@ -0,0 +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 _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
