Hello community, here is the log from the commit of package yast2-x11 for openSUSE:Factory checked in at 2015-08-21 12:41:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-x11 (Old) and /work/SRC/openSUSE:Factory/.yast2-x11.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-x11" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-x11/yast2-x11.changes 2014-03-21 12:14:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-x11.new/yast2-x11.changes 2015-08-21 12:42:00.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 18 14:00:28 UTC 2015 - [email protected] + +- xkbctrl uses systemd mapping information now (fate#318426) +- 3.1.4 + +------------------------------------------------------------------- Old: ---- yast2-x11-3.1.3.tar.bz2 New: ---- yast2-x11-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-x11.spec ++++++ --- /var/tmp/diff_new_pack.2McbK6/_old 2015-08-21 12:42:01.000000000 +0200 +++ /var/tmp/diff_new_pack.2McbK6/_new 2015-08-21 12:42:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-x11 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-x11 -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -30,7 +30,7 @@ BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXmu-devel BuildRequires: yast2-devtools >= 3.1.10 -Requires: xdm +Requires: systemd Requires: yast2_theme >= 3.1.10 Summary: YaST2 - X11 support License: GPL-2.0 ++++++ yast2-x11-3.1.3.tar.bz2 -> yast2-x11-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-x11-3.1.3/.travis.yml new/yast2-x11-3.1.4/.travis.yml --- old/yast2-x11-3.1.3/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-x11-3.1.4/.travis.yml 2015-04-17 10:43:09.000000000 +0200 @@ -0,0 +1,14 @@ +language: cpp +compiler: + - gcc +before_install: + # disable rvm, use system Ruby + - rvm reset + - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh + - sh ./travis_setup.sh -p "yast2-devtools libx11-dev libxmu-dev" +script: + - make -f Makefile.cvs + - make + - sudo make install + - make check + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-x11-3.1.3/CONTRIBUTING.md new/yast2-x11-3.1.4/CONTRIBUTING.md --- old/yast2-x11-3.1.3/CONTRIBUTING.md 2014-03-13 15:00:47.000000000 +0100 +++ new/yast2-x11-3.1.4/CONTRIBUTING.md 2015-04-17 10:43:09.000000000 +0200 @@ -12,13 +12,13 @@ ----------- If you find a problem, please report it either using -[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +[Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) or [GitHub issues](../../issues). (For Bugzilla, use the [simplified registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) if you don't have an account yet.) If you find a problem, please report it either using -[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee that every bug will be fixed, but we'll try. When creating a bug report, please follow our [bug reporting @@ -71,7 +71,7 @@ [widely used conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). -If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +If your commit is related to a bug in Bugzilla or an issue on GitHub, make sure you mention it in the commit message for cross-reference. Use format like bnc#775814 or gh#yast/yast-foo#42. See also [GitHub autolinking](https://help.github.com/articles/github-flavored-markdown#references) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-x11-3.1.3/MAINTAINER new/yast2-x11-3.1.4/MAINTAINER --- old/yast2-x11-3.1.3/MAINTAINER 2014-03-13 15:00:47.000000000 +0100 +++ new/yast2-x11-3.1.4/MAINTAINER 2015-04-17 10:43:09.000000000 +0200 @@ -1 +1 @@ -Arvin Schnell <[email protected]> +Deprecated file. Use `osc maintainer yast2-x11` instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-x11-3.1.3/README.md new/yast2-x11-3.1.4/README.md --- old/yast2-x11-3.1.3/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-x11-3.1.4/README.md 2015-04-17 10:43:09.000000000 +0200 @@ -0,0 +1,5 @@ +# YaST - X11 Tools and Configs # + +[](https://travis-ci.org/yast/yast-x11) +[](https://ci.opensuse.org/view/Yast/job/yast-x11-master/) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-x11-3.1.3/package/yast2-x11.changes new/yast2-x11-3.1.4/package/yast2-x11.changes --- old/yast2-x11-3.1.3/package/yast2-x11.changes 2014-03-13 15:00:47.000000000 +0100 +++ new/yast2-x11-3.1.4/package/yast2-x11.changes 2015-08-18 16:47:09.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 18 14:00:28 UTC 2015 - [email protected] + +- xkbctrl uses systemd mapping information now (fate#318426) +- 3.1.4 + +------------------------------------------------------------------- Thu Mar 13 09:29:50 UTC 2014 - [email protected] - fix typo in requires diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-x11-3.1.3/package/yast2-x11.spec new/yast2-x11-3.1.4/package/yast2-x11.spec --- old/yast2-x11-3.1.3/package/yast2-x11.spec 2014-03-13 15:00:47.000000000 +0100 +++ new/yast2-x11-3.1.4/package/yast2-x11.spec 2015-08-18 16:47:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-x11 -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,7 +28,7 @@ BuildRequires: autoconf automake gcc-c++ libtool xorg-x11-libX11-devel BuildRequires: xorg-x11-libXmu-devel BuildRequires: yast2-devtools >= 3.1.10 -Requires: xdm +Requires: systemd Requires: yast2_theme >= 3.1.10 Summary: YaST2 - X11 support Url: http://github.com/yast/yast-x11/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-x11-3.1.3/src/tools/xkbctrl new/yast2-x11-3.1.4/src/tools/xkbctrl --- old/yast2-x11-3.1.3/src/tools/xkbctrl 2014-03-13 15:00:47.000000000 +0100 +++ new/yast2-x11-3.1.4/src/tools/xkbctrl 2015-08-18 16:47:09.000000000 +0200 @@ -2,7 +2,7 @@ # Copyright (c) 2002 SuSE GmbH Nuernberg, Germany. All rights reserved. # # Author: Marcus Schaefer <[email protected]>, 2002 -# SaX2 script: get console -> x11 xkb mapping information +# script: get console -> x11 xkb mapping information # -- # CVS ID: # -------- @@ -13,7 +13,7 @@ #================================= # Globals... #--------------------------------- -my $CFGMap = "/etc/X11/xdm/Keyboard.map"; +my $CFGMap = "/usr/share/systemd/kbd-model-map"; #================================= # The magic main :-) @@ -26,15 +26,7 @@ my $XkbVariant; my $XkbLayout; my $XkbModel; - my $Protocol; - my $XkbRules; my $XkbOptions; - my $MapName; - my $XkbKeyCodes; - my $LeftAlt; - my $RightAlt; - my $ScrollLock; - my $RightCtl; my $Apply; my %map; @@ -50,52 +42,32 @@ foreach (keys %map) { if ($_ eq $ARGV[0]) { my @list = split (/:/,$map{$_}); - $XkbModel = Tr (shift(@list)); $XkbLayout = Tr (shift(@list)); + $XkbModel = Tr (shift(@list)); $XkbVariant = Tr (shift(@list)); - $XkbKeyCodes = Tr (shift(@list)); - $LeftAlt = Tr (shift(@list)); - $RightAlt = Tr (shift(@list)); - $ScrollLock = Tr (shift(@list)); - $RightCtl = Tr (shift(@list)); $XkbOptions = Tr (join(":",@list)); } } - $opt{-model} = $XkbModel; $opt{-layout} = $XkbLayout; - $opt{-option} = $XkbOptions; + $opt{-model} = $XkbModel; $opt{-variant} = $XkbVariant; + $opt{-option} = $XkbOptions; foreach (keys %opt) { - if (($opt{$_} ne "x") && ($opt{$_} ne "")) { + if (($opt{$_} ne "-") && ($opt{$_} ne "")) { $Apply = "$Apply $_ $opt{$_}"; } } $Apply =~ s/^ +//; print "\$[\n"; - if ($XkbVariant ne "x") { + if ($XkbVariant ne "-") { print " \"XkbVariant\" : \"$XkbVariant\",\n"; } print " \"XkbLayout\" : \"$XkbLayout\",\n"; print " \"XkbModel\" : \"$XkbModel\",\n"; - if ($XkbOptions ne "x") { + if ($XkbOptions ne "-") { print " \"XkbOptions\" : \"$XkbOptions\",\n"; } - if ($XkbKeyCodes !~ /xfree86/) { - print " \"XkbKeyCodes\" : \"$XkbKeyCodes\",\n"; - } - if ($LeftAlt ne "x") { - print " \"LeftAlt\" : \"$LeftAlt\",\n"; - } - if ($RightAlt ne "x") { - print " \"RightAlt\" : \"$RightAlt\",\n"; - } - if ($ScrollLock ne "x") { - print " \"ScrollLock\" : \"$ScrollLock\",\n"; - } - if ($RightCtl ne "x") { - print " \"RightCtl\" : \"$RightCtl\",\n"; - } print " \"Apply\" : \"$Apply\"\n"; print "]\n" } @@ -116,6 +88,7 @@ die "could not open file: $filename"; } while (my $line=<DATA>) { + $line =~ s/[ \t]+/:/g; chomp ($line); my @list = split (/:/,$line); $consoleName = shift (@list);
