Package: glibmm2.4 Followup-For: Bug #442828 I've attached the .diff.gz file for the new 2.14.1 version. Further more, according to the source code, #415464 has already been handled, so it can be closed. Hope some one can provide a NMU for it.
-- System Information: Debian Release: lenny/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.22-2-686 (SMP w/1 CPU core) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash
glibmm2.4_2.14.1-0.1.diff.gz
Description: GNU Zip compressed data
--- glibmm2.4_2.12.10-0.1.diff 2007-07-04 18:47:03.000000000 +0800 +++ glibmm2.4_2.14.1-0.1.diff 2007-10-06 00:31:08.000000000 +0800 @@ -1,400 +1,237 @@ ---- glibmm2.4-2.12.10.orig/scripts/config.sub -+++ glibmm2.4-2.12.10/scripts/config.sub -@@ -1,9 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -+# Inc. - --timestamp='2005-12-11' -+timestamp='2007-01-18' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -240,15 +241,16 @@ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -- | fr30 | frv \ -+ | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ -+ | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore | mep \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -268,26 +270,25 @@ - | mn10200 | mn10300 \ - | mt \ - | msp430 \ -+ | nios | nios2 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ -+ | score \ -+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ -- | sparcv8 | sparcv9 | sparcv9b \ -- | strongarm \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ -- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; -- m32c) -- basic_machine=$basic_machine-unknown -- ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown -@@ -317,18 +318,18 @@ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* \ -+ | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ -- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ -+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -- | m32r-* | m32rle-* \ -+ | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -@@ -350,29 +351,28 @@ - | mmix-* \ - | mt-* \ - | msp430-* \ -+ | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ -- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ -+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ - | ymp-* \ - | z8k-*) - ;; -- m32c-*) -- ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) -@@ -818,6 +818,12 @@ - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -+ pc98) -+ basic_machine=i386-pc -+ ;; -+ pc98-*) -+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; -@@ -904,6 +910,10 @@ - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; -+ sde) -+ basic_machine=mipsisa32-sde -+ os=-elf -+ ;; - sei) - basic_machine=mips-sei - os=-seiux -@@ -915,6 +925,9 @@ - basic_machine=sh-hitachi - os=-hms - ;; -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; - sh64) - basic_machine=sh64-unknown - ;; -@@ -1120,7 +1133,7 @@ - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sparc | sparcv8 | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) -@@ -1193,7 +1206,8 @@ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ -@@ -1208,7 +1222,7 @@ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -- | -skyos* | -haiku* | -rdos*) -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1360,6 +1374,12 @@ - # system, and we'll never get to this point. - - case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1369,9 +1389,9 @@ - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -- ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 -@@ -1397,6 +1417,9 @@ - m68*-cisco) - os=-aout - ;; -+ mep-*) -+ os=-elf -+ ;; - mips*-cisco) - os=-elf - ;; ---- glibmm2.4-2.12.10.orig/scripts/config.guess -+++ glibmm2.4-2.12.10/scripts/config.guess -@@ -1,9 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -+# Inc. - --timestamp='2005-12-13' -+timestamp='2007-03-06' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -106,7 +107,7 @@ - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; - trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; -- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -@@ -160,6 +161,7 @@ - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -206,8 +208,11 @@ - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; - macppc:MirBSD:*:*) -- echo powerppc-unknown-mirbsd${UNAME_RELEASE} -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -@@ -764,12 +769,19 @@ - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ case ${UNAME_MACHINE} in -+ pc98) -+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -- i*:MINGW*:*) -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) -@@ -779,9 +791,15 @@ - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; -- x86:Interix*:[345]*) -- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' -- exit ;; -+ *:Interix*:[3456]*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ EM64T | authenticamd) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; -@@ -817,6 +835,9 @@ - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -+ avr32*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; -@@ -851,7 +872,11 @@ - #endif - #endif - EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) -@@ -870,7 +895,11 @@ - #endif - #endif - EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -@@ -925,6 +954,9 @@ - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; -+ xtensa:Linux:*:*) -+ echo xtensa-unknown-linux-gnu -+ exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent -@@ -967,7 +999,7 @@ - LIBC=gnulibc1 - # endif - #else -- #if defined(__INTEL_COMPILER) || defined(__PGI) -+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout -@@ -977,7 +1009,11 @@ - LIBC=dietlibc - #endif - EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^LIBC/{ -+ s: ::g -+ p -+ }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit -@@ -1179,6 +1215,15 @@ - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; ---- glibmm2.4-2.12.10.orig/debian/changelog -+++ glibmm2.4-2.12.10/debian/changelog -@@ -0,0 +1,207 @@ +--- glibmm2.4-2.14.1.orig/debian/libglibmm-2.4-1c2a.install ++++ glibmm2.4-2.14.1/debian/libglibmm-2.4-1c2a.install +@@ -0,0 +1 @@ ++usr/lib/lib*.so.* +--- glibmm2.4-2.14.1.orig/debian/libglibmm-2.4-dev.dirs ++++ glibmm2.4-2.14.1/debian/libglibmm-2.4-dev.dirs +@@ -0,0 +1,3 @@ ++usr/lib ++usr/include ++usr/share/aclocal +--- glibmm2.4-2.14.1.orig/debian/rules ++++ glibmm2.4-2.14.1/debian/rules +@@ -0,0 +1,119 @@ ++#!/usr/bin/make -f ++# -*- makefile -*- ++# Sample debian/rules that uses debhelper. ++# GNU copyright 1997 to 1999 by Joey Hess. ++ ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++ ++ ++# These are used for cross-compiling and for saving the configure script ++# from having to guess our platform (since we know it already) ++DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) ++DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ++ ++ ++CXXFLAGS = -Wall -g ++ ++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ++ CXXFLAGS += -O0 ++else ++ CXXFLAGS += -O2 ++endif ++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) ++ INSTALL_PROGRAM += -s ++endif ++ ++ ++autogen: ++ libtoolize --force --copy ++ aclocal-1.9 -I scripts ++ automake-1.9 --copy --add-missing ++ autoconf ++ ++ ++config.status: configure ++ dh_testdir ++ # Add here commands to configure the package. ++ ./configure --enable-static --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CXXFLAGS="$(CXXFLAGS)" ++ ++ ++build: build-stamp ++build-stamp: config.status ++ dh_testdir ++ ++ # Add here commands to compile the package. ++ $(MAKE) ++ ++ touch build-stamp ++ ++clean: ++ dh_testdir ++ dh_testroot ++ rm -f build-stamp ++ ++ # Add here commands to clean up after the build process. ++ -$(MAKE) distclean ++ifneq "$(wildcard /usr/share/misc/config.sub)" "" ++ cp -f /usr/share/misc/config.sub scripts/config.sub ++endif ++ifneq "$(wildcard /usr/share/misc/config.guess)" "" ++ cp -f /usr/share/misc/config.guess scripts/config.guess ++endif ++ ++ ++ dh_clean ++ ++install: build ++ dh_testdir ++ dh_testroot ++ dh_clean -k ++ dh_installdirs ++ ++ # Add here commands to install the package into debian/tmp ++ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp ++ ++ ++# Build architecture-independent files here. ++binary-indep: build install ++# We have nothing to do by default. ++ ++# Build architecture-dependent files here. ++binary-arch: build install ++ dh_testdir ++ dh_testroot ++ dh_installchangelogs ChangeLog ++ dh_installdocs -XMakefile -XDoxyfile ++ for file in debian/libglibmm-2.4-dev/usr/share/doc/libglibmm-2.4-dev/reference/html/*.html; do \ ++ sed 's/\.\.\/\.\.\/\.\.\/\.\.\/gtkmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libgtkmm-2.4-doc\//g;' $$file > $$file.fixed; \ ++ mv $$file.fixed $$file; \ ++ sed 's/\.\.\/\.\.\/\.\.\/gtkmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libgtkmm-2.4-doc\//g;' $$file > $$file.fixed; \ ++ mv $$file.fixed $$file; \ ++ done ++ dh_installexamples ++ dh_install --sourcedir=debian/tmp ++# dh_installmenu ++# dh_installdebconf ++# dh_installlogrotate ++# dh_installemacsen ++# dh_installpam ++# dh_installmime ++# dh_installinit ++# dh_installcron ++# dh_installinfo ++ dh_installman ++ dh_link ++ dh_strip --dbg-package=libglibmm-2.4-1c2a-dbg ++ dh_compress -Xdoxygen_tags ++ dh_fixperms ++# dh_perl ++# dh_python ++ dh_makeshlibs ++ dh_installdeb ++ dh_shlibdeps ++ dh_gencontrol ++ dh_md5sums ++ dh_builddeb ++ ++binary: binary-indep binary-arch ++.PHONY: build clean binary-indep binary-arch binary install +--- glibmm2.4-2.14.1.orig/debian/control ++++ glibmm2.4-2.14.1/debian/control +@@ -0,0 +1,46 @@ ++Source: glibmm2.4 ++Section: libs ++Priority: optional ++Maintainer: Bradley Bell <[EMAIL PROTECTED]> ++Build-Depends: debhelper (>= 5), libglib2.0-dev (>= 2.14.0-1), libsigc++-2.0-dev (>= 2.0.16-2) ++Standards-Version: 3.7.2 ++ ++Package: libglibmm-2.4-dev ++Section: libdevel ++Architecture: any ++Depends: libglibmm-2.4-1c2a (= ${binary:Version}), libglib2.0-dev (>= 2.14.0-1), libsigc++-2.0-dev (>= 2.0.16-2) ++Suggests: libgtkmm-2.4-dev, libgtkmm-2.4-doc ++Conflicts: libglibmm2.3-dev ++Replaces: libglibmm2.3-dev ++Description: C++ wrapper for the GLib toolkit (development files) ++ GLib is a low-level general-purpose library used mainly by GTK+/GNOME ++ applications, but is useful for other programs as well. ++ glibmm is the C++ wrapper for GLib. ++ . ++ This package contains development files, reference documentation, and ++ examples. ++ ++Package: libglibmm-2.4-1c2a-dbg ++Section: libdevel ++Priority: extra ++Architecture: any ++Depends: libglibmm-2.4-1c2a (= ${binary:Version}) ++Description: C++ wrapper for the GLib toolkit (debug symbols) ++ GLib is a low-level general-purpose library used mainly by GTK+/GNOME ++ applications, but is useful for other programs as well. ++ glibmm is the C++ wrapper for GLib. ++ . ++ This package contains debug symbols for debugging applications using glibmm. ++ ++Package: libglibmm-2.4-1c2a ++Section: libs ++Architecture: any ++Depends: ${shlibs:Depends} ++Conflicts: libglibmm-2.4-1, libglibmm-2.4-1c2 ++Replaces: libglibmm-2.4-1, libglibmm-2.4-1c2 ++Description: C++ wrapper for the GLib toolkit (shared libraries) ++ GLib is a low-level general-purpose library used mainly by GTK+/GNOME ++ applications, but is useful for other programs as well. ++ glibmm is the C++ wrapper for GLib. ++ . ++ This package contains shared libraries. +--- glibmm2.4-2.14.1.orig/debian/copyright ++++ glibmm2.4-2.14.1/debian/copyright +@@ -0,0 +1,29 @@ ++This package was debianized by Bradley Bell <[EMAIL PROTECTED]> on ++Tue, 14 Oct 2003 16:49:47 -0700. ++ ++It was downloaded from http://gtkmm.sourceforge.net ++ ++Upstream Authors: Murray Cumming <[EMAIL PROTECTED]> ++ Daniel Elstner <[EMAIL PROTECTED]> ++ ++Copyright: ++ ++ * Copyright 2002 The gtkmm Development Team ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA ++ ++On Debian GNU/Linux systems, the complete text of the GNU Library General ++Public License can be found in /usr/share/common-licenses/LGPL file. +--- glibmm2.4-2.14.1.orig/debian/docs ++++ glibmm2.4-2.14.1/debian/docs +@@ -0,0 +1,6 @@ ++NEWS ++README ++CHANGES ++docs/images ++docs/internal ++docs/reference +--- glibmm2.4-2.14.1.orig/debian/changelog ++++ glibmm2.4-2.14.1/debian/changelog +@@ -0,0 +1,216 @@ ++glibmm2.4 (2.14.1-0.1) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * New upstream release. Closes: #442828 ++ * Fixed shadowed member in glibmm/helperlist.h. Closes: #415464 ++ * Replaced ${Source-Version} with ${binary:Version}. ++ ++ -- Deng Xiyue <[EMAIL PROTECTED]> Fri, 05 Oct 2007 21:29:52 +0800 ++ +glibmm2.4 (2.12.10-0.1) unstable; urgency=low + + * Non-maintainer upload. @@ -564,229 +401,54 @@ + + -- Bradley Bell <[EMAIL PROTECTED]> Wed, 21 Apr 2004 18:22:35 -0700 + -+glibmm2.4 (2.4.0-3) experimental; urgency=low -+ -+ * Fixes to the documentation -+ -+ -- Bradley Bell <[EMAIL PROTECTED]> Tue, 20 Apr 2004 15:53:21 -0700 -+ -+glibmm2.4 (2.4.0-2) experimental; urgency=low -+ -+ * Add dependency on glib and sigc dev packages -+ -+ -- Bradley Bell <[EMAIL PROTECTED]> Mon, 12 Apr 2004 20:36:49 -0700 -+ -+glibmm2.4 (2.4.0-1) experimental; urgency=low -+ -+ * New upstream release -+ -+ -- Bradley Bell <[EMAIL PROTECTED]> Mon, 12 Apr 2004 17:05:38 -0700 -+ -+glibmm2.3 (2.3.2-1) unstable; urgency=low -+ -+ * New upstream release -+ * Distribute files in usr/lib/glibmm-2.3 (Closes: #227848) -+ -+ -- Bradley Bell <[EMAIL PROTECTED]> Thu, 15 Jan 2004 14:46:02 -0800 -+ -+glibmm2.3 (2.3.1-1) unstable; urgency=low -+ -+ * New upstream release -+ * Add build-dep on libsigc++-1.2-dev (Closes: #217056) -+ -+ -- Bradley Bell <[EMAIL PROTECTED]> Tue, 28 Oct 2003 16:51:29 -0800 -+ -+glibmm2.3 (2.3.0-1) unstable; urgency=low -+ -+ * Initial Release. -+ -+ -- Bradley Bell <[EMAIL PROTECTED]> Tue, 14 Oct 2003 16:49:47 -0700 -+ ---- glibmm2.4-2.12.10.orig/debian/compat -+++ glibmm2.4-2.12.10/debian/compat -@@ -0,0 +1 @@ -+5 ---- glibmm2.4-2.12.10.orig/debian/docs -+++ glibmm2.4-2.12.10/debian/docs -@@ -0,0 +1,6 @@ -+NEWS -+README -+CHANGES -+docs/images -+docs/internal -+docs/reference ---- glibmm2.4-2.12.10.orig/debian/rules -+++ glibmm2.4-2.12.10/debian/rules -@@ -0,0 +1,119 @@ -+#!/usr/bin/make -f -+# -*- makefile -*- -+# Sample debian/rules that uses debhelper. -+# GNU copyright 1997 to 1999 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+ -+# These are used for cross-compiling and for saving the configure script -+# from having to guess our platform (since we know it already) -+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -+ -+ -+CXXFLAGS = -Wall -g -+ -+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -+ CXXFLAGS += -O0 -+else -+ CXXFLAGS += -O2 -+endif -+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -+ INSTALL_PROGRAM += -s -+endif -+ -+ -+autogen: -+ libtoolize --force --copy -+ aclocal-1.9 -I scripts -+ automake-1.9 --copy --add-missing -+ autoconf2.50 -+ -+ -+config.status: configure -+ dh_testdir -+ # Add here commands to configure the package. -+ ./configure --enable-static --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CXXFLAGS="$(CXXFLAGS)" -+ -+ -+build: build-stamp -+build-stamp: config.status -+ dh_testdir -+ -+ # Add here commands to compile the package. -+ $(MAKE) -+ -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp -+ -+ # Add here commands to clean up after the build process. -+ -$(MAKE) distclean -+ifneq "$(wildcard /usr/share/misc/config.sub)" "" -+ cp -f /usr/share/misc/config.sub scripts/config.sub -+endif -+ifneq "$(wildcard /usr/share/misc/config.guess)" "" -+ cp -f /usr/share/misc/config.guess scripts/config.guess -+endif -+ -+ -+ dh_clean -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ -+ # Add here commands to install the package into debian/tmp -+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp -+ -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# We have nothing to do by default. -+ -+# Build architecture-dependent files here. -+binary-arch: build install -+ dh_testdir -+ dh_testroot -+ dh_installchangelogs ChangeLog -+ dh_installdocs -XMakefile -XDoxyfile -+ for file in debian/libglibmm-2.4-dev/usr/share/doc/libglibmm-2.4-dev/reference/html/*.html; do \ -+ sed 's/\.\.\/\.\.\/\.\.\/\.\.\/gtkmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libgtkmm-2.4-doc\//g;' $$file > $$file.fixed; \ -+ mv $$file.fixed $$file; \ -+ sed 's/\.\.\/\.\.\/\.\.\/gtkmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libgtkmm-2.4-doc\//g;' $$file > $$file.fixed; \ -+ mv $$file.fixed $$file; \ -+ done -+ dh_installexamples -+ dh_install --sourcedir=debian/tmp -+# dh_installmenu -+# dh_installdebconf -+# dh_installlogrotate -+# dh_installemacsen -+# dh_installpam -+# dh_installmime -+# dh_installinit -+# dh_installcron -+# dh_installinfo -+ dh_installman -+ dh_link -+ dh_strip --dbg-package=libglibmm-2.4-1c2a-dbg -+ dh_compress -Xdoxygen_tags -+ dh_fixperms -+# dh_perl -+# dh_python -+ dh_makeshlibs -+ dh_installdeb -+ dh_shlibdeps -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb ++glibmm2.4 (2.4.0-3) experimental; urgency=low + -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install ---- glibmm2.4-2.12.10.orig/debian/copyright -+++ glibmm2.4-2.12.10/debian/copyright -@@ -0,0 +1,29 @@ -+This package was debianized by Bradley Bell <[EMAIL PROTECTED]> on -+Tue, 14 Oct 2003 16:49:47 -0700. ++ * Fixes to the documentation + -+It was downloaded from http://gtkmm.sourceforge.net ++ -- Bradley Bell <[EMAIL PROTECTED]> Tue, 20 Apr 2004 15:53:21 -0700 + -+Upstream Authors: Murray Cumming <[EMAIL PROTECTED]> -+ Daniel Elstner <[EMAIL PROTECTED]> ++glibmm2.4 (2.4.0-2) experimental; urgency=low + -+Copyright: ++ * Add dependency on glib and sigc dev packages + -+ * Copyright 2002 The gtkmm Development Team -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the Free -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA ++ -- Bradley Bell <[EMAIL PROTECTED]> Mon, 12 Apr 2004 20:36:49 -0700 + -+On Debian GNU/Linux systems, the complete text of the GNU Library General -+Public License can be found in /usr/share/common-licenses/LGPL file. ---- glibmm2.4-2.12.10.orig/debian/libglibmm-2.4-dev.dirs -+++ glibmm2.4-2.12.10/debian/libglibmm-2.4-dev.dirs -@@ -0,0 +1,3 @@ ++glibmm2.4 (2.4.0-1) experimental; urgency=low ++ ++ * New upstream release ++ ++ -- Bradley Bell <[EMAIL PROTECTED]> Mon, 12 Apr 2004 17:05:38 -0700 ++ ++glibmm2.3 (2.3.2-1) unstable; urgency=low ++ ++ * New upstream release ++ * Distribute files in usr/lib/glibmm-2.3 (Closes: #227848) ++ ++ -- Bradley Bell <[EMAIL PROTECTED]> Thu, 15 Jan 2004 14:46:02 -0800 ++ ++glibmm2.3 (2.3.1-1) unstable; urgency=low ++ ++ * New upstream release ++ * Add build-dep on libsigc++-1.2-dev (Closes: #217056) ++ ++ -- Bradley Bell <[EMAIL PROTECTED]> Tue, 28 Oct 2003 16:51:29 -0800 ++ ++glibmm2.3 (2.3.0-1) unstable; urgency=low ++ ++ * Initial Release. ++ ++ -- Bradley Bell <[EMAIL PROTECTED]> Tue, 14 Oct 2003 16:49:47 -0700 ++ +--- glibmm2.4-2.14.1.orig/debian/compat ++++ glibmm2.4-2.14.1/debian/compat +@@ -0,0 +1 @@ ++5 +--- glibmm2.4-2.14.1.orig/debian/libglibmm-2.4-1c2a.dirs ++++ glibmm2.4-2.14.1/debian/libglibmm-2.4-1c2a.dirs +@@ -0,0 +1 @@ +usr/lib -+usr/include -+usr/share/aclocal ---- glibmm2.4-2.12.10.orig/debian/libglibmm-2.4-dev.install -+++ glibmm2.4-2.12.10/debian/libglibmm-2.4-dev.install -@@ -0,0 +1,7 @@ -+usr/include/* -+usr/lib/glibmm-2.4 -+usr/lib/lib*.a -+usr/lib/lib*.so -+usr/lib/pkgconfig/* -+usr/lib/*.la -+usr/share/aclocal/* ---- glibmm2.4-2.12.10.orig/debian/libglibmm-2.4-dev.doc-base.glibmm2.4-reference -+++ glibmm2.4-2.12.10/debian/libglibmm-2.4-dev.doc-base.glibmm2.4-reference +--- glibmm2.4-2.14.1.orig/debian/libglibmm-2.4-dev.doc-base.glibmm2.4-reference ++++ glibmm2.4-2.14.1/debian/libglibmm-2.4-dev.doc-base.glibmm2.4-reference @@ -0,0 +1,9 @@ +Document: glibmm2.4-reference +Title: glibmm 2.4 Reference Manual @@ -797,69 +459,447 @@ +Format: HTML +Index: /usr/share/doc/libglibmm-2.4-dev/reference/html/index.html +Files: /usr/share/doc/libglibmm-2.4-dev/reference/html/*.html ---- glibmm2.4-2.12.10.orig/debian/watch -+++ glibmm2.4-2.12.10/debian/watch +--- glibmm2.4-2.14.1.orig/debian/libglibmm-2.4-dev.install ++++ glibmm2.4-2.14.1/debian/libglibmm-2.4-dev.install +@@ -0,0 +1,7 @@ ++usr/include/* ++usr/lib/glibmm-2.4 ++usr/lib/lib*.a ++usr/lib/lib*.so ++usr/lib/pkgconfig/* ++usr/lib/*.la ++usr/share/aclocal/* +--- glibmm2.4-2.14.1.orig/debian/watch ++++ glibmm2.4-2.14.1/debian/watch @@ -0,0 +1,6 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# Site Directory Pattern Version Script +version=2 -+ftp://ftp.gnome.org/pub/gnome/sources/glibmm/2.12/glibmm-(.*)\.tar\.gz debian uupdate ---- glibmm2.4-2.12.10.orig/debian/control -+++ glibmm2.4-2.12.10/debian/control -@@ -0,0 +1,46 @@ -+Source: glibmm2.4 -+Section: libs -+Priority: optional -+Maintainer: Bradley Bell <[EMAIL PROTECTED]> -+Build-Depends: debhelper (>= 5), libglib2.0-dev (>> 2.10.0), libsigc++-2.0-dev (>= 2.0.16-2) -+Standards-Version: 3.7.2 -+ -+Package: libglibmm-2.4-dev -+Section: libdevel -+Architecture: any -+Depends: libglibmm-2.4-1c2a (= ${Source-Version}), libglib2.0-dev (>> 2.10.0), libsigc++-2.0-dev (>= 2.0.16-2) -+Suggests: libgtkmm-2.4-dev, libgtkmm-2.4-doc -+Conflicts: libglibmm2.3-dev -+Replaces: libglibmm2.3-dev -+Description: C++ wrapper for the GLib toolkit (development files) -+ GLib is a low-level general-purpose library used mainly by GTK+/GNOME -+ applications, but is useful for other programs as well. -+ glibmm is the C++ wrapper for GLib. -+ . -+ This package contains development files, reference documentation, and -+ examples. -+ -+Package: libglibmm-2.4-1c2a-dbg -+Section: libdevel -+Priority: extra -+Architecture: any -+Depends: libglibmm-2.4-1c2a (= ${Source-Version}) -+Description: C++ wrapper for the GLib toolkit (debug symbols) -+ GLib is a low-level general-purpose library used mainly by GTK+/GNOME -+ applications, but is useful for other programs as well. -+ glibmm is the C++ wrapper for GLib. -+ . -+ This package contains debug symbols for debugging applications using glibmm. -+ -+Package: libglibmm-2.4-1c2a -+Section: libs -+Architecture: any -+Depends: ${shlibs:Depends} -+Conflicts: libglibmm-2.4-1, libglibmm-2.4-1c2 -+Replaces: libglibmm-2.4-1, libglibmm-2.4-1c2 -+Description: C++ wrapper for the GLib toolkit (shared libraries) -+ GLib is a low-level general-purpose library used mainly by GTK+/GNOME -+ applications, but is useful for other programs as well. -+ glibmm is the C++ wrapper for GLib. -+ . -+ This package contains shared libraries. ---- glibmm2.4-2.12.10.orig/debian/libglibmm-2.4-1c2a.dirs -+++ glibmm2.4-2.12.10/debian/libglibmm-2.4-1c2a.dirs -@@ -0,0 +1 @@ -+usr/lib ---- glibmm2.4-2.12.10.orig/debian/libglibmm-2.4-1c2a.install -+++ glibmm2.4-2.12.10/debian/libglibmm-2.4-1c2a.install -@@ -0,0 +1 @@ -+usr/lib/lib*.so.* ++ftp://ftp.gnome.org/pub/gnome/sources/glibmm/2.14/glibmm-(.*)\.tar\.gz debian uupdate +--- glibmm2.4-2.14.1.orig/scripts/config.guess ++++ glibmm2.4-2.14.1/scripts/config.guess +@@ -1,9 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, ++# Inc. + +-timestamp='2005-12-13' ++timestamp='2007-07-22' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -106,7 +107,7 @@ + trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; + trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; + : ${TMPDIR=/tmp} ; +- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +@@ -160,6 +161,7 @@ + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched +@@ -206,8 +208,11 @@ + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; + macppc:MirBSD:*:*) +- echo powerppc-unknown-mirbsd${UNAME_RELEASE} ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} +@@ -325,7 +330,7 @@ + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; +- i86pc:SunOS:5.*:*) ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) +@@ -764,12 +769,19 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ case ${UNAME_MACHINE} in ++ pc98) ++ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ amd64) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; +- i*:MINGW*:*) ++ *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) +@@ -779,9 +791,15 @@ + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- x86:Interix*:[345]*) +- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' +- exit ;; ++ *:Interix*:[3456]*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ EM64T | authenticamd) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; +@@ -817,6 +835,9 @@ + arm*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ avr32*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; +@@ -851,7 +872,11 @@ + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^CPU/{ ++ s: ::g ++ p ++ }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) +@@ -870,7 +895,11 @@ + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^CPU/{ ++ s: ::g ++ p ++ }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +@@ -925,6 +954,9 @@ + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; ++ xtensa:Linux:*:*) ++ echo xtensa-unknown-linux-gnu ++ exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent +@@ -967,7 +999,7 @@ + LIBC=gnulibc1 + # endif + #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) ++ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout +@@ -977,7 +1009,11 @@ + LIBC=dietlibc + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^LIBC/{ ++ s: ::g ++ p ++ }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit +@@ -1179,6 +1215,15 @@ + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; +--- glibmm2.4-2.14.1.orig/scripts/config.sub ++++ glibmm2.4-2.14.1/scripts/config.sub +@@ -1,9 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, ++# Inc. + +-timestamp='2005-12-11' ++timestamp='2007-06-28' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -240,15 +241,16 @@ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ +- | fr30 | frv \ ++ | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ +- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | mcore | mep \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -268,26 +270,25 @@ + | mn10200 | mn10300 \ + | mt \ + | msp430 \ ++ | nios | nios2 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ +- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ +- | sparcv8 | sparcv9 | sparcv9b \ +- | strongarm \ ++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ +- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k) + basic_machine=$basic_machine-unknown + ;; +- m32c) +- basic_machine=$basic_machine-unknown +- ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown +@@ -317,18 +318,18 @@ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ +- | avr-* \ ++ | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ +- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ +- | m32r-* | m32rle-* \ ++ | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ +@@ -350,29 +351,28 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ +- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ +- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ + | ymp-* \ + | z8k-*) + ;; +- m32c-*) +- ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) +@@ -475,8 +475,8 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16c) +- basic_machine=cr16c-unknown ++ cr16) ++ basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) +@@ -683,6 +683,10 @@ + basic_machine=i386-pc + os=-mingw32 + ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; + miniframe) + basic_machine=m68000-convergent + ;; +@@ -818,6 +822,12 @@ + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; ++ pc98) ++ basic_machine=i386-pc ++ ;; ++ pc98-*) ++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; +@@ -904,6 +914,10 @@ + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; + sei) + basic_machine=mips-sei + os=-seiux +@@ -915,6 +929,9 @@ + basic_machine=sh-hitachi + os=-hms + ;; ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; + sh64) + basic_machine=sh64-unknown + ;; +@@ -1120,7 +1137,7 @@ + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; +- sparc | sparcv8 | sparcv9 | sparcv9b) ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) +@@ -1193,7 +1210,8 @@ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ++ | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +@@ -1208,7 +1226,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1360,6 +1378,12 @@ + # system, and we'll never get to this point. + + case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; + *-acorn) + os=-riscix1.2 + ;; +@@ -1369,9 +1393,9 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff +- ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 +@@ -1397,6 +1421,9 @@ + m68*-cisco) + os=-aout + ;; ++ mep-*) ++ os=-elf ++ ;; + mips*-cisco) + os=-elf + ;;