Your message dated Sat, 05 Apr 2025 11:08:43 +0000
with message-id <[email protected]>
and subject line Bug#1101146: fixed in tdom 0.9.5.1-3
has caused the Debian Bug report #1101146,
regarding tdom: Consider enabling build for Tcl 9.0
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1101146: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1101146
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: tdom
Version: 0.9.5.1-2
Severity: normal
Tags: patch
Dear Maintainer,
Please, consider enabling build of tDom for Tcl 9.0 which is already
in unstable and testing, so the more extensions support Tcl 9.0 the
better.
I've created a branch on salsa:
https://salsa.debian.org/tcltk-team/tdom/-/tree/tcl9?ref_type=heads
The main change is in debian/rules: code which configures/builds all
three extensions is now wrapped by a loop on Tcl versions (9.0 and 8.6).
Actual build happens in debian/9.0 and debian/8.6 subdirectories.
It's worth menitioning that one test fails for tDom under Tcl 9 for me:
parsing of a very long string fails with an out of memory error (this
test doesn't run for Tcl 8.6). I guess it's not too bad to allow tDom
with this failed test to the Debian archive, but it definitely needs
to be investigated.
Also, I did not adapt the autopkgtest code to Tcl 9 yet.
For convenience, I've attached the diff between the current
debian/latest and tcl9 branches here.
-- System Information:
Debian Release: 12.10
APT prefers stable-security
APT policy: (500, 'stable-security'), (500, 'proposed-updates'), (500,
'stable'), (1, 'experimental'), (1, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.12.9+bpo-amd64 (SMP w/24 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE,
TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
-- no debconf information
diff --git a/debian/changelog b/debian/changelog
index 60d37f7..60a9d0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ tdom (0.9.5.1-3) UNRELEASED; urgency=medium
[ Hector Romojaro ]
* Remove build-stamp and debian/rules cleanup
+ [ Sergei Golovan ]
+ * Build two sets of libraries, one for Tcl 8.6 and another for Tcl 9.0.
+
-- Hector Romojaro <[email protected]> Fri, 28 Feb 2025 15:08:48
+0100
tdom (0.9.5.1-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index e3d3168..8e394b1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: Tcl/Tk Debian Packagers <[email protected]>
Uploaders: Hector Romojaro <[email protected]>, Stefan Sobernig
<[email protected]>
-Build-Depends: debhelper (>= 13), tcl-dev, libexpat1-dev, libgumbo-dev,
pkgconf, debhelper-compat (= 13)
+Build-Depends: debhelper (>= 13), tcl-dev, tcl8.6-dev, tcl9.0-dev,
libexpat1-dev, libgumbo-dev, pkgconf, debhelper-compat (= 13)
Rules-Requires-Root: no
Standards-Version: 4.7.2
Homepage: http://tdom.org/
@@ -14,6 +14,7 @@ Package: tdom
Architecture: any
Multi-Arch: same
Depends: ${tclsh:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: tcl-tdom (= ${binary:Version}), tcl8.6-tdom (= ${binary:Version}),
tcl9.0-tdom (= ${binary:Version})
Description: fast XML/DOM/XPath/XSLT/HTML/JSON extension for Tcl written in C
tDOM takes advantage of Expat, the XML parser from James Clark,
including namespace and DTD support. It includes a modified version
diff --git a/debian/rules b/debian/rules
index fe976f3..a580c4a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
#export DH_VERBOSE=1
#export DH_OPTIONS=-v
+TCLVERSIONS = 9.0 8.6
+
# Hardening
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -25,70 +27,102 @@ DEV=$(CURDIR)/debian/tdom-dev
ARCH_DEPENDENT=$(CURDIR)/debian/tdom/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
STUB_LIBDIR=/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/tdom$(VERSION)
+override_dh_autoreconf:
+ [ -f configure.backup ] || cp configure configure.backup
+ dh_autoreconf
+
override_dh_auto_configure:
+ for v in $(TCLVERSIONS) ; do \
+ mkdir -p debian/$$v ; \
+ done
#
- # Configure tDOM
+ # Configure tDOM"
#
- ( cd unix ; ../configure --host=$(DEB_HOST_GNU_TYPE) \
+ for v in $(TCLVERSIONS) ; do \
+ mkdir -p debian/$$v/unix ; \
+ ( cd debian/$$v/unix ; \
+ ../../../configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=$(CURDIR)/debian/tdom/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/ \
+ --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$$v \
--libdir=\$${prefix}/lib/tcltk/$(DEB_HOST_MULTIARCH) \
--enable-threads \
--includedir=$(DEV)/usr/include/tdom \
--with-expat=/usr \
- --enable-html5 )
+ --enable-html5 ) ; \
+ done
#
# Configure tnc extension
#
- ( cd extensions/tnc ; ./configure \
+ for v in $(TCLVERSIONS) ; do \
+ mkdir -p debian/$$v/extensions/tnc ; \
+ ( cd debian/$$v/extensions/tnc ; \
+ ../../../../extensions/tnc/configure \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=$(CURDIR)/debian/tdom/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/ \
+ --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$$v \
--libdir=\$${prefix}/lib/tcltk/$(DEB_HOST_MULTIARCH) \
--enable-threads \
- --includedir=$(DEV)/usr/include/tdom )
+ --includedir=$(DEV)/usr/include/tdom ) ; \
+ done
#
# Configure tdomhtml extension
#
- ( cd extensions/tdomhtml ; ./configure \
+ for v in $(TCLVERSIONS) ; do \
+ mkdir -p debian/$$v/extensions/tdomhtml ; \
+ ( cd debian/$$v/extensions/tdomhtml ; \
+ ../../../../extensions/tdomhtml/configure \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=$(CURDIR)/debian/tdom/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--libdir=\$${prefix}/lib/tcltk/$(DEB_HOST_MULTIARCH) \
- --includedir=$(DEV)/usr/include/tdom )
+ --includedir=$(DEV)/usr/include/tdom ) ; \
+ done
override_dh_auto_build:
#
# Build tDOM and extensions
#
- ( cd unix ; $(MAKE) )
- ( cd extensions/tnc ; $(MAKE) )
- ( cd extensions/tdomhtml ; $(MAKE) )
+ for v in $(TCLVERSIONS) ; do \
+ ( cd debian/$$v/unix ; $(MAKE) ) ; \
+ done
+ for v in $(TCLVERSIONS) ; do \
+ ( cd debian/$$v/extensions/tnc ; $(MAKE) ) ; \
+ done
+ for v in $(TCLVERSIONS) ; do \
+ ( cd debian/$$v/extensions/tdomhtml ; $(MAKE) ) ; \
+ done
override_dh_clean:
#
# Cleanup
#
- -( cd unix; [ ! -f Makefile ] || $(MAKE) distclean; )
- -( cd extensions/tnc; [ ! -f Makefile ] || $(MAKE) distclean; )
- -( cd extensions/tdomhtml; [ ! -f Makefile ] || $(MAKE) distclean; )
+ for v in $(TCLVERSIONS) ; do \
+ rm -rf debian/$$v ; \
+ done
+ [ ! -f configure.backup ] || mv configure.backup configure
dh_clean config.log config.status config.cache config.guess config.sub
override_dh_auto_install:
#
# Install the package into debian/tdom.
#
- ( cd unix/ ; $(MAKE) install )
- ( cd extensions/tnc ; $(MAKE) install )
- ( cd extensions/tdomhtml ; $(MAKE) install)
+ for v in $(TCLVERSIONS) ; do \
+ ( cd debian/$$v/unix ; $(MAKE) install ) ; \
+ done
+ for v in $(TCLVERSIONS) ; do \
+ ( cd debian/$$v/extensions/tnc ; $(MAKE) install ) ; \
+ done
+ for v in $(TCLVERSIONS) ; do \
+ ( cd debian/$$v/extensions/tdomhtml ; $(MAKE) install) ; \
+ done
#
# Remove >empty< man page for tdomhtml extension (note, there is no
# --without-man target available)
@@ -122,9 +156,9 @@ override_dh_auto_install:
#
# Wrapper for tdomConfig on /usr/lib/$(DEB_HOST_MULTIARCH)
#
- sed -i "s/TDOM_VERSION/$(VERSION)/" $(CURDIR)/debian/tdomConfig.sh
install -d -m 755 $(DEV)/usr/lib/$(DEB_HOST_MULTIARCH)
- install $(CURDIR)/debian/tdomConfig.sh
$(DEV)/usr/lib/$(DEB_HOST_MULTIARCH)/
+ sed "s/TDOM_VERSION/$(VERSION)/" $(CURDIR)/debian/tdomConfig.sh \
+ >$(DEV)/usr/lib/$(DEB_HOST_MULTIARCH)/tdomConfig.sh
#
# Move tDOM stub library
#
@@ -139,5 +173,7 @@ override_dh_installdeb:
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- (cd unix/; $(MAKE) test)
+ for v in $(TCLVERSIONS) ; do \
+ ( cd debian/$$v/unix ; $(MAKE) test) ; \
+ done
endif
--- End Message ---
--- Begin Message ---
Source: tdom
Source-Version: 0.9.5.1-3
Done: Hector Romojaro <[email protected]>
We believe that the bug you reported is fixed in the latest version of
tdom, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Hector Romojaro <[email protected]> (supplier of updated tdom package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 05 Apr 2025 11:39:00 +0200
Source: tdom
Architecture: source
Version: 0.9.5.1-3
Distribution: unstable
Urgency: medium
Maintainer: Tcl/Tk Debian Packagers <[email protected]>
Changed-By: Hector Romojaro <[email protected]>
Closes: 1101146
Changes:
tdom (0.9.5.1-3) unstable; urgency=medium
.
[ Hector Romojaro ]
* Remove build-stamp and debian/rules cleanup
* Fix FSF address on copyright file
.
[ Sergei Golovan ]
* Build two sets of libraries, one for Tcl 8.6 and another for Tcl 9.0.
(Closes: #1101146)
Checksums-Sha1:
1c306289918b7fa5e71f35925679e7fe096234b2 2084 tdom_0.9.5.1-3.dsc
818f3d94a011b296e32cd61520fd21e7d6fd0c9e 7200 tdom_0.9.5.1-3.debian.tar.xz
b75814f9c193b029d32d14bd4951a3bdc102bd84 6586 tdom_0.9.5.1-3_amd64.buildinfo
Checksums-Sha256:
6deb19338cbee1b0a4c3b91662f8c25e7f0684926a6d72f94f5d247ea3ef43f3 2084
tdom_0.9.5.1-3.dsc
a83bda03176d7b69e23c761f8ed25f35eb505087fe728193698181d33822227e 7200
tdom_0.9.5.1-3.debian.tar.xz
2269d35332473fdeea2acac4faa395f2f04e42fbf52f9f36e7a32eb33cfb4193 6586
tdom_0.9.5.1-3_amd64.buildinfo
Files:
4def0bab15d70f5edfb4eb5039c5a7cb 2084 libs optional tdom_0.9.5.1-3.dsc
54f4d4676678b34f6b9d8346480a5173 7200 libs optional
tdom_0.9.5.1-3.debian.tar.xz
8a68cba94bdf7284d08db72815311f22 6586 libs optional
tdom_0.9.5.1-3_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEE5FbOA8R4BcPcWpNk7cjIJA9ojmgFAmfxCMQACgkQ7cjIJA9o
jmi42A//QhGBT/oW4Th6NM7L0atIitFPqU0iiUXYSQ3JutpePl3n9To4B+peLHfi
tQiR8DV+irSsdp2Vpc1v1tWPzcc0gMXsHRFYxl12rRMDSDL2BXskXXjIYAImTHUq
L3TE5XcjjfOnmZEDXkUTk0cvcj8CZ76/Cx7qzAosXsGgL/jem3RoVGxTtVhs3tbM
ERHMN6oAu4RNGmio0ZqV20zGCJp/+inHOPhhZQfUNh6tgFfhwl8nwMoBArPcmBa3
oZnMHnvmmxH4BQ2izI3xZHje7gRFBk3cl/S5aaZohhl+hit0yogQ43hxqYpeVWa+
BOlUCvHjW1ilIduWykhS0zJBz05PwQQSNOZIIdCNNq3icCQlMUL3ZEbyRQwxRf1R
YvJglToNlTrQ0Bhh9FguuIIIRisSCQSvHTaD+SbiobgfgkUswv3d6xJU6OdMARjK
d8vvwjQ8FYUgOX4CZubHQQkjCPwRirORDxsOnZUilbsXL8FXHNI7sihp1xo99TE+
T4qQN86b0gh7aP3Fte8jCArtTXryB67NqgryYiXzf95H/pE2RVERDnFMolEJbe7+
INZHHDhK2rowMCWGjq9izAN7vpD6NRyccBaJz775oT+ISGB1WQVeNrah+NBG6B87
X7NEbwdQ2M9uH/J3mJQnQoruZPIDO9jBpAIyISZDGx8MIrWEvnU=
=o99d
-----END PGP SIGNATURE-----
pgpSXd0nUDjBf.pgp
Description: PGP signature
--- End Message ---
