diff -Nru perl-5.14.2/debian/changelog perl-5.14.2/debian/changelog --- perl-5.14.2/debian/changelog 2013-04-10 16:11:38.000000000 +0000 +++ perl-5.14.2/debian/changelog 2013-09-04 22:31:15.000000000 +0000 @@ -1,3 +1,20 @@ +perl (5.14.2-21+rpi2) wheezy-staging; urgency=low + + * Move the hacks to config.pm, Config_heavy.pl and CORE/config.h to before + md5sum generation so that the md5sums and files in the resulting package + match. + * Remove UU directory in clean target. + + -- Peter Michael Green Wed, 04 Sep 2013 21:15:17 +0000 + +perl (5.14.2-21+rpi1) wheezy-staging; urgency=low + + * switch to gcc-4.7 to avoid ICE + * Hack config.pm, Config_heavy.pl and CORE/config.h so perl related stuff is + built with the regular system compiler rather than explicitly with gcc 4.7. + + -- Peter Michael Green Sat, 03 Nov 2012 13:02:44 +0000 + perl (5.14.2-21) unstable; urgency=low [ Dominic Hargreaves ] diff -Nru perl-5.14.2/debian/config.debian perl-5.14.2/debian/config.debian --- perl-5.14.2/debian/config.debian 2013-04-02 19:08:04.000000000 +0000 +++ perl-5.14.2/debian/config.debian 2013-05-04 13:07:43.000000000 +0000 @@ -94,6 +94,7 @@ eval /bin/bash Configure \ -Dusethreads \ -Duselargefiles \ + -Dcc=gcc-4.7 \ -Dccflags=\'$ccflags\' \ -Dldflags=\'$ldflags\' \ -Dlddlflags=\'-shared $ldflags\' \ diff -Nru perl-5.14.2/debian/control perl-5.14.2/debian/control --- perl-5.14.2/debian/control 2013-04-02 19:08:04.000000000 +0000 +++ perl-5.14.2/debian/control 2013-05-04 13:07:43.000000000 +0000 @@ -7,7 +7,7 @@ Homepage: http://dev.perl.org/perl5/ Build-Depends: file, cpio (>= 2.6-5), libdb-dev, libgdbm-dev, netbase [!hurd-any], gcc (>= 4:4.2), procps [!hurd-any], zlib1g-dev | libz-dev, libbz2-dev, - dpkg-dev (>= 1.16.0) + dpkg-dev (>= 1.16.0), gcc-4.7 Build-Conflicts: libterm-readline-gnu-perl (<< 1.17), libfile-sharedir-perl Vcs-Git: git://anonscm.debian.org/perl/perl.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=perl/perl.git diff -Nru perl-5.14.2/debian/rules perl-5.14.2/debian/rules --- perl-5.14.2/debian/rules 2013-04-02 19:08:04.000000000 +0000 +++ perl-5.14.2/debian/rules 2013-09-04 22:31:42.000000000 +0000 @@ -117,6 +117,7 @@ # rm -f cpan/DB_File/DB_File.pm.bak cpan/DB_File/t/db-btree.t.bak \ cpan/DB_File/t/db-hash.t.bak cpan/DB_File/t/db-recno.t.bak + rm -rf UU install-stamp: build-stamp $(checkdir) @@ -420,6 +421,11 @@ >debian/perl-base.shlibs endif + #hack: set c compiler back to cc in installed config files + sed -i s/gcc-4.7/cc/ $(build)/perl-base/usr/lib/perl/5.14.2/Config.pm + sed -i s/gcc-4.7/cc/ $(build)/perl-base/usr/lib/perl/5.14.2/Config_heavy.pl + sed -i s/gcc-4.7/cc/ $(build)/perl/usr/lib/perl/5.14.2/CORE/config.h + for p in `./perl.static -l -00ne 'print $$1 if /^Architecture:\s+any/m \ and /^Package:\s+(.*)/m' debian/control`; \ do \ @@ -435,6 +441,7 @@ (cd $(build)/$$p; find usr -type f -print | xargs -r md5sum) \ >$(build)/$$p/DEBIAN/md5sums; \ done + # dpkg-shlibdeps needs to be run only after all the shlibs are present for p in `./perl.static -l -00ne 'print $$1 if /^Architecture:\s+any/m \ and /^Package:\s+(.*)/m' debian/control`; \