Hello community,
here is the log from the commit of package yast2-dns-server
checked in at Wed Oct 11 12:03:39 CEST 2006.
--------
--- yast2-dns-server/yast2-dns-server.changes 2006-10-02 17:55:01.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-dns-server/yast2-dns-server.changes 2006-10-10 15:17:03.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Oct 10 15:16:47 CEST 2006 - locilka@suse.cz
+
+- Merged SLES10 SP1 branch to openSUSE 10.2.
+- 2.14.0
+
+-------------------------------------------------------------------
Old:
----
yast2-dns-server-2.13.20.tar.bz2
New:
----
yast2-dns-server-2.14.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dns-server.spec ++++++
--- /var/tmp/diff_new_pack.ZxK3wr/_old 2006-10-11 12:03:25.000000000 +0200
+++ /var/tmp/diff_new_pack.ZxK3wr/_new 2006-10-11 12:03:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-dns-server (Version 2.13.20)
+# spec file for package yast2-dns-server (Version 2.14.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-dns-server
-Version: 2.13.20
+Version: 2.14.0
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-dns-server-2.13.20.tar.bz2
+Source0: yast2-dns-server-2.14.0.tar.bz2
prefix: /usr
BuildRequires: perl-Digest-SHA1 perl-X500-DN perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-testsuite
Requires: yast2 /usr/bin/host perl-gettext yast2-perl-bindings bind-utils yast2-ldap perl-X500-DN perl-Digest-SHA1 perl-Parse-RecDescent yast2-ldap-client
@@ -36,7 +36,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-dns-server-2.13.20
+%setup -n yast2-dns-server-2.14.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -79,6 +79,9 @@
%doc %{prefix}/share/doc/packages/yast2-dns-server
%changelog -n yast2-dns-server
+* Tue Oct 10 2006 - locilka@suse.cz
+- Merged SLES10 SP1 branch to openSUSE 10.2.
+- 2.14.0
* Mon Oct 02 2006 - locilka@suse.cz
- Merged proofread texts
- 2.13.20
++++++ yast2-dns-server-2.13.20.tar.bz2 -> yast2-dns-server-2.14.0.tar.bz2 ++++++
++++ 2955 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/Makefile.am new/yast2-dns-server-2.14.0/Makefile.am
--- old/yast2-dns-server-2.13.20/Makefile.am 2006-09-25 10:23:53.000000000 +0200
+++ new/yast2-dns-server-2.14.0/Makefile.am 2006-10-10 15:17:31.000000000 +0200
@@ -67,7 +67,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/VERSION new/yast2-dns-server-2.14.0/VERSION
--- old/yast2-dns-server-2.13.20/VERSION 2006-10-02 18:01:28.000000000 +0200
+++ new/yast2-dns-server-2.14.0/VERSION 2006-10-10 15:16:11.000000000 +0200
@@ -1 +1 @@
-2.13.20
+2.14.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/autodocs-ycp.ami new/yast2-dns-server-2.14.0/autodocs-ycp.ami
--- old/yast2-dns-server-2.13.20/autodocs-ycp.ami 2006-09-25 10:23:53.000000000 +0200
+++ new/yast2-dns-server-2.14.0/autodocs-ycp.ami 2006-10-10 15:17:31.000000000 +0200
@@ -1,18 +1,27 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 23438 2005-05-17 16:31:21Z mvidner $
+# $Id: autodocs-ycp.ami 32798 2006-09-11 11:25:01Z 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)
+CLEANFILES = $(html_DATA) pod2htm*.tmp
-AUTODOCS_YCP ?= $(srcdir)/../../src/*.ycp
-index.html: $(AUTODOCS_YCP)
- ${YCPDOC} -d. $^
+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 --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/configure.in new/yast2-dns-server-2.14.0/configure.in
--- old/yast2-dns-server-2.13.20/configure.in 2006-09-25 10:23:53.000000000 +0200
+++ new/yast2-dns-server-2.14.0/configure.in 2006-10-10 15:17:30.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-dns-server, 2.13.19, http://bugs.opensuse.org/, yast2-dns-server)
+AC_INIT(yast2-dns-server, 2.14.0, http://bugs.opensuse.org/, yast2-dns-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.19"
+VERSION="2.14.0"
RPMNAME="yast2-dns-server"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/src/cmdline.ycp new/yast2-dns-server-2.14.0/src/cmdline.ycp
--- old/yast2-dns-server-2.13.20/src/cmdline.ycp 2006-07-24 16:40:43.000000000 +0200
+++ new/yast2-dns-server-2.14.0/src/cmdline.ycp 2006-10-10 15:17:22.000000000 +0200
@@ -6,7 +6,7 @@
* Summary: Command Line for YaST2 DNS Server
* Authors: Lukas Ocilka
*
- * $Id: cmdline.ycp 31969 2006-07-24 14:42:12Z locilka $
+ * $Id: cmdline.ycp 33316 2006-10-10 13:17:16Z locilka $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/src/dialog-installwizard.ycp new/yast2-dns-server-2.14.0/src/dialog-installwizard.ycp
--- old/yast2-dns-server-2.13.20/src/dialog-installwizard.ycp 2006-10-02 18:01:52.000000000 +0200
+++ new/yast2-dns-server-2.14.0/src/dialog-installwizard.ycp 2006-10-10 15:17:22.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: dialog-installwizard.ycp 33239 2006-10-02 16:01:51Z locilka $
+ * $Id: dialog-installwizard.ycp 33316 2006-10-10 13:17:16Z locilka $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/src/dialog-main.ycp new/yast2-dns-server-2.14.0/src/dialog-main.ycp
--- old/yast2-dns-server-2.13.20/src/dialog-main.ycp 2006-10-02 18:01:07.000000000 +0200
+++ new/yast2-dns-server-2.14.0/src/dialog-main.ycp 2006-10-10 15:17:22.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: dialog-main.ycp 32634 2006-08-30 13:35:02Z locilka $
+ * $Id: dialog-main.ycp 33316 2006-10-10 13:17:16Z locilka $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/src/dialog-masterzone.ycp new/yast2-dns-server-2.14.0/src/dialog-masterzone.ycp
--- old/yast2-dns-server-2.13.20/src/dialog-masterzone.ycp 2006-10-02 18:01:52.000000000 +0200
+++ new/yast2-dns-server-2.14.0/src/dialog-masterzone.ycp 2006-10-10 15:17:22.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain ,
* Lukas Ocilka
*
- * $Id: dialog-masterzone.ycp 33239 2006-10-02 16:01:51Z locilka $
+ * $Id: dialog-masterzone.ycp 33316 2006-10-10 13:17:16Z locilka $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/src/dialogs.ycp new/yast2-dns-server-2.14.0/src/dialogs.ycp
--- old/yast2-dns-server-2.13.20/src/dialogs.ycp 2006-08-30 15:33:26.000000000 +0200
+++ new/yast2-dns-server-2.14.0/src/dialogs.ycp 2006-10-10 15:17:22.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Srain
*
- * $Id: dialogs.ycp 32634 2006-08-30 13:35:02Z locilka $
+ * $Id: dialogs.ycp 33316 2006-10-10 13:17:16Z locilka $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/src/helps.ycp new/yast2-dns-server-2.14.0/src/helps.ycp
--- old/yast2-dns-server-2.13.20/src/helps.ycp 2006-10-02 17:55:18.000000000 +0200
+++ new/yast2-dns-server-2.14.0/src/helps.ycp 2006-10-10 15:17:22.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain ,
* Lukas Ocilka
*
- * $Id: helps.ycp 33238 2006-10-02 15:55:15Z locilka $
+ * $Id: helps.ycp 33316 2006-10-10 13:17:16Z locilka $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/src/wizards.ycp new/yast2-dns-server-2.14.0/src/wizards.ycp
--- old/yast2-dns-server-2.13.20/src/wizards.ycp 2006-07-28 12:24:05.000000000 +0200
+++ new/yast2-dns-server-2.14.0/src/wizards.ycp 2006-10-10 15:17:22.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: wizards.ycp 32043 2006-07-28 10:25:33Z locilka $
+ * $Id: wizards.ycp 33316 2006-10-10 13:17:16Z locilka $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/testsuite/tests/DnsServerAPI.ycp new/yast2-dns-server-2.14.0/testsuite/tests/DnsServerAPI.ycp
--- old/yast2-dns-server-2.13.20/testsuite/tests/DnsServerAPI.ycp 2006-07-27 10:00:47.000000000 +0200
+++ new/yast2-dns-server-2.14.0/testsuite/tests/DnsServerAPI.ycp 2006-10-10 15:17:22.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Lukas Ocilka
* Copyright: Copyright 2004, Novell, Inc. All rights reserved.
*
- * $Id: DnsServerAPI.ycp 32012 2006-07-27 08:01:45Z locilka $
+ * $Id: DnsServerAPI.ycp 33316 2006-10-10 13:17:16Z locilka $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/testsuite/tests/Read.ycp new/yast2-dns-server-2.14.0/testsuite/tests/Read.ycp
--- old/yast2-dns-server-2.13.20/testsuite/tests/Read.ycp 2006-07-27 10:00:47.000000000 +0200
+++ new/yast2-dns-server-2.14.0/testsuite/tests/Read.ycp 2006-10-10 15:17:22.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain , Lukas Ocilka
* Copyright: Copyright 2004, Novell, Inc. All rights reserved.
*
- * $Id: Read.ycp 32012 2006-07-27 08:01:45Z locilka $
+ * $Id: Read.ycp 33316 2006-10-10 13:17:16Z locilka $
*
* Testsuite for reading configuration for dns-server
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/testsuite/tests/YaPIReadGlobalOptions.ycp new/yast2-dns-server-2.14.0/testsuite/tests/YaPIReadGlobalOptions.ycp
--- old/yast2-dns-server-2.13.20/testsuite/tests/YaPIReadGlobalOptions.ycp 2006-07-27 10:00:47.000000000 +0200
+++ new/yast2-dns-server-2.14.0/testsuite/tests/YaPIReadGlobalOptions.ycp 2006-10-10 15:17:22.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain , Lukas Ocilka
* Copyright: Copyright 2004, Novell, Inc. All rights reserved.
*
- * $Id: YaPIReadGlobalOptions.ycp 32012 2006-07-27 08:01:45Z locilka $
+ * $Id: YaPIReadGlobalOptions.ycp 33316 2006-10-10 13:17:16Z locilka $
*
* Testsuite for reading global options for dns-server
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/testsuite/tests/YaPIReadZones.ycp new/yast2-dns-server-2.14.0/testsuite/tests/YaPIReadZones.ycp
--- old/yast2-dns-server-2.13.20/testsuite/tests/YaPIReadZones.ycp 2006-07-27 10:00:47.000000000 +0200
+++ new/yast2-dns-server-2.14.0/testsuite/tests/YaPIReadZones.ycp 2006-10-10 15:17:22.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain , Lukas Ocilka
* Copyright: Copyright 2004, Novell, Inc. All rights reserved.
*
- * $Id: YaPIReadZones.ycp 32012 2006-07-27 08:01:45Z locilka $
+ * $Id: YaPIReadZones.ycp 33316 2006-10-10 13:17:16Z locilka $
*
* Testsuite for reading dns zones for dns-server
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/testsuite/tests/YaPIWriteGlobalOptions.ycp new/yast2-dns-server-2.14.0/testsuite/tests/YaPIWriteGlobalOptions.ycp
--- old/yast2-dns-server-2.13.20/testsuite/tests/YaPIWriteGlobalOptions.ycp 2006-07-27 10:00:47.000000000 +0200
+++ new/yast2-dns-server-2.14.0/testsuite/tests/YaPIWriteGlobalOptions.ycp 2006-10-10 15:17:22.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain , Lukas Ocilka
* Copyright: Copyright 2004, Novell, Inc. All rights reserved.
*
- * $Id: YaPIWriteGlobalOptions.ycp 32012 2006-07-27 08:01:45Z locilka $
+ * $Id: YaPIWriteGlobalOptions.ycp 33316 2006-10-10 13:17:16Z locilka $
*
* Testsuite for writting global options for dns-server
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.13.20/testsuite/tests/YaPIWriteZones.ycp new/yast2-dns-server-2.14.0/testsuite/tests/YaPIWriteZones.ycp
--- old/yast2-dns-server-2.13.20/testsuite/tests/YaPIWriteZones.ycp 2006-07-27 10:00:47.000000000 +0200
+++ new/yast2-dns-server-2.14.0/testsuite/tests/YaPIWriteZones.ycp 2006-10-10 15:17:22.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain , Lukas Ocilka
* Copyright: Copyright 2004, Novell, Inc. All rights reserved.
*
- * $Id: YaPIWriteZones.ycp 32012 2006-07-27 08:01:45Z locilka $
+ * $Id: YaPIWriteZones.ycp 33316 2006-10-10 13:17:16Z locilka $
*
* Testsuite for reading configuration for dns-server
*/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org