Hello community,

here is the log from the commit of package yast2-apparmor for openSUSE:Factory 
checked in at 2014-05-10 22:57:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-apparmor (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-apparmor.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-apparmor"

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-apparmor/yast2-apparmor.changes    
2013-10-11 11:05:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-apparmor.new/yast2-apparmor.changes       
2014-05-10 22:57:04.000000000 +0200
@@ -1,0 +2,6 @@
+Fri May  9 13:47:26 UTC 2014 - [email protected]
+
+- fix help text to match reality (bnc#876904)
+- 3.1.1
+
+-------------------------------------------------------------------

Old:
----
  yast2-apparmor-3.1.0.tar.bz2

New:
----
  yast2-apparmor-3.1.1.tar.bz2

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

Other differences:
------------------
++++++ yast2-apparmor.spec ++++++
--- /var/tmp/diff_new_pack.KUHTZm/_old  2014-05-10 22:57:05.000000000 +0200
+++ /var/tmp/diff_new_pack.KUHTZm/_new  2014-05-10 22:57:05.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-apparmor
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products 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-apparmor
-Version:        3.1.0
+Version:        3.1.1
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -46,7 +46,7 @@
 BuildRequires:  update-desktop-files
 
 BuildRequires:  yast2
-BuildRequires:  yast2-devtools >= 3.0.6
+BuildRequires:  yast2-devtools >= 3.1.10
 
 %if 0%{?suse_version} >= 1140
 # openSUSE-11.4 or newer

++++++ yast2-apparmor-3.1.0.tar.bz2 -> yast2-apparmor-3.1.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-apparmor-3.1.0/CONTRIBUTING.md 
new/yast2-apparmor-3.1.1/CONTRIBUTING.md
--- old/yast2-apparmor-3.1.0/CONTRIBUTING.md    1970-01-01 01:00:00.000000000 
+0100
+++ new/yast2-apparmor-3.1.1/CONTRIBUTING.md    2014-05-09 16:05:43.000000000 
+0200
@@ -0,0 +1,87 @@
+YaST Contribution Guidelines
+============================
+
+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.
+
+There are two main forms of contribution: reporting bugs and performing code
+changes.
+
+Bug Reports
+-----------
+
+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)
+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
+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).
+
+Code Changes
+------------
+
+We welcome all kinds of code contributions, from simple bug fixes to 
significant
+refactorings and implementation of new features. However, before making any
+non-trivial contribution, get in touch with us first — this can prevent wasted
+effort on both sides. Also, have a look at our [development
+documentation](http://en.opensuse.org/openSUSE:YaST_development).
+
+To send us your code change, use GitHub pull requests. The workflow is as
+follows:
+
+  1. Fork the project.
+
+  2. Create a topic branch based on `master`.
+
+  3. Implement your change, including tests (if possible). Make sure you adhere
+     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
+     (`rake osc:build`). The build process includes running the full testsuite.
+
+  5. Publish the branch and create a pull request.
+
+  6. 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.
+
+See also [GitHub's guide on
+contributing](https://help.github.com/articles/fork-a-repo).
+
+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
+described by its commit message. Especially avoid mixing formatting changes and
+functional changes into one commit. When writing commit messages, adhere to
+[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
+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)
+and [openSUSE abbreviation
+reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations).
+
+Additional Information
+----------------------
+
+If you have any question, feel free to ask at the [development mailing
+list](http://lists.opensuse.org/yast-devel/) or at the
+[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode.
+We'll do our best to provide a timely and accurate answer.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-apparmor-3.1.0/VERSION 
new/yast2-apparmor-3.1.1/VERSION
--- old/yast2-apparmor-3.1.0/VERSION    2013-10-08 12:56:22.000000000 +0200
+++ new/yast2-apparmor-3.1.1/VERSION    1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-3.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-apparmor-3.1.0/package/yast2-apparmor.changes 
new/yast2-apparmor-3.1.1/package/yast2-apparmor.changes
--- old/yast2-apparmor-3.1.0/package/yast2-apparmor.changes     2013-10-08 
12:56:22.000000000 +0200
+++ new/yast2-apparmor-3.1.1/package/yast2-apparmor.changes     2014-05-09 
16:05:43.000000000 +0200
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Fri May  9 13:47:26 UTC 2014 - [email protected]
+
+- fix help text to match reality (bnc#876904)
+- 3.1.1
+
+-------------------------------------------------------------------
 Wed Sep 18 10:45:06 UTC 2013 - [email protected]
 
 - do not use *.spec.in template, use *.spec file with RPM macros
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-apparmor-3.1.0/package/yast2-apparmor.spec 
new/yast2-apparmor-3.1.1/package/yast2-apparmor.spec
--- old/yast2-apparmor-3.1.0/package/yast2-apparmor.spec        2013-10-08 
12:56:22.000000000 +0200
+++ new/yast2-apparmor-3.1.1/package/yast2-apparmor.spec        2014-05-09 
16:05:43.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-apparmor
-Version:        3.1.0
+Version:        3.1.1
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -47,7 +47,7 @@
 BuildRequires: update-desktop-files
 
 BuildRequires: yast2
-BuildRequires: yast2-devtools >= 3.0.6
+BuildRequires: yast2-devtools >= 3.1.10
 
 %if 0%{?suse_version} >= 1140
 # openSUSE-11.4 or newer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-apparmor-3.1.0/src/clients/AA_EditProfile.rb 
new/yast2-apparmor-3.1.1/src/clients/AA_EditProfile.rb
--- old/yast2-apparmor-3.1.0/src/clients/AA_EditProfile.rb      2013-10-08 
12:16:12.000000000 +0200
+++ new/yast2-apparmor-3.1.1/src/clients/AA_EditProfile.rb      2014-05-09 
16:05:43.000000000 +0200
@@ -85,7 +85,7 @@
         "chooseProfile" => lambda do
           SelectProfileForm(
             @profiles,
-            _("Select a listed profile and press Next to edit it."),
+            _("Select a listed profile and press Edit to edit it."),
             _("Edit Profile - Choose profile to edit"),
             "apparmor_edit_profile"
           )

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to