* New upstream release.
* Make tk8.6-doc replace tck8.6 because of moving the
/usr/share/tcltk/tk8.6/demos link.
Sergei Golovan authored 10 years ago
Sergei Golovan committed 6 years ago
0 | |
tk8.6 (8.6.0-5) UNRELEASED; urgency=low
|
|
0 |
tk8.6 (8.6.1-1) experimental; urgency=low
|
1 | 1 |
|
2 | |
* NOT RELEASED YET
|
|
2 |
* New upstream release.
|
|
3 |
* Make tk8.6-doc replace tck8.6 because of moving the
|
|
4 |
/usr/share/tcltk/tk8.6/demos link.
|
3 | 5 |
|
4 | |
-- Sergei Golovan <sgolovan@debian.org> Mon, 19 Aug 2013 22:38:25 +0400
|
|
6 |
-- Sergei Golovan <sgolovan@debian.org> Tue, 24 Sep 2013 20:23:15 +0400
|
5 | 7 |
|
6 | 8 |
tk8.6 (8.6.0-4) experimental; urgency=low
|
7 | 9 |
|
63 | 63 |
Depends: ${misc:Depends}
|
64 | 64 |
Suggests: tk8.6
|
65 | 65 |
Conflicts: tkdoc, tk8.6 (<< 8.6.0-2)
|
|
66 |
Replaces: tk8.6 (<< 8.6.0-2)
|
66 | 67 |
Provides: tkdoc
|
67 | 68 |
Description: Tk toolkit for Tcl and X11 v8.6 - manual pages
|
68 | 69 |
Tk is a cross-platform graphical toolkit which provides the Motif
|
1 | 1 |
and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
|
2 | 2 |
installation.
|
3 | 3 |
|
4 | |
--- tk8.6-8.6.0.orig/unix/configure
|
5 | |
+++ tk8.6-8.6.0/unix/configure
|
6 | |
@@ -1432,6 +1432,7 @@
|
|
4 |
--- tk8.6-8.6.1.orig/unix/configure
|
|
5 |
+++ tk8.6-8.6.1/unix/configure
|
|
6 |
@@ -1431,6 +1431,7 @@
|
7 | 7 |
`ls -d ${prefix}/lib 2>/dev/null` \
|
8 | 8 |
`ls -d /usr/local/lib 2>/dev/null` \
|
9 | 9 |
`ls -d /usr/contrib/lib 2>/dev/null` \
|
|
11 | 11 |
`ls -d /usr/lib 2>/dev/null` \
|
12 | 12 |
`ls -d /usr/lib64 2>/dev/null` \
|
13 | 13 |
; do
|
14 | |
--- tk8.6-8.6.0.orig/unix/tcl.m4
|
15 | |
+++ tk8.6-8.6.0/unix/tcl.m4
|
|
14 |
--- tk8.6-8.6.1.orig/unix/tcl.m4
|
|
15 |
+++ tk8.6-8.6.1/unix/tcl.m4
|
16 | 16 |
@@ -93,6 +93,7 @@
|
17 | 17 |
`ls -d ${prefix}/lib 2>/dev/null` \
|
18 | 18 |
`ls -d /usr/local/lib 2>/dev/null` \
|
1 | 1 |
aren't installed by upstream script but are referenced inside other
|
2 | 2 |
manual pages.
|
3 | 3 |
|
4 | |
--- tk8.6-8.6.0.orig/unix/installManPage
|
5 | |
+++ tk8.6-8.6.0/unix/installManPage
|
|
4 |
--- tk8.6-8.6.1.orig/unix/installManPage
|
|
5 |
+++ tk8.6-8.6.1/unix/installManPage
|
6 | 6 |
@@ -92,12 +92,20 @@
|
7 | 7 |
exit 2 ;;
|
8 | 8 |
esac
|
0 | 0 |
Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
|
1 | 1 |
building on non-linux Debian architectures.
|
2 | 2 |
|
3 | |
--- tk8.6-8.6.0.orig/unix/configure
|
4 | |
+++ tk8.6-8.6.0/unix/configure
|
5 | |
@@ -4512,6 +4512,9 @@
|
|
3 |
--- tk8.6-8.6.1.orig/unix/configure
|
|
4 |
+++ tk8.6-8.6.1/unix/configure
|
|
5 |
@@ -4521,6 +4521,9 @@
|
6 | 6 |
if test "`uname -s`" = "AIX" ; then
|
7 | 7 |
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
|
8 | 8 |
fi
|
|
12 | 12 |
fi
|
13 | 13 |
fi
|
14 | 14 |
|
15 | |
@@ -5424,7 +5427,7 @@
|
16 | |
fi
|
17 | |
|
18 | |
;;
|
19 | |
- Linux*)
|
20 | |
+ Linux*|GNU*|NetBSD-Debian)
|
21 | |
SHLIB_CFLAGS="-fPIC"
|
22 | |
SHLIB_SUFFIX=".so"
|
23 | |
|
24 | |
--- tk8.6-8.6.0.orig/unix/tcl.m4
|
25 | |
+++ tk8.6-8.6.0/unix/tcl.m4
|
26 | |
@@ -924,6 +924,9 @@
|
|
15 |
--- tk8.6-8.6.1.orig/unix/tcl.m4
|
|
16 |
+++ tk8.6-8.6.1/unix/tcl.m4
|
|
17 |
@@ -928,6 +928,9 @@
|
27 | 18 |
if test "`uname -s`" = "AIX" ; then
|
28 | 19 |
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
|
29 | 20 |
fi
|
|
33 | 24 |
fi
|
34 | 25 |
fi
|
35 | 26 |
])
|
36 | |
@@ -1400,7 +1403,7 @@
|
37 | |
])
|
38 | |
])
|
39 | |
;;
|
40 | |
- Linux*)
|
41 | |
+ Linux*|GNU*|NetBSD-Debian)
|
42 | |
SHLIB_CFLAGS="-fPIC"
|
43 | |
SHLIB_SUFFIX=".so"
|
44 | |
|
0 | |
--- tk8.6-8.6.0.orig/unix/configure
|
1 | |
+++ tk8.6-8.6.0/unix/configure
|
2 | |
@@ -11115,7 +11115,7 @@
|
|
0 |
--- tk8.6-8.6.1.orig/unix/configure
|
|
1 |
+++ tk8.6-8.6.1/unix/configure
|
|
2 |
@@ -11213,7 +11213,7 @@
|
3 | 3 |
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
|
4 | 4 |
fi
|
5 | 5 |
|
|
8 | 8 |
PRIVATE_INCLUDE_DIR='$(includedir)'
|
9 | 9 |
HTML_DIR='$(DISTDIR)/html'
|
10 | 10 |
TK_PKG_DIR='tk$(VERSION)'
|
11 | |
--- tk8.6-8.6.0.orig/unix/configure.in
|
12 | |
+++ tk8.6-8.6.0/unix/configure.in
|
13 | |
@@ -634,7 +634,7 @@
|
|
11 |
--- tk8.6-8.6.1.orig/unix/configure.in
|
|
12 |
+++ tk8.6-8.6.1/unix/configure.in
|
|
13 |
@@ -666,7 +666,7 @@
|
14 | 14 |
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
|
15 | 15 |
fi
|
16 | 16 |
|
1 | 1 |
with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
|
2 | 2 |
puts private Tk headers there).
|
3 | 3 |
|
4 | |
--- tk8.6-8.6.0.orig/unix/tkConfig.sh.in
|
5 | |
+++ tk8.6-8.6.0/unix/tkConfig.sh.in
|
|
4 |
--- tk8.6-8.6.1.orig/unix/tkConfig.sh.in
|
|
5 |
+++ tk8.6-8.6.1/unix/tkConfig.sh.in
|
6 | 6 |
@@ -53,7 +53,7 @@
|
7 | 7 |
|
8 | 8 |
# String to pass to linker to pick up the Tk library from its
|
3 | 3 |
Bug: https://sourceforge.net/tracker/?func=detail&aid=3184834&group_id=12997&atid=112997
|
4 | 4 |
Last-updated: Wed, 20 Jul 2011 16:11:14 +0400
|
5 | 5 |
|
6 | |
--- tk8.6-8.6.0.orig/unix/configure.in
|
7 | |
+++ tk8.6-8.6.0/unix/configure.in
|
8 | |
@@ -557,8 +557,8 @@
|
|
6 |
--- tk8.6-8.6.1.orig/unix/configure.in
|
|
7 |
+++ tk8.6-8.6.1/unix/configure.in
|
|
8 |
@@ -485,8 +485,8 @@
|
9 | 9 |
XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
|
10 | 10 |
if test "$found_xft" = "no" ; then
|
11 | 11 |
found_xft=yes
|
|
16 | 16 |
fi
|
17 | 17 |
AC_MSG_RESULT([$found_xft])
|
18 | 18 |
dnl make sure that compiling against Xft header file doesn't bomb
|
19 | |
--- tk8.6-8.6.0.orig/unix/configure
|
20 | |
+++ tk8.6-8.6.0/unix/configure
|
21 | |
@@ -10851,8 +10851,8 @@
|
|
19 |
--- tk8.6-8.6.1.orig/unix/configure
|
|
20 |
+++ tk8.6-8.6.1/unix/configure
|
|
21 |
@@ -10370,8 +10370,8 @@
|
22 | 22 |
XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
|
23 | 23 |
if test "$found_xft" = "no" ; then
|
24 | 24 |
found_xft=yes
|
113 | 113 |
dh_shlibdeps -ldebian/libtk$(v)/usr/lib/$(DEB_HOST_MULTIARCH)
|
114 | 114 |
|
115 | 115 |
get-orig-source:
|
116 | |
wget -O tk$(v)_$(v).0.orig.tar.gz \
|
117 | |
http://prdownloads.sourceforge.net/tcl/tk$(v).0-src.tar.gz
|
|
116 |
wget -O tk$(v)_$(v).1.orig.tar.gz \
|
|
117 |
http://prdownloads.sourceforge.net/tcl/tk$(v).1-src.tar.gz
|
118 | 118 |
|
119 | 119 |
.PHONY: override_dh_auto_clean override_dh_auto_configure override_dh_auto_build \
|
120 | 120 |
override_dh_auto_install override_dh_compress override_dh_makeshlibs \
|