Hello community,
here is the log from the commit of package yast2-http-server for openSUSE:Factory
checked in at Mon Oct 3 09:25:52 CEST 2011.
--------
--- openSUSE:Factory/yast2-http-server/yast2-http-server.changes 2011-09-23 12:53:10.000000000 +0200
+++ yast2-http-server/yast2-http-server.changes 2011-09-29 11:13:33.000000000 +0200
@@ -1,0 +2,16 @@
+Thu Sep 29 11:08:59 CEST 2011 - visnov@suse.cz
+
+- set dialog title
+- 2.21.0
+
+-------------------------------------------------------------------
+Fri Aug 5 12:32:11 CEST 2011 - tgoettlicher@suse.de
+
+- fixed .desktop file (bnc #681249)
+
+-------------------------------------------------------------------
+Mon Jul 4 11:29:10 CEST 2011 - snwint@suse.de
+
+- fixed typos (bnc #703114)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-http-server-2.20.1.tar.bz2
New:
----
yast2-http-server-2.21.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.zCqeW8/_old 2011-10-03 09:25:48.000000000 +0200
+++ /var/tmp/diff_new_pack.zCqeW8/_new 2011-10-03 09:25:48.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-http-server
-Version: 2.20.1
-Release: 1
+Version: 2.21.0
+Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-http-server-2.20.1.tar.bz2
+Source0: yast2-http-server-%{version}.tar.bz2
Prefix: /usr
@@ -32,7 +32,8 @@
BuildRequires: docbook-xsl-stylesheets doxygen libxslt libzio perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
Requires: yast2-network yast2-perl-bindings libzio
# DnsServerApi moved to yast2.rpm (bnc#392606)
-Requires: yast2 >= 2.16.73
+# Wizard::SetDesktopTitleAndIcon
+Requires: yast2 >= 2.21.22
BuildArch: noarch
@@ -43,7 +44,7 @@
configuration.
%prep
-%setup -n yast2-http-server-2.20.1
+%setup -n yast2-http-server-%{version}
%build
%{prefix}/bin/y2tool y2autoconf
@@ -82,4 +83,5 @@
/usr/share/YaST2/scrconf/*
/usr/lib/YaST2/servers_non_y2/*
%doc %{prefix}/share/doc/packages/yast2-http-server
+
%changelog
++++++ yast2-http-server-2.20.1.tar.bz2 -> yast2-http-server-2.21.0.tar.bz2 ++++++
++++ 1937 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-http-server-2.20.1/Makefile.am new/yast2-http-server-2.21.0/Makefile.am
--- old/yast2-http-server-2.20.1/Makefile.am 2011-06-16 09:37:44.000000000 +0200
+++ new/yast2-http-server-2.21.0/Makefile.am 2011-09-29 11:10:17.000000000 +0200
@@ -20,7 +20,6 @@
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
@@ -155,7 +154,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
TAGVERSION = $(Y2TOOL) tagversion
@@ -185,21 +184,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
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-http-server-2.20.1/VERSION new/yast2-http-server-2.21.0/VERSION
--- old/yast2-http-server-2.20.1/VERSION 2011-06-16 09:45:11.000000000 +0200
+++ new/yast2-http-server-2.21.0/VERSION 2011-09-29 11:08:57.000000000 +0200
@@ -1 +1 @@
-2.20.1
+2.21.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-http-server-2.20.1/configure.in new/yast2-http-server-2.21.0/configure.in
--- old/yast2-http-server-2.20.1/configure.in 2011-06-16 09:37:44.000000000 +0200
+++ new/yast2-http-server-2.21.0/configure.in 2011-09-29 11:10:17.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-http-server
dnl
-dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-http-server, 2.20.0, http://bugs.opensuse.org/, yast2-http-server)
+AC_INIT(yast2-http-server, 2.21.0, http://bugs.opensuse.org/, yast2-http-server)
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.20.0"
+VERSION="2.21.0"
RPMNAME="yast2-http-server"
MAINTAINER="YaST2 Maintainers "
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-http-server-2.20.1/src/HttpServer.ycp new/yast2-http-server-2.21.0/src/HttpServer.ycp
--- old/yast2-http-server-2.20.1/src/HttpServer.ycp 2009-11-24 15:13:47.000000000 +0100
+++ new/yast2-http-server-2.21.0/src/HttpServer.ycp 2011-09-29 11:08:13.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of http-server, input and output functions.
* Authors: Stanislav Visnovsky
*
- * $Id: HttpServer.ycp 56052 2009-03-10 14:21:18Z mzugec $
+ * $Id: HttpServer.ycp 64723 2011-07-04 11:49:14Z snwint $
*
* Representation of the configuration of http-server.
* Input and output routines.
@@ -88,11 +88,11 @@
global void setWizardMode(boolean w_mode){
if(w_mode==true){
SCR::Execute(.target.bash, sformat("rm %1%2", Directory::vardir, "/http_server"));
- y2milestone("Set wizardmode on");
+ y2milestone("Set wizard mode on");
}
else{
SCR::Write ( .target.string, Directory::vardir + "/http_server", "");
- y2milestone("Set wizardmode off");
+ y2milestone("Set wizard mode off");
}
}
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-http-server-2.20.1/src/HttpServerWidgets.ycp new/yast2-http-server-2.21.0/src/HttpServerWidgets.ycp
--- old/yast2-http-server-2.20.1/src/HttpServerWidgets.ycp 2009-11-24 15:13:47.000000000 +0100
+++ new/yast2-http-server-2.21.0/src/HttpServerWidgets.ycp 2011-09-29 11:08:13.000000000 +0200
@@ -6,7 +6,7 @@
* Stanislav Visnovsky
* Internal
*
- * $Id: HttpServerWidgets.ycp 56262 2009-03-20 18:24:02Z mzugec $
+ * $Id: HttpServerWidgets.ycp 64723 2011-07-04 11:49:14Z snwint $
*/
{
@@ -1061,7 +1061,7 @@
`Left( `RadioButton(`id(`all_addr),`opt(`notify), _("All addresses (*)"), true)),
`Left(`RadioButton(`id(`multiselect),`opt(`notify), "")),
`MultiSelectionBox( `id(`ipaddress),
- _("IP Adresses"), items )
+ _("IP Addresses"), items )
,
`Left(`RadioButton(`id(`custom),`opt(`notify), "")),
`TextEntry(`id(`serv_name), _("ServerName"))
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-http-server-2.20.1/src/complex.ycp new/yast2-http-server-2.21.0/src/complex.ycp
--- old/yast2-http-server-2.20.1/src/complex.ycp 2009-11-24 15:13:47.000000000 +0100
+++ new/yast2-http-server-2.21.0/src/complex.ycp 2011-09-29 11:08:13.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Stanislav Visnovsky
*
- * $Id: complex.ycp 26106 2005-11-08 20:19:39Z mzugec $
+ * $Id: complex.ycp 65752 2011-09-19 06:44:39Z visnov $
*/
{
@@ -12,8 +12,6 @@
textdomain "http-server";
import "Wizard";
-//import "Wizard_hw";
-
import "HttpServer";
import "YaST::HTTPDData";
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-http-server-2.20.1/src/helps.ycp new/yast2-http-server-2.21.0/src/helps.ycp
--- old/yast2-http-server-2.20.1/src/helps.ycp 2010-10-08 09:59:44.000000000 +0200
+++ new/yast2-http-server-2.21.0/src/helps.ycp 2011-09-29 11:08:13.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Stanislav Visnovsky
*
- * $Id: helps.ycp 62043 2010-05-20 08:07:24Z mzugec $
+ * $Id: helps.ycp 64723 2011-07-04 11:49:14Z snwint $
*/
{
@@ -70,7 +70,7 @@
// apache service enabling help 1/1
"server_enable" : _("<p><b><big>HTTP Server Settings</big></b><br>
-Activate the HTTP server by choosing <b>Enabled</b>. To deactive it, choose
+Activate the HTTP server by choosing <b>Enabled</b>. To deactivate it, choose
<b>Disabled</b>.</p>
") ,
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-http-server-2.20.1/src/http-server.desktop new/yast2-http-server-2.21.0/src/http-server.desktop
--- old/yast2-http-server-2.20.1/src/http-server.desktop 2010-01-15 11:13:56.000000000 +0100
+++ new/yast2-http-server-2.21.0/src/http-server.desktop 2011-09-29 11:08:13.000000000 +0200
@@ -3,7 +3,6 @@
Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
X-KDE-ModuleType=Library
-X-KDE-RootOnly=true
X-KDE-HasReadOnlyMode=true
X-KDE-Library=yast2
X-SuSE-YaST-Call=http-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-http-server-2.20.1/src/http-server.ycp new/yast2-http-server-2.21.0/src/http-server.ycp
--- old/yast2-http-server-2.20.1/src/http-server.ycp 2009-11-24 15:13:47.000000000 +0100
+++ new/yast2-http-server-2.21.0/src/http-server.ycp 2011-09-29 11:08:13.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Stanislav Visnovsky
*
- * $Id: http-server.ycp 56052 2009-03-10 14:21:18Z mzugec $
+ * $Id: http-server.ycp 64723 2011-07-04 11:49:14Z snwint $
*
* Main file for http-server configuration. Uses all other files.
*/
@@ -345,7 +345,7 @@
"handler" : HostsHandler
],
"mode" : $[
- "help" : _("Enable or disable wizardmode."),
+ "help" : _("Enable or disable wizard mode."),
"handler" : ModeHandler
],
],
@@ -411,7 +411,7 @@
],
"wizard" : $[
"type" : "string",
- "help" : _("Set wizardmode \"on\" or \"off\".")
+ "help" : _("Set wizard mode \"on\" or \"off\".")
]
],
"mappings" : $[
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-http-server-2.20.1/src/wizards.ycp new/yast2-http-server-2.21.0/src/wizards.ycp
--- old/yast2-http-server-2.20.1/src/wizards.ycp 2009-11-24 15:13:47.000000000 +0100
+++ new/yast2-http-server-2.21.0/src/wizards.ycp 2011-09-29 11:09:41.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Wizards definitions
* Authors: Stanislav Visnovsky
*
- * $Id: wizards.ycp 56052 2009-03-10 14:21:18Z mzugec $
+ * $Id: wizards.ycp 66137 2011-09-29 09:09:40Z visnov $
*/
{
@@ -230,7 +230,7 @@
];
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("http-server");
+ Wizard::SetDesktopTitleAndIcon("http-server");
boolean w_mode=HttpServer::isWizardMode();
if (w_mode) sequence["read", `next] = "wizard";
@@ -254,7 +254,7 @@
term contents = `Label(_("Initializing ..."));
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("http-server");
+ Wizard::SetDesktopTitleAndIcon("http-server");
Wizard::SetContentsButtons(caption, contents, "",
Label::BackButton(), Label::NextButton());
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org