[SCM] Render HTML and CSS content with tk branch, master, updated. 0fccd680a864a4e7e7384b7f931372224e71444d

Tue Feb 21 14:09:05 UTC 2012

The following commit has been merged in the master branch:
commit 0fccd680a864a4e7e7384b7f931372224e71444d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Feb 21 15:07:26 2012 +0100

    Install man page, desktop file etc.

diff --git a/debian/control b/debian/control
index 7e45a8e..3424d70 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,8 @@ Description: Render HTML and CSS content with tk
  the HTML and CSS standards. Tkhtml3 is not an end-user application, it
  is for Tcl programmers who wish to embed a standards-compliant
  HTML/CSS implementation in their applications.
+ .
+ This package contains the Tkhtml3 widget and the Hv3 mega-widget.
 
 Package: hv3
 Section: web
diff --git a/debian/hv3.desktop b/debian/hv3.desktop
new file mode 100644
index 0000000..ee7bad9
--- /dev/null
+++ b/debian/hv3.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Hv3 Web Browser
+GenericName=Web Browser
+Comment=Browse the World Wide Web
+Type=Application
+Exec=hv3
+Categories=Network;WebBrowser;
diff --git a/debian/hv3.install b/debian/hv3.install
index 88aa010..8b2b80c 100644
--- a/debian/hv3.install
+++ b/debian/hv3.install
@@ -1,2 +1,4 @@
 hv/*.tcl /usr/share/hv3
 hv/hv3 usr/bin
+hv/hv3.1 usr/share/man/man1
+debian/hv3.desktop /usr/share/applications
diff --git a/debian/patches/hv3_binary.patch b/debian/patches/hv3_binary.patch
index 18d416e..4fc566d 100644
--- a/debian/patches/hv3_binary.patch
+++ b/debian/patches/hv3_binary.patch
@@ -1,8 +1,29 @@
 Author: Ole Streicher <debian at liska.ath.cx
 Description: Create a small shell script that starts the hv3 browser
 --- /dev/null	2012-02-20 09:14:07.126015334 +0100
-+++ hv/hv3	2012-02-21 12:26:59.000000000 +0100
++++ a/hv/hv3	2012-02-21 12:26:59.000000000 +0100
 @@ -0,0 +1,3 @@
 +#!/bin/sh
 +
 +exec wish /usr/share/hv3/hv3_main.tcl $*
+--- /dev/null	2012-02-20 09:14:07.126015334 +0100
++++ a/hv/hv3.1	2012-02-21 14:21:10.977153261 +0100
+@@ -0,0 +1,18 @@
++.TH HV3 "1" "January 2011" "HV3" "User Commands"
++.SH NAME
++hv3 \- Powerful yet minimalist web browser
++.SH SYNOPSIS
++.B hv3
++\fIurl \fR
++.SH DESCRIPTION
++Html Viewer 3 (hv3) is a powerful yet minimalist web browser that uses Tkhtml3
++as a rendering engine.The application itself is written in Tcl. Currently it
++is at alpha stage. Please try it out, then report bugs or make suggestions.
++.SH AUTHOR
++Dan Kennedy
++.SH "REPORTING BUGS"
++There is a mailing list for Hv3 and Tkhtml3 hosted by Google Groups. You can
++join the mailing list, view the archive and post new messages via
++http://groups.google.com/group/tkhtml3
++.SH COPYRIGHT
++Copyright (c) 2005 Dan Kennedy
diff --git a/debian/patches/install_manpages.patch b/debian/patches/install_manpages.patch
new file mode 100644
index 0000000..986a743
--- /dev/null
+++ b/debian/patches/install_manpages.patch
@@ -0,0 +1,66 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Install the manpages in the proper section.
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -208,7 +208,7 @@ libraries: $(HV3_LIB)
+ #========================================================================
+ 
+ doc:
+-	$(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/html.man>tkhtml.n
++	$(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/html.man>tkhtml.3tcl
+ 
+ install: all install-binaries install-libraries install-doc
+ 
+@@ -235,12 +235,12 @@ install-libraries: libraries
+ #========================================================================
+ 
+ install-doc: doc
+-	@mkdir -p $(DESTDIR)$(mandir)/mann
++	@mkdir -p $(DESTDIR)$(mandir)/man3
+ 	@echo "Installing documentation in $(DESTDIR)$(mandir)"
+-	@list='*.n'; for i in $$list; do \
++	@list='*.3tcl'; for i in $$list; do \
+ 	    echo "Installing $$i"; \
+-	    rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
+-	    $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
++	    rm -f $(DESTDIR)$(mandir)/man3/`basename $$i`; \
++	    $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man3 ; \
+ 	done
+ 
+ test: binaries libraries
+--- a/doc/browser.man
++++ b/doc/browser.man
+@@ -1,4 +1,4 @@
+-[TH ::hv3::browser n]
++[TH ::hv3::browser 3tcl]
+ 
+ [Section Name]
+ 	::hv3::browser - Web browser widget.
+--- a/doc/html.man
++++ b/doc/html.man
+@@ -1,5 +1,5 @@
+ 
+-[TH tkhtml n]
++[TH tkhtml 3tcl]
+ 
+ [Section Name]
+ 	tkhtml - Widget to render html documents.
+@@ -60,8 +60,8 @@
+ 
+ 		The seven integers define the sizes of the Tk fonts (in points)
+ 		used when a CSS formatted document requests font-size
+-		'xx-small', 'x-small', 'small', 'medium', 'large', 'x-large' or
+-		'xx-large', respectively.
++		"xx-small", "x-small", "small", "medium", "large", "x-large" or
++		"xx-large", respectively.
+ 
+ 		The default value is {8 9 10 11 13 15 17}.
+         }]
+--- a/doc/hv3.man
++++ b/doc/hv3.man
+@@ -1,4 +1,4 @@
+-[TH hv3 n]
++[TH hv3 3tcl]
+ 
+ [Section Name]
+ 	hv3 - Mega-widget building on Tkhtml.
diff --git a/debian/patches/series b/debian/patches/series
index d3ce92c..ed48d57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_state_sock.patch
 hv3_binary.patch
+install_manpages.patch
diff --git a/debian/rules b/debian/rules
index ae73170..f7016b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export DEB_BUILD_OPTIONS+=" nocheck"
 	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --libdir=/usr/lib/tcltk
+	dh_auto_configure -- --libdir=/usr/lib/tcltk --mandir=/usr/share/man
 
 debiandir_SQ = $(subst ','\'',$(dir $(lastword $(MAKEFILE_LIST))))
 get-orig-source:
diff --git a/debian/tk-html3.install b/debian/tk-html3.install
index 152e741..2b69f80 100644
--- a/debian/tk-html3.install
+++ b/debian/tk-html3.install
@@ -1 +1,2 @@
 usr/lib/tcltk/Tkhtml3.0/*
+usr/share/man/man3/*

-- 
Render HTML and CSS content with tk

