+++ /dev/null
-[colord]
-
-# This controls whether we search external volumes for color profiles.
-#
-# default=false
-SearchVolumes=false
-
-# If we should use SANE to add scanner and camera devices.
-#
-# If this is set to 'true' then a colord-sane process will
-# automatically be started by the daemon which watches USB scanner
-# devices as they are inserted and removed.
-#
-# default=true
-UseSANE=true
-
-# If we should create a dummy sensor for testing
-#
-# default=false
-CreateDummySensor=false
-
-# Known profiles are specific colorspaces that applications may request,
-# e.g. 'AdobeRGB' or 'sRGB'.
-# This key sets up any manual overrides that are not automatically added
-# using the profile dictionary metadata.
-#
-# default=
-StandardSpaces=adobe-rgb:/usr/share/color/icc/Argyll/ClayRGB1998.icm;srgb:/usr/share/color/icc/Argyll/sRGB.icm;prophoto-rgb:/usr/share/color/icc/Argyll/ProPhotoRGB.icc
mkdir -p './texmf/dvips.d'
mkdir -p './unixODBC/ODBCDataSources'
maybe chmod 0755 '.'
-maybe chmod 0644 './._cfg0000_colord.conf'
maybe chmod 0700 './.etckeeper'
maybe chmod 0600 './.gitignore'
maybe chmod 0600 './.pwd.lock'
maybe chmod 0644 './apache2/httpd.conf'
maybe chmod 0644 './apache2/magic'
maybe chmod 0755 './apache2/modules.d'
-maybe chmod 0644 './apache2/modules.d/._cfg0000_00_apache_manual.conf'
maybe chmod 0644 './apache2/modules.d/.keep_www-servers_apache-2'
maybe chmod 0644 './apache2/modules.d/00_apache_manual.conf'
maybe chmod 0644 './apache2/modules.d/00_default_settings.conf'
maybe chmod 0755 './config-archive/etc/apache2'
maybe chmod 0755 './config-archive/etc/apache2/modules.d'
maybe chmod 0644 './config-archive/etc/apache2/modules.d/00_apache_manual.conf'
+maybe chmod 0644 './config-archive/etc/apache2/modules.d/00_apache_manual.conf.1'
maybe chmod 0644 './config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist'
maybe chmod 0755 './config-archive/etc/bash'
maybe chmod 0644 './config-archive/etc/bash/bashrc'
maybe chmod 0644 './config-archive/etc/bash/bashrc.dist.new'
+maybe chmod 0644 './config-archive/etc/colord.conf'
+maybe chmod 0644 './config-archive/etc/colord.conf.dist'
maybe chmod 0755 './config-archive/etc/conf.d'
maybe chmod 0644 './config-archive/etc/conf.d/alsasound'
maybe chmod 0644 './config-archive/etc/conf.d/alsasound.dist'
maybe chmod 0755 './config-archive/etc/cups'
maybe chmod 0644 './config-archive/etc/cups/cups-pdf.conf'
maybe chmod 0644 './config-archive/etc/cups/cups-pdf.conf.dist'
+maybe chmod 0755 './config-archive/etc/cupshelpers'
+maybe chmod 0644 './config-archive/etc/cupshelpers/preferreddrivers.xml'
+maybe chmod 0644 './config-archive/etc/cupshelpers/preferreddrivers.xml.dist'
+maybe chmod 0755 './config-archive/etc/dbus-1'
+maybe chmod 0755 './config-archive/etc/dbus-1/system.d'
+maybe chmod 0644 './config-archive/etc/dbus-1/system.d/org.freedesktop.ColorManager.conf'
+maybe chmod 0644 './config-archive/etc/dbus-1/system.d/org.freedesktop.ColorManager.conf.dist'
maybe chmod 0755 './config-archive/etc/eselect'
maybe chmod 0755 './config-archive/etc/eselect/postgresql'
maybe chmod 0755 './config-archive/etc/eselect/postgresql/slots'
maybe chmod 0440 './config-archive/etc/sudoers.dist.new'
maybe chmod 0755 './config-archive/etc/xdg'
maybe chmod 0755 './config-archive/etc/xdg/autostart'
+maybe chmod 0644 './config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop'
+maybe chmod 0644 './config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop.dist'
maybe chmod 0644 './config-archive/etc/xdg/autostart/pulseaudio.desktop'
maybe chmod 0644 './config-archive/etc/xdg/autostart/pulseaudio.desktop.dist'
maybe chmod 0755 './config-archive/usr'
maybe chmod 0700 './cups/ssl'
maybe chmod 0644 './cups/ssl/.keep_net-print_cups-0'
maybe chmod 0755 './cupshelpers'
-maybe chmod 0644 './cupshelpers/._cfg0000_preferreddrivers.xml'
maybe chmod 0644 './cupshelpers/preferreddrivers.xml'
maybe chmod 0755 './dbus-1'
maybe chmod 0644 './dbus-1/session.conf'
maybe chmod 0644 './dbus-1/session.d/.keep_sys-apps_dbus-0'
maybe chmod 0644 './dbus-1/system.conf'
maybe chmod 0755 './dbus-1/system.d'
-maybe chmod 0644 './dbus-1/system.d/._cfg0000_org.freedesktop.ColorManager.conf'
maybe chmod 0644 './dbus-1/system.d/.keep_sys-apps_dbus-0'
maybe chmod 0644 './dbus-1/system.d/ConsoleKit.conf'
maybe chmod 0644 './dbus-1/system.d/NetworkManager.conf'
maybe chmod 0755 './xdg/Thunar'
maybe chmod 0644 './xdg/Thunar/uca.xml'
maybe chmod 0755 './xdg/autostart'
-maybe chmod 0644 './xdg/autostart/._cfg0000_Gentoo-print-applet.desktop'
maybe chmod 0644 './xdg/autostart/Gentoo-print-applet.desktop'
maybe chmod 0644 './xdg/autostart/evolution-alarm-notify.desktop'
maybe chmod 0644 './xdg/autostart/gdu-notification-daemon.desktop'
# Currently this affects the default location of the binary, the variable
# to pick encoder command-line options from, and where the options are
# given.
-#MP3ENCODERSYNTAX=default
+MP3ENCODERSYNTAX=default
#OGGENCODERSYNTAX=default
#FLACENCODERSYNTAX=default
#SPEEXENCODERSYNTAX=default
# Keep the wav files after encoding. Set it to "y" and remove "clean" from
# the list of default actions, since we purge the temp directory as default.
-#KEEPWAVS=n
+KEEPWAVS=y
# Track padding: force abcde to pad tracks using 0, so every song uses a two
# digit entry. If set to "y", even a single song encoding outputs a file like
# 01.my_song.ext
-#PADTRACKS=n
+PADTRACKS=y
# Define if you want abcde to be non-interactive.
# Keep in mind that there is no way to deactivate it right now in the command
#DISTMP3=distmp3
#VORBISCOMMENT=vorbiscomment
#METAFLAC=metaflac
-#NORMALIZE=normalize-audio
+NORMALIZE=normalize
#CDSPEED=eject
#VORBISGAIN=vorbisgain
#MKCUE=mkcue
#HTTPGETOPTS="-q -O -"
# MP3:
-#LAMEOPTS=
+LAMEOPTS="--preset standard"
#TOOLAMEOPTS=
#GOGOOPTS=
#BLADEENCOPTS=
# The default action list (referenced as "default") is defined in the following
# comment:
#ACTIONS=cddb,read,encode,tag,move,clean
+ACTIONS=cddb,read,normalize,encode,tag,move,playlist,clean
# CD device you want to read from
# It can be defined as a singletrack flac file, but since it might change from
# OUTPUTTYPE can be either "ogg", "mp3", "flac" or "spx", or a combination
# of them separated with ",": "ogg,mp3".
#OUTPUTTYPE=ogg
+OUTPUTTYPE=mp3
# Output filename format - change this to reflect your inner desire to
# organize things differently than everyone else :)
# to the files. Remove it from your user defined string if you are getting
# files like ".ogg.ogg".
#OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
+OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}_-_${ALBUMFILE}_-_${TRACKNUM}.${TRACKFILE}'
# Like OUTPUTFORMAT but for Various Artists discs.
#VAOUTPUTFORMAT='Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}'
+VAOUTPUTFORMAT='${ALBUMFILE}/${TRACKNUM}_-_${ARTISTFILE}_-_${TRACKFILE}'
# Like OUTPUTFORMAT and VAOUTPUTFORMAT but for the ONEFILE rips.
#ONETRACKOUTPUTFORMAT=$OUTPUTFORMAT
#BATCHNORM=n
# Enables nogap encoding when using the 'lame' encoder.
-#NOGAP=y
+NOGAP=y
# Set the playlist file location format. Uses the same variables and format
# as OUTPUTFORMAT. If the playlist is specified to be in a subdirectory, it
+++ /dev/null
-# Provide access to the documentation on your server as
-# http://yourserver.example.com/manual/
-# The documentation is always available at
-# http://httpd.apache.org/docs/2.2/
-<IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22-r1/manual$1"
-
-<Directory "/usr/share/doc/apache-2.2.22-r1/manual">
- Options Indexes
- AllowOverride None
- Order allow,deny
- Allow from all
-
- <Files *.html>
- SetHandler type-map
- </Files>
-
- SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br)/ prefer-language=$1
- RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br)){2,}(/.*)?$ /manual/$1$2
-
- LanguagePriority en de es fr ja ko pt-br
- ForceLanguagePriority Prefer Fallback
-</Directory>
-</IfDefine>
-
-# vim: ts=4 filetype=apache
# The documentation is always available at
# http://httpd.apache.org/docs/2.2/
<IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22-r1/manual$1"
-<Directory "/usr/share/doc/apache-2.2.22/manual">
+<Directory "/usr/share/doc/apache-2.2.22-r1/manual">
Options Indexes
AllowOverride None
Order allow,deny
# If we should use SANE to add scanner and camera devices.
#
+# If this is set to 'true' then a colord-sane process will
+# automatically be started by the daemon which watches USB scanner
+# devices as they are inserted and removed.
+#
# default=true
UseSANE=true
# The documentation is always available at
# http://httpd.apache.org/docs/2.2/
<IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.21-r1/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22/manual$1"
-<Directory "/usr/share/doc/apache-2.2.21-r1/manual">
+<Directory "/usr/share/doc/apache-2.2.22/manual">
Options Indexes
AllowOverride None
Order allow,deny
--- /dev/null
+# Provide access to the documentation on your server as
+# http://yourserver.example.com/manual/
+# The documentation is always available at
+# http://httpd.apache.org/docs/2.2/
+<IfDefine MANUAL>
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.21-r1/manual$1"
+
+<Directory "/usr/share/doc/apache-2.2.21-r1/manual">
+ Options Indexes
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+
+ <Files *.html>
+ SetHandler type-map
+ </Files>
+
+ SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br)/ prefer-language=$1
+ RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br)){2,}(/.*)?$ /manual/$1$2
+
+ LanguagePriority en de es fr ja ko pt-br
+ ForceLanguagePriority Prefer Fallback
+</Directory>
+</IfDefine>
+
+# vim: ts=4 filetype=apache
# The documentation is always available at
# http://httpd.apache.org/docs/2.2/
<IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22-r1/manual$1"
-<Directory "/usr/share/doc/apache-2.2.22/manual">
+<Directory "/usr/share/doc/apache-2.2.22-r1/manual">
Options Indexes
AllowOverride None
Order allow,deny
--- /dev/null
+[colord]
+
+# This controls whether we search external volumes for color profiles.
+#
+# default=false
+SearchVolumes=false
+
+# If we should use SANE to add scanner and camera devices.
+#
+# default=true
+UseSANE=true
+
+# If we should create a dummy sensor for testing
+#
+# default=false
+CreateDummySensor=false
+
+# Known profiles are specific colorspaces that applications may request,
+# e.g. 'AdobeRGB' or 'sRGB'.
+# This key sets up any manual overrides that are not automatically added
+# using the profile dictionary metadata.
+#
+# default=
+StandardSpaces=adobe-rgb:/usr/share/color/icc/Argyll/ClayRGB1998.icm;srgb:/usr/share/color/icc/Argyll/sRGB.icm;prophoto-rgb:/usr/share/color/icc/Argyll/ProPhotoRGB.icc
--- /dev/null
+[colord]
+
+# This controls whether we search external volumes for color profiles.
+#
+# default=false
+SearchVolumes=false
+
+# If we should use SANE to add scanner and camera devices.
+#
+# If this is set to 'true' then a colord-sane process will
+# automatically be started by the daemon which watches USB scanner
+# devices as they are inserted and removed.
+#
+# default=true
+UseSANE=true
+
+# If we should create a dummy sensor for testing
+#
+# default=false
+CreateDummySensor=false
+
+# Known profiles are specific colorspaces that applications may request,
+# e.g. 'AdobeRGB' or 'sRGB'.
+# This key sets up any manual overrides that are not automatically added
+# using the profile dictionary metadata.
+#
+# default=
+StandardSpaces=adobe-rgb:/usr/share/color/icc/Argyll/ClayRGB1998.icm;srgb:/usr/share/color/icc/Argyll/sRGB.icm;prophoto-rgb:/usr/share/color/icc/Argyll/ProPhotoRGB.icc
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<preferreddrivers>
+ <drivertypes>
+ <!-- GENERIC DRIVERS -->
+ <drivertype name="generic-foomatic-recommended">
+ <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
+ <deviceid>
+ <field name="DRV" match=".*,?R1"/>
+ </deviceid>
+ <fit>
+ generic
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic-escp">
+ <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):Generic-ESC_P"/>
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic-escp">
+ <ppdname match="drv:///sample.drv/epson(9|24).ppd"/>
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic-postscript">
+ <attribute name="ppd-make-and-model"
+ match="Generic PostScript Printer"/>
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic-pcl6">
+ <attribute name="ppd-make-and-model"
+ match="Generic PCL 6 Printer"/>
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic-pcl5e">
+ <attribute name="ppd-make-and-model"
+ match="Generic PCL 5e Printer"/>
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic-pcl5">
+ <attribute name="ppd-make-and-model"
+ match="Generic PCL 5 Printer"/>
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic-pcl">
+ <attribute name="ppd-make-and-model"
+ match="Generic PCL Laser Printer"/>
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic">
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <!-- END OF GENERIC DRIVERS -->
+ <!-- now fit is either exact-cmd, exact, or close -->
+
+ <drivertype name="cups">
+ <ppdname match="drv:///sample.drv/"/>
+ </drivertype>
+
+ <drivertype name="ghostscript">
+ <attribute name="ppd-product" match=".*Ghostscript"/>
+ </drivertype>
+
+ <drivertype name="gutenprint-simplified">
+ <ppdname match="gutenprint.*:.*/simple|.*-gutenprint.*\.sim"/>
+ </drivertype>
+
+ <drivertype name="gutenprint-expert">
+ <ppdname match="gutenprint.*:|.*-gutenprint"/>
+ </drivertype>
+
+ <drivertype name="foomatic-recommended-hpijs">
+ <attribute name="ppd-make-and-model" match=".* Foomatic/hpijs"/>
+ <deviceid>
+ <field name="DRV" match=".*,?R1"/>
+ </deviceid>
+ </drivertype>
+
+ <drivertype name="foomatic-hpijs">
+ <attribute name="ppd-make-and-model" match=".* Foomatic/hpijs"/>
+ </drivertype>
+
+ <drivertype name="foomatic-recommended-postscript">
+ <ppdname match="foomatic(-db-compressed-ppds)?:"/>
+ <attribute name="ppd-make-and-model" match=".*Postscript"/>
+ <deviceid>
+ <field name="DRV" match=".*,?R1"/>
+ </deviceid>
+ </drivertype>
+
+ <drivertype name="foomatic-postscript">
+ <ppdname match="foomatic(-db-compressed-ppds)?:.*-Postscript"/>
+ </drivertype>
+
+ <drivertype name="foomatic-pxlmono">
+ <!-- Treat this one specially because of the size of the output
+ it generates (see bug #661814) -->
+ <attribute name="ppd-make-and-model" match=".* Foomatic/pxlmono"/>
+ </drivertype>
+
+ <drivertype name="foomatic-recommended-nonpostscript">
+ <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
+ <deviceid>
+ <field name="DRV" match=".*,?R1"/>
+ </deviceid>
+ </drivertype>
+
+ <drivertype name="foomatic-gutenprint">
+ <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):.*-gutenprint"/>
+ </drivertype>
+
+ <drivertype name="foomatic">
+ <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
+ </drivertype>
+
+ <drivertype name="hpcups-plugin">
+ <ppdname match="drv:///(hp/)?hpcups.drv/|.*-hpcups"/>
+ <attribute name="ppd-make-and-model" match=".* plugin"/>
+ </drivertype>
+
+ <drivertype name="hpcups">
+ <ppdname match="drv:///(hp/)?hpcups.drv/|.*-hpcups"/>
+ </drivertype>
+
+ <drivertype name="hpijs-plugin">
+ <ppdname match="drv:///(hp/)?hpijs.drv/|.*-hpijs"/>
+ <attribute name="ppd-make-and-model" match=".* plugin"/>
+ </drivertype>
+
+ <drivertype name="hpijs">
+ <ppdname match="drv:///(hp/)?hpijs.drv/|.*-hpijs"/>
+ </drivertype>
+
+ <drivertype name="splix">
+ <ppdname match=".*splix"/>
+ </drivertype>
+
+ <drivertype name="turboprint">
+ <ppdname match=".*turboprint"/>
+ </drivertype>
+
+ <drivertype name="manufacturer-ricoh-ps">
+ <ppdname match=".*/(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)/PS/"/>
+ </drivertype>
+
+ <drivertype name="manufacturer-ricoh-pxl">
+ <ppdname match=".*/(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)/PXL/"/>
+ </drivertype>
+
+ <drivertype name="manufacturer-cmd">
+ <fit>
+ exact-cmd
+ </fit>
+ </drivertype>
+
+ <!-- Catch-all -->
+ <drivertype name="manufacturer"/>
+ </drivertypes>
+
+ <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+ <!-- This is where the types are arranged into the preferred order -->
+ <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+ <preferenceorder>
+ <!-- gutenprint is no good on the Brother HL-2030 (bug #645993) -->
+ <printer>
+ <make-and-model match="Brother HL-2030"/>
+ <deviceid>
+ <field name="MFG" match="Brother"/>
+ <field name="MDL" match="HL-2030"/>
+ </deviceid>
+ <blacklist>
+ <drivertype>gutenprint*</drivertype>
+ </blacklist>
+ </printer>
+
+ <!-- Ricoh family printers should use manufacturer's own PPD
+ files, with PostScript versions in preference to PXL versions
+ (bug #550315 comment #8)
+ -->
+ <printer>
+ <make-and-model
+ match="(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG) "/>
+ <deviceid>
+ <field name="MFG"
+ match="(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)"/>
+ </deviceid>
+ <drivers>
+ <drivertype>manufacturer-ricoh-ps</drivertype>
+ <drivertype>manufacturer-ricoh-pxl</drivertype>
+ </drivers>
+ </printer>
+
+ <!-- HP LaserJet 2100 series: avoid using PostScript for these
+ models because they only understand PS level 2 (bug
+ #710231). -->
+ <printer>
+ <make-and-model
+ match="(Hewlett-Packard|HP) LaserJet 2100 Series"/>
+ <deviceid>
+ <field name="MFG" match="(HP|Hewlett-Packard)"/>
+ <field name="MDL" match="HP LaserJet 2100 Series"/>
+ </deviceid>
+ <avoid>
+ <drivertype>*-postscript</drivertype>
+ </avoid>
+ </printer>
+
+ <!-- The gutenprint driver for the Xerox 6250DP is black and
+ white, so prefer other drivers (LP #669152) -->
+ <printer>
+ <make-and-model match="Xerox 6250DP"/>
+ <deviceid>
+ <field name="MFG" match="Xerox"/>
+ <field name="MDL" match="6250DP"/>
+ </deviceid>
+ <avoid>
+ <drivertype>gutenprint*</drivertype>
+ </avoid>
+ </printer>
+
+ <printer>
+ <!-- For all printers -->
+ <drivers>
+ <drivertype>manufacturer-cmd</drivertype>
+ <drivertype>foomatic-recommended-hpijs</drivertype>
+ <drivertype>foomatic-recommended-nonpostscript</drivertype>
+ <drivertype>manufacturer*</drivertype>
+ <drivertype>foomatic-recommended-postscript</drivertype>
+ <drivertype>foomatic-postscript</drivertype>
+ <drivertype>hpcups</drivertype>
+ <drivertype>hpijs</drivertype>
+ </drivers>
+ </printer>
+
+ <printer>
+ <!-- Use hpijs on HP printers at this point (i.e. in preference
+ to gutenprint) -->
+ <make-and-model match="(HP|Hewlett-Packard) "/>
+ <deviceid>
+ <field name="MFG" match="HP|Hewlett-Packard"/>
+ </deviceid>
+ <drivers>
+ <drivertype>foomatic-hpijs</drivertype>
+ </drivers>
+ </printer>
+
+ <printer>
+ <!-- For all printers (continued) -->
+ <drivers>
+ <drivertype>splix</drivertype>
+ <drivertype>gutenprint-simplified</drivertype>
+ <drivertype>gutenprint-expert</drivertype>
+ <drivertype>foomatic-hpijs</drivertype>
+ <drivertype>foomatic-gutenprint</drivertype>
+ <drivertype>foomatic</drivertype>
+ <drivertype>cups</drivertype>
+
+ <!-- Generic drivers listed last, in this order -->
+ <drivertype>generic-postscript</drivertype>
+ <drivertype>generic-foomatic-recommended</drivertype>
+ <drivertype>generic-pcl6</drivertype>
+ <drivertype>generic-pcl5c</drivertype>
+ <drivertype>generic-pcl5e</drivertype>
+ <drivertype>generic-pcl5</drivertype>
+ <drivertype>generic-pcl</drivertype>
+ <drivertype>foomatic-pxlmono</drivertype>
+ <drivertype>generic-escp</drivertype>
+ <drivertype>ghostscript</drivertype>
+ <drivertype>generic</drivertype>
+
+ <!-- Last of all, 3rd party non-free drivers -->
+ <drivertype>hpcups-plugin</drivertype>
+ <drivertype>hpijs-plugin</drivertype>
+ <drivertype>turboprint</drivertype>
+ </drivers>
+ </printer>
+ </preferenceorder>
+</preferreddrivers>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<preferreddrivers>
+ <drivertypes>
+ <!-- GENERIC DRIVERS -->
+ <drivertype name="generic-foomatic-recommended">
+ <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
+ <deviceid>
+ <field name="DRV" match=".*,?R1"/>
+ </deviceid>
+ <fit>
+ generic
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic-escp">
+ <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):Generic-ESC_P"/>
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic-escp">
+ <ppdname match="drv:///sample.drv/epson(9|24).ppd"/>
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic-postscript">
+ <attribute name="ppd-make-and-model"
+ match="Generic PostScript Printer"/>
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic-pcl6">
+ <attribute name="ppd-make-and-model"
+ match="Generic PCL 6 Printer"/>
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic-pcl5e">
+ <attribute name="ppd-make-and-model"
+ match="Generic PCL 5e Printer"/>
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic-pcl5">
+ <attribute name="ppd-make-and-model"
+ match="Generic PCL 5 Printer"/>
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic-pcl">
+ <attribute name="ppd-make-and-model"
+ match="Generic PCL Laser Printer"/>
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <drivertype name="generic">
+ <fit>
+ generic
+ none
+ </fit>
+ </drivertype>
+
+ <!-- END OF GENERIC DRIVERS -->
+ <!-- now fit is either exact-cmd, exact, or close -->
+
+ <drivertype name="cups">
+ <ppdname match="drv:///sample.drv/"/>
+ </drivertype>
+
+ <drivertype name="ghostscript">
+ <attribute name="ppd-product" match=".*Ghostscript"/>
+ </drivertype>
+
+ <drivertype name="gutenprint-simplified">
+ <ppdname match="gutenprint.*:.*/simple|.*-gutenprint.*\.sim"/>
+ </drivertype>
+
+ <drivertype name="gutenprint-expert">
+ <ppdname match="gutenprint.*:|.*-gutenprint"/>
+ </drivertype>
+
+ <drivertype name="foomatic-recommended-hpijs">
+ <attribute name="ppd-make-and-model" match=".* Foomatic/hpijs"/>
+ <deviceid>
+ <field name="DRV" match=".*,?R1"/>
+ </deviceid>
+ </drivertype>
+
+ <drivertype name="foomatic-hpijs">
+ <attribute name="ppd-make-and-model" match=".* Foomatic/hpijs"/>
+ </drivertype>
+
+ <drivertype name="foomatic-recommended-postscript">
+ <ppdname match="foomatic(-db-compressed-ppds)?:"/>
+ <attribute name="ppd-make-and-model" match=".*Postscript"/>
+ <deviceid>
+ <field name="DRV" match=".*,?R1"/>
+ </deviceid>
+ </drivertype>
+
+ <drivertype name="foomatic-postscript">
+ <ppdname match="foomatic(-db-compressed-ppds)?:.*-Postscript"/>
+ </drivertype>
+
+ <drivertype name="foomatic-recommended-nonpostscript">
+ <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
+ <deviceid>
+ <field name="DRV" match=".*,?R1"/>
+ </deviceid>
+ </drivertype>
+
+ <drivertype name="foomatic-gutenprint">
+ <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):.*-gutenprint"/>
+ </drivertype>
+
+ <drivertype name="foomatic">
+ <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
+ </drivertype>
+
+ <drivertype name="hpcups-plugin">
+ <ppdname match="drv:///(hp/)?hpcups.drv/|.*-hpcups"/>
+ <attribute name="ppd-make-and-model" match=".* plugin"/>
+ </drivertype>
+
+ <drivertype name="hpcups">
+ <ppdname match="drv:///(hp/)?hpcups.drv/|.*-hpcups"/>
+ </drivertype>
+
+ <drivertype name="hpijs-plugin">
+ <ppdname match="drv:///(hp/)?hpijs.drv/|.*-hpijs"/>
+ <attribute name="ppd-make-and-model" match=".* plugin"/>
+ </drivertype>
+
+ <drivertype name="hpijs">
+ <ppdname match="drv:///(hp/)?hpijs.drv/|.*-hpijs"/>
+ </drivertype>
+
+ <drivertype name="splix">
+ <ppdname match=".*splix"/>
+ </drivertype>
+
+ <drivertype name="turboprint">
+ <ppdname match=".*turboprint"/>
+ </drivertype>
+
+ <drivertype name="manufacturer-ricoh-ps">
+ <ppdname match=".*/(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)/PS/"/>
+ </drivertype>
+
+ <drivertype name="manufacturer-ricoh-pxl">
+ <ppdname match=".*/(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)/PXL/"/>
+ </drivertype>
+
+ <drivertype name="manufacturer-cmd">
+ <fit>
+ exact-cmd
+ </fit>
+ </drivertype>
+
+ <!-- Catch-all -->
+ <drivertype name="manufacturer"/>
+ </drivertypes>
+
+ <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+ <!-- This is where the types are arranged into the preferred order -->
+ <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+ <preferenceorder>
+ <!-- gutenprint is no good on the Brother HL-2030 (bug #645993) -->
+ <printer>
+ <make-and-model match="Brother HL-2030"/>
+ <deviceid>
+ <field name="MFG" match="Brother"/>
+ <field name="MDL" match="HL-2030"/>
+ </deviceid>
+ <blacklist>
+ <drivertype>gutenprint*</drivertype>
+ </blacklist>
+ </printer>
+
+ <!-- Ricoh family printers should use manufacturer's own PPD
+ files, with PostScript versions in preference to PXL versions
+ (bug #550315 comment #8)
+ -->
+ <printer>
+ <make-and-model
+ match="(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG) "/>
+ <deviceid>
+ <field name="MFG"
+ match="(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)"/>
+ </deviceid>
+ <drivers>
+ <drivertype>manufacturer-ricoh-ps</drivertype>
+ <drivertype>manufacturer-ricoh-pxl</drivertype>
+ </drivers>
+ </printer>
+
+ <!-- HP LaserJet 2100 series: avoid using PostScript for these
+ models because they only understand PS level 2 (bug
+ #710231). -->
+ <printer>
+ <make-and-model
+ match="(Hewlett-Packard|HP) LaserJet 2100 Series"/>
+ <deviceid>
+ <field name="MFG" match="(HP|Hewlett-Packard)"/>
+ <field name="MDL" match="HP LaserJet 2100 Series"/>
+ </deviceid>
+ <avoid>
+ <drivertype>*-postscript</drivertype>
+ </avoid>
+ </printer>
+
+ <!-- The gutenprint driver for the Xerox 6250DP is black and
+ white, so prefer other drivers (LP #669152) -->
+ <printer>
+ <make-and-model match="Xerox 6250DP"/>
+ <deviceid>
+ <field name="MFG" match="Xerox"/>
+ <field name="MDL" match="6250DP"/>
+ </deviceid>
+ <avoid>
+ <drivertype>gutenprint*</drivertype>
+ </avoid>
+ </printer>
+
+ <printer>
+ <!-- For all printers -->
+ <drivers>
+ <drivertype>manufacturer-cmd</drivertype>
+ <drivertype>foomatic-recommended-hpijs</drivertype>
+ <drivertype>foomatic-recommended-nonpostscript</drivertype>
+ <drivertype>manufacturer*</drivertype>
+ <drivertype>foomatic-recommended-postscript</drivertype>
+ <drivertype>foomatic-postscript</drivertype>
+ <drivertype>hpcups</drivertype>
+ <drivertype>hpijs</drivertype>
+ </drivers>
+ </printer>
+
+ <printer>
+ <!-- Use hpijs on HP printers at this point (i.e. in preference
+ to gutenprint) -->
+ <make-and-model match="(HP|Hewlett-Packard) "/>
+ <deviceid>
+ <field name="MFG" match="HP|Hewlett-Packard"/>
+ </deviceid>
+ <drivers>
+ <drivertype>foomatic-hpijs</drivertype>
+ </drivers>
+ </printer>
+
+ <printer>
+ <!-- For all printers (continued) -->
+ <drivers>
+ <drivertype>splix</drivertype>
+ <drivertype>gutenprint-simplified</drivertype>
+ <drivertype>gutenprint-expert</drivertype>
+ <drivertype>foomatic-hpijs</drivertype>
+ <drivertype>foomatic-gutenprint</drivertype>
+ <drivertype>foomatic</drivertype>
+ <drivertype>cups</drivertype>
+
+ <!-- Generic drivers listed last, in this order -->
+ <drivertype>generic-postscript</drivertype>
+ <drivertype>generic-foomatic-recommended</drivertype>
+ <drivertype>generic-pcl6</drivertype>
+ <drivertype>generic-pcl5c</drivertype>
+ <drivertype>generic-pcl5e</drivertype>
+ <drivertype>generic-pcl5</drivertype>
+ <drivertype>generic-pcl</drivertype>
+ <drivertype>generic-escp</drivertype>
+ <drivertype>ghostscript</drivertype>
+ <drivertype>generic</drivertype>
+
+ <!-- Last of all, 3rd party non-free drivers -->
+ <drivertype>hpcups-plugin</drivertype>
+ <drivertype>hpijs-plugin</drivertype>
+ <drivertype>turboprint</drivertype>
+ </drivers>
+ </printer>
+ </preferenceorder>
+</preferreddrivers>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+ <!-- This configuration file specifies the required security policies
+ for the ColorManager to work. -->
+
+ <!-- Only user root or user colord can own the colord service -->
+ <policy user="root">
+ <allow own="org.freedesktop.ColorManager"/>
+ </policy>
+ <policy user="colord">
+ <allow own="org.freedesktop.ColorManager"/>
+ </policy>
+
+ <!-- Use at_console policy rather than PolicyKit to allow running as colord user -->
+ <policy at_console="true">
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.ColorManager"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.ColorManager.Profile"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.ColorManager.Device"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.ColorManager.Sensor"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.DBus.Properties"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.DBus.Introspectable"/>
+ </policy>
+
+ <!-- Also allow root to access the API; cupsd needs to talk to colord -->
+ <policy user="root">
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.ColorManager"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.ColorManager.Profile"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.ColorManager.Device"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.ColorManager.Sensor"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.DBus.Properties"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.DBus.Introspectable"/>
+ </policy>
+</busconfig>
+
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+ <!-- This configuration file specifies the required security policies
+ for the ColorManager to work. -->
+
+ <!-- Only user root or user colord can own the colord service -->
+ <policy user="root">
+ <allow own="org.freedesktop.ColorManager"/>
+ </policy>
+ <policy user="colord">
+ <allow own="org.freedesktop.ColorManager"/>
+ </policy>
+
+ <!-- Allow anyone to call into the service - we'll reject callers using PolicyKit -->
+ <policy context="default">
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.ColorManager"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.ColorManager.Profile"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.ColorManager.Device"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.ColorManager.Sensor"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.DBus.Properties"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.DBus.Introspectable"/>
+ </policy>
+
+</busconfig>
+
--- /dev/null
+
+[Desktop Entry]
+Encoding=UTF-8
+Name=Print Queue Applet
+Name[de]=Applet für Druckerwarteschlange
+Name[en_GB]=Print Queue Applet
+Name[ru]=Апплет очереди печати
+Comment=System tray icon for managing print jobs
+Comment[de]=Symbol für Benachrichtigungsfeld zur Verwaltung von Druckaufträgen
+Comment[en_GB]=System tray icon for managing print jobs
+Comment[ru]=Иконка области уведомления для управления заданиями печати
+Exec=system-config-printer-applet
+Terminal=false
+Type=Application
+Icon=printer
+NotShowIn=KDE;
+StartupNotify=false
+X-GNOME-Autostart-Delay=30
+X-Desktop-File-Install-Version=0.19
+Categories=System;Monitor;GTK;
--- /dev/null
+
+[Desktop Entry]
+Encoding=UTF-8
+Name=Print Queue Applet
+Name[de]=Applet für Druckerwarteschlange
+Name[en_GB]=Print Queue Applet
+Name[ru]=Апплет очереди печати
+Comment=System tray icon for managing print jobs
+Comment[de]=Symbol für Benachrichtigungsfeld zur Verwaltung von Druckaufträgen
+Comment[en_GB]=System tray icon for managing print jobs
+Comment[ru]=Иконка области уведомления для управления заданиями печати
+Exec=system-config-printer-applet
+Terminal=false
+Type=Application
+Icon=printer
+NotShowIn=KDE;
+StartupNotify=false
+X-GNOME-Autostart-Delay=30
+X-Desktop-File-Install-Version=0.20
+Categories=System;Monitor;GTK;
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<preferreddrivers>
- <drivertypes>
- <!-- GENERIC DRIVERS -->
- <drivertype name="generic-foomatic-recommended">
- <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
- <deviceid>
- <field name="DRV" match=".*,?R1"/>
- </deviceid>
- <fit>
- generic
- </fit>
- </drivertype>
-
- <drivertype name="generic-escp">
- <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):Generic-ESC_P"/>
- <fit>
- generic
- none
- </fit>
- </drivertype>
-
- <drivertype name="generic-escp">
- <ppdname match="drv:///sample.drv/epson(9|24).ppd"/>
- <fit>
- generic
- none
- </fit>
- </drivertype>
-
- <drivertype name="generic-postscript">
- <attribute name="ppd-make-and-model"
- match="Generic PostScript Printer"/>
- <fit>
- generic
- none
- </fit>
- </drivertype>
-
- <drivertype name="generic-pcl6">
- <attribute name="ppd-make-and-model"
- match="Generic PCL 6 Printer"/>
- <fit>
- generic
- none
- </fit>
- </drivertype>
-
- <drivertype name="generic-pcl5e">
- <attribute name="ppd-make-and-model"
- match="Generic PCL 5e Printer"/>
- <fit>
- generic
- none
- </fit>
- </drivertype>
-
- <drivertype name="generic-pcl5">
- <attribute name="ppd-make-and-model"
- match="Generic PCL 5 Printer"/>
- <fit>
- generic
- none
- </fit>
- </drivertype>
-
- <drivertype name="generic-pcl">
- <attribute name="ppd-make-and-model"
- match="Generic PCL Laser Printer"/>
- <fit>
- generic
- none
- </fit>
- </drivertype>
-
- <drivertype name="generic">
- <fit>
- generic
- none
- </fit>
- </drivertype>
-
- <!-- END OF GENERIC DRIVERS -->
- <!-- now fit is either exact-cmd, exact, or close -->
-
- <drivertype name="cups">
- <ppdname match="drv:///sample.drv/"/>
- </drivertype>
-
- <drivertype name="ghostscript">
- <attribute name="ppd-product" match=".*Ghostscript"/>
- </drivertype>
-
- <drivertype name="gutenprint-simplified">
- <ppdname match="gutenprint.*:.*/simple|.*-gutenprint.*\.sim"/>
- </drivertype>
-
- <drivertype name="gutenprint-expert">
- <ppdname match="gutenprint.*:|.*-gutenprint"/>
- </drivertype>
-
- <drivertype name="foomatic-recommended-hpijs">
- <attribute name="ppd-make-and-model" match=".* Foomatic/hpijs"/>
- <deviceid>
- <field name="DRV" match=".*,?R1"/>
- </deviceid>
- </drivertype>
-
- <drivertype name="foomatic-hpijs">
- <attribute name="ppd-make-and-model" match=".* Foomatic/hpijs"/>
- </drivertype>
-
- <drivertype name="foomatic-recommended-postscript">
- <ppdname match="foomatic(-db-compressed-ppds)?:"/>
- <attribute name="ppd-make-and-model" match=".*Postscript"/>
- <deviceid>
- <field name="DRV" match=".*,?R1"/>
- </deviceid>
- </drivertype>
-
- <drivertype name="foomatic-postscript">
- <ppdname match="foomatic(-db-compressed-ppds)?:.*-Postscript"/>
- </drivertype>
-
- <drivertype name="foomatic-recommended-nonpostscript">
- <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
- <deviceid>
- <field name="DRV" match=".*,?R1"/>
- </deviceid>
- </drivertype>
-
- <drivertype name="foomatic-gutenprint">
- <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):.*-gutenprint"/>
- </drivertype>
-
- <drivertype name="foomatic">
- <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
- </drivertype>
-
- <drivertype name="hpcups-plugin">
- <ppdname match="drv:///(hp/)?hpcups.drv/|.*-hpcups"/>
- <attribute name="ppd-make-and-model" match=".* plugin"/>
- </drivertype>
-
- <drivertype name="hpcups">
- <ppdname match="drv:///(hp/)?hpcups.drv/|.*-hpcups"/>
- </drivertype>
-
- <drivertype name="hpijs-plugin">
- <ppdname match="drv:///(hp/)?hpijs.drv/|.*-hpijs"/>
- <attribute name="ppd-make-and-model" match=".* plugin"/>
- </drivertype>
-
- <drivertype name="hpijs">
- <ppdname match="drv:///(hp/)?hpijs.drv/|.*-hpijs"/>
- </drivertype>
-
- <drivertype name="splix">
- <ppdname match=".*splix"/>
- </drivertype>
-
- <drivertype name="turboprint">
- <ppdname match=".*turboprint"/>
- </drivertype>
-
- <drivertype name="manufacturer-ricoh-ps">
- <ppdname match=".*/(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)/PS/"/>
- </drivertype>
-
- <drivertype name="manufacturer-ricoh-pxl">
- <ppdname match=".*/(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)/PXL/"/>
- </drivertype>
-
- <drivertype name="manufacturer-cmd">
- <fit>
- exact-cmd
- </fit>
- </drivertype>
-
- <!-- Catch-all -->
- <drivertype name="manufacturer"/>
- </drivertypes>
-
- <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- <!-- This is where the types are arranged into the preferred order -->
- <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
- <preferenceorder>
- <!-- gutenprint is no good on the Brother HL-2030 (bug #645993) -->
- <printer>
- <make-and-model match="Brother HL-2030"/>
- <deviceid>
- <field name="MFG" match="Brother"/>
- <field name="MDL" match="HL-2030"/>
- </deviceid>
- <blacklist>
- <drivertype>gutenprint*</drivertype>
- </blacklist>
- </printer>
-
- <!-- Ricoh family printers should use manufacturer's own PPD
- files, with PostScript versions in preference to PXL versions
- (bug #550315 comment #8)
- -->
- <printer>
- <make-and-model
- match="(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG) "/>
- <deviceid>
- <field name="MFG"
- match="(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)"/>
- </deviceid>
- <drivers>
- <drivertype>manufacturer-ricoh-ps</drivertype>
- <drivertype>manufacturer-ricoh-pxl</drivertype>
- </drivers>
- </printer>
-
- <!-- HP LaserJet 2100 series: avoid using PostScript for these
- models because they only understand PS level 2 (bug
- #710231). -->
- <printer>
- <make-and-model
- match="(Hewlett-Packard|HP) LaserJet 2100 Series"/>
- <deviceid>
- <field name="MFG" match="(HP|Hewlett-Packard)"/>
- <field name="MDL" match="HP LaserJet 2100 Series"/>
- </deviceid>
- <avoid>
- <drivertype>*-postscript</drivertype>
- </avoid>
- </printer>
-
- <!-- The gutenprint driver for the Xerox 6250DP is black and
- white, so prefer other drivers (LP #669152) -->
- <printer>
- <make-and-model match="Xerox 6250DP"/>
- <deviceid>
- <field name="MFG" match="Xerox"/>
- <field name="MDL" match="6250DP"/>
- </deviceid>
- <avoid>
- <drivertype>gutenprint*</drivertype>
- </avoid>
- </printer>
-
- <printer>
- <!-- For all printers -->
- <drivers>
- <drivertype>manufacturer-cmd</drivertype>
- <drivertype>foomatic-recommended-hpijs</drivertype>
- <drivertype>foomatic-recommended-nonpostscript</drivertype>
- <drivertype>manufacturer*</drivertype>
- <drivertype>foomatic-recommended-postscript</drivertype>
- <drivertype>foomatic-postscript</drivertype>
- <drivertype>hpcups</drivertype>
- <drivertype>hpijs</drivertype>
- </drivers>
- </printer>
-
- <printer>
- <!-- Use hpijs on HP printers at this point (i.e. in preference
- to gutenprint) -->
- <make-and-model match="(HP|Hewlett-Packard) "/>
- <deviceid>
- <field name="MFG" match="HP|Hewlett-Packard"/>
- </deviceid>
- <drivers>
- <drivertype>foomatic-hpijs</drivertype>
- </drivers>
- </printer>
-
- <printer>
- <!-- For all printers (continued) -->
- <drivers>
- <drivertype>splix</drivertype>
- <drivertype>gutenprint-simplified</drivertype>
- <drivertype>gutenprint-expert</drivertype>
- <drivertype>foomatic-hpijs</drivertype>
- <drivertype>foomatic-gutenprint</drivertype>
- <drivertype>foomatic</drivertype>
- <drivertype>cups</drivertype>
-
- <!-- Generic drivers listed last, in this order -->
- <drivertype>generic-postscript</drivertype>
- <drivertype>generic-foomatic-recommended</drivertype>
- <drivertype>generic-pcl6</drivertype>
- <drivertype>generic-pcl5c</drivertype>
- <drivertype>generic-pcl5e</drivertype>
- <drivertype>generic-pcl5</drivertype>
- <drivertype>generic-pcl</drivertype>
- <drivertype>generic-escp</drivertype>
- <drivertype>ghostscript</drivertype>
- <drivertype>generic</drivertype>
-
- <!-- Last of all, 3rd party non-free drivers -->
- <drivertype>hpcups-plugin</drivertype>
- <drivertype>hpijs-plugin</drivertype>
- <drivertype>turboprint</drivertype>
- </drivers>
- </printer>
- </preferenceorder>
-</preferreddrivers>
<ppdname match="foomatic(-db-compressed-ppds)?:.*-Postscript"/>
</drivertype>
- <drivertype name="foomatic-pxlmono">
- <!-- Treat this one specially because of the size of the output
- it generates (see bug #661814) -->
- <attribute name="ppd-make-and-model" match=".* Foomatic/pxlmono"/>
- </drivertype>
-
<drivertype name="foomatic-recommended-nonpostscript">
<ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
<deviceid>
<drivertype>generic-pcl5e</drivertype>
<drivertype>generic-pcl5</drivertype>
<drivertype>generic-pcl</drivertype>
- <drivertype>foomatic-pxlmono</drivertype>
<drivertype>generic-escp</drivertype>
<drivertype>ghostscript</drivertype>
<drivertype>generic</drivertype>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
-
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
- <!-- This configuration file specifies the required security policies
- for the ColorManager to work. -->
-
- <!-- Only user root or user colord can own the colord service -->
- <policy user="root">
- <allow own="org.freedesktop.ColorManager"/>
- </policy>
- <policy user="colord">
- <allow own="org.freedesktop.ColorManager"/>
- </policy>
-
- <!-- Allow anyone to call into the service - we'll reject callers using PolicyKit -->
- <policy context="default">
- <allow send_destination="org.freedesktop.ColorManager"
- send_interface="org.freedesktop.ColorManager"/>
- <allow send_destination="org.freedesktop.ColorManager"
- send_interface="org.freedesktop.ColorManager.Profile"/>
- <allow send_destination="org.freedesktop.ColorManager"
- send_interface="org.freedesktop.ColorManager.Device"/>
- <allow send_destination="org.freedesktop.ColorManager"
- send_interface="org.freedesktop.ColorManager.Sensor"/>
- <allow send_destination="org.freedesktop.ColorManager"
- send_interface="org.freedesktop.DBus.Properties"/>
- <allow send_destination="org.freedesktop.ColorManager"
- send_interface="org.freedesktop.DBus.Introspectable"/>
- </policy>
-
-</busconfig>
-
<allow own="org.freedesktop.ColorManager"/>
</policy>
- <!-- Use at_console policy rather than PolicyKit to allow running as colord user -->
- <policy at_console="true">
+ <!-- Allow anyone to call into the service - we'll reject callers using PolicyKit -->
+ <policy context="default">
<allow send_destination="org.freedesktop.ColorManager"
send_interface="org.freedesktop.ColorManager"/>
<allow send_destination="org.freedesktop.ColorManager"
send_interface="org.freedesktop.DBus.Introspectable"/>
</policy>
- <!-- Also allow root to access the API; cupsd needs to talk to colord -->
- <policy user="root">
- <allow send_destination="org.freedesktop.ColorManager"
- send_interface="org.freedesktop.ColorManager"/>
- <allow send_destination="org.freedesktop.ColorManager"
- send_interface="org.freedesktop.ColorManager.Profile"/>
- <allow send_destination="org.freedesktop.ColorManager"
- send_interface="org.freedesktop.ColorManager.Device"/>
- <allow send_destination="org.freedesktop.ColorManager"
- send_interface="org.freedesktop.ColorManager.Sensor"/>
- <allow send_destination="org.freedesktop.ColorManager"
- send_interface="org.freedesktop.DBus.Properties"/>
- <allow send_destination="org.freedesktop.ColorManager"
- send_interface="org.freedesktop.DBus.Introspectable"/>
- </policy>
</busconfig>
--- /dev/null
+/etc/init.d/ntp-client
\ No newline at end of file
--- /dev/null
+/etc/init.d/ntpd
\ No newline at end of file
+++ /dev/null
-
-[Desktop Entry]
-Encoding=UTF-8
-Name=Print Queue Applet
-Name[de]=Applet für Druckerwarteschlange
-Name[en_GB]=Print Queue Applet
-Name[ru]=Апплет очереди печати
-Comment=System tray icon for managing print jobs
-Comment[de]=Symbol für Benachrichtigungsfeld zur Verwaltung von Druckaufträgen
-Comment[en_GB]=System tray icon for managing print jobs
-Comment[ru]=Иконка области уведомления для управления заданиями печати
-Exec=system-config-printer-applet
-Terminal=false
-Type=Application
-Icon=printer
-NotShowIn=KDE;
-StartupNotify=false
-X-GNOME-Autostart-Delay=30
-X-Desktop-File-Install-Version=0.20
-Categories=System;Monitor;GTK;
NotShowIn=KDE;
StartupNotify=false
X-GNOME-Autostart-Delay=30
-X-Desktop-File-Install-Version=0.19
+X-Desktop-File-Install-Version=0.20
Categories=System;Monitor;GTK;
projects / config / samara / etc.git / commitdiff