Merge pull request #698 from teclator/merge_SLE-12-SP1

Merge SLE-12-SP1 into SLE-12-SP2

.gitignore

@@ -19,11 +19,8 @@ coverage/
 install-sh
 pluglib-bindings.ami
 */.dep
-library/*/.dep
-library/*/*/.dep
-library/*/*.ybc
-library/*/*/*.ybc
-library/*/*/*/*.ybc
+library/**/.dep
+library/**/*.ybc
 doc/autodocs
 library/*/doc/autodocs
 library/*/testsuite/config/
@@ -35,9 +32,10 @@ library/*/testsuite/*.log
 library/*/testsuite/*.sum
 library/*/testsuite/*.exp
 library/*/testsuite/*.bak
-library/*/test/*.log
-library/*/test/*.trs
+library/*/test/**/*.log
+library/*/test/**/*.trs
 /test-driver
+coverage
 
 doc/yast.8
 
@@ -48,10 +46,12 @@ library/network/src/scrconf/network.scr
 missing
 library/packages/src/packages
 /.yardoc
+/*.pot
+*.log
+*.trs
 
 # Package
 package/yast2-*.tar.bz2
-package/yast2.spec
 
 # other
 home:*:*