r14651 - in /packages/unstable/gdesklets/debian: changelog control control.in patches/10_intltool-merge_iconv.diff patches/70_relibtoolize.diff
manphiz-guest at users.alioth.debian.org
manphiz-guest at users.alioth.debian.org
Mon Feb 18 13:57:20 UTC 2008
Author: manphiz-guest
Date: Mon Feb 18 13:57:19 2008
New Revision: 14651
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14651
Log:
* Run `intltoolize' when relibtoolizing to regenerate intltool-*.in
which solves the `@INTLTOOL_ICONV@ not being substituted' issue. And
drop 10_intltools-merge_fix.diff as no longer needed any more.
* Update cdbs build-dependency to >= 0.4.51 to avoid empty -dbg bug,
though currently no -dbg package availabe..
Removed:
packages/unstable/gdesklets/debian/patches/10_intltool-merge_iconv.diff
Modified:
packages/unstable/gdesklets/debian/changelog
packages/unstable/gdesklets/debian/control
packages/unstable/gdesklets/debian/control.in
packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff
Modified: packages/unstable/gdesklets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/changelog?rev=14651&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/changelog (original)
+++ packages/unstable/gdesklets/debian/changelog Mon Feb 18 13:57:19 2008
@@ -1,3 +1,13 @@
+gdesklets (0.35.4-2) UNRELEASED; urgency=low
+
+ * Run `intltoolize' when relibtoolizing to regenerate intltool-*.in
+ which solves the `@INTLTOOL_ICONV@ not being substituted' issue. And
+ drop 10_intltools-merge_fix.diff as no longer needed any more.
+ * Update cdbs build-dependency to >= 0.4.51 to avoid empty -dbg bug,
+ though currently no -dbg package availabe..
+
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Mon, 18 Feb 2008 20:58:33 +0800
+
gdesklets (0.35.4-1) unstable; urgency=high
[ Loic Minier ]
Modified: packages/unstable/gdesklets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/control?rev=14651&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/control (original)
+++ packages/unstable/gdesklets/debian/control Mon Feb 18 13:57:19 2008
@@ -2,8 +2,8 @@
Section: gnome
Priority: optional
Maintainer: Clément Stenac <zorglub at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Loic Minier <lool at dooz.org>, Sebastien Bacher <seb128 at debian.org>
-Build-Depends: cdbs,
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Loic Minier <lool at dooz.org>
+Build-Depends: cdbs (>= 0.4.51),
debhelper (>= 6),
python-dev,
python-gnome2-dev,
Modified: packages/unstable/gdesklets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/control.in?rev=14651&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/control.in (original)
+++ packages/unstable/gdesklets/debian/control.in Mon Feb 18 13:57:19 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Clément Stenac <zorglub at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.51),
debhelper (>= 6),
python-dev,
python-gnome2-dev,
Modified: packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff?rev=14651&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff (original)
+++ packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff Mon Feb 18 13:57:19 2008
@@ -1,6 +1,6 @@
diff -urN gdesklets-0.35.4.orig/aclocal.m4 gdesklets-0.35.4/aclocal.m4
--- gdesklets-0.35.4.orig/aclocal.m4 2006-10-05 20:04:26.000000000 +0800
-+++ gdesklets-0.35.4/aclocal.m4 2008-02-06 12:37:45.000000000 +0800
++++ gdesklets-0.35.4/aclocal.m4 2008-02-18 20:49:03.000000000 +0800
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -2085,7 +2085,7 @@
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
diff -urN gdesklets-0.35.4.orig/config/Makefile.in gdesklets-0.35.4/config/Makefile.in
--- gdesklets-0.35.4.orig/config/Makefile.in 2006-10-05 20:04:34.000000000 +0800
-+++ gdesklets-0.35.4/config/Makefile.in 2008-02-06 12:37:53.000000000 +0800
++++ gdesklets-0.35.4/config/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -2352,9 +2352,350 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
+diff -urN gdesklets-0.35.4.orig/config.guess gdesklets-0.35.4/config.guess
+--- gdesklets-0.35.4.orig/config.guess 2006-10-05 20:04:42.000000000 +0800
++++ gdesklets-0.35.4/config.guess 2007-08-17 11:14:13.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='2006-02-23'
++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
+@@ -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
+@@ -210,7 +212,7 @@
+ 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}
+@@ -328,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*:*)
+@@ -770,6 +772,8 @@
+ 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
+@@ -777,10 +781,7 @@
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit ;;
+- i*:MINGW*:*)
+- echo ${UNAME_MACHINE}-pc-mingw32
+- exit ;;
+- i*:MSYS_NT-*:*:*)
++ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+ i*:windows32*:*)
+@@ -790,12 +791,15 @@
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- x86:Interix*:[345]*)
+- echo i586-pc-interix${UNAME_RELEASE}
+- exit ;;
+- EM64T:Interix*:[345]*)
+- echo x86_64-unknown-interix${UNAME_RELEASE}
+- 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 ;;
+@@ -831,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 ;;
+@@ -947,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
+@@ -989,7 +999,7 @@
+ LIBC=gnulibc1
+ # endif
+ #else
+- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
++ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
+@@ -1205,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 gdesklets-0.35.4.orig/config.sub gdesklets-0.35.4/config.sub
+--- gdesklets-0.35.4.orig/config.sub 2006-10-05 20:04:42.000000000 +0800
++++ gdesklets-0.35.4/config.sub 2007-08-17 11:14:13.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='2006-02-23'
++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 | mb | microblaze | mcore \
++ | m32c | m32r | m32rle | m68000 | m68k | m88k \
++ | maxq | mb | microblaze | mcore | mep \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+@@ -274,21 +276,19 @@
+ | 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
+@@ -318,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-* \
+@@ -358,23 +358,21 @@
+ | 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)
+@@ -477,8 +475,8 @@
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+- cr16c)
+- basic_machine=cr16c-unknown
++ cr16)
++ basic_machine=cr16-unknown
+ os=-elf
+ ;;
+ crds | unos)
+@@ -685,6 +683,10 @@
+ basic_machine=i386-pc
+ os=-mingw32
+ ;;
++ mingw32ce)
++ basic_machine=arm-unknown
++ os=-mingw32ce
++ ;;
+ miniframe)
+ basic_machine=m68000-convergent
+ ;;
+@@ -912,6 +914,10 @@
+ sb1el)
+ basic_machine=mipsisa64sb1el-unknown
+ ;;
++ sde)
++ basic_machine=mipsisa32-sde
++ os=-elf
++ ;;
+ sei)
+ basic_machine=mips-sei
+ os=-seiux
+@@ -923,6 +929,9 @@
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
++ sh5el)
++ basic_machine=sh5le-unknown
++ ;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+@@ -1128,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)
+@@ -1217,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*)
+@@ -1369,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
+ ;;
+@@ -1378,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
+@@ -1406,6 +1421,9 @@
+ m68*-cisco)
+ os=-aout
+ ;;
++ mep-*)
++ os=-elf
++ ;;
+ mips*-cisco)
+ os=-elf
+ ;;
diff -urN gdesklets-0.35.4.orig/configure gdesklets-0.35.4/configure
--- gdesklets-0.35.4.orig/configure 2006-10-05 20:04:30.000000000 +0800
-+++ gdesklets-0.35.4/configure 2008-02-06 12:37:48.000000000 +0800
++++ gdesklets-0.35.4/configure 2008-02-18 20:51:05.000000000 +0800
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -9713,7 +10054,7 @@
if cmp -s ${file} ${file}.out 2>/dev/null; then
diff -urN gdesklets-0.35.4.orig/Controls/ArrayBuffer/Makefile.in gdesklets-0.35.4/Controls/ArrayBuffer/Makefile.in
--- gdesklets-0.35.4.orig/Controls/ArrayBuffer/Makefile.in 2006-10-05 20:04:32.000000000 +0800
-+++ gdesklets-0.35.4/Controls/ArrayBuffer/Makefile.in 2008-02-06 12:37:52.000000000 +0800
++++ gdesklets-0.35.4/Controls/ArrayBuffer/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9969,7 +10310,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/Controls/Calendar/Makefile.in gdesklets-0.35.4/Controls/Calendar/Makefile.in
--- gdesklets-0.35.4.orig/Controls/Calendar/Makefile.in 2006-10-05 20:04:32.000000000 +0800
-+++ gdesklets-0.35.4/Controls/Calendar/Makefile.in 2008-02-06 12:37:52.000000000 +0800
++++ gdesklets-0.35.4/Controls/Calendar/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -10238,7 +10579,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/Controls/EventPipe/Makefile.in gdesklets-0.35.4/Controls/EventPipe/Makefile.in
--- gdesklets-0.35.4.orig/Controls/EventPipe/Makefile.in 2006-10-05 20:04:32.000000000 +0800
-+++ gdesklets-0.35.4/Controls/EventPipe/Makefile.in 2008-02-06 12:37:52.000000000 +0800
++++ gdesklets-0.35.4/Controls/EventPipe/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -10494,7 +10835,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/Controls/HDDTemp/Makefile.in gdesklets-0.35.4/Controls/HDDTemp/Makefile.in
--- gdesklets-0.35.4.orig/Controls/HDDTemp/Makefile.in 2006-10-05 20:04:32.000000000 +0800
-+++ gdesklets-0.35.4/Controls/HDDTemp/Makefile.in 2008-02-06 12:37:53.000000000 +0800
++++ gdesklets-0.35.4/Controls/HDDTemp/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -10763,7 +11104,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/Controls/Makefile.in gdesklets-0.35.4/Controls/Makefile.in
--- gdesklets-0.35.4.orig/Controls/Makefile.in 2006-10-05 20:04:33.000000000 +0800
-+++ gdesklets-0.35.4/Controls/Makefile.in 2008-02-06 12:37:53.000000000 +0800
++++ gdesklets-0.35.4/Controls/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -11133,7 +11474,7 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -urN gdesklets-0.35.4.orig/Controls/Sensor/Makefile.in gdesklets-0.35.4/Controls/Sensor/Makefile.in
--- gdesklets-0.35.4.orig/Controls/Sensor/Makefile.in 2006-10-05 20:04:33.000000000 +0800
-+++ gdesklets-0.35.4/Controls/Sensor/Makefile.in 2008-02-06 12:37:53.000000000 +0800
++++ gdesklets-0.35.4/Controls/Sensor/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -11402,7 +11743,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/Controls/System/Makefile.in gdesklets-0.35.4/Controls/System/Makefile.in
--- gdesklets-0.35.4.orig/Controls/System/Makefile.in 2006-10-05 20:04:33.000000000 +0800
-+++ gdesklets-0.35.4/Controls/System/Makefile.in 2008-02-06 12:37:53.000000000 +0800
++++ gdesklets-0.35.4/Controls/System/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -11671,7 +12012,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/Controls/Time/Makefile.in gdesklets-0.35.4/Controls/Time/Makefile.in
--- gdesklets-0.35.4.orig/Controls/Time/Makefile.in 2006-10-05 20:04:33.000000000 +0800
-+++ gdesklets-0.35.4/Controls/Time/Makefile.in 2008-02-06 12:37:53.000000000 +0800
++++ gdesklets-0.35.4/Controls/Time/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -11940,7 +12281,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/Controls/URI/Makefile.in gdesklets-0.35.4/Controls/URI/Makefile.in
--- gdesklets-0.35.4.orig/Controls/URI/Makefile.in 2006-10-05 20:04:34.000000000 +0800
-+++ gdesklets-0.35.4/Controls/URI/Makefile.in 2008-02-06 12:37:53.000000000 +0800
++++ gdesklets-0.35.4/Controls/URI/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -12209,7 +12550,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/data/Makefile.in gdesklets-0.35.4/data/Makefile.in
--- gdesklets-0.35.4.orig/data/Makefile.in 2006-10-05 20:04:35.000000000 +0800
-+++ gdesklets-0.35.4/data/Makefile.in 2008-02-06 12:37:54.000000000 +0800
++++ gdesklets-0.35.4/data/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -12509,162 +12850,9 @@
uninstall-sharedmimepackageDATA
@INTLTOOL_DESKTOP_RULE@
-diff -urN gdesklets-0.35.4.orig/depcomp gdesklets-0.35.4/depcomp
---- gdesklets-0.35.4.orig/depcomp 2006-10-05 20:04:42.000000000 +0800
-+++ gdesklets-0.35.4/depcomp 2008-02-06 12:37:57.000000000 +0800
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # depcomp - compile a program generating dependencies as side-effects
-
--scriptversion=2005-07-09.11
-+scriptversion=2007-03-29.01
-
--# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 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
- # it under the terms of the GNU General Public License as published by
-@@ -91,7 +92,20 @@
- ## gcc 3 implements dependency tracking that does exactly what
- ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
- ## it if -MD -MP comes after the -MF stuff. Hmm.
-- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-+## the command line argument order; so add the flags where they
-+## appear in depend2.am. Note that the slowdown incurred here
-+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-+ for arg
-+ do
-+ case $arg in
-+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-+ *) set fnord "$@" "$arg" ;;
-+ esac
-+ shift # fnord
-+ shift # $arg
-+ done
-+ "$@"
- stat=$?
- if test $stat -eq 0; then :
- else
-@@ -201,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
-@@ -276,6 +295,46 @@
- rm -f "$tmpdepfile"
- ;;
-
-+hp2)
-+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-+ # compilers, which have integrated preprocessors. The correct option
-+ # to use with these is +Maked; it writes dependencies to a file named
-+ # 'foo.d', which lands next to the object file, wherever that
-+ # happens to be.
-+ # Much of this is similar to the tru64 case; see comments there.
-+ 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.d
-+ tmpdepfile2=$dir.libs/$base.d
-+ "$@" -Wc,+Maked
-+ else
-+ tmpdepfile1=$dir$base.d
-+ tmpdepfile2=$dir$base.d
-+ "$@" +Maked
-+ fi
-+ stat=$?
-+ if test $stat -eq 0; then :
-+ else
-+ rm -f "$tmpdepfile1" "$tmpdepfile2"
-+ exit $stat
-+ fi
-+
-+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-+ do
-+ test -f "$tmpdepfile" && break
-+ done
-+ if test -f "$tmpdepfile"; then
-+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-+ # Add `dependent.h:' lines.
-+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
-+ else
-+ echo "#dummy" > "$depfile"
-+ fi
-+ rm -f "$tmpdepfile" "$tmpdepfile2"
-+ ;;
-+
- tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-@@ -288,13 +347,13 @@
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
-- # static library. This mecanism is used in libtool 1.4 series to
-+ # static library. This mechanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
-- # compilations output dependencies in in $dir.libs/$base.o.d and
-+ # compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
diff -urN gdesklets-0.35.4.orig/display/Makefile.in gdesklets-0.35.4/display/Makefile.in
--- gdesklets-0.35.4.orig/display/Makefile.in 2006-10-05 20:04:35.000000000 +0800
-+++ gdesklets-0.35.4/display/Makefile.in 2008-02-06 12:37:54.000000000 +0800
++++ gdesklets-0.35.4/display/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -12933,7 +13121,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/doc/Makefile.in gdesklets-0.35.4/doc/Makefile.in
--- gdesklets-0.35.4.orig/doc/Makefile.in 2006-10-05 20:04:35.000000000 +0800
-+++ gdesklets-0.35.4/doc/Makefile.in 2008-02-06 12:37:54.000000000 +0800
++++ gdesklets-0.35.4/doc/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -13272,7 +13460,7 @@
doc:
diff -urN gdesklets-0.35.4.orig/doc/man/Makefile.in gdesklets-0.35.4/doc/man/Makefile.in
--- gdesklets-0.35.4.orig/doc/man/Makefile.in 2006-10-05 20:04:35.000000000 +0800
-+++ gdesklets-0.35.4/doc/man/Makefile.in 2008-02-06 12:37:54.000000000 +0800
++++ gdesklets-0.35.4/doc/man/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -13531,7 +13719,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/factory/Makefile.in gdesklets-0.35.4/factory/Makefile.in
--- gdesklets-0.35.4.orig/factory/Makefile.in 2006-10-05 20:04:35.000000000 +0800
-+++ gdesklets-0.35.4/factory/Makefile.in 2008-02-06 12:37:54.000000000 +0800
++++ gdesklets-0.35.4/factory/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -13798,781 +13986,844 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN gdesklets-0.35.4.orig/INSTALL gdesklets-0.35.4/INSTALL
---- gdesklets-0.35.4.orig/INSTALL 2006-10-05 20:04:42.000000000 +0800
-+++ gdesklets-0.35.4/INSTALL 2008-02-06 12:37:57.000000000 +0800
-@@ -1,8 +1,8 @@
- Installation Instructions
- *************************
-
--Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
--Software Foundation, Inc.
-+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-+2006, 2007 Free Software Foundation, Inc.
-
- This file is free documentation; the Free Software Foundation gives
- unlimited permission to copy, distribute and modify it.
-@@ -10,7 +10,10 @@
- Basic Installation
- ==================
-
--These are generic installation instructions.
-+Briefly, the shell commands `./configure; make; make install' should
-+configure, build, and install this package. The following
-+more-detailed instructions are generic; see the `README' file for
-+instructions specific to this package.
-
- The `configure' shell script attempts to guess correct values for
- various system-dependent variables used during compilation. It uses
-@@ -23,9 +26,9 @@
-
- It can also use an optional file (typically called `config.cache'
- and enabled with `--cache-file=config.cache' or simply `-C') that saves
--the results of its tests to speed up reconfiguring. (Caching is
-+the results of its tests to speed up reconfiguring. Caching is
- disabled by default to prevent problems with accidental use of stale
--cache files.)
-+cache files.
-
- If you need to do unusual things to compile the package, please try
- to figure out how `configure' could check whether to do them, and mail
-@@ -35,20 +38,17 @@
- may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
--`configure' by a program called `autoconf'. You only need
--`configure.ac' if you want to change it or regenerate `configure' using
--a newer version of `autoconf'.
-+`configure' by a program called `autoconf'. You need `configure.ac' if
-+you want to change it or regenerate `configure' using a newer version
-+of `autoconf'.
-
- The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
-- `./configure' to configure the package for your system. If you're
-- using `csh' on an old version of System V, you might need to type
-- `sh ./configure' instead to prevent `csh' from trying to execute
-- `configure' itself.
-+ `./configure' to configure the package for your system.
-
-- Running `configure' takes awhile. While running, it prints some
-- messages telling which features it is checking for.
-+ Running `configure' might take a while. While running, it prints
-+ some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
-@@ -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
- =====================
-
-@@ -78,7 +81,7 @@
- by setting variables in the command line or in the environment. Here
- is an example:
-
-- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-@@ -87,17 +90,15 @@
-
- You can compile the package for more than one kind of computer at the
- same time, by placing the object files for each architecture in their
--own directory. To do this, you must use a version of `make' that
--supports the `VPATH' variable, such as GNU `make'. `cd' to the
-+own directory. To do this, you can use GNU `make'. `cd' to the
- directory where you want the object files and executables to go and run
- the `configure' script. `configure' automatically checks for the
- source code in the directory that `configure' is in and in `..'.
-
-- If you have to use a `make' that does not support the `VPATH'
--variable, you have to compile the package for one architecture at a
--time in the source code directory. After you have installed the
--package for one architecture, use `make distclean' before reconfiguring
--for another architecture.
-+ With a non-GNU `make', it is safer to compile the package for one
-+architecture at a time in the source code directory. After you have
-+installed the package for one architecture, use `make distclean' before
-+reconfiguring for another architecture.
-
- Installation Names
- ==================
-@@ -190,12 +191,12 @@
- ./configure CC=/usr/local2/bin/gcc
-
- causes the specified `gcc' to be used as the C compiler (unless it is
--overridden in the site shell script). Here is a another example:
-+overridden in the site shell script).
-
-- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-+an Autoconf bug. Until the bug is fixed you can use this workaround:
-
--Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
--configuration-related scripts to be executed by `/bin/bash'.
-+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
- `configure' Invocation
- ======================
-diff -urN gdesklets-0.35.4.orig/install-sh gdesklets-0.35.4/install-sh
---- gdesklets-0.35.4.orig/install-sh 2006-10-05 20:04:32.000000000 +0800
-+++ gdesklets-0.35.4/install-sh 2008-02-06 12:37:52.000000000 +0800
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # install - install a program, script, or datafile
-
--scriptversion=2005-05-14.22
-+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
-@@ -39,38 +39,68 @@
- # when there is no Makefile.
+diff -urN gdesklets-0.35.4.orig/intltool-extract.in gdesklets-0.35.4/intltool-extract.in
+--- gdesklets-0.35.4.orig/intltool-extract.in 2006-10-05 20:04:21.000000000 +0800
++++ gdesklets-0.35.4/intltool-extract.in 2008-02-15 01:20:20.000000000 +0800
+@@ -32,7 +32,7 @@
+ ## Release information
+ my $PROGRAM = "intltool-extract";
+ my $PACKAGE = "intltool";
+-my $VERSION = "0.35.0";
++my $VERSION = "0.37.0";
+
+ ## Loaded modules
+ use strict;
+@@ -114,6 +114,11 @@
+ sub place_normal {
+ $FILE = $ARGV[0];
+ $OUTFILE = "$FILE.h";
++
++ my $dirname = dirname ($OUTFILE);
++ if (! -d "$dirname" && $dirname ne "") {
++ system ("mkdir -p $dirname");
++ }
+ }
+
+ sub place_local {
+@@ -156,7 +161,8 @@
+ --type=TYPE Specify the file type of FILENAME. Currently supports:
+ "gettext/glade", "gettext/ini", "gettext/keys"
+ "gettext/rfc822deb", "gettext/schemas",
+- "gettext/scheme", "gettext/xml"
++ "gettext/scheme", "gettext/xml", "gettext/quoted",
++ "gettext/quotedxml"
+ -l, --local Writes output into current working directory
+ (conflicts with --update)
+ --update Writes output into the same directory the source file
+@@ -212,6 +218,8 @@
+ &type_scheme if $gettext_type eq "scheme";
+ &type_schemas if $gettext_type eq "schemas";
+ &type_rfc822deb if $gettext_type eq "rfc822deb";
++ &type_quoted if $gettext_type eq "quoted";
++ &type_quotedxml if $gettext_type eq "quotedxml";
+ }
+
+ sub entity_decode_minimal
+@@ -231,9 +239,9 @@
+
+ s/'/'/g; # '
+ s/"/"/g; # "
+- s/&/&/g;
+ s/</</g;
+ s/>/>/g;
++ s/&/&/g;
+
+ return $_;
+ }
+@@ -242,7 +250,7 @@
+ {
+ return '\"' if $_ eq '"';
+ return '\n' if $_ eq "\n";
+- return '\\' if $_ eq '\\';
++ return '\\\\' if $_ eq '\\';
+
+ return $_;
+ }
+@@ -255,8 +263,11 @@
+
+ sub type_ini {
+ ### For generic translatable desktop files ###
+- while ($input =~ /^_.*=(.*)$/mg) {
+- $messages{$1} = [];
++ while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) {
++ if (defined($2)) {
++ $comments{$3} = $2;
++ }
++ $messages{$3} = [];
+ }
+ }
+
+@@ -711,6 +722,29 @@
+ return @list;
+ }
+
++sub type_quoted {
++ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
++ my $message = $1;
++ my $before = $`;
++ $message =~ s/\\\"/\"/g;
++ $before =~ s/[^\n]//g;
++ $messages{$message} = [];
++ $loc{$message} = length ($before) + 2;
++ }
++}
++
++sub type_quotedxml {
++ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
++ my $message = $1;
++ my $before = $`;
++ $message =~ s/\\\"/\"/g;
++ $message = entity_decode($message);
++ $before =~ s/[^\n]//g;
++ $messages{$message} = [];
++ $loc{$message} = length ($before) + 2;
++ }
++}
++
+ sub type_glade {
+ ### For translatable Glade XML files ###
+
+diff -urN gdesklets-0.35.4.orig/intltool-merge.in gdesklets-0.35.4/intltool-merge.in
+--- gdesklets-0.35.4.orig/intltool-merge.in 2006-10-05 20:04:21.000000000 +0800
++++ gdesklets-0.35.4/intltool-merge.in 2008-02-15 01:20:20.000000000 +0800
+@@ -35,7 +35,7 @@
+ ## Release information
+ my $PROGRAM = "intltool-merge";
+ my $PACKAGE = "intltool";
+-my $VERSION = "0.35.0";
++my $VERSION = "0.37.0";
+
+ ## Loaded modules
+ use strict;
+@@ -60,6 +60,8 @@
+ my $DESKTOP_STYLE_ARG = 0;
+ my $SCHEMAS_STYLE_ARG = 0;
+ my $RFC822DEB_STYLE_ARG = 0;
++my $QUOTED_STYLE_ARG = 0;
++my $QUOTEDXML_STYLE_ARG = 0;
+ my $QUIET_ARG = 0;
+ my $PASS_THROUGH_ARG = 0;
+ my $UTF8_ARG = 0;
+@@ -79,6 +81,8 @@
+ "desktop-style|d" => \$DESKTOP_STYLE_ARG,
+ "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
+ "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
++ "quoted-style" => \$QUOTED_STYLE_ARG,
++ "quotedxml-style" => \$QUOTEDXML_STYLE_ARG,
+ "pass-through|p" => \$PASS_THROUGH_ARG,
+ "utf8|u" => \$UTF8_ARG,
+ "multiple-output|m" => \$MULTIPLE_OUTPUT,
+@@ -91,9 +95,24 @@
+
+ my %po_files_by_lang = ();
+ my %translations = ();
+-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
++my $iconv = $ENV{"ICONV"} || "iconv";
+ my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
+
++sub isProgramInPath
++{
++ my ($file) = @_;
++ # If either a file exists, or when run it returns 0 exit status
++ return 1 if ((-x $file) or (system("$file -l >$devnull") == 0));
++ return 0;
++}
++
++if (! isProgramInPath ("$iconv"))
++{
++ print STDERR " *** iconv is not found on this system!\n".
++ " *** Without it, intltool-merge can not convert encodings.\n";
++ exit;
++}
++
+ # Use this instead of \w for XML files to handle more possible characters.
+ my $w = "[-A-Za-z0-9._:]";
+
+@@ -131,7 +150,7 @@
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+- &keys_merge_translations;
++ &keys_merge_translations;
+ &finalize;
+ }
+ elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
+@@ -157,6 +176,14 @@
+ &rfc822deb_merge_translations;
+ &finalize;
+ }
++elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2)
++{
++ &utf8_sanity_check;
++ &preparation;
++ &print_message;
++ "ed_merge_translations($QUOTEDXML_STYLE_ARG);
++ &finalize;
++}
+ else
+ {
+ &print_help;
+@@ -193,6 +220,8 @@
+ -k, --keys-style includes translations in the keys style
+ -s, --schemas-style includes translations in the schemas style
+ -r, --rfc822deb-style includes translations in the RFC822 style
++ --quoted-style includes translations in the quoted string style
++ --quotedxml-style includes translations in the quoted xml string style
+ -x, --xml-style includes translations in the standard xml style
+
+ Other options:
+@@ -249,8 +278,41 @@
+
+ sub gather_po_files
+ {
+- for my $po_file (glob "$PO_DIR/*.po") {
+- $po_files_by_lang{po_file2lang($po_file)} = $po_file;
++ if (my $linguas = $ENV{"LINGUAS"})
++ {
++ for my $lang (split / /, $linguas) {
++ my $po_file = $PO_DIR . "/" . $lang . ".po";
++ if (-e $po_file) {
++ $po_files_by_lang{$lang} = $po_file;
++ }
++ }
++ }
++ else
++ {
++ if (open LINGUAS_FILE, "$PO_DIR/LINGUAS")
++ {
++ while (<LINGUAS_FILE>)
++ {
++ next if /^#/;
++
++ for my $lang (split)
++ {
++ chomp ($lang);
++ my $po_file = $PO_DIR . "/" . $lang . ".po";
++ if (-e $po_file) {
++ $po_files_by_lang{$lang} = $po_file;
++ }
++ }
++ }
++
++ close LINGUAS_FILE;
++ }
++ else
++ {
++ for my $po_file (glob "$PO_DIR/*.po") {
++ $po_files_by_lang{po_file2lang($po_file)} = $po_file;
++ }
++ }
+ }
+ }
+
+@@ -415,7 +477,7 @@
+ {
+ $nextfuzzy = 1 if /^#, fuzzy/;
+
+- if (/^msgid "((\\.|[^\\])*)"/ )
++ if (/^msgid "((\\.|[^\\]+)*)"/ )
+ {
+ $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
+ $msgid = "";
+@@ -431,14 +493,14 @@
+ $nextfuzzy = 0;
+ }
+
+- if (/^msgstr "((\\.|[^\\])*)"/)
++ if (/^msgstr "((\\.|[^\\]+)*)"/)
+ {
+ $msgstr = unescape_po_string($1);
+ $inmsgstr = 1;
+ $inmsgid = 0;
+ }
+
+- if (/^"((\\.|[^\\])*)"/)
++ if (/^"((\\.|[^\\]+)*)"/)
+ {
+ $msgid .= unescape_po_string($1) if $inmsgid;
+ $msgstr .= unescape_po_string($1) if $inmsgstr;
+@@ -483,16 +545,15 @@
+ return $string;
+ }
+
+-## NOTE: deal with < - < but not > - > because it seems its ok to have
+-## > in the entity. For further info please look at #84738.
+ sub entity_decode
+ {
+ local ($_) = @_;
+
+ s/'/'/g; # '
+ s/"/"/g; # "
+- s/&/&/g;
+ s/</</g;
++ s/>/>/g;
++ s/&/&/g;
+
+ return $_;
+ }
+@@ -517,6 +578,7 @@
+ return "&" if $_ == 38;
+ return "'" if $_ == 39;
+ return "<" if $_ == 60;
++ return ">" if $_ == 62;
+ return chr $_;
+ }
+
+@@ -1006,8 +1068,8 @@
+
+ if ($MULTIPLE_OUTPUT) {
+ for my $lang (sort keys %po_files_by_lang) {
+- if ( ! -e $lang ) {
+- mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
++ if ( ! -d $lang ) {
++ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
+ }
+ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+@@ -1017,43 +1079,74 @@
+ close OUTPUT;
+ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
+ }
+- }
+- open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
+- binmode (OUTPUT) if $^O eq 'MSWin32';
+- my $tree = readXml($FILE);
+- print_header($FILE, \*OUTPUT);
+- parseTree(\*OUTPUT, $tree);
+- close OUTPUT;
+- print "CREATED $OUTFILE\n" unless $QUIET_ARG;
++ if ( ! -d "C" ) {
++ mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n";
++ }
++ open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n";
++ binmode (OUTPUT) if $^O eq 'MSWin32';
++ my $tree = readXml($FILE);
++ print_header($FILE, \*OUTPUT);
++ parseTree(\*OUTPUT, $tree);
++ close OUTPUT;
++ print "CREATED C/$OUTFILE\n" unless $QUIET_ARG;
++ } else {
++ open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
++ binmode (OUTPUT) if $^O eq 'MSWin32';
++ my $tree = readXml($FILE);
++ print_header($FILE, \*OUTPUT);
++ parseTree(\*OUTPUT, $tree);
++ close OUTPUT;
++ print "CREATED $OUTFILE\n" unless $QUIET_ARG;
++ }
+ }
+
+-sub keys_merge_translations
++sub keys_merge_translation
+ {
+- open INPUT, "<${FILE}" or die;
+- open OUTPUT, ">${OUTFILE}" or die;
++ my ($lang) = @_;
++
++ if ( ! -d $lang && $MULTIPLE_OUTPUT)
++ {
++ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
++ }
++
++ open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
++ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+
+- while (<INPUT>)
++ while (<INPUT>)
+ {
+- if (s/^(\s*)_(\w+=(.*))/$1$2/)
++ if (s/^(\s*)_(\w+=(.*))/$1$2/)
+ {
+- my $string = $3;
++ my $string = $3;
+
+- print OUTPUT;
++ if (!$MULTIPLE_OUTPUT)
++ {
++ print OUTPUT;
+
+- my $non_translated_line = $_;
++ my $non_translated_line = $_;
+
+- for my $lang (sort keys %po_files_by_lang)
++ for my $lang (sort keys %po_files_by_lang)
++ {
++ my $translation = $translations{$lang, $string};
++ next if !$translation;
++
++ $_ = $non_translated_line;
++ s/(\w+)=.*/[$lang]$1=$translation/;
++ print OUTPUT;
++ }
++ }
++ else
+ {
+- my $translation = $translations{$lang, $string};
+- next if !$translation;
++ my $non_translated_line = $_;
++ my $translation = $translations{$lang, $string};
++ $translation = $string if !$translation;
+
+ $_ = $non_translated_line;
+- s/(\w+)=.*/[$lang]$1=$translation/;
++ s/(\w+)=.*/$1=$translation/;
+ print OUTPUT;
+ }
+- }
+- else
++ }
++ else
+ {
+ print OUTPUT;
+ }
+@@ -1061,6 +1154,24 @@
+
+ close OUTPUT;
+ close INPUT;
++
++ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
++}
++
++sub keys_merge_translations
++{
++ if ($MULTIPLE_OUTPUT)
++ {
++ for my $lang (sort keys %po_files_by_lang)
++ {
++ keys_merge_translation ($lang);
++ }
++ keys_merge_translation ("C");
++ }
++ else
++ {
++ keys_merge_translation (".");
++ }
+ }
+
+ sub desktop_merge_translations
+@@ -1354,3 +1465,42 @@
+ return @list;
+ }
+
++sub quoted_translation
++{
++ my ($xml_mode, $lang, $string) = @_;
++
++ $string = entity_decode($string) if $xml_mode;
++ $string =~ s/\\\"/\"/g;
++
++ my $translation = $translations{$lang, $string};
++ $translation = $string if !$translation;
++ $translation = entity_encode($translation) if $xml_mode;
++ $translation =~ s/\"/\\\"/g;
++ return $translation
++}
++
++sub quoted_merge_translations
++{
++ my ($xml_mode) = @_;
++
++ if (!$MULTIPLE_OUTPUT) {
++ print "Quoted only supports Multiple Output.\n";
++ exit(1);
++ }
++
++ for my $lang (sort keys %po_files_by_lang) {
++ if ( ! -d $lang ) {
++ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
++ }
++ open INPUT, "<${FILE}" or die;
++ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
++ binmode (OUTPUT) if $^O eq 'MSWin32';
++ while (<INPUT>)
++ {
++ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge;
++ print OUTPUT;
++ }
++ close OUTPUT;
++ close INPUT;
++ }
++}
+diff -urN gdesklets-0.35.4.orig/intltool-update.in gdesklets-0.35.4/intltool-update.in
+--- gdesklets-0.35.4.orig/intltool-update.in 2006-10-05 20:04:21.000000000 +0800
++++ gdesklets-0.35.4/intltool-update.in 2008-02-15 01:20:20.000000000 +0800
+@@ -30,7 +30,7 @@
+
+ ## Release information
+ my $PROGRAM = "intltool-update";
+-my $VERSION = "0.35.0";
++my $VERSION = "0.37.0";
+ my $PACKAGE = "intltool";
+
+ ## Loaded modules
+@@ -71,7 +71,8 @@
+ "sheet(?:\\.in)+|". # ?
+ "schemas(?:\\.in)+|". # GConf specific
+ "pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
+-"kbd(?:\\.in)+"; # GOK specific.
++"kbd(?:\\.in)+|". # GOK specific.
++"policy(?:\\.in)+"; # PolicyKit files
+
+ my $ini_support =
+ "icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
+@@ -90,10 +91,9 @@
+ $| = 1;
+
+ ## Sometimes the source tree will be rooted somewhere else.
+-my $SRCDIR = ".";
++my $SRCDIR = $ENV{"srcdir"} || ".";
+ my $POTFILES_in;
+
+-$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
+ $POTFILES_in = "<$SRCDIR/POTFILES.in";
+
+ my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
+@@ -124,8 +124,10 @@
+
+ &Console_Write_IntltoolHelp if $arg_count > 1;
+
++my $PKGNAME = FindPackageName ();
++
+ # --version and --help don't require a module name
+-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
++my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
+
+ if ($POT_ARG)
+ {
+@@ -316,7 +318,8 @@
+ @buf_potfiles_ignore,
+ @buf_allfiles,
+ @buf_allfiles_sorted,
+- @buf_potfiles_sorted
++ @buf_potfiles_sorted,
++ @buf_potfiles_ignore_sorted
+ );
+
+ ## Search and find all translatable files
+@@ -326,7 +329,12 @@
+ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
+ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
+ }, "..";
+-
++ find sub {
++ push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/;
++ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
++ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
++ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
++ }, "$SRCDIR/.." if "$SRCDIR" ne ".";
+
+ open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
+ @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
+@@ -342,7 +350,7 @@
+ ## comparing with POTFILES.in
+ foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
+ {
+- (-s $ignore) or next;
++ (-s "$SRCDIR/$ignore") or next;
+
+ if ("$ignore" eq "POTFILES.ignore")
+ {
+@@ -351,7 +359,7 @@
+ }
+
+ print "Found $ignore: Ignoring files...\n" if $VERBOSE;
+- open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n";
++ open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n";
+
+ while (<FILE>)
+ {
+@@ -359,7 +367,7 @@
+ }
+ close FILE;
+
+- @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
++ @buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore);
+ }
+
+ foreach my $file (@buf_i18n_plain)
+@@ -417,7 +425,7 @@
+ }
+ }
+
+- if (/\.GetString ?\(QUOTEDTEXT/)
++ if (/\w\.GetString *\(QUOTEDTEXT/)
+ {
+ if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+ ## Remove the first 3 chars and add newline
+@@ -426,7 +434,8 @@
+ last;
+ }
+
+- if (/_\(QUOTEDTEXT/)
++ ## C_ N_ Q_ and _ are the macros defined in gi8n.h
++ if (/[CNQ]?_ *\(QUOTEDTEXT/)
+ {
+ if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+ ## Remove the first 3 chars and add newline
+@@ -486,6 +495,15 @@
+ my %in2;
+ foreach (@buf_potfiles_sorted)
+ {
++ s#^$SRCDIR/../##;
++ s#^$SRCDIR/##;
++ $in2{$_} = 1;
++ }
++
++ foreach (@buf_potfiles_ignore_sorted)
++ {
++ s#^$SRCDIR/../##;
++ s#^$SRCDIR/##;
+ $in2{$_} = 1;
+ }
+
+@@ -493,9 +511,16 @@
+
+ foreach (@buf_allfiles_sorted)
+ {
+- if (!exists($in2{$_}))
++ my $dummy = $_;
++ my $srcdir = $SRCDIR;
++
++ $srcdir =~ s#^../##;
++ $dummy =~ s#^$srcdir/../##;
++ $dummy =~ s#^$srcdir/##;
++ $dummy =~ s#_build/##;
++ if (!exists($in2{$dummy}))
+ {
+- push @result, $_
++ push @result, $dummy
+ }
+ }
+
+@@ -504,7 +529,7 @@
+ foreach (@buf_potfiles_sorted)
+ {
+ chomp (my $dummy = $_);
+- if ("$dummy" ne "" and ! -f "../$dummy")
++ if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy"))
+ {
+ push @buf_potfiles_notexist, $_;
+ }
+@@ -537,7 +562,7 @@
+ warn "\n" if ($VERBOSE or @result);
+ warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
+ warn @buf_potfiles_notexist, "\n";
+- warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n".
++ warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n".
+ "containing this list of absent files has been written in the current directory.\n";
+ }
+ }
+@@ -555,16 +580,33 @@
+ exit 1;
+ }
+
+-sub GenerateHeaders
++sub isProgramInPath
+ {
+- my $EXTRACT = "@INTLTOOL_EXTRACT@";
+- chomp $EXTRACT;
++ my ($file) = @_;
++ # If either a file exists, or when run it returns 0 exit status
++ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
++ return 0;
++}
+
+- $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
++sub isGNUGettextTool
++{
++ my ($file) = @_;
++ # Check that we are using GNU gettext tools
++ if (isProgramInPath ($file))
++ {
++ my $version = `$file --version`;
++ return 1 if ($version =~ m/.*\(GNU .*\).*/);
++ }
++ return 0;
++}
++
++sub GenerateHeaders
++{
++ my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
+
+ ## Generate the .h header files, so we can allow glade and
+ ## xml translation support
+- if (! -x "$EXTRACT")
++ if (! isProgramInPath ("$EXTRACT"))
+ {
+ print STDERR "\n *** The intltool-extract script wasn't found!"
+ ."\n *** Without it, intltool-update can not generate files.\n";
+@@ -611,13 +653,13 @@
#
- # This script is compatible with the BSD install script, but was written
--# from scratch. It can only install one file at a time, a restriction
--# shared with many OS's install programs.
-+# from scratch.
-+
-+nl='
-+'
-+IFS=" "" $nl"
-
- # 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
-+ doit_exec=$doit
-+fi
-
--# put in absolute paths if you don't have them in your path; or use env. vars.
-+# 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_mkdir=
-+
-+# Desired mode of installed file.
-+mode=0755
-
--chmodcmd="$chmodprog 0755"
--chowncmd=
- chgrpcmd=
--stripcmd=
-+chmodcmd=$chmodprog
-+chowncmd=
-+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...
-@@ -80,81 +110,86 @@
- 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 -n "$1"; do
-+while test $# -ne 0; do
- case $1 in
-- -c) shift
-- continue;;
-+ -c) ;;
-
-- -d) dir_arg=true
-- shift
-- continue;;
-+ -C) copy_on_change=true;;
-+
-+ -d) dir_arg=true;;
-
- -g) chgrpcmd="$chgrpprog $2"
-- shift
-- shift
-- continue;;
-+ shift;;
-
- --help) echo "$usage"; exit $?;;
-
-- -m) chmodcmd="$chmodprog $2"
-- shift
-- shift
-- continue;;
-+ -m) mode=$2
-+ case $mode in
-+ *' '* | *' '* | *'
-+'* | *'*'* | *'?'* | *'['*)
-+ echo "$0: invalid mode: $mode" >&2
-+ exit 1;;
-+ esac
-+ 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 $?;;
-
-- *) # When -d is used, all remaining arguments are directories to create.
-- # When -t is used, the destination is already specified.
-- test -n "$dir_arg$dstarg" && break
-- # Otherwise, the last argument is the destination. Remove it from $@.
-- for arg
-- do
-- if test -n "$dstarg"; then
-- # $@ is not empty: it contains at least $arg.
-- set fnord "$@" "$dstarg"
-- shift # fnord
-- fi
-- shift # arg
-- dstarg=$arg
-- done
-+ --) shift
- break;;
-+
-+ -*) echo "$0: invalid option: $1" >&2
-+ exit 1;;
-+
-+ *) break;;
- esac
-+ shift
- done
-
--if test -z "$1"; 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 "$dst_arg"; then
-+ # $@ is not empty: it contains at least $arg.
-+ set fnord "$@" "$dst_arg"
-+ shift # fnord
-+ fi
-+ shift # arg
-+ dst_arg=$arg
-+ done
-+fi
-+
-+if test $# -eq 0; then
- if test -z "$dir_arg"; then
- echo "$0: no input file specified." >&2
- exit 1
-@@ -164,24 +199,47 @@
- exit 0
- fi
-
-+if test -z "$dir_arg"; then
-+ trap '(exit $?); exit' 1 2 13 15
-+
-+ # Set umask so as not to create temps with too-generous modes.
-+ # However, 'strip' requires both read and write access to temps.
-+ case $mode in
-+ # Optimize common cases.
-+ *644) cp_umask=133;;
-+ *755) cp_umask=22;;
-+
-+ *[0-7])
-+ if test -z "$stripcmd"; then
-+ u_plus_rw=
-+ else
-+ u_plus_rw='% 200'
-+ fi
-+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-+ *)
-+ if test -z "$stripcmd"; then
-+ u_plus_rw=
-+ else
-+ u_plus_rw=,u+rw
-+ fi
-+ cp_umask=$mode$u_plus_rw;;
-+ esac
-+fi
-+
- for src
- do
- # Protect names starting with `-'.
- case $src in
-- -*) src=./$src ;;
-+ -*) src=./$src;;
- esac
-
- if test -n "$dir_arg"; then
- dst=$src
-- src=
--
-- if test -d "$dst"; then
-- mkdircmd=:
-- chmodcmd=
-- else
-- mkdircmd=$mkdirprog
-- fi
-+ dstdir=$dst
-+ test -d "$dstdir"
-+ dstdir_status=$?
- else
-+
- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
- # might cause directories to be created, which would be especially bad
- # if $src (and thus $dsttmp) contains '*'.
-@@ -190,71 +248,199 @@
- 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
-- dst=$dst/`basename "$src"`
-+ dstdir=$dst
-+ dst=$dstdir/`basename "$src"`
-+ dstdir_status=0
-+ else
-+ # Prefer dirname, but fall back on a substitute if dirname fails.
-+ dstdir=`
-+ (dirname "$dst") 2>/dev/null ||
-+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$dst" : 'X\(//\)[^/]' \| \
-+ X"$dst" : 'X\(//\)$' \| \
-+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-+ echo X"$dst" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'
-+ `
-+
-+ test -d "$dstdir"
-+ dstdir_status=$?
- fi
- fi
-
-- # This sed command emulates the dirname command.
-- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
--
-- # Make sure that the destination directory exists.
-+ obsolete_mkdir_used=false
-
-- # Skip lots of stat calls in the usual case.
-- if test ! -d "$dstdir"; then
-- defaultIFS='
-- '
-- IFS="${IFS-$defaultIFS}"
--
-- oIFS=$IFS
-- # Some sh's can't handle IFS=/ for some reason.
-- IFS='%'
-- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-- shift
-- IFS=$oIFS
-+ if test $dstdir_status != 0; then
-+ case $posix_mkdir in
-+ '')
-+ # Create intermediate dirs using mode 755 as modified by the umask.
-+ # This is like FreeBSD 'install' as of 1997-10-28.
-+ umask=`umask`
-+ case $stripcmd.$umask in
-+ # Optimize common cases.
-+ *[2367][2367]) mkdir_umask=$umask;;
-+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-+
-+ *[0-7])
-+ mkdir_umask=`expr $umask + 22 \
-+ - $umask % 100 % 40 + $umask % 20 \
-+ - $umask % 10 % 4 + $umask % 2
-+ `;;
-+ *) mkdir_umask=$umask,go-w;;
-+ esac
-+
-+ # With -d, create the new directory with the user-specified mode.
-+ # Otherwise, rely on $mkdir_umask.
-+ if test -n "$dir_arg"; then
-+ mkdir_mode=-m$mode
-+ else
-+ mkdir_mode=
-+ fi
-+
-+ posix_mkdir=false
-+ case $umask in
-+ *[123567][0-7][0-7])
-+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
-+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-+ ;;
-+ *)
-+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-+
-+ if (umask $mkdir_umask &&
-+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-+ then
-+ if test -z "$dir_arg" || {
-+ # Check for POSIX incompatibilities with -m.
-+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-+ # other-writeable bit of parent directory when it shouldn't.
-+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
-+ case $ls_ld_tmpdir in
-+ d????-?r-*) different_mode=700;;
-+ d????-?--*) different_mode=755;;
-+ *) false;;
-+ esac &&
-+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-+ }
-+ }
-+ then posix_mkdir=:
-+ fi
-+ rmdir "$tmpdir/d" "$tmpdir"
-+ else
-+ # Remove any dirs left behind by ancient mkdir implementations.
-+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-+ fi
-+ trap '' 0;;
-+ esac;;
-+ esac
-
-- pathcomp=
-+ if
-+ $posix_mkdir && (
-+ umask $mkdir_umask &&
-+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-+ )
-+ then :
-+ else
-
-- while test $# -ne 0 ; do
-- pathcomp=$pathcomp$1
-+ # The umask is ridiculous, or mkdir does not conform to POSIX,
-+ # or it failed possibly due to a race condition. Create the
-+ # directory the slow way, step by step, checking for races as we go.
-+
-+ case $dstdir in
-+ /*) prefix='/';;
-+ -*) prefix='./';;
-+ *) prefix='';;
-+ esac
-+
-+ eval "$initialize_posix_glob"
-+
-+ oIFS=$IFS
-+ IFS=/
-+ $posix_glob set -f
-+ set fnord $dstdir
- shift
-- if test ! -d "$pathcomp"; then
-- $mkdirprog "$pathcomp"
-- # mkdir can fail with a `File exist' error in case several
-- # install-sh are creating the directory concurrently. This
-- # is OK.
-- test -d "$pathcomp" || exit
-+ $posix_glob set +f
-+ IFS=$oIFS
-+
-+ prefixes=
-+
-+ for d
-+ do
-+ test -z "$d" && continue
-+
-+ prefix=$prefix$d
-+ if test -d "$prefix"; then
-+ prefixes=
-+ else
-+ if $posix_mkdir; then
-+ (umask=$mkdir_umask &&
-+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-+ # Don't fail if two instances are running concurrently.
-+ test -d "$prefix" || exit 1
-+ else
-+ case $prefix in
-+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-+ *) qprefix=$prefix;;
-+ esac
-+ prefixes="$prefixes '$qprefix'"
-+ fi
-+ fi
-+ prefix=$prefix/
-+ done
-+
-+ if test -n "$prefixes"; then
-+ # Don't fail if two instances are running concurrently.
-+ (umask $mkdir_umask &&
-+ eval "\$doit_exec \$mkdirprog $prefixes") ||
-+ test -d "$dstdir" || exit 1
-+ obsolete_mkdir_used=true
- fi
-- pathcomp=$pathcomp/
-- done
-+ fi
- fi
-
- if test -n "$dir_arg"; then
-- $doit $mkdircmd "$dst" \
-- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
--
-+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
- else
-- dstfile=`basename "$dst"`
-
- # Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
-@@ -262,10 +448,9 @@
-
- # Trap to clean up those temp files at exit.
- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-- trap '(exit $?); exit' 1 2 13 15
-
- # Copy the file name to the temp name.
-- $doit $cpprog "$src" "$dsttmp" &&
-+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
- # and set any options; do chmod last to preserve setuid bits.
- #
-@@ -273,47 +458,58 @@
- # 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 "$dsttmp"; } &&
--
-- # Now rename the file to the real destination.
-- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 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 "$dstdir/$dstfile"; then
-- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-- || {
-- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-- (exit 1); exit 1
-- }
-- else
-- :
-- fi
-- } &&
--
-- # Now rename the file to the real destination.
-- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-- }
-- }
-- fi || { (exit 1); exit 1; }
--done
-+ { 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 final little trick to "correctly" pass the exit status to the exit trap.
--{
-- (exit 0); exit 0
--}
-+ # 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
-+done
-
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
+ sub GeneratePOTemplate
+ {
+- my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
++ my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext";
+ my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
+ chomp $XGETTEXT;
+
+- if (! -x $XGETTEXT)
++ if (! isGNUGettextTool ("$XGETTEXT"))
+ {
+- print STDERR " *** xgettext is not found on this system!\n".
++ print STDERR " *** GNU xgettext is not found on this system!\n".
+ " *** Without it, intltool-update can not extract strings.\n";
+ exit;
+ }
+@@ -671,12 +713,8 @@
+ }
+ else
+ {
+- if ($SRCDIR eq ".") {
+- print OUTFILE "../$_\n";
+- } else {
+- print OUTFILE "$SRCDIR/../$_\n";
+- }
+- $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
++ print OUTFILE "$SRCDIR/../$_\n";
++ $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
+ }
+
+ next if (! $gettext_support_nonascii);
+@@ -717,13 +755,29 @@
+ unlink "$MODULE.pot";
+ my @xgettext_argument=("$XGETTEXT",
+ "--add-comments",
+- "--directory\=\.",
++ "--directory\=.",
++ "--default-domain\=$MODULE",
++ "--flag\=g_strdup_printf:1:c-format",
++ "--flag\=g_string_printf:2:c-format",
++ "--flag\=g_string_append_printf:2:c-format",
++ "--flag\=g_error_new:3:c-format",
++ "--flag\=g_set_error:4:c-format",
++ "--flag\=g_markup_printf_escaped:1:c-format",
++ "--flag\=g_log:3:c-format",
++ "--flag\=g_print:1:c-format",
++ "--flag\=g_printerr:1:c-format",
++ "--flag\=g_printf:1:c-format",
++ "--flag\=g_fprintf:2:c-format",
++ "--flag\=g_sprintf:2:c-format",
++ "--flag\=g_snprintf:3:c-format",
++ "--flag\=g_scanner_error:2:c-format",
++ "--flag\=g_scanner_warn:2:c-format",
+ "--output\=$MODULE\.pot",
+ "--files-from\=\.\/POTFILES\.in\.temp");
+ my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
+ push @xgettext_argument, $XGETTEXT_KEYWORDS;
+ my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
+- push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
++ push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS;
+ push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
+ push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
+ my $xgettext_command = join ' ', @xgettext_argument;
+@@ -784,9 +838,16 @@
+ {
+ -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
+
+- my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
++ my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge";
+ my ($lang, $outfile) = @_;
+
++ if (! isGNUGettextTool ("$MSGMERGE"))
++ {
++ print STDERR " *** GNU msgmerge is not found on this system!\n".
++ " *** Without it, intltool-update can not extract strings.\n";
++ exit;
++ }
++
+ print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
+
+ my $infile = "$SRCDIR/$lang.po";
+@@ -827,7 +888,14 @@
+ sub Console_Write_TranslationStatus
+ {
+ my ($lang, $output_file) = @_;
+- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
++ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
++
++ if (! isGNUGettextTool ("$MSGFMT"))
++ {
++ print STDERR " *** GNU msgfmt is not found on this system!\n".
++ " *** Without it, intltool-update can not extract strings.\n";
++ exit;
++ }
+
+ $output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
+
+@@ -836,21 +904,28 @@
+
+ sub Console_Write_CoverageReport
+ {
+- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
++ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
++
++ if (! isGNUGettextTool ("$MSGFMT"))
++ {
++ print STDERR " *** GNU msgfmt is not found on this system!\n".
++ " *** Without it, intltool-update can not extract strings.\n";
++ exit;
++ }
+
+ &GatherPOFiles;
+
+ foreach my $lang (@languages)
+ {
+- print "$lang: ";
++ print STDERR "$lang: ";
+ &POFile_Update ($lang, "");
+ }
+
+- print "\n\n * Current translation support in $MODULE \n\n";
++ print STDERR "\n\n * Current translation support in $MODULE \n\n";
+
+ foreach my $lang (@languages)
+ {
+- print "$lang: ";
++ print STDERR "$lang: ";
+ system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
+ }
+ }
+@@ -924,13 +999,13 @@
+
+ $conf_in || die "Cannot find top_builddir in Makevars.";
+ }
+- elsif (-f "../configure.ac")
++ elsif (-f "$SRCDIR/../configure.ac")
+ {
+- $conf_in = "../configure.ac";
++ $conf_in = "$SRCDIR/../configure.ac";
+ }
+- elsif (-f "../configure.in")
++ elsif (-f "$SRCDIR/../configure.in")
+ {
+- $conf_in = "../configure.in";
++ $conf_in = "$SRCDIR/../configure.in";
+ }
+ else
+ {
+@@ -1043,6 +1118,8 @@
+ close IN;
+ }
+
++ # unwrap lines split with a trailing \
++ $make_source =~ s/\\ $ \n/ /mxg;
+ $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
+
+ return $keywords;
diff -urN gdesklets-0.35.4.orig/layout/Makefile.in gdesklets-0.35.4/layout/Makefile.in
--- gdesklets-0.35.4.orig/layout/Makefile.in 2006-10-05 20:04:36.000000000 +0800
-+++ gdesklets-0.35.4/layout/Makefile.in 2008-02-06 12:37:54.000000000 +0800
++++ gdesklets-0.35.4/layout/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -14841,7 +15092,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/libdesklets/controls/Makefile.in gdesklets-0.35.4/libdesklets/controls/Makefile.in
--- gdesklets-0.35.4.orig/libdesklets/controls/Makefile.in 2006-10-05 20:04:36.000000000 +0800
-+++ gdesklets-0.35.4/libdesklets/controls/Makefile.in 2008-02-06 12:37:54.000000000 +0800
++++ gdesklets-0.35.4/libdesklets/controls/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -15110,7 +15361,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/libdesklets/Makefile.in gdesklets-0.35.4/libdesklets/Makefile.in
--- gdesklets-0.35.4.orig/libdesklets/Makefile.in 2006-10-05 20:04:36.000000000 +0800
-+++ gdesklets-0.35.4/libdesklets/Makefile.in 2008-02-06 12:37:54.000000000 +0800
++++ gdesklets-0.35.4/libdesklets/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -15480,7 +15731,7 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -urN gdesklets-0.35.4.orig/libdesklets/system/FreeBSD/Makefile.in gdesklets-0.35.4/libdesklets/system/FreeBSD/Makefile.in
--- gdesklets-0.35.4.orig/libdesklets/system/FreeBSD/Makefile.in 2006-10-05 20:04:36.000000000 +0800
-+++ gdesklets-0.35.4/libdesklets/system/FreeBSD/Makefile.in 2008-02-06 12:37:54.000000000 +0800
++++ gdesklets-0.35.4/libdesklets/system/FreeBSD/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -15749,7 +16000,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/libdesklets/system/Linux/Makefile.in gdesklets-0.35.4/libdesklets/system/Linux/Makefile.in
--- gdesklets-0.35.4.orig/libdesklets/system/Linux/Makefile.in 2006-10-05 20:04:37.000000000 +0800
-+++ gdesklets-0.35.4/libdesklets/system/Linux/Makefile.in 2008-02-06 12:37:54.000000000 +0800
++++ gdesklets-0.35.4/libdesklets/system/Linux/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16018,7 +16269,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/libdesklets/system/Makefile.in gdesklets-0.35.4/libdesklets/system/Makefile.in
--- gdesklets-0.35.4.orig/libdesklets/system/Makefile.in 2006-10-05 20:04:37.000000000 +0800
-+++ gdesklets-0.35.4/libdesklets/system/Makefile.in 2008-02-06 12:37:55.000000000 +0800
++++ gdesklets-0.35.4/libdesklets/system/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16478,7 +16729,7 @@
diff -urN gdesklets-0.35.4.orig/libdesklets/system/NetBSD/Makefile.in gdesklets-0.35.4/libdesklets/system/NetBSD/Makefile.in
--- gdesklets-0.35.4.orig/libdesklets/system/NetBSD/Makefile.in 2006-10-05 20:04:37.000000000 +0800
-+++ gdesklets-0.35.4/libdesklets/system/NetBSD/Makefile.in 2008-02-06 12:37:55.000000000 +0800
++++ gdesklets-0.35.4/libdesklets/system/NetBSD/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16747,7 +16998,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/libdesklets/system/OpenBSD/Makefile.in gdesklets-0.35.4/libdesklets/system/OpenBSD/Makefile.in
--- gdesklets-0.35.4.orig/libdesklets/system/OpenBSD/Makefile.in 2006-10-05 20:04:37.000000000 +0800
-+++ gdesklets-0.35.4/libdesklets/system/OpenBSD/Makefile.in 2008-02-06 12:37:55.000000000 +0800
++++ gdesklets-0.35.4/libdesklets/system/OpenBSD/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17659,7 +17910,7 @@
diff -urN gdesklets-0.35.4.orig/main/Makefile.in gdesklets-0.35.4/main/Makefile.in
--- gdesklets-0.35.4.orig/main/Makefile.in 2006-10-05 20:04:37.000000000 +0800
-+++ gdesklets-0.35.4/main/Makefile.in 2008-02-06 12:37:55.000000000 +0800
++++ gdesklets-0.35.4/main/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17928,7 +18179,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/Makefile.in gdesklets-0.35.4/Makefile.in
--- gdesklets-0.35.4.orig/Makefile.in 2006-10-05 20:04:42.000000000 +0800
-+++ gdesklets-0.35.4/Makefile.in 2008-02-06 12:37:57.000000000 +0800
++++ gdesklets-0.35.4/Makefile.in 2008-02-18 20:50:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18351,216 +18602,9 @@
install-data-hook:
-diff -urN gdesklets-0.35.4.orig/missing gdesklets-0.35.4/missing
---- gdesklets-0.35.4.orig/missing 2006-10-05 20:04:32.000000000 +0800
-+++ gdesklets-0.35.4/missing 2008-02-06 12:37:52.000000000 +0800
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
-
--scriptversion=2005-06-08.21
-+scriptversion=2006-05-10.23
-
--# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
- # Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
-
-@@ -33,6 +33,8 @@
- fi
-
- run=:
-+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
- # In the cases where this matters, `missing' is being run in the
- # srcdir already.
-@@ -44,7 +46,7 @@
-
- msg="missing on your system"
-
--case "$1" in
-+case $1 in
- --run)
- # Try to run requested program, and just exit if it succeeds.
- run=
-@@ -77,6 +79,7 @@
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
-+ autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
-@@ -106,7 +109,7 @@
- # Now exit if we have it, but it failed. Also exit now if we
- # don't have it and --version was passed (most likely to detect
- # the program).
--case "$1" in
-+case $1 in
- lex|yacc)
- # Not GNU programs, they don't have --version.
- ;;
-@@ -135,7 +138,7 @@
-
- # If it does not exist, or fails to run (possibly an outdated version),
- # try to emulate it.
--case "$1" in
-+case $1 in
- aclocal*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
-@@ -164,7 +167,7 @@
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
-- case "$f" in
-+ case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
-@@ -192,8 +195,8 @@
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
-- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
-@@ -214,25 +217,25 @@
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
-- if [ $# -ne 1 ]; then
-+ if test $# -ne 1; then
- eval LASTARG="\${$#}"
-- case "$LASTARG" in
-+ case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
-- if [ ! -f y.tab.h ]; then
-+ if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
-- if [ ! -f y.tab.c ]; then
-+ if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-@@ -244,18 +247,18 @@
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
-- if [ $# -ne 1 ]; then
-+ if test $# -ne 1; then
- eval LASTARG="\${$#}"
-- case "$LASTARG" in
-+ case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
-- if [ ! -f lex.yy.c ]; then
-+ if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-@@ -267,11 +270,9 @@
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
-- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-- if test -z "$file"; then
-- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-- fi
-- if [ -f "$file" ]; then
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+ if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
-@@ -289,11 +290,17 @@
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
-- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-+ file=`sed -n '
-+ /^@setfilename/{
-+ s/.* \([^ ]*\) *$/\1/
-+ p
-+ q
-+ }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
-@@ -317,13 +324,13 @@
- fi
- firstarg="$1"
- if shift; then
-- case "$firstarg" in
-+ case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
-- case "$firstarg" in
-+ case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
-diff -urN gdesklets-0.35.4.orig/mkinstalldirs gdesklets-0.35.4/mkinstalldirs
---- gdesklets-0.35.4.orig/mkinstalldirs 2006-10-05 20:04:42.000000000 +0800
-+++ gdesklets-0.35.4/mkinstalldirs 2008-02-06 12:37:57.000000000 +0800
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
-
--scriptversion=2005-06-29.22
-+scriptversion=2006-05-11.19
-
- # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
- # Created: 1993-05-16
-@@ -11,6 +11,9 @@
- # bugs to <bug-automake at gnu.org> or send patches to
- # <automake-patches at gnu.org>.
-
-+nl='
-+'
-+IFS=" "" $nl"
- errstatus=0
- dirmode=
-
diff -urN gdesklets-0.35.4.orig/plugin/Makefile.in gdesklets-0.35.4/plugin/Makefile.in
--- gdesklets-0.35.4.orig/plugin/Makefile.in 2006-10-05 20:04:38.000000000 +0800
-+++ gdesklets-0.35.4/plugin/Makefile.in 2008-02-06 12:37:55.000000000 +0800
++++ gdesklets-0.35.4/plugin/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18827,9 +18871,109 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
+diff -urN gdesklets-0.35.4.orig/po/Makefile.in.in gdesklets-0.35.4/po/Makefile.in.in
+--- gdesklets-0.35.4.orig/po/Makefile.in.in 2006-10-05 20:04:21.000000000 +0800
++++ gdesklets-0.35.4/po/Makefile.in.in 2008-02-15 01:20:20.000000000 +0800
+@@ -25,7 +25,7 @@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+-top_builddir = ..
++top_builddir = @top_builddir@
+ VPATH = @srcdir@
+
+ prefix = @prefix@
+@@ -56,15 +56,19 @@
+
+ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+
+-POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
++USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
++
++USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
++
++POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+ DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
+ EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+
+ POTFILES = \
+-#This Gets Replace for some reason
++# This comment gets stripped out
+
+-CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
++CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+
+ .SUFFIXES:
+ .SUFFIXES: .po .pox .gmo .mo .msg .cat
+@@ -98,11 +102,7 @@
+ install-data-no: all
+ install-data-yes: all
+ $(mkdir_p) $(DESTDIR)$(itlocaledir)
+- if test -n "$(PO_LINGUAS)"; then \
+- linguas="$(PO_LINGUAS)"; \
+- else \
+- linguas="$(ALL_LINGUAS)"; \
+- fi; \
++ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ $(mkdir_p) $$dir; \
+@@ -133,20 +133,21 @@
+ dvi info tags TAGS ID:
+
+ # Define this as empty until I found a useful application.
+-installcheck:
++install-exec installcheck:
+
+ uninstall:
+- if test -n "$(PO_LINGUAS)"; then \
+- linguas="$(PO_LINGUAS)"; \
+- else \
+- linguas="$(ALL_LINGUAS)"; \
+- fi; \
++ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ done
+
+ check: all $(GETTEXT_PACKAGE).pot
++ rm -f missing notexist
++ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
++ if [ -r missing -o -r notexist ]; then \
++ exit 1; \
++ fi
+
+ mostlyclean:
+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+@@ -179,11 +180,7 @@
+ update-po: Makefile
+ $(MAKE) $(GETTEXT_PACKAGE).pot
+ tmpdir=`pwd`; \
+- if test -n "$(PO_LINGUAS)"; then \
+- linguas="$(PO_LINGUAS)"; \
+- else \
+- linguas="$(ALL_LINGUAS)"; \
+- fi; \
++ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
+ echo "$$lang:"; \
+ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+@@ -211,8 +208,8 @@
+ $(MAKE) stamp-it; \
+ fi
+
+-stamp-it: Makefile.in.in ../config.status POTFILES.in
+- cd .. \
++stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
++ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
+ $(SHELL) ./config.status
+
diff -urN gdesklets-0.35.4.orig/scripting/Makefile.in gdesklets-0.35.4/scripting/Makefile.in
--- gdesklets-0.35.4.orig/scripting/Makefile.in 2006-10-05 20:04:38.000000000 +0800
-+++ gdesklets-0.35.4/scripting/Makefile.in 2008-02-06 12:37:55.000000000 +0800
++++ gdesklets-0.35.4/scripting/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19098,7 +19242,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/sensor/Makefile.in gdesklets-0.35.4/sensor/Makefile.in
--- gdesklets-0.35.4.orig/sensor/Makefile.in 2006-10-05 20:04:38.000000000 +0800
-+++ gdesklets-0.35.4/sensor/Makefile.in 2008-02-06 12:37:55.000000000 +0800
++++ gdesklets-0.35.4/sensor/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19367,7 +19511,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/Sensors/External/Makefile.in gdesklets-0.35.4/Sensors/External/Makefile.in
--- gdesklets-0.35.4.orig/Sensors/External/Makefile.in 2006-10-05 20:04:34.000000000 +0800
-+++ gdesklets-0.35.4/Sensors/External/Makefile.in 2008-02-06 12:37:53.000000000 +0800
++++ gdesklets-0.35.4/Sensors/External/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19636,7 +19780,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/Sensors/FontSelector/Makefile.in gdesklets-0.35.4/Sensors/FontSelector/Makefile.in
--- gdesklets-0.35.4.orig/Sensors/FontSelector/Makefile.in 2006-10-05 20:04:34.000000000 +0800
-+++ gdesklets-0.35.4/Sensors/FontSelector/Makefile.in 2008-02-06 12:37:53.000000000 +0800
++++ gdesklets-0.35.4/Sensors/FontSelector/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19905,7 +20049,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/Sensors/Makefile.in gdesklets-0.35.4/Sensors/Makefile.in
--- gdesklets-0.35.4.orig/Sensors/Makefile.in 2006-10-05 20:04:34.000000000 +0800
-+++ gdesklets-0.35.4/Sensors/Makefile.in 2008-02-06 12:37:53.000000000 +0800
++++ gdesklets-0.35.4/Sensors/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20244,7 +20388,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/Makefile.in gdesklets-0.35.4/shell/Makefile.in
--- gdesklets-0.35.4.orig/shell/Makefile.in 2006-10-05 20:04:38.000000000 +0800
-+++ gdesklets-0.35.4/shell/Makefile.in 2008-02-06 12:37:55.000000000 +0800
++++ gdesklets-0.35.4/shell/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20614,7 +20758,7 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -urN gdesklets-0.35.4.orig/shell/plugins/ControlBrowser/Makefile.in gdesklets-0.35.4/shell/plugins/ControlBrowser/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/ControlBrowser/Makefile.in 2006-10-05 20:04:39.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/ControlBrowser/Makefile.in 2008-02-06 12:37:55.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/ControlBrowser/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20883,7 +21027,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/plugins/ControlCollection/Makefile.in gdesklets-0.35.4/shell/plugins/ControlCollection/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/ControlCollection/Makefile.in 2006-10-05 20:04:39.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/ControlCollection/Makefile.in 2008-02-06 12:37:55.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/ControlCollection/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21152,7 +21296,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/plugins/ControlsView/Makefile.in gdesklets-0.35.4/shell/plugins/ControlsView/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/ControlsView/Makefile.in 2006-10-05 20:04:39.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/ControlsView/Makefile.in 2008-02-06 12:37:56.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/ControlsView/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21421,7 +21565,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/plugins/DisplayBrowser/Makefile.in gdesklets-0.35.4/shell/plugins/DisplayBrowser/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/DisplayBrowser/Makefile.in 2006-10-05 20:04:39.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/DisplayBrowser/Makefile.in 2008-02-06 12:37:56.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/DisplayBrowser/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21690,7 +21834,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/plugins/DisplayCollection/Makefile.in gdesklets-0.35.4/shell/plugins/DisplayCollection/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/DisplayCollection/Makefile.in 2006-10-05 20:04:39.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/DisplayCollection/Makefile.in 2008-02-06 12:37:56.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/DisplayCollection/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21959,7 +22103,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/plugins/DisplayView/Makefile.in gdesklets-0.35.4/shell/plugins/DisplayView/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/DisplayView/Makefile.in 2006-10-05 20:04:40.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/DisplayView/Makefile.in 2008-02-06 12:37:56.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/DisplayView/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -22228,7 +22372,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/plugins/gDeskletsClient/Makefile.in gdesklets-0.35.4/shell/plugins/gDeskletsClient/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/gDeskletsClient/Makefile.in 2006-10-05 20:04:42.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/gDeskletsClient/Makefile.in 2008-02-06 12:37:57.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/gDeskletsClient/Makefile.in 2008-02-18 20:50:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -22497,7 +22641,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/plugins/Help/Makefile.in gdesklets-0.35.4/shell/plugins/Help/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/Help/Makefile.in 2006-10-05 20:04:40.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/Help/Makefile.in 2008-02-06 12:37:56.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/Help/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -22766,7 +22910,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/plugins/Makefile.in gdesklets-0.35.4/shell/plugins/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/Makefile.in 2006-10-05 20:04:40.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/Makefile.in 2008-02-06 12:37:56.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -23105,7 +23249,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/plugins/Menu/Makefile.in gdesklets-0.35.4/shell/plugins/Menu/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/Menu/Makefile.in 2006-10-05 20:04:40.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/Menu/Makefile.in 2008-02-06 12:37:56.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/Menu/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -23374,7 +23518,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/plugins/PackageInstaller/Makefile.in gdesklets-0.35.4/shell/plugins/PackageInstaller/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/PackageInstaller/Makefile.in 2006-10-05 20:04:40.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/PackageInstaller/Makefile.in 2008-02-06 12:37:56.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/PackageInstaller/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -23643,7 +23787,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/plugins/Profiles/Makefile.in gdesklets-0.35.4/shell/plugins/Profiles/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/Profiles/Makefile.in 2006-10-05 20:04:41.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/Profiles/Makefile.in 2008-02-06 12:37:56.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/Profiles/Makefile.in 2008-02-18 20:50:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -23912,7 +24056,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/plugins/Shell/Makefile.in gdesklets-0.35.4/shell/plugins/Shell/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/Shell/Makefile.in 2006-10-05 20:04:41.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/Shell/Makefile.in 2008-02-06 12:37:56.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/Shell/Makefile.in 2008-02-18 20:50:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -24181,7 +24325,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/plugins/StatusBar/Makefile.in gdesklets-0.35.4/shell/plugins/StatusBar/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/StatusBar/Makefile.in 2006-10-05 20:04:41.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/StatusBar/Makefile.in 2008-02-06 12:37:56.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/StatusBar/Makefile.in 2008-02-18 20:50:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -24450,7 +24594,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/shell/plugins/ViewSwitch/Makefile.in gdesklets-0.35.4/shell/plugins/ViewSwitch/Makefile.in
--- gdesklets-0.35.4.orig/shell/plugins/ViewSwitch/Makefile.in 2006-10-05 20:04:41.000000000 +0800
-+++ gdesklets-0.35.4/shell/plugins/ViewSwitch/Makefile.in 2008-02-06 12:37:57.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/ViewSwitch/Makefile.in 2008-02-18 20:50:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -24719,7 +24863,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.35.4.orig/utils/Makefile.in gdesklets-0.35.4/utils/Makefile.in
--- gdesklets-0.35.4.orig/utils/Makefile.in 2006-10-05 20:04:42.000000000 +0800
-+++ gdesklets-0.35.4/utils/Makefile.in 2008-02-06 12:37:57.000000000 +0800
++++ gdesklets-0.35.4/utils/Makefile.in 2008-02-18 20:50:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
More information about the pkg-gnome-commits
mailing list