Model file fix for Debian 4.0+

diff --git a/lpadmin/config-debian-linux-3.1-* b/lpadmin/config-debian-linux-3.1-3.9
similarity index 100%
rename from lpadmin/config-debian-linux-3.1-*
rename to lpadmin/config-debian-linux-3.1-3.9

diff --git a/lpadmin/config-debian-linux-4.0-* b/lpadmin/config-debian-linux-4.0-*
new file mode 100644 (file)
index 0000000..f9dcea6
--- /dev/null
+++ b/lpadmin/config-debian-linux-4.0-*
@@ -0,0 +1,17 @@
+iface_perms=755
+gs_lib=
+iface_arg=
+gs_path=gs
+spool_dir=/var/spool/cups
+model_path=/usr/share/foomatic/db
+gs_fontpath=
+smbclient_path=smbclient
+print_style=cups
+show_status=0
+iface_owner=lp:lp
+sort_mode=0
+driver_style=cups
+stop_cmd=/etc/init.d/cupsys stop
+start_cmd=/etc/init.d/cupsys start
+display_mode=0
+show_jobs=0

diff --git a/lpadmin/config.info b/lpadmin/config.info
index a8573b7..438582e 100644 (file)
--- a/lpadmin/config.info
+++ b/lpadmin/config.info
@@ -9,13 +9,13 @@ print_style=Printer configuration style,4,solaris-Solaris,linux-Linux,freebsd-Fr
 driver_style=Printer driver style,4,webmin-Webmin,caldera-Caldera,redhat-Redhat,hpux-HPUX,suse-SuSE,cups-CUPS,irix-IRIX,printconf-Redhat Printconf,solaris-Solaris 10
 printcap_file=Printers file,3,None
 ro_printcap_file=Extra printers file not managed by Webmin,3,None
-spool_dir=Printer spool directory,3,None
-model_path=Directory containing interface programs,3,None
-smbclient_path=Path to smbclient,3,None
-gs_path=Path to ghostscript,3,None
-gs_fontpath=Ghostscript font directories,3,Default
-gs_lib=Ghostscript library directories,3,Default
-hpnp_path=Path to hpnp program,3,None
+spool_dir=Printer spool directory,3,None,60
+model_path=Directory containing printer drivers,3,None,60
+smbclient_path=Path to smbclient,3,None,60
+gs_path=Path to ghostscript,3,None,60
+gs_fontpath=Ghostscript font directories,3,Default,60
+gs_lib=Ghostscript library directories,3,Default,60
+hpnp_path=Path to hpnp program,3,None,60
 start_cmd=Command to start scheduler,3,Determined by printer style
 stop_cmd=Command to stop scheduler,3,Determined by printer style
 apply_cmd=Command to run after making any changes,3,None