Hi, Attached is the diff for my glademm 2.6.0-1.5 NMU.
Note that this NMU may be a sponsored one, so in case of answers, please also Cc: the sponsoree (mail in the changelog) too.
diff -u glademm-2.6.0/config.guess glademm-2.6.0/config.guess --- glademm-2.6.0/config.guess +++ glademm-2.6.0/config.guess @@ -1,10 +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, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-03-06' +timestamp='2008-01-23' # 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 @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -330,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*:*) @@ -532,7 +532,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -793,12 +793,15 @@ exit ;; *:Interix*:[3456]*) case ${UNAME_MACHINE} in - x86) + x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; EM64T | authenticamd) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -833,7 +836,14 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -954,8 +964,8 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -1474,9 +1484,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be diff -u glademm-2.6.0/config.sub glademm-2.6.0/config.sub --- glademm-2.6.0/config.sub +++ glademm-2.6.0/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-01-18' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -369,10 +369,14 @@ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -443,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -475,8 +487,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -668,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -683,6 +703,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -809,6 +833,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -1017,6 +1049,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; diff -u glademm-2.6.0/debian/changelog glademm-2.6.0/debian/changelog --- glademm-2.6.0/debian/changelog +++ glademm-2.6.0/debian/changelog @@ -1,3 +1,11 @@ +glademm (2.6.0-1.5) unstable; urgency=low + + * Non-maintainer upload. + * Patch header files to add missing includes + to make package buildable with g++ 4.3. (Closes: #454829) + + -- Kumar Appaiah <[EMAIL PROTECTED]> Mon, 24 Mar 2008 15:08:22 +0530 + glademm (2.6.0-1.4) unstable; urgency=low * Non-maintainer upload. only in patch2: unchanged: --- glademm-2.6.0.orig/src/TagStream.hh +++ glademm-2.6.0/src/TagStream.hh @@ -26,6 +26,8 @@ #include <fstream> #include <strstream> +#include <cstring> + class TagStream : public Tag { // ---- for reading ----- // copied from _GbWidgetLoadData only in patch2: unchanged: --- glademm-2.6.0.orig/src/Tag.cc +++ glademm-2.6.0/src/Tag.cc @@ -23,6 +23,8 @@ #include <locale.h> #include <iostream> +#include <cstring> + const Tag *Tag::find(const std::string &tp) const { const_iterator i=find(begin(),tp); if (i==end()) return 0; only in patch2: unchanged: --- glademm-2.6.0.orig/src/TagStream.cc +++ glademm-2.6.0/src/TagStream.cc @@ -20,7 +20,8 @@ #include "TagStream.hh" #include <cstring> #include <unistd.h> -#include <algo.h> +#include <algorithm> +#include <iostream> //#define REMEMBER_EMPTY_SPACE @@ -73,10 +74,10 @@ { std::string ret; std::string::const_iterator i(cont.begin()); while (i!=cont.end()) - { std::string::const_iterator verbatim(::find(i,cont.end(),'&')); + { std::string::const_iterator verbatim(std::find(i,cont.end(),'&')); ret+=std::string(i,verbatim); if (verbatim!=cont.end()) - { std::string::const_iterator endtag(::find(verbatim,cont.end(),';')); + { std::string::const_iterator endtag(std::find(verbatim,cont.end(),';')); if (endtag!=cont.end()) ++endtag; std::string tag(verbatim,endtag); if (tag[1]=='#' && tag[2]=='x') only in patch2: unchanged: --- glademm-2.6.0.orig/src/writers/bonobo_dock.cc +++ glademm-2.6.0/src/writers/bonobo_dock.cc @@ -20,6 +20,8 @@ #include "container.hh" +#include <cstring> + class Bonobo_Dock : public Gtk_Container {public: typedef Gtk_Container Parent; only in patch2: unchanged: --- glademm-2.6.0.orig/src/writers/bonobo_dockitem.cc +++ glademm-2.6.0/src/writers/bonobo_dockitem.cc @@ -20,6 +20,8 @@ #include "bin.hh" +#include <cstring> + class Bonobo_DockItem : public Gtk_Bin {public: typedef Gtk_Bin Parent; only in patch2: unchanged: --- glademm-2.6.0.orig/src/writers/clist.cc +++ glademm-2.6.0/src/writers/clist.cc @@ -21,6 +21,8 @@ #include "clist.hh" #include "../strsep.h" +#include <cstring> + static Gtk_CList Gtk_CList(false); const std::string Gtk_CList::TypeName(const Widget &w) const only in patch2: unchanged: --- glademm-2.6.0.orig/src/writers/combo.cc +++ glademm-2.6.0/src/writers/combo.cc @@ -21,6 +21,8 @@ #include "combo.hh" #include "../strsep.h" +#include <cstring> + static Gtk_Combo Gtk_Combo(false); const std::string Gtk_Combo::TypeName(const Widget &w) const only in patch2: unchanged: --- glademm-2.6.0.orig/src/writers/ctree.cc +++ glademm-2.6.0/src/writers/ctree.cc @@ -21,6 +21,8 @@ #include "container.hh" +#include <cstring> + class Gtk_CTree : public Gtk_Container {public: typedef Gtk_Container Parent; only in patch2: unchanged: --- glademm-2.6.0.orig/src/writers/gnome_about.cc +++ glademm-2.6.0/src/writers/gnome_about.cc @@ -21,6 +21,8 @@ #include "gnome_dialog.hh" #include "../strsep.h" +#include <cstring> + class Gnome_About : public Gnome_Dialog {public: typedef Gnome_Dialog Parent; only in patch2: unchanged: --- glademm-2.6.0.orig/src/writers/optionmenu.cc +++ glademm-2.6.0/src/writers/optionmenu.cc @@ -21,6 +21,8 @@ #include "button.hh" #include "../strsep.h" +#include <cstring> + class Gtk_OptionMenu : public Gtk_Button { static const char * const MenuTags; static Tag menu; only in patch2: unchanged: --- glademm-2.6.0.orig/src/writers/xpmname.cc +++ glademm-2.6.0/src/writers/xpmname.cc @@ -2,6 +2,8 @@ #include <string> #include <Configuration.hh> +#include <cstring> + // parts taken from /* xpmtoppm.c - read an X11 pixmap file and produce a portable pixmap **