diff -Nru binutils-mingw-w64-0.3/debian/binutils-mingw-w64-i686.install binutils-mingw-w64-1/debian/binutils-mingw-w64-i686.install --- binutils-mingw-w64-0.3/debian/binutils-mingw-w64-i686.install 1970-01-01 00:00:00.000000000 +0000 +++ binutils-mingw-w64-1/debian/binutils-mingw-w64-i686.install 2011-11-26 14:15:11.000000000 +0000 @@ -0,0 +1,3 @@ +usr/bin/i686-w64-mingw32-* +usr/lib/ldscripts/i386pe.* +usr/share/man/man1/i686-w64-mingw32-* diff -Nru binutils-mingw-w64-0.3/debian/binutils-mingw-w64-i686.links binutils-mingw-w64-1/debian/binutils-mingw-w64-i686.links --- binutils-mingw-w64-0.3/debian/binutils-mingw-w64-i686.links 1970-01-01 00:00:00.000000000 +0000 +++ binutils-mingw-w64-1/debian/binutils-mingw-w64-i686.links 2011-11-29 08:35:14.000000000 +0000 @@ -0,0 +1 @@ +usr/share/man/man1/i686-w64-mingw32-ld.1.gz usr/share/man/man1/i686-w64-mingw32-ld.bfd.1.gz diff -Nru binutils-mingw-w64-0.3/debian/binutils-mingw-w64-i686.lintian-overrides binutils-mingw-w64-1/debian/binutils-mingw-w64-i686.lintian-overrides --- binutils-mingw-w64-0.3/debian/binutils-mingw-w64-i686.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ binutils-mingw-w64-1/debian/binutils-mingw-w64-i686.lintian-overrides 2011-11-29 08:36:15.000000000 +0000 @@ -0,0 +1,3 @@ +# Bugs in binutils-source +binutils-mingw-w64-i686 binary: spelling-error-in-binary +binutils-mingw-w64-i686 binary: manpage-has-errors-from-man diff -Nru binutils-mingw-w64-0.3/debian/binutils-mingw-w64-i686.manpages binutils-mingw-w64-1/debian/binutils-mingw-w64-i686.manpages --- binutils-mingw-w64-0.3/debian/binutils-mingw-w64-i686.manpages 1970-01-01 00:00:00.000000000 +0000 +++ binutils-mingw-w64-1/debian/binutils-mingw-w64-i686.manpages 2011-11-29 05:52:13.000000000 +0000 @@ -0,0 +1 @@ +debian/i686-w64-mingw32-dllwrap.1 diff -Nru binutils-mingw-w64-0.3/debian/binutils-mingw-w64.links binutils-mingw-w64-1/debian/binutils-mingw-w64.links --- binutils-mingw-w64-0.3/debian/binutils-mingw-w64.links 2011-02-25 14:12:00.000000000 +0000 +++ binutils-mingw-w64-1/debian/binutils-mingw-w64.links 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/share/man/man1/i686-w64-mingw32-ld.1.gz usr/share/man/man1/i686-w64-mingw32-ld.bfd.1.gz -usr/share/man/man1/x86_64-w64-mingw32-ld.1.gz usr/share/man/man1/x86_64-w64-mingw32-ld.bfd.1.gz diff -Nru binutils-mingw-w64-0.3/debian/binutils-mingw-w64.lintian-overrides binutils-mingw-w64-1/debian/binutils-mingw-w64.lintian-overrides --- binutils-mingw-w64-0.3/debian/binutils-mingw-w64.lintian-overrides 2011-02-25 17:26:58.000000000 +0000 +++ binutils-mingw-w64-1/debian/binutils-mingw-w64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# Bugs in binutils-source -binutils-mingw-w64 binary: spelling-error-in-binary -binutils-mingw-w64 binary: manpage-has-errors-from-man diff -Nru binutils-mingw-w64-0.3/debian/binutils-mingw-w64-x86-64.install binutils-mingw-w64-1/debian/binutils-mingw-w64-x86-64.install --- binutils-mingw-w64-0.3/debian/binutils-mingw-w64-x86-64.install 1970-01-01 00:00:00.000000000 +0000 +++ binutils-mingw-w64-1/debian/binutils-mingw-w64-x86-64.install 2011-11-26 14:14:56.000000000 +0000 @@ -0,0 +1,3 @@ +usr/bin/x86_64-w64-mingw32-* +usr/lib/ldscripts/i386pep.* +usr/share/man/man1/x86_64-w64-mingw32-* diff -Nru binutils-mingw-w64-0.3/debian/binutils-mingw-w64-x86-64.links binutils-mingw-w64-1/debian/binutils-mingw-w64-x86-64.links --- binutils-mingw-w64-0.3/debian/binutils-mingw-w64-x86-64.links 1970-01-01 00:00:00.000000000 +0000 +++ binutils-mingw-w64-1/debian/binutils-mingw-w64-x86-64.links 2011-11-29 08:35:23.000000000 +0000 @@ -0,0 +1 @@ +usr/share/man/man1/x86_64-w64-mingw32-ld.1.gz usr/share/man/man1/x86_64-w64-mingw32-ld.bfd.1.gz diff -Nru binutils-mingw-w64-0.3/debian/binutils-mingw-w64-x86-64.lintian-overrides binutils-mingw-w64-1/debian/binutils-mingw-w64-x86-64.lintian-overrides --- binutils-mingw-w64-0.3/debian/binutils-mingw-w64-x86-64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ binutils-mingw-w64-1/debian/binutils-mingw-w64-x86-64.lintian-overrides 2011-11-29 08:36:28.000000000 +0000 @@ -0,0 +1,3 @@ +# Bugs in binutils-source +binutils-mingw-w64-x86-64 binary: spelling-error-in-binary +binutils-mingw-w64-x86-64 binary: manpage-has-errors-from-man diff -Nru binutils-mingw-w64-0.3/debian/binutils-mingw-w64-x86-64.manpages binutils-mingw-w64-1/debian/binutils-mingw-w64-x86-64.manpages --- binutils-mingw-w64-0.3/debian/binutils-mingw-w64-x86-64.manpages 1970-01-01 00:00:00.000000000 +0000 +++ binutils-mingw-w64-1/debian/binutils-mingw-w64-x86-64.manpages 2011-11-29 05:52:28.000000000 +0000 @@ -0,0 +1 @@ +debian/x86_64-w64-mingw32-dllwrap.1 diff -Nru binutils-mingw-w64-0.3/debian/changelog binutils-mingw-w64-1/debian/changelog --- binutils-mingw-w64-0.3/debian/changelog 2011-05-24 21:44:32.000000000 +0000 +++ binutils-mingw-w64-1/debian/changelog 2011-12-07 15:13:04.000000000 +0000 @@ -1,3 +1,19 @@ +binutils-mingw-w64 (1) unstable; urgency=low + + [ Stephen Kitt ] + * Fix Lintian error about copyright templates. + * Add build-arch and build-indep targets. + * Switch to single-number versions and add the binutils-mingw-w64 + version to the resulting binary package's version. + * Split package into 32- and 64-bit specific versions (-i686 and + -x86-64) - see thread starting at + http://lists.debian.org/4EBA730A.7060707@greffrath.com for rationale. + + [ Didier Raboud ] + * Confidently setting the DMUA-flag to yes. + + -- Stephen Kitt Wed, 30 Nov 2011 20:09:17 +0100 + binutils-mingw-w64 (0.3) unstable; urgency=low * Enable LTO (Closes: #626285). diff -Nru binutils-mingw-w64-0.3/debian/control binutils-mingw-w64-1/debian/control --- binutils-mingw-w64-0.3/debian/control 2011-05-24 21:45:11.000000000 +0000 +++ binutils-mingw-w64-1/debian/control 2011-12-07 15:12:36.000000000 +0000 @@ -2,19 +2,49 @@ Section: devel Priority: extra Maintainer: Stephen Kitt -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, binutils-source (>= 2.21.51.20110523), bison, flex +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 7.0.50~), autotools-dev, binutils-source (>= 2.22), bison, flex Standards-Version: 3.9.2 Homepage: http://www.gnu.org/software/binutils/ Vcs-Git: git://git.debian.org/collab-maint/binutils-mingw-w64.git Vcs-Browser: http://git.debian.org/?p=collab-maint/binutils-mingw-w64.git;a=summary Package: binutils-mingw-w64 +Architecture: all +Depends: ${misc:Depends}, binutils-mingw-w64-i686, binutils-mingw-w64-x86-64 +Built-Using: binutils (= ${binutils:Version}) +Conflicts: mingw32-binutils +Description: Cross-binutils for Win32 and Win64 using MinGW-w64 + MinGW-w64 provides a development and runtime environment for 32- and + 64-bit (x86 and x64) Windows applications using the Windows API and + the GNU Compiler Collection (gcc). + . + This metapackage provides the toolchain binutils. + +Package: binutils-mingw-w64-i686 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, binutils (>= ${local:Version}) -Built-Using: binutils (= ${binary:Version}) +Built-Using: binutils (= ${binutils:Version}) Conflicts: mingw32-binutils -Description: Cross-binutils for Win32 and Win64 using MinGW-w64 +Breaks: binutils-mingw-w64 (<< 2.22-1+1) +Replaces: binutils-mingw-w64 (<< 2.22-1+1) +Description: Cross-binutils for Win32 (x86) using MinGW-w64 + MinGW-w64 provides a development and runtime environment for 32- and + 64-bit (x86 and x64) Windows applications using the Windows API and + the GNU Compiler Collection (gcc). + . + This package contains the toolchain binutils targeting 32-bit Windows. + +Package: binutils-mingw-w64-x86-64 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, binutils (>= ${local:Version}) +Built-Using: binutils (= ${binutils:Version}) +Conflicts: mingw32-binutils +Breaks: binutils-mingw-w64 (<< 2.22-1+1) +Replaces: binutils-mingw-w64 (<< 2.22-1+1) +Description: Cross-binutils for Win64 (x64) using MinGW-w64 MinGW-w64 provides a development and runtime environment for 32- and - 64-bit Windows applications using the GNU Compiler Collection (gcc). + 64-bit (x86 and x64) Windows applications using the Windows API and + the GNU Compiler Collection (gcc). . - This package contains the toolchain binutils. + This package contains the toolchain binutils targeting 64-bit Windows. diff -Nru binutils-mingw-w64-0.3/debian/copyright binutils-mingw-w64-1/debian/copyright --- binutils-mingw-w64-0.3/debian/copyright 2010-11-17 22:22:10.000000000 +0000 +++ binutils-mingw-w64-1/debian/copyright 2011-07-21 06:17:09.000000000 +0000 @@ -5,7 +5,7 @@ It is based on the binutils-source package maintained by James Troup . -Upstream Author(s): +Upstream Author: Free Software Foundation, Inc. diff -Nru binutils-mingw-w64-0.3/debian/rules binutils-mingw-w64-1/debian/rules --- binutils-mingw-w64-0.3/debian/rules 2011-05-11 06:20:51.000000000 +0000 +++ binutils-mingw-w64-1/debian/rules 2011-11-29 05:53:09.000000000 +0000 @@ -9,19 +9,16 @@ binutils_dir := /usr/src/binutils upstream_dir := $(top_dir)/upstream build_dir := $(top_dir)/build -deb_version := $(shell dpkg-query -W -f="\$${Version}\n" binutils-source) +source_version := $(shell dpkg-query -W -f="\$${Version}\n" binutils-source) +deb_version := $(source_version)+$(shell dpkg-parsechangelog | sed -ne "s/^Version: \(.*\)/\1/p") deb_upstream_version := $(shell echo $(deb_version) | cut -d- -f1) gnu_upstream_version := $(shell echo $(deb_upstream_version) | cut -d. -f1-3) -package := binutils-mingw-w64 targets := i686-w64-mingw32 x86_64-w64-mingw32 CFLAGS = $(shell dpkg-buildflags --get CFLAGS) CFLAGS += -Wall -all: - echo $(deb_version) - unpack: unpack-stamp unpack-stamp: tar xf $(binutils_dir)/binutils-$(gnu_upstream_version).tar.* @@ -43,16 +40,18 @@ done touch $@ -build: build-stamp -build-stamp: configure-stamp +build-arch-stamp: configure-stamp dh_testdir for target in $(targets); do \ dh_auto_build --parallel -B$(build_dir)/$$target; \ done touch $@ -install: install-stamp -install-stamp: build-stamp +build-indep-stamp: + touch $@ + +install-arch: install-arch-stamp +install-arch-stamp: build-arch-stamp dh_testdir dh_testroot dh_prep @@ -61,12 +60,12 @@ done # Drop files which will conflict with other packages - rm -rf debian/$(package)/usr/lib/*.a - rm -rf debian/$(package)/usr/share/info - rm -rf debian/$(package)/usr/share/locale + rm -rf debian/tmp/usr/lib/*.a + rm -rf debian/tmp/usr/share/info + rm -rf debian/tmp/usr/share/locale # The following aren't necessary and don't comply with the FHS - rm -rf $(patsubst %,debian/$(package)/usr/%,$(targets)) + rm -rf $(patsubst %,debian/tmp/usr/%,$(targets)) # Copy the dllwrap manpages for target in $(targets); do \ @@ -75,24 +74,22 @@ touch $@ -binary-indep: -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installman $(patsubst %,debian/%-dllwrap.1,$(targets)) +build: build-arch build-indep +build-arch: build-arch-stamp +build-indep: build-indep-stamp + +binary-indep: build-indep + dh $@ + +binary-arch: install-arch + dh $@ + +override_dh_installchangelogs: dh_installchangelogs $(upstream_dir)/ChangeLog - dh_link - dh_strip - dh_lintian - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol -- -v$(deb_version) -Vlocal:Version=$(deb_upstream_version) - dh_md5sums - dh_builddeb + +override_dh_gencontrol: + dh_gencontrol -- -v$(deb_version) -Vlocal:Version=$(deb_upstream_version) -Vbinutils:Version=$(source_version) binary: binary-indep binary-arch -.PHONY: binary-indep binary-arch binary clean build install +.PHONY: binary-indep binary-arch binary clean build-indep build-arch build install-arch