[SCM] Table extension for Tcl/Tk branch, master, updated. a69cbd30e7384cb4ff608fa0d3ebdb283e5f7148

Ole Streicher github at liska.ath.cx
Thu Jan 5 13:36:34 UTC 2012


The following commit has been merged in the master branch:
commit a69cbd30e7384cb4ff608fa0d3ebdb283e5f7148
Author: Ole Streicher <github at liska.ath.cx>
Date:   Thu Jan 5 14:33:44 2012 +0100

    Add Debian files from package tktable2.9-2.9+cvs20060727-2.
    The diffs for the original tktable files are put in
    tktable-2.9+cvs20060727-2-nodebian.diff.
    This will probably not compile.

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..fe71046
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,159 @@
+tktable2.9 (2.9+cvs20060727-2) unstable; urgency=low
+
+  * Added build-dep on groff
+    Closes: #365107
+  * Assume this version fixes the hurd-i386 autobuild, please reopen
+    the bug if this should not be the case...
+    Closes: #324143
+  * Changed Maintainer to: Justin Pryzby <justinpryzby at users.sf.net>
+
+ -- Lars Steinke <lss at debian.org>  Sun,  3 Sep 2006 10:55:08 +0200
+
+tktable2.9 (2.9+cvs20060727-1) unstable; urgency=medium
+
+  * Pull changes from upstream CVS
+    - Improved license, with no implication of obligations
+    - Fix compiler warning about undefined behavior
+  * Medium urgency for RC bug fix
+  * - Make sure pkgIndex.tcl from the runtime package references the shared
+      lib rather than the static lib, which is^Wwas in the -dev package;
+    - Implement the name changes intended in the previous uploads; drop the
+      -dev package, since the .tcl files refer to the shared library only.
+    Closes: 368795.
+  * Add replaces+Conflicts against the old name.
+  * Bump Standards-Version; no changes.
+  * Apply patch from Petr Salinger to allow compilation on GNU/kFreeBSD
+    Closes: #380144 (and possibly #324143 too)
+  * Sponsored Upload for Justin Pryzby <justinpryzby at users.sf.net>
+
+ -- Lars Steinke <lss at debian.org>  Mon, 28 Aug 2006 10:58:06 -0400
+
+tktable (2.9-3) unstable; urgency=low
+
+  * Replaced tclconfig/tcl.m4 with updated /usr/lib/tcl8.4/tcl.m4.
+    Closes: #356062 
+
+ -- Lars Steinke <lss at debian.org>  Mon, 17 Apr 2006 11:49:14 +0200
+
+tktable (2.9-2) unstable; urgency=low
+
+  * Sponsored upload.
+  * Redo most of the package
+    - Justin Pryzby <justinpryzby at users.sf.net> Wed, 29 Mar 2006 14:10:22
+  * Rename the library, since upstream doesn't guarantee any kind of A[BP]I
+    compatibility, any new release will probably require rebuilding at least.
+  * Reupload and rename tktable-2.9 orig tarball; this used to be a native
+    package.
+  * Patch tcl.m4 and run autoconf at buildtime; thanks to David Watson
+    <david at planetwatson.co.uk> for the useful patch.
+    Closes: #356062, and maybe #324143 too.
+  * Correct manpage typos; Thanks A Costa <agcosta at gis.net>.
+    Closes: #320551
+  * Remove README.Debian, since saods9 also depends on tktable.
+  * ./debian/control:
+    - Build-Conflict with old autoconf.
+    - Add myself as an uploader; hopefully I'm progressing through NM
+      sufficiently quickly for this to be meaningful.
+    - Bump standards-version to 3.6.2; no changes.
+    - End the long description with a period, and indent homepage field on a
+      new line, as per DevRef 6.2.4.
+    - Trim Build-Depends, since {tcl,tk}8.4-dev packages depend on the precise
+      versions of the runtime packages.
+  * ./debian/copyright: Fully document the copyright holder, including years.
+  * Document a P/D license for Debian .diff in ./debian/rules and
+    ./debian/copyright; okayed by Lars.
+  * Update to debhelper 4 from, uh, 1.
+  * ./debian/rules:
+    - Remove strange symlinks from /usr/lib/.. to /usr/lib/tktable/..
+      Closes: #339056
+    - Hack options to ./configure to find tcl includes, fixing probably
+      FTBFS;
+      Closes: #343138.
+    - build-stamp target now touches $@ to avoid recompilations instead of
+      causing them.
+    - Remove double calls to ./configure in clean target; instead, only
+      distclean if Makefile exits (addressing an issue mentioned in #324143).
+    - Remove call to strip, this is already handled by dh_strip, which also
+      supports DEB_BUILD_OPTIONS=nostrip.
+    - dh_installman now installs the manpage, rather than cp -a, and
+      dh_installdoc installs the html documentation, rather than mv;
+      dh_examples now installs ./demos.
+    - Remove obsolete targets 'source' and 'diff'.
+  * Add a watchfile.
+
+ -- Lars Steinke <lss at debian.org>  Sun, 16 Apr 2006 14:10:22 -0500
+
+tktable (2.9-1) unstable; urgency=low
+
+  * New upstream release (closes: Bug#262668)
+
+ --  Lars Steinke (Debian Developer) <lss at debian.org>  Wed, 16 Feb 2004 17:51:05 +0200
+
+tktable (2.8-2) unstable; urgency=low
+
+  * Fixed build dependencies
+  * Fixed clean target in debian/rules (closes: Bug#194055)
+
+ -- Lars Steinke <lss at debian.org>  Wed,  4 Jun 2003 17:51:05 +0200
+
+tktable (2.8-1) unstable; urgency=low
+
+  * New upstream release (closes: Bug#173668)
+  * Fixed dependencies (closes: Bug#191311)
+
+ -- Lars Steinke <lss at debian.org>  Tue, 20 May 2003 14:29:23 +0200
+
+tktable (2.7-2) unstable; urgency=low
+
+  * Fix overrides
+
+ -- Lars Steinke <lss at debian.org>  Mon, 11 Mar 2002 20:29:23 +0200
+
+tktable (2.7-1) unstable; urgency=low
+
+  * New upstream release with bugfixes (closes: Bug#128376)
+
+ -- Lars Steinke <lss at debian.org>  Sun, 10 Mar 2002 20:29:23 +0200
+ 
+tktable (2.6-3) unstable; urgency=low
+
+  * Fixed build dependency on debhelper (closes: Bug#94827)
+
+ -- Lars Steinke <lss at debian.org>  Mon, 23 Apr 2001 11:29:23 +0200
+
+tktable (2.6-2) unstable; urgency=low
+
+  * Miscellaneous fixes (closes #93730, #93735) 
+
+ -- Lars Steinke <lss at debian.org>  Wed, 18 Apr 2001 20:36:56 +0200
+
+tktable (2.6-1) unstable; urgency=low
+
+  * New upstream release
+  * Fixed build dependencies (closes #85308)
+
+ -- Lars Steinke <lss at debian.org>  Wed,  7 Mar 2001 17:58:55 +0100
+
+tktable (2.5-3) unstable; urgency=low
+
+  * Fixed linitan messages
+
+ -- Lars Steinke <lss at debian.org>  Wed, 15 Mar 2000 13:30:54 +0100
+
+tktable (2.5-2) unstable; urgency=low
+
+  * Recompiled for Tk/Tcl 8.2
+
+ -- Lars Steinke <lss at debian.org>  Tue,  5 Oct 1999 12:54:34 +0200
+
+tktable (2.5-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Lars Steinke <lss at debian.org>  Tue, 17 Aug 1999 15:55:51 +0200
+
+tktable (2.3-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Lars Steinke <lss at debian.org>  Fri, 21 Aug 1998 16:58:57 +0200
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..752e046
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,20 @@
+Source: tktable2.9
+Priority: optional
+Maintainer: Justin Pryzby <justinpryzby at users.sf.net>
+Uploaders: Lars Steinke <lss at debian.org>
+Build-Depends: debhelper (>> 4.0.0), tcl8.4-dev, tk8.4-dev, autoconf, groff
+Build-Conflicts: autoconf2.13
+Standards-Version: 3.7.2
+Section: interpreters
+
+Package: libtktable2.9
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, tcl|tcl8.4|tcl8.3, tk|tk8.4|tk8.3
+Replaces: tktable, tktable-dev, libtktable, libtktable-dev
+Conflicts: tktable, tktable-dev, libtktable, libtktable-dev
+Description: Table extension for Tcl/Tk
+ Provides support for tables and matrices in Tcl/Tk.  This package is
+ sufficient to run and link against tkTable.
+ .
+  Homepage: http://tktable.sourceforge.net/
diff --git a/license.txt b/debian/copyright
similarity index 74%
copy from license.txt
copy to debian/copyright
index fb155d2..3d725cb 100644
--- a/license.txt
+++ b/debian/copyright
@@ -1,3 +1,15 @@
+This package was first debianized by Lars Steinke <steinke at lsweb.de> on
+Fri, 21 Aug 1998 16:58:57 +0200.
+
+Debian-specific changes are a work of Lars Steinke <lss at debian.org>
+during the years 1998-2004, and Justin Pryzby
+<pryzbyj at justinpryzby.com> during 2005-2006; they are hereby released
+into the public domain.
+
+It was downloaded from http://tktable.sourceforge.net
+
+Copyright 1997-2002, Jeffrey Hobbs (jeff at hobbs.org)
+
 		   * COPYRIGHT AND LICENSE TERMS *
 
 (This file blatantly stolen from Tcl/Tk license and adapted - thus assume
@@ -39,3 +51,11 @@ This software is also falls under the bourbon_ware clause v2:
  of aged bourbon and scotch are welcome by the author.  The user may feel
  exempt from this clause if they are below drinking age or think the author
  has already partaken of too many drinks.
+
+======================================================================
+./tclconfig/tcl.m4 is
+# Copyright (c) 1999-2000 Ajuba Solutions.
+# Copyright (c) 2002-2005 ActiveState Corporation.
+
+and is available under the same distribution license as the rest of
+tktable.
diff --git a/debian/libtktable2.9.docs b/debian/libtktable2.9.docs
new file mode 100644
index 0000000..4c2e441
--- /dev/null
+++ b/debian/libtktable2.9.docs
@@ -0,0 +1,4 @@
+README.blt
+README.txt
+TODO.txt
+UPGRADING.txt
diff --git a/debian/rules b/debian/rules
new file mode 100644
index 0000000..09cf700
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,93 @@
+#!/usr/bin/make -f
+# Made with the aid of dh_make, by Craig Small
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+# Debian-specific changes are a work of Lars Steinke <lss at debian.org>
+# during the years 1998-2004, and Justin Pryzby
+# <pryzbyj at justinpryzby.com> during 2005-2006; they are hereby
+# released into the public domain.
+
+ver=2.9
+pkg=libtktable
+lib=$(pkg)$(ver)
+
+base=Tktable
+lbase=lib$(base)
+libfst=lib$(base)$(ver).a
+libfsh=lib$(base)$(ver).so
+
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+CONFIGURE = ./configure
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	CONFIGURE += --build $(DEB_HOST_GNU_TYPE)
+else
+	CONFIGURE += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+CFLAGS=-Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+export DH_COMPAT=4
+
+build: build-stamp
+
+build-stamp: CONFIGURE+=--with-tcl=/usr/lib/tcl8.4 --with-tk=/usr/lib/tk8.4 --with-tclinclude=/usr/include/tcl8.4 --with-tkinclude=/usr/include/tcl8.4 --enable-threads
+build-stamp:
+	dh_testdir
+	autoconf
+# If a static library -dev package is to be built, it is necessary
+# that the shared build creates pkgIndex.tcl, not the static build,
+# otherwise it will reference the static .a library.
+	rm -f ./pkgIndex.tcl
+
+# First build the shared library, with -fPIC.
+	$(CONFIGURE) --enable-shared CFLAGS="$(CFLAGS)"
+	$(MAKE)
+
+# Now rebuild for the static library, without -fPIC
+# find -name '*.o' -type f -print0 |xargs -0 $(RM)
+# $(CONFIGURE) --disable-shared CFLAGS="$(CFLAGS)"
+# $(MAKE)
+
+	touch "$@"
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	set -e; [ ! -f ./Makefile ] || $(MAKE) distclean;
+	dh_clean $(libfst) $(libfsh) config.log configure
+
+binary-indep: build
+binary-arch: build
+	dh_testdir
+	dh_testroot
+	dh_clean
+	dh_installdirs -a usr/lib/$(base)$(ver)
+	dh_installchangelogs ChangeLog
+	dh_installdocs	-a
+	dh_installexamples -p$(lib) ./demos/*
+	dh_install -p$(lib) ./library/tkTable.tcl ./pkgIndex.tcl $(lbase)$(ver).so usr/lib/$(base)$(ver)
+	# dh_install -p$(dev) $(lbase)$(ver).a usr/lib/$(base)$(ver)
+	chmod 0644 ./debian/$(lib)/usr/lib/Tktable2.9/tkTable.tcl
+	cd ./debian/$(lib)/usr/share/doc/$(lib)/examples/ && chmod 0644 tcllogo.gif loadtable.tcl
+	dh_installman -p$(lib) doc/tkTable.n
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
diff --git a/debian/tktable-2.9+cvs20060727-2-nodebian.diff b/debian/tktable-2.9+cvs20060727-2-nodebian.diff
new file mode 100644
index 0000000..c8dab00
--- /dev/null
+++ b/debian/tktable-2.9+cvs20060727-2-nodebian.diff
@@ -0,0 +1,44 @@
+--- tktable2.9-2.9+cvs20060727.orig/doc/tkTable.n
++++ tktable2.9-2.9+cvs20060727/doc/tkTable.n
+@@ -233,7 +233,7 @@
+ .de UL
+ \\$1\l'|0\(ul'\\$2
+ ..
+-.TH table n 2.8 Tk "Tk Table Extension"
++.TH table "3" "2.8 Tk" "Tk Table Extension"
+ .HS table tk
+ .BS
+ .SH NAME
+@@ -322,7 +322,7 @@
+ \fBtag col\fR widget method.  If no tag is found, it will evaluate the named
+ procedure passing the column number in question as the sole argument.  The
+ procedure is expected to return the name of a tag to use, or a null string.
+-Errors occuring during the evaluation of the procedure, or the return of an
++Errors occurring during the evaluation of the procedure, or the return of an
+ invalid tag name are silently ignored.
+ .OP \-colwidth colWidth ColWidth
+ Default column width, interpreted as characters in the default font when
+@@ -1028,7 +1028,7 @@
+ .TP
+ \fIpathName \fBinsert active\fR \fIindex value\fR
+ The \fIvalue\fR is a text string which is inserted at the \fIindex\fR
+-postion of the active cell.  The cursor is then positioned after the
++position of the active cell.  The cursor is then positioned after the
+ 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=""
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..ba3ef4d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/tktable/ Tktable(.*)\.tar\.gz debian uupdate

-- 
Table extension for Tcl/Tk



More information about the debian-science-commits mailing list