#At file:///etc/ based on revid:root@lamia-20100203064317-whagbeui3pyl1bck
157 timour@askmonty.org 2010-02-04
saving uncommitted changes in /etc prior to apt run
modified:
cups/subscriptions.conf
cups/subscriptions.conf.O
resolv.conf
=== modified file 'cups/subscriptions.conf'
--- a/cups/subscriptions.conf 2010-02-03 06:43:17 +0000
+++ b/cups/subscriptions.conf 2010-02-04 11:25:37 +0000
@@ -1,11 +1,11 @@
# Subscription configuration file for CUPS v1.4.1
-# Written by cupsd on 2010-02-02 08:18
-NextSubscriptionId 101
-
+# Written by cupsd on 2010-02-04 13:19
+NextSubscriptionId 102
+
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 tsk
LeaseDuration 86400
Interval 0
-ExpirationTime 1265177812
-NextEventId 8
+ExpirationTime 1265368739
+NextEventId 1
</Subscription>
=== modified file 'cups/subscriptions.conf.O'
--- a/cups/subscriptions.conf.O 2010-02-03 06:43:17 +0000
+++ b/cups/subscriptions.conf.O 2010-02-04 11:25:37 +0000
@@ -1,11 +1,3 @@
# Subscription configuration file for CUPS v1.4.1
-# Written by cupsd on 2010-02-02 08:17
+# Written by cupsd on 2010-02-03 08:43
NextSubscriptionId 101
-
-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 tsk
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1265177812
-NextEventId 7
-</Subscription>
=== modified file 'resolv.conf'
--- a/resolv.conf 2010-02-01 11:56:20 +0000
+++ b/resolv.conf 2010-02-04 11:25:37 +0000
@@ -1,2 +1,3 @@
# Generated by NetworkManager
-nameserver 192.168.2.1
+nameserver 212.50.0.10
+nameserver 212.50.10.50
