[Pkg-tcltk-commits] r1546 - tk8.5/branches/experimental/debian

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2014-01-10 08:14:09 +0000 (Fri, 10 Jan 2014)
New Revision: 1546

Added:
   tk8.5/branches/experimental/debian/tk8.5.prerm
Modified:
   tk8.5/branches/experimental/debian/changelog
   tk8.5/branches/experimental/debian/control
   tk8.5/branches/experimental/debian/rules
Log:
[tk8.5-experimental]
  * Fixed version in replacing tk8.5 by tk8.5-doc due to moving demos
    (closes: #722940).
  * Restored tk8.5 prerm script which removes alternative for /usr/bin/wish
    (closes: #720143).
  * Export ac_cv_func_strtod=yes and tcl_cv_strtod_buggy=1 to help with
    cross-build (closes: #695444).
  * Added ${misc:Depends} substvar for libtcl8.5-dbg package.
  * Bumped standards version to 3.9.4.


Modified: tk8.5/branches/experimental/debian/changelog
===================================================================
--- tk8.5/branches/experimental/debian/changelog	2014-01-10 08:12:43 UTC (rev 1545)
+++ tk8.5/branches/experimental/debian/changelog	2014-01-10 08:14:09 UTC (rev 1546)
@@ -1,8 +1,15 @@
-tk8.5 (8.5.15-3) UNRELEASED; urgency=low
+tk8.5 (8.5.15-3) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * Fixed version in replacing tk8.5 by tk8.5-doc due to moving demos
+    (closes: #722940).
+  * Restored tk8.5 prerm script which removes alternative for /usr/bin/wish
+    (closes: #720143).
+  * Export ac_cv_func_strtod=yes and tcl_cv_strtod_buggy=1 to help with
+    cross-build (closes: #695444).
+  * Added ${misc:Depends} substvar for libtcl8.5-dbg package.
+  * Bumped standards version to 3.9.4.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 12 Oct 2013 22:02:57 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 10 Jan 2014 11:55:22 +0400
 
 tk8.5 (8.5.15-2) experimental; urgency=low
 

Modified: tk8.5/branches/experimental/debian/control
===================================================================
--- tk8.5/branches/experimental/debian/control	2014-01-10 08:12:43 UTC (rev 1545)
+++ tk8.5/branches/experimental/debian/control	2014-01-10 08:14:09 UTC (rev 1546)
@@ -5,7 +5,7 @@
 Uploaders: Sergei Golovan <sgolovan at debian.org>
 Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), x11proto-core-dev,
  libx11-dev, libxss-dev, libxext-dev, libxft-dev, tcl8.5-dev (>= 8.5.14-3)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://www.tcl.tk/
 
 Package: tk8.5
@@ -43,7 +43,7 @@
 Priority: extra
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libtk8.5 (= ${binary:Version})
+Depends: libtk8.5 (= ${binary:Version}), ${misc:Depends}
 Multi-Arch: same
 Description: Symbol files for libtk8.5
  Tk is a cross-platform graphical toolkit which provides the Motif
@@ -74,8 +74,8 @@
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: tk8.5
-Conflicts: tkdoc, tk8.3-doc, tk8.4-doc, tk8.5 (<< 8.5.14-2)
-Replaces: tk8.5 (<< 8.5.14-2)
+Conflicts: tkdoc, tk8.3-doc, tk8.4-doc, tk8.5 (<< 8.5.14-3~)
+Replaces: tk8.5 (<< 8.5.14-3~)
 Provides: tkdoc
 Description: Tk toolkit for Tcl and X11, v8.5 - manual pages
  Tk is a cross-platform graphical toolkit which provides the Motif

Modified: tk8.5/branches/experimental/debian/rules
===================================================================
--- tk8.5/branches/experimental/debian/rules	2014-01-10 08:12:43 UTC (rev 1545)
+++ tk8.5/branches/experimental/debian/rules	2014-01-10 08:14:09 UTC (rev 1546)
@@ -7,6 +7,11 @@
 include /usr/share/dpkg/buildflags.mk
 include /usr/share/dpkg/architecture.mk
 
+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
 CFLAGS += -fno-unit-at-a-time

Added: tk8.5/branches/experimental/debian/tk8.5.prerm
===================================================================
--- tk8.5/branches/experimental/debian/tk8.5.prerm	                        (rev 0)
+++ tk8.5/branches/experimental/debian/tk8.5.prerm	2014-01-10 08:14:09 UTC (rev 1546)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ $1 != "upgrade" ] ; then
+    update-alternatives --remove wish /usr/bin/wish8.5
+fi
+
+#DEBHELPER#