Current state

diff --git a/cups/printers.conf b/cups/printers.conf
index 68263ddb9ff97aacf2343483b87812e9698b6be8..1ad5dd7685c9b422ead71a67e3d2c783d8abd712 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.7.1
-# Written by cupsd on 2014-07-08 00:01
+# Written by cupsd on 2014-11-02 09:14
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer Bla_blub>
 UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 84c074b4e4820f1d0487c57868af691604be6e8a..3810e03a0685f7114058e57f525be70b4a708396 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,3 +1,3 @@
-# Subscription configuration file for CUPS v1.6.4
-# Written by cupsd on 2014-02-01 13:02
-NextSubscriptionId 210
+# Subscription configuration file for CUPS v1.7.1
+# Written by cupsd on 2014-11-16 19:21
+NextSubscriptionId 212

diff --git a/fstab b/fstab
index 0fad1c1adb27956913ed84db724fa6d6a71a26ba..faca9a00ab04c9ec22e6c4a423c024c0e809b588 100644 (file)
--- a/fstab
+++ b/fstab
@@ -42,6 +42,7 @@ shm                                   /dev/shm                tmpfs   nodev,nosuid,noexec     0 0
 /data/all/Dokumente/Doris              /home/doris/Dokumente   none    bind                    0 0
 /data/all/Dokumente/Patrick            /home/patrick/Dokumente none    bind                    0 0
 
+/dev/sde                               /mnt/usb_stick          auto    noauto,user,uid=frank,gid=users 0 0
 /dev/sde1                              /mnt/usb_stick1         auto    noauto,user,uid=frank,gid=users 0 0
 /dev/sde2                              /mnt/usb_stick2         auto    noauto,user             0 0
 

diff --git a/local.d/baselayout1.stop b/local.d/baselayout1.stop
index ab762bc91c0c90224de66cd0e335f5fed707d90e..dd12ae60b910cb4532c7cbb0d9f8b33f83875682 100755 (executable)
--- a/local.d/baselayout1.stop
+++ b/local.d/baselayout1.stop
@@ -10,10 +10,16 @@
 
 echo "Sende Mail wegen Shutdown ..."
 echo "Kiste $(hostname) wird '$(date)' ordentlich heruntergefahren" | /usr/bin/mailx -s "Shutdown von $(hostname)" root@localhost
+sleep 1
+echo "Flushing the mail queue ..."
+/usr/sbin/postqueue -f
 
-echo
-echo "Warte 5 Sekunden ..."
-echo
-sleep 5
+printf "Warte 10 Sekunden: "
+for i in $(seq 10 -1 1); do
+    printf "$i "
+    sleep 1
+done
+
+printf "0 - shutdown!!\n"
 
 # vim: ts=4 expandtab

diff --git a/openvpn/profitbricks/keys/pb-2-fbrehm.2014-0.crt b/openvpn/profitbricks/keys/pb-2-fbrehm.2014-0.crt
new file mode 100644 (file)
index 0000000..84f9466
--- /dev/null
+++ b/openvpn/profitbricks/keys/pb-2-fbrehm.2014-0.crt
@@ -0,0 +1,95 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 132 (0x84)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=DE, ST=B, L=Berlin, O=ProfitBricks GmbH, OU=System Operations, CN=ProfitBricks GmbH CA/emailAddress=sysadmin@profitbricks.com
+        Validity
+            Not Before: Jul 14 13:32:41 2014 GMT
+            Not After : Jul 14 13:32:41 2015 GMT
+        Subject: C=DE, ST=B, L=Berlin, O=ProfitBricks GmbH, OU=SO, CN=pb-2-fbrehm/emailAddress=frank.brehm@profitbricks.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:bd:bc:b6:8c:fd:d9:4f:e8:03:51:80:66:19:9f:
+                    99:61:0a:a6:54:3d:1f:0d:08:45:f1:93:a9:15:75:
+                    db:06:cf:a5:5c:34:cc:68:b6:e5:d2:3e:4a:10:ae:
+                    bb:c1:78:bb:66:06:8e:f7:82:29:14:b0:6d:25:dc:
+                    36:70:e2:52:16:87:3c:d6:ba:a9:2f:b7:c4:cc:63:
+                    76:b8:84:7b:7a:21:22:74:89:f1:4c:05:a3:e5:14:
+                    1c:fe:3f:d8:18:c1:93:0f:8c:bb:cd:4e:f7:e8:dd:
+                    4f:46:b8:ea:ae:b9:bf:b2:88:04:7b:75:26:3a:c1:
+                    c3:de:f3:7d:44:c4:d6:c3:1e:bd:28:1a:7d:87:45:
+                    96:9e:e1:59:f2:28:47:12:9f:2b:a7:9c:c6:d7:36:
+                    ac:ad:bf:71:c9:5c:a0:c2:1d:f8:d1:80:83:41:e2:
+                    f4:86:8b:f9:68:18:71:73:89:78:2c:e1:8b:81:dd:
+                    3f:7d:cf:98:cb:be:7b:4f:3f:b4:10:80:b5:29:5a:
+                    e9:73:38:76:99:a3:66:ec:c5:1a:06:19:1c:d6:f8:
+                    89:87:44:77:c5:53:a8:48:02:84:c1:a4:3c:60:fa:
+                    da:50:c6:20:64:e6:b1:fe:f0:8f:9b:4d:32:58:a8:
+                    a7:46:02:2e:80:6a:49:21:56:e9:6b:45:96:2a:08:
+                    16:75
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                Easy-RSA Generated Certificate
+            X509v3 Subject Key Identifier: 
+                DB:98:E6:28:C0:AF:BE:EF:8D:83:B6:D6:32:AA:16:E5:F3:A7:80:8E
+            X509v3 Authority Key Identifier: 
+                keyid:A2:4E:D1:50:78:57:D0:4E:A7:94:1C:25:D4:DF:67:30:D4:44:DD:09
+                DirName:/C=DE/ST=B/L=Berlin/O=ProfitBricks GmbH/OU=System Operations/CN=ProfitBricks GmbH CA/emailAddress=sysadmin@profitbricks.com
+                serial:EA:C8:E4:D0:70:F1:9C:78
+
+            X509v3 Extended Key Usage: 
+                TLS Web Client Authentication
+            X509v3 Key Usage: 
+                Digital Signature
+    Signature Algorithm: sha1WithRSAEncryption
+        b8:ec:f5:1e:b3:99:54:c8:61:2c:d9:8c:d9:bb:2e:ab:e4:ea:
+        31:aa:ea:85:f4:00:dc:2a:70:a1:17:0b:e7:22:34:e5:de:7a:
+        55:39:fa:03:b4:3d:fc:51:23:1e:cd:81:83:ce:8b:fc:c6:14:
+        06:62:91:be:51:68:e0:2f:69:04:f4:89:58:5b:aa:99:5e:f5:
+        e4:55:55:0b:b0:c0:b8:aa:be:ef:21:88:1d:21:ac:8f:52:99:
+        be:7f:a0:bd:44:09:8e:88:97:0a:24:1b:99:cd:06:75:ee:0b:
+        95:8b:78:3f:d1:45:62:6b:28:11:96:90:74:32:df:81:c5:c1:
+        e3:14:12:fa:e2:49:65:19:0f:08:c1:5b:6f:4b:1b:d6:39:0a:
+        08:19:c3:a3:5a:d1:71:a6:3e:71:0c:df:3c:d3:35:dd:b4:23:
+        48:cf:f4:40:3a:a7:0a:75:2f:42:f7:34:ef:bf:fe:d6:ca:c0:
+        b5:96:a9:57:e2:94:c7:dc:76:58:24:49:2c:f8:bb:ab:44:f4:
+        74:26:e4:06:8c:11:f0:af:8f:24:27:87:ac:b0:f0:bc:68:63:
+        4b:7f:c8:bd:dd:a1:c8:ad:a5:98:ed:85:5e:94:8a:4a:ed:15:
+        c9:c6:ae:f9:60:ef:79:cd:da:25:c9:ce:97:d7:28:65:85:a9:
+        72:87:9b:c1
+-----BEGIN CERTIFICATE-----
+MIIFIzCCBAugAwIBAgICAIQwDQYJKoZIhvcNAQEFBQAwgasxCzAJBgNVBAYTAkRF
+MQowCAYDVQQIEwFCMQ8wDQYDVQQHEwZCZXJsaW4xGjAYBgNVBAoTEVByb2ZpdEJy
+aWNrcyBHbWJIMRowGAYDVQQLExFTeXN0ZW0gT3BlcmF0aW9uczEdMBsGA1UEAxMU
+UHJvZml0QnJpY2tzIEdtYkggQ0ExKDAmBgkqhkiG9w0BCQEWGXN5c2FkbWluQHBy
+b2ZpdGJyaWNrcy5jb20wHhcNMTQwNzE0MTMzMjQxWhcNMTUwNzE0MTMzMjQxWjCB
+ljELMAkGA1UEBhMCREUxCjAIBgNVBAgTAUIxDzANBgNVBAcTBkJlcmxpbjEaMBgG
+A1UEChMRUHJvZml0QnJpY2tzIEdtYkgxCzAJBgNVBAsTAlNPMRQwEgYDVQQDEwtw
+Yi0yLWZicmVobTErMCkGCSqGSIb3DQEJARYcZnJhbmsuYnJlaG1AcHJvZml0YnJp
+Y2tzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL28toz92U/o
+A1GAZhmfmWEKplQ9Hw0IRfGTqRV12wbPpVw0zGi25dI+ShCuu8F4u2YGjveCKRSw
+bSXcNnDiUhaHPNa6qS+3xMxjdriEe3ohInSJ8UwFo+UUHP4/2BjBkw+Mu81O9+jd
+T0a46q65v7KIBHt1JjrBw97zfUTE1sMevSgafYdFlp7hWfIoRxKfK6ecxtc2rK2/
+cclcoMId+NGAg0Hi9IaL+WgYcXOJeCzhi4HdP33PmMu+e08/tBCAtSla6XM4dpmj
+ZuzFGgYZHNb4iYdEd8VTqEgChMGkPGD62lDGIGTmsf7wj5tNMliop0YCLoBqSSFW
+6WtFlioIFnUCAwEAAaOCAWIwggFeMAkGA1UdEwQCMAAwLQYJYIZIAYb4QgENBCAW
+HkVhc3ktUlNBIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU25jmKMCv
+vu+Ng7bWMqoW5fOngI4wgeAGA1UdIwSB2DCB1YAUok7RUHhX0E6nlBwl1N9nMNRE
+3QmhgbGkga4wgasxCzAJBgNVBAYTAkRFMQowCAYDVQQIEwFCMQ8wDQYDVQQHEwZC
+ZXJsaW4xGjAYBgNVBAoTEVByb2ZpdEJyaWNrcyBHbWJIMRowGAYDVQQLExFTeXN0
+ZW0gT3BlcmF0aW9uczEdMBsGA1UEAxMUUHJvZml0QnJpY2tzIEdtYkggQ0ExKDAm
+BgkqhkiG9w0BCQEWGXN5c2FkbWluQHByb2ZpdGJyaWNrcy5jb22CCQDqyOTQcPGc
+eDATBgNVHSUEDDAKBggrBgEFBQcDAjALBgNVHQ8EBAMCB4AwDQYJKoZIhvcNAQEF
+BQADggEBALjs9R6zmVTIYSzZjNm7Lqvk6jGq6oX0ANwqcKEXC+ciNOXeelU5+gO0
+PfxRIx7NgYPOi/zGFAZikb5RaOAvaQT0iVhbqple9eRVVQuwwLiqvu8hiB0hrI9S
+mb5/oL1ECY6IlwokG5nNBnXuC5WLeD/RRWJrKBGWkHQy34HFweMUEvriSWUZDwjB
+W29LG9Y5CggZw6Na0XGmPnEM3zzTNd20I0jP9EA6pwp1L0L3NO+//tbKwLWWqVfi
+lMfcdlgkSSz4u6tE9HQm5AaMEfCvjyQnh6yw8LxoY0t/yL3docitpZjthV6Uikrt
+FcnGrvlg73nN2iXJzpfXKGWFqXKHm8E=
+-----END CERTIFICATE-----

diff --git a/openvpn/profitbricks/keys/pb-2-fbrehm.crt b/openvpn/profitbricks/keys/pb-2-fbrehm.crt
index f1dc6e6e426d39cb35dc09a51a724e60fc6f065b..a080713642f274b7d35670f6455b320627b5442d 120000 (symlink)
--- a/openvpn/profitbricks/keys/pb-2-fbrehm.crt
+++ b/openvpn/profitbricks/keys/pb-2-fbrehm.crt
@@ -1 +1 @@
-pb-2-fbrehm.2013-0.crt
\ No newline at end of file
+pb-2-fbrehm.2014-0.crt
\ No newline at end of file

diff --git a/php/apache2-php5.3/ext-active/uuid.ini b/php/apache2-php5.3/ext-active/uuid.ini
deleted file mode 120000 (symlink)
index f851904..0000000
--- a/php/apache2-php5.3/ext-active/uuid.ini
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/uuid.ini
\ No newline at end of file

diff --git a/php/apache2-php5.3/ext-active/yaz.ini b/php/apache2-php5.3/ext-active/yaz.ini
deleted file mode 120000 (symlink)
index 507e4a5..0000000
--- a/php/apache2-php5.3/ext-active/yaz.ini
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/apache2-php5.3/ext/yaz.ini
\ No newline at end of file

diff --git a/php/apache2-php5.3/ext/uuid.ini b/php/apache2-php5.3/ext/uuid.ini
deleted file mode 100644 (file)
index 3d84187..0000000
--- a/php/apache2-php5.3/ext/uuid.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension=uuid.so

diff --git a/php/apache2-php5.3/ext/yaz.ini b/php/apache2-php5.3/ext/yaz.ini
deleted file mode 100644 (file)
index fc2f651..0000000
--- a/php/apache2-php5.3/ext/yaz.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension=yaz.so

diff --git a/php/cgi-php5.3/ext-active/uuid.ini b/php/cgi-php5.3/ext-active/uuid.ini
deleted file mode 120000 (symlink)
index 4c2ce79..0000000
--- a/php/cgi-php5.3/ext-active/uuid.ini
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/uuid.ini
\ No newline at end of file

diff --git a/php/cgi-php5.3/ext-active/yaz.ini b/php/cgi-php5.3/ext-active/yaz.ini
deleted file mode 120000 (symlink)
index d71259f..0000000
--- a/php/cgi-php5.3/ext-active/yaz.ini
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cgi-php5.3/ext/yaz.ini
\ No newline at end of file

diff --git a/php/cgi-php5.3/ext/uuid.ini b/php/cgi-php5.3/ext/uuid.ini
deleted file mode 100644 (file)
index 3d84187..0000000
--- a/php/cgi-php5.3/ext/uuid.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension=uuid.so

diff --git a/php/cgi-php5.3/ext/yaz.ini b/php/cgi-php5.3/ext/yaz.ini
deleted file mode 100644 (file)
index fc2f651..0000000
--- a/php/cgi-php5.3/ext/yaz.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension=yaz.so

diff --git a/php/cli-php5.3/ext-active/uuid.ini b/php/cli-php5.3/ext-active/uuid.ini
deleted file mode 120000 (symlink)
index 0c39d67..0000000
--- a/php/cli-php5.3/ext-active/uuid.ini
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/uuid.ini
\ No newline at end of file

diff --git a/php/cli-php5.3/ext-active/yaz.ini b/php/cli-php5.3/ext-active/yaz.ini
deleted file mode 120000 (symlink)
index 1fcdb98..0000000
--- a/php/cli-php5.3/ext-active/yaz.ini
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/cli-php5.3/ext/yaz.ini
\ No newline at end of file

diff --git a/php/cli-php5.3/ext/uuid.ini b/php/cli-php5.3/ext/uuid.ini
deleted file mode 100644 (file)
index 3d84187..0000000
--- a/php/cli-php5.3/ext/uuid.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension=uuid.so

diff --git a/php/cli-php5.3/ext/yaz.ini b/php/cli-php5.3/ext/yaz.ini
deleted file mode 100644 (file)
index fc2f651..0000000
--- a/php/cli-php5.3/ext/yaz.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension=yaz.so

diff --git a/php/embed-php5.3/ext-active/uuid.ini b/php/embed-php5.3/ext-active/uuid.ini
deleted file mode 120000 (symlink)
index ae123ac..0000000
--- a/php/embed-php5.3/ext-active/uuid.ini
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/embed-php5.3/ext/uuid.ini
\ No newline at end of file

diff --git a/php/embed-php5.3/ext/uuid.ini b/php/embed-php5.3/ext/uuid.ini
deleted file mode 100644 (file)
index 3d84187..0000000
--- a/php/embed-php5.3/ext/uuid.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension=uuid.so

diff --git a/php/fpm-php5.3/ext-active/uuid.ini b/php/fpm-php5.3/ext-active/uuid.ini
deleted file mode 120000 (symlink)
index f081ab1..0000000
--- a/php/fpm-php5.3/ext-active/uuid.ini
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/uuid.ini
\ No newline at end of file

diff --git a/php/fpm-php5.3/ext-active/yaz.ini b/php/fpm-php5.3/ext-active/yaz.ini
deleted file mode 120000 (symlink)
index bc24d45..0000000
--- a/php/fpm-php5.3/ext-active/yaz.ini
+++ /dev/null
@@ -1 +0,0 @@
-/etc/php/fpm-php5.3/ext/yaz.ini
\ No newline at end of file

diff --git a/php/fpm-php5.3/ext/uuid.ini b/php/fpm-php5.3/ext/uuid.ini
deleted file mode 100644 (file)
index 3d84187..0000000
--- a/php/fpm-php5.3/ext/uuid.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension=uuid.so

diff --git a/php/fpm-php5.3/ext/yaz.ini b/php/fpm-php5.3/ext/yaz.ini
deleted file mode 100644 (file)
index fc2f651..0000000
--- a/php/fpm-php5.3/ext/yaz.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension=yaz.so

diff --git a/portage/package.keywords b/portage/package.keywords
index 69caee7f905316684408099fb63e023b4da5c881..6a30e27966e0753ad32b080eb43ab0de5de2da36 100644 (file)
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -4,13 +4,16 @@
 
 ~app-admin/eselect-java-0.1.0
 # ~app-admin/gnome-system-log-3.6.1
+~app-admin/keepass-2.26
 # ~app-admin/openrc-settingsd-1.0.1
 
+~app-arch/engrampa-1.8.0
 ~app-arch/mate-file-archiver-1.6.0
 ~app-arch/mate-file-archiver-1.6.1
 
 ~app-editors/mate-text-editor-1.6.2
 ~app-editors/mate-text-editor-1.6.2
+~app-editors/pluma-1.8.0
 
 ~app-emulation/emul-linux-x86-baselibs-20120520
 ~app-emulation/emul-linux-x86-db-20120520
@@ -30,6 +33,7 @@ app-emulation/virtualbox-modules
 ~app-misc/g15stats-1.9.7
 ~app-misc/g15mpd-1.0.0
 
+~app-text/atril-1.8.0
 ~app-text/debiandoc-sgml-1.2.27
 ~app-text/mate-document-viewer-1.6.1
 ~app-text/mate-document-viewer-1.6.2
@@ -59,6 +63,7 @@ app-emulation/virtualbox-modules
 ~dev-libs/libgcrypt-1.6.1
 ~dev-libs/libindicator-12.10.1
 ~dev-libs/libmateweather-1.6.2
+~dev-libs/libmateweather-1.8.0
 # ~dev-libs/libzeitgeist-0.3.18
 ~dev-libs/nspr-4.9.1
 ~dev-libs/nspr-4.9.6
@@ -82,6 +87,7 @@ dev-python/passlib
 ~dev-python/pathlib-1.0
 dev-python/pb-logging
 ~dev-python/pbr-0.8.2
+~dev-python/pep8-1.5.7
 ~dev-python/pillow-2.3.0
 ~dev-python/pygments-1.6
 ~dev-python/pylint-0.28.0
@@ -135,36 +141,58 @@ dev-vcs/rcs-fast-export           **
 
 mail-client/thunderbird
 
+~mate-base/caja-1.8.0
+~mate-base/caja-1.8.1
 ~mate-base/libmatekbd-1.6.2
+~mate-base/libmatekbd-1.8.0
 ~mate-base/mate-1.6.0
+~mate-base/mate-1.8.0
 ~mate-base/mate-applets-1.6.2
+~mate-base/mate-applets-1.8.0
 ~mate-base/mate-common-1.6.2
+~mate-base/mate-common-1.8.0
 ~mate-base/mate-control-center-1.6.2
+~mate-base/mate-control-center-1.8.1
 ~mate-base/mate-desktop-1.6.2
+~mate-base/mate-desktop-1.8.1
 ~mate-base/mate-file-manager-1.6.3
 ~mate-base/mate-menus-1.6.0
+~mate-base/mate-menus-1.8.0
 ~mate-base/mate-panel-1.6.1
+~mate-base/mate-panel-1.8.0
 ~mate-base/mate-session-manager-1.6.1
+~mate-base/mate-session-manager-1.8.1
 ~mate-base/mate-settings-daemon-1.6.2
+~mate-base/mate-settings-daemon-1.8.1
 
 ~mate-extra/caja-extensions-1.8.0
 ~mate-extra/mate-calc-1.6.0
 ~mate-extra/mate-calc-1.6.1
+~mate-extra/mate-calc-1.8.0
 ~mate-extra/mate-character-map-1.6.0
 ~mate-extra/mate-dialogs-1.6.2
+~mate-extra/mate-dialogs-1.8.0
 ~mate-extra/mate-file-manager-image-converter-1.6.0
 ~mate-extra/mate-file-manager-open-terminal-1.6.0
 ~mate-extra/mate-file-manager-sendto-1.6.0
 ~mate-extra/mate-file-manager-share-1.6.0
 ~mate-extra/mate-media-1.6.1
+~mate-extra/mate-media-1.8.0
 ~mate-extra/mate-polkit-1.6.1
+~mate-extra/mate-polkit-1.8.0
 ~mate-extra/mate-power-manager-1.6.3
+~mate-extra/mate-power-manager-1.8.0
 ~mate-extra/mate-screensaver-1.6.1
+~mate-extra/mate-screensaver-1.8.0
 ~mate-extra/mate-sensors-applet-1.6.1
+~mate-extra/mate-sensors-applet-1.8.0
 ~mate-extra/mate-system-monitor-1.6.1
+~mate-extra/mate-system-monitor-1.8.0
 ~mate-extra/mate-utils-1.6.1
+~mate-extra/mate-utils-1.8.0
 
 # ~media-gfx/eog-3.6.2
+~media-gfx/eom-1.8.0
 # ~media-gfx/gnome-font-viewer-3.6.2
 ~media-gfx/mate-image-viewer-1.6.2
 ~media-gfx/shotwell-0.13.1
@@ -219,19 +247,25 @@ www-client/firefox
 ~x11-libs/libmatewnck-1.6.1
 
 ~x11-misc/mate-menu-editor-1.6.0
+~x11-misc/mozo-1.8.0
 
 ~x11-plugins/wmcalendar-0.5.2
 ~x11-plugins/wmmixer-1.5       **
 
 # ~x11-terms/gnome-terminal-3.6.1
 ~x11-terms/mate-terminal-1.6.2
+~x11-terms/mate-terminal-1.8.0
 
 # ~x11-themes/gnome-backgrounds-3.6.1
 # ~x11-themes/gnome-icon-theme-extras-3.6.2
 # ~x11-themes/gnome-icon-theme-symbolic-3.6.2
 ~x11-themes/mate-backgrounds-1.6.1
+~x11-themes/mate-backgrounds-1.8.0
 ~x11-themes/mate-icon-theme-1.6.3
+~x11-themes/mate-icon-theme-1.8.0
 ~x11-themes/mate-themes-1.6.3
+~x11-themes/mate-themes-1.8.0
 
+~x11-wm/marco-1.8.0
 ~x11-wm/mate-window-manager-1.6.2
 # ~x11-wm/mutter-3.6.3

diff --git a/portage/package.use b/portage/package.use
index 6d6fdc33c7338a763bd3dc132068fa5116504d46..a2200f3c28858f83a11ed94b83edd9ef64b8f2a1 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -3,6 +3,7 @@ app-accessibility/espeak                -portaudio pulseaudio
 
 app-admin/eselect-php                  fpm
 app-admin/gnome-system-tools           nfs
+app-admin/keepass                      aot
 app-admin/syslog-ng                    spoof-source sql
 app-admin/ulogd                                dbi nfacct pcap
 
@@ -40,6 +41,7 @@ app-portage/eix                               optimization strong-optimization
 app-shells/bash                                plugins
 app-shells/tcsh                                catalogs
 
+app-text/atril                         dvi t1lib xps
 app-text/djvu                          doc threads
 app-text/docbook-sgml-utils            jadetex
 app-text/enchant                       aspell -zemberek

diff --git a/rc.conf b/rc.conf
index f15028520f477bfda0fd01c994cce868a2d01567..8990bad0f4ba6efc3778a688dc0ba01133411b32 100644 (file)
--- a/rc.conf
+++ b/rc.conf
@@ -7,8 +7,8 @@
 # WARNING: whilst we have improved parallel, it can still potentially lock
 # the boot process. Don't file bugs about this unless you can supply
 # patches that fix it without breaking other things!
-#rc_parallel="NO"
-rc_parallel="YES"
+rc_parallel="NO"
+#rc_parallel="YES"
 
 # Set rc_interactive to "YES" and you'll be able to press the I key during
 # boot so you can choose to start specific services. Set to "NO" to disable
@@ -133,6 +133,8 @@ unicode="YES"
 #rc_foo_bar_need="openvpn"
 #rc_foo_bar_after="clock"
 
+rc_local_after="mta"
+
 # You can also remove dependencies.
 # This is mainly used for saying which servies do NOT provide net.
 #rc_net_tap0_provide="!net"

diff --git a/smartd.conf b/smartd.conf
index 8f20337b007a9ff471e269fe0d82719c7ef5fc67..806328c65762820d5fd7c14ec29bd729c9ce9b11 100644 (file)
--- a/smartd.conf
+++ b/smartd.conf
@@ -40,6 +40,7 @@
 #/dev/hda -a -o on -S on -s (S/../.././02|L/../../6/03)
 /dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03)
 /dev/sdb -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03)
+/dev/sdc -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03)
 #/dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03)
 
 # Monitor SMART status, ATA Error Log, Self-test log, and track

diff --git a/sound/events/mate-battstat_applet.soundlist b/sound/events/mate-battstat_applet.soundlist
index 94e9a714d300424f4e6533358565fe99a4120507..9514165791f1dda859a3c9cc09a88446b53ac035 100644 (file)
--- a/sound/events/mate-battstat_applet.soundlist
+++ b/sound/events/mate-battstat_applet.soundlist
@@ -5,7 +5,7 @@ description[ar]=أداة حالة البطارية
 description[as]=বেটাৰি'ৰ অৱস্থা নিৰীক্ষণৰ সৰঞ্জাম
 description[ast]=Utilidá d'estau de la batería
 description[az]=Batareya Vəziyyəti Tə'minatı
-description[be]=УÑ\82Ñ\83лка Ñ\81Ñ\82анÑ\83 заÑ\80аду батарэі
+description[be]=УÑ\82Ñ\8bлÑ\96Ñ\82а Ñ\81Ñ\82ану батарэі
 description[be@latin]=Pryłada adsočvańnia stanu akumulatara
 description[bg]=Инструмент за състоянието на батерията
 description[bn]=ব্যাটারি'র অবস্থা নিরীক্ষণের সরঞ্জাম
@@ -14,6 +14,7 @@ description[br]=Merour stad ar batiri
 description[bs]=Alatka za status baterije
 description[ca]=Utilitat de l'estat de la bateria
 description[ca@valencia]=Utilitat de l'estat de la bateria
+description[cmn]=電池狀態公用程式
 description[crh]=Pil Durumu Aracı
 description[cs]=Nástroj stavu baterie
 description[cy]=Cyfleuster Cyflwr Batri
@@ -65,7 +66,6 @@ description[ka]=ელემენტის მდგომარეობის
 description[kn]=ಬ್ಯಾಟರಿ ಸ್ಥಿತಿಯ ಸೌಲಭ್ಯ
 description[ko]=배터리 상태 유틸리티
 description[ku]=Amûra rewşa bataryayê
-description[ky]=Батарея Абалы Индикатору
 description[lt]=Baterijos būsenos pagalbinė programa
 description[lv]=Baterijas statusa utilīta
 description[mai]=बैटरी स्थिति उपयोगिता
@@ -100,6 +100,7 @@ description[th]=แอพเพล็ตแสดงสถานะแบตเ
 description[tr]=Pil Durumu Aracı
 description[ug]=باتارېيە ھالەت قورالى
 description[uk]=Утиліта індикації стану акумулятора
+description[ur]=بیٹری حالت سہولت
 description[vi]=Tiện ích xem trạng thái pin
 description[xh]=Isixhobo soBume beBhetri
 description[zh_CN]=电池状态工具
@@ -110,11 +111,12 @@ description[zh_TW]=電池狀態公用程式
 file=
 description=Battery power low
 description[af]=Battery amper pap
+description[am]=የባትሪው ሐይል ዝቅተኛ ነው 
 description[ar]=طاقة البطارية منخفضة
 description[as]=বেটাৰিৰ ক্ষমতা কম
 description[ast]=Batería baxa
 description[az]=Batareya həcmi alçaqdır
-description[be]=Ð\97аÑ\80ад баÑ\82аÑ\80Ñ\8dÑ\96 нÑ\96зкі
+description[be]=Ð\9cала Ñ\8dнеÑ\80гÑ\96Ñ\96 Ñ\9e баÑ\82аÑ\80Ñ\8dі
 description[be@latin]=Akumulatar razradžany
 description[bg]=Ниска мощност на батерията
 description[bn]=ব্যাটারির ক্ষমতা কম
@@ -123,6 +125,7 @@ description[br]=Izel youll ar pod-tredan
 description[bs]=Baterija skoro prazna
 description[ca]=Bateria amb càrrega baixa
 description[ca@valencia]=Bateria amb càrrega baixa
+description[cmn]=電池電量過低
 description[crh]=Pil gücü zayıf
 description[cs]=Téměř vybité baterie
 description[cy]=Mae pŵer y batri'n isel
@@ -173,7 +176,6 @@ description[ka]=დაბალი ძაბვა
 description[kn]=ಕೆಳಮಟ್ಟದಲ್ಲಿರುವ ಬ್ಯಾಟರಿ ವಿದ್ಯುಚ್ಚಕ್ತಿ
 description[ko]=배터리 전력이 부족합니다
 description[ku]=Hêza bataryayê qels e
-description[ky]=Батарея заряды толук түгөндү
 description[lt]=Baterija beveik išsikrovusi
 description[lv]=Baterijas enerģija zema
 description[mai]=बैटरी पावर कम
@@ -191,13 +193,13 @@ description[oc]=Batariá febla
 description[or]=ବ୍ଯାଟେରୀ  ବିଦ୍ଯୁତ କମ ଅଛି
 description[pa]=ਬੈਟਰੀ ਪਾਵਰ ਘੱਟ ਹੈ
 description[pl]=Akumulator jest na wyczerpaniu
-description[pt]=Bateria fraca
+description[pt]=Energia da bateria em baixo
 description[pt_BR]=Bateria fraca
 description[ro]=Acumulator pe terminate
 description[ru]=Батарея разряжена
 description[si]=වියළි කොෂ බලය අවම වී ඇත
 description[sk]=Batéria je slabá
-description[sl]=Baterija je skoraj prazna
+description[sl]=Napetost baterije je nizka
 description[sq]=Ngarkesë e ulët e baterisë
 description[sr]=Батерија слаба
 description[sr@latin]=Baterija slaba
@@ -208,6 +210,7 @@ description[th]=แบตเตอรี่ใกล้หมด
 description[tr]=Pil gücü zayıf
 description[ug]=باتارېيىدە توك ئاز قالدى
 description[uk]=Акумулятор розряджений
+description[ur]=بیٹری کی توانائی پست ہے
 description[vi]=Pin thấp
 description[wa]=Li batreye est flåwe
 description[xh]=Amandla ebhetri asezantsi
@@ -219,11 +222,11 @@ description[zh_TW]=電池電量過低
 file=
 description=Battery fully re-charged
 description[af]=Battery ten volle gelaai
-description[ar]=أُعيد شحن البطارية تماما
+description[ar]=أُعيد شحن البطارية تمامًا
 description[as]=বেটাৰি সম্পূৰ্ণৰূপে চাৰ্জ কৰা হৈছে
 description[ast]=Batería llena
 description[az]=Batareya tamamilə dolduruldu
-description[be]=Батарэя поўнасьцю перазараджана
+description[be]=Батарэя цалкам перанасілкована
 description[be@latin]=Akumulatar całkam zaradžany
 description[bg]=Батерията е напълно презаредена
 description[bn]=ব্যাটারি সম্পূর্ণরূপে চার্জ করা হয়েছে
@@ -232,6 +235,7 @@ description[br]=Pod-tredan adleuniet penn da benn
 description[bs]=Baterija je napunjena
 description[ca]=La bateria està completament carregada
 description[ca@valencia]=La bateria està completament carregada
+description[cmn]=電池電量全滿
 description[crh]=Pil tamamen doldu
 description[cs]=Baterie jsou plně nabity
 description[cy]=Mae'r batri wedi ail-drydanu’n llwyr
@@ -282,7 +286,6 @@ description[ka]=ელემენტი ბოლომდეა დამუ
 description[kn]=ಸಂಪೂರ್ಣವಾಗಿ ಮರು-ಚಾರ್ಜ್ ಆದಂತಹ ಬ್ಯಾಟರಿ
 description[ko]=배터리가 완전히 충전되었습니다!
 description[ku]=Batarya bi tevahî şarj bû
-description[ky]=Батарея толук заряддалды
 description[lt]=Baterija yra pilnai įkrauta.
 description[lv]=Baterija pilnīgi uzlādēta
 description[mai]=बैटरी पूर्णतः पुनः चार्ज
@@ -291,7 +294,7 @@ description[mk]=Батеријата е целосно наполнета
 description[ml]=ബാറ്ററി ചാര്‍ജ്ജ് നിറഞ്ഞു
 description[mn]=Зай дахин бүрэн цэнэглэгдлээ!
 description[mr]=बॅटरी पूर्णतः पुनःभारित
-description[ms]=Bateri dicas sepenuhnya
+description[ms]=Bateri dicas-semula sepenuhnya
 description[nb]=Batteriet er fullt oppladet
 description[ne]=ब्याट्री पूरा रिचार्ज भयो
 description[nl]=Accu is volledig opgeladen
@@ -300,13 +303,13 @@ description[oc]=Batariá completament recargada
 description[or]=ବ୍ଯାଟେରୀ  ପୂର୍ଣ୍ଣ ଭାବରେ ପୁନଃ-ଚାର୍ଜ ହୋଇଛି
 description[pa]=ਬੈਟਰੀ ਪੂਰੀ ਮੁੜ-ਚਾਰਜ ਹੋ ਗਈ ਹੈ
 description[pl]=Akumulator jest w pełni naładowany
-description[pt]=Bateria completamente carregada
+description[pt]=Bateria completamente recarregada
 description[pt_BR]=A bateria está totalmente recarregada
 description[ro]=Acumulator complet reîncărcat
 description[ru]=Батарея полностью заряжена
 description[si]=වියළි කෝෂය සම්පූර්ණයෙන්ම බලගැන්වී ඇත
 description[sk]=Batéria je plne nabitá
-description[sl]=Baterija je znova povsem napolnjena.
+description[sl]=Baterija je znova povsem napolnjena
 description[sq]=Bateria e ringarkuar plot
 description[sr]=Батерија у потпуности напуњена
 description[sr@latin]=Baterija u potpunosti napunjena
@@ -316,7 +319,8 @@ description[te]=బాటరీ పూర్తిగా తిరిగి ఛ
 description[th]=แบตเตอรี่อัดเต็มแล้ว
 description[tr]=Pil tamamen doldu
 description[ug]=باتارېيە زەرەتلىنىپ بولدى
-description[uk]=Акумулятор повністю перезаряджено
+description[uk]=Акумулятор повністю заряджено
+description[ur]=بیٹری مکمل طور پر دوبارہ چارج ہوگئی ہے
 description[vi]=Pin đã được sạc đầy.
 description[wa]=Li batreye est tcherdjeye a make
 description[xh]=Ibhetri sele igcwaliswe ngokupheleleyo kwakhona

diff --git a/xdg/autostart/mate-power-manager.desktop b/xdg/autostart/mate-power-manager.desktop
index d222b26f45f0087faf03ae8968ba4b693ce371ec..bdf1039ee0f434bae73486c793053731f0e04205 100644 (file)
--- a/xdg/autostart/mate-power-manager.desktop
+++ b/xdg/autostart/mate-power-manager.desktop
@@ -18,7 +18,7 @@ OnlyShowIn=MATE;
 X-MATE-Bugzilla-Bugzilla=MATE
 X-MATE-Bugzilla-Product=mate-power-manager
 X-MATE-Bugzilla-Component=mate-power-manager
-X-MATE-Bugzilla-Version=1.6.3
+X-MATE-Bugzilla-Version=1.8.0
 X-MATE-Bugzilla-ExtraInfoScript=mate-power-bugreport.sh
 #X-MATE-AutoRestart=true
 

diff --git a/xdg/autostart/mate-screensaver.desktop b/xdg/autostart/mate-screensaver.desktop
index 6b37c10c50df9c162ab212b3d52c00d65e128853..53a4b4bd89693b80df1059ad0a61bca7c084a9cd 100644 (file)
--- a/xdg/autostart/mate-screensaver.desktop
+++ b/xdg/autostart/mate-screensaver.desktop
@@ -18,4 +18,4 @@ X-MATE-Autostart-Notify=true
 X-MATE-Bugzilla-Bugzilla=MATE
 X-MATE-Bugzilla-Product=mate-screensaver
 X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.6.1
+X-MATE-Bugzilla-Version=1.8.0

diff --git a/xdg/autostart/polkit-mate-authentication-agent-1.desktop b/xdg/autostart/polkit-mate-authentication-agent-1.desktop
index 230662d9aa2937c571ec93c81cecd31f13e5a76d..500ed8972a38f42d8ae3b6f02269274de59d41d9 100644 (file)
--- a/xdg/autostart/polkit-mate-authentication-agent-1.desktop
+++ b/xdg/autostart/polkit-mate-authentication-agent-1.desktop
@@ -1,8 +1,12 @@
 [Desktop Entry]
 Name=PolicyKit Authentication Agent
-Name[de]=Legitimationsdienst von PolicyKit
+Name[de]=PolicyKit-Legitimationsagent
 Name[en_GB]=PolicyKit Authentication Agent
+Name[ru]=Агент аутентификации PolicyKit
 Comment=PolicyKit Authentication Agent for the MATE Desktop
+Comment[de]=PolicyKit-Legitimationsagent für die MATE-Arbeitsumgebung
+Comment[en_GB]=PolicyKit Authentication Agent for the MATE Desktop
+Comment[ru]=Агент аутентификации PolicyKit для рабочей среды MATE
 Exec=/usr/libexec/polkit-mate-authentication-agent-1
 Terminal=false
 Type=Application

diff --git a/xdg/menus/mate-applications.menu b/xdg/menus/mate-applications.menu
index 2b917cc1da556d9d3cbb7cb628d5f677ca8f1021..258494b23a2bd9635ee45d386f2ccb9ba744b454 100644 (file)
--- a/xdg/menus/mate-applications.menu
+++ b/xdg/menus/mate-applications.menu
@@ -17,6 +17,7 @@
 
   <!-- Read in overrides and child menus from applications-merged/ -->
   <DefaultMergeDirs/>
+  <MergeDir>applications-merged</MergeDir>
 
   <!-- Accessories submenu -->
   <Menu>

diff --git a/xdg/menus/mate-settings.menu b/xdg/menus/mate-settings.menu
index 18b7e17c3d75241ac82269600d86f76ffdb2002b..29e07b79f00edc60b4d9d2280a0a7f0a0eb3248a 100644 (file)
--- a/xdg/menus/mate-settings.menu
+++ b/xdg/menus/mate-settings.menu
@@ -12,6 +12,7 @@
 
   <!-- Read in overrides and child menus from applications-merged/ -->
   <DefaultMergeDirs/>
+  <MergeDir>preferences-merged</MergeDir>
 
   <!-- Add a link to the control center -->
   <Include>
@@ -33,6 +34,7 @@
         </Not>
       </And>
     </Include>
+    <MergeFile>mate-preferences-categories.menu</MergeFile>
   </Menu>
 
   <!-- System Settings -->