diff -Nru ruby1.8-1.8.7.358/debian/changelog ruby1.8-1.8.7.358/debian/changelog --- ruby1.8-1.8.7.358/debian/changelog 2012-10-31 17:20:28.000000000 -0700 +++ ruby1.8-1.8.7.358/debian/changelog 2013-03-01 06:47:37.000000000 -0800 @@ -1,3 +1,17 @@ +ruby1.8 (1.8.7.358-6+x32+1) unreleased; urgency=low + + * Forgot to remove gcc-4.6 from ruby1.8-dev package's Depends as well. + + -- Daniel Schepler Fri, 01 Mar 2013 06:46:30 -0800 + +ruby1.8 (1.8.7.358-6+x32) unreleased; urgency=low + + * Build using gcc-4.7 for x32 upload, as gcc-4.6 is unavailable on x32. + (But do pass -fno-tree-dce -fno-optimize-sibling-calls as suggested in + #674541.) + + -- Daniel Schepler Thu, 28 Feb 2013 17:54:27 -0800 + ruby1.8 (1.8.7.358-6) unstable; urgency=high * Timeout the execution of the tests after 2 hours. This should fix the diff -Nru ruby1.8-1.8.7.358/debian/control ruby1.8-1.8.7.358/debian/control --- ruby1.8-1.8.7.358/debian/control 2012-10-31 14:08:23.000000000 -0700 +++ ruby1.8-1.8.7.358/debian/control 2013-03-01 06:45:41.000000000 -0800 @@ -3,7 +3,7 @@ Priority: optional Maintainer: akira yamada Uploaders: Daigo Moriwaki , Lucas Nussbaum , Antonio Terceiro -Build-Depends: cdbs (>= 0.4.106), debhelper (>= 5), autotools-dev, autoconf, m4, quilt (>= 0.40), patch, bison, binutils (>= 2.14.90.0.7), libgdbm-dev, libncurses5-dev, libreadline-gplv2-dev, tcl-dev, tk-dev, zlib1g-dev, libssl-dev (>= 0.9.6b), file, coreutils, gcc-4.6 +Build-Depends: cdbs (>= 0.4.106), debhelper (>= 5), autotools-dev, autoconf, m4, quilt (>= 0.40), patch, bison, binutils (>= 2.14.90.0.7), libgdbm-dev, libncurses5-dev, libreadline-gplv2-dev, tcl-dev, tk-dev, zlib1g-dev, libssl-dev (>= 0.9.6b), file, coreutils Standards-Version: 3.9.2 Homepage: http://www.ruby-lang.org/ Vcs-Git: git://git.debian.org/collab-maint/ruby1.8.git @@ -58,7 +58,7 @@ Package: ruby1.8-dev Architecture: any -Depends: libruby1.8 (= ${binary:Version}), libc6-dev, ${misc:Depends}, gcc-4.6 +Depends: libruby1.8 (= ${binary:Version}), libc6-dev, ${misc:Depends} Recommends: ruby1.8 (= ${binary:Version}) Provides: ruby-dev Description: Header files for compiling extension modules for the Ruby 1.8 diff -Nru ruby1.8-1.8.7.358/debian/rules ruby1.8-1.8.7.358/debian/rules --- ruby1.8-1.8.7.358/debian/rules 2012-10-31 15:12:27.000000000 -0700 +++ ruby1.8-1.8.7.358/debian/rules 2013-02-28 17:57:15.000000000 -0800 @@ -19,13 +19,12 @@ DEB_AUTO_UPDATE_AUTOCONF = YES -CC = gcc-4.6 # see #674541; same version must be in Depends of ruby1.8-dev CFLAGS += -fno-strict-aliasing -g CXXFLAGS += -fno-strict-aliasing -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -g -O0 else - CFLAGS += -g -O2 + CFLAGS += -g -O2 -fno-tree-dce -fno-optimize-sibling-calls # Workaround for #634260. Can be removed when #635126 is fixed. ifeq ($(DEB_BUILD_ARCH),armel) CFLAGS += -fno-tree-sra