[Pkg-tcltk-commits] r1356 - in tcl8.4/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Mon Jun 24 11:37:08 UTC 2013
Author: sgolovan
Date: 2013-06-24 11:37:07 +0000 (Mon, 24 Jun 2013)
New Revision: 1356
Modified:
tcl8.4/trunk/debian/changelog
tcl8.4/trunk/debian/control
tcl8.4/trunk/debian/patches/manpages.diff
tcl8.4/trunk/debian/patches/non-linux.diff
tcl8.4/trunk/debian/patches/rpath.diff
tcl8.4/trunk/debian/patches/tclinc.diff
tcl8.4/trunk/debian/patches/tcllibrary.diff
tcl8.4/trunk/debian/patches/tclpackagepath.diff
tcl8.4/trunk/debian/rules
Log:
[tcl8.4]
* New upstream release.
* Refreshed patches.
* Pass CC to compiler and set ac_cv variables, to allow cross builds
(closes: #597708)
* Bumped standards version to 3.9.4.
Modified: tcl8.4/trunk/debian/changelog
===================================================================
--- tcl8.4/trunk/debian/changelog 2013-06-20 17:02:00 UTC (rev 1355)
+++ tcl8.4/trunk/debian/changelog 2013-06-24 11:37:07 UTC (rev 1356)
@@ -1,8 +1,12 @@
-tcl8.4 (8.4.19-6) UNRELEASED; urgency=low
+tcl8.4 (8.4.20-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Refreshed patches.
+ * Pass CC to compiler and set ac_cv variables, to allow cross builds
+ (closes: #597708)
+ * Bumped standards version to 3.9.4.
- -- Sergei Golovan <sgolovan at debian.org> Mon, 28 May 2012 16:48:54 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 24 Jun 2013 15:34:57 +0400
tcl8.4 (8.4.19-5) unstable; urgency=low
Modified: tcl8.4/trunk/debian/control
===================================================================
--- tcl8.4/trunk/debian/control 2013-06-20 17:02:00 UTC (rev 1355)
+++ tcl8.4/trunk/debian/control 2013-06-24 11:37:07 UTC (rev 1356)
@@ -4,7 +4,7 @@
Maintainer: Debian Tcl/Tk Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
Uploaders: Sergei Golovan <sgolovan at debian.org>
Build-Depends: debhelper (>= 8.0.0), dpkg-dev (>= 1.16.1~)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tcl.tk/
Package: tcl8.4
Modified: tcl8.4/trunk/debian/patches/manpages.diff
===================================================================
--- tcl8.4/trunk/debian/patches/manpages.diff 2013-06-20 17:02:00 UTC (rev 1355)
+++ tcl8.4/trunk/debian/patches/manpages.diff 2013-06-24 11:37:07 UTC (rev 1356)
@@ -2,8 +2,8 @@
aren't installed by upstream script but are referenced inside other
manual pages.
---- tcl8.4-8.4.19.orig/unix/installManPage
-+++ tcl8.4-8.4.19/unix/installManPage
+--- tcl8.4-8.4.20.orig/unix/installManPage
++++ tcl8.4-8.4.20/unix/installManPage
@@ -49,7 +49,16 @@
}' $MANPAGE`
Modified: tcl8.4/trunk/debian/patches/non-linux.diff
===================================================================
--- tcl8.4/trunk/debian/patches/non-linux.diff 2013-06-20 17:02:00 UTC (rev 1355)
+++ tcl8.4/trunk/debian/patches/non-linux.diff 2013-06-24 11:37:07 UTC (rev 1356)
@@ -1,9 +1,9 @@
Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
building on non-linux Debian architectures.
---- tcl8.4-8.4.19.orig/unix/configure
-+++ tcl8.4-8.4.19/unix/configure
-@@ -2506,6 +2506,9 @@
+--- tcl8.4-8.4.20.orig/unix/configure
++++ tcl8.4-8.4.20/unix/configure
+@@ -2523,6 +2523,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -13,18 +13,9 @@
fi
fi
-@@ -3061,7 +3064,7 @@
- fi
- fi
- ;;
-- Linux*)
-+ Linux*|GNU*|NetBSD-Debian)
- SHLIB_CFLAGS="-fPIC"
- SHLIB_LD_LIBS='${LIBS}'
- SHLIB_SUFFIX=".so"
---- tcl8.4-8.4.19.orig/unix/tcl.m4
-+++ tcl8.4-8.4.19/unix/tcl.m4
-@@ -898,6 +898,9 @@
+--- tcl8.4-8.4.20.orig/unix/tcl.m4
++++ tcl8.4-8.4.20/unix/tcl.m4
+@@ -916,6 +916,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -34,12 +25,3 @@
fi
fi
])
-@@ -1335,7 +1338,7 @@
- fi
- fi
- ;;
-- Linux*)
-+ Linux*|GNU*|NetBSD-Debian)
- SHLIB_CFLAGS="-fPIC"
- SHLIB_LD_LIBS='${LIBS}'
- SHLIB_SUFFIX=".so"
Modified: tcl8.4/trunk/debian/patches/rpath.diff
===================================================================
--- tcl8.4/trunk/debian/patches/rpath.diff 2013-06-20 17:02:00 UTC (rev 1355)
+++ tcl8.4/trunk/debian/patches/rpath.diff 2013-06-24 11:37:07 UTC (rev 1356)
@@ -1,9 +1,11 @@
-Patch by Chris Waters removes -rpath from search flags and adds -soname
-to library build options.
+Author: Chris Waters
+Description: Patch adds -soname to library build options because of added
+ zero version to the library name.
+Last-Modified: Mon, 24 Jun 2013 15:28:04 +0400
---- tcl8.4-8.4.19.orig/unix/configure
-+++ tcl8.4-8.4.19/unix/configure
-@@ -3072,12 +3072,15 @@
+--- tcl8.4-8.4.20.orig/unix/configure
++++ tcl8.4-8.4.20/unix/configure
+@@ -3072,6 +3072,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -13,16 +15,9 @@
if test "$have_dl" = yes; then
SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
-- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-+ CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- else
- ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
---- tcl8.4-8.4.19.orig/unix/tcl.m4
-+++ tcl8.4-8.4.19/unix/tcl.m4
-@@ -1346,12 +1346,15 @@
+--- tcl8.4-8.4.20.orig/unix/tcl.m4
++++ tcl8.4-8.4.20/unix/tcl.m4
+@@ -1346,6 +1346,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -32,10 +27,3 @@
if test "$have_dl" = yes; then
SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
-- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-+ CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- else
- AC_CHECK_HEADER(dld.h, [
Modified: tcl8.4/trunk/debian/patches/tclinc.diff
===================================================================
--- tcl8.4/trunk/debian/patches/tclinc.diff 2013-06-20 17:02:00 UTC (rev 1355)
+++ tcl8.4/trunk/debian/patches/tclinc.diff 2013-06-24 11:37:07 UTC (rev 1356)
@@ -7,27 +7,27 @@
Also, it allows to find tclConfig.sh in /usr/share/tcltk/tcl8.4 and tkConfig.sh
in /usr/share/tcltk/tk8.4 where they are located in Debian installation.
---- tcl8.4-8.4.19.orig/unix/tcl.m4
-+++ tcl8.4-8.4.19/unix/tcl.m4
-@@ -83,6 +83,7 @@
+--- tcl8.4-8.4.20.orig/unix/tcl.m4
++++ tcl8.4-8.4.20/unix/tcl.m4
+@@ -90,6 +90,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.4 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
; do
- if test -f "$i/tclConfig.sh" ; then
-@@ -203,6 +204,7 @@
+@@ -217,6 +218,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.4 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
; do
- if test -f "$i/tkConfig.sh" ; then
---- tcl8.4-8.4.19.orig/unix/tclConfig.sh.in
-+++ tcl8.4-8.4.19/unix/tclConfig.sh.in
-@@ -111,7 +111,7 @@
+--- tcl8.4-8.4.20.orig/unix/tclConfig.sh.in
++++ tcl8.4-8.4.20/unix/tclConfig.sh.in
+@@ -109,7 +109,7 @@
# String to pass to linker to pick up the Tcl library from its
# build directory.
@@ -36,7 +36,7 @@
# String to pass to linker to pick up the Tcl library from its
# installed directory.
-@@ -146,7 +146,7 @@
+@@ -144,7 +144,7 @@
# different place than the directory containing the source files, this
# points to the location of the sources, not the location where Tcl was
# compiled.
@@ -45,7 +45,7 @@
# List of standard directories in which to look for packages during
# "package require" commands. Contains the "prefix" directory plus also
-@@ -164,14 +164,14 @@
+@@ -162,14 +162,14 @@
# String to pass to linker to pick up the Tcl stub library from its
# build directory.
Modified: tcl8.4/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.4/trunk/debian/patches/tcllibrary.diff 2013-06-20 17:02:00 UTC (rev 1355)
+++ tcl8.4/trunk/debian/patches/tcllibrary.diff 2013-06-24 11:37:07 UTC (rev 1356)
@@ -1,6 +1,6 @@
---- tcl8.4-8.4.19.orig/unix/configure
-+++ tcl8.4-8.4.19/unix/configure
-@@ -9150,7 +9150,7 @@
+--- tcl8.4-8.4.20.orig/unix/configure
++++ tcl8.4-8.4.20/unix/configure
+@@ -9185,7 +9185,7 @@
DBGX='${TCL_DBGX}'
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -9,9 +9,9 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
---- tcl8.4-8.4.19.orig/unix/configure.in
-+++ tcl8.4-8.4.19/unix/configure.in
-@@ -570,7 +570,7 @@
+--- tcl8.4-8.4.20.orig/unix/configure.in
++++ tcl8.4-8.4.20/unix/configure.in
+@@ -594,7 +594,7 @@
DBGX='${TCL_DBGX}'
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -20,9 +20,9 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
---- tcl8.4-8.4.19.orig/library/init.tcl
-+++ tcl8.4-8.4.19/library/init.tcl
-@@ -49,7 +49,7 @@
+--- tcl8.4-8.4.20.orig/library/init.tcl
++++ tcl8.4-8.4.20/library/init.tcl
+@@ -46,7 +46,7 @@
namespace eval tcl {
variable Dir
if {[info library] ne ""} {
Modified: tcl8.4/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.4/trunk/debian/patches/tclpackagepath.diff 2013-06-20 17:02:00 UTC (rev 1355)
+++ tcl8.4/trunk/debian/patches/tclpackagepath.diff 2013-06-24 11:37:07 UTC (rev 1356)
@@ -2,9 +2,9 @@
without adding /usr/lib to it. It helps to put the policy compliant value to
::tcl_pkgPath variable and to TCL_PACKAGE_PATH variable in tclConfig.sh.
---- tcl8.4-8.4.19.orig/unix/configure
-+++ tcl8.4-8.4.19/unix/configure
-@@ -9281,9 +9281,9 @@
+--- tcl8.4-8.4.20.orig/unix/configure
++++ tcl8.4-8.4.20/unix/configure
+@@ -9316,9 +9316,9 @@
test -z "$TCL_PACKAGE_PATH" && \
TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
elif test "$prefix" != "$exec_prefix"; then
@@ -16,9 +16,9 @@
fi
#--------------------------------------------------------------------
---- tcl8.4-8.4.19.orig/unix/configure.in
-+++ tcl8.4-8.4.19/unix/configure.in
-@@ -670,9 +670,9 @@
+--- tcl8.4-8.4.20.orig/unix/configure.in
++++ tcl8.4-8.4.20/unix/configure.in
+@@ -694,9 +694,9 @@
test -z "$TCL_PACKAGE_PATH" && \
TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
elif test "$prefix" != "$exec_prefix"; then
Modified: tcl8.4/trunk/debian/rules
===================================================================
--- tcl8.4/trunk/debian/rules 2013-06-20 17:02:00 UTC (rev 1355)
+++ tcl8.4/trunk/debian/rules 2013-06-24 11:37:07 UTC (rev 1356)
@@ -20,6 +20,9 @@
override_dh_auto_configure:
# So so ugly but it works...
touch generic/tclStubInit.c
+ CC=$(DEB_HOST_GNU_TYPE)-gcc \
+ ac_cv_func_strtod=yes \
+ tcl_cv_strtod_buggy=1 \
TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" \
TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk /usr/lib" \
CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
@@ -27,6 +30,7 @@
--includedir=/usr/include/tcl$(v) \
--enable-shared \
--enable-threads \
+ --disable-rpath \
--enable-man-symlinks \
--enable-man-compression=gzip
@@ -88,14 +92,13 @@
done
override_dh_makeshlibs:
- dh_makeshlibs -V 'tcl$(v) (>= 8.4.16)' -XTcltest
+ dh_makeshlibs -V 'tcl$(v) (>= $(v).16)' -XTcltest
override_dh_shlibdeps:
dh_shlibdeps -ldebian/tcl$(v)/usr/lib
get-orig-source:
- wget -O tcl8.4_8.4.19.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tcl8.4.19-src.tar.gz
+ wget -O tcl$(v)_$(v).20.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tcl$(v).20-src.tar.gz
.PHONY: override_dh_auto_configure override_dh_auto_install override_dh_makeshlibs override_dh_shlibdeps get-orig-source
-
More information about the Pkg-tcltk-commits
mailing list