From: Frank Brehm <frank@brehm-online.com>
Date: Wed, 15 Feb 2012 15:22:58 +0000 (+0100)
Subject: Current state
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=f013ba006207047b0d8ac68a9a910c932dd45c7f;p=config%2Fbruni%2Fetc.git

Current state
---

diff --git a/cups/printers.conf b/cups/printers.conf
index 8304b163..445dfb1e 100644
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-08 08:32
+# Written by cupsd on 2012-02-15 08:16
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D
diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 6774f088..cc3babb7 100644
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-07 21:52
+# Written by cupsd on 2012-02-14 18:43
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D
diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 1925cdc5..296ddccf 100644
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,3 +1,3 @@
 # Subscription configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-03 04:12
-NextSubscriptionId 128
+# Written by cupsd on 2012-02-15 08:16
+NextSubscriptionId 130
diff --git a/cups/subscriptions.conf.O b/cups/subscriptions.conf.O
index f2781e25..8fe0f129 100644
--- a/cups/subscriptions.conf.O
+++ b/cups/subscriptions.conf.O
@@ -1,19 +1,11 @@
 # Subscription configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-01 21:51
-NextSubscriptionId 128
-<Subscription 126>
+# Written by cupsd on 2012-02-14 00:40
+NextSubscriptionId 130
+<Subscription 129>
 Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner doris
+Owner frank
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1328206305
-NextEventId 649
-</Subscription>
-<Subscription 127>
-Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner doris
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1328214031
-NextEventId 649
+ExpirationTime 1329262791
+NextEventId 627
 </Subscription>
diff --git a/java-config-2/current-system-vm b/java-config-2/current-system-vm
index e98206a2..ec080389 120000
--- a/java-config-2/current-system-vm
+++ b/java-config-2/current-system-vm
@@ -1 +1 @@
-/usr/lib/jvm//sun-jdk-1.6
\ No newline at end of file
+/usr/lib/jvm//oracle-jdk-bin-1.7
\ No newline at end of file
diff --git a/make.conf b/make.conf
index 99e44dc0..cd0277c1 100644
--- a/make.conf
+++ b/make.conf
@@ -8,7 +8,7 @@ CXXFLAGS="${CFLAGS}"
 # Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.
 CHOST="x86_64-pc-linux-gnu"
 
-MAKEOPTS="-j7"
+MAKEOPTS="-j5"
 #MAKEOPTS="-j1"
 
 GENTOO_MIRRORS="http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/ http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/"
@@ -34,7 +34,7 @@ ACCEPT_LICENSE=" \
 	Oracle-BCLA-JavaSE \
 "
 
-EMERGE_DEFAULT_OPTS="--with-bdeps y "
+EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10"
 
 CONFIG_PROTECT="/usr/share/xsessions \
                 /var/www/localhost/htdocs/phpmyadmin \