Author: jsmeix Date: Thu Mar 18 16:09:00 2010 New Revision: 61387 URL: http://svn.opensuse.org/viewcvs/yast?rev=61387&view=rev Log: Finished clean-up of AutoYST printer client: In src/printer.desktop added the line X-SuSE-YaST-AutoInstSchema=printer.rnc to pull in printer.rnc when yast2-schema is build which fixes bnc#588998 Finally cleaned up src/printer.rnc according to bnc#588679 comment #9 so that now bnc#588679 is fixed. Modified: trunk/printer/src/printer.desktop trunk/printer/src/printer.rnc Modified: trunk/printer/src/printer.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer.desktop?rev=61387&r1=61386&r2=61387&view=diff ============================================================================== --- trunk/printer/src/printer.desktop (original) +++ trunk/printer/src/printer.desktop Thu Mar 18 16:09:00 2010 @@ -6,16 +6,17 @@ X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 -X-SuSE-YaST-Call=printer +X-SuSE-YaST-Call=printer X-SuSE-YaST-Group=Hardware X-SuSE-YaST-Argument= X-SuSE-YaST-RootOnly=true -X-SuSE-YaST-AutoInst=all X-SuSE-YaST-Geometry= X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInst=all X-SuSE-YaST-AutoInstResource=printer X-SuSE-YaST-AutoInstClonable=true +X-SuSE-YaST-AutoInstSchema=printer.rnc Icon=yast-printer Exec=xdg-su -c "/sbin/yast2 printer" Modified: trunk/printer/src/printer.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer.rnc?rev=61387&r1=61386&r2=61387&view=diff ============================================================================== --- trunk/printer/src/printer.rnc (original) +++ trunk/printer/src/printer.rnc Thu Mar 18 16:09:00 2010 @@ -2,117 +2,12 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" -# -# redone. I used "Anything*" because for me it looks like a generic parser -# with unpredictable keys - ug@suse.de -# printer = element printer { - element cups_remote_server { text }? & - element server_settings { - Anything* + element client_conf_content { + element file_contents { text }? + }? & + element cupsd_conf_content { + element file_contents { text }? }? } - -# removed (read above) -# -#printer = -# element printer { -# (text -# | printer_default -# | printcap -# | cups_installation -# | server_hostname -# | spooler)* -# } - - -# -# old stuff -# -config = element config { text } -printer_default = element default { text } -create_remote_queue = - element create_remote_queue { BOOLEAN } -accepting = - element accepting { BOOLEAN } -cups-state = element cups-state { text } -# <!ELEMENT default (#PCDATA)> - -# <!ELEMENT device (#PCDATA)>: redefined -device_ieee = element device_ieee { text } -ff = - element ff { BOOLEAN } -info = element info { text } -job-sheets = element job-sheets { text } -lprng-state = element lprng-state { text } -name = element name { text } -ownppd = element ownppd { text } -printcap = - element printcap { - LIST, - printcap_entry* - } -y2_printcap_entry = - accepting - | allowusers - | bannerend - | bannerstart - | denyusers - | ff - | info - | location - | manufacturer - | model - | name - | nick - | printcap_entry_options - | ppd_options - | raw - | printcap_entry_state - | uri -location = element location { text } -bannerstart = element bannerstart { text } -bannerend = element bannerend { text } -manufacturer = element manufacturer { text } -model = element model { text } -nick = element nick { text } -printcap_entry_state = element state { text } -printcap_entry_options = element options { text } -ppd_options = - element ppd_options { - LIST, - ppd_option* - } -ppd_option = element ppd_option { ppd_option_key, ppd_option_val } -ppd_option_key = element key { text } -ppd_option_val = element value { text } -denyusers = - element denyusers { - LIST, - denyuser* - } -denyuser = element denyuser { text } -allowusers = - element allowusers { - LIST, - allowuser* - } -allowuser = element allowuser { text } -printcap_entry = element printcap_entry { y2_printcap_entry* } -printers = - element printers { - LIST, - printer+ - } -cups_installation = - element cups_installation { SYMBOL } -raw = - element raw { - attribute config:type { text }, - text - } -type = element type { text } -spooler = element spooler { text } -server_hostname = element server_hostname { text } -uri = element uri { text } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org