-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
gconfmm2.0 (2.0.2-1.1) unstable; urgency=high
* Non-maintainer upload.
* GCC 4.0 transition (Closes: #286496, #317690)
-- Luk Claes <[EMAIL PROTECTED]> Fri, 5 Aug 2005 13:54:34 +0200
Patch attached.
Cheers
Luk
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC814O5UTeB5t8Mo0RAiP+AJ43JkfR5Sa2+afr7H+s2WiH6+bhwQCbBDMG
CfTGpSHCEmx41xOdvyEtzFs=
=5EGq
-----END PGP SIGNATURE-----
diff -u gconfmm2.0-2.0.2/scripts/config.guess
gconfmm2.0-2.0.2/scripts/config.guess
--- gconfmm2.0-2.0.2/scripts/config.guess
+++ gconfmm2.0-2.0.2/scripts/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-08-13'
+timestamp='2005-04-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
@@ -53,7 +53,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
@@ -319,6 +319,9 @@
*:OS/390:*:*)
echo i370-ibm-openedition
exit 0 ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit 0 ;;
*:OS400:*:*)
echo powerpc-ibm-os400
exit 0 ;;
@@ -342,7 +345,7 @@
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
exit 0 ;;
- DRS?6000:UNIX_SV:4.2*:7*)
+ 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 ;;
esac ;;
@@ -801,6 +804,9 @@
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit 0 ;;
+ amd64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit 0 ;;
@@ -824,6 +830,12 @@
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit 0 ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
+ exit 0 ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit 0 ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
@@ -1128,6 +1140,10 @@
# From [EMAIL PROTECTED]
echo i860-stratus-sysv4
exit 0 ;;
+ i*86:VOS:*:*)
+ # From [EMAIL PROTECTED]
+ echo ${UNAME_MACHINE}-stratus-vos
+ exit 0 ;;
*:VOS:*:*)
# From [EMAIL PROTECTED]
echo hppa1.1-stratus-vos
@@ -1188,6 +1204,9 @@
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
@@ -1241,7 +1260,10 @@
A*) echo alpha-dec-vms && exit 0 ;;
I*) echo ia64-dec-vms && exit 0 ;;
V*) echo vax-dec-vms && exit 0 ;;
- esac
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
+ exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1401,7 +1423,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- ftp://ftp.gnu.org/pub/gnu/config/
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
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 gconfmm2.0-2.0.2/scripts/config.sub gconfmm2.0-2.0.2/scripts/config.sub
--- gconfmm2.0-2.0.2/scripts/config.sub
+++ gconfmm2.0-2.0.2/scripts/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-06-24'
+timestamp='2005-04-22'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,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
@@ -231,13 +231,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 | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -262,12 +263,13 @@
| pyramid \
| sh | sh[1234] | 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 \
| we32k \
- | x86 | xscale | xstormy16 | xtensa \
+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -298,7 +300,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-* \
| d10v-* | d30v-* | dlx-* \
@@ -310,7 +312,7 @@
| ip2k-* | iq2000-* \
| m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -336,15 +338,16 @@
| romp-* | rs6000-* \
| sh-* | sh[1234]-* | 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-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
- | xtensa-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
@@ -457,6 +460,9 @@
crds | unos)
basic_machine=m68k-crds
;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
@@ -486,6 +492,10 @@
basic_machine=m88k-motorola
os=-sysv3
;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
@@ -1026,6 +1036,10 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
+ ;;
xps | xps100)
basic_machine=xps100-honeywell
;;
@@ -1294,6 +1308,9 @@
-kaos*)
os=-kaos
;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
-none)
;;
*)
diff -u gconfmm2.0-2.0.2/debian/changelog gconfmm2.0-2.0.2/debian/changelog
--- gconfmm2.0-2.0.2/debian/changelog
+++ gconfmm2.0-2.0.2/debian/changelog
@@ -1,3 +1,10 @@
+gconfmm2.0 (2.0.2-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * GCC 4.0 transition (Closes: #286496, #317690)
+
+ -- Luk Claes <[EMAIL PROTECTED]> Fri, 5 Aug 2005 13:54:34 +0200
+
gconfmm2.0 (2.0.2-1) unstable; urgency=low
* New upstream release
diff -u gconfmm2.0-2.0.2/debian/control gconfmm2.0-2.0.2/debian/control
--- gconfmm2.0-2.0.2/debian/control
+++ gconfmm2.0-2.0.2/debian/control
@@ -8,7 +8,7 @@
Package: libgconfmm2.0-dev
Section: libdevel
Architecture: any
-Depends: libgconfmm2.0-1c102 (= ${Source-Version}), libgtkmm2.0-dev (>=
2.2.0-1), libgconf2-dev (>= 1.1.8)
+Depends: libgconfmm-2.0-1 (= ${Source-Version}), libgtkmm2.0-dev (>= 2.2.0-1),
libgconf2-dev (>= 1.1.8)
Suggests: libgtkmm2.0-doc, libgnomemm1.3-dev
Conflicts: libgconfmm1.3-dev
Description: C++ wrappers for GConf2 (development files)
@@ -16,12 +16,12 @@
the C++ wrapper for GConf.
This package contains development files and examples.
-Package: libgconfmm2.0-1c102
+Package: libgconfmm-2.0-1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libgconfmm2.0-1
-Replaces: libgconfmm2.0-1
+Conflicts: libgconfmm2.0-1c102
+Replaces: libgconfmm2.0-1c102
Description: C++ wrappers for GConf2 (shared library)
GConf is a system for storing application preferences. gconfmm is
the C++ wrapper for GConf.
diff -u gconfmm2.0-2.0.2/debian/rules gconfmm2.0-2.0.2/debian/rules
--- gconfmm2.0-2.0.2/debian/rules
+++ gconfmm2.0-2.0.2/debian/rules
@@ -33,7 +33,7 @@
debname=$(libname)$(release)
-p_libs = $(debname)-$(major)c102
+p_libs = $(libname)-$(release)-$(major)
p_devs = $(debname)-dev
p_docs = $(debname)-dev
only in patch2:
unchanged:
--- gconfmm2.0-2.0.2.orig/gconf/gconfmm/client.cc
+++ gconfmm2.0-2.0.2/gconf/gconfmm/client.cc
@@ -182,10 +182,10 @@
switch(list_type)
{
case GCONF_VALUE_INT:
- gconf_value_set_int(v,(int)i->data);
+ gconf_value_set_int(v,GPOINTER_TO_INT(i->data));
break;
case GCONF_VALUE_BOOL:
- gconf_value_set_bool(v,(gboolean)i->data);
+ gconf_value_set_bool(v,i->data!=0);
break;
case GCONF_VALUE_FLOAT:
gconf_value_set_float(v,*(gdouble*)i->data);
