[Pkg-tcltk-commits] r1542 - tcl8.5/branches/experimental/debian

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2014-01-10 07:57:54 +0000 (Fri, 10 Jan 2014)
New Revision: 1542

Added:
   tcl8.5/branches/experimental/debian/tcl8.5.prerm
Modified:
   tcl8.5/branches/experimental/debian/changelog
   tcl8.5/branches/experimental/debian/rules
Log:
  * Restored tcl8.5.prerm script which removes alternative for
    /usr/bin/tclsh8.5 (closes: #720143).
  * Export ac_cv_func_strtod=yes and tcl_cv_strtod_buggy=1 to help with
    cross-build (closes: #719247).


Modified: tcl8.5/branches/experimental/debian/changelog
===================================================================
--- tcl8.5/branches/experimental/debian/changelog	2013-12-18 15:31:46 UTC (rev 1541)
+++ tcl8.5/branches/experimental/debian/changelog	2014-01-10 07:57:54 UTC (rev 1542)
@@ -1,8 +1,11 @@
-tcl8.5 (8.5.15-3) UNRELEASED; urgency=low
+tcl8.5 (8.5.15-3) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * Restored tcl8.5.prerm script which removes alternative for
+    /usr/bin/tclsh8.5 (closes: #720143).
+  * Export ac_cv_func_strtod=yes and tcl_cv_strtod_buggy=1 to help with
+    cross-build (closes: #719247).
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 12 Oct 2013 10:23:46 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 10 Jan 2014 11:45:08 +0400
 
 tcl8.5 (8.5.15-2) experimental; urgency=low
 

Modified: tcl8.5/branches/experimental/debian/rules
===================================================================
--- tcl8.5/branches/experimental/debian/rules	2013-12-18 15:31:46 UTC (rev 1541)
+++ tcl8.5/branches/experimental/debian/rules	2014-01-10 07:57:54 UTC (rev 1542)
@@ -7,8 +7,10 @@
 include /usr/share/dpkg/buildflags.mk
 include /usr/share/dpkg/architecture.mk
 
-LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
-export LDFLAGS
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+       export ac_cv_func_strtod=yes
+       export tcl_cv_strtod_buggy=1
+endif
 
 ifeq (, $(findstring debug, $(DEB_BUILD_OPTIONS)))
 # See bug #446335 for -fno-unit-at-a-time

Added: tcl8.5/branches/experimental/debian/tcl8.5.prerm
===================================================================
--- tcl8.5/branches/experimental/debian/tcl8.5.prerm	                        (rev 0)
+++ tcl8.5/branches/experimental/debian/tcl8.5.prerm	2014-01-10 07:57:54 UTC (rev 1542)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ $1 != "upgrade" ] ; then
+    update-alternatives --remove tclsh /usr/bin/tclsh8.5
+fi
+
+#DEBHELPER#