Hello community,
here is the log from the commit of package yast2-squid
checked in at Tue Sep 30 14:08:00 CEST 2008.
--------
--- yast2-squid/yast2-squid.changes 2008-03-21 14:48:06.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-squid/yast2-squid.changes 2008-09-30 13:30:49.683131000 +0200
@@ -1,0 +2,28 @@
+Tue Sep 30 13:00:25 CEST 2008 - jsrain@suse.cz
+
+- fixed writing the settings (bnc #421100)
+- 2.17.1
+
+-------------------------------------------------------------------
+Fri Jun 6 12:52:42 CEST 2008 - jsrain@suse.cz
+
+- fixed several typos
+- 2.17.0
+
+-------------------------------------------------------------------
+Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz
+
+- added categories Settings and System into desktop file
+ (bnc #382778)
+
+-------------------------------------------------------------------
+Fri Apr 11 11:19:42 CEST 2008 - jsrain@suse.cz
+
+- more texts fixes (bnc #377805)
+
+-------------------------------------------------------------------
+Wed Apr 2 11:51:34 CEST 2008 - jsrain@suse.cz
+
+- fixed some texts (bnc #373131, bnc #373103, bnc #373109)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-squid-2.16.3.tar.bz2
New:
----
yast2-squid-2.17.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-squid.spec ++++++
--- /var/tmp/diff_new_pack.X22160/_old 2008-09-30 14:07:39.000000000 +0200
+++ /var/tmp/diff_new_pack.X22160/_new 2008-09-30 14:07:39.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package yast2-squid (Version 2.16.3)
+# spec file for package yast2-squid (Version 2.17.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -12,12 +19,12 @@
Name: yast2-squid
-Version: 2.16.3
+Version: 2.17.1
Release: 1
License: GPL v2 only
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-squid-2.16.3.tar.bz2
+Source0: yast2-squid-2.17.1.tar.bz2
Prefix: /usr
Requires: yast2 filesystem boost
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools
@@ -35,7 +42,7 @@
Daniel Fiser
%prep
-%setup -n yast2-squid-2.16.3
+%setup -n yast2-squid-2.17.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,8 +81,20 @@
%{_libdir}/YaST2/plugin/libpy2ag_squid.so*
/usr/share/YaST2/scrconf/*.scr
%doc %{prefix}/share/doc/packages/yast2-squid
-
%changelog
+* Tue Sep 30 2008 jsrain@suse.cz
+- fixed writing the settings (bnc #421100)
+- 2.17.1
+* Fri Jun 06 2008 jsrain@suse.cz
+- fixed several typos
+- 2.17.0
+* Fri May 16 2008 jsrain@suse.cz
+- added categories Settings and System into desktop file
+ (bnc #382778)
+* Fri Apr 11 2008 jsrain@suse.cz
+- more texts fixes (bnc #377805)
+* Wed Apr 02 2008 jsrain@suse.cz
+- fixed some texts (bnc #373131, bnc #373103, bnc #373109)
* Fri Mar 21 2008 jsrain@suse.cz
- changed 'Accept' button to 'Finish' (fate #120373)
- 2.16.3
++++++ yast2-squid-2.16.3.tar.bz2 -> yast2-squid-2.17.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/aclocal.m4 new/yast2-squid-2.17.1/aclocal.m4
--- old/yast2-squid-2.16.3/aclocal.m4 2008-03-21 14:47:45.000000000 +0100
+++ new/yast2-squid-2.17.1/aclocal.m4 2008-09-30 13:30:14.000000000 +0200
@@ -7519,3 +7519,159 @@
AC_MSG_RESULT([$SED])
])
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant .
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+ [AC_MSG_RESULT([no])
+ $4])
+elif test $pkg_failed = untried; then
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see http://pkg-config.freedesktop.org/.])],
+ [$4])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/agents/config/Makefile.in new/yast2-squid-2.17.1/agents/config/Makefile.in
--- old/yast2-squid-2.16.3/agents/config/Makefile.in 2008-03-21 14:47:49.000000000 +0100
+++ new/yast2-squid-2.17.1/agents/config/Makefile.in 2008-09-30 13:30:19.000000000 +0200
@@ -110,6 +110,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -124,6 +125,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/agents/Makefile.in new/yast2-squid-2.17.1/agents/Makefile.in
--- old/yast2-squid-2.16.3/agents/Makefile.in 2008-03-21 14:47:49.000000000 +0100
+++ new/yast2-squid-2.17.1/agents/Makefile.in 2008-09-30 13:30:19.000000000 +0200
@@ -110,6 +110,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -124,6 +125,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/agents/src/Makefile.in new/yast2-squid-2.17.1/agents/src/Makefile.in
--- old/yast2-squid-2.16.3/agents/src/Makefile.in 2008-03-21 14:47:49.000000000 +0100
+++ new/yast2-squid-2.17.1/agents/src/Makefile.in 2008-09-30 13:30:19.000000000 +0200
@@ -150,6 +150,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -164,6 +165,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/config/Makefile.in new/yast2-squid-2.17.1/config/Makefile.in
--- old/yast2-squid-2.16.3/config/Makefile.in 2008-03-21 14:47:49.000000000 +0100
+++ new/yast2-squid-2.17.1/config/Makefile.in 2008-09-30 13:30:19.000000000 +0200
@@ -113,6 +113,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -127,6 +128,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/config/squid.desktop new/yast2-squid-2.17.1/config/squid.desktop
--- old/yast2-squid-2.16.3/config/squid.desktop 2008-03-17 12:43:01.000000000 +0100
+++ new/yast2-squid-2.17.1/config/squid.desktop 2008-05-16 16:45:51.000000000 +0200
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
-Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
X-KDE-ModuleType=Library
X-KDE-RootOnly=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/configure new/yast2-squid-2.17.1/configure
--- old/yast2-squid-2.16.3/configure 2008-03-21 14:47:47.000000000 +0100
+++ new/yast2-squid-2.17.1/configure 2008-09-30 13:30:16.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-squid 2.16.3.
+# Generated by GNU Autoconf 2.61 for yast2-squid 2.17.1.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-squid'
PACKAGE_TARNAME='yast2-squid'
-PACKAGE_VERSION='2.16.3'
-PACKAGE_STRING='yast2-squid 2.16.3'
+PACKAGE_VERSION='2.17.1'
+PACKAGE_STRING='yast2-squid 2.17.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -899,6 +899,9 @@
am__fastdepCC_TRUE
am__fastdepCC_FALSE
CPP
+PKG_CONFIG
+Y2CORE_CFLAGS
+Y2CORE_LIBS
AGENT_LIBADD
SED
GREP
@@ -933,6 +936,9 @@
CC
CFLAGS
CPP
+PKG_CONFIG
+Y2CORE_CFLAGS
+Y2CORE_LIBS
CXXCPP
F77
FFLAGS'
@@ -1438,7 +1444,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 yast2-squid 2.16.3 to adapt to many kinds of systems.
+\`configure' configures yast2-squid 2.17.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1509,7 +1515,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-squid 2.16.3:";;
+ short | recursive ) echo "Configuration of yast2-squid 2.17.1:";;
esac
cat <<\_ACEOF
@@ -1547,6 +1553,10 @@
CC C compiler command
CFLAGS C compiler flags
CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
+ Y2CORE_CFLAGS
+ C compiler flags for Y2CORE, overriding pkg-config
+ Y2CORE_LIBS linker flags for Y2CORE, overriding pkg-config
CXXCPP C++ preprocessor
F77 Fortran 77 compiler command
FFLAGS Fortran 77 compiler flags
@@ -1615,7 +1625,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-squid configure 2.16.3
+yast2-squid configure 2.17.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1629,7 +1639,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-squid $as_me 2.16.3, which was
+It was created by yast2-squid $as_me 2.17.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2450,7 +2460,7 @@
# Define the identity of the package.
PACKAGE='yast2-squid'
- VERSION='2.16.3'
+ VERSION='2.17.1'
cat >>confdefs.h <<_ACEOF
@@ -2678,7 +2688,7 @@
-VERSION="2.16.3"
+VERSION="2.17.1"
RPMNAME="yast2-squid"
MAINTAINER="Jiri Srain "
@@ -4848,8 +4858,247 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
+# If we have core, get its Y2CORE_CFLAGS.
+# When building core itself, it has set Y2CORE_CFLAGS elsewhere already
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+fi
+if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5
+ ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for Y2CORE" >&5
+echo $ECHO_N "checking for Y2CORE... $ECHO_C" >&6; }
+
+if test -n "$Y2CORE_CFLAGS"; then
+ pkg_cv_Y2CORE_CFLAGS="$Y2CORE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5
+ ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_Y2CORE_CFLAGS=`$PKG_CONFIG --cflags "yast2-core" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$Y2CORE_LIBS"; then
+ pkg_cv_Y2CORE_LIBS="$Y2CORE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5
+ ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_Y2CORE_LIBS=`$PKG_CONFIG --libs "yast2-core" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ Y2CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "yast2-core" 2>&1`
+ else
+ Y2CORE_PKG_ERRORS=`$PKG_CONFIG --print-errors "yast2-core" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$Y2CORE_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (yast2-core) were not met:
+
+$Y2CORE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (yast2-core) were not met:
+
+$Y2CORE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see http://pkg-config.freedesktop.org/.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see http://pkg-config.freedesktop.org/.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ Y2CORE_CFLAGS=$pkg_cv_Y2CORE_CFLAGS
+ Y2CORE_LIBS=$pkg_cv_Y2CORE_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+
+fi
+
+CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
@@ -5569,7 +5818,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5572 "configure"' > conftest.$ac_ext
+ echo '#line 5821 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7924,11 +8173,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7927: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8176: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7931: \$? = $ac_status" >&5
+ echo "$as_me:8180: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8214,11 +8463,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8217: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8466: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8221: \$? = $ac_status" >&5
+ echo "$as_me:8470: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8318,11 +8567,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8321: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8570: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8325: \$? = $ac_status" >&5
+ echo "$as_me:8574: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10682,7 +10931,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:13435: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13190: \$? = $ac_status" >&5
+ echo "$as_me:13439: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13287,11 +13536,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13290: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13539: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13294: \$? = $ac_status" >&5
+ echo "$as_me:13543: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14870,11 +15119,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14873: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15122: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14877: \$? = $ac_status" >&5
+ echo "$as_me:15126: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14974,11 +15223,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14977: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15226: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14981: \$? = $ac_status" >&5
+ echo "$as_me:15230: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17181,11 +17430,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17184: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17433: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17188: \$? = $ac_status" >&5
+ echo "$as_me:17437: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17471,11 +17720,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17474: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17723: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17478: \$? = $ac_status" >&5
+ echo "$as_me:17727: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17575,11 +17824,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17578: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17827: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17582: \$? = $ac_status" >&5
+ echo "$as_me:17831: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21393,7 +21642,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-squid $as_me 2.16.3, which was
+This file was extended by yast2-squid $as_me 2.17.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21446,7 +21695,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-squid config.status 2.16.3
+yast2-squid config.status 2.17.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -21803,6 +22052,9 @@
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
CPP!$CPP$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+Y2CORE_CFLAGS!$Y2CORE_CFLAGS$ac_delim
+Y2CORE_LIBS!$Y2CORE_LIBS$ac_delim
AGENT_LIBADD!$AGENT_LIBADD$ac_delim
SED!$SED$ac_delim
GREP!$GREP$ac_delim
@@ -21825,7 +22077,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/configure.in new/yast2-squid-2.17.1/configure.in
--- old/yast2-squid-2.16.3/configure.in 2008-03-21 14:47:34.000000000 +0100
+++ new/yast2-squid-2.17.1/configure.in 2008-09-30 13:30:03.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-squid
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-squid, 2.16.3, http://bugs.opensuse.org/, yast2-squid)
+AC_INIT(yast2-squid, 2.17.1, http://bugs.opensuse.org/, yast2-squid)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.3"
+VERSION="2.17.1"
RPMNAME="yast2-squid"
MAINTAINER="Jiri Srain "
@@ -149,8 +149,14 @@
AC_PROG_CC
AC_PROG_CPP
-CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
+# If we have core, get its Y2CORE_CFLAGS.
+# When building core itself, it has set Y2CORE_CFLAGS elsewhere already
+PKG_CHECK_EXISTS([yast2-core],[
+ PKG_CHECK_MODULES(Y2CORE, yast2-core)
+])
+
+CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
AC_SUBST(AGENT_LIBADD)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/doc/autodocs/Makefile.in new/yast2-squid-2.17.1/doc/autodocs/Makefile.in
--- old/yast2-squid-2.16.3/doc/autodocs/Makefile.in 2008-03-21 14:47:49.000000000 +0100
+++ new/yast2-squid-2.17.1/doc/autodocs/Makefile.in 2008-09-30 13:30:19.000000000 +0200
@@ -122,6 +122,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -136,6 +137,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/doc/Makefile.in new/yast2-squid-2.17.1/doc/Makefile.in
--- old/yast2-squid-2.16.3/doc/Makefile.in 2008-03-21 14:47:49.000000000 +0100
+++ new/yast2-squid-2.17.1/doc/Makefile.in 2008-09-30 13:30:19.000000000 +0200
@@ -123,6 +123,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -137,6 +138,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/Makefile.in new/yast2-squid-2.17.1/Makefile.in
--- old/yast2-squid-2.16.3/Makefile.in 2008-03-21 14:47:50.000000000 +0100
+++ new/yast2-squid-2.17.1/Makefile.in 2008-09-30 13:30:19.000000000 +0200
@@ -146,6 +146,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -160,6 +161,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = $(shell cat $(srcdir)/VERSION)
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/squid.pot new/yast2-squid-2.17.1/squid.pot
--- old/yast2-squid-2.16.3/squid.pot 2008-03-14 10:01:06.000000000 +0100
+++ new/yast2-squid-2.17.1/squid.pot 2008-09-25 13:12:27.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-14 10:01+0100\n"
+"POT-Creation-Date: 2008-09-25 13:12+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -37,15 +37,15 @@
msgstr ""
#: src/Squid.ycp:1036
-msgid "Read the rest settings."
+msgid "Read Other Settings."
msgstr ""
#: src/Squid.ycp:1037
-msgid "Read service status."
+msgid "Read Service Status."
msgstr ""
#: src/Squid.ycp:1038
-msgid "Read firewall settings."
+msgid "Read Firewall Settings."
msgstr ""
#: src/Squid.ycp:1039
@@ -65,15 +65,15 @@
msgstr ""
#: src/Squid.ycp:1043
-msgid "Reading the rest settings ..."
+msgid "Reading Other Settings ..."
msgstr ""
#: src/Squid.ycp:1044
-msgid "Reading service status ..."
+msgid "Reading Service Status ..."
msgstr ""
#: src/Squid.ycp:1045
-msgid "Reading firewall settings ..."
+msgid "Reading Firewall Settings ..."
msgstr ""
#: src/Squid.ycp:1053
@@ -184,7 +184,7 @@
msgstr ""
#: src/SquidACL.ycp:90
-msgid "The IP address of the requesting client, or the clients IP Address."
+msgid "The IP address of the requesting client."
msgstr ""
#: src/SquidACL.ycp:93
@@ -288,7 +288,7 @@
msgstr ""
#: src/SquidACL.ycp:183
-msgid "This provides match against local socket TCP port."
+msgid "This provides match against local TCP port number."
msgstr ""
#: src/SquidACL.ycp:186
@@ -351,7 +351,7 @@
#: src/SquidACL.ycp:247
msgid ""
"Regular expression matching against the mime type of the reply received by\n"
-"squid. Can be used to detect file download or some types HTTP tunneling requests."
+"squid. Can be used to detect file download or some types HTTP tunnelling requests."
msgstr ""
#: src/SquidACL.ycp:250
@@ -388,7 +388,7 @@
msgstr ""
#: src/SquidACL_local_functions.ycp:314
-msgid "You must select at least on day."
+msgid "You must select at least one day."
msgstr ""
#: src/SquidACL_local_functions.ycp:317
@@ -396,7 +396,7 @@
msgstr ""
#: src/SquidACL_local_functions.ycp:320
-msgid "From must be less then To."
+msgid "From must be less than To."
msgstr ""
#: src/SquidACL_local_functions.ycp:359 src/SquidACL_local_functions.ycp:388
@@ -411,12 +411,14 @@
msgid "Header Name and Regular Expression must not be empty."
msgstr ""
-#: src/SquidACL_local_functions.ycp:521
+#. error report
+#: src/SquidACL_local_functions.ycp:522
msgid "MAC Address must not be empty."
msgstr ""
-#: src/SquidACL_local_functions.ycp:524
-msgid "Incorrect formar of MAC Address."
+#. error report
+#: src/SquidACL_local_functions.ycp:526
+msgid "Incorrect format of MAC Address."
msgstr ""
#: src/complex.ycp:93
@@ -498,7 +500,7 @@
msgid "Refresh Patterns"
msgstr ""
-#: src/complex.ycp:247 src/complex.ycp:248 src/dialogs.ycp:80
+#: src/complex.ycp:247 src/complex.ycp:248 src/dialogs.ycp:86
msgid "Cache Setting"
msgstr ""
@@ -506,7 +508,7 @@
msgid "Cache Directory Setting"
msgstr ""
-#: src/complex.ycp:255 src/dialogs.ycp:177
+#: src/complex.ycp:255 src/dialogs.ycp:183
msgid "Cache Directory"
msgstr ""
@@ -514,7 +516,7 @@
msgid "Access Control Setting"
msgstr ""
-#: src/complex.ycp:266 src/dialogs.ycp:216
+#: src/complex.ycp:266 src/dialogs.ycp:222
msgid "Access Control"
msgstr ""
@@ -526,7 +528,7 @@
msgid "Logging and Timeouts"
msgstr ""
-#: src/complex.ycp:285 src/dialogs.ycp:276
+#: src/complex.ycp:285 src/dialogs.ycp:282
msgid "Miscellaneous Setting"
msgstr ""
@@ -546,123 +548,126 @@
msgid "Options"
msgstr ""
-#: src/dialogs.ycp:60
+#. table header, stands for minimum
+#: src/dialogs.ycp:62
msgid "Min"
msgstr ""
-#: src/dialogs.ycp:60
-msgid "Precent"
+#. table header
+#: src/dialogs.ycp:64 src/popup_dialogs.ycp:110
+msgid "Percent"
msgstr ""
-#: src/dialogs.ycp:60
+#. table header, stands for maximum
+#: src/dialogs.ycp:66
msgid "Max"
msgstr ""
-#: src/dialogs.ycp:83
+#: src/dialogs.ycp:89
msgid "C&ache Memory"
msgstr ""
-#: src/dialogs.ycp:88
+#: src/dialogs.ycp:94
msgid "Ma&x Object Size"
msgstr ""
-#: src/dialogs.ycp:93
+#: src/dialogs.ycp:99
msgid "M&in Object Size"
msgstr ""
-#: src/dialogs.ycp:98
-msgid "Swap &Low-Water Mark (in percents)"
+#: src/dialogs.ycp:104
+msgid "Swap &Low-Water Mark (percentage)"
msgstr ""
-#: src/dialogs.ycp:102
-msgid "Swap &High-Water Mark (in percents)"
+#: src/dialogs.ycp:108
+msgid "Swap &High-Water Mark (percentage)"
msgstr ""
-#: src/dialogs.ycp:107
+#: src/dialogs.ycp:113
msgid "&Cache Replacement Policy"
msgstr ""
-#: src/dialogs.ycp:113
+#: src/dialogs.ycp:119
msgid "&Memory Replacement Policy"
msgstr ""
-#: src/dialogs.ycp:180
+#: src/dialogs.ycp:186
msgid "&Directory Name"
msgstr ""
-#: src/dialogs.ycp:184
+#: src/dialogs.ycp:190
msgid "&Size (in MB)"
msgstr ""
-#: src/dialogs.ycp:186
+#: src/dialogs.ycp:192
msgid "L&evel 1 Directories"
msgstr ""
-#: src/dialogs.ycp:188
+#: src/dialogs.ycp:194
msgid "Le&vel 2 Directories"
msgstr ""
-#: src/dialogs.ycp:201 src/dialogs.ycp:218
+#: src/dialogs.ycp:207 src/dialogs.ycp:224
msgid "ACL Groups"
msgstr ""
-#: src/dialogs.ycp:202 src/popup_dialogs.ycp:294
+#: src/dialogs.ycp:208 src/popup_dialogs.ycp:294
msgid "Name"
msgstr ""
-#: src/dialogs.ycp:202 src/popup_dialogs.ycp:295
+#: src/dialogs.ycp:208 src/popup_dialogs.ycp:295
msgid "Type"
msgstr ""
-#: src/dialogs.ycp:202
+#: src/dialogs.ycp:208
msgid "Description"
msgstr ""
-#: src/dialogs.ycp:218 src/popup_dialogs.ycp:203
+#: src/dialogs.ycp:224 src/popup_dialogs.ycp:203
msgid "Allow/Deny"
msgstr ""
-#: src/dialogs.ycp:236
+#: src/dialogs.ycp:242
msgid "Logging"
msgstr ""
-#: src/dialogs.ycp:239
+#: src/dialogs.ycp:245
msgid "&Access Log"
msgstr ""
-#: src/dialogs.ycp:243
+#: src/dialogs.ycp:249
msgid "&Cache Log"
msgstr ""
-#: src/dialogs.ycp:247
+#: src/dialogs.ycp:253
msgid "Cache &Store Log"
msgstr ""
-#: src/dialogs.ycp:250
+#: src/dialogs.ycp:256
msgid "&Emulate Httpd Log?"
msgstr ""
-#: src/dialogs.ycp:258
+#: src/dialogs.ycp:264
msgid "Timeouts"
msgstr ""
-#: src/dialogs.ycp:261
+#: src/dialogs.ycp:267
msgid "Connection &Timeout"
msgstr ""
-#: src/dialogs.ycp:265
+#: src/dialogs.ycp:271
msgid "Client &Lifetime"
msgstr ""
-#: src/dialogs.ycp:278
+#: src/dialogs.ycp:284
msgid "&Language of error messages"
msgstr ""
-#: src/dialogs.ycp:281
+#: src/dialogs.ycp:287
msgid "&Administrator's e-mail"
msgstr ""
-#: src/dialogs.ycp:283
+#: src/dialogs.ycp:289
msgid "&Use Ftp Passive Mode"
msgstr ""
@@ -748,7 +753,7 @@
#: src/helps.ycp:86
msgid ""
"<p><b>Percent</b> is percentage of the objects age (time since last\n"
-"modification age) an object without explicit expire time will be\n"
+"modification) an object without explicit expire time will be\n"
"considered fresh.</p>"
msgstr ""
@@ -839,14 +844,14 @@
#: src/helps.ycp:144
msgid ""
"<p><b>ACL Group</b> has various types and description of ACL Group depends\n"
-"on them.</p>"
+"on the particular type.</p>"
msgstr ""
#: src/helps.ycp:147
msgid ""
-"<p>In <b>Access Control</b> table can be denied or allowed ACL Groups.\n"
-"If there is more ACL Groups in one line it means that access will be allowed\n"
-"or denied for those who are from all ACL Groups at the same time.</p>"
+"<p>In the <b>Access Control</b> table access can be denied or allowed to ACL Groups.\n"
+"If there are more ACL Groups in one line, it means that access will be allowed\n"
+"or denied for those who belong to all ACL Groups at the same time.</p>"
msgstr ""
#: src/helps.ycp:150
@@ -861,7 +866,7 @@
#: src/helps.ycp:157
msgid ""
-"<p><b>Cache Log</b> defines the file where general informations about your\n"
+"<p><b>Cache Log</b> defines the file where general information about your\n"
"cache's behavior is logged.</p>"
msgstr ""
@@ -869,7 +874,7 @@
msgid ""
"<p><b>Cache Store Log</b> defines the location where the transaction log of all\n"
"objects that are stored in the object store, as well as the time when the object\n"
-"get deleted. This option can be leaved empty.</p>"
+"gets deleted. This option can be left empty.</p>"
msgstr ""
#: src/helps.ycp:162
@@ -892,7 +897,7 @@
#: src/helps.ycp:173
msgid ""
-"<p><b>Admistrator's e-mail</b> is the address which will be added to any\n"
+"<p><b>Administrator's e-mail</b> is the address which will be added to any\n"
"error pages that are displayed to clients. Defaults to either webmaster.</p>"
msgstr ""
@@ -920,10 +925,6 @@
msgid "Min (in minutes)"
msgstr ""
-#: src/popup_dialogs.ycp:110
-msgid "Percent"
-msgstr ""
-
#: src/popup_dialogs.ycp:111
msgid "Max (in minutes)"
msgstr ""
@@ -991,16 +992,14 @@
msgid "ACL table must not be empty."
msgstr ""
-#: src/store_del.ycp:333 src/store_del.ycp:334
-msgid "ACL Group '"
-msgstr ""
-
#: src/store_del.ycp:333
-msgid "' already exists with different type.\n"
+#, ycp-format
+msgid "ACL Group '%1' already exists with different type.\n"
msgstr ""
#: src/store_del.ycp:334
-msgid "' has to have type '"
+#, ycp-format
+msgid "ACL Group '%1' has to have type '%2'.\n"
msgstr ""
#: src/store_del.ycp:335
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/src/dialogs.ycp new/yast2-squid-2.17.1/src/dialogs.ycp
--- old/yast2-squid-2.16.3/src/dialogs.ycp 2007-11-09 17:24:41.000000000 +0100
+++ new/yast2-squid-2.17.1/src/dialogs.ycp 2008-06-06 12:47:59.000000000 +0200
@@ -57,7 +57,13 @@
`Left(`Label( _("Refresh Patterns"))),
`HBox(
`Table(`id("refresh_patterns"), `opt(`keepSorting, `notify),
- `header(_("Regular Expression"), _("Min"), _("Precent"), _("Max")/*, _("Options")*/)),
+ `header(_("Regular Expression"),
+ // table header, stands for minimum
+ _("Min"),
+ // table header
+ _("Percent"),
+ // table header, stands for maximum
+ _("Max")/*, _("Options")*/)),
`Top(`VBox(
`PushButton(`id(`up), Label::UpButton()),
`PushButton(`id(`down), Label::DownButton())
@@ -95,11 +101,11 @@
)),
`VSpacing(0.4),
`VWeight(1, `HBox(
- `IntField(`id("cache_swap_low"), _("Swap &Low-Water Mark (in percents)"), 0, 100, 0)
+ `IntField(`id("cache_swap_low"), _("Swap &Low-Water Mark (percentage)"), 0, 100, 0)
)),
`VSpacing(0.4),
`VWeight(1, `HBox(
- `IntField(`id("cache_swap_high"), _("Swap &High-Water Mark (in percents)"), 0, 100, 0)
+ `IntField(`id("cache_swap_high"), _("Swap &High-Water Mark (percentage)"), 0, 100, 0)
)),
`VSpacing(0.4),
`Left(`VWeight(1, `HBox(
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/src/helps.ycp new/yast2-squid-2.17.1/src/helps.ycp
--- old/yast2-squid-2.16.3/src/helps.ycp 2007-11-09 17:24:41.000000000 +0100
+++ new/yast2-squid-2.17.1/src/helps.ycp 2008-06-06 12:52:39.000000000 +0200
@@ -84,7 +84,7 @@
_("<p><b>Min</b> determines how long (in minutes) should be an object
considered fresh if no explicit expire time given.") +
_("<p><b>Percent</b> is percentage of the objects age (time since last
-modification age) an object without explicit expire time will be
+modification) an object without explicit expire time will be
considered fresh.</p>") +
_("<p><b>Max</b> is upper limit on how long objects without an explicit
expiry time will be considered fresh.</p>"),
@@ -142,11 +142,11 @@
"acl_groups" :
_("<p>Access to Squid server can be controlled via <b>ACL Groups</b>.</p>") +
_("<p><b>ACL Group</b> has various types and description of ACL Group depends
-on them.</p>"),
+on the particular type.</p>"),
"http_access" :
-_("<p>In <b>Access Control</b> table can be denied or allowed ACL Groups.
-If there is more ACL Groups in one line it means that access will be allowed
-or denied for those who are from all ACL Groups at the same time.</p>") +
+_("<p>In the <b>Access Control</b> table access can be denied or allowed to ACL Groups.
+If there are more ACL Groups in one line, it means that access will be allowed
+or denied for those who belong to all ACL Groups at the same time.</p>") +
_("<p><b>Access Control</b> table is checked in the order listed here.
The first entry which matches is used.</p>"),
@@ -154,11 +154,11 @@
/* Logging and Timeouts Dialog */
"logging" :
_("<p><b>Access Log</b> defines the file where client activities are logged.</p>") +
-_("<p><b>Cache Log</b> defines the file where general informations about your
+_("<p><b>Cache Log</b> defines the file where general information about your
cache's behavior is logged.</p>") +
_("<p><b>Cache Store Log</b> defines the location where the transaction log of all
objects that are stored in the object store, as well as the time when the object
-get deleted. This option can be leaved empty.</p>") +
+gets deleted. This option can be left empty.</p>") +
_("<p><b>Emulate Httpd Log</b> allows you to specify that Squid write its
<b>Access Log</b> in HTTPD common log file format.</p>"),
"timeouts" :
@@ -170,7 +170,7 @@
/* Miscellaneous Dialog */
"miscellaneous" :
-_("<p><b>Admistrator's e-mail</b> is the address which will be added to any
+_("<p><b>Administrator's e-mail</b> is the address which will be added to any
error pages that are displayed to clients. Defaults to either webmaster.</p>")
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/src/Makefile.in new/yast2-squid-2.17.1/src/Makefile.in
--- old/yast2-squid-2.16.3/src/Makefile.in 2008-03-21 14:47:50.000000000 +0100
+++ new/yast2-squid-2.17.1/src/Makefile.in 2008-09-30 13:30:19.000000000 +0200
@@ -118,6 +118,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -132,6 +133,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/src/SquidACL_local_functions.ycp new/yast2-squid-2.17.1/src/SquidACL_local_functions.ycp
--- old/yast2-squid-2.16.3/src/SquidACL_local_functions.ycp 2008-01-17 17:54:18.000000000 +0100
+++ new/yast2-squid-2.17.1/src/SquidACL_local_functions.ycp 2008-04-11 11:17:48.000000000 +0200
@@ -311,13 +311,13 @@
if (selected_items == 0){
ok = false;
- Report::Error( _("You must select at least on day."));
+ Report::Error( _("You must select at least one day."));
}else if (!isHHMMFormat(from) || !isHHMMFormat(to)){
ok = false;
Report::Error( _("Time is not filled in correct format."));
}else if (!isCorrectFromTo(from, to)){// from must be less then to
ok = false;
- Report::Error( _("From must be less then To."));//TODO: better error message
+ Report::Error( _("From must be less than To."));//TODO: better error message
}
return ok;
}
@@ -518,10 +518,12 @@
string mac = (string)UI::QueryWidget(`id("acl_mac"), `Value);
if (size(mac) == 0){
ok = false;
+ // error report
Report::Error( _("MAC Address must not be empty."));
}else if (!regexpmatch(mac, "^([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}$")){
ok = false;
- Report::Error( _("Incorrect formar of MAC Address."));
+ // error report
+ Report::Error( _("Incorrect format of MAC Address."));
}
return ok;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/src/SquidACL.ycp new/yast2-squid-2.17.1/src/SquidACL.ycp
--- old/yast2-squid-2.16.3/src/SquidACL.ycp 2007-08-21 11:15:02.000000000 +0200
+++ new/yast2-squid-2.17.1/src/SquidACL.ycp 2008-06-06 12:46:38.000000000 +0200
@@ -87,7 +87,7 @@
"widget_init" : srcWidgetInit,
"verification" : srcVerif,
"options" : srcOptions,
- "help" : _("The IP address of the requesting client, or the clients IP Address.") ],
+ "help" : _("The IP address of the requesting client.") ],
"dst" : $[ "name" : "dst",
"widget" : `Frame( _("dst"),
@@ -180,7 +180,7 @@
"widget_init" : myportWidgetInit,
"verification" : myportVerif,
"options" : portOptions,
- "help" : _("This provides match against local socket TCP port.") ],
+ "help" : _("This provides match against local TCP port number.") ],
"proto" : $[ "name" : "proto",
"widget" : `Frame ( _("proto"),
@@ -245,7 +245,7 @@
"verification" : headerVerif,
"options" : headerOptions,
"help" : _("Regular expression matching against the mime type of the reply received by
-squid. Can be used to detect file download or some types HTTP tunneling requests.") ],
+squid. Can be used to detect file download or some types HTTP tunnelling requests.") ],
"req_mime_type" : regexp("req_mime_type", "req_mime_type", _("Match against the mime type of the request generated by the client.")),
"rep_mime_type" : regexp("rep_mime_type", "rep_mime_type", _("Match against the mime type of the reply received by Squid.")),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/src/Squid.ycp new/yast2-squid-2.17.1/src/Squid.ycp
--- old/yast2-squid-2.16.3/src/Squid.ycp 2007-11-09 17:24:41.000000000 +0100
+++ new/yast2-squid-2.17.1/src/Squid.ycp 2008-09-30 12:59:07.000000000 +0200
@@ -1033,16 +1033,16 @@
_("Read Refresh Patterns from config file."),
_("Read ACL Groups from config file."),
_("Read Access Control table from config file."),
- _("Read the rest settings."),
- _("Read service status."),
- _("Read firewall settings.")],
+ _("Read Other Settings."),
+ _("Read Service Status."),
+ _("Read Firewall Settings.")],
[_("Reading HTTP Ports ..."),
_("Reading Refresh Patterns ..."),
_("Reading ACL Groups ..."),
_("Reading Access Control table ..."),
- _("Reading the rest settings ..."),
- _("Reading service status ..."),
- _("Reading firewall settings ...")],
+ _("Reading Other Settings ..."),
+ _("Reading Service Status ..."),
+ _("Reading Firewall Settings ...")],
"");
if(Abort()) return false;
@@ -1192,10 +1192,10 @@
boolean writeRestSetting()
{
boolean ok = true;
- list<string> setting = nil;
foreach (string key, list value, parameters,
{
+ value = settings[key]:[];
if (size(value) > 0){
y2debug("Squid::Write - %1: %2", key, value);
if (!SCR::Write(add(squid_path, key), [value])){
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/src/store_del.ycp new/yast2-squid-2.17.1/src/store_del.ycp
--- old/yast2-squid-2.16.3/src/store_del.ycp 2007-11-09 17:24:41.000000000 +0100
+++ new/yast2-squid-2.17.1/src/store_del.ycp 2008-06-06 12:45:45.000000000 +0200
@@ -330,9 +330,9 @@
if (error){
ok = false;
- Report::Error( _("ACL Group '") + name + _("' already exists with different type.\n")
- + _("ACL Group '") + name + _("' has to have type '") + existed_type + "'.\n"
- + _("If you want to change type of this ACL Group you must\ndelete other ACL Groups with same name before that."));
+ Report::Error( sformat (_("ACL Group '%1' already exists with different type.\n"), name)
+ + sformat (_("ACL Group '%1' has to have type '%2'.\n" ), name, existed_type )
+ + _("If you want to change type of this ACL Group you must\ndelete other ACL Groups with same name before that.") );
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/testsuite/Makefile.in new/yast2-squid-2.17.1/testsuite/Makefile.in
--- old/yast2-squid-2.16.3/testsuite/Makefile.in 2008-03-21 14:47:50.000000000 +0100
+++ new/yast2-squid-2.17.1/testsuite/Makefile.in 2008-09-30 13:30:19.000000000 +0200
@@ -108,6 +108,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -122,6 +123,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/VERSION new/yast2-squid-2.17.1/VERSION
--- old/yast2-squid-2.16.3/VERSION 2008-03-21 13:23:05.000000000 +0100
+++ new/yast2-squid-2.17.1/VERSION 2008-09-30 13:00:58.000000000 +0200
@@ -1 +1 @@
-2.16.3
+2.17.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org