From: Sebastian Harl Date: Sun, 6 Jun 2010 13:59:58 +0000 (+0200) Subject: patches: Added tcl-8.5. X-Git-Tag: experimental/1.4.3-2^0 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9880a40d858e762ad008d9501bf3b931db08334e;p=pkg-rrdtool.git patches: Added tcl-8.5. … fixing an issue identified by Tcl 8.5 in the Tcl bindings: So far, a strict version of the "Tcl" package was requested, which seems to have been ignored by Tcl < 8.5. This requirement has been removed. --- diff --git a/debian/changelog b/debian/changelog index 01212ed..170c29e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,13 @@ rrdtool (1.4.3-2) experimental; urgency=low * debian/control: Rebuild against Tcl 8.5 (Closes: #582211). - Build-depend on tcl-dev (>= 8.5) and tcl (>= 8.5). * Uploading to experimental, which hosts Tcl 8.5 for now. + * debian/patches: + - Added tcl-8.5, fixing an issue identified by Tcl 8.5 in the Tcl + bindings: So far, a strict version of the "Tcl" package was requested, + which seems to have been ignored by Tcl < 8.5. This requirement has been + removed. - -- Sebastian Harl Tue, 25 May 2010 20:11:31 +0200 + -- Sebastian Harl Sun, 06 Jun 2010 15:22:39 +0200 rrdtool (1.4.3-1) unstable; urgency=low diff --git a/debian/patches/series b/debian/patches/series index e472686..ab9438e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ no-rpath-for-ruby no-rpath-for-perl implicit-decl-fix bts530814-hurd +tcl-8.5 diff --git a/debian/patches/tcl-8.5 b/debian/patches/tcl-8.5 new file mode 100644 index 0000000..a84798b --- /dev/null +++ b/debian/patches/tcl-8.5 @@ -0,0 +1,12 @@ +diff a/bindings/tcl/tclrrd.c b/bindings/tcl/tclrrd.c +--- a/bindings/tcl/tclrrd.c ++++ b/bindings/tcl/tclrrd.c +@@ -678,7 +678,7 @@ static int init( + if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) + return TCL_ERROR; + +- if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 1) == NULL) { ++ if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 0) == NULL) { + return TCL_ERROR; + } +