[Pkg-tcltk-devel] Bug#582343: setools: please rebuild against tcl 8.5 in experimental

Thu May 20 03:34:54 UTC 2010

Source: setools
Version: 3.3.6.ds-7
Severity: wishlist
Tags: patch
User: pkg-tcltk-devel at lists.alioth.debian.org
Usertags: UpgradeDefaultTclTkTo85

Hi Manoj,

To help find problems that arise before making this change for real,
it would be nice to have most packages depending on tcl-dev built
against version 8.5 in experimental.

As discussed on debian-release[1], this requires sourceful uploads to
introduce versioned build-deps on tcl-dev, tcl, et al, since
experimental buildds are a little fussy about where they get their
build-deps from[2].

I have tried rebuilding with the patch below applied and apol
seems to work correctly.  In fact, through the magic of tcl stubs[3],
the change in tcl version should not affect users much.  For example,
apol works just fine when run with tclsh versions other than the
default.

Some other changes deserve comment:

 Instead of looking for /usr/lib/tcl8.4/tclConfig.sh, use the
 default tcl version from /usr/lib/tclConfig.sh.  Without this
 change, attemps to build with tcl-dev 8.5 would fail.

 Build-depend on tcl-dev, not tcl8.4-dev | tcl-dev, to reflect
 that /usr/lib/tclConfig.sh is required.

 setools Depends on tk | wish, not tk8.4 | wish, so whichever
 version is the current default will be preferred.  Probably
 the use of tk8.4 was a remnant from when tk8.3 was the default
 version.

Please let me know if you’d like me to file separate bugs for
these.

I also included Jakub’s patch for version 3.3.6.ds-7.2, but _not_
version 3.3.6.ds-7.1, because I noticed the latter too late.

Patch is against the setools branch of debian-dir.git, intended
for experimental.  If an NMU would be simpler, please let me know
and I can send a proposed diff and look for a sponsor.

Thoughts?
Jonathan

[1] http://lists.debian.org/debian-release/2010/03/msg00303.html
[2] http://lists.debian.org/debian-devel-announce/2006/04/msg00007.html
[3] http://www.tcl.tk/doc/howto/stubs.html
http://groups.google.com/group/comp.lang.tcl/msg/9cb3066d3dbf5cc8

 changelog     |   12 ++++++++++++
 control       |    6 +++---
 local-vars.mk |    4 +---
 local.mk      |    2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/changelog b/changelog
index cf11111..5d08d3c 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,15 @@
+setools (3.3.6.ds-8) experimental; urgency=low
+
+  * Rebuild against tcl in experimental.
+  * Stop hard-coding default tcl version of 8.4 in build system.
+    Without this change, changes to the default tcl version would cause
+    build failures.
+  * Adjust setools dependency to refer to default tclsh version.
+  * Run the configure script with bash. (Closes: #581884)
+    Thanks to Jakub Wilk <jwilk at debian.org> for the patch.
+
+ -- Jonathan Nieder <jrnieder at gmail.com>  Wed, 19 May 2010 21:18:48 -0500
+
 setools (3.3.6.ds-7) unstable; urgency=low
 
   * Bug fix: "FTBFS with Python 2.6 as default", thanks to Jakub Wilk
diff --git a/control b/control
index 542ba9b..7aa4ec4 100644
--- a/control
+++ b/control
@@ -6,8 +6,8 @@ Section: admin
 Maintainer: Manoj Srivastava <srivasta at debian.org>
 Standards-Version: 3.8.4.0
 XS-Python-Version: 2.4
-Build-Depends: tcl8.4-dev (>= 8.4.9) | tcl-dev (>= 8.4.9), libcap-dev,
- tk8.4-dev (>= 8.4.9) | tk-dev (>= 8.4.9), bison, libcunit1-dev,
+Build-Depends: tcl-dev (>= 8.5), tcl (>= 8.5), libcap-dev,
+ tk-dev (>= 8.5), tk (>= 8.5), bison, libcunit1-dev,
  libgtk2.0-dev (>= 2.8), flex (>= 2.5.33-6), libglade2-dev,
  libselinux1-dev (>= 2.0.85), libtool, libsepol1-dev (>= 2.0.37),
  pkg-config, swig (>= 1.3.28), libsqlite3-dev (>= 3.2), libxml2-dev,
@@ -17,7 +17,7 @@ Build-Depends: tcl8.4-dev (>= 8.4.9) | tcl-dev (>= 8.4.9), libcap-dev,
 
 Package: setools
 Architecture: any
-Depends: ${shlibs:Depends}, tk8.4 (>= 8.4.9) | wish, bwidget (>= 1.8),
+Depends: ${shlibs:Depends}, tk (>= 8.4.9) | wish, bwidget (>= 1.8),
   libsetools-tcl (= ${binary:Version})
 Description: tools for Security Enhanced Linux policy analysis
  Security-enhanced Linux is a patch of the Linux kernel and a number
diff --git a/local-vars.mk b/local-vars.mk
index 35799bb..420c12e 100644
--- a/local-vars.mk
+++ b/local-vars.mk
@@ -115,8 +115,6 @@ else
 JAVA_CONF_OPTION:=
 endif
 
-TCLVER         =8.4 
-
 COMMA   = ,
 PY_VERSIONS    =>= 2.3
 PYDEFAULT      =$(strip $(shell pyversions -vd))
@@ -134,7 +132,7 @@ STOP_VERSION   :=$(shell perl -e '$$ARGV[0] =~ m/^(\d)\.(\d)/;$$maj=$$1;$$min=$$
 
 PDIR=$(LIBDIR)/python$(PYTHON_VERSION)
 
-confflags    = --with-tcl=$(PREFIX)/lib/tcl$(TCLVER) --with-tk=$(PREFIX)/lib/tk$(TCLVER) --with-tkinclude=$(PREFIX)/include/tcl$(TCLVER)
+confflags    = --with-tcl=$(PREFIX)/lib/ --with-tk=$(PREFIX)/lib/ --with-tkinclude=$(PREFIX)/include/tcl
 BUILD_FLAGS  = 
 
 
diff --git a/local.mk b/local.mk
index 9ae0a5b..cb996e4 100644
--- a/local.mk
+++ b/local.mk
@@ -136,7 +136,7 @@ debian/stamp/conf/setools:
 	@test -d debian/stamp/conf || mkdir -p debian/stamp/conf
 	WARNINGS=none autoreconf -f -i  --warnings=none
 	PYTHON_VERSION=$(PYTHON_VERSION)  \
-               ./configure         --verbose --prefix=$(PREFIX)  \
+	       bash ./configure    --verbose --prefix=$(PREFIX)  \
 	       --sysconfdir=/etc   --enable-dependency-tracking  \
                $(JAVA_CONF_OPTION) --enable-swig-python          \
                --enable-swig-tcl   --disable-bwidget-check       \
-- 
1.7.1




