Codebase list tk8.6 / 66586d8
* 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
9 changed file(s) with 35 addition(s) and 50 deletion(s). Raw diff Collapse all Expand all
0 tk8.6 (8.6.0-5) UNRELEASED; urgency=low
0 tk8.6 (8.6.1-1) experimental; urgency=low
11
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.
35
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
57
68 tk8.6 (8.6.0-4) experimental; urgency=low
79
6363 Depends: ${misc:Depends}
6464 Suggests: tk8.6
6565 Conflicts: tkdoc, tk8.6 (<< 8.6.0-2)
66 Replaces: tk8.6 (<< 8.6.0-2)
6667 Provides: tkdoc
6768 Description: Tk toolkit for Tcl and X11 v8.6 - manual pages
6869 Tk is a cross-platform graphical toolkit which provides the Motif
11 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
22 installation.
33
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 @@
77 `ls -d ${prefix}/lib 2>/dev/null` \
88 `ls -d /usr/local/lib 2>/dev/null` \
99 `ls -d /usr/contrib/lib 2>/dev/null` \
1111 `ls -d /usr/lib 2>/dev/null` \
1212 `ls -d /usr/lib64 2>/dev/null` \
1313 ; 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
1616 @@ -93,6 +93,7 @@
1717 `ls -d ${prefix}/lib 2>/dev/null` \
1818 `ls -d /usr/local/lib 2>/dev/null` \
11 aren't installed by upstream script but are referenced inside other
22 manual pages.
33
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
66 @@ -92,12 +92,20 @@
77 exit 2 ;;
88 esac
00 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
11 building on non-linux Debian architectures.
22
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 @@
66 if test "`uname -s`" = "AIX" ; then
77 tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
88 fi
1212 fi
1313 fi
1414
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 @@
2718 if test "`uname -s`" = "AIX" ; then
2819 tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
2920 fi
3324 fi
3425 fi
3526 ])
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 @@
33 TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
44 fi
55
88 PRIVATE_INCLUDE_DIR='$(includedir)'
99 HTML_DIR='$(DISTDIR)/html'
1010 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 @@
1414 TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
1515 fi
1616
11 with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
22 puts private Tk headers there).
33
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
66 @@ -53,7 +53,7 @@
77
88 # String to pass to linker to pick up the Tk library from its
33 Bug: https://sourceforge.net/tracker/?func=detail&aid=3184834&group_id=12997&atid=112997
44 Last-updated: Wed, 20 Jul 2011 16:11:14 +0400
55
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 @@
99 XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
1010 if test "$found_xft" = "no" ; then
1111 found_xft=yes
1616 fi
1717 AC_MSG_RESULT([$found_xft])
1818 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 @@
2222 XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
2323 if test "$found_xft" = "no" ; then
2424 found_xft=yes
113113 dh_shlibdeps -ldebian/libtk$(v)/usr/lib/$(DEB_HOST_MULTIARCH)
114114
115115 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
118118
119119 .PHONY: override_dh_auto_clean override_dh_auto_configure override_dh_auto_build \
120120 override_dh_auto_install override_dh_compress override_dh_makeshlibs \