From: fbrehm Date: Mon, 12 Mar 2012 15:55:24 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=f90f1f9976bbcdbdc0be622e1ce3b7808b30f646;p=config%2Fsamara%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/.etckeeper b/.etckeeper index 7d9749a..f187ade 100755 --- a/.etckeeper +++ b/.etckeeper @@ -458,6 +458,8 @@ maybe chmod 0644 './cups/ppd/.keep_net-print_cups-0' maybe chmod 0644 './cups/ppd/Dell_2330dn_Laser_Printer.ppd' maybe chgrp lp './cups/printers.conf' maybe chmod 0600 './cups/printers.conf' +maybe chgrp lp './cups/printers.conf.O' +maybe chmod 0600 './cups/printers.conf.O' maybe chgrp lp './cups/snmp.conf' maybe chmod 0640 './cups/snmp.conf' maybe chgrp lp './cups/ssl' diff --git a/.gitignore b/.gitignore index fa8caf3..00b0eea 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,5 @@ openvpn/openvpn-status.log DEADJOE # end section managed by etckeeper + +motd diff --git a/cups/printers.conf b/cups/printers.conf index 8b32828..c680b02 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-21 10:35 +# Written by cupsd on 2012-03-12 13:23 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING Info Dell 2330dn Laser Printer @@ -7,7 +7,7 @@ Location Office R+I MakeModel Dell 2330dn Laser Printer DeviceURI socket://192.168.178.6 State Idle -StateTime 1329816924 +StateTime 1331554954 Type 8425692 Filter application/vnd.cups-raw 0 - Filter application/vnd.cups-command 0 commandtops @@ -24,5 +24,5 @@ Attribute marker-colors \#000000,none,none Attribute marker-levels 30,88,0 Attribute marker-names Black Toner,Fuser,Maintenance Kit Attribute marker-types toner,other,other -Attribute marker-change-time 1329816924 +Attribute marker-change-time 1331554954 diff --git a/cups/printers.conf.O b/cups/printers.conf.O new file mode 100644 index 0000000..8b32828 --- /dev/null +++ b/cups/printers.conf.O @@ -0,0 +1,28 @@ +# Printer configuration file for CUPS v1.4.8 +# Written by cupsd on 2012-02-21 10:35 +# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING + +Info Dell 2330dn Laser Printer +Location Office R+I +MakeModel Dell 2330dn Laser Printer +DeviceURI socket://192.168.178.6 +State Idle +StateTime 1329816924 +Type 8425692 +Filter application/vnd.cups-raw 0 - +Filter application/vnd.cups-command 0 commandtops +Filter application/vnd.cups-postscript 0 - +Accepting Yes +Shared No +JobSheets none none +QuotaPeriod 0 +PageLimit 0 +KLimit 0 +OpPolicy default +ErrorPolicy stop-printer +Attribute marker-colors \#000000,none,none +Attribute marker-levels 30,88,0 +Attribute marker-names Black Toner,Fuser,Maintenance Kit +Attribute marker-types toner,other,other +Attribute marker-change-time 1329816924 + diff --git a/make.conf b/make.conf index 7350664..790f6d9 100644 --- a/make.conf +++ b/make.conf @@ -26,6 +26,7 @@ ACCEPT_LICENSE=" \ dlj-1.1 \ sun-bcla-java-vm \ AdobeFlash-10 \ + AdobeFlash-10.3 \ AdobeFlash-10.1 \ skype-eula \ Oracle-BCLA-JavaSE \ diff --git a/motd b/motd deleted file mode 100644 index 9ff2519..0000000 --- a/motd +++ /dev/null @@ -1,15 +0,0 @@ -Linux samara 3.2.1-gentoo-r2 #1 SMP Thu Feb 16 18:53:53 CET 2012 x86_64 AMD Phenom(tm) II X6 1075T Processor AuthenticAMD GNU/Linux -Gentoo Base System release 2.0.3 - ____ -/ ___| __ _ _ __ ___ __ _ _ __ __ _ -\___ \ / _` | '_ ` _ \ / _` | '__/ _` | - ___) | (_| | | | | | | (_| | | | (_| | -|____/ \__,_|_| |_| |_|\__,_|_| \__,_| - - -Ich habe noch nie von einem Menschen gehört, der die Macht attackiert -hat, ohne sie für sich zu wollen. - -- Elias Canetti - -Today is Pungenday, the 68th day of Chaos in the YOLD 3178 - diff --git a/portage/package.keywords b/portage/package.keywords index b57623d..89c3083 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -30,6 +30,10 @@ dev-python/fbrehm-libs ~sys-apps/etckeeper-0.58 ~sys-apps/ppd-9999 +~sys-fs/nilfs-utils-2.1.0 + +#~www-plugins/adobe-flash-11.1.102.63 + ~x11-apps/desktopnova-0.7.4 ~x11-apps/desktopnova-0.8.1