diff -pruN 1.1.10-2/debian/changelog 1.1.10-3/debian/changelog --- 1.1.10-2/debian/changelog 2025-04-09 15:57:49.000000000 +0000 +++ 1.1.10-3/debian/changelog 2025-04-19 10:12:51.000000000 +0000 @@ -1,3 +1,12 @@ +tdbcpostgres (1.1.10-3) unstable; urgency=medium + + * We now generate binary package tcl-tdbc-mysql which ships both Tcl8.6 and + Tcl9.0 extension libraries. + * As per Debian Tcl/Tk policy we're moving the binary extensions into their + arch dependent directories + + -- Massimo Manghi Sat, 19 Apr 2025 12:12:51 +0200 + tdbcpostgres (1.1.10-2) unstable; urgency=medium * Building both extension libraries for Tcl 8.6 and the Tcl9 diff -pruN 1.1.10-2/debian/control 1.1.10-3/debian/control --- 1.1.10-2/debian/control 2025-04-09 15:57:41.000000000 +0000 +++ 1.1.10-3/debian/control 2025-04-19 10:12:51.000000000 +0000 @@ -2,15 +2,19 @@ Source: tdbcpostgres Section: libs Priority: optional Maintainer: Massimo Manghi -Build-Depends: debhelper-compat (=13), tcl8.6-dev, tcl9.0-dev, tcl8.6-tdbc (>=1.0.6~), postgresql-client +Build-Depends: debhelper-compat (=13), tcl8.6-dev, tcl9.0-dev, tcl-tdbc (>=1.1.10-3~), postgresql-client Standards-Version: 4.7.2 Rules-Requires-Root: binary-targets Homepage: http://core.tcl.tk/tdbcodbc -Package: tcl8.6-tdbc-postgres +Package: tcl-tdbc-postgres Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, tcl8.6 | tcl9.0, tcl8.6-tdbc (>=1.0.6), postgresql-client +Depends: ${shlibs:Depends}, ${misc:Depends}, tcl-tdbc (>=1.1.10-3~), postgresql-client +Conflicts: tcl8.6-tdbc-postgres (<< 1.1.10-3) +Replaces: tcl8.6-tdbc-postgres (<< 1.1.10-3) +Provides: tcl8.6-tdbc-postgres (= ${binary:Version}), tcl9.0-tdbc-postgres (= ${binary:Version}) Description: Tcl Database Connectivity Tdbc is an interface standard for SQL databases and connectivity that aims to make it easy to write portable and secure Tcl scripts that access SQL - databases. This package provides the driver for the PostgreSQL DBMS. + databases. This package provides the driver for the PostgreSQL DBMS. This package + currently provides both Tcl8.6 and Tcl9.0 extension libraries diff -pruN 1.1.10-2/debian/rules 1.1.10-3/debian/rules --- 1.1.10-2/debian/rules 2025-04-09 15:57:49.000000000 +0000 +++ 1.1.10-3/debian/rules 2025-04-19 10:12:51.000000000 +0000 @@ -14,53 +14,58 @@ TCLVERSIONS = 8.6 9.0 DPKG_EXPORT_BUILDFLAGS = 1 export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow include /usr/share/dpkg/buildflags.mk +DIR = $(shell pwd)/debian/tcl-tdbc-postgres +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -DIR = $(shell pwd)/debian/tcl8.6-tdbc-postgres - -%: - dh $@ clean: echo "cleaning up source directory"; \ rm -fv debian/autoreconf.* ; \ - for v in $(TCLVERSIONS) ; do \ - rm -frv debian/$$v ; \ - done + rm -frv debian/tcl-tdbc-postgres ; \ + rm -frv debian/tdbcpostgres ; \ dh_clean override_dh_auto_configure: for v in $(TCLVERSIONS) ; do \ + BUILD_DIR="debian/tdbcpostgres/tcl$$v" ; \ + echo "Configuring tdbcpostgres for Tcl$$v in $$BUILD_DIR" ;\ CFLAGS="-I/usr/include/tcl$$v"; \ - dh_auto_configure -B$(CURDIR)/debian/$$v -- \ - --with-tcl=/usr/lib/tcl$$v \ - --prefix=/usr \ - --includedir=/usr/include \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libdir=/usr/lib/tcltk/ \ - --libexecdir=/usr/lib/tcltk \ - --with-tdbc=$$(ls -dv /usr/lib/tcltk/tdbc1.* | tail -n 1) ; \ - done ; - -# running twice cleanup of empty directories as there are two of them nested + dh_auto_configure --builddir=$$BUILD_DIR -- \ + --with-tcl=/usr/lib/tcl$$v \ + --prefix=/usr \ + --includedir=/usr/include \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libdir=/usr/lib/tcltk/$(DEB_HOST_MULTIARCH) \ + --libexecdir=/usr/lib/tcltk/$(DEB_HOST_MULTIARCH) \ + --with-tdbc=$$(ls -dv /usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/tdbc1.* | tail -n 1) ; \ + done + +override_dh_auto_build: + for v in $(TCLVERSIONS) ; do \ + BUILD_DIR="debian/tdbcpostgres/tcl$$v" ; \ + echo "Building tdbcpostgres for Tcl$$v in $$BUILD_DIR" ; \ + dh_auto_build --builddir=$$BUILD_DIR --; \ + done override_dh_auto_install: for v in $(TCLVERSIONS) ; do \ - dh_auto_install -B$(CURDIR)/debian/$$v ; \ - done - mkdir $(DIR)/usr/share/man/man3 - # Fix up the manpages. + BUILD_DIR="debian/tdbcpostgres/tcl$$v" ; \ + echo "Install tdbcpostgres files for Tcl$$v version from $$BUILD_DIR" ; \ + dh_auto_install --builddir=$$BUILD_DIR -- ; \ + done ; \ + mkdir --parent $(DIR)/usr/share/man/man3 ;\ cd $(DIR)/usr/share/man/mann && \ - for f in *.[n] ; do \ - f2=$$(echo $$f | sed -e 's/\.[n]/.3tcl/') ; \ + for f in *.[3n] ; do \ + f2=$$(echo $$f | sed -e 's/\.[3n]/.3tcl/') ; \ if [ -L $$f ]; then \ - l=$$(readlink -n $$f | sed -e 's/\.[n]/.3tcl/') ; \ + l=$$(readlink -n $$f | sed -e 's/\.[3n]/.3tcl/') ; \ rm $$f ; \ ln -sf $$l $$f2 ; \ else \ - cat $$f | sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [n]/.TH \1 3tcl/' \ + cat $$f | sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tcl/' \ -e 's/\(Tk_[0-9A-Za-z]*\)(3)/\1(3tk)/g' \ -e 's/\([A-Z][0-9A-Za-z_]*\)(3)/\1(3tcl)/g' \ -e 's/send(n)/send(3tk)/g' \ @@ -75,3 +80,9 @@ override_dh_auto_install: fi ; \ done ; \ find $(DIR) -empty -prune -exec rmdir -v \{\} \; ; + + +%: + dh $@ + +.PHONY: override_dh_auto_install override_dh_auto_configure