Merge remote-tracking branch 'origin/master' into adapt_to_new_squid

.travis.yml

@@ -0,0 +1,16 @@
+language: cpp
+compiler:
+    - gcc
+before_install:
+    # disable rvm, use system Ruby
+    - rvm reset
+    - wget https://raw.githubusercontent.com/yast/yast-devtools/SLE-12-GA/travis-tools/travis_setup.sh
+    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-core-dev libboost-dev libboost-regex-dev" -g "rspec:2.14.1 yast-rake gettext"
+script:
+    - rake check:syntax
+    - rake check:pot
+    - make -f Makefile.cvs
+    - make
+    - sudo make install
+    - make check
+

CONTRIBUTING.md

@@ -12,13 +12,13 @@ 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)
+[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 @@ 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
+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)

README.md

@@ -0,0 +1,5 @@
+# YaST - The Squid Module #
+
+[![Travis Build](https://travis-ci.org/yast/yast-squid.svg?branch=master)](https://travis-ci.org/yast/yast-squid)
+[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-squid-master.svg)](https://ci.opensuse.org/view/Yast/job/yast-squid-master/)
+

package/yast2-squid.changes

@@ -4,6 +4,11 @@ Thu Jul  2 12:32:25 UTC 2015 - jreidinger@suse.com
 - remove obsolete emulate_http_log config option (bnc#928896)
 - 3.1.4
 
+-------------------------------------------------------------------
+Thu Dec  4 09:51:38 UTC 2014 - jreidinger@suse.com
+
+- remove X-KDE-Library from desktop file (bnc#899104)
+
 -------------------------------------------------------------------
 Fri Apr  4 11:19:40 UTC 2014 - jreidinger@suse.com
 

src/desktop/squid.desktop

@@ -4,7 +4,6 @@ Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
 
 X-KDE-ModuleType=Library
 X-KDE-HasReadOnlyMode=true
-X-KDE-Library=yast2
 X-SuSE-YaST-Call=squid
 
 X-SuSE-YaST-Group=Net_advanced