From 9d9c9c85763cbce5273f0611a5f482ecc4690a82 Mon Sep 17 00:00:00 2001 From: frank Date: Sun, 5 Feb 2012 07:50:21 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- cups/printers.conf | 2 +- cups/printers.conf.O | 2 +- cups/subscriptions.conf | 4 ++-- cups/subscriptions.conf.O | 18 +++++++++++++----- portage/package.use | 1 + resolv.conf | 8 +++++--- 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/cups/printers.conf b/cups/printers.conf index 31789d49..9901be2e 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-01 08:30 +# Written by cupsd on 2012-02-04 19:00 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING Info Kyocera FS-1020D diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 7fbfe24c..5d8d28a8 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-01-31 22:27 +# Written by cupsd on 2012-02-03 04:12 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING Info Kyocera FS-1020D diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index 9d4abe28..1925cdc5 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-01-31 22:27 -NextSubscriptionId 126 +# Written by cupsd on 2012-02-03 04:12 +NextSubscriptionId 128 diff --git a/cups/subscriptions.conf.O b/cups/subscriptions.conf.O index 715a89c2..f2781e25 100644 --- a/cups/subscriptions.conf.O +++ b/cups/subscriptions.conf.O @@ -1,11 +1,19 @@ # Subscription configuration file for CUPS v1.4.8 -# Written by cupsd on 2012-01-30 18:44 -NextSubscriptionId 126 - +# Written by cupsd on 2012-02-01 21:51 +NextSubscriptionId 128 + 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 1328031858 -NextEventId 1 +ExpirationTime 1328206305 +NextEventId 649 + + +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 diff --git a/portage/package.use b/portage/package.use index 70a29bda..ed8f481b 100644 --- a/portage/package.use +++ b/portage/package.use @@ -154,6 +154,7 @@ media-libs/libwmf -expat media-libs/mesa gles llvm shared-dricore media-libs/netpbm rle media-libs/openjpeg tools +media-libs/sdl-mixer mikmod media-libs/urt gs media-libs/xine-lib xvmc media-libs/xvid pic diff --git a/resolv.conf b/resolv.conf index 9a19004e..93a7dfad 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,4 +1,6 @@ -# Generated by net-scripts for interface eth0 +# Hand made by Frank Brehm domain brehm-online.com -search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de -nameserver 10.12.11.1 +search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de profitbricks.localdomain dc1.de.profitbricks.net +#nameserver 10.12.11.1 +nameserver 192.168.178.30 +nameserver 192.168.178.85 -- 2.39.5