From: Frank Brehm Date: Tue, 28 May 2013 09:58:22 +0000 (+0200) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=3d09f402c88871cb88560a4a10cd1c458081d5ef;p=config%2Fsamara%2Fetc.git Current state --- diff --git a/cups/printers.conf b/cups/printers.conf index 8500901..f543db8 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.5.2 -# Written by cupsd on 2013-05-21 09:56 +# Written by cupsd on 2013-05-22 13:05 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be @@ -8,7 +8,7 @@ Location Office RI MakeModel Dell S2500 Foomatic/Postscript (recommended) DeviceURI socket://192.168.49.5 State Idle -StateTime 1369122947 +StateTime 1369220699 Type 8433684 Accepting Yes Shared No @@ -22,5 +22,5 @@ Attribute marker-colors \#000000,none,none Attribute marker-levels 10,99,-1 Attribute marker-names Black Toner,Fuser,Maintenance Kit Attribute marker-types toner,other,other -Attribute marker-change-time 1369122946 +Attribute marker-change-time 1369220699 diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 912c307..e5f925d 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -1,15 +1,15 @@ # Printer configuration file for CUPS v1.5.2 -# Written by cupsd on 2013-05-21 09:48 +# Written by cupsd on 2013-05-22 13:03 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be Info RI Dell 2350dn Laser Printer Location Office RI -MakeModel Dell 2350dn Laser Printer +MakeModel Dell S2500 Foomatic/Postscript (recommended) DeviceURI socket://192.168.49.5 State Idle -StateTime 1369122480 -Type 8388612 +StateTime 1369220558 +Type 8433684 Accepting Yes Shared No JobSheets none none @@ -19,8 +19,8 @@ KLimit 0 OpPolicy default ErrorPolicy stop-printer Attribute marker-colors \#000000,none,none -Attribute marker-levels 50,83,-1 +Attribute marker-levels 10,99,-1 Attribute marker-names Black Toner,Fuser,Maintenance Kit Attribute marker-types toner,other,other -Attribute marker-change-time 1355739545 +Attribute marker-change-time 1369220558 diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index 86b2fe2..0974442 100644 --- a/cups/subscriptions.conf +++ b/cups/subscriptions.conf @@ -1,11 +1,3 @@ # Subscription configuration file for CUPS v1.5.2 -# Written by cupsd on 2013-05-21 09:56 -NextSubscriptionId 10 - -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 fbrehm -LeaseDuration 86400 -Interval 0 -ExpirationTime 1369207997 -NextEventId 38 - +# Written by cupsd on 2013-05-23 12:08 +NextSubscriptionId 11 diff --git a/cups/subscriptions.conf.O b/cups/subscriptions.conf.O index 01100e5..4656b3d 100644 --- a/cups/subscriptions.conf.O +++ b/cups/subscriptions.conf.O @@ -1,11 +1,11 @@ # Subscription configuration file for CUPS v1.5.2 -# Written by cupsd on 2013-05-21 09:48 -NextSubscriptionId 10 - +# Written by cupsd on 2013-05-22 13:05 +NextSubscriptionId 11 + 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 fbrehm LeaseDuration 86400 Interval 0 -ExpirationTime 1369207997 -NextEventId 21 +ExpirationTime 1369303693 +NextEventId 72 diff --git a/portage/package.keywords b/portage/package.keywords deleted file mode 100644 index b1fbce9..0000000 --- a/portage/package.keywords +++ /dev/null @@ -1,100 +0,0 @@ - -~app-admin/ulogd-1.24 - -~app-emulation/emul-linux-x86-baselibs-20120520 -~app-emulation/emul-linux-x86-db-20120520 -~app-emulation/emul-linux-x86-gtklibs-20120520 -~app-emulation/emul-linux-x86-medialibs-20120520 -~app-emulation/emul-linux-x86-opengl-20120520 -~app-emulation/emul-linux-x86-qtlibs-20120520 -~app-emulation/emul-linux-x86-soundlibs-20120520 -~app-emulation/emul-linux-x86-xlibs-20120520 -app-emulation/virtualbox -app-emulation/virtualbox-additions -app-emulation/virtualbox-extpack-oracle -app-emulation/virtualbox-modules - -~app-misc/g15stats-1.9.7 - -~app-text/dblatex-0.3 -app-text/docbook2odf -app-text/docbook2odf-xsl-stylesheets - -~dev-vcs/gitg-0.2.5 - -~dev-db/virtuoso-odbc-6.1.4 -~dev-db/virtuoso-server-6.1.4 - -~dev-java/icedtea-7.2.0 -~dev-java/icedtea-7.2.3.6 -~dev-java/icedtea-web-1.1.4 -~dev-java/icedtea-web-1.3.1 -~dev-java/java-sdk-docs-1.7.0.2 -~dev-java/oracle-jdk-bin-1.7.0.2 -=dev-java/oracle-jdk-bin-1.7* -~dev-java/oracle-jre-bin-1.7.0.2 -=dev-java/oracle-jre-bin-1.7* - -#required by www-client/firefox-13.0, required by @selected, required by @world (argument) -~dev-libs/nspr-4.9.1 -#required by www-client/firefox-13.0, required by @selected, required by @world (argument) -~dev-libs/nss-3.13.5 - -~dev-perl/Email-Sender-0.110.5 -~dev-perl/Nagios-Plugin-0.360.0 -~dev-perl/Math-Calc-Units-1.70.0 - -~dev-python/crcmod-1.7 -dev-python/fbrehm-libs -~dev-python/iniparse-0.4 -~dev-python/netifaces-0.6 -dev-python/pb-base -dev-python/pb-logging -~dev-python/python-debian-0.1.21 -~dev-python/stevedore-0.8 -~dev-python/virtualenv-clone-0.2.4 -~dev-python/virtualenvwrapper-3.2 -~dev-python/virtualenvwrapper-3.7 - -~dev-ruby/dnsruby-1.53 -~dev-ruby/zonecheck-3.0.4 - -~dev-util/kbuild-0.1.9998_pre20120806 - -~dev-vcs/gitg-0.2.7 - -mail-client/thunderbird - -~media-gfx/gimp-2.8.2 - -~media-libs/babl-0.1.10 -~media-libs/gegl-0.2.0 - -~media-video/lxdvdrip-1.76 -~media-video/streamdvd-0.4 - -~net-im/skype-2.2.0.35 - -~net-libs/libvncserver-0.9.9 - -~sys-apps/etckeeper-0.58 -~sys-apps/ppd-9999 - -~sys-block/mbuffer-20120505 - -~sys-fs/nilfs-utils-2.1.0 - -~sys-libs/zlib-1.2.7 - -#~www-plugins/adobe-flash-11.1.102.63 - -www-client/firefox - -~x11-apps/desktopnova-0.7.4 -~x11-apps/desktopnova-0.8.1 - -~x11-libs/gtksourceview-3.2.3 - -~x11-plugins/pidgin-facebookchat-1.69 -~x11-plugins/wmcalendar-0.5.2 - diff --git a/portage/package.keywords/common b/portage/package.keywords/common new file mode 100644 index 0000000..b1fbce9 --- /dev/null +++ b/portage/package.keywords/common @@ -0,0 +1,100 @@ + +~app-admin/ulogd-1.24 + +~app-emulation/emul-linux-x86-baselibs-20120520 +~app-emulation/emul-linux-x86-db-20120520 +~app-emulation/emul-linux-x86-gtklibs-20120520 +~app-emulation/emul-linux-x86-medialibs-20120520 +~app-emulation/emul-linux-x86-opengl-20120520 +~app-emulation/emul-linux-x86-qtlibs-20120520 +~app-emulation/emul-linux-x86-soundlibs-20120520 +~app-emulation/emul-linux-x86-xlibs-20120520 +app-emulation/virtualbox +app-emulation/virtualbox-additions +app-emulation/virtualbox-extpack-oracle +app-emulation/virtualbox-modules + +~app-misc/g15stats-1.9.7 + +~app-text/dblatex-0.3 +app-text/docbook2odf +app-text/docbook2odf-xsl-stylesheets + +~dev-vcs/gitg-0.2.5 + +~dev-db/virtuoso-odbc-6.1.4 +~dev-db/virtuoso-server-6.1.4 + +~dev-java/icedtea-7.2.0 +~dev-java/icedtea-7.2.3.6 +~dev-java/icedtea-web-1.1.4 +~dev-java/icedtea-web-1.3.1 +~dev-java/java-sdk-docs-1.7.0.2 +~dev-java/oracle-jdk-bin-1.7.0.2 +=dev-java/oracle-jdk-bin-1.7* +~dev-java/oracle-jre-bin-1.7.0.2 +=dev-java/oracle-jre-bin-1.7* + +#required by www-client/firefox-13.0, required by @selected, required by @world (argument) +~dev-libs/nspr-4.9.1 +#required by www-client/firefox-13.0, required by @selected, required by @world (argument) +~dev-libs/nss-3.13.5 + +~dev-perl/Email-Sender-0.110.5 +~dev-perl/Nagios-Plugin-0.360.0 +~dev-perl/Math-Calc-Units-1.70.0 + +~dev-python/crcmod-1.7 +dev-python/fbrehm-libs +~dev-python/iniparse-0.4 +~dev-python/netifaces-0.6 +dev-python/pb-base +dev-python/pb-logging +~dev-python/python-debian-0.1.21 +~dev-python/stevedore-0.8 +~dev-python/virtualenv-clone-0.2.4 +~dev-python/virtualenvwrapper-3.2 +~dev-python/virtualenvwrapper-3.7 + +~dev-ruby/dnsruby-1.53 +~dev-ruby/zonecheck-3.0.4 + +~dev-util/kbuild-0.1.9998_pre20120806 + +~dev-vcs/gitg-0.2.7 + +mail-client/thunderbird + +~media-gfx/gimp-2.8.2 + +~media-libs/babl-0.1.10 +~media-libs/gegl-0.2.0 + +~media-video/lxdvdrip-1.76 +~media-video/streamdvd-0.4 + +~net-im/skype-2.2.0.35 + +~net-libs/libvncserver-0.9.9 + +~sys-apps/etckeeper-0.58 +~sys-apps/ppd-9999 + +~sys-block/mbuffer-20120505 + +~sys-fs/nilfs-utils-2.1.0 + +~sys-libs/zlib-1.2.7 + +#~www-plugins/adobe-flash-11.1.102.63 + +www-client/firefox + +~x11-apps/desktopnova-0.7.4 +~x11-apps/desktopnova-0.8.1 + +~x11-libs/gtksourceview-3.2.3 + +~x11-plugins/pidgin-facebookchat-1.69 +~x11-plugins/wmcalendar-0.5.2 +