r14548 - in /desktop/experimental/glibmm2.4/debian: changelog compat control control.in copyright patches/70_relibtoolize.patch rules watch
manphiz-guest at users.alioth.debian.org
manphiz-guest at users.alioth.debian.org
Wed Feb 13 07:25:14 UTC 2008
Author: manphiz-guest
Date: Wed Feb 13 07:25:14 2008
New Revision: 14548
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14548
Log:
* Bump libglib2.0-dev dependency to version 2.15.5.
* Bump shlibs version to 2.15.5
* Add check-dist.mk from gnome-pkg-tools to prevent uploading to wrong
place.
* Drop 10_gcc4.3_include_fix.patch, merged upstream.
* Refine watch file to check for number based version, and adjust to
check for development releases.
* Correct copyright holders, and correct license pointer to
/usr/share/common-licenses/LGPL-2.1.
* Bump compat level to 6, let debhelper >= 6 accordingly, and make
cdbs >= 0.4.51 to workaround empty -dbg problem.
* Drop -1 postfix in version dependencies as per lintian.
* Regenerate 70_relibtoolize.patch for new version.
Modified:
desktop/experimental/glibmm2.4/debian/changelog
desktop/experimental/glibmm2.4/debian/compat
desktop/experimental/glibmm2.4/debian/control
desktop/experimental/glibmm2.4/debian/control.in
desktop/experimental/glibmm2.4/debian/copyright
desktop/experimental/glibmm2.4/debian/patches/70_relibtoolize.patch
desktop/experimental/glibmm2.4/debian/rules
desktop/experimental/glibmm2.4/debian/watch
Modified: desktop/experimental/glibmm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glibmm2.4/debian/changelog?rev=14548&op=diff
==============================================================================
--- desktop/experimental/glibmm2.4/debian/changelog (original)
+++ desktop/experimental/glibmm2.4/debian/changelog Wed Feb 13 07:25:14 2008
@@ -2,18 +2,21 @@
* New upstream development release.
* Branched for experimental from unstable.
- * debian/control{,.in}
- + Bump libglib2.0-dev dependency to version 2.15.3
- * debian/rules
- + Bump shlibs version to 2.15.3
- + Add check-dist.mk from gnome-pkg-tools to prevent uploading to wrong
- place.
- * debian/patches
- + Drop 10_gcc4.3_include_fix.patch, merged upstream.
- * debian/watch
- + Refined to stricter version check.
-
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Sat, 09 Feb 2008 00:24:36 +0800
+ * Bump libglib2.0-dev dependency to version 2.15.5.
+ * Bump shlibs version to 2.15.5
+ * Add check-dist.mk from gnome-pkg-tools to prevent uploading to wrong
+ place.
+ * Drop 10_gcc4.3_include_fix.patch, merged upstream.
+ * Refine watch file to check for number based version, and adjust to
+ check for development releases.
+ * Correct copyright holders, and correct license pointer to
+ /usr/share/common-licenses/LGPL-2.1.
+ * Bump compat level to 6, let debhelper >= 6 accordingly, and make
+ cdbs >= 0.4.51 to workaround empty -dbg problem.
+ * Drop -1 postfix in version dependencies as per lintian.
+ * Regenerate 70_relibtoolize.patch for new version.
+
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Wed, 13 Feb 2008 14:56:44 +0800
glibmm2.4 (2.14.2-4) unstable; urgency=low
Modified: desktop/experimental/glibmm2.4/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glibmm2.4/debian/compat?rev=14548&op=diff
==============================================================================
--- desktop/experimental/glibmm2.4/debian/compat (original)
+++ desktop/experimental/glibmm2.4/debian/compat Wed Feb 13 07:25:14 2008
@@ -1,1 +1,1 @@
-5
+6
Modified: desktop/experimental/glibmm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glibmm2.4/debian/control?rev=14548&op=diff
==============================================================================
--- desktop/experimental/glibmm2.4/debian/control (original)
+++ desktop/experimental/glibmm2.4/debian/control Wed Feb 13 07:25:14 2008
@@ -6,12 +6,12 @@
Homepage: http://www.gtkmm.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glibmm2.4
-Build-Depends: cdbs (>= 0.4.41),
- debhelper (>= 5),
+Build-Depends: cdbs (>= 0.4.51),
+ debhelper (>= 6),
doc-base,
gnome-pkg-tools (>= 0.11),
- libglib2.0-dev (>= 2.15.0),
- libsigc++-2.0-dev (>= 2.0.17-1),
+ libglib2.0-dev (>= 2.15.5),
+ libsigc++-2.0-dev (>= 2.0.17),
pkg-config
Standards-Version: 3.7.3
@@ -34,7 +34,7 @@
Architecture: any
Depends: ${misc:Depends},
libglibmm-2.4-1c2a (= ${binary:Version}),
- libglib2.0-dev (>= 2.15.1),
+ libglib2.0-dev (>= 2.14.1),
libsigc++-2.0-dev (>= 2.0.17-1),
pkg-config
Suggests: libglibmm-2.4-doc, libgtkmm-2.4-dev (>= 2.12.1)
Modified: desktop/experimental/glibmm2.4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glibmm2.4/debian/control.in?rev=14548&op=diff
==============================================================================
--- desktop/experimental/glibmm2.4/debian/control.in (original)
+++ desktop/experimental/glibmm2.4/debian/control.in Wed Feb 13 07:25:14 2008
@@ -6,12 +6,12 @@
Homepage: http://www.gtkmm.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glibmm2.4
-Build-Depends: cdbs (>= 0.4.41),
- debhelper (>= 5),
+Build-Depends: cdbs (>= 0.4.51),
+ debhelper (>= 6),
doc-base,
gnome-pkg-tools (>= 0.11),
- libglib2.0-dev (>= 2.15.0),
- libsigc++-2.0-dev (>= 2.0.17-1),
+ libglib2.0-dev (>= 2.15.5),
+ libsigc++-2.0-dev (>= 2.0.17),
pkg-config
Standards-Version: 3.7.3
@@ -34,7 +34,7 @@
Architecture: any
Depends: ${misc:Depends},
libglibmm-2.4-1c2a (= ${binary:Version}),
- libglib2.0-dev (>= 2.15.1),
+ libglib2.0-dev (>= 2.14.1),
libsigc++-2.0-dev (>= 2.0.17-1),
pkg-config
Suggests: libglibmm-2.4-doc, libgtkmm-2.4-dev (>= 2.12.1)
Modified: desktop/experimental/glibmm2.4/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glibmm2.4/debian/copyright?rev=14548&op=diff
==============================================================================
--- desktop/experimental/glibmm2.4/debian/copyright (original)
+++ desktop/experimental/glibmm2.4/debian/copyright Wed Feb 13 07:25:14 2008
@@ -8,7 +8,9 @@
Copyright:
- * Copyright 2002 The gtkmm Development Team
+
+ * Copyright (C) 1998-2002, 2006 The gtkmm Development Team
+ * Copyright (C) 2002-2004 The glibmm Development Team
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -26,4 +28,4 @@
* MA 02110-1301, USA
On Debian GNU/Linux systems, the complete text of the GNU Library General
-Public License can be found in /usr/share/common-licenses/LGPL file.
+Public License can be found in /usr/share/common-licenses/LGPL-2.1 file.
Modified: desktop/experimental/glibmm2.4/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glibmm2.4/debian/patches/70_relibtoolize.patch?rev=14548&op=diff
==============================================================================
--- desktop/experimental/glibmm2.4/debian/patches/70_relibtoolize.patch (original)
+++ desktop/experimental/glibmm2.4/debian/patches/70_relibtoolize.patch Wed Feb 13 07:25:14 2008
@@ -1,6 +1,6 @@
-diff -urN glibmm-2.15.4.orig/aclocal.m4 glibmm-2.15.4/aclocal.m4
---- glibmm-2.15.4.orig/aclocal.m4 2008-02-08 23:08:11.000000000 +0800
-+++ glibmm-2.15.4/aclocal.m4 2008-02-09 00:22:31.000000000 +0800
+diff -urN glibmm-2.15.5.orig/aclocal.m4 glibmm-2.15.5/aclocal.m4
+--- glibmm-2.15.5.orig/aclocal.m4 2008-02-12 20:08:05.000000000 +0800
++++ glibmm-2.15.5/aclocal.m4 2008-02-13 15:22:53.000000000 +0800
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -13243,9 +13243,9 @@
m4_include([scripts/c_std.m4])
m4_include([scripts/cxx.m4])
-diff -urN glibmm-2.15.4.orig/config.h.in glibmm-2.15.4/config.h.in
---- glibmm-2.15.4.orig/config.h.in 2008-02-08 23:08:41.000000000 +0800
-+++ glibmm-2.15.4/config.h.in 2008-02-09 00:22:37.000000000 +0800
+diff -urN glibmm-2.15.5.orig/config.h.in glibmm-2.15.5/config.h.in
+--- glibmm-2.15.5.orig/config.h.in 2008-02-12 20:08:50.000000000 +0800
++++ glibmm-2.15.5/config.h.in 2008-02-13 15:22:56.000000000 +0800
@@ -1,6 +1,141 @@
+/* config.h.in. Generated from configure.in by autoheader. */
@@ -13389,9 +13389,9 @@
+
+/* Version number of package */
+#undef VERSION
-diff -urN glibmm-2.15.4.orig/configure glibmm-2.15.4/configure
---- glibmm-2.15.4.orig/configure 2008-02-08 23:08:19.000000000 +0800
-+++ glibmm-2.15.4/configure 2008-02-09 00:22:34.000000000 +0800
+diff -urN glibmm-2.15.5.orig/configure glibmm-2.15.5/configure
+--- glibmm-2.15.5.orig/configure 2008-02-12 20:08:15.000000000 +0800
++++ glibmm-2.15.5/configure 2008-02-13 15:23:01.000000000 +0800
@@ -866,12 +866,15 @@
PLATFORM_WIN32_FALSE
OS_WIN32_TRUE
@@ -17418,9 +17418,9 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-diff -urN glibmm-2.15.4.orig/docs/images/Makefile.in glibmm-2.15.4/docs/images/Makefile.in
---- glibmm-2.15.4.orig/docs/images/Makefile.in 2008-02-08 23:08:15.000000000 +0800
-+++ glibmm-2.15.4/docs/images/Makefile.in 2008-02-09 00:22:41.000000000 +0800
+diff -urN glibmm-2.15.5.orig/docs/images/Makefile.in glibmm-2.15.5/docs/images/Makefile.in
+--- glibmm-2.15.5.orig/docs/images/Makefile.in 2008-02-12 20:08:11.000000000 +0800
++++ glibmm-2.15.5/docs/images/Makefile.in 2008-02-13 15:22:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17456,9 +17456,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/docs/internal/Makefile.in glibmm-2.15.4/docs/internal/Makefile.in
---- glibmm-2.15.4.orig/docs/internal/Makefile.in 2008-02-08 23:08:15.000000000 +0800
-+++ glibmm-2.15.4/docs/internal/Makefile.in 2008-02-09 00:22:41.000000000 +0800
+diff -urN glibmm-2.15.5.orig/docs/internal/Makefile.in glibmm-2.15.5/docs/internal/Makefile.in
+--- glibmm-2.15.5.orig/docs/internal/Makefile.in 2008-02-12 20:08:11.000000000 +0800
++++ glibmm-2.15.5/docs/internal/Makefile.in 2008-02-13 15:22:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17494,9 +17494,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/docs/Makefile.in glibmm-2.15.4/docs/Makefile.in
---- glibmm-2.15.4.orig/docs/Makefile.in 2008-02-08 23:08:14.000000000 +0800
-+++ glibmm-2.15.4/docs/Makefile.in 2008-02-09 00:22:41.000000000 +0800
+diff -urN glibmm-2.15.5.orig/docs/Makefile.in glibmm-2.15.5/docs/Makefile.in
+--- glibmm-2.15.5.orig/docs/Makefile.in 2008-02-12 20:08:10.000000000 +0800
++++ glibmm-2.15.5/docs/Makefile.in 2008-02-13 15:22:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17570,9 +17570,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/docs/reference/Makefile.in glibmm-2.15.4/docs/reference/Makefile.in
---- glibmm-2.15.4.orig/docs/reference/Makefile.in 2008-02-08 23:08:15.000000000 +0800
-+++ glibmm-2.15.4/docs/reference/Makefile.in 2008-02-09 00:22:41.000000000 +0800
+diff -urN glibmm-2.15.5.orig/docs/reference/Makefile.in glibmm-2.15.5/docs/reference/Makefile.in
+--- glibmm-2.15.5.orig/docs/reference/Makefile.in 2008-02-12 20:08:11.000000000 +0800
++++ glibmm-2.15.5/docs/reference/Makefile.in 2008-02-13 15:22:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17608,9 +17608,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/examples/child_watch/Makefile.in glibmm-2.15.4/examples/child_watch/Makefile.in
---- glibmm-2.15.4.orig/examples/child_watch/Makefile.in 2008-02-08 23:08:15.000000000 +0800
-+++ glibmm-2.15.4/examples/child_watch/Makefile.in 2008-02-09 00:22:41.000000000 +0800
+diff -urN glibmm-2.15.5.orig/examples/child_watch/Makefile.in glibmm-2.15.5/examples/child_watch/Makefile.in
+--- glibmm-2.15.5.orig/examples/child_watch/Makefile.in 2008-02-12 20:08:11.000000000 +0800
++++ glibmm-2.15.5/examples/child_watch/Makefile.in 2008-02-13 15:22:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17684,9 +17684,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/examples/compose/Makefile.in glibmm-2.15.4/examples/compose/Makefile.in
---- glibmm-2.15.4.orig/examples/compose/Makefile.in 2008-02-08 23:08:15.000000000 +0800
-+++ glibmm-2.15.4/examples/compose/Makefile.in 2008-02-09 00:22:41.000000000 +0800
+diff -urN glibmm-2.15.5.orig/examples/compose/Makefile.in glibmm-2.15.5/examples/compose/Makefile.in
+--- glibmm-2.15.5.orig/examples/compose/Makefile.in 2008-02-12 20:08:11.000000000 +0800
++++ glibmm-2.15.5/examples/compose/Makefile.in 2008-02-13 15:22:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17760,9 +17760,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/examples/iochannel_stream/Makefile.in glibmm-2.15.4/examples/iochannel_stream/Makefile.in
---- glibmm-2.15.4.orig/examples/iochannel_stream/Makefile.in 2008-02-08 23:08:15.000000000 +0800
-+++ glibmm-2.15.4/examples/iochannel_stream/Makefile.in 2008-02-09 00:22:41.000000000 +0800
+diff -urN glibmm-2.15.5.orig/examples/iochannel_stream/Makefile.in glibmm-2.15.5/examples/iochannel_stream/Makefile.in
+--- glibmm-2.15.5.orig/examples/iochannel_stream/Makefile.in 2008-02-12 20:08:11.000000000 +0800
++++ glibmm-2.15.5/examples/iochannel_stream/Makefile.in 2008-02-13 15:22:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17836,9 +17836,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/examples/Makefile.in glibmm-2.15.4/examples/Makefile.in
---- glibmm-2.15.4.orig/examples/Makefile.in 2008-02-08 23:08:15.000000000 +0800
-+++ glibmm-2.15.4/examples/Makefile.in 2008-02-09 00:22:41.000000000 +0800
+diff -urN glibmm-2.15.5.orig/examples/Makefile.in glibmm-2.15.5/examples/Makefile.in
+--- glibmm-2.15.5.orig/examples/Makefile.in 2008-02-12 20:08:11.000000000 +0800
++++ glibmm-2.15.5/examples/Makefile.in 2008-02-13 15:22:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17912,9 +17912,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/examples/markup/Makefile.in glibmm-2.15.4/examples/markup/Makefile.in
---- glibmm-2.15.4.orig/examples/markup/Makefile.in 2008-02-08 23:08:15.000000000 +0800
-+++ glibmm-2.15.4/examples/markup/Makefile.in 2008-02-09 00:22:42.000000000 +0800
+diff -urN glibmm-2.15.5.orig/examples/markup/Makefile.in glibmm-2.15.5/examples/markup/Makefile.in
+--- glibmm-2.15.5.orig/examples/markup/Makefile.in 2008-02-12 20:08:11.000000000 +0800
++++ glibmm-2.15.5/examples/markup/Makefile.in 2008-02-13 15:22:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17988,9 +17988,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/examples/options/Makefile.in glibmm-2.15.4/examples/options/Makefile.in
---- glibmm-2.15.4.orig/examples/options/Makefile.in 2008-02-08 23:08:15.000000000 +0800
-+++ glibmm-2.15.4/examples/options/Makefile.in 2008-02-09 00:22:42.000000000 +0800
+diff -urN glibmm-2.15.5.orig/examples/options/Makefile.in glibmm-2.15.5/examples/options/Makefile.in
+--- glibmm-2.15.5.orig/examples/options/Makefile.in 2008-02-12 20:08:11.000000000 +0800
++++ glibmm-2.15.5/examples/options/Makefile.in 2008-02-13 15:22:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18064,9 +18064,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/examples/regex/Makefile.in glibmm-2.15.4/examples/regex/Makefile.in
---- glibmm-2.15.4.orig/examples/regex/Makefile.in 2008-02-08 23:08:16.000000000 +0800
-+++ glibmm-2.15.4/examples/regex/Makefile.in 2008-02-09 00:22:42.000000000 +0800
+diff -urN glibmm-2.15.5.orig/examples/regex/Makefile.in glibmm-2.15.5/examples/regex/Makefile.in
+--- glibmm-2.15.5.orig/examples/regex/Makefile.in 2008-02-12 20:08:12.000000000 +0800
++++ glibmm-2.15.5/examples/regex/Makefile.in 2008-02-13 15:22:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18140,9 +18140,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/examples/thread/Makefile.in glibmm-2.15.4/examples/thread/Makefile.in
---- glibmm-2.15.4.orig/examples/thread/Makefile.in 2008-02-08 23:08:16.000000000 +0800
-+++ glibmm-2.15.4/examples/thread/Makefile.in 2008-02-09 00:22:42.000000000 +0800
+diff -urN glibmm-2.15.5.orig/examples/thread/Makefile.in glibmm-2.15.5/examples/thread/Makefile.in
+--- glibmm-2.15.5.orig/examples/thread/Makefile.in 2008-02-12 20:08:12.000000000 +0800
++++ glibmm-2.15.5/examples/thread/Makefile.in 2008-02-13 15:22:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18216,9 +18216,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/gio/giomm/Makefile.in glibmm-2.15.4/gio/giomm/Makefile.in
---- glibmm-2.15.4.orig/gio/giomm/Makefile.in 2008-02-08 23:08:16.000000000 +0800
-+++ glibmm-2.15.4/gio/giomm/Makefile.in 2008-02-09 00:22:42.000000000 +0800
+diff -urN glibmm-2.15.5.orig/gio/giomm/Makefile.in glibmm-2.15.5/gio/giomm/Makefile.in
+--- glibmm-2.15.5.orig/gio/giomm/Makefile.in 2008-02-12 20:08:12.000000000 +0800
++++ glibmm-2.15.5/gio/giomm/Makefile.in 2008-02-13 15:22:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18230,7 +18230,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -157,6 +157,7 @@
+@@ -156,6 +156,7 @@
DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
DLLTOOL = @DLLTOOL@
@@ -18238,7 +18238,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -195,6 +196,7 @@
+@@ -194,6 +195,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -18246,7 +18246,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
-@@ -207,6 +209,7 @@
+@@ -206,6 +208,7 @@
PERL_PATH = @PERL_PATH@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -18254,7 +18254,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -401,8 +404,8 @@
+@@ -400,8 +403,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
@@ -18265,7 +18265,7 @@
else :; fi; \
done
-@@ -410,8 +413,8 @@
+@@ -409,8 +412,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
@@ -18276,7 +18276,7 @@
done
clean-libLTLIBRARIES:
-@@ -592,8 +595,8 @@
+@@ -590,8 +593,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18287,7 +18287,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -618,8 +621,8 @@
+@@ -616,8 +619,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18298,7 +18298,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -629,13 +632,12 @@
+@@ -627,13 +630,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -18314,9 +18314,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/gio/giomm/private/Makefile.in glibmm-2.15.4/gio/giomm/private/Makefile.in
---- glibmm-2.15.4.orig/gio/giomm/private/Makefile.in 2008-02-08 23:08:16.000000000 +0800
-+++ glibmm-2.15.4/gio/giomm/private/Makefile.in 2008-02-09 00:22:42.000000000 +0800
+diff -urN glibmm-2.15.5.orig/gio/giomm/private/Makefile.in glibmm-2.15.5/gio/giomm/private/Makefile.in
+--- glibmm-2.15.5.orig/gio/giomm/private/Makefile.in 2008-02-12 20:08:12.000000000 +0800
++++ glibmm-2.15.5/gio/giomm/private/Makefile.in 2008-02-13 15:22:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18390,9 +18390,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/gio/Makefile.in glibmm-2.15.4/gio/Makefile.in
---- glibmm-2.15.4.orig/gio/Makefile.in 2008-02-08 23:08:16.000000000 +0800
-+++ glibmm-2.15.4/gio/Makefile.in 2008-02-09 00:22:42.000000000 +0800
+diff -urN glibmm-2.15.5.orig/gio/Makefile.in glibmm-2.15.5/gio/Makefile.in
+--- glibmm-2.15.5.orig/gio/Makefile.in 2008-02-12 20:08:12.000000000 +0800
++++ glibmm-2.15.5/gio/Makefile.in 2008-02-13 15:22:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18466,9 +18466,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/gio/src/Makefile.in glibmm-2.15.4/gio/src/Makefile.in
---- glibmm-2.15.4.orig/gio/src/Makefile.in 2008-02-08 23:08:16.000000000 +0800
-+++ glibmm-2.15.4/gio/src/Makefile.in 2008-02-09 00:22:42.000000000 +0800
+diff -urN glibmm-2.15.5.orig/gio/src/Makefile.in glibmm-2.15.5/gio/src/Makefile.in
+--- glibmm-2.15.5.orig/gio/src/Makefile.in 2008-02-12 20:08:12.000000000 +0800
++++ glibmm-2.15.5/gio/src/Makefile.in 2008-02-13 15:22:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18504,9 +18504,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/glib/glibmm/Makefile.in glibmm-2.15.4/glib/glibmm/Makefile.in
---- glibmm-2.15.4.orig/glib/glibmm/Makefile.in 2008-02-08 23:08:17.000000000 +0800
-+++ glibmm-2.15.4/glib/glibmm/Makefile.in 2008-02-09 00:22:43.000000000 +0800
+diff -urN glibmm-2.15.5.orig/glib/glibmm/Makefile.in glibmm-2.15.5/glib/glibmm/Makefile.in
+--- glibmm-2.15.5.orig/glib/glibmm/Makefile.in 2008-02-12 20:08:13.000000000 +0800
++++ glibmm-2.15.5/glib/glibmm/Makefile.in 2008-02-13 15:22:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18542,7 +18542,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -407,8 +410,8 @@
+@@ -408,8 +411,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
@@ -18553,7 +18553,7 @@
else :; fi; \
done
-@@ -416,8 +419,8 @@
+@@ -417,8 +420,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
@@ -18564,7 +18564,7 @@
done
clean-libLTLIBRARIES:
-@@ -607,8 +610,8 @@
+@@ -608,8 +611,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18575,7 +18575,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -633,8 +636,8 @@
+@@ -634,8 +637,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18586,7 +18586,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -644,13 +647,12 @@
+@@ -645,13 +648,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -18602,9 +18602,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/glib/glibmm/private/Makefile.in glibmm-2.15.4/glib/glibmm/private/Makefile.in
---- glibmm-2.15.4.orig/glib/glibmm/private/Makefile.in 2008-02-08 23:08:17.000000000 +0800
-+++ glibmm-2.15.4/glib/glibmm/private/Makefile.in 2008-02-09 00:22:43.000000000 +0800
+diff -urN glibmm-2.15.5.orig/glib/glibmm/private/Makefile.in glibmm-2.15.5/glib/glibmm/private/Makefile.in
+--- glibmm-2.15.5.orig/glib/glibmm/private/Makefile.in 2008-02-12 20:08:13.000000000 +0800
++++ glibmm-2.15.5/glib/glibmm/private/Makefile.in 2008-02-13 15:22:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18678,9 +18678,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/glib/Makefile.in glibmm-2.15.4/glib/Makefile.in
---- glibmm-2.15.4.orig/glib/Makefile.in 2008-02-08 23:08:16.000000000 +0800
-+++ glibmm-2.15.4/glib/Makefile.in 2008-02-09 00:22:42.000000000 +0800
+diff -urN glibmm-2.15.5.orig/glib/Makefile.in glibmm-2.15.5/glib/Makefile.in
+--- glibmm-2.15.5.orig/glib/Makefile.in 2008-02-12 20:08:13.000000000 +0800
++++ glibmm-2.15.5/glib/Makefile.in 2008-02-13 15:22:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18754,9 +18754,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/glib/src/Makefile.in glibmm-2.15.4/glib/src/Makefile.in
---- glibmm-2.15.4.orig/glib/src/Makefile.in 2008-02-08 23:08:17.000000000 +0800
-+++ glibmm-2.15.4/glib/src/Makefile.in 2008-02-09 00:22:43.000000000 +0800
+diff -urN glibmm-2.15.5.orig/glib/src/Makefile.in glibmm-2.15.5/glib/src/Makefile.in
+--- glibmm-2.15.5.orig/glib/src/Makefile.in 2008-02-12 20:08:13.000000000 +0800
++++ glibmm-2.15.5/glib/src/Makefile.in 2008-02-13 15:22:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18792,31 +18792,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/INSTALL glibmm-2.15.4/INSTALL
---- glibmm-2.15.4.orig/INSTALL 2008-02-06 05:14:05.000000000 +0800
-+++ glibmm-2.15.4/INSTALL 2008-02-09 00:22:41.000000000 +0800
-@@ -2,7 +2,7 @@
- *************************
-
- Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
--2006 Free Software Foundation, Inc.
-+2006, 2007 Free Software Foundation, Inc.
-
- This file is free documentation; the Free Software Foundation gives
- unlimited permission to copy, distribute and modify it.
-@@ -67,6 +67,9 @@
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-+ 6. Often, you can also type `make uninstall' to remove the installed
-+ files again.
-+
- Compilers and Options
- =====================
-
-diff -urN glibmm-2.15.4.orig/Makefile.in glibmm-2.15.4/Makefile.in
---- glibmm-2.15.4.orig/Makefile.in 2008-02-08 23:08:14.000000000 +0800
-+++ glibmm-2.15.4/Makefile.in 2008-02-09 00:22:41.000000000 +0800
+diff -urN glibmm-2.15.5.orig/Makefile.in glibmm-2.15.5/Makefile.in
+--- glibmm-2.15.5.orig/Makefile.in 2008-02-12 20:08:10.000000000 +0800
++++ glibmm-2.15.5/Makefile.in 2008-02-13 15:22:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18942,9 +18920,9 @@
all-local:
-diff -urN glibmm-2.15.4.orig/MSVC_Net2003/examples/dispatcher/Makefile.in glibmm-2.15.4/MSVC_Net2003/examples/dispatcher/Makefile.in
---- glibmm-2.15.4.orig/MSVC_Net2003/examples/dispatcher/Makefile.in 2008-02-08 23:08:14.000000000 +0800
-+++ glibmm-2.15.4/MSVC_Net2003/examples/dispatcher/Makefile.in 2008-02-09 00:22:40.000000000 +0800
+diff -urN glibmm-2.15.5.orig/MSVC_Net2003/examples/dispatcher/Makefile.in glibmm-2.15.5/MSVC_Net2003/examples/dispatcher/Makefile.in
+--- glibmm-2.15.5.orig/MSVC_Net2003/examples/dispatcher/Makefile.in 2008-02-12 20:08:09.000000000 +0800
++++ glibmm-2.15.5/MSVC_Net2003/examples/dispatcher/Makefile.in 2008-02-13 15:22:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18980,9 +18958,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/MSVC_Net2003/examples/dispatcher2/Makefile.in glibmm-2.15.4/MSVC_Net2003/examples/dispatcher2/Makefile.in
---- glibmm-2.15.4.orig/MSVC_Net2003/examples/dispatcher2/Makefile.in 2008-02-08 23:08:14.000000000 +0800
-+++ glibmm-2.15.4/MSVC_Net2003/examples/dispatcher2/Makefile.in 2008-02-09 00:22:40.000000000 +0800
+diff -urN glibmm-2.15.5.orig/MSVC_Net2003/examples/dispatcher2/Makefile.in glibmm-2.15.5/MSVC_Net2003/examples/dispatcher2/Makefile.in
+--- glibmm-2.15.5.orig/MSVC_Net2003/examples/dispatcher2/Makefile.in 2008-02-12 20:08:09.000000000 +0800
++++ glibmm-2.15.5/MSVC_Net2003/examples/dispatcher2/Makefile.in 2008-02-13 15:22:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19018,9 +18996,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/MSVC_Net2003/examples/Makefile.in glibmm-2.15.4/MSVC_Net2003/examples/Makefile.in
---- glibmm-2.15.4.orig/MSVC_Net2003/examples/Makefile.in 2008-02-08 23:08:14.000000000 +0800
-+++ glibmm-2.15.4/MSVC_Net2003/examples/Makefile.in 2008-02-09 00:22:40.000000000 +0800
+diff -urN glibmm-2.15.5.orig/MSVC_Net2003/examples/Makefile.in glibmm-2.15.5/MSVC_Net2003/examples/Makefile.in
+--- glibmm-2.15.5.orig/MSVC_Net2003/examples/Makefile.in 2008-02-12 20:08:09.000000000 +0800
++++ glibmm-2.15.5/MSVC_Net2003/examples/Makefile.in 2008-02-13 15:22:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19094,9 +19072,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/MSVC_Net2003/examples/markup/Makefile.in glibmm-2.15.4/MSVC_Net2003/examples/markup/Makefile.in
---- glibmm-2.15.4.orig/MSVC_Net2003/examples/markup/Makefile.in 2008-02-08 23:08:14.000000000 +0800
-+++ glibmm-2.15.4/MSVC_Net2003/examples/markup/Makefile.in 2008-02-09 00:22:40.000000000 +0800
+diff -urN glibmm-2.15.5.orig/MSVC_Net2003/examples/markup/Makefile.in glibmm-2.15.5/MSVC_Net2003/examples/markup/Makefile.in
+--- glibmm-2.15.5.orig/MSVC_Net2003/examples/markup/Makefile.in 2008-02-12 20:08:10.000000000 +0800
++++ glibmm-2.15.5/MSVC_Net2003/examples/markup/Makefile.in 2008-02-13 15:22:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19132,9 +19110,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/MSVC_Net2003/examples/options/Makefile.in glibmm-2.15.4/MSVC_Net2003/examples/options/Makefile.in
---- glibmm-2.15.4.orig/MSVC_Net2003/examples/options/Makefile.in 2008-02-08 23:08:14.000000000 +0800
-+++ glibmm-2.15.4/MSVC_Net2003/examples/options/Makefile.in 2008-02-09 00:22:40.000000000 +0800
+diff -urN glibmm-2.15.5.orig/MSVC_Net2003/examples/options/Makefile.in glibmm-2.15.5/MSVC_Net2003/examples/options/Makefile.in
+--- glibmm-2.15.5.orig/MSVC_Net2003/examples/options/Makefile.in 2008-02-12 20:08:10.000000000 +0800
++++ glibmm-2.15.5/MSVC_Net2003/examples/options/Makefile.in 2008-02-13 15:22:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19170,9 +19148,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/MSVC_Net2003/examples/thread/Makefile.in glibmm-2.15.4/MSVC_Net2003/examples/thread/Makefile.in
---- glibmm-2.15.4.orig/MSVC_Net2003/examples/thread/Makefile.in 2008-02-08 23:08:14.000000000 +0800
-+++ glibmm-2.15.4/MSVC_Net2003/examples/thread/Makefile.in 2008-02-09 00:22:40.000000000 +0800
+diff -urN glibmm-2.15.5.orig/MSVC_Net2003/examples/thread/Makefile.in glibmm-2.15.5/MSVC_Net2003/examples/thread/Makefile.in
+--- glibmm-2.15.5.orig/MSVC_Net2003/examples/thread/Makefile.in 2008-02-12 20:08:10.000000000 +0800
++++ glibmm-2.15.5/MSVC_Net2003/examples/thread/Makefile.in 2008-02-13 15:22:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19208,9 +19186,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/MSVC_Net2003/examples/thread_pool/Makefile.in glibmm-2.15.4/MSVC_Net2003/examples/thread_pool/Makefile.in
---- glibmm-2.15.4.orig/MSVC_Net2003/examples/thread_pool/Makefile.in 2008-02-08 23:08:14.000000000 +0800
-+++ glibmm-2.15.4/MSVC_Net2003/examples/thread_pool/Makefile.in 2008-02-09 00:22:40.000000000 +0800
+diff -urN glibmm-2.15.5.orig/MSVC_Net2003/examples/thread_pool/Makefile.in glibmm-2.15.5/MSVC_Net2003/examples/thread_pool/Makefile.in
+--- glibmm-2.15.5.orig/MSVC_Net2003/examples/thread_pool/Makefile.in 2008-02-12 20:08:10.000000000 +0800
++++ glibmm-2.15.5/MSVC_Net2003/examples/thread_pool/Makefile.in 2008-02-13 15:22:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19246,9 +19224,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/MSVC_Net2003/gendef/Makefile.in glibmm-2.15.4/MSVC_Net2003/gendef/Makefile.in
---- glibmm-2.15.4.orig/MSVC_Net2003/gendef/Makefile.in 2008-02-08 23:08:14.000000000 +0800
-+++ glibmm-2.15.4/MSVC_Net2003/gendef/Makefile.in 2008-02-09 00:22:40.000000000 +0800
+diff -urN glibmm-2.15.5.orig/MSVC_Net2003/gendef/Makefile.in glibmm-2.15.5/MSVC_Net2003/gendef/Makefile.in
+--- glibmm-2.15.5.orig/MSVC_Net2003/gendef/Makefile.in 2008-02-12 20:08:10.000000000 +0800
++++ glibmm-2.15.5/MSVC_Net2003/gendef/Makefile.in 2008-02-13 15:22:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19284,9 +19262,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/MSVC_Net2003/glibmm/Makefile.in glibmm-2.15.4/MSVC_Net2003/glibmm/Makefile.in
---- glibmm-2.15.4.orig/MSVC_Net2003/glibmm/Makefile.in 2008-02-08 23:08:14.000000000 +0800
-+++ glibmm-2.15.4/MSVC_Net2003/glibmm/Makefile.in 2008-02-09 00:22:40.000000000 +0800
+diff -urN glibmm-2.15.5.orig/MSVC_Net2003/glibmm/Makefile.in glibmm-2.15.5/MSVC_Net2003/glibmm/Makefile.in
+--- glibmm-2.15.5.orig/MSVC_Net2003/glibmm/Makefile.in 2008-02-12 20:08:10.000000000 +0800
++++ glibmm-2.15.5/MSVC_Net2003/glibmm/Makefile.in 2008-02-13 15:22:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19322,9 +19300,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/MSVC_Net2003/Makefile.in glibmm-2.15.4/MSVC_Net2003/Makefile.in
---- glibmm-2.15.4.orig/MSVC_Net2003/Makefile.in 2008-02-08 23:08:13.000000000 +0800
-+++ glibmm-2.15.4/MSVC_Net2003/Makefile.in 2008-02-09 00:22:40.000000000 +0800
+diff -urN glibmm-2.15.5.orig/MSVC_Net2003/Makefile.in glibmm-2.15.5/MSVC_Net2003/Makefile.in
+--- glibmm-2.15.5.orig/MSVC_Net2003/Makefile.in 2008-02-12 20:08:09.000000000 +0800
++++ glibmm-2.15.5/MSVC_Net2003/Makefile.in 2008-02-13 15:22:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19398,9 +19376,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/MSVC_Net2003/tests/glibmm_value/Makefile.in glibmm-2.15.4/MSVC_Net2003/tests/glibmm_value/Makefile.in
---- glibmm-2.15.4.orig/MSVC_Net2003/tests/glibmm_value/Makefile.in 2008-02-08 23:08:14.000000000 +0800
-+++ glibmm-2.15.4/MSVC_Net2003/tests/glibmm_value/Makefile.in 2008-02-09 00:22:41.000000000 +0800
+diff -urN glibmm-2.15.5.orig/MSVC_Net2003/tests/glibmm_value/Makefile.in glibmm-2.15.5/MSVC_Net2003/tests/glibmm_value/Makefile.in
+--- glibmm-2.15.5.orig/MSVC_Net2003/tests/glibmm_value/Makefile.in 2008-02-12 20:08:10.000000000 +0800
++++ glibmm-2.15.5/MSVC_Net2003/tests/glibmm_value/Makefile.in 2008-02-13 15:22:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19436,9 +19414,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/MSVC_Net2003/tests/Makefile.in glibmm-2.15.4/MSVC_Net2003/tests/Makefile.in
---- glibmm-2.15.4.orig/MSVC_Net2003/tests/Makefile.in 2008-02-08 23:08:14.000000000 +0800
-+++ glibmm-2.15.4/MSVC_Net2003/tests/Makefile.in 2008-02-09 00:22:40.000000000 +0800
+diff -urN glibmm-2.15.5.orig/MSVC_Net2003/tests/Makefile.in glibmm-2.15.5/MSVC_Net2003/tests/Makefile.in
+--- glibmm-2.15.5.orig/MSVC_Net2003/tests/Makefile.in 2008-02-12 20:08:10.000000000 +0800
++++ glibmm-2.15.5/MSVC_Net2003/tests/Makefile.in 2008-02-13 15:22:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19512,1528 +19490,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/scripts/config.guess glibmm-2.15.4/scripts/config.guess
---- glibmm-2.15.4.orig/scripts/config.guess 2008-02-06 05:13:52.000000000 +0800
-+++ glibmm-2.15.4/scripts/config.guess 2008-02-09 00:22:41.000000000 +0800
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+# Inc.
-
--timestamp='2005-12-13'
-+timestamp='2007-07-22'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -106,7 +107,7 @@
- trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
- trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
- : ${TMPDIR=/tmp} ;
-- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-@@ -160,6 +161,7 @@
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
-+ sh5el) machine=sh5le-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
-@@ -206,8 +208,11 @@
- *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit ;;
-+ *:SolidBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+ exit ;;
- macppc:MirBSD:*:*)
-- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-@@ -325,7 +330,7 @@
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
-- i86pc:SunOS:5.*:*)
-+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
-@@ -764,12 +769,19 @@
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:FreeBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ case ${UNAME_MACHINE} in
-+ pc98)
-+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ amd64)
-+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ *)
-+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ esac
- exit ;;
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
-- i*:MINGW*:*)
-+ *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
- i*:windows32*:*)
-@@ -779,9 +791,15 @@
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
-- x86:Interix*:[345]*)
-- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-- exit ;;
-+ *:Interix*:[3456]*)
-+ case ${UNAME_MACHINE} in
-+ x86)
-+ echo i586-pc-interix${UNAME_RELEASE}
-+ exit ;;
-+ EM64T | authenticamd)
-+ echo x86_64-unknown-interix${UNAME_RELEASE}
-+ exit ;;
-+ esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-@@ -817,6 +835,9 @@
- arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-+ avr32*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
- cris:Linux:*:*)
- echo cris-axis-linux-gnu
- exit ;;
-@@ -851,7 +872,11 @@
- #endif
- #endif
- EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^CPU/{
-+ s: ::g
-+ p
-+ }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
-@@ -870,7 +895,11 @@
- #endif
- #endif
- EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^CPU/{
-+ s: ::g
-+ p
-+ }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- or32:Linux:*:*)
-@@ -925,6 +954,9 @@
- x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
- exit ;;
-+ xtensa:Linux:*:*)
-+ echo xtensa-unknown-linux-gnu
-+ exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
-@@ -967,7 +999,7 @@
- LIBC=gnulibc1
- # endif
- #else
-- #if defined(__INTEL_COMPILER) || defined(__PGI)
-+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
-@@ -977,7 +1009,11 @@
- LIBC=dietlibc
- #endif
- EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^LIBC/{
-+ s: ::g
-+ p
-+ }'`"
- test x"${LIBC}" != x && {
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit
-@@ -1179,6 +1215,15 @@
- SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
- exit ;;
-+ SX-7:SUPER-UX:*:*)
-+ echo sx7-nec-superux${UNAME_RELEASE}
-+ exit ;;
-+ SX-8:SUPER-UX:*:*)
-+ echo sx8-nec-superux${UNAME_RELEASE}
-+ exit ;;
-+ SX-8R:SUPER-UX:*:*)
-+ echo sx8r-nec-superux${UNAME_RELEASE}
-+ exit ;;
- Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit ;;
-diff -urN glibmm-2.15.4.orig/scripts/config.sub glibmm-2.15.4/scripts/config.sub
---- glibmm-2.15.4.orig/scripts/config.sub 2008-02-06 05:13:53.000000000 +0800
-+++ glibmm-2.15.4/scripts/config.sub 2008-02-09 00:22:41.000000000 +0800
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+# Inc.
-
--timestamp='2005-12-11'
-+timestamp='2007-06-28'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -240,15 +241,16 @@
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
-- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | bfin \
- | c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
-- | fr30 | frv \
-+ | fido | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
-+ | maxq | mb | microblaze | mcore | mep \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-@@ -268,26 +270,25 @@
- | mn10200 | mn10300 \
- | mt \
- | msp430 \
-+ | nios | nios2 \
- | ns16k | ns32k \
- | or32 \
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
-- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+ | score \
-+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
-- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-- | sparcv8 | sparcv9 | sparcv9b \
-- | strongarm \
-+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+ | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
- | we32k \
-- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k)
- basic_machine=$basic_machine-unknown
- ;;
-- m32c)
-- basic_machine=$basic_machine-unknown
-- ;;
- m6811 | m68hc11 | m6812 | m68hc12)
- # Motorola 68HC11/12.
- basic_machine=$basic_machine-unknown
-@@ -317,18 +318,18 @@
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-- | avr-* \
-+ | avr-* | avr32-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
-- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-- | m32r-* | m32rle-* \
-+ | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-@@ -350,29 +351,28 @@
- | mmix-* \
- | mt-* \
- | msp430-* \
-+ | nios-* | nios2-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
- | romp-* | rs6000-* \
-- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
-- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
- | ymp-* \
- | z8k-*)
- ;;
-- m32c-*)
-- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
- 386bsd)
-@@ -475,8 +475,8 @@
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
-- cr16c)
-- basic_machine=cr16c-unknown
-+ cr16)
-+ basic_machine=cr16-unknown
- os=-elf
- ;;
- crds | unos)
-@@ -683,6 +683,10 @@
- basic_machine=i386-pc
- os=-mingw32
- ;;
-+ mingw32ce)
-+ basic_machine=arm-unknown
-+ os=-mingw32ce
-+ ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
-@@ -818,6 +822,12 @@
- pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
-+ pc98)
-+ basic_machine=i386-pc
-+ ;;
-+ pc98-*)
-+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
-@@ -904,6 +914,10 @@
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
- ;;
-+ sde)
-+ basic_machine=mipsisa32-sde
-+ os=-elf
-+ ;;
- sei)
- basic_machine=mips-sei
- os=-seiux
-@@ -915,6 +929,9 @@
- basic_machine=sh-hitachi
- os=-hms
- ;;
-+ sh5el)
-+ basic_machine=sh5le-unknown
-+ ;;
- sh64)
- basic_machine=sh64-unknown
- ;;
-@@ -1120,7 +1137,7 @@
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
-- sparc | sparcv8 | sparcv9 | sparcv9b)
-+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
- ;;
- cydra)
-@@ -1193,7 +1210,8 @@
- | -aos* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+ | -openbsd* | -solidbsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-@@ -1208,7 +1226,7 @@
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku* | -rdos*)
-+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
-@@ -1360,6 +1378,12 @@
- # system, and we'll never get to this point.
-
- case $basic_machine in
-+ score-*)
-+ os=-elf
-+ ;;
-+ spu-*)
-+ os=-elf
-+ ;;
- *-acorn)
- os=-riscix1.2
- ;;
-@@ -1369,9 +1393,9 @@
- arm*-semi)
- os=-aout
- ;;
-- c4x-* | tic4x-*)
-- os=-coff
-- ;;
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
- # This must come before the *-dec entry.
- pdp10-*)
- os=-tops20
-@@ -1397,6 +1421,9 @@
- m68*-cisco)
- os=-aout
- ;;
-+ mep-*)
-+ os=-elf
-+ ;;
- mips*-cisco)
- os=-elf
- ;;
-diff -urN glibmm-2.15.4.orig/scripts/depcomp glibmm-2.15.4/scripts/depcomp
---- glibmm-2.15.4.orig/scripts/depcomp 2008-02-06 05:14:05.000000000 +0800
-+++ glibmm-2.15.4/scripts/depcomp 2008-02-09 00:22:43.000000000 +0800
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # depcomp - compile a program generating dependencies as side-effects
-
--scriptversion=2006-10-15.18
-+scriptversion=2007-03-29.01
-
--# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
- # Foundation, Inc.
-
- # This program is free software; you can redistribute it and/or modify
-@@ -215,34 +215,39 @@
- # current directory. Also, the AIX compiler puts `$object:' at the
- # start of each line; $object doesn't have directory information.
- # Version 6 uses the directory in both cases.
-- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-- tmpdepfile="$stripped.u"
-+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+ test "x$dir" = "x$object" && dir=
-+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- if test "$libtool" = yes; then
-+ tmpdepfile1=$dir$base.u
-+ tmpdepfile2=$base.u
-+ tmpdepfile3=$dir.libs/$base.u
- "$@" -Wc,-M
- else
-+ tmpdepfile1=$dir$base.u
-+ tmpdepfile2=$dir$base.u
-+ tmpdepfile3=$dir$base.u
- "$@" -M
- fi
- stat=$?
-
-- if test -f "$tmpdepfile"; then :
-- else
-- stripped=`echo "$stripped" | sed 's,^.*/,,'`
-- tmpdepfile="$stripped.u"
-- fi
--
- if test $stat -eq 0; then :
- else
-- rm -f "$tmpdepfile"
-+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- exit $stat
- fi
-
-+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-+ do
-+ test -f "$tmpdepfile" && break
-+ done
- if test -f "$tmpdepfile"; then
-- outname="$stripped.o"
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
-- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+ # That's a tab and a space in the [].
-+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
-diff -urN glibmm-2.15.4.orig/scripts/install-sh glibmm-2.15.4/scripts/install-sh
---- glibmm-2.15.4.orig/scripts/install-sh 2008-02-06 05:14:05.000000000 +0800
-+++ glibmm-2.15.4/scripts/install-sh 2008-02-09 00:22:40.000000000 +0800
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # install - install a program, script, or datafile
-
--scriptversion=2006-10-14.15
-+scriptversion=2006-12-25.00
-
- # This originates from X11R5 (mit/util/scripts/install.sh), which was
- # later released in X11R6 (xc/config/util/install.sh) with the
-@@ -48,7 +48,7 @@
- # set DOITPROG to echo to test this script
-
- # Don't use :- since 4.3BSD and earlier shells don't like it.
--doit="${DOITPROG-}"
-+doit=${DOITPROG-}
- if test -z "$doit"; then
- doit_exec=exec
- else
-@@ -58,34 +58,49 @@
- # Put in absolute file names if you don't have them in your path;
- # or use environment vars.
-
--mvprog="${MVPROG-mv}"
--cpprog="${CPPROG-cp}"
--chmodprog="${CHMODPROG-chmod}"
--chownprog="${CHOWNPROG-chown}"
--chgrpprog="${CHGRPPROG-chgrp}"
--stripprog="${STRIPPROG-strip}"
--rmprog="${RMPROG-rm}"
--mkdirprog="${MKDIRPROG-mkdir}"
-+chgrpprog=${CHGRPPROG-chgrp}
-+chmodprog=${CHMODPROG-chmod}
-+chownprog=${CHOWNPROG-chown}
-+cmpprog=${CMPPROG-cmp}
-+cpprog=${CPPROG-cp}
-+mkdirprog=${MKDIRPROG-mkdir}
-+mvprog=${MVPROG-mv}
-+rmprog=${RMPROG-rm}
-+stripprog=${STRIPPROG-strip}
-+
-+posix_glob='?'
-+initialize_posix_glob='
-+ test "$posix_glob" != "?" || {
-+ if (set -f) 2>/dev/null; then
-+ posix_glob=
-+ else
-+ posix_glob=:
-+ fi
-+ }
-+'
-
--posix_glob=
- posix_mkdir=
-
- # Desired mode of installed file.
- mode=0755
-
-+chgrpcmd=
- chmodcmd=$chmodprog
- chowncmd=
--chgrpcmd=
--stripcmd=
-+mvcmd=$mvprog
- rmcmd="$rmprog -f"
--mvcmd="$mvprog"
-+stripcmd=
-+
- src=
- dst=
- dir_arg=
--dstarg=
-+dst_arg=
-+
-+copy_on_change=false
- no_target_directory=
-
--usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-+usage="\
-+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
- or: $0 [OPTION]... SRCFILES... DIRECTORY
- or: $0 [OPTION]... -t DIRECTORY SRCFILES...
- or: $0 [OPTION]... -d DIRECTORIES...
-@@ -95,65 +110,55 @@
- In the 4th, create DIRECTORIES.
-
- Options:
---c (ignored)
---d create directories instead of installing files.
---g GROUP $chgrpprog installed files to GROUP.
---m MODE $chmodprog installed files to MODE.
---o USER $chownprog installed files to USER.
---s $stripprog installed files.
---t DIRECTORY install into DIRECTORY.
---T report an error if DSTFILE is a directory.
----help display this help and exit.
----version display version info and exit.
-+ --help display this help and exit.
-+ --version display version info and exit.
-+
-+ -c (ignored)
-+ -C install only if different (preserve the last data modification time)
-+ -d create directories instead of installing files.
-+ -g GROUP $chgrpprog installed files to GROUP.
-+ -m MODE $chmodprog installed files to MODE.
-+ -o USER $chownprog installed files to USER.
-+ -s $stripprog installed files.
-+ -t DIRECTORY install into DIRECTORY.
-+ -T report an error if DSTFILE is a directory.
-
- Environment variables override the default commands:
-- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-+ RMPROG STRIPPROG
- "
-
- while test $# -ne 0; do
- case $1 in
-- -c) shift
-- continue;;
-+ -c) ;;
-+
-+ -C) copy_on_change=true;;
-
-- -d) dir_arg=true
-- shift
-- continue;;
-+ -d) dir_arg=true;;
-
- -g) chgrpcmd="$chgrpprog $2"
-- shift
-- shift
-- continue;;
-+ shift;;
-
- --help) echo "$usage"; exit $?;;
-
- -m) mode=$2
-- shift
-- shift
- case $mode in
- *' '* | *' '* | *'
- '* | *'*'* | *'?'* | *'['*)
- echo "$0: invalid mode: $mode" >&2
- exit 1;;
- esac
-- continue;;
-+ shift;;
-
- -o) chowncmd="$chownprog $2"
-- shift
-- shift
-- continue;;
--
-- -s) stripcmd=$stripprog
-- shift
-- continue;;
--
-- -t) dstarg=$2
-- shift
-- shift
-- continue;;
--
-- -T) no_target_directory=true
-- shift
-- continue;;
-+ shift;;
-+
-+ -s) stripcmd=$stripprog;;
-+
-+ -t) dst_arg=$2
-+ shift;;
-+
-+ -T) no_target_directory=true;;
-
- --version) echo "$0 $scriptversion"; exit $?;;
-
-@@ -165,21 +170,22 @@
-
- *) break;;
- esac
-+ shift
- done
-
--if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
-+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
- # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
- # Otherwise, the last argument is the destination. Remove it from $@.
- for arg
- do
-- if test -n "$dstarg"; then
-+ if test -n "$dst_arg"; then
- # $@ is not empty: it contains at least $arg.
-- set fnord "$@" "$dstarg"
-+ set fnord "$@" "$dst_arg"
- shift # fnord
- fi
- shift # arg
-- dstarg=$arg
-+ dst_arg=$arg
- done
- fi
-
-@@ -224,7 +230,7 @@
- do
- # Protect names starting with `-'.
- case $src in
-- -*) src=./$src ;;
-+ -*) src=./$src;;
- esac
-
- if test -n "$dir_arg"; then
-@@ -242,22 +248,22 @@
- exit 1
- fi
-
-- if test -z "$dstarg"; then
-+ if test -z "$dst_arg"; then
- echo "$0: no destination specified." >&2
- exit 1
- fi
-
-- dst=$dstarg
-+ dst=$dst_arg
- # Protect names starting with `-'.
- case $dst in
-- -*) dst=./$dst ;;
-+ -*) dst=./$dst;;
- esac
-
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
- if test -d "$dst"; then
- if test -n "$no_target_directory"; then
-- echo "$0: $dstarg: Is a directory" >&2
-+ echo "$0: $dst_arg: Is a directory" >&2
- exit 1
- fi
- dstdir=$dst
-@@ -378,26 +384,19 @@
- # directory the slow way, step by step, checking for races as we go.
-
- case $dstdir in
-- /*) prefix=/ ;;
-- -*) prefix=./ ;;
-- *) prefix= ;;
-+ /*) prefix='/';;
-+ -*) prefix='./';;
-+ *) prefix='';;
- esac
-
-- case $posix_glob in
-- '')
-- if (set -f) 2>/dev/null; then
-- posix_glob=true
-- else
-- posix_glob=false
-- fi ;;
-- esac
-+ eval "$initialize_posix_glob"
-
- oIFS=$IFS
- IFS=/
-- $posix_glob && set -f
-+ $posix_glob set -f
- set fnord $dstdir
- shift
-- $posix_glob && set +f
-+ $posix_glob set +f
- IFS=$oIFS
-
- prefixes=
-@@ -459,41 +458,54 @@
- # ignore errors from any of these, just make sure not to ignore
- # errors from the above "$doit $cpprog $src $dsttmp" command.
- #
-- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
--
-- # Now rename the file to the real destination.
-- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
-- || {
-- # The rename failed, perhaps because mv can't rename something else
-- # to itself, or perhaps because mv is so ancient that it does not
-- # support -f.
--
-- # Now remove or move aside any old file at destination location.
-- # We try this two ways since rm can't unlink itself on some
-- # systems and the destination file might be busy for other
-- # reasons. In this case, the final cleanup might fail but the new
-- # file should still install successfully.
-- {
-- if test -f "$dst"; then
-- $doit $rmcmd -f "$dst" 2>/dev/null \
-- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
-- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
-- || {
-- echo "$0: cannot unlink or rename $dst" >&2
-- (exit 1); exit 1
-- }
-- else
-- :
-- fi
-- } &&
--
-- # Now rename the file to the real destination.
-- $doit $mvcmd "$dsttmp" "$dst"
-- }
-- } || exit 1
-+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-+
-+ # If -C, don't bother to copy if it wouldn't change the file.
-+ if $copy_on_change &&
-+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
-+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
-+
-+ eval "$initialize_posix_glob" &&
-+ $posix_glob set -f &&
-+ set X $old && old=:$2:$4:$5:$6 &&
-+ set X $new && new=:$2:$4:$5:$6 &&
-+ $posix_glob set +f &&
-+
-+ test "$old" = "$new" &&
-+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-+ then
-+ rm -f "$dsttmp"
-+ else
-+ # Rename the file to the real destination.
-+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-+
-+ # The rename failed, perhaps because mv can't rename something else
-+ # to itself, or perhaps because mv is so ancient that it does not
-+ # support -f.
-+ {
-+ # Now remove or move aside any old file at destination location.
-+ # We try this two ways since rm can't unlink itself on some
-+ # systems and the destination file might be busy for other
-+ # reasons. In this case, the final cleanup might fail but the new
-+ # file should still install successfully.
-+ {
-+ test ! -f "$dst" ||
-+ $doit $rmcmd -f "$dst" 2>/dev/null ||
-+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-+ } ||
-+ { echo "$0: cannot unlink or rename $dst" >&2
-+ (exit 1); exit 1
-+ }
-+ } &&
-+
-+ # Now rename the file to the real destination.
-+ $doit $mvcmd "$dsttmp" "$dst"
-+ }
-+ fi || exit 1
-
- trap '' 0
- fi
-diff -urN glibmm-2.15.4.orig/scripts/ltmain.sh glibmm-2.15.4/scripts/ltmain.sh
---- glibmm-2.15.4.orig/scripts/ltmain.sh 2008-02-06 05:13:53.000000000 +0800
-+++ glibmm-2.15.4/scripts/ltmain.sh 2008-02-02 21:28:24.000000000 +0800
-@@ -1,8 +1,8 @@
- # ltmain.sh - Provide generalized library-building support services.
- # NOTE: Changing this file will not affect anything until you rerun configure.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-+# 2007, 2008 Free Software Foundation, Inc.
- # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -43,14 +43,22 @@
-
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.5.22
--TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-+VERSION="1.5.26 Debian 1.5.26-1"
-+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
-
--# See if we are running on zsh, and set the options which allow our
--# commands through without removal of \ escapes.
--if test -n "${ZSH_VERSION+set}" ; then
-+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-@@ -105,11 +113,19 @@
- # These must not be set unconditionally because not all systems understand
- # e.g. LANG=C (notably SCO).
- # We save the old values to restore during execute mode.
--if test "${LC_ALL+set}" = set; then
-- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
--fi
--if test "${LANG+set}" = set; then
-- save_LANG="$LANG"; LANG=C; export LANG
-+lt_env=
-+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+do
-+ eval "if test \"\${$lt_var+set}\" = set; then
-+ save_$lt_var=\$$lt_var
-+ lt_env=\"$lt_var=\$$lt_var \$lt_env\"
-+ $lt_var=C
-+ export $lt_var
-+ fi"
-+done
-+
-+if test -n "$lt_env"; then
-+ lt_env="env $lt_env"
- fi
-
- # Make sure IFS has a sensible default
-@@ -136,6 +152,8 @@
- preserve_args=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
-+extracted_archives=
-+extracted_serial=0
-
- #####################################
- # Shell function definitions:
-@@ -196,7 +214,13 @@
- if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
- $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
- win32_nmres=`eval $NM -f posix -A $1 | \
-- $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
-+ $SED -n -e '1,100{
-+ / I /{
-+ s,.*,import,
-+ p
-+ q
-+ }
-+ }'`
- case $win32_nmres in
- import*) win32_libid_type="x86 archive import";;
- *) win32_libid_type="x86 archive static";;
-@@ -327,7 +351,17 @@
- *) my_xabs=`pwd`"/$my_xlib" ;;
- esac
- my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-- my_xdir="$my_gentop/$my_xlib"
-+ my_xlib_u=$my_xlib
-+ while :; do
-+ case " $extracted_archives " in
-+ *" $my_xlib_u "*)
-+ extracted_serial=`expr $extracted_serial + 1`
-+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
-+ *) break ;;
-+ esac
-+ done
-+ extracted_archives="$extracted_archives $my_xlib_u"
-+ my_xdir="$my_gentop/$my_xlib_u"
-
- $show "${rm}r $my_xdir"
- $run ${rm}r "$my_xdir"
-@@ -454,11 +488,12 @@
- ;;
-
- --version)
-- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-- $echo
-- $echo "Copyright (C) 2005 Free Software Foundation, Inc."
-- $echo "This is free software; see the source for copying conditions. There is NO"
-- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+ echo "\
-+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-+
-+Copyright (C) 2008 Free Software Foundation, Inc.
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- exit $?
- ;;
-
-@@ -755,9 +790,11 @@
- *.class) xform=class ;;
- *.cpp) xform=cpp ;;
- *.cxx) xform=cxx ;;
-- *.f90) xform=f90 ;;
-+ *.[fF][09]?) xform=[fF][09]. ;;
- *.for) xform=for ;;
- *.java) xform=java ;;
-+ *.obj) xform=obj ;;
-+ *.sx) xform=sx ;;
- esac
-
- libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -926,7 +963,7 @@
- $run $rm "$lobj" "$output_obj"
-
- $show "$command"
-- if $run eval "$command"; then :
-+ if $run eval $lt_env "$command"; then :
- else
- test -n "$output_obj" && $run $rm $removelist
- exit $EXIT_FAILURE
-@@ -998,7 +1035,7 @@
- command="$command$suppress_output"
- $run $rm "$obj" "$output_obj"
- $show "$command"
-- if $run eval "$command"; then :
-+ if $run eval $lt_env "$command"; then :
- else
- $run $rm $removelist
- exit $EXIT_FAILURE
-@@ -1131,6 +1168,7 @@
- thread_safe=no
- vinfo=
- vinfo_number=no
-+ single_module="${wl}-single_module"
-
- func_infer_tag $base_compile
-
-@@ -1138,8 +1176,9 @@
- for arg
- do
- case $arg in
-- -all-static | -static)
-- if test "X$arg" = "X-all-static"; then
-+ -all-static | -static | -static-libtool-libs)
-+ case $arg in
-+ -all-static)
- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
- $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
- fi
-@@ -1147,12 +1186,20 @@
- dlopen_self=$dlopen_self_static
- fi
- prefer_static_libs=yes
-- else
-+ ;;
-+ -static)
- if test -z "$pic_flag" && test -n "$link_static_flag"; then
- dlopen_self=$dlopen_self_static
- fi
- prefer_static_libs=built
-- fi
-+ ;;
-+ -static-libtool-libs)
-+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+ dlopen_self=$dlopen_self_static
-+ fi
-+ prefer_static_libs=yes
-+ ;;
-+ esac
- build_libtool_libs=no
- build_old_libs=yes
- break
-@@ -1600,13 +1647,18 @@
- continue
- ;;
-
-- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- compiler_flags="$compiler_flags $arg"
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
- continue
- ;;
-
-+ -multi_module)
-+ single_module="${wl}-multi_module"
-+ continue
-+ ;;
-+
- -module)
- module=yes
- continue
-@@ -1620,10 +1672,11 @@
- # -m* pass through architecture-specific compiler args for GCC
- # -m*, -t[45]*, -txscale* pass through architecture-specific
- # compiler args for GCC
-- # -pg pass through profiling flag for GCC
-+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-+ # -F/path gives path to uninstalled frameworks, gcc on darwin
- # @file GCC response files
-- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-- -t[45]*|-txscale*|@*)
-+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
-@@ -1651,9 +1704,9 @@
-
- -no-install)
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
- # The PATH hackery in wrapper scripts is required on Windows
-- # in order for the loader to find any dlls it needs.
-+ # and Darwin in order for the loader to find any dlls it needs.
- $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
- $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
- fast_install=no
-@@ -1712,7 +1765,7 @@
- continue
- ;;
-
-- -static)
-+ -static | -static-libtool-libs)
- # The effects of -static are defined in a previous loop.
- # We used to do the same as -all-static on platforms that
- # didn't have a PIC flag, but the assumption that the effects
-@@ -2082,7 +2135,10 @@
- case $pass in
- dlopen) libs="$dlfiles" ;;
- dlpreopen) libs="$dlprefiles" ;;
-- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+ link)
-+ libs="$deplibs %DEPLIBS%"
-+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-+ ;;
- esac
- fi
- if test "$pass" = dlopen; then
-@@ -2094,7 +2150,7 @@
- lib=
- found=no
- case $deplib in
-- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
-@@ -2109,7 +2165,12 @@
- continue
- fi
- name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+ if test "$linkmode" = lib; then
-+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-+ else
-+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-+ fi
-+ for searchdir in $searchdirs; do
- for search_ext in .la $std_shrext .so .a; do
- # Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
-@@ -2490,7 +2551,9 @@
-
- if test "$linkmode,$pass" = "prog,link"; then
- if test -n "$library_names" &&
-- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-+ { { test "$prefer_static_libs" = no ||
-+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
-+ test -z "$old_library"; }; then
- # We need to hardcode the library path
- if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
- # Make sure the rpath contains only unique directories.
-@@ -2903,12 +2966,18 @@
- # we do not want to link against static libs,
- # but need to link against shared
- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-+ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
- depdepl=$tmp
- done
-- if test -f "$path/$depdepl" ; then
-+ if test -f "$deplibdir/$depdepl" ; then
-+ depdepl="$deplibdir/$depdepl"
-+ elif test -f "$path/$depdepl" ; then
- depdepl="$path/$depdepl"
-+ else
-+ # Can't find it, oh well...
-+ depdepl=
- fi
- # do not add paths which are already there
- case " $newlib_search_path " in
-@@ -3056,9 +3125,10 @@
-
- case $linkmode in
- oldlib)
-- if test -n "$deplibs"; then
-- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-- fi
-+ case " $deplibs" in
-+ *\ -l* | *\ -L*)
-+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
-+ esac
-
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-@@ -3186,7 +3256,7 @@
- # which has an extra 1 added just for fun
- #
- case $version_type in
-- darwin|linux|osf|windows)
-+ darwin|linux|osf|windows|none)
- current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_revision"
-@@ -3197,9 +3267,15 @@
- age="0"
- ;;
- irix|nonstopux)
-- current=`expr $number_major + $number_minor - 1`
-+ current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_minor"
-+ lt_irix_increment=no
-+ ;;
-+ *)
-+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
-+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
-+ exit $EXIT_FAILURE
- ;;
- esac
- ;;
-@@ -3258,7 +3334,8 @@
- versuffix="$major.$age.$revision"
- # Darwin ld doesn't like 0 for these options...
- minor_current=`expr $current + 1`
-- verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
- ;;
-
- freebsd-aout)
-@@ -3272,8 +3349,11 @@
- ;;
-
- irix | nonstopux)
-- major=`expr $current - $age + 1`
--
-+ if test "X$lt_irix_increment" = "Xno"; then
-+ major=`expr $current - $age`
-+ else
-+ major=`expr $current - $age + 1`
-+ fi
- case $version_type in
- nonstopux) verstring_prefix=nonstopux ;;
- *) verstring_prefix=sgi ;;
-@@ -3410,11 +3490,11 @@
- fi
-
- # Eliminate all temporary directories.
-- for path in $notinst_path; do
-- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-- done
-+ #for path in $notinst_path; do
-+ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-+ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-+ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-+ #done
-
- if test -n "$xrpath"; then
- # If the user specified any rpath flags, then add them.
-@@ -3515,13 +3595,12 @@
- int main() { return 0; }
- EOF
- $rm conftest
-- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-- if test "$?" -eq 0 ; then
-+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
- ldd_output=`ldd conftest`
- for i in $deplibs; do
- name=`expr $i : '-l\(.*\)'`
- # If $name is empty we are operating on a -L argument.
-- if test "$name" != "" && test "$name" -ne "0"; then
-+ if test "$name" != "" && test "$name" != "0"; then
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
- *" $i "*)
-@@ -3560,9 +3639,7 @@
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" != "0"; then
- $rm conftest
-- $LTCC $LTCFLAGS -o conftest conftest.c $i
-- # Did it work?
-- if test "$?" -eq 0 ; then
-+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
- ldd_output=`ldd conftest`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
-@@ -3594,7 +3671,7 @@
- droppeddeps=yes
- $echo
- $echo "*** Warning! Library $i is needed by this library but I was not able to"
-- $echo "*** make it link in! You will probably need to install it or some"
-+ $echo "*** make it link in! You will probably need to install it or some"
- $echo "*** library that it depends on before this library will be fully"
- $echo "*** functional. Installing it before continuing would be even better."
- fi
-@@ -3880,7 +3957,10 @@
- test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
- if test -n "$hardcode_libdir_flag_spec_ld"; then
-- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-+ case $archive_cmds in
-+ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
-+ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
-+ esac
- else
- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
- fi
-@@ -4190,9 +4270,10 @@
- ;;
-
- obj)
-- if test -n "$deplibs"; then
-- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-- fi
-+ case " $deplibs" in
-+ *\ -l* | *\ -L*)
-+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
-+ esac
-
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-@@ -4239,12 +4320,14 @@
- reload_conv_objs=
- gentop=
- # reload_cmds runs $LD directly, so let us get rid of
-- # -Wl from whole_archive_flag_spec
-+ # -Wl from whole_archive_flag_spec and hope we can get by with
-+ # turning comma into space..
- wl=
-
- if test -n "$convenience"; then
- if test -n "$whole_archive_flag_spec"; then
-- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
- else
- gentop="$output_objdir/${obj}x"
- generated="$generated $gentop"
-@@ -4692,16 +4775,16 @@
- case $host in
- *cygwin* | *mingw* )
- if test -f "$output_objdir/${outputname}.def" ; then
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
- else
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
- fi
- ;;
- * )
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
- ;;
- esac
- ;;
-@@ -4716,13 +4799,13 @@
- # really was required.
-
- # Nullify the symbol file.
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
- fi
-
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- # Replace the output file specification.
-- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
- link_command="$compile_command$compile_rpath"
-
- # We have no uninstalled library dependencies, so finalize right now.
-@@ -4809,7 +4892,7 @@
- if test "$fast_install" != no; then
- link_command="$finalize_var$compile_command$finalize_rpath"
- if test "$fast_install" = yes; then
-- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
- else
- # fast_install is set to needless
- relink_command=
-@@ -4846,7 +4929,7 @@
- fi
- done
- relink_command="(cd `pwd`; $relink_command)"
-- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
- fi
-
- # Quote $echo for shipping.
-@@ -5253,6 +5336,20 @@
- Xsed='${SED} -e 1s/^X//'
- sed_quote_subst='$sed_quote_subst'
-
-+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-@@ -5395,7 +5492,7 @@
- ;;
- esac
- $echo >> $output "\
-- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-+ \$echo \"\$0: cannot exec \$program \$*\"
- exit $EXIT_FAILURE
- fi
- else
-@@ -5581,7 +5678,7 @@
- done
- # Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
- if test "$hardcode_automatic" = yes ; then
- relink_command=
- fi
-@@ -5926,9 +6023,9 @@
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
-- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
- else
-- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
- fi
-
- $echo "$modename: warning: relinking \`$file'" 1>&2
-@@ -6137,7 +6234,7 @@
- file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
- outputname="$tmpdir/$file"
- # Replace the output file specification.
-- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
-
- $show "$relink_command"
- if $run eval "$relink_command"; then :
-@@ -6348,8 +6445,10 @@
- if test -f "$dir/$objdir/$dlname"; then
- dir="$dir/$objdir"
- else
-- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-- exit $EXIT_FAILURE
-+ if test ! -f "$dir/$dlname"; then
-+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
- fi
- ;;
-
-@@ -6413,12 +6512,12 @@
- fi
-
- # Restore saved environment variables
-- if test "${save_LC_ALL+set}" = set; then
-- LC_ALL="$save_LC_ALL"; export LC_ALL
-- fi
-- if test "${save_LANG+set}" = set; then
-- LANG="$save_LANG"; export LANG
-- fi
-+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+ do
-+ eval "if test \"\${save_$lt_var+set}\" = set; then
-+ $lt_var=\$save_$lt_var; export $lt_var
-+ fi"
-+ done
-
- # Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
-@@ -6775,9 +6874,9 @@
- -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
- -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
- -export-symbols SYMFILE
-- try to export only the symbols listed in SYMFILE
-+ try to export only the symbols listed in SYMFILE
- -export-symbols-regex REGEX
-- try to export only the symbols matching REGEX
-+ try to export only the symbols matching REGEX
- -LLIBDIR search LIBDIR for required installed libraries
- -lNAME OUTPUT-FILE requires the installed library libNAME
- -module build a library that can dlopened
-@@ -6791,9 +6890,11 @@
- -release RELEASE specify package release information
- -rpath LIBDIR the created library will eventually be installed in LIBDIR
- -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-- -static do not do any dynamic linking of libtool libraries
-+ -static do not do any dynamic linking of uninstalled libtool libraries
-+ -static-libtool-libs
-+ do not do any dynamic linking of libtool libraries
- -version-info CURRENT[:REVISION[:AGE]]
-- specify library version info [each variable defaults to 0]
-+ specify library version info [each variable defaults to 0]
-
- All other options (arguments beginning with \`-') are ignored.
-
-diff -urN glibmm-2.15.4.orig/scripts/Makefile.in glibmm-2.15.4/scripts/Makefile.in
---- glibmm-2.15.4.orig/scripts/Makefile.in 2008-02-08 23:08:18.000000000 +0800
-+++ glibmm-2.15.4/scripts/Makefile.in 2008-02-09 00:22:44.000000000 +0800
+diff -urN glibmm-2.15.5.orig/scripts/Makefile.in glibmm-2.15.5/scripts/Makefile.in
+--- glibmm-2.15.5.orig/scripts/Makefile.in 2008-02-12 20:08:14.000000000 +0800
++++ glibmm-2.15.5/scripts/Makefile.in 2008-02-13 15:23:00.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21069,9 +19528,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -urN glibmm-2.15.4.orig/tests/giomm_simple/Makefile.in glibmm-2.15.4/tests/giomm_simple/Makefile.in
---- glibmm-2.15.4.orig/tests/giomm_simple/Makefile.in 2008-02-08 23:08:17.000000000 +0800
-+++ glibmm-2.15.4/tests/giomm_simple/Makefile.in 2008-02-09 00:22:43.000000000 +0800
+diff -urN glibmm-2.15.5.orig/tests/giomm_simple/Makefile.in glibmm-2.15.5/tests/giomm_simple/Makefile.in
+--- glibmm-2.15.5.orig/tests/giomm_simple/Makefile.in 2008-02-12 20:08:13.000000000 +0800
++++ glibmm-2.15.5/tests/giomm_simple/Makefile.in 2008-02-13 15:23:00.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21154,9 +19613,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/tests/glibmm_value/Makefile.in glibmm-2.15.4/tests/glibmm_value/Makefile.in
---- glibmm-2.15.4.orig/tests/glibmm_value/Makefile.in 2008-02-08 23:08:17.000000000 +0800
-+++ glibmm-2.15.4/tests/glibmm_value/Makefile.in 2008-02-09 00:22:43.000000000 +0800
+diff -urN glibmm-2.15.5.orig/tests/glibmm_value/Makefile.in glibmm-2.15.5/tests/glibmm_value/Makefile.in
+--- glibmm-2.15.5.orig/tests/glibmm_value/Makefile.in 2008-02-12 20:08:13.000000000 +0800
++++ glibmm-2.15.5/tests/glibmm_value/Makefile.in 2008-02-13 15:23:00.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21239,9 +19698,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/tests/Makefile.in glibmm-2.15.4/tests/Makefile.in
---- glibmm-2.15.4.orig/tests/Makefile.in 2008-02-08 23:08:17.000000000 +0800
-+++ glibmm-2.15.4/tests/Makefile.in 2008-02-09 00:22:43.000000000 +0800
+diff -urN glibmm-2.15.5.orig/tests/Makefile.in glibmm-2.15.5/tests/Makefile.in
+--- glibmm-2.15.5.orig/tests/Makefile.in 2008-02-12 20:08:13.000000000 +0800
++++ glibmm-2.15.5/tests/Makefile.in 2008-02-13 15:22:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21315,9 +19774,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/tools/extra_defs_gen/Makefile.in glibmm-2.15.4/tools/extra_defs_gen/Makefile.in
---- glibmm-2.15.4.orig/tools/extra_defs_gen/Makefile.in 2008-02-08 23:08:17.000000000 +0800
-+++ glibmm-2.15.4/tools/extra_defs_gen/Makefile.in 2008-02-09 00:22:43.000000000 +0800
+diff -urN glibmm-2.15.5.orig/tools/extra_defs_gen/Makefile.in glibmm-2.15.5/tools/extra_defs_gen/Makefile.in
+--- glibmm-2.15.5.orig/tools/extra_defs_gen/Makefile.in 2008-02-12 20:08:14.000000000 +0800
++++ glibmm-2.15.5/tools/extra_defs_gen/Makefile.in 2008-02-13 15:23:00.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21422,9 +19881,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/tools/m4/Makefile.in glibmm-2.15.4/tools/m4/Makefile.in
---- glibmm-2.15.4.orig/tools/m4/Makefile.in 2008-02-08 23:08:17.000000000 +0800
-+++ glibmm-2.15.4/tools/m4/Makefile.in 2008-02-09 00:22:43.000000000 +0800
+diff -urN glibmm-2.15.5.orig/tools/m4/Makefile.in glibmm-2.15.5/tools/m4/Makefile.in
+--- glibmm-2.15.5.orig/tools/m4/Makefile.in 2008-02-12 20:08:14.000000000 +0800
++++ glibmm-2.15.5/tools/m4/Makefile.in 2008-02-13 15:23:00.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21498,9 +19957,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/tools/Makefile.in glibmm-2.15.4/tools/Makefile.in
---- glibmm-2.15.4.orig/tools/Makefile.in 2008-02-08 23:08:17.000000000 +0800
-+++ glibmm-2.15.4/tools/Makefile.in 2008-02-09 00:22:43.000000000 +0800
+diff -urN glibmm-2.15.5.orig/tools/Makefile.in glibmm-2.15.5/tools/Makefile.in
+--- glibmm-2.15.5.orig/tools/Makefile.in 2008-02-12 20:08:14.000000000 +0800
++++ glibmm-2.15.5/tools/Makefile.in 2008-02-13 15:23:00.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21574,9 +20033,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urN glibmm-2.15.4.orig/tools/pm/Makefile.in glibmm-2.15.4/tools/pm/Makefile.in
---- glibmm-2.15.4.orig/tools/pm/Makefile.in 2008-02-08 23:08:18.000000000 +0800
-+++ glibmm-2.15.4/tools/pm/Makefile.in 2008-02-09 00:22:44.000000000 +0800
+diff -urN glibmm-2.15.5.orig/tools/pm/Makefile.in glibmm-2.15.5/tools/pm/Makefile.in
+--- glibmm-2.15.5.orig/tools/pm/Makefile.in 2008-02-12 20:08:14.000000000 +0800
++++ glibmm-2.15.5/tools/pm/Makefile.in 2008-02-13 15:23:00.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
Modified: desktop/experimental/glibmm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glibmm2.4/debian/rules?rev=14548&op=diff
==============================================================================
--- desktop/experimental/glibmm2.4/debian/rules (original)
+++ desktop/experimental/glibmm2.4/debian/rules Wed Feb 13 07:25:14 2008
@@ -17,7 +17,7 @@
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_DH_MAKESHLIBS_ARGS_libglibmm-2.4-1c2a += -V"libglibmm-2.4-1c2a (>= 2.15.3)"
+DEB_DH_MAKESHLIBS_ARGS_libglibmm-2.4-1c2a += -V"libglibmm-2.4-1c2a (>= 2.15.5)"
DEB_INSTALL_EXAMPLES_libglibmm-2.4-doc += \
-Xfragment -X.deps -X.libs -X.o -X.in -X.am
Modified: desktop/experimental/glibmm2.4/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glibmm2.4/debian/watch?rev=14548&op=diff
==============================================================================
--- desktop/experimental/glibmm2.4/debian/watch (original)
+++ desktop/experimental/glibmm2.4/debian/watch Wed Feb 13 07:25:14 2008
@@ -3,6 +3,6 @@
# to check for upstream updates and more.
# Site Directory Pattern Version Script
version=2
-http://download.gnome.org/sources/glibmm/([\d\.]+)[02468]/ \
+http://download.gnome.org/sources/glibmm/([\d\.]+)[13579]/ \
glibmm-([\d\.]+)\.tar\.gz \
debian uupdate
More information about the pkg-gnome-commits
mailing list