Current state

diff --git a/.gitignore b/.gitignore
index 0c60368f8c826dc5d64d61a00e94b3c0b3cd8508..11ea0a5ce7863d8a79a3709f180ec5157b2f9f4e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,5 @@ DEADJOE
 *.bak
 
 # end section managed by etckeeper
+
+cups/*.conf.O

diff --git a/cups/printers.conf b/cups/printers.conf
index 716eaf12848d948f6d692ce198c4ebe2ee62f819..a758b7b8e19a59ba018ecad58970f166ff725b47 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-03-27 08:19
+# Written by cupsd on 2012-04-01 08:21
 # 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
deleted file mode 100644 (file)
index e17f6d3..0000000
--- a/cups/printers.conf.O
+++ /dev/null
@@ -1,39 +0,0 @@
-# Printer configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-03-26 19:26
-# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
-<DefaultPrinter FS-1020D>
-Info Kyocera FS-1020D
-Location bruni
-MakeModel Kyocera FS-1020D - CUPS+Gutenprint v5.2.7
-DeviceURI usb://Kyocera/FS-1020D
-State Idle
-StateTime 1326840725
-Type 4116
-Filter application/vnd.cups-raw 0 -
-Filter application/vnd.cups-raster 100 rastertogutenprint.5.2
-Accepting Yes
-Shared Yes
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy stop-printer
-</Printer>
-<Printer Virtual_Printer>
-Info PDF Printer
-Location Local Printer
-MakeModel Apple LaserWriter 4/600 Foomatic/Postscript (recommended)
-DeviceURI cups-pdf:/
-State Idle
-StateTime 1264666962
-Type 8388612
-Accepting Yes
-Shared Yes
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy stop-printer
-</Printer>

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index a74c038c905e9cd37c58a5466b3c238b5189ddbb..31ced4b1ada1668206ec59047c44f9c30b822663 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,3 +1,11 @@
 # Subscription configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-26 17:28
-NextSubscriptionId 133
+# Written by cupsd on 2012-03-31 13:35
+NextSubscriptionId 134
+<Subscription 133>
+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 frank
+LeaseDuration 86400
+Interval 0
+ExpirationTime 1333280083
+NextEventId 627
+</Subscription>

diff --git a/cups/subscriptions.conf.O b/cups/subscriptions.conf.O
deleted file mode 100644 (file)
index 4f651c2..0000000
--- a/cups/subscriptions.conf.O
+++ /dev/null
@@ -1,11 +0,0 @@
-# Subscription configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-25 17:28
-NextSubscriptionId 133
-<Subscription 132>
-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 frank
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1330273704
-NextEventId 316
-</Subscription>

diff --git a/portage/package.keywords b/portage/package.keywords
index 20d75928e0f753701dea5ccd00c6b2e0b83914b4..6677f8fb5632be2a06dc509ea1e8fa2830fd6342 100644 (file)
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -1,4 +1,9 @@
 
+app-emulation/virtualbox
+app-emulation/virtualbox-additions
+app-emulation/virtualbox-extpack-oracle
+app-emulation/virtualbox-modules
+
 ~dev-java/java-sdk-docs-1.7.0.2
 ~dev-java/oracle-jdk-bin-1.7.0.2
 ~dev-java/oracle-jre-bin-1.7.0.2