[Pkg-tcltk-devel] Bug#582217: xapian-bindings: please rebuild against tcl 8.5 in experimental

[Jonathan Nieder]

Source: xapian-bindings
Version: 1.2.0-3
Severity: wishlist
Tags: patch
User: pkg-tcltk-devel at alioth.debian.org
Usertags: UpgradeDefaultTclTkTo85

Hi Olly,

In squeeze, hopefully the default version of tcl will be 8.5.  To find
problems that might prevent that, it would be nice to rebuild all
relevant packages against the updated tcltk-defaults in experimental.
As discussed on debian-release[1], this requires sourceful uploads.

I just tried rebuilding version 1.2.0-3 with the patch below applied
and did not run into any problems.

One change in the patch requires extra explanation:

 -TCLSH=/usr/bin/tclsh
 +TCLSH=/usr/bin/tclsh-default

Without this change, if tcl8.6 is installed and we try building
against tcl8.4-dev, say, then the build will fail.  I can file this
as a separate bug if you’d like.

Patch is against the source from experimental.  If an NMU would be
simpler, please let me know and I can try to arrange it.

Regards,
Jonathan

[1] http://lists.debian.org/debian-release/2010/03/msg00303.html

 debian/changelog |    6 ++++++
 debian/codename  |    1 +
 debian/control   |    2 +-
 debian/rules     |    6 +++++-
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 debian/codename

diff --git a/debian/changelog b/debian/changelog
index 52802b3..5b94899 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xapian-bindings (1.2.0-4) experimental; urgency=low
+
+  * Rebuild against tcl-dev from experimental.
+
+ -- Jonathan Nieder <jrnieder at gmail.com>  Wed, 19 May 2010 02:31:35 -0500
+
 xapian-bindings (1.2.0-3) experimental; urgency=low
 
   * Removing the call to autoreconf means we need libxapian-dev >= 1.2.0-2.
diff --git a/debian/codename b/debian/codename
new file mode 100644
index 0000000..9839eb2
--- /dev/null
+++ b/debian/codename
@@ -0,0 +1 @@
+experimental
diff --git a/debian/control b/debian/control
index 05ced12..20cc23e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Olly Betts <olly at survex.com>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 7), python, python-central (>= 0.4.10), python-all-dev,   tcl-dev, ruby1.8-dev, ruby1.9.1-dev, ruby1.8, ruby1.9.1, libxapian-dev (>= 1.2.0), libxapian-dev (<< 1.3.0), autotools-dev, libxapian-dev (>= 1.2.0-2~)
+Build-Depends: debhelper (>= 7), python, python-central (>= 0.4.10), python-all-dev,   tcl-dev (>= 8.5), tcl (>= 8.5), ruby1.8-dev, ruby1.9.1-dev, ruby1.8, ruby1.9.1, libxapian-dev (>= 1.2.0), libxapian-dev (<< 1.3.0), autotools-dev, libxapian-dev (>= 1.2.0-2~)
 XS-Python-Version: all
 Homepage: http://xapian.org/
 Vcs-Browser: http://trac.xapian.org/browser/trunk/xapian-bindings
diff --git a/debian/rules b/debian/rules
index 3dcea1b..048330c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,8 +100,12 @@ BUILD_DEPS += $(PHP_VERSIONS:%=php%-cli,)
 #
 # lenny/hardy onwards have a "tcl-dev" dummy package which pulls in the package
 # for the current preferred version.
+ifeq ($(CODENAME), experimental)
+BUILD_DEPS += tcl-dev (>= 8.5), tcl (>= 8.5),
+else
 BUILD_DEPS += tcl-dev,# NB Trailing ',' required here!
+endif
-TCLSH=/usr/bin/tclsh
+TCLSH=/usr/bin/tclsh-default
 
 # Build depends for Ruby.
 #
-- 
1.7.1