[SCM] Table extension for Tcl/Tk branch, master, updated. 6e0a95b3aed34eea4f9918c653c92d7a448c8220
Ole Streicher
github at liska.ath.cx
Fri Jan 6 09:28:26 UTC 2012
The following commit has been merged in the master branch:
commit ccbf0f04e2ae097cf8d00af2fbb815e60acb26a4
Author: Ole Streicher <github at liska.ath.cx>
Date: Fri Jan 6 09:42:03 2012 +0100
Clean up "rules", make package buildable and remove most Lintian errors
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..0f5792f
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,6 @@
+pkgIndex.tcl
+config.log
+configure
+libTktable2.10.so
+libTktable2.10.a
+*.o
diff --git a/debian/control b/debian/control
index 8e5d4f2..99f1fda 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/tktable.git
Package: libtktable2.10
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, tcl|tcl8.5|tcl8.4|tcl8.3, tk|tk8.5|tk8.4|tk8.3
+Depends: ${misc:Depends}, ${shlibs:Depends}, tcl|tcl8.5|tcl8.4|tcl8.3, tk|tk8.5|tk8.4|tk8.3
Replaces: tktable, tktable-dev, libtktable, libtktable-dev
Conflicts: tktable, tktable-dev, libtktable, libtktable-dev
Description: Table extension for Tcl/Tk
diff --git a/debian/copyright b/debian/copyright
index ca641ba..5fac01c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -50,6 +50,8 @@ Files: tclconfig/tcl.m4
Copyright: Copyright (c) 1999-2000 Ajuba Solutions.
Copyright (c) 2002-2005 ActiveState Corporation.
License: BSD
+ This file is available under the same distribution license as the rest of
+ tktable.
Files: debian/*
Copyright: not applicable
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..a510814
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/lib/TkTable/2.10
diff --git a/debian/libtktable2.9.docs b/debian/docs
similarity index 68%
rename from debian/libtktable2.9.docs
rename to debian/docs
index 4c2e441..a70e508 100644
--- a/debian/libtktable2.9.docs
+++ b/debian/docs
@@ -1,4 +1,4 @@
README.blt
README.txt
TODO.txt
-UPGRADING.txt
+
diff --git a/debian/files b/debian/files
new file mode 100644
index 0000000..4c7c568
--- /dev/null
+++ b/debian/files
@@ -0,0 +1 @@
+libtktable2.10_2.10-1_amd64.deb libs optional
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..a7a3f71
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,4 @@
+library/tkTable.tcl usr/lib/TkTable2.10
+pkgIndex.tcl usr/lib/TkTable2.10
+libTktable2.10.so usr/lib/TkTable2.10
+
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..1258ba4
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+doc/tkTable.n
diff --git a/debian/patches/add_tclLoadDl_for_Hurd.patch b/debian/patches/add_tclLoadDl_for_Hurd.patch
new file mode 100644
index 0000000..991f752
--- /dev/null
+++ b/debian/patches/add_tclLoadDl_for_Hurd.patch
@@ -0,0 +1,17 @@
+Author: CW (?)
+Description: (guess) Add missing library for Debian GNU/Hurd
+--- a/tclconfig/tcl.m4
++++ b/tclconfig/tcl.m4
+@@ -1621,8 +1621,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/patches/add_tclLoadDl_lib.patch b/debian/patches/add_tclLoadDl_lib.patch
deleted file mode 100644
index d87a848..0000000
--- a/debian/patches/add_tclLoadDl_lib.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/patches/dont_install_license.patch b/debian/patches/dont_install_license.patch
new file mode 100644
index 0000000..fa807b0
--- /dev/null
+++ b/debian/patches/dont_install_license.patch
@@ -0,0 +1,14 @@
+Author: Ole Streicher <liska.ath.cx>
+Description: Dont install the license file; this is covered by Debian's
+ "copyright" file.
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -44,7 +44,7 @@
+
+ PKG_HEADERS = @PKG_HEADERS@
+
+-PKG_EXTRA_FILES = license.txt README.txt
++PKG_EXTRA_FILES = README.txt
+
+ PKG_MAN_PAGES = tkTable.n
+
diff --git a/debian/patches/fix_manpage_spelling.patch b/debian/patches/fix_manpage_spelling.patch
deleted file mode 100644
index 0e61dd2..0000000
--- a/debian/patches/fix_manpage_spelling.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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?
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f437d4a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+set_manpage_chapter.patch
+add_tclLoadDl_for_Hurd.patch
+
+dont_install_license.patch
diff --git a/debian/patches/set_manpage_chapter.patch b/debian/patches/set_manpage_chapter.patch
new file mode 100644
index 0000000..3e1b932
--- /dev/null
+++ b/debian/patches/set_manpage_chapter.patch
@@ -0,0 +1,15 @@
+Author: Justin Pryzby <justinpryzby at users.sf.net>
+Description: Set chapter number for manpage
+--- a/doc/tkTable.n
++++ b/doc/tkTable.n
+@@ -233,9 +233,7 @@
+ .de UL
+ \\$1\l'|0\(ul'\\$2
+ ..
+-.TH table n 2.8 Tk "Tk Table Extension"
++.TH table "3" "2.10 Tk" "Tk Table Extension"
+-.HS table tk
+-.BS
+ .SH NAME
+ table \- Create and manipulate tables
+ .SH SYNOPSIS
diff --git a/debian/rules b/debian/rules
index 2c71910..3a1d7fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,88 +6,18 @@
# <pryzbyj at justinpryzby.com> during 2005-2006; they are hereby
# released into the public domain.
-ver=2.10
-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.5 --with-tk=/usr/lib/tk8.5 --with-tclinclude=/usr/include/tcl8.5 --with-tkinclude=/usr/include/tcl8.5 --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
+%:
+ dh $@ --with autoreconf
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --build $(DEB_BUILD_GNU_TYPE) \
+ --host $(DEB_HOST_GNU_TYPE) \
+ --with-tcl=/usr/lib/tcl8.5 \
+ --with-tk=/usr/lib/tk8.5
+ --with-tclinclude=/usr/include/tcl8.5 \
+ --with-tkinclude=/usr/include/tcl8.5 \
+ --enable-threads --enable-shared
--
Table extension for Tcl/Tk
More information about the debian-science-commits
mailing list