Hello community,
here is the log from the commit of package yast2-instserver for openSUSE:Factory
checked in at Fri Jul 3 17:01:13 CEST 2009.
--------
--- yast2-instserver/yast2-instserver.changes 2009-04-08 15:13:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-instserver/yast2-instserver.changes 2009-06-19 12:26:40.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Jun 16 14:27:37 CEST 2009 - mvidner@suse.cz
+
+- Using autodocs-ycp.ami, which contains a fix for automake 1.11.
+
+-------------------------------------------------------------------
+Wed Apr 8 16:55:18 CEST 2009 - lslezak@suse.cz
+
+- propose "/srv/install" as the default location (bnc#462556)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-instserver.spec ++++++
--- /var/tmp/diff_new_pack.W16132/_old 2009-07-03 17:00:32.000000000 +0200
+++ /var/tmp/diff_new_pack.W16132/_new 2009-07-03 17:00:32.000000000 +0200
@@ -17,12 +17,11 @@
# norootforbuild
-Url: http://www.suse.com/
Name: yast2-instserver
Version: 2.18.1
-Release: 1
-License: GPL v2 or later
+Release: 2
+License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-instserver-2.18.1.tar.bz2
@@ -39,13 +38,6 @@
for installaing SUSE Linux over the network. Currently FTP, HTTP and
NFS sources are supported.
-
-
-Authors:
---------
- Ladislav Slezak
- Anas Nashif
-
%prep
%setup -n yast2-instserver-2.18.1
@@ -83,233 +75,3 @@
%dir /etc/apache2
%dir /etc/apache2/conf.d
%changelog
-* Wed Apr 08 2009 lslezak@suse.cz
-- fixed SLP config - escape special characters and use [] brackets
- instead of (), they have special meaning (bnc#492367)
-- 2.18.1
-* Wed Mar 18 2009 lslezak@suse.cz
-- write correct IP address to SLP config file when there is no eth0
- device (bnc#475676)
-- add 'no_subtree_check' option to NFS exports
-- 2.18.0
-* Fri Dec 19 2008 lslezak@suse.cz
-- do not configure vsftpd in xinetd mode if it's set to standalone
- mode in the config file (bnc#438694)
-* Wed Oct 15 2008 lslezak@suse.cz
-- fixed UI syntax error when asking for a CD (bnc#435658)
-- minor code11 fixes - remove cut blanks from content file values,
- use NAME key (instead of PRODUCT) (bnc#428463)
-- 2.17.3
-* Tue Oct 14 2008 lslezak@suse.cz
-- fixed adding of a removed repository - do not remove the new
- repository at the and, remove it immediately (bnc#187280)
-- support for SLES8 sources (bnc#265858)
-- 2.17.2
-* Wed Sep 10 2008 lslezak@suse.cz
-- merged proofread texts (2008-09-08)
-- 2.17.1
-* Wed Jul 30 2008 lslezak@suse.cz
-- fixed service name in the firewallconfiguration, install the
- needed packages before reading service files (bnc#403377)
-- added firewall config in the FTP server configuration dialog
-- 2.17.0
-* Fri May 16 2008 jsrain@suse.cz
-- added categories Settings and System into desktop file
- (bnc #382778)
-* Wed Apr 30 2008 lslezak@suse.cz
-- fixed .spec file (removed left over agent files)
-- 2.16.5
-* Tue Apr 29 2008 lslezak@suse.cz
-- ag_content agent moved to yast2.rpm (bnc#339126)
-- 2.16.4
-* Tue Apr 15 2008 lslezak@suse.cz
-- merged proofread texts (2008-04-15)
-- 2.16.3
-* Mon Mar 17 2008 jsrain@suse.cz
-- added 'StartupNotify=true' to the desktop file (bnc #304964)
-- 2.16.2
-* Thu Mar 13 2008 lslezak@suse.cz
-- added missing translation mark (#366082)
-- 2.16.1
-* Fri Mar 07 2008 lslezak@suse.cz
-- check the network service status at startup (#308662)
-- fixed path in the slp.reg file (add "/CD1") (#365187)
-- 2.16.0
-* Mon Dec 10 2007 lslezak@suse.cz
-- merged proofread texts (2007-18-23)
-* Mon Nov 19 2007 locilka@suse.cz
-- Unified used terminology (repositories) (FATE #302970).
-* Thu Jul 19 2007 lslezak@suse.cz
-- "installation source" changed to "repository"
-- 2.15.4
-* Fri Jun 08 2007 lslezak@suse.cz
-- added support for OES1 (#84086)
-- 2.15.3
-* Thu Feb 15 2007 lslezak@suse.cz
-- configure firewall in the network setup dialogs (#243326)
-- install required packages for the selected service
-- preserve modified attributes in SLP reg file (#238957)
-- remove the old reg file when a source is renamed
-- 2.15.2
-* Tue Dec 19 2006 lslezak@suse.cz
-- install apache2 when a HTTP source is configured (#192147)
-- 2.15.1
-* Wed Dec 06 2006 lslezak@suse.cz
-- write hostname to SLP registration file (#158172)
-- 2.15.0
-* Mon Nov 13 2006 lslezak@suse.cz
-- 2.14.0
-* Wed Aug 16 2006 lslezak@suse.cz
-- support for SLE10 Service Pack (#192063)
-- 2.13.12
-* Thu Jun 08 2006 lslezak@suse.cz
-- display an error message when copying files fails (#179387)
-- 2.13.11
-* Wed Jun 07 2006 lslezak@suse.cz
-- fixed the workflow - configure the server at first (#179766)
-- refresh MD5SUM files in a standalone product only when it's
- required (number of CDs is 2 or more)
-- 2.13.10
-* Thu May 18 2006 lslezak@suse.cz
-- ask for an add-on product only if the product is pre-CODE10
- (#170729)
-- don't touch MD5SUMS file in setup/descr subdir (SHA1 sum is in
- signed content file, it could potentionally break signed sources)
-- don't recreate MD5SUMS for standalone products
-- read content file from CD1 only once (required for SLES9, there
- is CORE9 CD1)
-- 2.13.9
-* Tue May 16 2006 jsuchome@suse.cz
-- recreate MD5SUMS files after copying CDs (#175040)
-* Fri May 12 2006 jsuchome@suse.cz
-- when creating installation source, use the content file from
- first CD and create actual directory.yast (#171157)
-- 2.13.8
-* Thu Mar 02 2006 lslezak@suse.cz
-- removed yast2-devel-packages macro from .spec file
-- 2.13.7
-* Mon Dec 19 2005 jsuchome@suse.cz
-- merged texts from proofreading
-- 2.13.6
-* Wed Oct 26 2005 lslezak@suse.cz
-- use rescue file (and other files) from a service pack (#95413)
-- fixed creating of the order files
-- remove deleted sources correctly
-- workaround for NLD9 (#128062)
-- 2.13.5
-* Wed Oct 19 2005 lslezak@suse.cz
-- remove partialy configured source if configuration is aborted
-- use a new popup for copying additional media instead of
- the checkbox
-- fixed help texts
-- 2.13.4
-* Tue Oct 11 2005 lslezak@suse.cz
-- don't reset xinetd configuration when FTP service is
- set up (#121885)
-- 2.13.3
-* Fri Oct 07 2005 lslezak@suse.cz
-- updated the help texts
-- 2.13.2
-* Wed Oct 05 2005 lslezak@suse.cz
-- CD drive is configurable (instead of hardcoded /dev/cdrom)
-- split the configuration dialog, the workflow adapted
-- also edit/delete files in the repository
-- 2.13.1
-* Fri Sep 30 2005 lslezak@suse.cz
-- use WizardHW for the overview dialog, code cleanup
-- MountBind() fixed
-- 2.13.0
-* Thu Aug 11 2005 visnov@suse.cz
-- mark up help examples according to the style guide
-* Thu Jul 28 2005 lslezak@suse.cz
-- updated desktop file
-- 2.12.3
-* Thu May 26 2005 lslezak@suse.cz
-- update SLP registration file when export type (FTP,NFS...)
- is changed, remove it when SLP is disabled (#83909)
-- 2.12.2
-* Tue May 17 2005 lslezak@suse.cz
-- another fix for FTP configuration (#82861)
-- 2.12.1
-* Tue May 17 2005 lslezak@suse.cz
-- fixed FTP source configuration (#82861)
-- 2.12.0
-* Wed Feb 09 2005 nashif@suse.de
-- Save configuration data into /etc/YaST2/instserver
-* Mon Nov 15 2004 nashif@suse.de
-- Fixed sformat syntax
-* Fri Nov 05 2004 nashif@suse.de
-- #47946: YaST2 install server module requests "NUX Exnterprise.."
-- #47936: YaST installation server module asks for SLES9-SP1 CD4
-* Tue Nov 02 2004 nashif@suse.de
-- #47701: announcing instserver dir via slp does not work
-- #47564: yast2-installserver fails to configure httpd
-- #47599: YaST "Installation Server" does not accept SP1 CD2 iso
-* Sat Oct 09 2004 nashif@suse.de
-- #47047: Service pack not copied correctly because of special
- format(hardlinks).
-- Use flag SP to identify Service pack CD
-* Tue Aug 10 2004 nashif@suse.de
-- Disable test mode
-* Tue Aug 10 2004 nashif@suse.de
-- If required packages cant be installed, return to setup screen.
- (#43628)
-* Mon Aug 09 2004 nashif@suse.de
-- SLP not functional after adding sles9 and sles9 eval (#43466):
- Now we use the product ID to distinguish between sources with
- same Label.
- Also detect if same product ID is already available and add a
- counter to description attribute to make it unique
-* Wed Jul 07 2004 nashif@suse.de
-- Install Server setup doesn't work for SuSE Linux 9.1 (#42536)
-* Wed May 26 2004 nashif@suse.de
-- Added documentation about network installation
-* Tue May 25 2004 nashif@suse.de
-- Fixed label and requested CD for Service Packs and addon products
- (#40816 )
-* Thu May 20 2004 nashif@suse.de
-- instorder file has only one column according to the specification
-* Mon May 17 2004 nashif@suse.de
-- Add +FollowSymLinks to apache configuration
-* Mon May 17 2004 nashif@suse.de
-- Use product name from media file (#40656)
-- Allow dot in source name (#40657)
-* Thu May 13 2004 nashif@suse.de
-- Fixed dialog loop when checking for directory permissions (#40260)
-* Mon May 10 2004 nashif@suse.de
-- Ask for the right Product CD if product is based on something
- else.
-- check if slp server is running and start it if not. (#40260)
-- check if directory to contain sources is writable (#40260)
-* Mon May 10 2004 nashif@suse.de
-- Do not allow special charachters in source name (#40260)
-* Fri Apr 30 2004 nashif@suse.de
-- dont announce empty attributes (#39669)
-- content file of base product changed (#39276)
-* Fri Apr 16 2004 nashif@suse.de
-- Create multiple sources using CORE/SLES installation media
-- Reload SLP daemon when needed only
-- Support additional product media
-* Fri Apr 02 2004 nashif@suse.de
-- License changed to GPL
-* Fri Mar 12 2004 nashif@suse.de
-- Use apache2
-- 2.9.6
-* Tue Mar 09 2004 nashif@suse.de
-- disabled test mode
-- 2.9.5
-* Fri Mar 05 2004 nashif@suse.de
-- strict types
-- 2.9.4
-* Tue Mar 02 2004 nashif@suse.de
-- Renamed agent to avoid conflict
-- 2.9.3
-* Mon Mar 01 2004 nashif@suse.de
-- Merged proofread texts
-- 2.9.1
-* Sun Feb 29 2004 nashif@suse.de
-- Support for SLES8/ SLES8 products
-- Support for adding from ISO images
-- HTTP/NFS/FTP support
-* Wed Feb 11 2004 nashif@suse.de
-- initial version
++++++ yast2-instserver-2.18.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.18.1/autodocs-ycp.ami new/yast2-instserver-2.18.1/autodocs-ycp.ami
--- old/yast2-instserver-2.18.1/autodocs-ycp.ami 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-instserver-2.18.1/autodocs-ycp.ami 2009-06-22 08:11:25.000000000 +0200
@@ -0,0 +1,27 @@
+# -*- makefile -*- Automake include file
+# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+
+# Builds source documentation for YCP sources
+# Uses ycpdoc
+# PARAMETERS:
+# AUTODOCS_YCP: Files that the ycp autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
+
+htmldir = $(docdir)/autodocs
+
+html_DATA = index.html $(wildcard *.html)
+CLEANFILES = $(html_DATA) pod2htm*.tmp
+
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${YCPDOC} -d. $^
+ for i in $(AUTODOCS_PM); do \
+ b=`basename $$i`; b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.18.1/configure new/yast2-instserver-2.18.1/configure
--- old/yast2-instserver-2.18.1/configure 2009-03-18 09:49:52.000000000 +0100
+++ new/yast2-instserver-2.18.1/configure 2009-06-22 08:11:28.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-instserver 2.18.0.
+# Generated by GNU Autoconf 2.63 for yast2-instserver 2.18.1.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-instserver'
PACKAGE_TARNAME='yast2-instserver'
-PACKAGE_VERSION='2.18.0'
-PACKAGE_STRING='yast2-instserver 2.18.0'
+PACKAGE_VERSION='2.18.1'
+PACKAGE_STRING='yast2-instserver 2.18.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1274,7 +1274,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-instserver 2.18.0 to adapt to many kinds of systems.
+\`configure' configures yast2-instserver 2.18.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1346,7 +1346,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-instserver 2.18.0:";;
+ short | recursive ) echo "Configuration of yast2-instserver 2.18.1:";;
esac
cat <<\_ACEOF
@@ -1426,7 +1426,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-instserver configure 2.18.0
+yast2-instserver configure 2.18.1
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1440,7 +1440,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-instserver $as_me 2.18.0, which was
+It was created by yast2-instserver $as_me 2.18.1, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2287,7 +2287,7 @@
# Define the identity of the package.
PACKAGE='yast2-instserver'
- VERSION='2.18.0'
+ VERSION='2.18.1'
cat >>confdefs.h <<_ACEOF
@@ -2511,7 +2511,7 @@
-VERSION="2.18.0"
+VERSION="2.18.1"
RPMNAME="yast2-instserver"
MAINTAINER="Ladislav Slezak "
@@ -3452,7 +3452,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-instserver $as_me 2.18.0, which was
+This file was extended by yast2-instserver $as_me 2.18.1, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3502,7 +3502,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-instserver config.status 2.18.0
+yast2-instserver config.status 2.18.1
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/yast2-instserver-2.18.1/configure.in new/yast2-instserver-2.18.1/configure.in
--- old/yast2-instserver-2.18.1/configure.in 2009-03-18 09:49:48.000000000 +0100
+++ new/yast2-instserver-2.18.1/configure.in 2009-06-22 08:11:25.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-instserver
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-instserver, 2.18.0, http://bugs.opensuse.org/, yast2-instserver)
+AC_INIT(yast2-instserver, 2.18.1, http://bugs.opensuse.org/, yast2-instserver)
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.18.0"
+VERSION="2.18.1"
RPMNAME="yast2-instserver"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.18.1/doc/autodocs/Makefile.am new/yast2-instserver-2.18.1/doc/autodocs/Makefile.am
--- old/yast2-instserver-2.18.1/doc/autodocs/Makefile.am 2007-05-18 12:49:02.000000000 +0200
+++ new/yast2-instserver-2.18.1/doc/autodocs/Makefile.am 2009-06-16 09:42:07.000000000 +0200
@@ -1,10 +1,3 @@
-# Makefile.am for devtools/devtools/skeletons/config/doc/autodocs
+# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/autodocs
-
-index.html: $(srcdir)/../../src/*.ycp
- $(ybindir)/ycpdoc -d. $(srcdir)/../../src/*.ycp
-
-html_DATA = index.html $(wildcard *.html)
-
-CLEANFILES = $(html_DATA)
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.18.1/doc/autodocs/Makefile.in new/yast2-instserver-2.18.1/doc/autodocs/Makefile.in
--- old/yast2-instserver-2.18.1/doc/autodocs/Makefile.in 2009-03-18 09:49:54.000000000 +0100
+++ new/yast2-instserver-2.18.1/doc/autodocs/Makefile.in 2009-06-22 08:11:28.000000000 +0200
@@ -14,7 +14,18 @@
@SET_MAKE@
-# Makefile.am for devtools/devtools/skeletons/config/doc/autodocs
+# Makefile.am for YCP module .../doc/autodocs
+
+# -*- makefile -*- Automake include file
+# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+
+# Builds source documentation for YCP sources
+# Uses ycpdoc
+# PARAMETERS:
+# AUTODOCS_YCP: Files that the ycp autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@@ -35,8 +46,9 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/autodocs-ycp.ami
subdir = doc/autodocs
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -172,11 +184,11 @@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
+CLEANFILES = $(html_DATA) pod2htm*.tmp
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/autodocs-ycp.ami $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -355,8 +367,17 @@
uninstall-am uninstall-htmlDATA
-index.html: $(srcdir)/../../src/*.ycp
- $(ybindir)/ycpdoc -d. $(srcdir)/../../src/*.ycp
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${YCPDOC} -d. $^
+ for i in $(AUTODOCS_PM); do \
+ b=`basename $$i`; b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.18.1/instserver.pot new/yast2-instserver-2.18.1/instserver.pot
--- old/yast2-instserver-2.18.1/instserver.pot 2008-09-10 10:47:12.000000000 +0200
+++ new/yast2-instserver-2.18.1/instserver.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-# translation of instserver.po to
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Andrew Spackman , 2008.
-msgid ""
-msgstr ""
-"Project-Id-Version: instserver\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-04 10:35+0200\n"
-"PO-Revision-Date: 2008-08-25 22:28+1200\n"
-"Last-Translator: Andrew Spackman \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#: src/helps.ycp:98
-msgid ""
-"<p>SLP (Service Location Protocol) facilitates to find an installation server. \n"
-"If checked, the repository will be announced on the network using SLP.</p>\n"
-msgstr ""
-"<p>SLP (Service Location Protocol) facilitates finding an installation server. \n"
-"If checked, the repository will be announced on the network using SLP.</p>\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.18.1/instserver_proof.pot new/yast2-instserver-2.18.1/instserver_proof.pot
--- old/yast2-instserver-2.18.1/instserver_proof.pot 2008-04-15 13:48:21.000000000 +0200
+++ new/yast2-instserver-2.18.1/instserver_proof.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,151 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: yast2 9.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-25 07:24+0100\n"
-"PO-Revision-Date: 2008-04-01 10:21+0200\n"
-"Last-Translator: proofreader\n"
-"Language-Team: en_US\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/Instserver.ycp:450
-msgid ""
-"Directory is already exported via NFS,\n"
-"Leave NFS exports unmodified?"
-msgstr ""
-"Directory is already exported via NFS.\n"
-"Leave NFS exports unmodified?"
-
-#. Progress stage 2/2
-#: src/Instserver.ycp:816
-msgid "Look for a new repository"
-msgstr "Search for a new repository"
-
-#. Progress step 2/2
-#: src/Instserver.ycp:821
-msgid "Looking for a new repository..."
-msgstr "Searching for a new repository..."
-
-#: src/dialogs.ycp:1131
-#, ycp-format
-msgid ""
-"Error while creating 'repository' directory.\n"
-"Verify that the directory \n"
-" %1 \n"
-"is writable and try again."
-msgstr ""
-"Error while creating <tt>repository</tt> directory.\n"
-"Verify that the directory \n"
-" %1 \n"
-"is writable and try again."
-
-#: src/helps.ycp:59
-msgid ""
-"<p>If the chosen software repository directory is outside\n"
-"the FTP server hierarchy, a mount entry is added to <tt>/etc/fstab</tt>,\n"
-"which makes the software repository directory available under the\n"
-"FTP server (using the <tt>--bind</tt> option of <tt>mount</tt>).\n"
-"</p>\n"
-msgstr ""
-"<p>If the chosen software repository directory is outside\n"
-"the FTP server hierarchy, a mount entry is added to <tt>/etc/fstab</tt>.\n"
-"This makes the software repository directory available under the\n"
-"FTP server (using the <tt>--bind</tt> option of <tt>mount</tt>).\n"
-"</p>\n"
-
-#: src/helps.ycp:87 src/helps.ycp:101
-msgid ""
-"<p><b><big>Configuration of the Repository</big></b><br>\n"
-"</p>\n"
-msgstr ""
-"<p><b>Configuration of the Repository</b><br>\n"
-"</p>\n"
-
-#: src/helps.ycp:91
-msgid ""
-"<p>The repository name is used to create a directory under which all product\n"
-"CDs are copied and managed. The repository is accessed using the\n"
-"configured protocol (NFS, FTP, or HTTP)</p> "
-msgstr ""
-"<p>The repository name is used to create a directory under which all product\n"
-"CDs are copied and managed. The repository is accessed using the\n"
-"configured protocol (NFS, FTP, or HTTP).</p> "
-
-#: src/helps.ycp:97
-msgid ""
-"<p>SLP (Service Location Protocol) makes finding an installation server easier. \n"
-"If checked, the repository will be announced on the network using SLP.</p>\n"
-msgstr ""
-"<p>SLP (Service Location Protocol) facilitates to find an installation server. \n"
-"If checked, the repository will be announced on the network using SLP.</p>\n"
-
-#. Write dialog help 1/2
-#: src/helps.ycp:131
-msgid ""
-"<p><b><big>Saving Repository Configuration</big></b><br>\n"
-"Please wait...<br></p>\n"
-msgstr ""
-"<p><b>Saving Repository Configuration</b><br>\n"
-"Please wait...<br></p>\n"
-
-#. Summary dialog help 1/3
-#: src/helps.ycp:143
-msgid ""
-"<p><b><big>Repository Configuration</big></b><br>\n"
-"Configure the installation server here.<br></p>\n"
-msgstr ""
-"<p><b>Repository Configuration</b><br>\n"
-"Configure the installation server here.<br></p>\n"
-
-#. Summary dialog help 2/3
-#: src/helps.ycp:148
-msgid ""
-"<p><b><big>Adding a Repository:</big></b><br>\n"
-"In the repository directory is searched for \n"
-"unconfigured directories, which are then made \n"
-"available for configuration.\n"
-"Choose a repository from the list of found repositories. \n"
-"Then press <b>Configure</b>.</p>\n"
-msgstr ""
-"<p><b>Adding a Repository:</b><br>\n"
-"Unconfigured directories are detected in the repository directory and then made \n"
-"available for configuration.\n"
-"To add a repository, select it from the list of unconfigured repositories and press <b>Configure</b>.</p>\n"
-
-#. Ovreview dialog help 1/3
-#: src/helps.ycp:163
-msgid ""
-"<p><b><big>Repositories Overview</big></b><br>\n"
-"Obtain an overview of configured repositories. Additionally\n"
-"edit their configuration.<br></p>\n"
-msgstr ""
-"<p><b>Repositories Overview</b><br>\n"
-"Here you get an overview of the configured repositories. Additionally,\n"
-"you are able to edit their configuration.<br></p>\n"
-
-#. Ovreview dialog help 2/3
-#: src/helps.ycp:169
-msgid ""
-"<p><b><big>Adding a Repository:</big></b><br>\n"
-"Press <b>Add</b> to configure a repository.</p>"
-msgstr ""
-"<p><b>Adding a Repository:</b><br>\n"
-"Press <b>Add</b> to configure a repository.</p>"
-
-#. Ovreview dialog help 3/3
-#: src/helps.ycp:173
-msgid ""
-"<p><b><big>Editing or Deleting:</big></b><br>\n"
-"Choose a repository to change or remove.\n"
-"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
-msgstr ""
-"<p><b><big>Editing or Deleting:</big></b><br>\n"
-"Choose the repository you want to change or remove and\n"
-"press <b>Edit</b> or <b>Delete</b>, respectively.</p>\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.18.1/Makefile.am new/yast2-instserver-2.18.1/Makefile.am
--- old/yast2-instserver-2.18.1/Makefile.am 2009-03-18 09:49:48.000000000 +0100
+++ new/yast2-instserver-2.18.1/Makefile.am 2009-06-22 08:11:25.000000000 +0200
@@ -32,10 +32,10 @@
# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
-# where devtools instal m4 snippets
+# where devtools install m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
+ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
cmp -s $< $@ || cp -f $< $@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.18.1/Makefile.in new/yast2-instserver-2.18.1/Makefile.in
--- old/yast2-instserver-2.18.1/Makefile.in 2009-03-18 09:49:54.000000000 +0100
+++ new/yast2-instserver-2.18.1/Makefile.in 2009-06-22 08:11:29.000000000 +0200
@@ -226,10 +226,10 @@
# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
-# where devtools instal m4 snippets
+# where devtools install m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
+ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
CLEANFILES =
MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec
POT_DST = $(shell find -type d -name testsuite -prune , \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.18.1/src/dialogs.ycp new/yast2-instserver-2.18.1/src/dialogs.ycp
--- old/yast2-instserver-2.18.1/src/dialogs.ycp 2009-03-18 09:49:07.000000000 +0100
+++ new/yast2-instserver-2.18.1/src/dialogs.ycp 2009-04-08 16:56:28.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: dialogs.ycp 56196 2009-03-18 08:49:06Z lslezak $
+ * $Id: dialogs.ycp 56706 2009-04-08 14:56:28Z lslezak $
*/
{
@@ -1230,7 +1230,7 @@
/* Instserver server dialog caption */
string caption = _("Initial Setup -- Servers");
- string dir = Instserver::ServerSettings["directory"]:"";
+ string dir = Instserver::ServerSettings["directory"]:"/srv/install";
boolean dry = Instserver::ServerSettings["dry"]:false;
symbol source = Instserver::ServerSettings["service"]:`http;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.18.1/src/Instserver.ycp new/yast2-instserver-2.18.1/src/Instserver.ycp
--- old/yast2-instserver-2.18.1/src/Instserver.ycp 2009-04-08 15:12:03.000000000 +0200
+++ new/yast2-instserver-2.18.1/src/Instserver.ycp 2009-04-08 15:24:13.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Installation Server settings, input and output functions
* Authors: Anas Nashif
*
- * $Id: Instserver.ycp 56696 2009-04-08 13:12:03Z lslezak $
+ * $Id: Instserver.ycp 56701 2009-04-08 13:24:13Z lslezak $
*
* Representation of the configuration of Installation Server.
* Input and output routines.
@@ -27,6 +27,7 @@
import "IP";
import "Message";
import "SuSEFirewall";
+import "String";
include "instserver/routines.ycp";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org