saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/printers.conf b/cups/printers.conf
index 31789d493eda0449c16d14ebf0da28db7c529cdd..9901be2ed69c9b1bc0242ad26a09471998beccb5 100644 (file)
--- 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
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 7fbfe24c87f8928b7eef95141e83b55a1f0bbc6e..5d8d28a8894de4a24fd69a11b4247ac692e4ddf9 100644 (file)
--- 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
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 9d4abe28060474bd4289a42aaa46ac34ee83324d..1925cdc51fbed40a3789989217aec49919deea87 100644 (file)
--- 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 715a89c211051a007485c8f253935ddd18125da2..f2781e2593e50948bf28af2a9f0d09e5d19c9fe5 100644 (file)
--- 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
-<Subscription 125>
+# Written by cupsd on 2012-02-01 21:51
+NextSubscriptionId 128
+<Subscription 126>
 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
+</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
 </Subscription>

diff --git a/portage/package.use b/portage/package.use
index 70a29bda4fa705fa2f9dfea5c24f724dcac44287..ed8f481b10cd1f9362b264d24a021bb60d05cb74 100644 (file)
--- 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 9a19004eeb4283acd8151efac7b1bed74b6488ab..93a7dfadf607aaf4b24cc98f5925edcdb85f8f68 100644 (file)
--- 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