Hello community,
here is the log from the commit of package yast2-mouse for openSUSE:Factory
checked in at Wed Sep 2 18:41:26 CEST 2009.
--------
--- yast2-mouse/yast2-mouse.changes 2009-01-26 09:55:14.000000000 +0100
+++ yast2-mouse/yast2-mouse.changes 2009-07-30 21:56:23.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Jul 30 20:56:18 CEST 2009 - jdsn@suse.de
+
+- disabled to call sax2 when GPM configuration is called in
+ graphical mode (bnc#441404)
+- 2.18.1
+
+-------------------------------------------------------------------
+Fri Mar 6 09:02:25 CET 2009 - jsrain@suse.cz
+
+- fixed textdomain
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-mouse-2.18.0.tar.bz2
New:
----
yast2-mouse-2.18.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-mouse.spec ++++++
--- /var/tmp/diff_new_pack.Uq2JH4/_old 2009-09-02 18:40:44.000000000 +0200
+++ /var/tmp/diff_new_pack.Uq2JH4/_new 2009-09-02 18:40:44.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-mouse (Version 2.18.0)
+# spec file for package yast2-mouse (Version 2.18.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,13 +19,13 @@
Name: yast2-mouse
-Version: 2.18.0
+Version: 2.18.1
Release: 1
-License: GPL v2 or later
-Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-mouse-2.18.0.tar.bz2
+Source0: yast2-mouse-2.18.1.tar.bz2
Prefix: /usr
+Group: System/YaST
+License: GPL v2 or later
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
# AutoinstData
Requires: yast2 >= 2.16.8
@@ -44,19 +44,10 @@
Summary: YaST2 - Mouse Configuration
%description
-A Mouse configuration module to be called from the YaST2 control
-center.
-
-
-
-Authors:
---------
- Thomas Roelz
- Thomas Fehr
- Marcus Sch�fer
+Configuration module to configure the console mouse.
%prep
-%setup -n yast2-mouse-2.18.0
+%setup -n yast2-mouse-2.18.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -66,7 +57,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
++++++ yast2-mouse-2.18.0.tar.bz2 -> yast2-mouse-2.18.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.18.0/Makefile.am new/yast2-mouse-2.18.1/Makefile.am
--- old/yast2-mouse-2.18.0/Makefile.am 2009-01-26 09:55:01.000000000 +0100
+++ new/yast2-mouse-2.18.1/Makefile.am 2009-09-01 18:42:10.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-mouse-2.18.0/Makefile.in new/yast2-mouse-2.18.1/Makefile.in
--- old/yast2-mouse-2.18.0/Makefile.in 2009-01-26 09:55:06.000000000 +0100
+++ new/yast2-mouse-2.18.1/Makefile.in 2009-09-01 18:42:15.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-mouse-2.18.0/VERSION new/yast2-mouse-2.18.1/VERSION
--- old/yast2-mouse-2.18.0/VERSION 2009-01-21 13:28:05.000000000 +0100
+++ new/yast2-mouse-2.18.1/VERSION 2009-07-30 20:56:13.000000000 +0200
@@ -1 +1 @@
-2.18.0
+2.18.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.18.0/autodocs-ycp.ami new/yast2-mouse-2.18.1/autodocs-ycp.ami
--- old/yast2-mouse-2.18.0/autodocs-ycp.ami 2009-01-26 09:55:01.000000000 +0100
+++ new/yast2-mouse-2.18.1/autodocs-ycp.ami 2009-09-01 18:42:10.000000000 +0200
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
@@ -8,20 +8,25 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-html_DATA = index.html $(wildcard *.html)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
CLEANFILES = $(html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
#including *.pm, for the index
- ${YCPDOC} -d. $^
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
for i in $(AUTODOCS_PM); do \
- b=`basename $$i`; b=$${b%.pm}; \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
- echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.18.0/configure new/yast2-mouse-2.18.1/configure
--- old/yast2-mouse-2.18.0/configure 2009-01-26 09:55:04.000000000 +0100
+++ new/yast2-mouse-2.18.1/configure 2009-09-01 18:42:14.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-mouse 2.18.0.
+# Generated by GNU Autoconf 2.63 for yast2-mouse 2.18.1.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-mouse'
PACKAGE_TARNAME='yast2-mouse'
-PACKAGE_VERSION='2.18.0'
-PACKAGE_STRING='yast2-mouse 2.18.0'
+PACKAGE_VERSION='2.18.1'
+PACKAGE_STRING='yast2-mouse 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-mouse 2.18.0 to adapt to many kinds of systems.
+\`configure' configures yast2-mouse 2.18.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1345,7 +1345,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-mouse 2.18.0:";;
+ short | recursive ) echo "Configuration of yast2-mouse 2.18.1:";;
esac
cat <<\_ACEOF
@@ -1425,7 +1425,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-mouse configure 2.18.0
+yast2-mouse configure 2.18.1
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1439,7 +1439,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-mouse $as_me 2.18.0, which was
+It was created by yast2-mouse $as_me 2.18.1, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2286,7 +2286,7 @@
# Define the identity of the package.
PACKAGE='yast2-mouse'
- VERSION='2.18.0'
+ VERSION='2.18.1'
cat >>confdefs.h <<_ACEOF
@@ -2510,7 +2510,7 @@
-VERSION="2.18.0"
+VERSION="2.18.1"
RPMNAME="yast2-mouse"
MAINTAINER="Marcus Schäfer "
@@ -3451,7 +3451,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-mouse $as_me 2.18.0, which was
+This file was extended by yast2-mouse $as_me 2.18.1, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3501,7 +3501,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-mouse config.status 2.18.0
+yast2-mouse 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-mouse-2.18.0/configure.in new/yast2-mouse-2.18.1/configure.in
--- old/yast2-mouse-2.18.0/configure.in 2009-01-26 09:55:01.000000000 +0100
+++ new/yast2-mouse-2.18.1/configure.in 2009-09-01 18:42:10.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-mouse
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-mouse, 2.18.0, http://bugs.opensuse.org/, yast2-mouse)
+AC_INIT(yast2-mouse, 2.18.1, http://bugs.opensuse.org/, yast2-mouse)
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-mouse"
MAINTAINER="Marcus Schäfer "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.18.0/doc/autodocs/Makefile.in new/yast2-mouse-2.18.1/doc/autodocs/Makefile.in
--- old/yast2-mouse-2.18.0/doc/autodocs/Makefile.in 2009-01-26 09:55:05.000000000 +0100
+++ new/yast2-mouse-2.18.1/doc/autodocs/Makefile.in 2009-09-01 18:42:15.000000000 +0200
@@ -17,7 +17,7 @@
# Makefile.am for YCP module .../doc/autodocs
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
@@ -26,6 +26,10 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@@ -142,7 +146,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
imagedir = @imagedir@
includedir = @includedir@
infodir = @infodir@
@@ -184,7 +188,7 @@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
AUTODOCS_YCP = $(srcdir)/../../src/*.ycp $(srcdir)/../../src/*/*.ycp
-html_DATA = index.html $(wildcard *.html)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
CLEANFILES = $(html_DATA) pod2htm*.tmp
all: all-am
@@ -370,14 +374,15 @@
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
#including *.pm, for the index
- ${YCPDOC} -d. $^
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
for i in $(AUTODOCS_PM); do \
- b=`basename $$i`; b=$${b%.pm}; \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
- echo "<a href='$$b.html'>$$b</a>" > $$b.mod.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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.18.0/mouse.pot new/yast2-mouse-2.18.1/mouse.pot
--- old/yast2-mouse-2.18.0/mouse.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-mouse-2.18.1/mouse.pot 2009-09-01 18:27:54.000000000 +0200
@@ -0,0 +1,186 @@
+# 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.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-09-01 18:27+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: data/mouse_raw.ycp:11
+msgid "PS/2 mouse (Aux-port)"
+msgstr ""
+
+#: data/mouse_raw.ycp:13
+msgid "Microsoft compatible serial mouse - (ttyS0 - COM1)"
+msgstr ""
+
+#: data/mouse_raw.ycp:15
+msgid "Microsoft compatible serial mouse - (ttyS1 - COM2)"
+msgstr ""
+
+#: data/mouse_raw.ycp:17
+msgid "Microsoft Intellimouse - 3 buttons and wheel - (ttyS0 - COM1)"
+msgstr ""
+
+#: data/mouse_raw.ycp:19
+msgid "Microsoft Intellimouse - 3 buttons and wheel - (ttyS1 - COM2)"
+msgstr ""
+
+#: data/mouse_raw.ycp:21
+msgid "Mouse Systems serial mouse - (ttyS0 - COM1)"
+msgstr ""
+
+#: data/mouse_raw.ycp:23
+msgid "Mouse Systems serial mouse - (ttyS1 - COM2)"
+msgstr ""
+
+#: data/mouse_raw.ycp:25
+msgid "Mouse Man protocol (serial Logitech mouse) - (ttyS0 - COM1)"
+msgstr ""
+
+#: data/mouse_raw.ycp:27
+msgid "Mouse Man protocol (serial Logitech mouse) - (ttyS1 - COM2)"
+msgstr ""
+
+#: data/mouse_raw.ycp:29
+msgid "Old Logitech serial mouse (series 9) - (ttyS0 - COM1)"
+msgstr ""
+
+#: data/mouse_raw.ycp:31
+msgid "Old Logitech serial mouse (series 9) - (ttyS1 - COM2)"
+msgstr ""
+
+#: data/mouse_raw.ycp:33
+msgid "Logitech busmouse"
+msgstr ""
+
+#: data/mouse_raw.ycp:35
+msgid "Sun Mouse - (/dev/sunmouse)"
+msgstr ""
+
+#: data/mouse_raw.ycp:37
+msgid "Oldest 2-button serial mouse - (ttyS0 - COM1)"
+msgstr ""
+
+#: data/mouse_raw.ycp:39
+msgid "Oldest 2-button serial mouse - (ttyS1 - COM2)"
+msgstr ""
+
+#: data/mouse_raw.ycp:41
+msgid "Microsoft busmouse"
+msgstr ""
+
+#: data/mouse_raw.ycp:43
+msgid "ATI XL busmouse"
+msgstr ""
+
+#: data/mouse_raw.ycp:45
+msgid "Plug-and-Play mice - (ttyS0 - COM1)"
+msgstr ""
+
+#: data/mouse_raw.ycp:47
+msgid "Plug-and-Play mice - (ttyS1 - COM2)"
+msgstr ""
+
+#: data/mouse_raw.ycp:49
+msgid "USB mouse"
+msgstr ""
+
+#: data/mouse_raw.ycp:51
+msgid "Intelli/Wheel mouse (Aux-port)"
+msgstr ""
+
+#: data/mouse_raw.ycp:53
+msgid "Intelli/Wheel mouse (USB)"
+msgstr ""
+
+#: data/mouse_raw.ycp:55
+msgid "IntelliMouse Explorer (ps2)"
+msgstr ""
+
+#: data/mouse_raw.ycp:57
+msgid "IntelliMouse Explorer (USB)"
+msgstr ""
+
+#: data/mouse_raw.ycp:59
+msgid "NONE "
+msgstr ""
+
+#: src/inst_mouse.ycp:59
+msgid "Choose your &mouse type from the list"
+msgstr ""
+
+#. ==========================================
+#. help texts
+#. ------------------------------------------
+#: src/inst_mouse.ycp:75
+msgid ""
+"<p>\n"
+"Choose the <b>mouse type</b> of the mouse attached to your computer.\n"
+"</p>\n"
+msgstr ""
+
+#: src/inst_mouse.ycp:80
+msgid ""
+"<p>\n"
+"Use the arrow keys to select a mouse. If the selection bar does not\n"
+"move, hit the <b><i>Tab</i></b> key (maybe repeatedly) until it does.\n"
+"</p>\n"
+msgstr ""
+
+#: src/inst_mouse.ycp:86
+msgid ""
+"<p>\n"
+"If you select <b>None</b>, you have to use the keyboard as\n"
+"described in the manual.\n"
+"</p>"
+msgstr ""
+
+#: src/inst_mouse.ycp:91
+msgid "Mouse configuration"
+msgstr ""
+
+#. save translated label text
+#: src/modules/Mouse.ycp:381
+msgid "Probe"
+msgstr ""
+
+#: src/mouse.ycp:69
+#, ycp-format
+msgid "Current Mouse Type: %1"
+msgstr ""
+
+#: src/mouse.ycp:114
+msgid "No mouse connected to the system..."
+msgstr ""
+
+#: src/mouse.ycp:150
+msgid "Mouse configuration."
+msgstr ""
+
+#: src/mouse.ycp:157
+msgid "Mouse configuration summary."
+msgstr ""
+
+#. progress step title
+#: src/mouse_finish.ycp:79
+msgid "Saving mouse configuration..."
+msgstr ""
+
+#: src/proposal/mouse_proposal.ycp:83
+msgid "Mouse"
+msgstr ""
+
+#: src/proposal/mouse_proposal.ycp:84
+msgid "&Mouse"
+msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.18.0/src/inst_init_mouse.ycp new/yast2-mouse-2.18.1/src/inst_init_mouse.ycp
--- old/yast2-mouse-2.18.0/src/inst_init_mouse.ycp 2009-01-21 13:28:05.000000000 +0100
+++ new/yast2-mouse-2.18.1/src/inst_init_mouse.ycp 2009-07-29 16:15:48.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Installation mode selection, initializing mouse
* Authors: Lukas Ocilka
*
- * $Id:$
+ * $Id: inst_init_mouse.ycp 57028 2009-04-29 10:58:09Z lslezak $
*
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.18.0/src/mouse.desktop new/yast2-mouse-2.18.1/src/mouse.desktop
--- old/yast2-mouse-2.18.0/src/mouse.desktop 2008-05-16 16:57:25.000000000 +0200
+++ new/yast2-mouse-2.18.1/src/mouse.desktop 2009-07-30 21:23:34.000000000 +0200
@@ -19,7 +19,7 @@
Icon=yast-mouse
Exec=/sbin/yast2 mouse
-Name=Mouse Model
-GenericName=Change the mouse model
+Name=GPM Configuration
+GenericName=Change the console mouse model
X-KDE-SubstituteUID=true
StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.18.0/src/mouse.ycp new/yast2-mouse-2.18.1/src/mouse.ycp
--- old/yast2-mouse-2.18.0/src/mouse.ycp 2005-10-14 13:34:50.000000000 +0200
+++ new/yast2-mouse-2.18.1/src/mouse.ycp 2009-07-30 20:54:26.000000000 +0200
@@ -79,13 +79,15 @@
map display_info = (map) UI::GetDisplayInfo ();
if (!display_info["TextMode"]:true)
{
- if (Confirm::MustBeRoot ())
- {
- // call sax
- SCR::Execute (.target.bash, "/usr/sbin/sax2 -O Mouse");
- return `finish;
- }
- return `cancel;
+ // disable mouse module in non-Textmode (bnc#441404)
+ y2milestone("YaST2 gpm (formerly known as 'mouse') was started in GUI mode. It is intended to configure the mouse for the console only. Mouse configuration for X is configured automatically by the X-Server.");
+ //if (Confirm::MustBeRoot ())
+ //{
+ // // call sax
+ // SCR::Execute (.target.bash, "/usr/sbin/sax2 -O Mouse");
+ // return `finish;
+ //}
+ //return `cancel;
}
MouseRead ();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.18.0/src/mouse_finish.ycp new/yast2-mouse-2.18.1/src/mouse_finish.ycp
--- old/yast2-mouse-2.18.0/src/mouse_finish.ycp 2009-01-21 13:28:05.000000000 +0100
+++ new/yast2-mouse-2.18.1/src/mouse_finish.ycp 2009-07-29 16:15:48.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Lukas Ocilka
*
- * $Id:$
+ * $Id: mouse_finish.ycp 57028 2009-04-29 10:58:09Z lslezak $
*
*/
@@ -19,7 +19,7 @@
//
// SCR::Write is called before SCR is switched to the installed system
-textdomain "installation";
+textdomain "mouse";
import "Progress";
import "Installation";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
