Hello community,

here is the log from the commit of package yast2-x11 for openSUSE:Factory 
checked in at 2018-01-17 21:43:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-x11 (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-x11.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-x11"

Wed Jan 17 21:43:31 2018 rev:16 rq:564510 version:4.0.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-x11/yast2-x11.changes      2016-06-29 
15:01:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-x11.new/yast2-x11.changes 2018-01-17 
21:43:36.468497138 +0100
@@ -1,0 +2,6 @@
+Mon Jan 15 08:16:28 UTC 2018 - jreidin...@suse.com
+
+- drop note about KEYTABLE (bsc#1075828, fate#319454)
+- 4.0.0
+
+-------------------------------------------------------------------

Old:
----
  yast2-x11-3.1.5.tar.bz2

New:
----
  yast2-x11-4.0.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-x11.spec ++++++
--- /var/tmp/diff_new_pack.T3CPDy/_old  2018-01-17 21:43:37.088468119 +0100
+++ /var/tmp/diff_new_pack.T3CPDy/_new  2018-01-17 21:43:37.088468119 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-x11
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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.5
+Version:        4.0.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-x11-3.1.5.tar.bz2 -> yast2-x11-4.0.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-x11-3.1.5/.travis.yml 
new/yast2-x11-4.0.0/.travis.yml
--- old/yast2-x11-3.1.5/.travis.yml     2016-05-03 16:38:04.338780184 +0200
+++ new/yast2-x11-4.0.0/.travis.yml     2018-01-15 11:02:54.000000000 +0100
@@ -1,14 +1,11 @@
-language: cpp
-compiler:
-    - gcc
+sudo: required
+language: bash
+services:
+  - docker
+
 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"
+  - docker build -t yast-x11-image .
 script:
-    - make -f Makefile.cvs
-    - make
-    - sudo make install
-    - make check
-
+  # the "yast-travis-cpp" script is included in the base yastdevel/cpp image
+  # see https://github.com/yast/docker-yast-cpp/blob/master/yast-travis-cpp
+  - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" 
yast-x11-image yast-travis-cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-x11-3.1.5/CONTRIBUTING.md 
new/yast2-x11-4.0.0/CONTRIBUTING.md
--- old/yast2-x11-3.1.5/CONTRIBUTING.md 2016-05-03 16:38:04.350780184 +0200
+++ new/yast2-x11-4.0.0/CONTRIBUTING.md 2018-01-15 11:02:54.000000000 +0100
@@ -3,7 +3,7 @@
 
 YaST is an open source project and as such it welcomes all kinds of
 contributions. If you decide to contribute, please follow these guidelines to
-ensure the process is effective and pleasant both for you and YaST maintainers.
+ensure the process is effective and pleasant both for you and the YaST 
maintainers.
 
 There are two main forms of contribution: reporting bugs and performing code
 changes.
@@ -17,13 +17,11 @@
 
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.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
 guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug).
 
+We can't guarantee that every bug will be fixed, but we'll try.
+
 Code Changes
 ------------
 
@@ -44,15 +42,22 @@
      to the [Ruby style
      guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md).
 
-  4. Make sure your change didn't break anything by building the RPM package
+  4. Update the package version (in `packages/*.spec`, usually by
+     `rake version:bump`) and add a new entry to the `package/*.changes` file
+     (by `osc vc package`).  
+     For bigger changes or changes which need longer discussion it is advised 
to
+     add this as a separate last commit so it can be easily updated when 
another
+     change is merged in the meantime.
+
+  5. Make sure your change didn't break anything by building the RPM package
      (`rake osc:build`). The build process includes running the full testsuite.
 
-  5. Publish the branch and create a pull request.
+  6. Publish the branch and create a pull request.
 
-  6. YaST developers will review your change and possibly point out issues.
+  7. YaST developers will review your change and possibly point out issues.
      Adapt the code under their guidance until they are all resolved.
 
-  7. Finally, the pull request will get merged or rejected.
+  8. Finally, the pull request will get merged or rejected.
 
 See also [GitHub's guide on
 contributing](https://help.github.com/articles/fork-a-repo).
@@ -60,9 +65,6 @@
 If you want to do multiple unrelated changes, use separate branches and pull
 requests.
 
-Do not change the `VERSION` and `*.changes` files as this could lead to
-conflicts.
-
 ### Commits
 
 Each commit in the pull request should do only one thing, which is clearly
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-x11-3.1.5/Dockerfile 
new/yast2-x11-4.0.0/Dockerfile
--- old/yast2-x11-3.1.5/Dockerfile      1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-x11-4.0.0/Dockerfile      2018-01-15 11:02:54.000000000 +0100
@@ -0,0 +1,7 @@
+FROM yastdevel/cpp
+RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \
+  xorg-x11-libX11-devel \
+  xorg-x11-libXmu-devel
+
+COPY . /usr/src/app
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-x11-3.1.5/package/yast2-x11.changes 
new/yast2-x11-4.0.0/package/yast2-x11.changes
--- old/yast2-x11-3.1.5/package/yast2-x11.changes       2016-06-15 
15:56:09.807778788 +0200
+++ new/yast2-x11-4.0.0/package/yast2-x11.changes       2018-01-15 
11:02:54.000000000 +0100
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Jan 15 08:16:28 UTC 2018 - jreidin...@suse.com
+
+- drop note about KEYTABLE (bsc#1075828, fate#319454)
+- 4.0.0
+
+-------------------------------------------------------------------
 Wed Jun 15 15:10:47 CEST 2016 - snw...@suse.de
 
 - add set_videomode script to adjust video mode using xrandr (bsc#974821)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-x11-3.1.5/package/yast2-x11.spec 
new/yast2-x11-4.0.0/package/yast2-x11.spec
--- old/yast2-x11-3.1.5/package/yast2-x11.spec  2016-06-15 15:56:09.807778788 
+0200
+++ new/yast2-x11-4.0.0/package/yast2-x11.spec  2018-01-15 11:02:54.000000000 
+0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-x11
-Version:        3.1.5
+Version:        4.0.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-x11-3.1.5/src/tools/xkbctrl.1 
new/yast2-x11-4.0.0/src/tools/xkbctrl.1
--- old/yast2-x11-3.1.5/src/tools/xkbctrl.1     2016-05-03 16:38:04.378780184 
+0200
+++ new/yast2-x11-4.0.0/src/tools/xkbctrl.1     2018-01-15 11:02:54.000000000 
+0100
@@ -12,11 +12,7 @@
 
 .SH DESCRIPTION
 xkbctrl is used to obtain the X11 keyboard configuration parameters
-according to a given console map name. The currently used console map
-is stored in the
-.I KEYTABLE
-variable within the file:
-.I /etc/sysconfig/keyboard
+according to a given console map name.
 
 .SH COMMAND LINE OPTIONS
 The one and only argument is the name of the console map but this


Reply via email to