[Pkg-tcltk-commits] r1865 - in tk8.6/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Thu Aug 10 09:47:29 UTC 2017
Author: sgolovan
Date: 2017-08-10 09:47:29 +0000 (Thu, 10 Aug 2017)
New Revision: 1865
Modified:
tk8.6/trunk/debian/changelog
tk8.6/trunk/debian/control
tk8.6/trunk/debian/patches/confsearch.diff
tk8.6/trunk/debian/patches/non-linux.diff
tk8.6/trunk/debian/patches/tklibrary.diff
tk8.6/trunk/debian/patches/xft.diff
tk8.6/trunk/debian/rules
Log:
[tk8.6]
* New upstream release (closes: #860927).
* Refreshed patches.
* Arch-qualify TCL_CC.
* Sort the object files inside the static library using the C locale to make
the build reproducible (closes: #818753).
* Bumped standards version to 4.0.1.
Modified: tk8.6/trunk/debian/changelog
===================================================================
--- tk8.6/trunk/debian/changelog 2017-08-10 09:31:12 UTC (rev 1864)
+++ tk8.6/trunk/debian/changelog 2017-08-10 09:47:29 UTC (rev 1865)
@@ -1,8 +1,13 @@
-tk8.6 (8.6.6-2) UNRELEASED; urgency=medium
+tk8.6 (8.6.7-1) unstable; urgency=medium
- * NOT RELEASED YET
+ * New upstream release (closes: #860927).
+ * Refreshed patches.
+ * Arch-qualify TCL_CC.
+ * Sort the object files inside the static library using the C locale to make
+ the build reproducible (closes: #818753).
+ * Bumped standards version to 4.0.1.
- -- Sergei Golovan <sgolovan at debian.org> Thu, 28 Jul 2016 06:27:55 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 10 Aug 2017 12:45:27 +0300
tk8.6 (8.6.6-1) unstable; urgency=medium
Modified: tk8.6/trunk/debian/control
===================================================================
--- tk8.6/trunk/debian/control 2017-08-10 09:31:12 UTC (rev 1864)
+++ tk8.6/trunk/debian/control 2017-08-10 09:47:29 UTC (rev 1865)
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), x11proto-core-dev,
libx11-dev, libxt-dev, libxss-dev, libxext-dev, libxft-dev,
tcl8.6-dev (>= 8.6.0-2)
-Standards-Version: 3.9.8
+Standards-Version: 4.0.1
Homepage: http://www.tcl.tk/
Package: tk8.6
Modified: tk8.6/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.6/trunk/debian/patches/confsearch.diff 2017-08-10 09:31:12 UTC (rev 1864)
+++ tk8.6/trunk/debian/patches/confsearch.diff 2017-08-10 09:47:29 UTC (rev 1865)
@@ -1,32 +1,25 @@
-Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5
-and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
+Patch by Sergei Golovan allows to find tclConfig.sh in /usr/lib/tcl8.6
+and tkConfig.sh in /usr/lib/tk8.6 where they are located in Debian
installation.
--- a/unix/configure
+++ b/unix/configure
@@ -1431,6 +1431,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
- `ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
-+ `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
+ `ls -d /usr/local/lib 2>/dev/null` \
++ `ls -d /usr/lib/tcl8.6 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
- ; do
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
-@@ -93,6 +93,7 @@
+@@ -224,6 +224,8 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
-+ `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
++ `ls -d /usr/lib/tcl8.6 2>/dev/null` \
++ `ls -d /usr/lib/tk8.6 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
-@@ -223,6 +224,7 @@
- `ls -d ${prefix}/lib 2>/dev/null` \
- `ls -d /usr/local/lib 2>/dev/null` \
- `ls -d /usr/contrib/lib 2>/dev/null` \
-+ `ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \
- `ls -d /usr/lib 2>/dev/null` \
- `ls -d /usr/lib64 2>/dev/null` \
- ; do
Modified: tk8.6/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.6/trunk/debian/patches/non-linux.diff 2017-08-10 09:31:12 UTC (rev 1864)
+++ tk8.6/trunk/debian/patches/non-linux.diff 2017-08-10 09:47:29 UTC (rev 1865)
@@ -3,7 +3,7 @@
--- a/unix/configure
+++ b/unix/configure
-@@ -4447,6 +4447,9 @@
+@@ -4293,6 +4293,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -15,7 +15,7 @@
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
-@@ -926,6 +926,9 @@
+@@ -925,6 +925,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
Modified: tk8.6/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.6/trunk/debian/patches/tklibrary.diff 2017-08-10 09:31:12 UTC (rev 1864)
+++ tk8.6/trunk/debian/patches/tklibrary.diff 2017-08-10 09:47:29 UTC (rev 1865)
@@ -1,6 +1,6 @@
--- a/unix/configure
+++ b/unix/configure
-@@ -11232,7 +11232,7 @@
+@@ -11057,7 +11057,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
@@ -11,7 +11,7 @@
TK_PKG_DIR='tk$(VERSION)'
--- a/unix/configure.in
+++ b/unix/configure.in
-@@ -678,7 +678,7 @@
+@@ -672,7 +672,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
Modified: tk8.6/trunk/debian/patches/xft.diff
===================================================================
--- tk8.6/trunk/debian/patches/xft.diff 2017-08-10 09:31:12 UTC (rev 1864)
+++ tk8.6/trunk/debian/patches/xft.diff 2017-08-10 09:47:29 UTC (rev 1865)
@@ -6,7 +6,7 @@
--- a/unix/configure.in
+++ b/unix/configure.in
-@@ -485,8 +485,8 @@
+@@ -479,8 +479,8 @@
XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
if test "$found_xft" = "no" ; then
found_xft=yes
@@ -19,7 +19,7 @@
dnl make sure that compiling against Xft header file doesn't bomb
--- a/unix/configure
+++ b/unix/configure
-@@ -10311,8 +10311,8 @@
+@@ -10136,8 +10136,8 @@
XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
if test "$found_xft" = "no" ; then
found_xft=yes
Modified: tk8.6/trunk/debian/rules
===================================================================
--- tk8.6/trunk/debian/rules 2017-08-10 09:31:12 UTC (rev 1864)
+++ tk8.6/trunk/debian/rules 2017-08-10 09:47:29 UTC (rev 1865)
@@ -7,6 +7,10 @@
include /usr/share/dpkg/buildflags.mk
include /usr/share/dpkg/architecture.mk
+ifeq ($(origin CC),default)
+CC = $(DEB_HOST_GNU_TYPE)-gcc
+endif
+
ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
# See bug #446335
CFLAGS += -fno-unit-at-a-time
@@ -20,6 +24,7 @@
override_dh_auto_configure:
TK_LIBRARY="/usr/share/tcltk/tk$(v)" \
+ CC="$(CC)" \
CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
TK_SHLIB_LD_EXTRAS="-Wl,-soname,\$${TK_LIB_FILE}" \
@@ -36,6 +41,7 @@
$(MAKE) -C unix
# Build the static library
cd unix && \
+ LC_ALL=C \
ar cr libtk$(v).a *.o && \
ar d libtk$(v).a tkAppInit.o && \
ranlib libtk$(v).a
@@ -117,8 +123,8 @@
dh_shlibdeps -ldebian/libtk$(v)/usr/lib/$(DEB_HOST_MULTIARCH)
get-orig-source:
- wget -O tk$(v)_$(v).6.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tk$(v).6-src.tar.gz
+ wget -O tk$(v)_$(v).7.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tk$(v).7-src.tar.gz
.PHONY: override_dh_auto_clean override_dh_auto_configure override_dh_auto_build \
override_dh_auto_install override_dh_compress override_dh_strip \
More information about the Pkg-tcltk-commits
mailing list