[SCM] Render HTML and CSS content with tk branch, debian, updated. 6a9d264c7b57bbd59c3cfc48031e3074b7a76f70

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 6a9d264c7b57bbd59c3cfc48031e3074b7a76f70
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Feb 24 12:25:44 2012 +0100

    Fix bookmarks and disable bug report button

diff --git a/debian/patches/disable_bugreport.patch b/debian/patches/disable_bugreport.patch
new file mode 100644
index 0000000..b548e49
--- /dev/null
+++ b/debian/patches/disable_bugreport.patch
@@ -0,0 +1,35 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Disable the "Bug report" button: the website behind it is
+ not functional anymore.
+--- a/hv/hv3_main.tcl
++++ b/hv/hv3_main.tcl
+@@ -692,13 +692,10 @@ proc gui_build {widget_array} {
+   ::hv3::toolbutton .toolbar.b.home -text Home -command [list \
+       gui_current goto $::hv3::homeuri
+   ]
+-  ::hv3::toolbutton .toolbar.bug -text {Report Bug} -command gui_report_bug
+ 
+   .toolbar.b.new configure -tooltip "Open New Tab"
+   .toolbar.b.home configure -tooltip "Go to Bookmarks Manager"
+ 
+-  .toolbar.bug configure -tooltip "Bug Report"
+-
+   # Create the middle bit - the browser window
+   #
+   ::hv3::tabset .notebook              \
+@@ -745,7 +742,6 @@ proc gui_build {widget_array} {
+   pack [frame .toolbar.b.spacer -width 2 -height 1] -side left
+ 
+   pack .toolbar.b -side left
+-  pack .toolbar.bug -side right
+   pack .toolbar.entry -fill x -expand true
+ 
+   # Pack the top, bottom and middle, in that order. The middle must be 
+@@ -824,7 +820,6 @@ proc gui_menu {widget_array} {
+     .toolbar.b.stop configure -image hv3_stopimg
+     .toolbar.b.new configure -image hv3_newimg
+     .toolbar.b.home configure -image hv3_homeimg
+-    .toolbar.bug configure -image hv3_bugimg
+   }
+ }
+ #--------------------------------------------------------------------------
diff --git a/debian/patches/series b/debian/patches/series
index a68a29f..16aa64b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,5 @@ install_manpages.patch
 fix_empty_offset.patch
 dont_resize_fixed_table_columns.patch
 dont_ignore_bgcolor.patch
-
+disable_bugreport.patch
+updated_bookmarks.patch
diff --git a/debian/patches/updated_bookmarks.patch b/debian/patches/updated_bookmarks.patch
new file mode 100644
index 0000000..8430a33
--- /dev/null
+++ b/debian/patches/updated_bookmarks.patch
@@ -0,0 +1,15 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Updated bookmarks: freshmeat->freecode; CVSTrac->fossil
+--- a/hv/hv3_bookmarks.tcl
++++ b/hv/hv3_bookmarks.tcl
+@@ -155,8 +155,8 @@ pressing enter.
+   "INSTRUCTIONS"                http://tkhtml.tcl.tk 1
+   "Hv3/Tkhtml3 Home page"       http://tkhtml.tcl.tk 0
+   "Hv3/Tkhtml3 Mailing List"    http://groups.google.com/group/tkhtml3 0
+-  "Hv3/Tkhtml3 CVSTrac"         http://tkhtml.tcl.tk/cvstrac/timeline 0
+-  "Hv3 @ freshmeat.net"         http://freshmeat.net/hv3 0
++  "Hv3/Tkhtml3 Repository"      http://tkhtml.tcl.tk/fossil 0
++  "Hv3 @ Freecode"              http://freecode.com/projects/hv3 0
+         } {
+           if {$C} {
+             set zSnapshot "

-- 
Render HTML and CSS content with tk