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

Ole Streicher debian at liska.ath.cx
Wed Feb 22 09:12:46 UTC 2012


The following commit has been merged in the debian branch:
commit f91651901e033393f4a59bdcfb885784938b2fb6
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Feb 22 10:12:22 2012 +0100

    Fix build dependencies

diff --git a/debian/control b/debian/control
index 1cf0785..670a785 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: tk-html3
 Priority: extra
 Maintainer: Ole Streicher <debian at liska.ath.cx>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, tcl-dev, tk-dev
+Build-Depends: debhelper (>= 8.0.0), dh-autoreconf, tcl-dev, tk-dev
 Standards-Version: 3.9.2
 Section: interpreters
 Homepage: http://tkhtml.tcl.tk/index.html
@@ -10,7 +10,7 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/tkhtml3.git
 
 Package: tk-html3
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, tcl, tk
+Depends: ${tk:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: Render HTML and CSS content with tk
  Tkhtml3 is a Tk widget that displays content formatted according to
  the HTML and CSS standards. Tkhtml3 is not an end-user application, it
@@ -22,7 +22,7 @@ Description: Render HTML and CSS content with tk
 Package: hv3
 Section: web
 Architecture: all
-Depends: ${misc:Depends}, tk-html3, libsqlite3-tcl, tcl, tk
+Depends: ${tk:Depends}, ${misc:Depends}
 Recommends: libtk-imk
 Description: Lightweight web browser
  Hv3 is a cross-platform web browser with support for modern web
diff --git a/debian/rules b/debian/rules
index bf6d0cc..918a026 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
 # -*- makefile -*-
 #export DH_VERBOSE=1
 
-export DEB_BUILD_OPTIONS+=" nocheck"
-
 %:
 	dh $@ --with autoreconf
 
@@ -13,6 +11,13 @@ override_dh_auto_configure:
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
 
+override_dh_shlibdeps:
+	dh_shlibdeps
+	tcltk-depends
+
+override_dh_auto_test:
+	# ignore builtin test
+
 debiandir_SQ = $(subst ','\'',$(dir $(lastword $(MAKEFILE_LIST))))
 get-orig-source:
 	sh '$(debiandir_SQ)'get-orig-source.sh

-- 
Render HTML and CSS content with tk



More information about the debian-science-commits mailing list