[SCM] Render HTML and CSS content with tk branch, master, updated. 46cb6de8e51ea7739274dfdcd5fe9620c030b5ca
Ole Streicher
debian at liska.ath.cx
Tue Feb 21 11:38:43 UTC 2012
The following commit has been merged in the master branch:
commit 532e1052c4fd82c096fed5ab666c3916731c45f1
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Feb 21 11:51:14 2012 +0100
Remove "lemon" dependency: lemon is not longer used during build
diff --git a/debian/control b/debian/control
index e23e9bf..8586290 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, lemon, tcl-dev, tk-dev
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, tcl-dev, tk-dev
Standards-Version: 3.9.2
Section: libs
Homepage: http://tkhtml.tcl.tk/index.html
diff --git a/debian/patches/fix_state_sock.patch b/debian/patches/fix_state_sock.patch
index ca9923f..3b40422 100644
--- a/debian/patches/fix_state_sock.patch
+++ b/debian/patches/fix_state_sock.patch
@@ -3,12 +3,12 @@ Description: Fix the exception 'can't read "state(sock)": no such element
in array'.
--- a/hv/hv3_http.tcl
+++ b/hv/hv3_http.tcl
-@@ -973,7 +973,7 @@ proc ::hv3::HttpFinish {token args} {
- upvar 0 $token state
- catch {
- close $state(sock)
-- unset state(sock)
-+# unset state(sock)
+@@ -626,7 +626,7 @@ if 0 {
+ upvar 0 $token state
+ catch {
+ close $state(sock)
+- unset state(sock)
++# unset state(sock)
+ }
+ eval [linsert $args 0 ::http::FinishReal $token]
}
- eval [linsert $args 0 ::http::FinishReal $token]
- }
diff --git a/debian/patches/series b/debian/patches/series
index fbb394a..8cbb24e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
fix_state_sock.patch
-use_external_lemon.patch
+debian-changes-3.0+fossil20110109-1
diff --git a/debian/patches/use_external_lemon.patch b/debian/patches/use_external_lemon.patch
deleted file mode 100644
index f4694c0..0000000
--- a/debian/patches/use_external_lemon.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Instead of building the own "lemon" parser generator,
- use the one that is provided with Debian.
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -308,10 +308,10 @@ LEMON = lemon$(EXEEXT)
- $(LEMON): $(srcdir)/tools/lemon.c
- $(COMPILE) `@CYGPATH@ $(srcdir)/tools/lemon.c` -o $(LEMON)
-
--cssparse.h: $(srcdir)/src/cssparse.lem $(LEMON)
-+cssparse.h: $(srcdir)/src/cssparse.lem
- cp $(srcdir)/src/cssparse.lem .
- cp $(srcdir)/tools/lempar.c .
-- ./$(LEMON) cssparse.lem
-+ lemon cssparse.lem
-
- cssparse.c: cssparse.h
-
diff --git a/debian/rules b/debian/rules
index 6eda792..4a45065 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,11 @@
# -*- makefile -*-
#export DH_VERBOSE=1
+export DEB_BUILD_OPTIONS+=" nocheck"
+
%:
dh $@ --with autoreconf
debiandir_SQ = $(subst ','\'',$(dir $(lastword $(MAKEFILE_LIST))))
get-orig-source:
- sh '$(debiandir_SQ)'get-orig-source.sh
+ sh '$(debiandir_SQ)'get-orig-source.sh
--
Render HTML and CSS content with tk
More information about the debian-science-commits
mailing list