[Pkg-tcltk-commits] r1359 - in tdom/trunk/debian: . patches

[andrewshadoura-guest at alioth.debian.org]

Author: andrewshadoura-guest
Date: 2013-06-24 12:34:59 +0000 (Mon, 24 Jun 2013)
New Revision: 1359

Added:
   tdom/trunk/debian/patches/kfreebsd.patch
   tdom/trunk/debian/patches/tcl8.6-compat.patch
Removed:
   tdom/trunk/debian/patched/
Modified:
   tdom/trunk/debian/changelog
   tdom/trunk/debian/patches/series
Log:
Acknowledge NMUs, add Tcl8.6 compat patch

Modified: tdom/trunk/debian/changelog
===================================================================
--- tdom/trunk/debian/changelog	2013-06-24 12:20:59 UTC (rev 1358)
+++ tdom/trunk/debian/changelog	2013-06-24 12:34:59 UTC (rev 1359)
@@ -1,7 +1,6 @@
-tdom (0.8.3~20080525-3.1) UNRELEASED; urgency=low
+tdom (0.8.3~20080525-4) UNRELEASED; urgency=low
 
   [ Sergei Golovan ]
-  * Non-maintainer upload.
   * NOT RELEASED YET
 
   [ Hector Romojaro ]
@@ -9,6 +8,21 @@
 
  -- Hector Romojaro <hromojaro at dia.uned.es>  Sun, 04 Mar 2012 19:18:53 +0100
 
+tdom (0.8.3~20080525-3+nmu2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add missing kfreebsd.dpatch line (closes: #692299).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Fri, 30 Nov 2012 01:20:05 +0000
+
+tdom (0.8.3~20080525-3+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add a binary-indep rule (fixes ftp-master autoreject).
+  * Support kfreebsd in configure scripts (closes: #692299). 
+
+ -- Michael Gilbert <mgilbert at debian.org>  Thu, 22 Nov 2012 07:30:32 +0000
+
 tdom (0.8.3~20080525-3) unstable; urgency=low
 
   * Checked for lintian sanity (v2.2.12)

Added: tdom/trunk/debian/patches/kfreebsd.patch
===================================================================
--- tdom/trunk/debian/patches/kfreebsd.patch	                        (rev 0)
+++ tdom/trunk/debian/patches/kfreebsd.patch	2013-06-24 12:34:59 UTC (rev 1359)
@@ -0,0 +1,24 @@
+From: Michael Gilbert <mgilbert at debian.org>
+
+--- a/configure
++++ b/configure
+@@ -8640,7 +8640,7 @@
+ 	        fi
+ 	    fi
+ 	    ;;
+-	Linux*)
++	Linux*|GNU*|NetBSD-Debian)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
+--- a/extensions/tnc/configure
++++ b/extensions/tnc/configure
+@@ -8082,7 +8082,7 @@
+ 	        fi
+ 	    fi
+ 	    ;;
+-	Linux*)
++	Linux*|GNU*|NetBSD-Debian)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"

Modified: tdom/trunk/debian/patches/series
===================================================================
--- tdom/trunk/debian/patches/series	2013-06-24 12:20:59 UTC (rev 1358)
+++ tdom/trunk/debian/patches/series	2013-06-24 12:34:59 UTC (rev 1359)
@@ -1 +1,3 @@
 shared-expat.patch
+kfreebsd.patch
+tcl8.6-compat.patch

Added: tdom/trunk/debian/patches/tcl8.6-compat.patch
===================================================================
--- tdom/trunk/debian/patches/tcl8.6-compat.patch	                        (rev 0)
+++ tdom/trunk/debian/patches/tcl8.6-compat.patch	2013-06-24 12:34:59 UTC (rev 1359)
@@ -0,0 +1,32 @@
+Author: Rolf Ade
+Description: Compatibility with Tcl 8.6 - Beginning with 8.6, interp->errorLine
+ isn't public visible anymore (TIP 330).
+
+--- a/generic/dom.h
++++ b/generic/dom.h
+@@ -101,6 +101,14 @@
+ #endif
+ 
+ /*
++ * Beginning with 8.6, interp->errorLine isn't public visible anymore
++ * (TIP 330)
++ */
++#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6)
++# define Tcl_GetErrorLine(interp) (interp)->errorLine
++#endif
++
++/*
+  * Starting with Tcl 8.2 the Tcl_Panic() is defined properly
+  * over the stubs table.
+  * Also, we have a proper Tcl_GetString() shortcut afterwards.
+--- a/generic/tcldom.c
++++ b/generic/tcldom.c
+@@ -5951,7 +5951,7 @@
+     if (ret == TCL_ERROR) {
+         char msg[64 + TCL_INTEGER_SPACE];
+         sprintf(msg, "\n    (\"%s %s\" body line %d)", Tcl_GetString(objv[0]),
+-                Tcl_GetString(objv[1]), interp->errorLine);
++                Tcl_GetString(objv[1]), Tcl_GetErrorLine(interp));
+         Tcl_AddErrorInfo(interp, msg);
+     }
+