Hello community, here is the log from the commit of package gconfmm for openSUSE:Factory checked in at Tue Oct 6 01:04:52 CEST 2009. -------- --- GNOME/gconfmm/gconfmm.changes 2009-08-29 11:07:13.000000000 +0200 +++ gconfmm/gconfmm.changes 2009-09-28 17:32:14.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Sep 28 17:29:26 CEST 2009 - vuntz@opensuse.org + +- Update to version 2.28.0: + + Fixed the build with the latest gmmproc. +- Changes from version 2.26.0: + + Cleaned up glib includes to use only toplevel headers. + bgo#564214 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gconfmm-2.24.0.tar.bz2 New: ---- gconfmm-2.28.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconfmm.spec ++++++ --- /var/tmp/diff_new_pack.W7j8Yu/_old 2009-10-06 01:04:31.000000000 +0200 +++ /var/tmp/diff_new_pack.W7j8Yu/_new 2009-10-06 01:04:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gconfmm (Version 2.24.0) +# spec file for package gconfmm (Version 2.28.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,8 +18,8 @@ Name: gconfmm -Version: 2.24.0 -Release: 2 +Version: 2.28.0 +Release: 1 License: LGPL v2.1 or later Summary: C++ Interface for GConf (Part of the GNOME Project) Url: http://www.gtkmm.org/ ++++++ gconfmm-2.24.0.tar.bz2 -> gconfmm-2.28.0.tar.bz2 ++++++ ++++ 66550 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/ChangeLog new/gconfmm-2.28.0/ChangeLog --- old/gconfmm-2.24.0/ChangeLog 2008-09-21 15:33:29.000000000 +0200 +++ new/gconfmm-2.28.0/ChangeLog 2009-09-21 13:01:05.000000000 +0200 @@ -1,3 +1,30 @@ +2.28.0: + +2009-03-27 Murray Cumming <murrayc@murrayc.com> + + * gconf/src/client.ccg: + * gconf/src/value.ccg: Add some static g_conf_*_get_type() functions that + call gconf_*_get_type() to fix the build because gmmproc now guesses the + prefix wrong, because we made it guess other prefixes better. + +2.26.0: + +2009-03-16 Murray Cumming <murrayc@murrayc.com> + + * configure.in: Increased version number to match GNOME 2.26. + +2009-01-24 Deng Xiyue <manphiz@gmail.com> + + * Change license header to mention Lesser General Public License + version 2.1 instead of Library General Public License, to be + consistent with COPYING. + +2008-12-12 Przemysław Grzegorczyk <pgrzegorczyk@gmail.com> + + * gconf/src/client: Cleaned up glib includes to use + only toplevel headers. + Bug #564214 + 2.24.0: 2008-09-21 Murray Cumming <murrayc@murrayc.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/INSTALL new/gconfmm-2.28.0/INSTALL --- old/gconfmm-2.24.0/INSTALL 2008-09-21 12:55:14.000000000 +0200 +++ new/gconfmm-2.28.0/INSTALL 2009-08-05 09:36:07.000000000 +0200 @@ -2,15 +2,15 @@ ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007 Free Software Foundation, Inc. +2006, 2007, 2008, 2009 Free Software Foundation, Inc. -This file is free documentation; the Free Software Foundation gives + This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== -Briefly, the shell commands `./configure; make; make install' should + Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. @@ -73,9 +73,9 @@ Compilers and Options ===================== -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -88,7 +88,7 @@ Compiling For Multiple Architectures ==================================== -You can compile the package for more than one kind of computer at the + You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run @@ -100,10 +100,24 @@ installed the package for one architecture, use `make distclean' before reconfiguring for another architecture. + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + Installation Names ================== -By default, `make install' installs the package's commands under + By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the option `--prefix=PREFIX'. @@ -126,7 +140,7 @@ Optional Features ================= -Some packages pay attention to `--enable-FEATURE' options to + Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -138,14 +152,46 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -153,7 +199,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -171,9 +218,9 @@ Sharing Defaults ================ -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -182,7 +229,7 @@ Defining Variables ================== -Variables not defined in a site shell script can be set in the + Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -201,11 +248,19 @@ `configure' Invocation ====================== -`configure' recognizes the following options to control how it operates. + `configure' recognizes the following options to control how it +operates. `--help' `-h' - Print a summary of the options to `configure', and exit. + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. `--version' `-V' @@ -232,6 +287,16 @@ Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/NEWS new/gconfmm-2.28.0/NEWS --- old/gconfmm-2.24.0/NEWS 2008-09-21 15:33:41.000000000 +0200 +++ new/gconfmm-2.28.0/NEWS 2009-09-21 13:01:40.000000000 +0200 @@ -1,3 +1,13 @@ +2.28.0: + +* Fixed the build with the latest gmmproc. + (Murray Cumming) + +2.26.0: + +* Cleaned up glib includes to use only toplevel headers. + (Przemysław Grzegorczyk) Bug #564214 + 2.24.0: * Updated version to match gnome 2.24. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/configure.in new/gconfmm-2.28.0/configure.in --- old/gconfmm-2.24.0/configure.in 2008-09-21 15:33:48.000000000 +0200 +++ new/gconfmm-2.28.0/configure.in 2009-09-21 13:00:50.000000000 +0200 @@ -17,7 +17,7 @@ # Version and initialization ######################################################################### GCONFMM_MAJOR_VERSION=2 -GCONFMM_MINOR_VERSION=24 +GCONFMM_MINOR_VERSION=28 GCONFMM_MICRO_VERSION=0 # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/docs/reference/Doxyfile new/gconfmm-2.28.0/docs/reference/Doxyfile --- old/gconfmm-2.24.0/docs/reference/Doxyfile 2008-09-21 15:34:15.000000000 +0200 +++ new/gconfmm-2.28.0/docs/reference/Doxyfile 2009-09-21 13:02:26.000000000 +0200 @@ -4,7 +4,7 @@ # General configuration options #--------------------------------------------------------------------------- PROJECT_NAME = gconfmm -PROJECT_NUMBER = 2.24.0 +PROJECT_NUMBER = 2.28.0 OUTPUT_DIRECTORY = OUTPUT_LANGUAGE = English EXTRACT_ALL = YES @@ -53,7 +53,7 @@ #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = /home/murrayc/checkouts/gnome224/gconfmm/gconf/gconfmm/ +INPUT = /home/murrayc/checkouts/gnome/gconfmm/gconf/gconfmm/ FILE_PATTERNS = *.h RECURSIVE = NO EXCLUDE = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/examples/client/main.cc new/gconfmm-2.28.0/examples/client/main.cc --- old/gconfmm-2.24.0/examples/client/main.cc 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/examples/client/main.cc 2009-08-20 12:08:42.000000000 +0200 @@ -5,16 +5,16 @@ * Copyright (C) 2000 gnomemm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/examples/client/window_test.cc new/gconfmm-2.28.0/examples/client/window_test.cc --- old/gconfmm-2.24.0/examples/client/window_test.cc 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/examples/client/window_test.cc 2009-08-20 12:08:42.000000000 +0200 @@ -5,16 +5,16 @@ * Copyright (C) 2000-2003 gnomemm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/examples/client/window_test.h new/gconfmm-2.28.0/examples/client/window_test.h --- old/gconfmm-2.24.0/examples/client/window_test.h 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/examples/client/window_test.h 2009-08-20 12:08:42.000000000 +0200 @@ -5,16 +5,16 @@ * Copyright (C) 2000 GConf-- Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/callback.cc new/gconfmm-2.28.0/gconf/gconfmm/callback.cc --- old/gconfmm-2.24.0/gconf/gconfmm/callback.cc 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/callback.cc 2009-08-20 12:08:42.000000000 +0200 @@ -1,20 +1,20 @@ -// $Id: callback.cc 398 2003-01-28 23:17:29Z murrayc $ +// $Id$ /* callback.cc * * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/callback.h new/gconfmm-2.28.0/gconf/gconfmm/callback.h --- old/gconfmm-2.24.0/gconf/gconfmm/callback.h 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/callback.h 2009-08-20 12:08:42.000000000 +0200 @@ -1,20 +1,20 @@ -// $Id: callback.h 589 2004-02-13 17:26:18Z murrayc $ -*- c++ -*- +// $Id$ -*- c++ -*- /* callback.h * * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/changeset.cc new/gconfmm-2.28.0/gconf/gconfmm/changeset.cc --- old/gconfmm-2.24.0/gconf/gconfmm/changeset.cc 2008-07-01 11:44:40.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/changeset.cc 2009-08-20 12:08:59.000000000 +0200 @@ -12,16 +12,16 @@ * Copyright (C) 2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/changeset.h new/gconfmm-2.28.0/gconf/gconfmm/changeset.h --- old/gconfmm-2.24.0/gconf/gconfmm/changeset.h 2008-07-01 11:44:40.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/changeset.h 2009-08-20 12:08:59.000000000 +0200 @@ -14,16 +14,16 @@ * Copyright (C) 2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/client.cc new/gconfmm-2.28.0/gconf/gconfmm/client.cc --- old/gconfmm-2.24.0/gconf/gconfmm/client.cc 2008-09-03 15:45:36.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/client.cc 2009-08-20 12:08:59.000000000 +0200 @@ -11,28 +11,46 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <glibmm/private/object_p.h> -#include <glib/gerror.h> +#include <glib.h> #include <gconf/gconf-client.h> #include "gconfmm/value.h" namespace { + +//gmmproc guesses the gconf prefix wrongly, so we help it: +inline static GType g_conf_client_error_handling_mode_get_type() +{ + return gconf_client_error_handling_mode_get_type(); +} + +inline static GType g_conf_error_get_type() +{ + return gconf_error_get_type(); +} + +inline static GType g_conf_client_preload_type_get_type() +{ + return gconf_client_preload_type_get_type(); +} + + using namespace Gnome::Conf; class PrimitiveHolder @@ -404,13 +422,13 @@ // static GType Glib::ValueGnome::Conf::ClientErrorHandlingMode::value_type() { - return gconf_client_error_handling_mode_get_type(); + return g_conf_client_error_handling_mode_get_type(); } // static GType Glib::ValueGnome::Conf::ClientPreloadType::value_type() { - return gconf_client_preload_type_get_type(); + return g_conf_client_preload_type_get_type(); } @@ -445,7 +463,7 @@ // static GType Glib::ValueGnome::Conf::Error::Code::value_type() { - return gconf_error_get_type(); + return g_conf_error_get_type(); } @@ -491,6 +509,7 @@ return *this; } + void Client_Class::class_init_function(void* g_class, void* class_data) { BaseClassType *const klass = static_cast<BaseClassType*>(g_class); @@ -663,6 +682,7 @@ Glib::Object((GObject*)(castitem)) {} + Client::~Client() {} @@ -674,6 +694,7 @@ return client_class_.init().get_type(); } + GType Client::get_base_type() { return gconf_client_get_type(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/client.h new/gconfmm-2.28.0/gconf/gconfmm/client.h --- old/gconfmm-2.24.0/gconf/gconfmm/client.h 2008-09-03 15:45:36.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/client.h 2009-08-20 12:08:59.000000000 +0200 @@ -14,16 +14,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -342,6 +342,8 @@ #ifndef DOXYGEN_SHOULD_SKIP_THIS static GType get_type() G_GNUC_CONST; + + static GType get_base_type() G_GNUC_CONST; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/entry.cc new/gconfmm-2.28.0/gconf/gconfmm/entry.cc --- old/gconfmm-2.24.0/gconf/gconfmm/entry.cc 2008-07-01 11:44:40.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/entry.cc 2009-08-20 12:08:59.000000000 +0200 @@ -12,16 +12,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/entry.h new/gconfmm-2.28.0/gconf/gconfmm/entry.h --- old/gconfmm-2.24.0/gconf/gconfmm/entry.h 2008-07-01 11:44:40.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/entry.h 2009-08-20 12:08:59.000000000 +0200 @@ -14,16 +14,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/init.cc new/gconfmm-2.28.0/gconf/gconfmm/init.cc --- old/gconfmm-2.24.0/gconf/gconfmm/init.cc 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/init.cc 2009-08-20 12:08:42.000000000 +0200 @@ -3,16 +3,16 @@ * Copyright (C) 2001 The libgnomeuimm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/init.h new/gconfmm-2.28.0/gconf/gconfmm/init.h --- old/gconfmm-2.24.0/gconf/gconfmm/init.h 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/init.h 2009-08-20 12:08:42.000000000 +0200 @@ -6,16 +6,16 @@ * Copyright (C) 2001 The gconfimm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/private/client_p.h new/gconfmm-2.28.0/gconf/gconfmm/private/client_p.h --- old/gconfmm-2.24.0/gconf/gconfmm/private/client_p.h 2008-07-01 11:44:40.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/private/client_p.h 2009-08-20 12:08:59.000000000 +0200 @@ -27,6 +27,7 @@ const Glib::Class& init(); + static void class_init_function(void* g_class, void* class_data); static Glib::ObjectBase* wrap_new(GObject*); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/schema.h new/gconfmm-2.28.0/gconf/gconfmm/schema.h --- old/gconfmm-2.24.0/gconf/gconfmm/schema.h 2008-07-01 11:44:40.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/schema.h 2009-08-20 12:08:59.000000000 +0200 @@ -14,16 +14,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/setinterface.cc new/gconfmm-2.28.0/gconf/gconfmm/setinterface.cc --- old/gconfmm-2.24.0/gconf/gconfmm/setinterface.cc 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/setinterface.cc 2009-08-20 12:08:42.000000000 +0200 @@ -5,16 +5,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/setinterface.h new/gconfmm-2.28.0/gconf/gconfmm/setinterface.h --- old/gconfmm-2.24.0/gconf/gconfmm/setinterface.h 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/setinterface.h 2009-08-20 12:08:42.000000000 +0200 @@ -5,16 +5,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/value.cc new/gconfmm-2.28.0/gconf/gconfmm/value.cc --- old/gconfmm-2.24.0/gconf/gconfmm/value.cc 2008-09-03 15:45:37.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/value.cc 2009-08-20 12:08:59.000000000 +0200 @@ -12,16 +12,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -29,6 +29,22 @@ #include <gconf/gconf.h> #include "gconfmm/schema.h" +namespace +{ + +//gmmproc guesses the gconf prefix wrongly, so we help it: +inline static GType g_conf_value_type_get_type() +{ + return gconf_value_type_get_type(); +} + +inline static GType g_conf_unset_flags_get_type() +{ + return gconf_unset_flags_get_type(); +} + +} //anonymous namespace + namespace Gnome { @@ -142,13 +158,13 @@ // static GType Glib::ValueGnome::Conf::ValueType::value_type() { - return gconf_value_type_get_type(); + return g_conf_value_type_get_type(); } // static GType Glib::ValueGnome::Conf::UnsetFlags::value_type() { - return gconf_unset_flags_get_type(); + return g_conf_unset_flags_get_type(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/value.h new/gconfmm-2.28.0/gconf/gconfmm/value.h --- old/gconfmm-2.24.0/gconf/gconfmm/value.h 2008-09-03 15:45:37.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/value.h 2009-08-20 12:08:59.000000000 +0200 @@ -14,16 +14,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/value_listhelpers.h new/gconfmm-2.28.0/gconf/gconfmm/value_listhelpers.h --- old/gconfmm-2.24.0/gconf/gconfmm/value_listhelpers.h 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/value_listhelpers.h 2009-08-20 12:08:42.000000000 +0200 @@ -7,16 +7,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm/wrap_init.h new/gconfmm-2.28.0/gconf/gconfmm/wrap_init.h --- old/gconfmm-2.24.0/gconf/gconfmm/wrap_init.h 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm/wrap_init.h 2009-08-20 12:08:42.000000000 +0200 @@ -6,16 +6,16 @@ * Copyright (C) 200-2002 The GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/gconfmm.h new/gconfmm-2.28.0/gconf/gconfmm.h --- old/gconfmm-2.24.0/gconf/gconfmm.h 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/gconfmm.h 2009-08-20 12:08:42.000000000 +0200 @@ -1,19 +1,19 @@ -/* $Id: gconfmm.h 145 2002-02-17 21:04:48Z murrayc $ */ +/* $Id$ */ /* gconfmm - a C++ wrapper for GConf * * Copyright 1999-2001 Free Software Foundation * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/src/changeset.ccg new/gconfmm-2.28.0/gconf/src/changeset.ccg --- old/gconfmm-2.24.0/gconf/src/changeset.ccg 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/src/changeset.ccg 2009-08-20 12:08:42.000000000 +0200 @@ -6,16 +6,16 @@ * Copyright (C) 2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/src/changeset.hg new/gconfmm-2.28.0/gconf/src/changeset.hg --- old/gconfmm-2.24.0/gconf/src/changeset.hg 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/src/changeset.hg 2009-08-20 12:08:42.000000000 +0200 @@ -6,16 +6,16 @@ * Copyright (C) 2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/src/client.ccg new/gconfmm-2.28.0/gconf/src/client.ccg --- old/gconfmm-2.24.0/gconf/src/client.ccg 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/src/client.ccg 2009-08-20 12:08:42.000000000 +0200 @@ -5,28 +5,47 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <glibmm/private/object_p.h> -#include <glib/gerror.h> +#include <glib.h> #include <gconf/gconf-client.h> #include "gconfmm/value.h" namespace { + +//gmmproc guesses the gconf prefix wrongly, so we help it: +inline static GType g_conf_client_error_handling_mode_get_type() +{ + return gconf_client_error_handling_mode_get_type(); +} + +inline static GType g_conf_error_get_type() +{ + return gconf_error_get_type(); +} + +inline static GType g_conf_client_preload_type_get_type() +{ + return gconf_client_preload_type_get_type(); +} + + + using namespace Gnome::Conf; class PrimitiveHolder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/src/client.hg new/gconfmm-2.28.0/gconf/src/client.hg --- old/gconfmm-2.24.0/gconf/src/client.hg 2008-09-03 15:45:25.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/src/client.hg 2009-08-20 12:08:42.000000000 +0200 @@ -6,16 +6,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/src/entry.ccg new/gconfmm-2.28.0/gconf/src/entry.ccg --- old/gconfmm-2.24.0/gconf/src/entry.ccg 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/src/entry.ccg 2009-08-20 12:08:42.000000000 +0200 @@ -6,16 +6,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/src/entry.hg new/gconfmm-2.28.0/gconf/src/entry.hg --- old/gconfmm-2.24.0/gconf/src/entry.hg 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/src/entry.hg 2009-08-20 12:08:42.000000000 +0200 @@ -6,16 +6,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/src/schema.hg new/gconfmm-2.28.0/gconf/src/schema.hg --- old/gconfmm-2.24.0/gconf/src/schema.hg 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/src/schema.hg 2009-08-20 12:08:42.000000000 +0200 @@ -6,16 +6,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/src/value.ccg new/gconfmm-2.28.0/gconf/src/value.ccg --- old/gconfmm-2.24.0/gconf/src/value.ccg 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/src/value.ccg 2009-08-20 12:08:42.000000000 +0200 @@ -6,16 +6,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -23,6 +23,22 @@ #include <gconf/gconf.h> #include "gconfmm/schema.h" +namespace +{ + +//gmmproc guesses the gconf prefix wrongly, so we help it: +inline static GType g_conf_value_type_get_type() +{ + return gconf_value_type_get_type(); +} + +inline static GType g_conf_unset_flags_get_type() +{ + return gconf_unset_flags_get_type(); +} + +} //anonymous namespace + namespace Gnome { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/gconf/src/value.hg new/gconfmm-2.28.0/gconf/src/value.hg --- old/gconfmm-2.24.0/gconf/src/value.hg 2008-09-03 15:45:25.000000000 +0200 +++ new/gconfmm-2.28.0/gconf/src/value.hg 2009-08-20 12:08:42.000000000 +0200 @@ -6,16 +6,16 @@ * Copyright (C) 2000-2002 GConfmm Development Team * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/scripts/missing new/gconfmm-2.28.0/scripts/missing --- old/gconfmm-2.24.0/scripts/missing 2008-09-21 12:55:14.000000000 +0200 +++ new/gconfmm-2.28.0/scripts/missing 2009-08-05 09:36:07.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create `y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + Send bug reports to <bug-automake@gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: `tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: `$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/tools/extra_defs_gen/generate_defs_gconf.cc new/gconfmm-2.28.0/tools/extra_defs_gen/generate_defs_gconf.cc --- old/gconfmm-2.24.0/tools/extra_defs_gen/generate_defs_gconf.cc 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/tools/extra_defs_gen/generate_defs_gconf.cc 2009-08-20 12:08:42.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Id: generate_defs_gconf.cc 508 2003-11-03 09:38:58Z murrayc $ */ +/* $Id$ */ /* generate_defs_libgnomecanvas.h * @@ -12,9 +12,9 @@ * 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. + * General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gconfmm-2.24.0/tools/m4/convert.m4 new/gconfmm-2.28.0/tools/m4/convert.m4 --- old/gconfmm-2.24.0/tools/m4/convert.m4 2008-07-01 11:44:29.000000000 +0200 +++ new/gconfmm-2.28.0/tools/m4/convert.m4 2009-08-20 12:08:42.000000000 +0200 @@ -1,4 +1,4 @@ -dnl $Id: convert.m4 135 2002-01-28 14:36:20Z cactus $ +dnl $Id$ # Override of the file of the same name in gtkmm. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org