Hello community,
here is the log from the commit of package NetworkManager-vpnc for openSUSE:Factory
checked in at Fri Mar 5 11:40:25 CET 2010.
--------
--- NetworkManager-vpnc/NetworkManager-vpnc.changes 2010-02-11 10:10:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/NetworkManager-vpnc/NetworkManager-vpnc.changes 2010-02-23 11:47:42.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Feb 23 09:08:32 CET 2010 - dimstar@opensuse.org
+
+- Update to version 0.8:
+ + build: disabled .desktop file for now
+ + bgo#608348 - build: add missing test .pcf files to tarball
+ + Updated translations.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
NetworkManager-vpnc-0.7.999.tar.bz2
New:
----
NetworkManager-vpnc-0.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-vpnc.spec ++++++
--- /var/tmp/diff_new_pack.ERC1U4/_old 2010-03-05 11:40:00.000000000 +0100
+++ /var/tmp/diff_new_pack.ERC1U4/_new 2010-03-05 11:40:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package NetworkManager-vpnc (Version 0.7.999)
+# spec file for package NetworkManager-vpnc (Version 0.8)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -28,8 +28,9 @@
BuildRequires: update-desktop-files
ExcludeArch: s390 s390x
Summary: NetworkManager VPN Support for vpnc
-Version: 0.7.999
+Version: 0.8
Release: 1
+# FIXME .desktop icons are currently disabled (on purpose) in the NM tarballs. They will re-appear later on (when nmce supports --import)
License: GPLv2+
Group: Productivity/Networking/System
Url: http://people.redhat.com/dcbw/NetworkManager/
@@ -44,13 +45,6 @@
%description
NetworkManager-vpnc provides VPN support to NetworkManager for vpnc.
-
-
-Authors:
---------
- Dan Williams
- David Zeuthen
-
%package gnome
License: GPLv2+
Summary: NetworkManager VPN Support for vpnc
@@ -62,13 +56,6 @@
%description gnome
NetworkManager-vpnc provides VPN support to NetworkManager for vpnc.
-
-
-Authors:
---------
- Dan Williams
- David Zeuthen
-
%prep
%setup -n %{name}-%{version}
%patch0 -p1
@@ -91,7 +78,8 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/mimetypes
mv $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/mimetypes/
cp nm-vpnc-settings.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
-%suse_update_desktop_file nm-vpnc GNOME Network Monitor Applet
+# FIXME .desktop icons are currently disabled (on purpose) in the NM tarballs. They will re-appear later on (when nmce supports --import)
+# %%suse_update_desktop_file nm-vpnc GNOME Network Monitor Applet
%clean
rm -rf $RPM_BUILD_ROOT
@@ -112,7 +100,8 @@
%files gnome
%defattr(-,root,root,0755)
-%{_datadir}/applications/nm-vpnc.desktop
+# FIXME .desktop icons are currently disabled (on purpose) in the NM tarballs. They will re-appear later on (when nmce supports --import)
+#%{_datadir}/applications/nm-vpnc.desktop
# FIXME: Owned also by NetworkManager-openvpn. Probably move to NetworkManager-gnome:
%{_datadir}/gnome-vpn-properties
%{_datadir}/icons/hicolor/*/*/*.png
++++++ NetworkManager-vpnc-0.7.999.tar.bz2 -> NetworkManager-vpnc-0.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/aclocal.m4 new/NetworkManager-vpnc-0.8/aclocal.m4
--- old/NetworkManager-vpnc-0.7.999/aclocal.m4 2010-01-22 00:20:03.000000000 +0100
+++ new/NetworkManager-vpnc-0.8/aclocal.m4 2010-02-18 17:16:14.000000000 +0100
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -655,7 +655,7 @@
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -671,7 +671,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/auth-dialog/Makefile.in new/NetworkManager-vpnc-0.8/auth-dialog/Makefile.in
--- old/NetworkManager-vpnc-0.7.999/auth-dialog/Makefile.in 2010-01-22 00:20:04.000000000 +0100
+++ new/NetworkManager-vpnc-0.8/auth-dialog/Makefile.in 2010-02-18 17:16:16.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/common-gnome/Makefile.in new/NetworkManager-vpnc-0.8/common-gnome/Makefile.in
--- old/NetworkManager-vpnc-0.7.999/common-gnome/Makefile.in 2010-01-22 00:20:05.000000000 +0100
+++ new/NetworkManager-vpnc-0.8/common-gnome/Makefile.in 2010-02-18 17:16:16.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/compile new/NetworkManager-vpnc-0.8/compile
--- old/NetworkManager-vpnc-0.7.999/compile 2009-06-11 11:29:50.000000000 +0200
+++ new/NetworkManager-vpnc-0.8/compile 2009-12-10 16:29:51.000000000 +0100
@@ -1,7 +1,7 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2009-10-06.20; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
# Foundation, Inc.
@@ -124,9 +124,9 @@
ret=$?
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/config.guess new/NetworkManager-vpnc-0.8/config.guess
--- old/NetworkManager-vpnc-0.7.999/config.guess 2009-06-11 11:29:50.000000000 +0200
+++ new/NetworkManager-vpnc-0.8/config.guess 2009-12-10 16:29:51.000000000 +0100
@@ -1,10 +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, 2006, 2007, 2008
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
-timestamp='2009-04-27'
+timestamp='2009-11-20'
# 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
@@ -27,16 +27,16 @@
# the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner .
-# Please send patches to . Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to and include a ChangeLog
+# entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
# exits with 0. Otherwise, it exits with 1.
#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess...
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -170,7 +170,7 @@
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
+ | grep -q __ELF__
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
@@ -333,6 +333,9 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ echo i386-pc-auroraux${UNAME_RELEASE}
+ exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval $set_cc_for_build
SUN_ARCH="i386"
@@ -656,7 +659,7 @@
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep __LP64__ >/dev/null
+ grep -q __LP64__
then
HP_ARCH="hppa2.0w"
else
@@ -807,12 +810,12 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:[3456]*)
+ *:Interix*:*)
case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T | authenticamd | genuineintel)
+ authenticamd | genuineintel | EM64T)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
@@ -822,6 +825,9 @@
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
+ 8664:Windows_NT:*)
+ echo x86_64-pc-mks
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -851,6 +857,20 @@
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -873,6 +893,17 @@
frv:Linux:*:*)
echo frv-unknown-linux-gnu
exit ;;
+ i*86:Linux:*:*)
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
@@ -882,78 +913,34 @@
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- mips:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef mips
- #undef mipsel
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mipsel
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips
- #else
- CPU=
- #endif
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
+ mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
- #undef mips64
- #undef mips64el
+ #undef ${UNAME_MACHINE}
+ #undef ${UNAME_MACHINE}el
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mips64el
+ CPU=${UNAME_MACHINE}el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips64
+ CPU=${UNAME_MACHINE}
#else
CPU=
#endif
#endif
EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
echo or32-unknown-linux-gnu
exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
- exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -962,8 +949,11 @@
*) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
@@ -986,66 +976,6 @@
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-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
- # problems with other programs or directories called `ld' in the path.
- # Set LC_ALL=C to ensure ld outputs messages in English.
- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
- | sed -ne '/supported targets:/!d
- s/[ ][ ]*/ /g
- s/.*supported targets: *//
- s/ .*//
- p'`
- case "$ld_supported_targets" in
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit ;;
- "")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include
- #ifdef __ELF__
- # ifdef __GLIBC__
- # if __GLIBC__ >= 2
- LIBC=gnu
- # else
- LIBC=gnulibc1
- # endif
- # else
- LIBC=gnulibc1
- # endif
- #else
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
- #endif
- #endif
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^LIBC/{
- s: ::g
- p
- }'`"
- test x"${LIBC}" != x && {
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit
- }
- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
@@ -1074,7 +1004,7 @@
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
@@ -1182,7 +1112,7 @@
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
@@ -1275,6 +1205,16 @@
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
+ i386)
+ eval $set_cc_for_build
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ UNAME_PROCESSOR="x86_64"
+ fi
+ fi ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/config.sub new/NetworkManager-vpnc-0.8/config.sub
--- old/NetworkManager-vpnc-0.7.999/config.sub 2009-06-11 11:29:50.000000000 +0200
+++ new/NetworkManager-vpnc-0.8/config.sub 2009-12-10 16:29:51.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
-timestamp='2009-04-17'
+timestamp='2009-11-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@
# Please send patches to . Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;h...
+
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
@@ -149,10 +152,13 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray)
+ -apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
;;
+ -bluegene*)
+ os=-cnk
+ ;;
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
@@ -281,6 +287,7 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
@@ -288,13 +295,14 @@
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
+ | ubicom32 \
| v850 | v850e \
| we32k \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12)
+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
os=-none
@@ -337,7 +345,7 @@
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -365,7 +373,7 @@
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
- | romp-* | rs6000-* \
+ | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -374,6 +382,7 @@
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
| tron-* \
+ | ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -467,6 +476,10 @@
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
+ bluegene*)
+ basic_machine=powerpc-ibm
+ os=-cnk
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -719,6 +732,9 @@
basic_machine=ns32k-utek
os=-sysv
;;
+ microblaze)
+ basic_machine=microblaze-xilinx
+ ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
@@ -1240,6 +1256,9 @@
# First match some system type aliases
# that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
+ -auroraux)
+ os=-auroraux
+ ;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
@@ -1260,9 +1279,9 @@
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1283,7 +1302,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1613,7 +1632,7 @@
-sunos*)
vendor=sun
;;
- -aix*)
+ -cnk*|-aix*)
vendor=ibm
;;
-beos*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/configure new/NetworkManager-vpnc-0.8/configure
--- old/NetworkManager-vpnc-0.7.999/configure 2010-01-22 00:20:06.000000000 +0100
+++ new/NetworkManager-vpnc-0.8/configure 2010-02-18 17:16:17.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for NetworkManager-vpnc 0.7.999.
+# Generated by GNU Autoconf 2.63 for NetworkManager-vpnc 0.8.
#
# Report bugs to .
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='NetworkManager-vpnc'
PACKAGE_TARNAME='NetworkManager-vpnc'
-PACKAGE_VERSION='0.7.999'
-PACKAGE_STRING='NetworkManager-vpnc 0.7.999'
+PACKAGE_VERSION='0.8'
+PACKAGE_STRING='NetworkManager-vpnc 0.8'
PACKAGE_BUGREPORT='dcbw@redhat.com'
# Factoring default headers for most tests.
@@ -1554,7 +1554,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures NetworkManager-vpnc 0.7.999 to adapt to many kinds of systems.
+\`configure' configures NetworkManager-vpnc 0.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1625,7 +1625,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of NetworkManager-vpnc 0.7.999:";;
+ short | recursive ) echo "Configuration of NetworkManager-vpnc 0.8:";;
esac
cat <<\_ACEOF
@@ -1758,7 +1758,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-NetworkManager-vpnc configure 0.7.999
+NetworkManager-vpnc configure 0.8
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1772,7 +1772,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by NetworkManager-vpnc $as_me 0.7.999, which was
+It was created by NetworkManager-vpnc $as_me 0.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2621,7 +2621,7 @@
# Define the identity of the package.
PACKAGE='NetworkManager-vpnc'
- VERSION='0.7.999'
+ VERSION='0.8'
cat >>confdefs.h <<_ACEOF
@@ -15510,12 +15510,12 @@
pkg_cv_NM_UTILS_CFLAGS="$NM_UTILS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.7.999 libnm-util libnm-glib libnm-glib-vpn\"") >&5
- ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.7.999 libnm-util libnm-glib libnm-glib-vpn") 2>&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.8 libnm-util libnm-glib libnm-glib-vpn\"") >&5
+ ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.8 libnm-util libnm-glib libnm-glib-vpn") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_NM_UTILS_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= 0.7.999 libnm-util libnm-glib libnm-glib-vpn" 2>/dev/null`
+ pkg_cv_NM_UTILS_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= 0.8 libnm-util libnm-glib libnm-glib-vpn" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -15526,12 +15526,12 @@
pkg_cv_NM_UTILS_LIBS="$NM_UTILS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.7.999 libnm-util libnm-glib libnm-glib-vpn\"") >&5
- ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.7.999 libnm-util libnm-glib libnm-glib-vpn") 2>&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.8 libnm-util libnm-glib libnm-glib-vpn\"") >&5
+ ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.8 libnm-util libnm-glib libnm-glib-vpn") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_NM_UTILS_LIBS=`$PKG_CONFIG --libs "NetworkManager >= 0.7.999 libnm-util libnm-glib libnm-glib-vpn" 2>/dev/null`
+ pkg_cv_NM_UTILS_LIBS=`$PKG_CONFIG --libs "NetworkManager >= 0.8 libnm-util libnm-glib libnm-glib-vpn" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -15549,14 +15549,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NM_UTILS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager >= 0.7.999 libnm-util libnm-glib libnm-glib-vpn" 2>&1`
+ NM_UTILS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager >= 0.8 libnm-util libnm-glib libnm-glib-vpn" 2>&1`
else
- NM_UTILS_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager >= 0.7.999 libnm-util libnm-glib libnm-glib-vpn" 2>&1`
+ NM_UTILS_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager >= 0.8 libnm-util libnm-glib libnm-glib-vpn" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NM_UTILS_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (NetworkManager >= 0.7.999 libnm-util libnm-glib libnm-glib-vpn) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (NetworkManager >= 0.8 libnm-util libnm-glib libnm-glib-vpn) were not met:
$NM_UTILS_PKG_ERRORS
@@ -15567,7 +15567,7 @@
and NM_UTILS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
-$as_echo "$as_me: error: Package requirements (NetworkManager >= 0.7.999 libnm-util libnm-glib libnm-glib-vpn) were not met:
+$as_echo "$as_me: error: Package requirements (NetworkManager >= 0.8 libnm-util libnm-glib libnm-glib-vpn) were not met:
$NM_UTILS_PKG_ERRORS
@@ -16183,7 +16183,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by NetworkManager-vpnc $as_me 0.7.999, which was
+This file was extended by NetworkManager-vpnc $as_me 0.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16246,7 +16246,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-NetworkManager-vpnc config.status 0.7.999
+NetworkManager-vpnc config.status 0.8
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/configure.ac new/NetworkManager-vpnc-0.8/configure.ac
--- old/NetworkManager-vpnc-0.7.999/configure.ac 2010-01-22 00:15:05.000000000 +0100
+++ new/NetworkManager-vpnc-0.8/configure.ac 2010-02-18 17:16:08.000000000 +0100
@@ -1,6 +1,6 @@
AC_PREREQ(2.52)
-AC_INIT(NetworkManager-vpnc, 0.7.999, dcbw@redhat.com, NetworkManager-vpnc)
+AC_INIT(NetworkManager-vpnc, 0.8, dcbw@redhat.com, NetworkManager-vpnc)
AM_INIT_AUTOMAKE([subdir-objects no-dist-gzip dist-bzip2])
AM_MAINTAINER_MODE
@@ -87,7 +87,7 @@
AC_SUBST(GNOMEKEYRING_LIBS)
fi
-PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.7.999 libnm-util libnm-glib libnm-glib-vpn)
+PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.8 libnm-util libnm-glib libnm-glib-vpn)
AC_SUBST(NM_UTILS_CFLAGS)
AC_SUBST(NM_UTILS_LIBS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/Makefile.am new/NetworkManager-vpnc-0.8/Makefile.am
--- old/NetworkManager-vpnc-0.7.999/Makefile.am 2009-04-30 16:32:16.000000000 +0200
+++ new/NetworkManager-vpnc-0.8/Makefile.am 2010-01-28 00:19:03.000000000 +0100
@@ -12,14 +12,18 @@
nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservice_DATA = nm-vpnc-service.name
+desktopfile = nm-vpnc.desktop.in
+iconfile = gnome-mime-application-x-cisco-vpn-settings.png
+
if WITH_GNOME
-desktopdir = $(datadir)/applications
-desktop_in_files = nm-vpnc.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+# FIXME: uncomment when nmce gets --import support
+#desktopdir = $(datadir)/applications
+#desktop_in_files = $(desktopfile)
+#desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+#@INTLTOOL_DESKTOP_RULE@
icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = gnome-mime-application-x-cisco-vpn-settings.png
+icon_DATA = $(iconfile)
endif
nm-vpnc-service.name: $(srcdir)/nm-vpnc-service.name.in
@@ -27,8 +31,8 @@
EXTRA_DIST = nm-vpnc-service.name.in \
$(dbusservice_DATA) \
- $(desktop_in_files) \
- $(icon_DATA) \
+ $(desktopfile) \
+ $(iconfile) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/Makefile.in new/NetworkManager-vpnc-0.8/Makefile.in
--- old/NetworkManager-vpnc-0.7.999/Makefile.in 2010-01-22 00:20:05.000000000 +0100
+++ new/NetworkManager-vpnc-0.8/Makefile.in 2010-02-18 17:16:17.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -85,11 +85,9 @@
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(dbusservicedir)" \
- "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icondir)" \
+am__installdirs = "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(icondir)" \
"$(DESTDIR)$(nmvpnservicedir)"
-DATA = $(dbusservice_DATA) $(desktop_DATA) $(icon_DATA) \
- $(nmvpnservice_DATA)
+DATA = $(dbusservice_DATA) $(icon_DATA) $(nmvpnservice_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -292,15 +290,20 @@
dbusservice_DATA = nm-vpnc-service.conf
nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservice_DATA = nm-vpnc-service.name
-@WITH_GNOME_TRUE@desktopdir = $(datadir)/applications
-@WITH_GNOME_TRUE@desktop_in_files = nm-vpnc.desktop.in
-@WITH_GNOME_TRUE@desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+desktopfile = nm-vpnc.desktop.in
+iconfile = gnome-mime-application-x-cisco-vpn-settings.png
+
+# FIXME: uncomment when nmce gets --import support
+#desktopdir = $(datadir)/applications
+#desktop_in_files = $(desktopfile)
+#desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+#@INTLTOOL_DESKTOP_RULE@
@WITH_GNOME_TRUE@icondir = $(datadir)/icons/hicolor/48x48/apps
-@WITH_GNOME_TRUE@icon_DATA = gnome-mime-application-x-cisco-vpn-settings.png
+@WITH_GNOME_TRUE@icon_DATA = $(iconfile)
EXTRA_DIST = nm-vpnc-service.name.in \
$(dbusservice_DATA) \
- $(desktop_in_files) \
- $(icon_DATA) \
+ $(desktopfile) \
+ $(iconfile) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
@@ -392,26 +395,6 @@
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(dbusservicedir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(dbusservicedir)" && rm -f $$files
-install-desktopDATA: $(desktop_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
- @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
- done
-
-uninstall-desktopDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
install-iconDATA: $(icon_DATA)
@$(NORMAL_INSTALL)
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
@@ -460,7 +443,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -485,7 +468,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -649,7 +632,8 @@
fi; \
done
-test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -692,17 +676,17 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -766,7 +750,7 @@
all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(nmvpnservicedir)"; do \
+ for dir in "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(nmvpnservicedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -818,8 +802,8 @@
info-am:
-install-data-am: install-dbusserviceDATA install-desktopDATA \
- install-iconDATA install-nmvpnserviceDATA
+install-data-am: install-dbusserviceDATA install-iconDATA \
+ install-nmvpnserviceDATA
install-dvi: install-dvi-recursive
@@ -865,8 +849,8 @@
ps-am:
-uninstall-am: uninstall-dbusserviceDATA uninstall-desktopDATA \
- uninstall-iconDATA uninstall-nmvpnserviceDATA
+uninstall-am: uninstall-dbusserviceDATA uninstall-iconDATA \
+ uninstall-nmvpnserviceDATA
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
ctags-recursive install-am install-strip tags-recursive
@@ -879,19 +863,17 @@
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dbusserviceDATA install-desktopDATA install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-iconDATA install-info install-info-am \
- install-man install-nmvpnserviceDATA install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-dbusserviceDATA uninstall-desktopDATA \
+ install-dbusserviceDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-iconDATA install-info install-info-am install-man \
+ install-nmvpnserviceDATA install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-dbusserviceDATA \
uninstall-iconDATA uninstall-nmvpnserviceDATA
-@WITH_GNOME_TRUE@@INTLTOOL_DESKTOP_RULE@
nm-vpnc-service.name: $(srcdir)/nm-vpnc-service.name.in
sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/po/et.po new/NetworkManager-vpnc-0.8/po/et.po
--- old/NetworkManager-vpnc-0.7.999/po/et.po 2010-01-14 18:46:57.000000000 +0100
+++ new/NetworkManager-vpnc-0.8/po/et.po 2010-02-18 17:15:44.000000000 +0100
@@ -6,15 +6,15 @@
#
# Priit Laes , 2007.
# Ivar Smolin , 2007.
-# Mattias Põldaru , 2007-2009.
+# Mattias Põldaru <mahfiaz gmail com>, 2007-2010.
#
msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-vpnc\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&component=VPN: vpnc\n"
-"POT-Creation-Date: 2008-12-15 17:05+0000\n"
-"PO-Revision-Date: 2009-02-09 01:04+0300\n"
+"product=NetworkManager&component=VPN: vpnc\n"
+"POT-Creation-Date: 2010-02-04 21:40+0000\n"
+"PO-Revision-Date: 2010-02-13 00:29+0300\n"
"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
"Language-Team: Estonian \n"
"MIME-Version: 1.0\n"
@@ -78,13 +78,13 @@
msgstr "Nõrk (kasuta ettevaatlikult)"
msgid "None (completely insecure)"
-msgstr "Pole (täiesti turvamata)"
+msgstr "Puudub (täiesti turvamata)"
-msgid "Cisco UDP (default)"
-msgstr "Cisco UDP (vaikimisi)"
+msgid "NAT-T (default)"
+msgstr "NAT-T (vaikimisi)"
-msgid "NAT-T"
-msgstr "NAT-T"
+msgid "Cisco UDP"
+msgstr "Cisco UDP"
msgid "Disabled"
msgstr "Keelatud"
@@ -144,128 +144,3 @@
msgid "_User password:"
msgstr "_Kasutaja parool:"
-
-#~ msgid "_Username:"
-#~ msgstr "_Kasutajanimi:"
-
-#~ msgid "_Domain:"
-#~ msgstr "_Domeen:"
-
-#~ msgid "Connect _anonymously"
-#~ msgstr "Ühendu _anonüümselt"
-
-#~ msgid "Connect as _user:"
-#~ msgstr "Ühendu ka_sutajana:"
-
-#~ msgid "NAT-T (default)"
-#~ msgstr "NAT-T (vaikimisi)"
-
-#~ msgid "The following vpnc VPN connection will be created:"
-#~ msgstr "Luuakse alljärgnev VPN ühendus:"
-
-#~ msgid "Name: %s"
-#~ msgstr "Nimi: %s"
-
-#~ msgid "Gateway: %s"
-#~ msgstr "Värav: %s"
-
-#~ msgid "Group Name: %s"
-#~ msgstr "Grupinimi: %s"
-
-#~ msgid "Username: %s"
-#~ msgstr "Kasutajanimi: %s"
-
-#~ msgid "Domain: %s"
-#~ msgstr "Domeen: %s"
-
-#~ msgid "Routes: %s"
-#~ msgstr "Marsruudid: %s"
-
-#~ msgid "NAT-Keepalive packet interval: %s"
-#~ msgstr "NAT-Keepalive pakettide intervall: %s"
-
-#~ msgid "Enable Single DES"
-#~ msgstr "Ühekordse DES krüptimise lubamine"
-
-#~ msgid "Disable NAT Traversal"
-#~ msgstr "Keela NAT-traversal"
-
-#~ msgid "The connection details can be changed using the \"Edit\" button."
-#~ msgstr "Ühenduse üksikasjade muutmiseks kasuta \"Redigeeri\" nuppu."
-
-#~ msgid "Cannot import settings"
-#~ msgstr "Sätteid pole võimalik importida"
-
-#~ msgid "The VPN settings file '%s' does not contain valid data."
-#~ msgstr "VPN seadete fail '%s' ei sisalda sobivat infot."
-
-#~ msgid "Select file to import"
-#~ msgstr "Imporditava faili valimine"
-
-#~ msgid "Save as..."
-#~ msgstr "Salvesta kui..."
-
-#~ msgid "A file named \"%s\" already exists."
-#~ msgstr "Fail nimega \"%s\" on juba olemas."
-
-#~ msgid "Do you want to replace it with the one you are saving?"
-#~ msgstr "Kas sa tahad seda asendada sellega, mida sa salvestad?"
-
-#~ msgid "Failed to export configuration"
-#~ msgstr "Tõrge sätete eksportimisel"
-
-#~ msgid "Failed to save file %s"
-#~ msgstr "Tõrge faili %s salvestamisel"
-
-#~ msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
-#~ msgstr "<i>näide: 172.16.0.0/16 10.11.12.0/24</i>"
-
-#~ msgid "Connection na_me:"
-#~ msgstr "Ühe_nduse nimi:"
-
-#~ msgid "Enable _weak single DES encryption"
-#~ msgstr "Luba _nõrga ühekordse DES krüptimisalgoritmi kasutamist"
-
-#~ msgid "Import _Saved Configuration..."
-#~ msgstr "_Impordi salvestatud sätted..."
-
-#~ msgid "Interval:"
-#~ msgstr "Intervall:"
-
-#~ msgid ""
-#~ "Name used to identify the connection to the private network, e.g. "
-#~ "\"Campus VPN\" or \"Corporate Network\""
-#~ msgstr ""
-#~ "Privaatvõrgu eristamise nimi, nt \"Ülikooli VPN\" või \"Firma võrk\""
-
-#~ msgid "Override _user name"
-#~ msgstr "Kasutaja_nime ülimuslikkus"
-
-#~ msgid ""
-#~ "Please enter the information provided by your system administrator below. "
-#~ "Do not enter your password here as you will be prompted when connecting."
-#~ msgstr ""
-#~ "Palun sisesta siia süsteemiadministraatorilt saadud info. Ära sisesta "
-#~ "siia oma parooli, seda küsitakse ühendumiselt."
-
-#~ msgid ""
-#~ "Please note that the file you import is not a Cisco VPN or VPNC "
-#~ "configuration file. Ask your adminstrator for the file."
-#~ msgstr ""
-#~ "Võta teadmiseks, et imporditav fail ei ole ei Cisco VPN-i ega VPNC "
-#~ "seadistamise fail. Küsi õiget faili oma administraatorilt."
-
-#~ msgid "Use NAT _keepalive packets"
-#~ msgstr "_NAT-keepalive pakettide kasutamine"
-
-#~ msgid "Use _domain for authentication"
-#~ msgstr "Autentimiseks _domeeni kasutamine"
-
-#~ msgid "_Only use VPN connection for these addresses"
-#~ msgstr "_Ainult neile aadressidele kasutatakse VPN-i"
-
-#~ msgid "<b>Required Information</b>"
-#~ msgstr "<b>Vajalik teave</b>"
-
-#~ msgid "O_ptional Information"
-#~ msgstr "_Valikulised andmed"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/po/it.po new/NetworkManager-vpnc-0.8/po/it.po
--- old/NetworkManager-vpnc-0.7.999/po/it.po 2009-04-20 13:09:29.000000000 +0200
+++ new/NetworkManager-vpnc-0.8/po/it.po 2010-01-26 20:43:39.000000000 +0100
@@ -2,18 +2,19 @@
# Copyright (C) 2006, 2007, 2008, 2009 the NetworkManager-VPNC'S COPYRIGHT HOLDER
# This file is distributed under the same license as the NetworkManager-VPNC package.
# Francesco Marletta , 2006, 2007, 2008, 2009.
+# Luca Ferretti , 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: NetworkManager-VPNC 0.7.1\n"
+"Project-Id-Version: NetworkManager-VPNC 0.8.x\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=NetworkManager&component=VPN: vpnc\n"
-"POT-Creation-Date: 2009-03-06 05:45+0000\n"
-"PO-Revision-Date: 2009-03-07 23:31+0100\n"
-"Last-Translator: Francesco Marletta \n"
-"Language-Team: italian \n"
+"POT-Creation-Date: 2010-01-13 20:28+0000\n"
+"PO-Revision-Date: 2010-01-25 22:56+0100\n"
+"Last-Translator: Luca Ferretti \n"
+"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -23,17 +24,17 @@
#: ../auth-dialog/gnome-two-password-dialog.c:159
msgid "_Password:"
-msgstr "_Password:"
+msgstr "Pass_word:"
-#: ../auth-dialog/gnome-two-password-dialog.c:240
+#: ../auth-dialog/gnome-two-password-dialog.c:239
msgid "Sh_ow passwords"
msgstr "M_ostra le password"
-#: ../auth-dialog/gnome-two-password-dialog.c:300
+#: ../auth-dialog/gnome-two-password-dialog.c:299
msgid "_Remember passwords for this session"
msgstr "_Ricorda le password per questa sessione"
-#: ../auth-dialog/gnome-two-password-dialog.c:301
+#: ../auth-dialog/gnome-two-password-dialog.c:300
msgid "_Save passwords in keyring"
msgstr "_Salva le password nel portachiavi"
@@ -41,8 +42,7 @@
#, c-format
msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr ""
-"È necessario autenticarsi per accedere alla Rete Privata Virtuale (VPN) \"%s"
-"\"."
+"È necessario autenticarsi per accedere alla VPN (rete privata virtuale) «%s»."
#: ../auth-dialog/main.c:171
msgid "Authenticate VPN"
@@ -75,17 +75,20 @@
"Compatibile con vari gateway VPN basati su IPSec di Cisco, Juniper, "
"Netscreen e SonicWALL."
+# femminile perché riferito a password
#: ../properties/nm-vpnc.c:339
msgid "Saved"
-msgstr "Salvato"
+msgstr "Salvata"
+# sempre riferito a password
#: ../properties/nm-vpnc.c:346
msgid "Always Ask"
-msgstr "Chiedi sempre"
+msgstr "Chiedere ogni volta"
+# ancora riferito a password
#: ../properties/nm-vpnc.c:353
msgid "Not Required"
-msgstr "Non richiesto"
+msgstr "Non richiesta"
#: ../properties/nm-vpnc.c:412
msgid "Secure (default)"
@@ -100,22 +103,24 @@
msgstr "Nessuno (completamente insicuro)"
#: ../properties/nm-vpnc.c:471
-msgid "Cisco UDP (default)"
-msgstr "UDP Cisco (predefinito)"
+#| msgid "Secure (default)"
+msgid "NAT-T (default)"
+msgstr "NAT-T (predefinito)"
#: ../properties/nm-vpnc.c:478
-msgid "NAT-T"
-msgstr "NAT-T"
+#| msgid "Cisco UDP (default)"
+msgid "Cisco UDP"
+msgstr "UDP Cisco"
#: ../properties/nm-vpnc.c:485
msgid "Disabled"
msgstr "Disabilitato"
-#: ../properties/nm-vpnc.c:1116
+#: ../properties/nm-vpnc.c:1119
msgid "TCP tunneling not supported"
msgstr "Tunnel TCP non supportato"
-#: ../properties/nm-vpnc.c:1118
+#: ../properties/nm-vpnc.c:1121
#, c-format
msgid ""
"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
@@ -124,9 +129,9 @@
"The connection can still be created, with TCP tunneling disabled, however it "
"may not work as expected."
msgstr ""
-"Il file di impostazioni VPN \"%s\" specifica the il traffico VPN deve "
-"passare attraverso un tunnel TCP, cosa che non è attualmente supportata dal "
-"software vpnc.\n"
+"Il file di impostazioni VPN «%s» specifica the il traffico VPN deve passare "
+"attraverso un tunnel TCP, cosa che non è attualmente supportata dal software "
+"vpnc.\n"
"\n"
"La connessione può essere creata lo stesso, con il tunnel TCP disabilitato, "
"comunque potrebbe non funzionare come ci si aspetta."
@@ -141,7 +146,7 @@
#: ../properties/nm-vpnc-dialog.glade.h:3
msgid "<b>Optional</b>"
-msgstr "<b>Opzionale</b>"
+msgstr "<b>Opzionali</b>"
#: ../properties/nm-vpnc-dialog.glade.h:4
msgid "Disable Dead Peer Detection"
@@ -182,3 +187,6 @@
#: ../properties/nm-vpnc-dialog.glade.h:13
msgid "_User password:"
msgstr "Password _utente:"
+
+#~ msgid "NAT-T"
+#~ msgstr "NAT-T"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/po/sv.po new/NetworkManager-vpnc-0.8/po/sv.po
--- old/NetworkManager-vpnc-0.7.999/po/sv.po 2009-04-20 13:09:29.000000000 +0200
+++ new/NetworkManager-vpnc-0.8/po/sv.po 2010-02-18 17:15:44.000000000 +0100
@@ -1,7 +1,7 @@
# Swedish messages for NetworkManager-vpnc.
-# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# Daniel Nylander , 2006, 2007, 2008.
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Free Software Foundation, Inc.
# Christian Rose , 2004, 2005, 2006.
+# Daniel Nylander , 2006, 2007, 2008, 2010.
#
# $Id: sv.po,v 1.2 2006/07/12 12:49:06 menthos Exp $
#
@@ -9,32 +9,32 @@
msgstr ""
"Project-Id-Version: NetworkManager-vpnc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-19 00:20+0100\n"
-"PO-Revision-Date: 2008-12-19 00:20+0100\n"
+"POT-Creation-Date: 2010-02-04 22:38+0100\n"
+"PO-Revision-Date: 2010-02-04 22:38+0100\n"
"Last-Translator: Daniel Nylander \n"
-"Language-Team: Swedish \n"
+"Language-Team: Swedish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../auth-dialog/gnome-two-password-dialog.c:118
+#: ../auth-dialog/gnome-two-password-dialog.c:103
msgid "_Secondary Password:"
msgstr "_Sekundärt lösenord:"
-#: ../auth-dialog/gnome-two-password-dialog.c:174
+#: ../auth-dialog/gnome-two-password-dialog.c:159
msgid "_Password:"
msgstr "_Lösenord:"
-#: ../auth-dialog/gnome-two-password-dialog.c:255
+#: ../auth-dialog/gnome-two-password-dialog.c:239
msgid "Sh_ow passwords"
msgstr "Visa lösen_ord"
-#: ../auth-dialog/gnome-two-password-dialog.c:315
+#: ../auth-dialog/gnome-two-password-dialog.c:299
msgid "_Remember passwords for this session"
msgstr "_Kom ihåg lösenord för denna session"
-#: ../auth-dialog/gnome-two-password-dialog.c:316
+#: ../auth-dialog/gnome-two-password-dialog.c:300
msgid "_Save passwords in keyring"
msgstr "_Spara lösenord i nyckelring"
@@ -92,22 +92,22 @@
msgstr "Ingen (totalt osäker)"
#: ../properties/nm-vpnc.c:471
-msgid "Cisco UDP (default)"
-msgstr "Cisco UDP (standard)"
+msgid "NAT-T (default)"
+msgstr "NAT-T (standard)"
#: ../properties/nm-vpnc.c:478
-msgid "NAT-T"
-msgstr "NAT-T"
+msgid "Cisco UDP"
+msgstr "Cisco UDP"
#: ../properties/nm-vpnc.c:485
msgid "Disabled"
msgstr "Inaktiverad"
-#: ../properties/nm-vpnc.c:1104
+#: ../properties/nm-vpnc.c:1119
msgid "TCP tunneling not supported"
msgstr "TCP-tunnling stöds inte"
-#: ../properties/nm-vpnc.c:1106
+#: ../properties/nm-vpnc.c:1121
#, c-format
msgid ""
"The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n"
@@ -170,6 +170,8 @@
msgid "_User password:"
msgstr "Användarlös_enord:"
+#~ msgid "NAT-T"
+#~ msgstr "NAT-T"
#~ msgid "_Username:"
#~ msgstr "_Användarnamn:"
#~ msgid "_Domain:"
@@ -178,8 +180,6 @@
#~ msgstr "Anslut anon_ymt"
#~ msgid "Connect as _user:"
#~ msgstr "Anslut som _användare:"
-#~ msgid "NAT-T (default)"
-#~ msgstr "NAT-T (standard)"
#~ msgid "G_roup Name:"
#~ msgstr "G_ruppnamn:"
#~ msgid "The following vpnc VPN connection will be created:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/properties/Makefile.in new/NetworkManager-vpnc-0.8/properties/Makefile.in
--- old/NetworkManager-vpnc-0.7.999/properties/Makefile.in 2010-01-22 00:20:05.000000000 +0100
+++ new/NetworkManager-vpnc-0.8/properties/Makefile.in 2010-02-18 17:16:16.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -481,7 +481,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -506,7 +506,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/properties/tests/Makefile.in new/NetworkManager-vpnc-0.8/properties/tests/Makefile.in
--- old/NetworkManager-vpnc-0.7.999/properties/tests/Makefile.in 2010-01-22 00:20:05.000000000 +0100
+++ new/NetworkManager-vpnc-0.8/properties/tests/Makefile.in 2010-02-18 17:16:16.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -397,7 +397,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -422,7 +422,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/properties/tests/pcf/Makefile.am new/NetworkManager-vpnc-0.8/properties/tests/pcf/Makefile.am
--- old/NetworkManager-vpnc-0.7.999/properties/tests/pcf/Makefile.am 2009-10-18 19:08:54.000000000 +0200
+++ new/NetworkManager-vpnc-0.8/properties/tests/pcf/Makefile.am 2010-01-29 03:03:19.000000000 +0100
@@ -3,5 +3,7 @@
everything-via-vpn.pcf \
no-natt.pcf \
always-ask.pcf \
- iso885915.pcf
+ iso885915.pcf \
+ nat-cisco.pcf \
+ natt.pcf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/properties/tests/pcf/Makefile.in new/NetworkManager-vpnc-0.8/properties/tests/pcf/Makefile.in
--- old/NetworkManager-vpnc-0.7.999/properties/tests/pcf/Makefile.in 2010-01-22 00:20:05.000000000 +0100
+++ new/NetworkManager-vpnc-0.8/properties/tests/pcf/Makefile.in 2010-02-18 17:16:16.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -207,7 +207,9 @@
everything-via-vpn.pcf \
no-natt.pcf \
always-ask.pcf \
- iso885915.pcf
+ iso885915.pcf \
+ nat-cisco.pcf \
+ natt.pcf
all: all-am
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/properties/tests/pcf/nat-cisco.pcf new/NetworkManager-vpnc-0.8/properties/tests/pcf/nat-cisco.pcf
--- old/NetworkManager-vpnc-0.7.999/properties/tests/pcf/nat-cisco.pcf 1970-01-01 01:00:00.000000000 +0100
+++ new/NetworkManager-vpnc-0.8/properties/tests/pcf/nat-cisco.pcf 2010-01-13 21:28:57.000000000 +0100
@@ -0,0 +1,38 @@
+[main]
+Description=NAT-Cisco
+!Host=10.20.30.40
+!AuthType=1
+!GroupName=blahblah
+!GroupPwd=my-group-password
+!enc_GroupPwd=
+EnableISPConnect=0
+ISPConnectType=0
+ISPConnect=
+ISPCommand=
+Username=bsmith
+SaveUserPassword=1
+UserPassword=my-user-password
+enc_UserPassword=
+!NTDomain=COMPANY
+!EnableBackup=0
+!BackupServer=
+!EnableMSLogon=1
+!MSLogonType=0
+EnableNat=1
+!TunnelingMode=0
+!TcpTunnelingPort=10000
+CertStore=0
+CertName=
+CertPath=
+CertSubjectName=
+CertSerialHash=00000000000000000000000000000000
+SendCertChain=0
+VerifyCertDN=
+DHGroup=2
+ForceKeepAlives=1
+PeerTimeout=90
+!EnableLocalLAN=1
+!EnableSplitDNS=1
+ISPPhonebook=
+X-NM-Routes=10.0.0.0/8 172.16.0.0/16
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/properties/tests/pcf/natt.pcf new/NetworkManager-vpnc-0.8/properties/tests/pcf/natt.pcf
--- old/NetworkManager-vpnc-0.7.999/properties/tests/pcf/natt.pcf 1970-01-01 01:00:00.000000000 +0100
+++ new/NetworkManager-vpnc-0.8/properties/tests/pcf/natt.pcf 2010-01-13 21:28:57.000000000 +0100
@@ -0,0 +1,39 @@
+[main]
+Description=NAT-T
+!Host=10.20.30.40
+!AuthType=1
+!GroupName=blahblah
+!GroupPwd=my-group-password
+!enc_GroupPwd=
+EnableISPConnect=0
+ISPConnectType=0
+ISPConnect=
+ISPCommand=
+Username=bsmith
+SaveUserPassword=1
+UserPassword=my-user-password
+enc_UserPassword=
+!NTDomain=COMPANY
+!EnableBackup=0
+!BackupServer=
+!EnableMSLogon=1
+!MSLogonType=0
+EnableNat=1
+!TunnelingMode=0
+!TcpTunnelingPort=10000
+CertStore=0
+CertName=
+CertPath=
+CertSubjectName=
+CertSerialHash=00000000000000000000000000000000
+SendCertChain=0
+VerifyCertDN=
+DHGroup=2
+ForceKeepAlives=1
+PeerTimeout=90
+!EnableLocalLAN=1
+!EnableSplitDNS=1
+ISPPhonebook=
+X-NM-Routes=10.0.0.0/8 172.16.0.0/16
+X-NM-Use-NAT-T=1
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-vpnc-0.7.999/src/Makefile.in new/NetworkManager-vpnc-0.8/src/Makefile.in
--- old/NetworkManager-vpnc-0.7.999/src/Makefile.in 2010-01-22 00:20:05.000000000 +0100
+++ new/NetworkManager-vpnc-0.8/src/Makefile.in 2010-02-18 17:16:16.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org