diff --git a/CONTROL/control b/CONTROL/control index 6a9f0b0..4df105d 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,9 +1,9 @@ Package: webif Priority: optional Section: web -Version: 1.0.7-9 +Version: 1.0.7-10 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: webif-channelicons(>=1.1.5),mongoose(>=3.0-9),jim(>=0.74-2),jim-oo,jim-sqlite3(>=0.74-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6) +Depends: webif-channelicons(>=1.1.6),mongoose(>=3.0-9),jim(>=0.74-4),jim-oo,jim-sqlite3(>=0.74-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6) Suggests: Description: An evolving web interface for the Humax. diff --git a/var/mongoose/lib/overrides b/var/mongoose/lib/overrides index 13dd576..37f9414 100644 --- a/var/mongoose/lib/overrides +++ b/var/mongoose/lib/overrides @@ -1,10 +1,10 @@ -proc {dict merge} {dict args} { - foreach d $args { - foreach k [dict keys $d] { - dict set dict $k [dict get $d $k] - } - } - return $dict -} +#proc {dict merge} {dict args} { +# foreach d $args { +# foreach k [dict keys $d] { +# dict set dict $k [dict get $d $k] +# } +# } +# return $dict +#} diff --git a/var/mongoose/lib/rsv.class b/var/mongoose/lib/rsv.class index f8efe78..1ff58cc 100755 --- a/var/mongoose/lib/rsv.class +++ b/var/mongoose/lib/rsv.class @@ -212,7 +212,7 @@ rsv method fix_hsvc {} { if {$_hsvc eq ""} { set _hsvc [get_channel_attr_bylcn $usLcn] } - return $hsvc + set hsvc $_hsvc } rsv method insert {{table pending} {force 0}} {