Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Hi,
I've prepared a new version of gcc-mingw-w64, fixing the RC bug
#690148 (/usr/share/doc/gcc-mingw32 used to be a directory but is now
a symlink). While I'm at it I'd also like to add symlinks to the
gcc-mingw32 package to fully replace the version in Squeeze, which
would also fix #682257 (gcc-mingw32 provides i586-mingw32msvc-g++ but
not amd64-mingw32msvc-g++).
Would the added symlinks be acceptable for Wheezy, or should I limit
myself to fixing the RC bug? The attached debdiff contains all the
changes I have planned; the RC bug fix is in gcc-mingw32.postinst.
Thanks in advance,
Stephen
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (500, 'testing'), (500, 'stable'), (200, 'unstable'), (1,
'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-4-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gcc-mingw-w64-7/debian/changelog gcc-mingw-w64-8/debian/changelog
--- gcc-mingw-w64-7/debian/changelog 2012-08-08 08:21:59.000000000 +0200
+++ gcc-mingw-w64-8/debian/changelog 2012-10-17 07:49:17.000000000 +0200
@@ -1,3 +1,13 @@
+gcc-mingw-w64 (8) unstable; urgency=low
+
+ * Replace /usr/share/doc/gcc-mingw32 with a symlink when necessary
+ (Closes: #690148).
+ * Provide amd64 compatibility symlinks in gcc-mingw32, preserving the
+ functionality of the Squeeze version; add g++ compatibility symlink
+ (Closes: #682257).
+
+ -- Stephen Kitt <st...@sk2.org> Wed, 17 Oct 2012 07:49:14 +0200
+
gcc-mingw-w64 (7) unstable; urgency=low
* When upgrading from versions where /usr/share/doc/gcc-mingw-w64 is a
diff -Nru gcc-mingw-w64-7/debian/control gcc-mingw-w64-8/debian/control
--- gcc-mingw-w64-7/debian/control 2012-08-08 08:25:36.000000000 +0200
+++ gcc-mingw-w64-8/debian/control 2012-10-17 07:54:13.000000000 +0200
@@ -298,9 +298,13 @@
Package: gcc-mingw32
Architecture: all
Depends: binutils-mingw-w64-i686,
+ binutils-mingw-w64-x86-64,
gcc-mingw-w64-i686,
+ gcc-mingw-w64-x86-64,
g++-mingw-w64-i686,
+ g++-mingw-w64-x86-64,
gfortran-mingw-w64-i686,
+ gfortran-mingw-w64-x86-64,
${misc:Depends}
Built-Using: gcc-4.6 (= ${gcc:Version})
Conflicts: mingw32-binutils
@@ -310,9 +314,9 @@
the GNU Compiler Collection (gcc).
.
This transition package replaces the old gcc-4.4.4-based gcc-mingw32
- package and allows building software using the old i586-mingw32msvc
- triplet. It also includes compatibility symlinks for i586-mingw32msvc
- binutils binaries.
+ package and allows building software using the amd64-mingw32msvc and
+ i586-mingw32msvc triplets. It also includes compatibility symlinks
+ for amd64-mingw32msvc and i586-mingw32msvc binutils binaries.
Package: gcc-mingw-w64-base
Architecture: any
diff -Nru gcc-mingw-w64-7/debian/control.gcc-mingw32 gcc-mingw-w64-8/debian/control.gcc-mingw32
--- gcc-mingw-w64-7/debian/control.gcc-mingw32 2012-08-08 08:15:05.000000000 +0200
+++ gcc-mingw-w64-8/debian/control.gcc-mingw32 2012-10-17 07:45:01.000000000 +0200
@@ -1,9 +1,13 @@
Package: gcc-mingw32
Architecture: all
Depends: binutils-mingw-w64-i686,
+ binutils-mingw-w64-x86-64,
gcc-mingw-w64-i686,
+ gcc-mingw-w64-x86-64,
g++-mingw-w64-i686,
+ g++-mingw-w64-x86-64,
gfortran-mingw-w64-i686,
+ gfortran-mingw-w64-x86-64,
${misc:Depends}
Built-Using: gcc-4.6 (= ${gcc:Version})
Conflicts: mingw32-binutils
@@ -13,6 +17,6 @@
the GNU Compiler Collection (gcc).
.
This transition package replaces the old gcc-4.4.4-based gcc-mingw32
- package and allows building software using the old i586-mingw32msvc
- triplet. It also includes compatibility symlinks for i586-mingw32msvc
- binutils binaries.
+ package and allows building software using the amd64-mingw32msvc and
+ i586-mingw32msvc triplets. It also includes compatibility symlinks
+ for amd64-mingw32msvc and i586-mingw32msvc binutils binaries.
diff -Nru gcc-mingw-w64-7/debian/gcc-mingw32.links gcc-mingw-w64-8/debian/gcc-mingw32.links
--- gcc-mingw-w64-7/debian/gcc-mingw32.links 2012-07-02 19:55:06.000000000 +0200
+++ gcc-mingw-w64-8/debian/gcc-mingw32.links 2012-10-17 07:37:21.000000000 +0200
@@ -1,17 +1,17 @@
usr/bin/i686-w64-mingw32-addr2line usr/bin/i586-mingw32msvc-addr2line
usr/bin/i686-w64-mingw32-ar usr/bin/i586-mingw32msvc-ar
usr/bin/i686-w64-mingw32-as usr/bin/i586-mingw32msvc-as
-usr/bin/i686-w64-mingw32-c++ usr/bin/i586-mingw32msvc-c++
-usr/bin/i686-w64-mingw32-gcc usr/bin/i586-mingw32msvc-cc
usr/bin/i686-w64-mingw32-c++filt usr/bin/i586-mingw32msvc-c++filt
usr/bin/i686-w64-mingw32-cpp usr/bin/i586-mingw32msvc-cpp
+usr/bin/i686-w64-mingw32-c++ usr/bin/i586-mingw32msvc-c++
usr/bin/i686-w64-mingw32-dlltool usr/bin/i586-mingw32msvc-dlltool
usr/bin/i686-w64-mingw32-dllwrap usr/bin/i586-mingw32msvc-dllwrap
-usr/bin/i686-w64-mingw32-g++ usr/bin/i586-mingw32msvc-g++
+usr/bin/i686-w64-mingw32-gcc usr/bin/i586-mingw32msvc-cc
usr/bin/i686-w64-mingw32-gcc usr/bin/i586-mingw32msvc-gcc
usr/bin/i686-w64-mingw32-gcov usr/bin/i586-mingw32msvc-gcov
usr/bin/i686-w64-mingw32-gfortran usr/bin/i586-mingw32msvc-gfortran
usr/bin/i686-w64-mingw32-gprof usr/bin/i586-mingw32msvc-gprof
+usr/bin/i686-w64-mingw32-g++ usr/bin/i586-mingw32msvc-g++
usr/bin/i686-w64-mingw32-ld usr/bin/i586-mingw32msvc-ld
usr/bin/i686-w64-mingw32-nm usr/bin/i586-mingw32msvc-nm
usr/bin/i686-w64-mingw32-objcopy usr/bin/i586-mingw32msvc-objcopy
@@ -23,6 +23,31 @@
usr/bin/i686-w64-mingw32-strip usr/bin/i586-mingw32msvc-strip
usr/bin/i686-w64-mingw32-windmc usr/bin/i586-mingw32msvc-windmc
usr/bin/i686-w64-mingw32-windres usr/bin/i586-mingw32msvc-windres
+usr/bin/x86_64-w64-mingw32-addr2line usr/bin/amd64-mingw32msvc-addr2line
+usr/bin/x86_64-w64-mingw32-ar usr/bin/amd64-mingw32msvc-ar
+usr/bin/x86_64-w64-mingw32-as usr/bin/amd64-mingw32msvc-as
+usr/bin/x86_64-w64-mingw32-c++filt usr/bin/amd64-mingw32msvc-c++filt
+usr/bin/x86_64-w64-mingw32-cpp usr/bin/amd64-mingw32msvc-cpp
+usr/bin/x86_64-w64-mingw32-c++ usr/bin/amd64-mingw32msvc-c++
+usr/bin/x86_64-w64-mingw32-dlltool usr/bin/amd64-mingw32msvc-dlltool
+usr/bin/x86_64-w64-mingw32-dllwrap usr/bin/amd64-mingw32msvc-dllwrap
+usr/bin/x86_64-w64-mingw32-gcc usr/bin/amd64-mingw32msvc-cc
+usr/bin/x86_64-w64-mingw32-gcc usr/bin/amd64-mingw32msvc-gcc
+usr/bin/x86_64-w64-mingw32-gcov usr/bin/amd64-mingw32msvc-gcov
+usr/bin/x86_64-w64-mingw32-gfortran usr/bin/amd64-mingw32msvc-gfortran
+usr/bin/x86_64-w64-mingw32-gprof usr/bin/amd64-mingw32msvc-gprof
+usr/bin/x86_64-w64-mingw32-g++ usr/bin/amd64-mingw32msvc-g++
+usr/bin/x86_64-w64-mingw32-ld usr/bin/amd64-mingw32msvc-ld
+usr/bin/x86_64-w64-mingw32-nm usr/bin/amd64-mingw32msvc-nm
+usr/bin/x86_64-w64-mingw32-objcopy usr/bin/amd64-mingw32msvc-objcopy
+usr/bin/x86_64-w64-mingw32-objdump usr/bin/amd64-mingw32msvc-objdump
+usr/bin/x86_64-w64-mingw32-ranlib usr/bin/amd64-mingw32msvc-ranlib
+usr/bin/x86_64-w64-mingw32-readelf usr/bin/amd64-mingw32msvc-readelf
+usr/bin/x86_64-w64-mingw32-size usr/bin/amd64-mingw32msvc-size
+usr/bin/x86_64-w64-mingw32-strings usr/bin/amd64-mingw32msvc-strings
+usr/bin/x86_64-w64-mingw32-strip usr/bin/amd64-mingw32msvc-strip
+usr/bin/x86_64-w64-mingw32-windmc usr/bin/amd64-mingw32msvc-windmc
+usr/bin/x86_64-w64-mingw32-windres usr/bin/amd64-mingw32msvc-windres
usr/share/man/man1/i686-w64-mingw32-addr2line.1.gz usr/share/man/man1/i586-mingw32msvc-addr2line.1.gz
usr/share/man/man1/i686-w64-mingw32-ar.1.gz usr/share/man/man1/i586-mingw32msvc-ar.1.gz
usr/share/man/man1/i686-w64-mingw32-as.1.gz usr/share/man/man1/i586-mingw32msvc-as.1.gz
@@ -41,3 +66,21 @@
usr/share/man/man1/i686-w64-mingw32-strip.1.gz usr/share/man/man1/i586-mingw32msvc-strip.1.gz
usr/share/man/man1/i686-w64-mingw32-windmc.1.gz usr/share/man/man1/i586-mingw32msvc-windmc.1.gz
usr/share/man/man1/i686-w64-mingw32-windres.1.gz usr/share/man/man1/i586-mingw32msvc-windres.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-addr2line.1.gz usr/share/man/man1/amd64-mingw32msvc-addr2line.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-ar.1.gz usr/share/man/man1/amd64-mingw32msvc-ar.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-as.1.gz usr/share/man/man1/amd64-mingw32msvc-as.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-c++filt.1.gz usr/share/man/man1/amd64-mingw32msvc-c++filt.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-dlltool.1.gz usr/share/man/man1/amd64-mingw32msvc-dlltool.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-dllwrap.1.gz usr/share/man/man1/amd64-mingw32msvc-dllwrap.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-gprof.1.gz usr/share/man/man1/amd64-mingw32msvc-gprof.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-ld.1.gz usr/share/man/man1/amd64-mingw32msvc-ld.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-nm.1.gz usr/share/man/man1/amd64-mingw32msvc-nm.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-objcopy.1.gz usr/share/man/man1/amd64-mingw32msvc-objcopy.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-objdump.1.gz usr/share/man/man1/amd64-mingw32msvc-objdump.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-ranlib.1.gz usr/share/man/man1/amd64-mingw32msvc-ranlib.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-readelf.1.gz usr/share/man/man1/amd64-mingw32msvc-readelf.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-size.1.gz usr/share/man/man1/amd64-mingw32msvc-size.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-strings.1.gz usr/share/man/man1/amd64-mingw32msvc-strings.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-strip.1.gz usr/share/man/man1/amd64-mingw32msvc-strip.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-windmc.1.gz usr/share/man/man1/amd64-mingw32msvc-windmc.1.gz
+usr/share/man/man1/x86_64-w64-mingw32-windres.1.gz usr/share/man/man1/amd64-mingw32msvc-windres.1.gz
diff -Nru gcc-mingw-w64-7/debian/gcc-mingw32.postinst gcc-mingw-w64-8/debian/gcc-mingw32.postinst
--- gcc-mingw-w64-7/debian/gcc-mingw32.postinst 1970-01-01 01:00:00.000000000 +0100
+++ gcc-mingw-w64-8/debian/gcc-mingw32.postinst 2012-10-17 07:09:40.000000000 +0200
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+# Replace documentation directory with symlink
+if [ -d /usr/share/doc/gcc-mingw32 ] && [ ! -L /usr/share/doc/gcc-mingw32 ]; then
+ if rmdir /usr/share/doc/gcc-mingw32 2>/dev/null; then
+ ln -sf gcc-mingw-w64-base /usr/share/doc/gcc-mingw32
+ fi
+fi
+
+#DEBHELPER#
+
+exit 0
