[SCM] Table extension for Tcl/Tk branch, debian, updated. e6932eee5b2f8435e5845d8818ffe9008686b847

Ole Streicher github at liska.ath.cx
Thu Jan 5 14:15:08 UTC 2012


The following commit has been merged in the debian branch:
commit d19a793d310696d5c65139e8ee0a7dd63e410f0e
Author: Ole Streicher <github at liska.ath.cx>
Date:   Thu Jan 5 14:42:02 2012 +0100

    Split up 2.9 patch into small pieces

diff --git a/debian/patches/add_tclLoadDl_lib.patch b/debian/patches/add_tclLoadDl_lib.patch
new file mode 100644
index 0000000..d87a848
--- /dev/null
+++ b/debian/patches/add_tclLoadDl_lib.patch
@@ -0,0 +1,15 @@
+--- tktable2.9-2.9+cvs20060727.orig/tclconfig/tcl.m4
++++ tktable2.9-2.9+cvs20060727/tclconfig/tcl.m4
+@@ -1474,8 +1474,11 @@
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
+ 
++	    # following line added by CW for Debian GNU/Hurd
++	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
++
+ 	    SHLIB_LD="${CC} -shared"
+-	    DL_OBJS=""
++	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 	    CC_SEARCH_FLAGS=""
diff --git a/debian/tktable-2.9+cvs20060727-2-nodebian.diff b/debian/patches/fix_manpage_spelling.patch
similarity index 72%
rename from debian/tktable-2.9+cvs20060727-2-nodebian.diff
rename to debian/patches/fix_manpage_spelling.patch
index c8dab00..0e61dd2 100644
--- a/debian/tktable-2.9+cvs20060727-2-nodebian.diff
+++ b/debian/patches/fix_manpage_spelling.patch
@@ -27,18 +27,3 @@
  new text. \fIindex\fR can be a number, \fBinsert\fR or \fBend\fR.
  .TP
  \fIpathName \fBinsert cols\fR ?\fIswitches\fR? \fIindex\fR ?\fIcount\fR?
---- tktable2.9-2.9+cvs20060727.orig/tclconfig/tcl.m4
-+++ tktable2.9-2.9+cvs20060727/tclconfig/tcl.m4
-@@ -1474,8 +1474,11 @@
- 	    SHLIB_LD_LIBS='${LIBS}'
- 	    SHLIB_SUFFIX=".so"
- 
-+	    # following line added by CW for Debian GNU/Hurd
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
-+
- 	    SHLIB_LD="${CC} -shared"
--	    DL_OBJS=""
-+	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
- 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
- 	    CC_SEARCH_FLAGS=""

-- 
Table extension for Tcl/Tk



More information about the debian-science-commits mailing list