[Pkg-tcltk-commits] r1316 - in tcl8.6/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Wed Dec 19 18:31:36 UTC 2012
Author: sgolovan
Date: 2012-12-19 18:31:35 +0000 (Wed, 19 Dec 2012)
New Revision: 1316
Modified:
tcl8.6/trunk/debian/changelog
tcl8.6/trunk/debian/patches/confsearch.diff
tcl8.6/trunk/debian/patches/manpages.diff
tcl8.6/trunk/debian/patches/non-linux.diff
tcl8.6/trunk/debian/patches/rpath.diff
tcl8.6/trunk/debian/patches/tcllibrary.diff
tcl8.6/trunk/debian/patches/tclpackagepath.diff
tcl8.6/trunk/debian/patches/tclport.diff
tcl8.6/trunk/debian/rules
Log:
[tcl8.6]
* New upstream release.
Modified: tcl8.6/trunk/debian/changelog
===================================================================
--- tcl8.6/trunk/debian/changelog 2012-12-16 18:31:20 UTC (rev 1315)
+++ tcl8.6/trunk/debian/changelog 2012-12-19 18:31:35 UTC (rev 1316)
@@ -1,8 +1,8 @@
-tcl8.6 (8.6.0~b3-2) UNRELEASED; urgency=low
+tcl8.6 (8.6.0-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
- -- Sergei Golovan <sgolovan at debian.org> Thu, 20 Sep 2012 09:08:57 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 19 Dec 2012 22:19:28 +0400
tcl8.6 (8.6.0~b3-1) experimental; urgency=low
Modified: tcl8.6/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.6/trunk/debian/patches/confsearch.diff 2012-12-16 18:31:20 UTC (rev 1315)
+++ tcl8.6/trunk/debian/patches/confsearch.diff 2012-12-19 18:31:35 UTC (rev 1316)
@@ -2,8 +2,8 @@
and tkConfig.sh in /usr/lib/tk8.6 where they are located in Debian
installation.
---- tcl8.6-8.6.0~b3.orig/unix/tcl.m4
-+++ tcl8.6-8.6.0~b3/unix/tcl.m4
+--- tcl8.6-8.6.0.orig/unix/tcl.m4
++++ tcl8.6-8.6.0/unix/tcl.m4
@@ -93,6 +93,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
Modified: tcl8.6/trunk/debian/patches/manpages.diff
===================================================================
--- tcl8.6/trunk/debian/patches/manpages.diff 2012-12-16 18:31:20 UTC (rev 1315)
+++ tcl8.6/trunk/debian/patches/manpages.diff 2012-12-19 18:31:35 UTC (rev 1316)
@@ -2,8 +2,8 @@
aren't installed by upstream script but are referenced inside other
manual pages.
---- tcl8.6-8.6.0~b3.orig/unix/installManPage
-+++ tcl8.6-8.6.0~b3/unix/installManPage
+--- tcl8.6-8.6.0.orig/unix/installManPage
++++ tcl8.6-8.6.0/unix/installManPage
@@ -92,12 +92,20 @@
exit 2 ;;
esac
Modified: tcl8.6/trunk/debian/patches/non-linux.diff
===================================================================
--- tcl8.6/trunk/debian/patches/non-linux.diff 2012-12-16 18:31:20 UTC (rev 1315)
+++ tcl8.6/trunk/debian/patches/non-linux.diff 2012-12-19 18:31:35 UTC (rev 1316)
@@ -1,8 +1,8 @@
Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
building on non-linux Debian architectures.
---- tcl8.6-8.6.0~b3.orig/unix/configure
-+++ tcl8.6-8.6.0~b3/unix/configure
+--- tcl8.6-8.6.0.orig/unix/configure
++++ tcl8.6-8.6.0/unix/configure
@@ -6665,6 +6665,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -22,8 +22,8 @@
SHLIB_CFLAGS="-fPIC"
SHLIB_SUFFIX=".so"
---- tcl8.6-8.6.0~b3.orig/unix/Makefile.in
-+++ tcl8.6-8.6.0~b3/unix/Makefile.in
+--- tcl8.6-8.6.0.orig/unix/Makefile.in
++++ tcl8.6-8.6.0/unix/Makefile.in
@@ -179,6 +179,7 @@
SHLIB_LD = @SHLIB_LD@
SHLIB_CFLAGS = @SHLIB_CFLAGS@ -DBUILD_tcl
@@ -32,8 +32,8 @@
TCL_SHLIB_LD_EXTRAS = @TCL_SHLIB_LD_EXTRAS@
SHLIB_SUFFIX = @SHLIB_SUFFIX@
---- tcl8.6-8.6.0~b3.orig/unix/tcl.m4
-+++ tcl8.6-8.6.0~b3/unix/tcl.m4
+--- tcl8.6-8.6.0.orig/unix/tcl.m4
++++ tcl8.6-8.6.0/unix/tcl.m4
@@ -924,6 +924,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
Modified: tcl8.6/trunk/debian/patches/rpath.diff
===================================================================
--- tcl8.6/trunk/debian/patches/rpath.diff 2012-12-16 18:31:20 UTC (rev 1315)
+++ tcl8.6/trunk/debian/patches/rpath.diff 2012-12-19 18:31:35 UTC (rev 1316)
@@ -1,8 +1,8 @@
Patch by Chris Waters removes -rpath from search flags and adds -soname
to library build options.
---- tcl8.6-8.6.0~b3.orig/unix/configure
-+++ tcl8.6-8.6.0~b3/unix/configure
+--- tcl8.6-8.6.0.orig/unix/configure
++++ tcl8.6-8.6.0/unix/configure
@@ -7587,6 +7587,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -13,8 +13,8 @@
SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
---- tcl8.6-8.6.0~b3.orig/unix/Makefile.in
-+++ tcl8.6-8.6.0~b3/unix/Makefile.in
+--- tcl8.6-8.6.0.orig/unix/Makefile.in
++++ tcl8.6-8.6.0/unix/Makefile.in
@@ -794,7 +794,10 @@
fi
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
@@ -27,8 +27,8 @@
@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
---- tcl8.6-8.6.0~b3.orig/unix/tcl.m4
-+++ tcl8.6-8.6.0~b3/unix/tcl.m4
+--- tcl8.6-8.6.0.orig/unix/tcl.m4
++++ tcl8.6-8.6.0/unix/tcl.m4
@@ -1410,6 +1410,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
Modified: tcl8.6/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tcllibrary.diff 2012-12-16 18:31:20 UTC (rev 1315)
+++ tcl8.6/trunk/debian/patches/tcllibrary.diff 2012-12-19 18:31:35 UTC (rev 1316)
@@ -1,5 +1,5 @@
---- tcl8.6-8.6.0~b3.orig/unix/configure
-+++ tcl8.6-8.6.0~b3/unix/configure
+--- tcl8.6-8.6.0.orig/unix/configure
++++ tcl8.6-8.6.0/unix/configure
@@ -19348,7 +19348,7 @@
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -9,8 +9,8 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
---- tcl8.6-8.6.0~b3.orig/unix/configure.in
-+++ tcl8.6-8.6.0~b3/unix/configure.in
+--- tcl8.6-8.6.0.orig/unix/configure.in
++++ tcl8.6-8.6.0/unix/configure.in
@@ -790,7 +790,7 @@
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -20,8 +20,8 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
---- tcl8.6-8.6.0~b3.orig/library/init.tcl
-+++ tcl8.6-8.6.0~b3/library/init.tcl
+--- tcl8.6-8.6.0.orig/library/init.tcl
++++ tcl8.6-8.6.0/library/init.tcl
@@ -46,7 +46,7 @@
}
namespace eval tcl {
Modified: tcl8.6/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tclpackagepath.diff 2012-12-16 18:31:20 UTC (rev 1315)
+++ tcl8.6/trunk/debian/patches/tclpackagepath.diff 2012-12-19 18:31:35 UTC (rev 1316)
@@ -2,8 +2,8 @@
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.6-8.6.0~b3.orig/unix/configure
-+++ tcl8.6-8.6.0~b3/unix/configure
+--- tcl8.6-8.6.0.orig/unix/configure
++++ tcl8.6-8.6.0/unix/configure
@@ -19479,9 +19479,9 @@
test -z "$TCL_MODULE_PATH" && \
TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
@@ -16,8 +16,8 @@
fi
#--------------------------------------------------------------------
---- tcl8.6-8.6.0~b3.orig/unix/configure.in
-+++ tcl8.6-8.6.0~b3/unix/configure.in
+--- tcl8.6-8.6.0.orig/unix/configure.in
++++ tcl8.6-8.6.0/unix/configure.in
@@ -883,9 +883,9 @@
test -z "$TCL_MODULE_PATH" && \
TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
Modified: tcl8.6/trunk/debian/patches/tclport.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tclport.diff 2012-12-16 18:31:20 UTC (rev 1315)
+++ tcl8.6/trunk/debian/patches/tclport.diff 2012-12-19 18:31:35 UTC (rev 1316)
@@ -1,8 +1,8 @@
Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488491
---- tcl8.6-8.6.0~b3.orig/generic/tclPort.h
-+++ tcl8.6-8.6.0~b3/generic/tclPort.h
+--- tcl8.6-8.6.0.orig/generic/tclPort.h
++++ tcl8.6-8.6.0/generic/tclPort.h
@@ -22,7 +22,7 @@
#endif
#include "tcl.h"
Modified: tcl8.6/trunk/debian/rules
===================================================================
--- tcl8.6/trunk/debian/rules 2012-12-16 18:31:20 UTC (rev 1315)
+++ tcl8.6/trunk/debian/rules 2012-12-19 18:31:35 UTC (rev 1316)
@@ -77,7 +77,6 @@
cp compat/*.h $(DIR)/usr/include/tcl$(v)/tcl-private/compat
install -d $(DIR)/usr/include/tcl$(v)/tcl-private/libtommath
cp libtommath/*.h $(DIR)/usr/include/tcl$(v)/tcl-private/libtommath
- -rm $(DIR)/usr/include/tcl$(v)/tdbc*.h
#
# Fix up the manpages.
cd $(DIR)/usr/share/man/man1 && \
@@ -106,14 +105,14 @@
done
override_dh_makeshlibs:
- dh_makeshlibs -a -V 'tcl$(v) (>= 8.6.0~b1)' -XTcltest
+ dh_makeshlibs -a -V 'tcl$(v) (>= $(v).0)' -XTcltest
override_dh_shlibdeps:
dh_shlibdeps -a -ldebian/tcl$(v)/usr/lib
get-orig-source:
- wget -O tcl8.6_8.6.0~b3.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tcl8.6b3-src.tar.gz
+ wget -O tcl$(v)_$(v).0.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tcl-core$(v).0-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