Hello community, here is the log from the commit of package yast2-mouse for openSUSE:Factory checked in at 2013-06-05 13:26:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-mouse (Old) and /work/SRC/openSUSE:Factory/.yast2-mouse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-mouse" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-mouse/yast2-mouse.changes 2013-04-24 12:23:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-mouse.new/yast2-mouse.changes 2013-06-05 13:26:02.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 24 15:16:03 UTC 2013 - [email protected] + +- move data/mouse_raw.ycp to include/mouse/mouse_raw.ycp + (make the future transition to ruby easier) +- 2.24.1 + +------------------------------------------------------------------- Old: ---- yast2-mouse-2.24.0.tar.bz2 New: ---- yast2-mouse-2.24.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-mouse.spec ++++++ --- /var/tmp/diff_new_pack.VvXut9/_old 2013-06-05 13:26:03.000000000 +0200 +++ /var/tmp/diff_new_pack.VvXut9/_new 2013-06-05 13:26:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-mouse -Version: 2.24.0 +Version: 2.24.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,7 +83,8 @@ %files %defattr(-,root,root) -/usr/share/YaST2/data/*.ycp +%dir /usr/share/YaST2/include/mouse +/usr/share/YaST2/include/mouse/* /usr/share/YaST2/modules/* /usr/share/YaST2/clients/*.ycp %ifnarch s390 s390x ++++++ yast2-mouse-2.24.0.tar.bz2 -> yast2-mouse-2.24.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.24.0/Makefile.am new/yast2-mouse-2.24.1/Makefile.am --- old/yast2-mouse-2.24.0/Makefile.am 2013-04-16 10:31:39.000000000 +0200 +++ new/yast2-mouse-2.24.1/Makefile.am 2013-05-28 14:13:47.000000000 +0200 @@ -193,4 +193,4 @@ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo # test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = agents data doc src testsuite +SUBDIRS = agents doc src testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.24.0/Makefile.in new/yast2-mouse-2.24.1/Makefile.in --- old/yast2-mouse-2.24.0/Makefile.in 2013-04-16 10:31:44.000000000 +0200 +++ new/yast2-mouse-2.24.1/Makefile.in 2013-05-28 14:13:53.000000000 +0200 @@ -321,7 +321,7 @@ TAGVERSION = $(Y2TOOL) tagversion # test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = agents data doc src testsuite +SUBDIRS = agents doc src testsuite all: all-recursive .SUFFIXES: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.24.0/VERSION new/yast2-mouse-2.24.1/VERSION --- old/yast2-mouse-2.24.0/VERSION 2013-04-16 10:31:33.000000000 +0200 +++ new/yast2-mouse-2.24.1/VERSION 2013-05-07 17:16:32.000000000 +0200 @@ -1 +1 @@ -2.24.0 +2.24.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.24.0/configure new/yast2-mouse-2.24.1/configure --- old/yast2-mouse-2.24.0/configure 2013-04-16 10:31:43.000000000 +0200 +++ new/yast2-mouse-2.24.1/configure 2013-05-28 14:13:53.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-mouse 2.24.0. +# Generated by GNU Autoconf 2.69 for yast2-mouse 2.24.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-mouse' PACKAGE_TARNAME='yast2-mouse' -PACKAGE_VERSION='2.24.0' -PACKAGE_STRING='yast2-mouse 2.24.0' +PACKAGE_VERSION='2.24.1' +PACKAGE_STRING='yast2-mouse 2.24.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,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.24.0 to adapt to many kinds of systems. +\`configure' configures yast2-mouse 2.24.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1318,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-mouse 2.24.0:";; + short | recursive ) echo "Configuration of yast2-mouse 2.24.1:";; esac cat <<\_ACEOF @@ -1398,7 +1398,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-mouse configure 2.24.0 +yast2-mouse configure 2.24.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1415,7 +1415,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.24.0, which was +It was created by yast2-mouse $as_me 2.24.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2354,7 +2354,7 @@ # Define the identity of the package. PACKAGE='yast2-mouse' - VERSION='2.24.0' + VERSION='2.24.1' cat >>confdefs.h <<_ACEOF @@ -2477,7 +2477,7 @@ -VERSION="2.24.0" +VERSION="2.24.1" RPMNAME="yast2-mouse" MAINTAINER="J. Daniel Schmidt <[email protected]> " @@ -2842,7 +2842,7 @@ -ac_config_files="$ac_config_files Makefile agents/Makefile data/Makefile doc/autodocs/Makefile doc/Makefile src/modules/Makefile src/proposal/Makefile src/Makefile testsuite/Makefile" +ac_config_files="$ac_config_files Makefile agents/Makefile doc/autodocs/Makefile doc/Makefile src/modules/Makefile src/proposal/Makefile src/Makefile testsuite/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3403,7 +3403,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.24.0, which was +This file was extended by yast2-mouse $as_me 2.24.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3456,7 +3456,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-mouse config.status 2.24.0 +yast2-mouse config.status 2.24.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -3571,7 +3571,6 @@ case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "agents/Makefile") CONFIG_FILES="$CONFIG_FILES agents/Makefile" ;; - "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; "doc/autodocs/Makefile") CONFIG_FILES="$CONFIG_FILES doc/autodocs/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "src/modules/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/Makefile" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.24.0/configure.in new/yast2-mouse-2.24.1/configure.in --- old/yast2-mouse-2.24.0/configure.in 2013-04-16 10:31:39.000000000 +0200 +++ new/yast2-mouse-2.24.1/configure.in 2013-05-28 14:13:47.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-mouse, 2.24.0, http://bugs.opensuse.org/, yast2-mouse) +AC_INIT(yast2-mouse, 2.24.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.24.0" +VERSION="2.24.1" RPMNAME="yast2-mouse" MAINTAINER="J. Daniel Schmidt <[email protected]> " @@ -151,7 +151,6 @@ AC_CONFIG_FILES(Makefile agents/Makefile -data/Makefile doc/autodocs/Makefile doc/Makefile src/modules/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.24.0/data/Makefile.am new/yast2-mouse-2.24.1/data/Makefile.am --- old/yast2-mouse-2.24.0/data/Makefile.am 2013-01-22 11:29:55.000000000 +0100 +++ new/yast2-mouse-2.24.1/data/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -# -# Makefile.am for y2c_mouse/data -# - -ydata_DATA = mouse_raw.ycp - -EXTRA_DIST = $(ydata_DATA) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.24.0/data/Makefile.in new/yast2-mouse-2.24.1/data/Makefile.in --- old/yast2-mouse-2.24.0/data/Makefile.in 2013-04-16 10:31:44.000000000 +0200 +++ new/yast2-mouse-2.24.1/data/Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,435 +0,0 @@ -# Makefile.in generated by automake 1.12.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -# Makefile.am for y2c_mouse/data -# - -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = data -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) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(ydatadir)" -DATA = $(ydata_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINTAINER = @MAINTAINER@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RPMNAME = @RPMNAME@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -STYLESHEET_CSS = @STYLESHEET_CSS@ -STYLESHEET_HTML = @STYLESHEET_HTML@ -STYLESHEET_PDF = @STYLESHEET_PDF@ -STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@ -STYLESHEET_YDOC = @STYLESHEET_YDOC@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ -YCPC = @YCPC@ -YCPDOC = @YCPDOC@ -YCPMAKEDEP = @YCPMAKEDEP@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -agentdir = @agentdir@ -am__leading_dot = @am__leading_dot@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -clientdir = @clientdir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -desktopdir = @desktopdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -execcompdir = @execcompdir@ -fillupdir = @fillupdir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -imagedir = @imagedir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -moduledir = @moduledir@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -pkgconfigdatadir = @pkgconfigdatadir@ -pkgconfigdir = @pkgconfigdir@ -plugindir = @plugindir@ -potdir = @potdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -schemadir = @schemadir@ -scrconfdir = @scrconfdir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -themedir = @themedir@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -yast2dir = @yast2dir@ -ybindir = @ybindir@ -ydatadir = @ydatadir@ -yncludedir = @yncludedir@ -ystartupdir = @ystartupdir@ -ydata_DATA = mouse_raw.ycp -EXTRA_DIST = $(ydata_DATA) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-ydataDATA: $(ydata_DATA) - @$(NORMAL_INSTALL) - @list='$(ydata_DATA)'; test -n "$(ydatadir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(ydatadir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(ydatadir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(ydatadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(ydatadir)" || exit $$?; \ - done - -uninstall-ydataDATA: - @$(NORMAL_UNINSTALL) - @list='$(ydata_DATA)'; test -n "$(ydatadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(ydatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(ydatadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-ydataDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-ydataDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-ydataDATA installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-am uninstall-ydataDATA - - -# 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-mouse-2.24.0/data/mouse_raw.ycp new/yast2-mouse-2.24.1/data/mouse_raw.ycp --- old/yast2-mouse-2.24.0/data/mouse_raw.ycp 2013-01-22 11:29:55.000000000 +0100 +++ new/yast2-mouse-2.24.1/data/mouse_raw.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,65 +0,0 @@ -/** - * $Id$ - * Author: Unknown <[email protected]> - textdomain "mouse" - */ -{ -textdomain "mouse"; - -// map <string, list> -return ($[ -"00_ps2" : [ _("PS/2 mouse (Aux-port)"), - $["mset":"PS/2", "gpm":"ps2", "bus":"PS/2", "device":"/dev/input/mice", "emul3":true, "wheels":0 ]], -"01_ms0" : [ _("Microsoft compatible serial mouse - (ttyS0 - COM1)"), - $["mset":"Microsoft", "gpm":"ms", "device":"/dev/ttyS0", "emul3":true, "wheels":0 ]], -"02_ms" : [ _("Microsoft compatible serial mouse - (ttyS1 - COM2)"), - $["mset":"Microsoft", "gpm":"ms", "device":"/dev/ttyS1", "emul3":true, "wheels":0 ]], -"03_ms30" : [ _("Microsoft Intellimouse - 3 buttons and wheel - (ttyS0 - COM1)"), - $["mset":"IntelliMouse","gpm":"ms3", "device":"/dev/ttyS0", "emul3":false, "wheels":1 ]], -"04_ms3" : [ _("Microsoft Intellimouse - 3 buttons and wheel - (ttyS1 - COM2)"), - $["mset":"IntelliMouse","gpm":"ms3", "device":"/dev/ttyS1", "emul3":false, "wheels":1 ]], -"05_msc0" : [ _("Mouse Systems serial mouse - (ttyS0 - COM1)"), - $["mset":"MouseSystems","gpm":"msc", "device":"/dev/ttyS0", "emul3":true, "wheels":0 ]], -"06_msc" : [ _("Mouse Systems serial mouse - (ttyS1 - COM2)"), - $["mset":"MouseSystems","gpm":"msc", "device":"/dev/ttyS1", "emul3":true, "wheels":0 ]], -"07_mman0" : [ _("Mouse Man protocol (serial Logitech mouse) - (ttyS0 - COM1)"), - $["mset":"Mouseman", "gpm":"mman", "device":"/dev/ttyS0", "emul3":false, "wheels":0 ]], -"08_mman" : [ _("Mouse Man protocol (serial Logitech mouse) - (ttyS1 - COM2)"), - $["mset":"Mouseman", "gpm":"mman", "device":"/dev/ttyS1", "emul3":false, "wheels":0 ]], -"09_logi0" : [ _("Old Logitech serial mouse (series 9) - (ttyS0 - COM1)"), - $["mset":"Logitech", "gpm":"logi", "device":"/dev/ttyS0", "emul3":true, "wheels":0 ]], -"10_logi" : [ _("Old Logitech serial mouse (series 9) - (ttyS1 - COM2)"), - $["mset":"Logitech", "gpm":"logi", "device":"/dev/ttyS1", "emul3":true, "wheels":0 ]], -"11_busm" : [ _("Logitech busmouse"), - $["mset":"BusMouse", "gpm":"BusMouse", "device":"/dev/logibm", "emul3":false, "wheels":0 ]], -"12_sun" : [ _("Sun Mouse - (/dev/sunmouse)"), - $["mset":"MouseSystems","gpm":"sun", "device":"/dev/sunmouse", "emul3":false, "wheels":0 ]], -"13_bare0" : [ _("Oldest 2-button serial mouse - (ttyS0 - COM1)"), - $["mset":"Microsoft", "gpm":"bare", "device":"/dev/ttyS0", "emul3":true, "wheels":0 ]], -"14_bare" : [ _("Oldest 2-button serial mouse - (ttyS1 - COM2)"), - $["mset":"Microsoft", "gpm":"bare", "device":"/dev/ttyS1", "emul3":true, "wheels":0 ]], -"15_mb" : [ _("Microsoft busmouse"), - $["mset":"BusMouse", "gpm":"mb", "device":"/dev/inportbm", "emul3":true, "wheels":0 ]], -"16_bm" : [ _("ATI XL busmouse"), - $["mset":"BusMouse", "gpm":"bm", "device":"/dev/atibm", "emul3":true, "wheels":0 ]], -"17_pnp0" : [ _("Plug-and-Play mice - (ttyS0 - COM1)"), - $["mset":"Auto", "gpm":"pnp", "device":"/dev/ttyS0", "emul3":true, "wheels":0 ]], -"18_pnp" : [ _("Plug-and-Play mice - (ttyS1 - COM2)"), - $["mset":"Auto", "gpm":"pnp", "device":"/dev/ttyS1", "emul3":true, "wheels":0 ]], -"19_usb" : [ _("USB mouse"), - $["mset":"PS/2", "gpm":"ps2", "bus":"USB", "device":"/dev/input/mice", "emul3":true, "wheels":0 ]], -"20_imps2" : [ _("Intelli/Wheel mouse (Aux-port)"), - $["mset":"imps/2", "gpm":"imps2", "bus":"PS/2", "device":"/dev/input/mice", "emul3":false, "wheels":1 ]], -"21_imps2" : [ _("Intelli/Wheel mouse (USB)"), - $["mset":"imps/2", "gpm":"imps2", "bus":"USB", "device":"/dev/input/mice", "emul3":false, "wheels":1 ]], -"22_exps2" : [ _("IntelliMouse Explorer (ps2)"), - $["mset":"ExplorerPS/2","gpm":"exps2", "bus":"PS/2", "device":"/dev/input/mice", "emul3":false, "wheels":1 ]], -"23_exps2" : [ _("IntelliMouse Explorer (USB)"), - $["mset":"ExplorerPS/2","gpm":"exps2", "bus":"USB", "device":"/dev/input/mice", "emul3":false, "wheels":1 ]], -"none" : [ _("NONE "), - $["mset":"", "gpm":"", "device":"", "emul3":false, "wheels":0 ]], -]); - - -/* EOF */ -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.24.0/src/Makefile.am new/yast2-mouse-2.24.1/src/Makefile.am --- old/yast2-mouse-2.24.0/src/Makefile.am 2013-01-22 11:29:55.000000000 +0100 +++ new/yast2-mouse-2.24.1/src/Makefile.am 2013-05-07 17:16:32.000000000 +0200 @@ -12,6 +12,11 @@ desktop_DATA = \ mouse.desktop -EXTRA_DIST = $(client_DATA) $(desktop_DATA) +yncludedir = @yncludedir@/mouse + +ynclude_DATA = \ + include/mouse/mouse_raw.ycp + +EXTRA_DIST = $(client_DATA) $(desktop_DATA) $(ynclude_DATA) include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.24.0/src/Makefile.in new/yast2-mouse-2.24.1/src/Makefile.in --- old/yast2-mouse-2.24.0/src/Makefile.in 2013-04-16 10:31:44.000000000 +0200 +++ new/yast2-mouse-2.24.1/src/Makefile.in 2013-05-28 14:13:54.000000000 +0200 @@ -106,8 +106,9 @@ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(modulebindir)" -DATA = $(client_DATA) $(desktop_DATA) $(modulebin_DATA) + "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(yncludedir)" +DATA = $(client_DATA) $(desktop_DATA) $(modulebin_DATA) \ + $(ynclude_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -257,7 +258,7 @@ yast2dir = @yast2dir@ ybindir = @ybindir@ ydatadir = @ydatadir@ -yncludedir = @yncludedir@ +yncludedir = @yncludedir@/mouse ystartupdir = @ystartupdir@ # @@ -273,7 +274,10 @@ desktop_DATA = \ mouse.desktop -EXTRA_DIST = $(client_DATA) $(desktop_DATA) +ynclude_DATA = \ + include/mouse/mouse_raw.ycp + +EXTRA_DIST = $(client_DATA) $(desktop_DATA) $(ynclude_DATA) modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) modulebindir = $(moduledir) ybcfiles = $(filter %.ybc,$(modulebin_DATA)) @@ -384,6 +388,27 @@ @list='$(modulebin_DATA)'; test -n "$(modulebindir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(modulebindir)'; $(am__uninstall_files_from_dir) +install-yncludeDATA: $(ynclude_DATA) + @$(NORMAL_INSTALL) + @list='$(ynclude_DATA)'; test -n "$(yncludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(yncludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(yncludedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(yncludedir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(yncludedir)" || exit $$?; \ + done + +uninstall-yncludeDATA: + @$(NORMAL_UNINSTALL) + @list='$(ynclude_DATA)'; test -n "$(yncludedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(yncludedir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -601,7 +626,7 @@ all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(modulebindir)"; do \ + for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(yncludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -657,7 +682,7 @@ info-am: install-data-am: install-clientDATA install-desktopDATA \ - install-modulebinDATA + install-modulebinDATA install-yncludeDATA install-dvi: install-dvi-recursive @@ -702,7 +727,7 @@ ps-am: uninstall-am: uninstall-clientDATA uninstall-desktopDATA \ - uninstall-modulebinDATA + uninstall-modulebinDATA uninstall-yncludeDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ cscopelist-recursive ctags-recursive install-am install-strip \ @@ -717,12 +742,12 @@ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-modulebinDATA install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ + install-ps-am install-strip install-yncludeDATA installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall-clientDATA uninstall-desktopDATA \ - uninstall-modulebinDATA + uninstall-modulebinDATA uninstall-yncludeDATA # suffix mapping: info '(make)Static Usage' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.24.0/src/include/mouse/mouse_raw.ycp new/yast2-mouse-2.24.1/src/include/mouse/mouse_raw.ycp --- old/yast2-mouse-2.24.0/src/include/mouse/mouse_raw.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-mouse-2.24.1/src/include/mouse/mouse_raw.ycp 2013-05-07 17:16:32.000000000 +0200 @@ -0,0 +1,68 @@ +/** + * $Id$ + * Author: Unknown <[email protected]> + textdomain "mouse" + */ +{ +textdomain "mouse"; + +define map<string, list> get_mouse_db() { + +// map <string, list> +return ($[ +"00_ps2" : [ _("PS/2 mouse (Aux-port)"), + $["mset":"PS/2", "gpm":"ps2", "bus":"PS/2", "device":"/dev/input/mice", "emul3":true, "wheels":0 ]], +"01_ms0" : [ _("Microsoft compatible serial mouse - (ttyS0 - COM1)"), + $["mset":"Microsoft", "gpm":"ms", "device":"/dev/ttyS0", "emul3":true, "wheels":0 ]], +"02_ms" : [ _("Microsoft compatible serial mouse - (ttyS1 - COM2)"), + $["mset":"Microsoft", "gpm":"ms", "device":"/dev/ttyS1", "emul3":true, "wheels":0 ]], +"03_ms30" : [ _("Microsoft Intellimouse - 3 buttons and wheel - (ttyS0 - COM1)"), + $["mset":"IntelliMouse","gpm":"ms3", "device":"/dev/ttyS0", "emul3":false, "wheels":1 ]], +"04_ms3" : [ _("Microsoft Intellimouse - 3 buttons and wheel - (ttyS1 - COM2)"), + $["mset":"IntelliMouse","gpm":"ms3", "device":"/dev/ttyS1", "emul3":false, "wheels":1 ]], +"05_msc0" : [ _("Mouse Systems serial mouse - (ttyS0 - COM1)"), + $["mset":"MouseSystems","gpm":"msc", "device":"/dev/ttyS0", "emul3":true, "wheels":0 ]], +"06_msc" : [ _("Mouse Systems serial mouse - (ttyS1 - COM2)"), + $["mset":"MouseSystems","gpm":"msc", "device":"/dev/ttyS1", "emul3":true, "wheels":0 ]], +"07_mman0" : [ _("Mouse Man protocol (serial Logitech mouse) - (ttyS0 - COM1)"), + $["mset":"Mouseman", "gpm":"mman", "device":"/dev/ttyS0", "emul3":false, "wheels":0 ]], +"08_mman" : [ _("Mouse Man protocol (serial Logitech mouse) - (ttyS1 - COM2)"), + $["mset":"Mouseman", "gpm":"mman", "device":"/dev/ttyS1", "emul3":false, "wheels":0 ]], +"09_logi0" : [ _("Old Logitech serial mouse (series 9) - (ttyS0 - COM1)"), + $["mset":"Logitech", "gpm":"logi", "device":"/dev/ttyS0", "emul3":true, "wheels":0 ]], +"10_logi" : [ _("Old Logitech serial mouse (series 9) - (ttyS1 - COM2)"), + $["mset":"Logitech", "gpm":"logi", "device":"/dev/ttyS1", "emul3":true, "wheels":0 ]], +"11_busm" : [ _("Logitech busmouse"), + $["mset":"BusMouse", "gpm":"BusMouse", "device":"/dev/logibm", "emul3":false, "wheels":0 ]], +"12_sun" : [ _("Sun Mouse - (/dev/sunmouse)"), + $["mset":"MouseSystems","gpm":"sun", "device":"/dev/sunmouse", "emul3":false, "wheels":0 ]], +"13_bare0" : [ _("Oldest 2-button serial mouse - (ttyS0 - COM1)"), + $["mset":"Microsoft", "gpm":"bare", "device":"/dev/ttyS0", "emul3":true, "wheels":0 ]], +"14_bare" : [ _("Oldest 2-button serial mouse - (ttyS1 - COM2)"), + $["mset":"Microsoft", "gpm":"bare", "device":"/dev/ttyS1", "emul3":true, "wheels":0 ]], +"15_mb" : [ _("Microsoft busmouse"), + $["mset":"BusMouse", "gpm":"mb", "device":"/dev/inportbm", "emul3":true, "wheels":0 ]], +"16_bm" : [ _("ATI XL busmouse"), + $["mset":"BusMouse", "gpm":"bm", "device":"/dev/atibm", "emul3":true, "wheels":0 ]], +"17_pnp0" : [ _("Plug-and-Play mice - (ttyS0 - COM1)"), + $["mset":"Auto", "gpm":"pnp", "device":"/dev/ttyS0", "emul3":true, "wheels":0 ]], +"18_pnp" : [ _("Plug-and-Play mice - (ttyS1 - COM2)"), + $["mset":"Auto", "gpm":"pnp", "device":"/dev/ttyS1", "emul3":true, "wheels":0 ]], +"19_usb" : [ _("USB mouse"), + $["mset":"PS/2", "gpm":"ps2", "bus":"USB", "device":"/dev/input/mice", "emul3":true, "wheels":0 ]], +"20_imps2" : [ _("Intelli/Wheel mouse (Aux-port)"), + $["mset":"imps/2", "gpm":"imps2", "bus":"PS/2", "device":"/dev/input/mice", "emul3":false, "wheels":1 ]], +"21_imps2" : [ _("Intelli/Wheel mouse (USB)"), + $["mset":"imps/2", "gpm":"imps2", "bus":"USB", "device":"/dev/input/mice", "emul3":false, "wheels":1 ]], +"22_exps2" : [ _("IntelliMouse Explorer (ps2)"), + $["mset":"ExplorerPS/2","gpm":"exps2", "bus":"PS/2", "device":"/dev/input/mice", "emul3":false, "wheels":1 ]], +"23_exps2" : [ _("IntelliMouse Explorer (USB)"), + $["mset":"ExplorerPS/2","gpm":"exps2", "bus":"USB", "device":"/dev/input/mice", "emul3":false, "wheels":1 ]], +"none" : [ _("NONE "), + $["mset":"", "gpm":"", "device":"", "emul3":false, "wheels":0 ]], +]); + +} + +/* EOF */ +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.24.0/src/modules/Makefile.am new/yast2-mouse-2.24.1/src/modules/Makefile.am --- old/yast2-mouse-2.24.0/src/modules/Makefile.am 2013-01-22 11:29:55.000000000 +0100 +++ new/yast2-mouse-2.24.1/src/modules/Makefile.am 2013-05-07 17:16:32.000000000 +0200 @@ -2,9 +2,17 @@ # Makefile.am for y2c_mouse/src/modules # +YCPCFLAGS = -I . -M . + module_DATA = \ Mouse.ycp EXTRA_DIST = $(module_DATA) + +mouse: + ln -sf ../include/mouse mouse + +ycpchook = mouse + include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.24.0/src/modules/Makefile.in new/yast2-mouse-2.24.1/src/modules/Makefile.in --- old/yast2-mouse-2.24.0/src/modules/Makefile.in 2013-04-16 10:31:44.000000000 +0200 +++ new/yast2-mouse-2.24.1/src/modules/Makefile.in 2013-05-28 14:13:54.000000000 +0200 @@ -222,10 +222,12 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ +YCPCFLAGS = -I . -M . module_DATA = \ Mouse.ycp EXTRA_DIST = $(module_DATA) +ycpchook = mouse modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) modulebindir = $(moduledir) ybcfiles = $(filter %.ybc,$(modulebin_DATA)) @@ -477,6 +479,9 @@ uninstall-moduleDATA uninstall-modulebinDATA +mouse: + ln -sf ../include/mouse mouse + # suffix mapping: info '(make)Static Usage' # apply only to our modules, not external ones ${ybcfiles}: %.ybc: %.ycp $(ycpchook) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mouse-2.24.0/src/modules/Mouse.ycp new/yast2-mouse-2.24.1/src/modules/Mouse.ycp --- old/yast2-mouse-2.24.0/src/modules/Mouse.ycp 2013-04-16 10:31:33.000000000 +0200 +++ new/yast2-mouse-2.24.1/src/modules/Mouse.ycp 2013-05-07 17:16:32.000000000 +0200 @@ -54,6 +54,8 @@ map<string, list> mice = $[]; boolean first_proposal = true; +include "mouse/mouse_raw.ycp"; + //========================================== // Set... //------------------------------------------ @@ -187,9 +189,7 @@ // ... // search mouse in raw database (file access) // --- - mice = (map<string,list>)eval(SCR::Read ( - .target.yast2, "mouse_raw.ycp") - ); + mice = get_mouse_db(); list<list> tl = maplist( string mouse_id, list mouse_data, mice, ``{ mouse_data[1,"id"] = mouse_id; return(mouse_data); @@ -289,11 +289,8 @@ // ... // Get mouse data base for possible retranslation. // --- - mice = (map<string, list>)eval(SCR::Read ( - .target.yast2, ["mouse_raw.ycp", $[]] - )); - locale translate = mice[mouse_id, 0]:mouse_id; - name = (string) eval (translate); + mice = get_mouse_db(); + name = mice[mouse_id, 0]:mouse_id; y2milestone ("Mouse '%1', name '%2'", mouse_id, name); // ... // Overwrite perhaps probed data only if the @@ -325,9 +322,7 @@ ); string n = ""; if( size(mice)==0 || first_proposal || language_changed ) { - mice = (map<string, list>)eval(SCR::Read( - .target.yast2, ["mouse_raw.ycp", $[]] - )); + mice = get_mouse_db(); } first_proposal = false; @@ -365,15 +360,11 @@ // try translated mouse.ycp first, if this doesnt exist // use the raw (untranslated) version // --- - locale translate = ""; string mouse_name = ""; - mice = (map<string, list>)eval(SCR::Read ( - .target.yast2, ["mouse_raw.ycp", $[]] - )); + mice = get_mouse_db(); map<string, string> selection = mapmap( string mouse_code, list mouse_value, mice, ``{ - translate = mouse_value[0]:""; - mouse_name = (string)eval(translate); + mouse_name = mouse_value[0]:""; return $[mouse_code: mouse_name]; }); if (Mode::config()) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
