[Pkg-voip-commits] r1571 - in libcommoncpp2/trunk/debian: . patches

Mark Purcell msp at costa.debian.org
Wed Apr 12 18:24:09 UTC 2006


Author: msp
Date: 2006-04-12 18:24:09 +0000 (Wed, 12 Apr 2006)
New Revision: 1571

Modified:
   libcommoncpp2/trunk/debian/changelog
   libcommoncpp2/trunk/debian/patches/01_debian.dpatch
Log:
releasing version 1.3.26-1

Modified: libcommoncpp2/trunk/debian/changelog
===================================================================
--- libcommoncpp2/trunk/debian/changelog	2006-04-12 18:16:28 UTC (rev 1570)
+++ libcommoncpp2/trunk/debian/changelog	2006-04-12 18:24:09 UTC (rev 1571)
@@ -1,15 +1,14 @@
-libcommoncpp2 (1.3.26-1) UNRELEASED; urgency=low
+libcommoncpp2 (1.3.26-1) unstable; urgency=low
 
-  [ Mark Purcell ]
-  * (NOT RELEASED YET) New upstream release
-
   [ Kilian Krause ]
   * debian/rules: Add get-orig-source target.
 
   [ Mark Purcell ]
+  * New upstream release
   * debian/watch to use svn-upgrade
+  * Update debian/patches/01_debian.dpatch
 
- -- Mark Purcell <msp at debian.org>  Wed, 12 Apr 2006 19:15:40 +0100
+ -- Mark Purcell <msp at debian.org>  Wed, 12 Apr 2006 19:23:19 +0100
 
 libcommoncpp2 (1.3.25-3) unstable; urgency=low
 

Modified: libcommoncpp2/trunk/debian/patches/01_debian.dpatch
===================================================================
--- libcommoncpp2/trunk/debian/patches/01_debian.dpatch	2006-04-12 18:16:28 UTC (rev 1570)
+++ libcommoncpp2/trunk/debian/patches/01_debian.dpatch	2006-04-12 18:24:09 UTC (rev 1571)
@@ -5,72 +5,11 @@
 ## DP: New patch generated from libcommoncpp2 1.3.25-3 diff.gz
 
 @DPATCH@
-
---- libcommoncpp2-1.3.25.orig/doc/Doxyfile.in
-+++ libcommoncpp2-1.3.25/doc/Doxyfile.in
-@@ -184,6 +184,19 @@
- 
- SUBGROUPING            = YES
- 
-+# The GENERATE_TODOLIST tag can be used to enable (YES) or
-+# disable (NO) the todo list. This list is created by putting \todo
-+# commands in the documentation.
-+
-+GENERATE_TODOLIST      = NO
-+
-+# If the sources in your project are distributed over multiple directories
-+# then setting the SHOW_DIRECTORIES tag to YES will show the directory
-+# hierarchy in the documentation.
-+
-+SHOW_DIRECTORIES        = NO
-+
-+
- #---------------------------------------------------------------------------
- # Build related configuration options
- #---------------------------------------------------------------------------
-@@ -300,7 +313,7 @@
- # disable (NO) the todo list. This list is created by putting \todo 
- # commands in the documentation.
- 
--GENERATE_TODOLIST      = YES
-+GENERATE_TODOLIST      = NO
- 
- # The GENERATE_TESTLIST tag can be used to enable (YES) or 
- # disable (NO) the test list. This list is created by putting \test 
-@@ -650,7 +663,7 @@
- # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
- # generate Latex output.
- 
--GENERATE_LATEX         = YES
-+GENERATE_LATEX         = NO
- 
- # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
- # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-@@ -768,7 +781,7 @@
- # If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
- # generate man pages
- 
--GENERATE_MAN           = NO
-+GENERATE_MAN           = YES
- 
- # The MAN_OUTPUT tag is used to specify where the man pages will be put. 
- # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
---- libcommoncpp2-1.3.25.orig/src/ccgnu2-config.in
-+++ libcommoncpp2-1.3.25/src/ccgnu2-config.in
-@@ -81,6 +81,9 @@
- 	--modflags | --module)
- 		echo $modflags
- 		;;
-+	--help)
-+		usage 0
-+		;;
- 	*)
- 		usage 1 1>&2
- 		;;
---- libcommoncpp2-1.3.25.orig/aclocal.m4
-+++ libcommoncpp2-1.3.25/aclocal.m4
-@@ -1439,6 +1439,12 @@
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+diff -urNad libcommoncpp2-1.3.26~/aclocal.m4 libcommoncpp2-1.3.26/aclocal.m4
+--- libcommoncpp2-1.3.26~/aclocal.m4	2006-03-28 15:45:41.000000000 +0100
++++ libcommoncpp2-1.3.26/aclocal.m4	2006-04-12 19:19:25.000000000 +0100
+@@ -1601,6 +1601,12 @@
+     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
    fi
  
 +  # Append ld.so.conf contents to the search path
@@ -82,7 +21,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -1472,6 +1478,18 @@
+@@ -1622,6 +1628,18 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -101,9 +40,9 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -4988,6 +5006,9 @@
-   linux*)
-     _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+@@ -5370,6 +5388,9 @@
+   cygwin* | mingw*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
 +  linux*)
 +    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
@@ -111,9 +50,9 @@
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -5181,6 +5202,32 @@
-     fi
-     ;;
+@@ -5636,6 +5657,32 @@
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
  
 +  linux*)
 +    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -144,20 +83,9 @@
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
---- libcommoncpp2-1.3.25.orig/autoconf/config.guess
-+++ libcommoncpp2-1.3.25/autoconf/config.guess
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
--timestamp='2004-11-12'
-+timestamp='2006-02-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
+diff -urNad libcommoncpp2-1.3.26~/autoconf/config.guess libcommoncpp2-1.3.26/autoconf/config.guess
+--- libcommoncpp2-1.3.26~/autoconf/config.guess	2006-02-12 00:43:48.000000000 +0000
++++ libcommoncpp2-1.3.26/autoconf/config.guess	2006-04-12 19:19:25.000000000 +0100
 @@ -17,13 +17,15 @@
  #
  # You should have received a copy of the GNU General Public License
@@ -175,15 +103,6 @@
  # Originally written by Per Bothner <per at bothner.com>.
  # Please send patches to <config-patches at gnu.org>.  Submit a context
  # diff and a properly formatted ChangeLog entry.
-@@ -53,7 +55,7 @@
- GNU config.guess ($timestamp)
- 
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
 @@ -66,11 +68,11 @@
  while test $# -gt 0 ; do
    case $1 in
@@ -217,169 +136,7 @@
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
  # (ghazi at noc.rutgers.edu 1994-08-24)
-@@ -196,55 +198,23 @@
- 	# contains redundant information, the shorter form:
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
--	exit 0 ;;
--    amd64:OpenBSD:*:*)
--	echo x86_64-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    amiga:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    cats:OpenBSD:*:*)
--	echo arm-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hp300:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    luna88k:OpenBSD:*:*)
--    	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    macppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme88k:OpenBSD:*:*)
--	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvmeppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sgi:OpenBSD:*:*)
--	echo mips64-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sun3:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:OpenBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+	exit ;;
-     *:ekkoBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    *:SolidBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+	exit ;;
-     macppc:MirBSD:*:*)
- 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:MirBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     alpha:OSF1:*:*)
- 	case $UNAME_RELEASE in
- 	*4.0)
-@@ -297,40 +267,43 @@
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
- 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit 0 ;;
-+	exit ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# Should we change UNAME_MACHINE based on the output of uname instead
- 	# of the specific Alpha model?
- 	echo alpha-pc-interix
--	exit 0 ;;
-+	exit ;;
-     21064:Windows_NT:50:3)
- 	echo alpha-dec-winnt3.5
--	exit 0 ;;
-+	exit ;;
-     Amiga*:UNIX_System_V:4.0:*)
- 	echo m68k-unknown-sysv4
--	exit 0;;
-+	exit ;;
-     *:[Aa]miga[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-amigaos
--	exit 0 ;;
-+	exit ;;
-     *:[Mm]orph[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-morphos
--	exit 0 ;;
-+	exit ;;
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
--	exit 0 ;;
-+	exit ;;
-     *:z/VM:*:*)
- 	echo s390-ibm-zvmoe
--	exit 0 ;;
-+	exit ;;
-     *:OS400:*:*)
-         echo powerpc-ibm-os400
--	exit 0 ;;
-+	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
--	exit 0;;
-+	exit ;;
-+    arm:riscos:*:*|arm:RISCOS:*:*)
-+	echo arm-unknown-riscos
-+	exit ;;
-     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- 	echo hppa1.1-hitachi-hiuxmpp
--	exit 0;;
-+	exit ;;
-     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- 	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -338,32 +311,32 @@
- 	else
- 		echo pyramid-pyramid-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     NILE*:*:*:dcosx)
- 	echo pyramid-pyramid-svr4
--	exit 0 ;;
-+	exit ;;
-     DRS?6000:unix:4.0:6*)
- 	echo sparc-icl-nx6
--	exit 0 ;;
-+	exit ;;
-     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- 	case `/usr/bin/uname -p` in
--	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-+	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     i86pc:SunOS:5.*:*)
- 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
- 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
- 	# it's likely to be more like Solaris than SunOS4.
- 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:*:*)
- 	case "`/usr/bin/arch -k`" in
- 	    Series*|S4*)
-@@ -372,10 +345,10 @@
+@@ -361,10 +363,10 @@
  	esac
  	# Japanese Language versions have a version number like `4.1.3-JL'.
  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -392,7 +149,7 @@
      sun*:*:4.2BSD:*)
  	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -387,10 +360,10 @@
+@@ -376,10 +378,10 @@
  		echo sparc-sun-sunos${UNAME_RELEASE}
  		;;
  	esac
@@ -405,60 +162,7 @@
      # The situation for MiNT is a little confusing.  The machine name
      # can be virtually everything (everything which is not
      # "atarist" or "atariste" at least should have a processor
-@@ -401,40 +374,40 @@
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- 	echo m68k-atari-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-         echo m68k-milan-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-         echo m68k-hades-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-         echo m68k-unknown-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     m68k:machten:*:*)
- 	echo m68k-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     powerpc:machten:*:*)
- 	echo powerpc-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RISC*:Mach:*:*)
- 	echo mips-dec-mach_bsd4.3
--	exit 0 ;;
-+	exit ;;
-     RISC*:ULTRIX:*:*)
- 	echo mips-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     VAX*:ULTRIX*:*:*)
- 	echo vax-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     2020:CLIX:*:* | 2430:CLIX:*:*)
- 	echo clipper-intergraph-clix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mips:*:*:UMIPS | mips:*:*:RISCos)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -458,32 +431,33 @@
+@@ -444,32 +446,33 @@
  	  exit (-1);
  	}
  EOF
@@ -503,7 +207,7 @@
      AViiON:dgux:*:*)
          # DG/UX returns AViiON for all architectures
          UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -499,29 +473,29 @@
+@@ -485,29 +488,29 @@
  	else
  	    echo i586-dg-dgux${UNAME_RELEASE}
  	fi
@@ -542,7 +246,7 @@
      ia64:AIX:*:*)
  	if [ -x /usr/bin/oslevel ] ; then
  		IBM_REV=`/usr/bin/oslevel`
-@@ -529,7 +503,7 @@
+@@ -515,7 +518,7 @@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
@@ -551,7 +255,7 @@
      *:AIX:2:3)
  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
  		eval $set_cc_for_build
-@@ -544,14 +518,18 @@
+@@ -530,14 +533,18 @@
  			exit(0);
  			}
  EOF
@@ -573,7 +277,7 @@
      *:AIX:*:[45])
  	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
-@@ -565,28 +543,28 @@
+@@ -551,28 +558,28 @@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
@@ -610,7 +314,7 @@
      9000/[34678]??:HP-UX:*:*)
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	case "${UNAME_MACHINE}" in
-@@ -648,9 +626,19 @@
+@@ -634,9 +641,19 @@
  	esac
  	if [ ${HP_ARCH} = "hppa2.0w" ]
  	then
@@ -633,7 +337,7 @@
  	    then
  		HP_ARCH="hppa2.0w"
  	    else
-@@ -658,11 +646,11 @@
+@@ -644,11 +661,11 @@
  	    fi
  	fi
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -647,233 +351,7 @@
      3050*:HI-UX:*:*)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -690,158 +678,177 @@
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
- 	echo unknown-hitachi-hiuxwe2
--	exit 0 ;;
-+	exit ;;
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- 	echo hppa1.1-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     9000/8??:4.3bsd:*:*)
- 	echo hppa1.0-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- 	echo hppa1.0-hp-mpeix
--	exit 0 ;;
-+	exit ;;
-     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- 	echo hppa1.1-hp-osf
--	exit 0 ;;
-+	exit ;;
-     hp8??:OSF1:*:*)
- 	echo hppa1.0-hp-osf
--	exit 0 ;;
-+	exit ;;
-     i*86:OSF1:*:*)
- 	if [ -x /usr/sbin/sysversion ] ; then
- 	    echo ${UNAME_MACHINE}-unknown-osf1mk
- 	else
- 	    echo ${UNAME_MACHINE}-unknown-osf1
- 	fi
--	exit 0 ;;
-+	exit ;;
-     parisc*:Lites*:*:*)
- 	echo hppa1.1-hp-lites
--	exit 0 ;;
-+	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit 0 ;;
-+        exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     CRAY*Y-MP:*:*:*)
- 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*[A-Z]90:*:*:*)
- 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- 	      -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*TS:*:*:*)
- 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*T3E:*:*:*)
- 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*SV1:*:*:*)
- 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     *:UNICOS/mp:*:*)
- 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit 0 ;;
-+        exit ;;
-     5000:UNIX_System_V:4.*:*)
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--	exit 0 ;;
-+	exit ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sparc*:BSD/OS:*:*)
- 	echo sparc-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:FreeBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	exit 0 ;;
-+	case ${UNAME_MACHINE} in
-+	    pc98)
-+		echo i386-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 0 ;;
-+	exit ;;
-     i*:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
--	exit 0 ;;
-+	exit ;;
-+    i*:MSYS_NT-*:*:*)
-+	echo ${UNAME_MACHINE}-pc-mingw32
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
--	exit 0 ;;
--    x86:Interix*:[34]*)
--	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
--	exit 0 ;;
-+	exit ;;
-+    x86:Interix*:[345]*)
-+	echo i586-pc-interix${UNAME_RELEASE}
-+	exit ;;
-+    EM64T:Interix*:[345]*)
-+	echo x86_64-unknown-interix${UNAME_RELEASE}
-+	exit ;;
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
--	exit 0 ;;
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- 	# UNAME_MACHINE based on the output of uname instead of i386?
- 	echo i586-pc-interix
--	exit 0 ;;
-+	exit ;;
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
--	exit 0 ;;
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-+	echo x86_64-unknown-cygwin
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU:*:*)
- 	# the GNU system
- 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU/*:*:*)
- 	# other systems with GNU libc and userland
- 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
--	exit 0 ;;
-+	exit ;;
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
--	exit 0 ;;
-+	exit ;;
-     arm*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     cris:Linux:*:*)
- 	echo cris-axis-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     crisv32:Linux:*:*)
- 	echo crisv32-axis-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     frv:Linux:*:*)
-     	echo frv-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     m32r*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     m68*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     mips:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -858,8 +865,12 @@
+@@ -836,8 +853,12 @@
  	#endif
  	#endif
  EOF
@@ -888,34 +366,7 @@
  	;;
      mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -877,15 +888,22 @@
- 	#endif
- 	#endif
- EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	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:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-     ppc:Linux:*:*)
- 	echo powerpc-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     ppc64:Linux:*:*)
- 	echo powerpc64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- 	  EV5)   UNAME_MACHINE=alphaev5 ;;
-@@ -899,7 +917,7 @@
+@@ -877,7 +898,7 @@
  	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
  	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
  	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -924,43 +375,7 @@
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -907,25 +925,28 @@
- 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
- 	  *)    echo hppa-unknown-linux-gnu ;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
- 	echo hppa64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
--	exit 0 ;;
-+	exit ;;
-     sh64*:Linux:*:*)
-     	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sparc:Linux:*:* | sparc64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-+    vax:Linux:*:*)
-+	echo ${UNAME_MACHINE}-dec-linux-gnu
-+	exit ;;
-     x86_64:Linux:*:*)
- 	echo x86_64-unknown-linux-gnu
--	exit 0 ;;
-+	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
-@@ -943,15 +964,15 @@
+@@ -921,15 +942,15 @@
  		;;
  	  a.out-i386-linux)
  		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
@@ -979,7 +394,7 @@
  	esac
  	# Determine whether the default compiler is a.out or elf
  	eval $set_cc_for_build
-@@ -968,7 +989,7 @@
+@@ -946,7 +967,7 @@
  	LIBC=gnulibc1
  	# endif
  	#else
@@ -988,71 +403,7 @@
  	LIBC=gnu
  	#else
  	LIBC=gnuaout
-@@ -978,16 +999,23 @@
- 	LIBC=dietlibc
- 	#endif
- EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
--	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-+	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
-+	}
-+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- 	;;
-     i*86:DYNIX/ptx:4*:*)
- 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- 	# earlier versions are messed up and put the nodename in both
- 	# sysname and nodename.
- 	echo i386-sequent-sysv4
--	exit 0 ;;
-+	exit ;;
-     i*86:UNIX_SV:4.2MP:2.*)
-         # Unixware is an offshoot of SVR4, but it has its own version
-         # number series starting with 2...
-@@ -995,27 +1023,27 @@
- 	# I just have to hope.  -- rms.
-         # Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:OS/2:*:*)
- 	# If we were able to find `uname', then EMX Unix compatibility
- 	# is probably installed.
- 	echo ${UNAME_MACHINE}-pc-os2-emx
--	exit 0 ;;
-+	exit ;;
-     i*86:XTS-300:*:STOP)
- 	echo ${UNAME_MACHINE}-unknown-stop
--	exit 0 ;;
-+	exit ;;
-     i*86:atheos:*:*)
- 	echo ${UNAME_MACHINE}-unknown-atheos
--	exit 0 ;;
--	i*86:syllable:*:*)
-+	exit ;;
-+    i*86:syllable:*:*)
- 	echo ${UNAME_MACHINE}-pc-syllable
--	exit 0 ;;
-+	exit ;;
-     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     i*86:*DOS:*:*)
- 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
--	exit 0 ;;
-+	exit ;;
-     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -1023,15 +1051,16 @@
+@@ -995,15 +1016,16 @@
  	else
  		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
  	fi
@@ -1072,285 +423,7 @@
      i*86:*:3.2:*)
  	if test -f /usr/options/cb.name; then
  		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-@@ -1049,73 +1078,73 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv32
- 	fi
--	exit 0 ;;
-+	exit ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-         # the processor, so we play safe by assuming i386.
- 	echo i386-pc-msdosdjgpp
--        exit 0 ;;
-+        exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
--	exit 0 ;;
-+	exit ;;
-     paragon:*:*:*)
- 	echo i860-intel-osf1
--	exit 0 ;;
-+	exit ;;
-     i860:*:4.*:*) # i860-SVR4
- 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- 	else # Add other i860-SVR4 vendors below as they are discovered.
- 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
- 	fi
--	exit 0 ;;
-+	exit ;;
-     mini*:CTIX:SYS*5:*)
- 	# "miniframe"
- 	echo m68010-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     mc68k:UNIX:SYSTEM5:3.51m)
- 	echo m68k-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     M680?0:D-NIX:5.3:*)
- 	echo m68k-diab-dnix
--	exit 0 ;;
-+	exit ;;
-     M68*:*:R3V[5678]*:*)
--	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
--	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && echo i486-ncr-sysv4 && exit 0 ;;
-+          && { echo i486-ncr-sysv4; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
--	exit 0 ;;
-+	exit ;;
-     TSUNAMI:LynxOS:2.*:*)
- 	echo sparc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
- 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
- 	echo mips-dde-sysv${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RM*:ReliantUNIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     RM*:SINIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:SINIX-*:*:*)
- 	if uname -p 2>/dev/null >/dev/null ; then
- 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1123,69 +1152,72 @@
- 	else
- 		echo ns32k-sni-sysv
- 	fi
--	exit 0 ;;
-+	exit ;;
-     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                       # says <Richard.M.Bartel at ccMail.Census.GOV>
-         echo i586-unisys-sysv4
--        exit 0 ;;
-+        exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes at openmarket.com>.
- 	# How about differentiating between stratus architectures? -djm
- 	echo hppa1.1-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:*:*:FTX*)
- 	# From seanf at swdc.stratus.com.
- 	echo i860-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-+    i*86:VOS:*:*)
-+	# From Paul.Green at stratus.com.
-+	echo ${UNAME_MACHINE}-stratus-vos
-+	exit ;;
-     *:VOS:*:*)
- 	# From Paul.Green at stratus.com.
- 	echo hppa1.1-stratus-vos
--	exit 0 ;;
-+	exit ;;
-     mc68*:A/UX:*:*)
- 	echo m68k-apple-aux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     news*:NEWS-OS:6*:*)
- 	echo mips-sony-newsos6
--	exit 0 ;;
-+	exit ;;
-     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- 	if [ -d /usr/nec ]; then
- 	        echo mips-nec-sysv${UNAME_RELEASE}
- 	else
- 	        echo mips-unknown-sysv${UNAME_RELEASE}
- 	fi
--        exit 0 ;;
-+        exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
--	exit 0 ;;
-+	exit ;;
-     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
- 	echo powerpc-apple-beos
--	exit 0 ;;
-+	exit ;;
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
--	exit 0 ;;
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-5:SUPER-UX:*:*)
- 	echo sx5-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-6:SUPER-UX:*:*)
- 	echo sx6-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Rhapsody:*:*)
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Darwin:*:*)
- 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- 	case $UNAME_PROCESSOR in
--	    *86) UNAME_PROCESSOR=i686 ;;
- 	    unknown) UNAME_PROCESSOR=powerpc ;;
- 	esac
- 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
- 	UNAME_PROCESSOR=`uname -p`
- 	if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1193,22 +1225,25 @@
- 		UNAME_MACHINE=pc
- 	fi
- 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:QNX:*:4*)
- 	echo i386-pc-qnx
--	exit 0 ;;
-+	exit ;;
-+    NSE-?:NONSTOP_KERNEL:*:*)
-+	echo nse-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-     NSR-?:NONSTOP_KERNEL:*:*)
- 	echo nsr-tandem-nsk${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:NonStop-UX:*:*)
- 	echo mips-compaq-nonstopux
--	exit 0 ;;
-+	exit ;;
-     BS2000:POSIX*:*:*)
- 	echo bs2000-siemens-sysv
--	exit 0 ;;
-+	exit ;;
-     DS/*:UNIX_System_V:*:*)
- 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Plan9:*:*)
- 	# "uname -m" is not consistent, so use $cputype instead. 386
- 	# is converted to i386 for consistency with other x86
-@@ -1219,41 +1254,47 @@
- 	    UNAME_MACHINE="$cputype"
- 	fi
- 	echo ${UNAME_MACHINE}-unknown-plan9
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-10:*:*)
- 	echo pdp10-unknown-tops10
--	exit 0 ;;
-+	exit ;;
-     *:TENEX:*:*)
- 	echo pdp10-unknown-tenex
--	exit 0 ;;
-+	exit ;;
-     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- 	echo pdp10-dec-tops20
--	exit 0 ;;
-+	exit ;;
-     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- 	echo pdp10-xkl-tops20
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-20:*:*)
- 	echo pdp10-unknown-tops20
--	exit 0 ;;
-+	exit ;;
-     *:ITS:*:*)
- 	echo pdp10-unknown-its
--	exit 0 ;;
-+	exit ;;
-     SEI:*:*:SEIUX)
-         echo mips-sei-seiux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:DragonFly:*:*)
- 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	exit 0 ;;
-+	exit ;;
-     *:*VMS:*:*)
-     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
- 	case "${UNAME_MACHINE}" in
--	    A*) echo alpha-dec-vms && exit 0 ;;
--	    I*) echo ia64-dec-vms && exit 0 ;;
--	    V*) echo vax-dec-vms && exit 0 ;;
-+	    A*) echo alpha-dec-vms ; exit ;;
-+	    I*) echo ia64-dec-vms ; exit ;;
-+	    V*) echo vax-dec-vms ; exit ;;
- 	esac ;;
-     *:XENIX:*:SysV)
- 	echo i386-pc-xenix
--	exit 0 ;;
-+	exit ;;
-+    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+	exit ;;
-+    i*86:rdos:*:*)
-+	echo ${UNAME_MACHINE}-pc-rdos
-+	exit ;;
- esac
- 
- #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1285,7 +1326,7 @@
+@@ -1243,7 +1265,7 @@
  #endif
  
  #if defined (__arm) && defined (__acorn) && defined (__unix)
@@ -1359,7 +432,7 @@
  #endif
  
  #if defined (hp300) && !defined (hpux)
-@@ -1374,11 +1415,12 @@
+@@ -1332,11 +1354,12 @@
  }
  EOF
  
@@ -1374,7 +447,7 @@
  
  # Convex versions that predate uname can use getsysinfo(1)
  
-@@ -1387,22 +1429,22 @@
+@@ -1345,22 +1368,22 @@
      case `getsysinfo -f cpu_type` in
      c1*)
  	echo c1-convex-bsd
@@ -1402,7 +475,7 @@
      esac
  fi
  
-@@ -1413,7 +1455,9 @@
+@@ -1371,7 +1394,9 @@
  the operating system you are using. It is advised that you
  download the most up to date version of the config scripts from
  
@@ -1413,20 +486,9 @@
  
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
---- libcommoncpp2-1.3.25.orig/autoconf/config.sub
-+++ libcommoncpp2-1.3.25/autoconf/config.sub
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
--timestamp='2004-11-30'
-+timestamp='2006-02-23'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
+diff -urNad libcommoncpp2-1.3.26~/autoconf/config.sub libcommoncpp2-1.3.26/autoconf/config.sub
+--- libcommoncpp2-1.3.26~/autoconf/config.sub	2006-02-12 00:43:48.000000000 +0000
++++ libcommoncpp2-1.3.26/autoconf/config.sub	2006-04-12 19:19:25.000000000 +0100
 @@ -21,14 +21,15 @@
  #
  # You should have received a copy of the GNU General Public License
@@ -1446,15 +508,6 @@
  # Please send patches to <config-patches at gnu.org>.  Submit a context
  # diff and a properly formatted ChangeLog entry.
  #
-@@ -70,7 +71,7 @@
- version="\
- GNU config.sub ($timestamp)
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
 @@ -83,11 +84,11 @@
  while test $# -gt 0 ; do
    case $1 in
@@ -1479,19 +532,7 @@
  
      * )
         break ;;
-@@ -118,8 +119,9 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
--  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+  storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-     ;;
-@@ -170,6 +172,10 @@
+@@ -169,6 +170,10 @@
  	-hiux*)
  		os=-hiuxwe2
  		;;
@@ -1502,7 +543,7 @@
  	-sco5)
  		os=-sco3.2v5
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -186,6 +192,10 @@
+@@ -185,6 +190,10 @@
  		# Don't forget version if it is 3.2v4 or newer.
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
@@ -1513,23 +554,7 @@
  	-sco*)
  		os=-sco3.2v2
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -231,13 +241,14 @@
- 	| 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 \
-+	| bfin \
- 	| c4x | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
- 	| fr30 | frv \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- 	| i370 | i860 | i960 | ia64 \
- 	| ip2k | iq2000 \
--	| m32r | m32rle | m68000 | m68k | m88k | mcore \
-+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
- 	| mips | mipsbe | mipseb | mipsel | mipsle \
- 	| mips16 \
- 	| mips64 | mips64el \
-@@ -246,6 +257,7 @@
+@@ -244,6 +253,7 @@
  	| mips64vr4100 | mips64vr4100el \
  	| mips64vr4300 | mips64vr4300el \
  	| mips64vr5000 | mips64vr5000el \
@@ -1537,29 +562,7 @@
  	| mipsisa32 | mipsisa32el \
  	| mipsisa32r2 | mipsisa32r2el \
  	| mipsisa64 | mipsisa64el \
-@@ -254,15 +266,18 @@
- 	| mipsisa64sr71k | mipsisa64sr71kel \
- 	| mipstx39 | mipstx39el \
- 	| mn10200 | mn10300 \
-+	| mt \
- 	| msp430 \
-+	| nios | nios2 \
- 	| ns16k | ns32k \
--	| openrisc | or32 \
-+	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
--	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
--	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-+	| sparcv8 | sparcv9 | sparcv9b \
- 	| strongarm \
- 	| tahoe | thumb | tic4x | tic80 | tron \
- 	| v850 | v850e \
-@@ -271,6 +286,9 @@
+@@ -269,6 +279,9 @@
  	| z8k)
  		basic_machine=$basic_machine-unknown
  		;;
@@ -1569,7 +572,7 @@
  	m6811 | m68hc11 | m6812 | m68hc12)
  		# Motorola 68HC11/12.
  		basic_machine=$basic_machine-unknown
-@@ -278,6 +296,9 @@
+@@ -276,6 +289,9 @@
  		;;
  	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
  		;;
@@ -1579,25 +582,25 @@
  
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
-@@ -298,7 +319,7 @@
+@@ -296,7 +312,7 @@
  	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
  	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
  	| avr-* \
 -	| bs2000-* \
 +	| bfin-* | bs2000-* \
  	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- 	| clipper-* | craynv-* | cydra-* \
+ 	| clipper-* | cydra-* \
  	| d10v-* | d30v-* | dlx-* \
-@@ -310,7 +331,7 @@
- 	| ip2k-* | iq2000-* \
- 	| m32r-* | m32rle-* \
+@@ -308,7 +324,7 @@
+ 	| ip2k-* \
+ 	| m32r-* \
  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 -	| m88110-* | m88k-* | mcore-* \
 +	| m88110-* | m88k-* | maxq-* | mcore-* \
  	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
  	| mips16-* \
  	| mips64-* | mips64el-* \
-@@ -319,6 +340,7 @@
+@@ -317,6 +333,7 @@
  	| mips64vr4100-* | mips64vr4100el-* \
  	| mips64vr4300-* | mips64vr4300el-* \
  	| mips64vr5000-* | mips64vr5000el-* \
@@ -1605,29 +608,7 @@
  	| mipsisa32-* | mipsisa32el-* \
  	| mipsisa32r2-* | mipsisa32r2el-* \
  	| mipsisa64-* | mipsisa64el-* \
-@@ -327,16 +349,19 @@
- 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
- 	| mipstx39-* | mipstx39el-* \
- 	| 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[23]e-* | sh[34]eb-* | shbe-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
--	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-+	| sparclite-* \
- 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
- 	| tahoe-* | thumb-* \
- 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-@@ -348,6 +373,8 @@
+@@ -345,6 +362,8 @@
  	| ymp-* \
  	| z8k-*)
  		;;
@@ -1636,7 +617,7 @@
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
  	386bsd)
-@@ -683,6 +710,9 @@
+@@ -659,6 +678,9 @@
  		basic_machine=i386-pc
  		os=-msdos
  		;;
@@ -1646,7 +627,7 @@
  	mvs)
  		basic_machine=i370-ibm
  		os=-mvs
-@@ -758,9 +788,8 @@
+@@ -738,9 +760,8 @@
  		basic_machine=hppa1.1-oki
  		os=-proelf
  		;;
@@ -1655,9 +636,9 @@
  		basic_machine=or32-unknown
 -		os=-coff
  		;;
- 	os400)
- 		basic_machine=powerpc-ibm
-@@ -791,6 +820,12 @@
+ 	OSE68000 | ose68000)
+ 		basic_machine=m68000-ericsson
+@@ -767,6 +788,12 @@
  	pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
@@ -1670,7 +651,7 @@
  	pentium | p5 | k5 | k6 | nexgen | viac3)
  		basic_machine=i586-pc
  		;;
-@@ -847,6 +882,10 @@
+@@ -823,6 +850,10 @@
  		basic_machine=i586-unknown
  		os=-pw32
  		;;
@@ -1681,7 +662,7 @@
  	rom68k)
  		basic_machine=m68k-rom68k
  		os=-coff
-@@ -1086,12 +1125,9 @@
+@@ -1045,12 +1076,9 @@
  	we32k)
  		basic_machine=we32k-att
  		;;
@@ -1695,34 +676,7 @@
  	sparc | sparcv8 | sparcv9 | sparcv9b)
  		basic_machine=sparc-sun
  		;;
-@@ -1165,20 +1201,23 @@
- 	      | -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* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
--	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku* | -rdos*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1196,7 +1235,7 @@
+@@ -1154,7 +1182,7 @@
  		os=`echo $os | sed -e 's|nto|nto-qnx|'`
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
@@ -1731,7 +685,7 @@
  	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
  		;;
  	-mac*)
-@@ -1385,6 +1424,9 @@
+@@ -1328,6 +1356,9 @@
  	*-be)
  		os=-beos
  		;;
@@ -1741,7 +695,7 @@
  	*-ibm)
  		os=-aix
  		;;
-@@ -1556,7 +1598,7 @@
+@@ -1490,7 +1521,7 @@
  esac
  
  echo $basic_machine$os
@@ -1750,20 +704,9 @@
  
  # Local variables:
  # eval: (add-hook 'write-file-hooks 'time-stamp)
---- libcommoncpp2-1.3.25.orig/include/cc++/misc.h
-+++ libcommoncpp2-1.3.25/include/cc++/misc.h
-@@ -343,6 +343,9 @@
-  * @author David Sugar <dyfet at ostel.com>
-  * @short load text configuration files into keyword pairs.
-  */
-+
-+void endKeysdata(void);
-+
- class __EXPORT Keydata : protected MemPager
- {
- public:
---- libcommoncpp2-1.3.25.orig/ccgnu2-config.8
-+++ libcommoncpp2-1.3.25/ccgnu2-config.8
+diff -urNad libcommoncpp2-1.3.26~/ccgnu2-config.8 libcommoncpp2-1.3.26/ccgnu2-config.8
+--- libcommoncpp2-1.3.26~/ccgnu2-config.8	1970-01-01 01:00:00.000000000 +0100
++++ libcommoncpp2-1.3.26/ccgnu2-config.8	2006-04-12 19:19:25.000000000 +0100
 @@ -0,0 +1,19 @@
 +.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
 +.TH CCGNU2-CONFIG "1" "March 2006" "Debian GNU/Linux" "User Commands"
@@ -1784,3 +727,79 @@
 +[\-\-stdlibs]
 +[\-\-includes]
 +[\-\-module]
+diff -urNad libcommoncpp2-1.3.26~/doc/Doxyfile.in libcommoncpp2-1.3.26/doc/Doxyfile.in
+--- libcommoncpp2-1.3.26~/doc/Doxyfile.in	2005-04-23 23:08:04.000000000 +0100
++++ libcommoncpp2-1.3.26/doc/Doxyfile.in	2006-04-12 19:19:24.000000000 +0100
+@@ -184,6 +184,19 @@
+ 
+ SUBGROUPING            = YES
+ 
++# The GENERATE_TODOLIST tag can be used to enable (YES) or
++# disable (NO) the todo list. This list is created by putting \todo
++# commands in the documentation.
++
++GENERATE_TODOLIST      = NO
++
++# If the sources in your project are distributed over multiple directories
++# then setting the SHOW_DIRECTORIES tag to YES will show the directory
++# hierarchy in the documentation.
++
++SHOW_DIRECTORIES        = NO
++
++
+ #---------------------------------------------------------------------------
+ # Build related configuration options
+ #---------------------------------------------------------------------------
+@@ -300,7 +313,7 @@
+ # disable (NO) the todo list. This list is created by putting \todo 
+ # commands in the documentation.
+ 
+-GENERATE_TODOLIST      = YES
++GENERATE_TODOLIST      = NO
+ 
+ # The GENERATE_TESTLIST tag can be used to enable (YES) or 
+ # disable (NO) the test list. This list is created by putting \test 
+@@ -650,7 +663,7 @@
+ # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+ # generate Latex output.
+ 
+-GENERATE_LATEX         = YES
++GENERATE_LATEX         = NO
+ 
+ # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+ # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+@@ -768,7 +781,7 @@
+ # If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+ # generate man pages
+ 
+-GENERATE_MAN           = NO
++GENERATE_MAN           = YES
+ 
+ # The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+ # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+diff -urNad libcommoncpp2-1.3.26~/include/cc++/misc.h libcommoncpp2-1.3.26/include/cc++/misc.h
+--- libcommoncpp2-1.3.26~/include/cc++/misc.h	2006-03-28 16:09:04.000000000 +0100
++++ libcommoncpp2-1.3.26/include/cc++/misc.h	2006-04-12 19:19:25.000000000 +0100
+@@ -343,6 +343,9 @@
+  * @author David Sugar <dyfet at ostel.com>
+  * @short load text configuration files into keyword pairs.
+  */
++
++void endKeysdata(void);
++
+ class __EXPORT Keydata : protected MemPager
+ {
+ public:
+diff -urNad libcommoncpp2-1.3.26~/src/ccgnu2-config.in libcommoncpp2-1.3.26/src/ccgnu2-config.in
+--- libcommoncpp2-1.3.26~/src/ccgnu2-config.in	2005-04-23 23:08:17.000000000 +0100
++++ libcommoncpp2-1.3.26/src/ccgnu2-config.in	2006-04-12 19:19:25.000000000 +0100
+@@ -81,6 +81,9 @@
+ 	--modflags | --module)
+ 		echo $modflags
+ 		;;
++	--help)
++		usage 0
++		;;
+ 	*)
+ 		usage 1 1>&2
+ 		;;




More information about the Pkg-voip-commits mailing list