diff -u gcc-3.3-3.3.6/debian/changelog gcc-3.3-3.3.6/debian/changelog --- gcc-3.3-3.3.6/debian/changelog +++ gcc-3.3-3.3.6/debian/changelog @@ -1,3 +1,9 @@ +gcc-3.3 (1:3.3.6-15ubuntu5) hardy-proposed; urgency=low + + * Correct makeinfo version check. LP: #222876. + + -- Matthias Klose Fri, 02 May 2008 09:54:48 +0200 + gcc-3.3 (1:3.3.6-15ubuntu4) hardy; urgency=low * Disable the build entirely on hppa, we no longer need libgcc1/gcc-3.3 diff -u gcc-3.3-3.3.6/debian/rules.patch gcc-3.3-3.3.6/debian/rules.patch --- gcc-3.3-3.3.6/debian/rules.patch +++ gcc-3.3-3.3.6/debian/rules.patch @@ -39,6 +39,7 @@ link-libs \ gcc-mips-update \ gcc-fixtail \ + makeinfo-version-check \ ifeq ($(GFDL_INVARIANT_FREE),yes) debian_patches += \ diff -u gcc-3.3-3.3.6/debian/control gcc-3.3-3.3.6/debian/control --- gcc-3.3-3.3.6/debian/control +++ gcc-3.3-3.3.6/debian/control @@ -1,8 +1,7 @@ Source: gcc-3.3 Section: devel Priority: optional -Maintainer: Ubuntu MOTU Developers -XSBC-Original-Maintainer: Debian GCC Maintainers +Maintainer: Debian GCC Maintainers Uploaders: Matthias Klose , Gerhard Tonn Standards-Version: 3.6.2 Build-Depends: dpkg-dev (>= 1.13.9), libc6.1-dev (>= 2.3.5-1ubuntu4) [alpha ia64] | libc0.3-dev [hurd-i386] | libc0.1-dev [kfreebsd-i386] | libc12-dev (>= 2.0.ds1-1) [netbsd-i386] | libc6-dev (>= 2.3.5-1ubuntu4), libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libunwind7-dev (>= 0.98.5-1) [ia64], libatomic-ops-dev [ia64], m4, autoconf2.13, automake1.4 | automake (<< 1.5), libtool, autotools-dev, gawk, dejagnu (>= 1.4.3) [!hppa !hurd-i386], bzip2, binutils (>= 2.15-7) | binutils-multiarch (>= 2.15-7), binutils-hppa64 (>= 2.15-7) [hppa], debhelper (>= 3.0.25), gperf (>= 2.7-3), bison (>= 1:1.875), flex, gettext, texinfo (>= 4.3), zlib1g-dev, libgc-dev [!avr], gcc-3.3, locales [!netbsd-i386 !hppa !hurd-i386 !hurd-i386], procps [!hppa !hurd-i386], sharutils, realpath (>= 1.9.12), lsb-release @@ -30,10 +29,10 @@ Architecture: any Section: devel Priority: optional -Depends: gcc-3.3-base (= 1:3.3.6-15ubuntu3), cpp-3.3 (= 1:3.3.6-15ubuntu3), libgcc1 (>= 1:3.3.4-3), ${shlibs:Depends}, binutils (>= 2.15-7) +Depends: gcc-3.3-base (= 1:3.3.6-15ubuntu5), cpp-3.3 (= 1:3.3.6-15ubuntu5), libgcc1 (>= 1:3.3.4-3), ${shlibs:Depends}, binutils (>= 2.15-7) Recommends: libc6-dev (>= 2.3.5-1ubuntu4) Conflicts: gcc-3.2 (<= 1:3.2.3-0pre8) -Suggests: gcc-3.3-doc (>= 1:3.3.6-15ubuntu3) +Suggests: gcc-3.3-doc (>= 1:3.3.6-15ubuntu5) Provides: c-compiler Description: The GNU C compiler This is the GNU C compiler, a fairly portable optimizing compiler for C. @@ -42,7 +41,7 @@ Architecture: any Section: interpreters Priority: optional -Depends: gcc-3.3-base (= 1:3.3.6-15ubuntu3), ${shlibs:Depends} +Depends: gcc-3.3-base (= 1:3.3.6-15ubuntu5), ${shlibs:Depends} Description: The GNU C preprocessor A macro processor that is used automatically by the GNU C compiler to transform programs before actual compilation. @@ -54,7 +53,7 @@ Architecture: all Section: doc Priority: optional -Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu3) +Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu5) Replaces: cpp (<= 1:2.93.12) Description: Documentation for the GNU C preprocessor (cpp) Documentation for the GNU C preprocessor in info format. @@ -63,10 +62,10 @@ Architecture: any Section: devel Priority: optional -Depends: gcc-3.3-base (= 1:3.3.6-15ubuntu3), gcc-3.3 (= 1:3.3.6-15ubuntu3), libstdc++5-3.3-dev (= 1:3.3.6-15ubuntu3), ${shlibs:Depends} +Depends: gcc-3.3-base (= 1:3.3.6-15ubuntu5), gcc-3.3 (= 1:3.3.6-15ubuntu5), libstdc++5-3.3-dev (= 1:3.3.6-15ubuntu5), ${shlibs:Depends} Replaces: gcc (<= 2.7.2.3-3) Provides: c++-compiler, c++abi1-dev -Suggests: gcc-3.3-doc (>= 1:3.3.6-15ubuntu3) +Suggests: gcc-3.3-doc (>= 1:3.3.6-15ubuntu5) Description: The GNU C++ compiler This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. @@ -74,7 +73,7 @@ Architecture: any Section: libs Priority: optional -Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu3), ${shlibs:Depends} +Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu5), ${shlibs:Depends} Description: The GNU Standard C++ Library v3 This package contains an additional runtime library for C++ programs built with the GNU compiler. @@ -87,7 +86,7 @@ Architecture: any Section: libs Priority: optional -Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu3), ${shlibs:Depends} +Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu5), ${shlibs:Depends} Conflicts: libstdc++5 (<= 1:3.3-0pre9) Description: The GNU Standard C++ Library v3 (64bit) This package contains an additional runtime library for C++ programs @@ -101,7 +100,7 @@ Architecture: any Section: libdevel Priority: optional -Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu3), libstdc++5 (>= 1:3.3.6-15ubuntu3), libc6-dev (>= 2.3.5-1ubuntu4), g++-3.3 (>= 1:3.3.6-15ubuntu3) +Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu5), libstdc++5 (>= 1:3.3.6-15ubuntu5), libc6-dev (>= 2.3.5-1ubuntu4), g++-3.3 (>= 1:3.3.6-15ubuntu5) Conflicts: libg++27-dev, libg++272-dev (<< 2.7.2.8-1), libstdc++2.8-dev, libg++2.8-dev, libstdc++2.9-dev, libstdc++2.9-glibc2.1-dev, libstdc++2.10-dev (<< 1:2.95.3-2), libstdc++3.0-dev, libstdc++5-dev (<= 1:3.2.3-0pre3) Suggests: libstdc++5-3.3-doc Provides: libstdc++-dev @@ -118,7 +117,7 @@ Architecture: any Section: libdevel Priority: extra -Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu3), libstdc++5, libstdc++5-3.3-dev +Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu5), libstdc++5, libstdc++5-3.3-dev Description: The GNU Standard C++ Library v3 (shared library subset kit) This is used to develop subsets of the libstdc++ shared libraries for use on custom installation floppies and in embedded systems. @@ -129,7 +128,7 @@ Architecture: any Section: libdevel Priority: extra -Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu3), libstdc++5, libstdc++5-3.3-dev +Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu5), libstdc++5, libstdc++5-3.3-dev Conflicts: libstdc++5-dbg Description: The GNU Standard C++ Library v3 (debugging files) This package contains the shared library of libstdc++ compiled with @@ -139,7 +138,7 @@ Architecture: all Section: doc Priority: optional -Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu3) +Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu5) Replaces: libstdc++3.0-doc Description: The GNU Standard C++ Library v3 (documentation files) This package contains documentation files for the GNU stdc++ library. @@ -152,7 +151,7 @@ Package: gcc-3.3-soft-float Architecture: arm armeb Priority: optional -Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu3), ${shlibs:Depends}, gcc-3.3 (>= 1:3.3.6-15ubuntu3), gcc-3.3 (<< 1:3.3.7) +Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu5), ${shlibs:Depends}, gcc-3.3 (>= 1:3.3.6-15ubuntu5), gcc-3.3 (<< 1:3.3.7) Replaces: gcc-soft-float-ss (<< 1:3.3.7) Description: The soft-floating-point gcc libraries (arm) These are versions of basic static libraries such as libgcc.a compiled @@ -162,7 +161,7 @@ Architecture: all Section: doc Priority: optional -Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu3) +Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu5) Conflicts: gcc-docs (<< 2.95.2) Replaces: gcc (<=2.7.2.3-4.3), gcc-docs (<< 2.95.2) Description: Documentation for the GNU compilers (gcc, gobjc, g++) @@ -171,7 +170,7 @@ Package: gcc-3.3-nof Architecture: powerpc Priority: optional -Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu3), ${shlibs:Depends}, gcc-3.3 (>= 1:3.3.6-15ubuntu3), gcc-3.3 (<< 1:3.3.7) +Depends: gcc-3.3-base (>= 1:3.3.6-15ubuntu5), ${shlibs:Depends}, gcc-3.3 (>= 1:3.3.6-15ubuntu5), gcc-3.3 (<< 1:3.3.7) Conflicts: gcc-3.2-nof Description: The no-floating-point gcc libraries (powerpc) These are versions of basic static libraries such as libgcc.a compiled diff -u gcc-3.3-3.3.6/debian/rules2 gcc-3.3-3.3.6/debian/rules2 --- gcc-3.3-3.3.6/debian/rules2 +++ gcc-3.3-3.3.6/debian/rules2 @@ -255,6 +255,8 @@ : # generate debian/README.Debian cat debian/README $(patch_stamp) > debian/README.Debian + find $(srcdir) -name '*.info' | xargs -r rm -f + rm -rf $(builddir) mkdir $(builddir) # find this directory before the gpc test dir (test_summary) only in patch2: unchanged: --- gcc-3.3-3.3.6.orig/debian/patches/makeinfo-version-check.dpatch +++ gcc-3.3-3.3.6/debian/patches/makeinfo-version-check.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh -e + +# DP: Correct makeinfo version check. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + cd ${dir}gcc && autoconf2.13 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + rm -f ${dir}gcc/configure + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +--- gcc/configure.in~ 2008-05-02 10:35:29.531199992 +0200 ++++ gcc/configure.in 2008-05-02 11:05:35.288439429 +0200 +@@ -609,7 +609,7 @@ + # that we can use it. + gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version, + [GNU texinfo.* \([0-9][0-9.]*\)], +- [4.[2-9]*]) ++ [4.[2-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*]) + fi + + if test $gcc_cv_prog_makeinfo_modern = no; then