Source: dirdiff Version: 2.1-7.1 Severity: important Tags: patch Dear Maintainer,
Tcl/Tk 8.5 has reached its end-of-life and is to be removed from Debian. So please, switch the dirdiff package to more recent version of Tcl/Tk. I've attached a proposed NMU which replaces tcl8.5 by tcl8.6 where appropriate in debian/*. Also, since dirdiff uses deprecated API (result field for the Tcl_Interp structure) I had to define USE_INTERP_RESULT which made the packages diff longer. If you don't mind, I could do the upload. -- System Information: Debian Release: 9.3 APT prefers stable-debug APT policy: (500, 'stable-debug'), (500, 'proposed-updates'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental'), (1, 'unstable'), (1, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.14.0-0.bpo.3-amd64 (SMP w/12 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- no debconf information
diff -u dirdiff-2.1/debian/changelog dirdiff-2.1/debian/changelog --- dirdiff-2.1/debian/changelog +++ dirdiff-2.1/debian/changelog @@ -1,3 +1,12 @@ +dirdiff (2.1-7.2) unstable; urgency=medium + + * Non-maintainer upload. + * Switch to Tcl/Tk 8.6 as 8.5 is planned to be removed from Debian. + * Define the USE_INTERP_RESULT macro to enable the deprecated result + field for the Tcl_Interp structure. + + -- Sergei Golovan <sgolo...@debian.org> Sun, 28 Jan 2018 18:41:56 +0300 + dirdiff (2.1-7.1) unstable; urgency=medium * Non-maintainer upload. diff -u dirdiff-2.1/debian/control dirdiff-2.1/debian/control --- dirdiff-2.1/debian/control +++ dirdiff-2.1/debian/control @@ -4,12 +4,12 @@ Priority: optional Maintainer: Santiago Sánchez Paz <sanchez...@gmail.com> Uploaders: Luciano Bello <luci...@debian.org> -Build-Depends: quilt, debhelper (>= 7), tk8.5-dev +Build-Depends: quilt, debhelper (>= 7), tk8.6-dev Standards-Version: 3.9.5 Package: dirdiff Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, tk8.5 +Depends: ${misc:Depends}, ${shlibs:Depends}, tk8.6 Description: Display and merge changes between two directory trees Dirdiff can handle up to 5 trees. It displays a main window with a list of the files which are different between the trees, with colored diff -u dirdiff-2.1/debian/patches/05_wish-tk8.5.patch dirdiff-2.1/debian/patches/05_wish-tk8.5.patch --- dirdiff-2.1/debian/patches/05_wish-tk8.5.patch +++ dirdiff-2.1/debian/patches/05_wish-tk8.5.patch @@ -4,7 +4,7 @@ #!/bin/sh # Tcl ignores the next line \ -exec wish "$0" -- "${1+$@}" -+exec wish8.5 "$0" -- "${1+$@}" ++exec wish8.6 "$0" -- "${1+$@}" # Copyright (C) 1999-2004 Paul Mackerras. All rights reserved. # This program is free software; it may be used, copied, modified diff -u dirdiff-2.1/debian/patches/LDFLAGS.patch dirdiff-2.1/debian/patches/LDFLAGS.patch --- dirdiff-2.1/debian/patches/LDFLAGS.patch +++ dirdiff-2.1/debian/patches/LDFLAGS.patch @@ -4,8 +4,8 @@ all: libfilecmp.so.0.0 libfilecmp.so.0.0: filecmp.c -- $(CC) $(CFLAGS) -shared $(SOFLAGS) -o $@ filecmp.c $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared $(SOFLAGS) -o $@ filecmp.c $(LIBS) +- $(CC) $(CFLAGS) -DUSE_INTERP_RESULT -shared $(SOFLAGS) -o $@ filecmp.c $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -DUSE_INTERP_RESULT -shared $(SOFLAGS) -o $@ filecmp.c $(LIBS) install: dirdiff libfilecmp.so.0.0 $(INSTALL) -c dirdiff $(BINDIR) diff -u dirdiff-2.1/debian/patches/hardening dirdiff-2.1/debian/patches/hardening --- dirdiff-2.1/debian/patches/hardening +++ dirdiff-2.1/debian/patches/hardening @@ -6,8 +6,8 @@ +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) # You may need to change the -I arguments depending on your system --CFLAGS=-O3 -I/usr/include/tcl8.5 -+CFLAGS:=-O3 -I/usr/include/tcl8.5 $(shell dpkg-buildflags --get CFLAGS) +-CFLAGS=-O3 -I/usr/include/tcl8.6 ++CFLAGS:=-O3 -I/usr/include/tcl8.6 $(shell dpkg-buildflags --get CFLAGS) +CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) diff -u dirdiff-2.1/debian/patches/shared-object.patch dirdiff-2.1/debian/patches/shared-object.patch --- dirdiff-2.1/debian/patches/shared-object.patch +++ dirdiff-2.1/debian/patches/shared-object.patch @@ -2,17 +2,17 @@ +++ cvs-local/Makefile @@ -9,12 +9,14 @@ # You may need to change the -I arguments depending on your system - CFLAGS=-O3 -I/usr/include/tcl8.5 + CFLAGS=-O3 -I/usr/include/tcl8.6 +SOFLAGS = -fPIC -Wl,-soname,libfilecmp.so.0.0 + - LIBS = -ltcl8.5 + LIBS = -ltcl8.6 all: libfilecmp.so.0.0 libfilecmp.so.0.0: filecmp.c -- $(CC) $(CFLAGS) -shared -o $@ filecmp.c $(LIBS) -+ $(CC) $(CFLAGS) -shared $(SOFLAGS) -o $@ filecmp.c $(LIBS) +- $(CC) $(CFLAGS) -DUSE_INTERP_RESULT -shared -o $@ filecmp.c $(LIBS) ++ $(CC) $(CFLAGS) -DUSE_INTERP_RESULT -shared $(SOFLAGS) -o $@ filecmp.c $(LIBS) install: dirdiff libfilecmp.so.0.0 $(INSTALL) -c dirdiff $(BINDIR) diff -u dirdiff-2.1/debian/patches/tcl-version.patch dirdiff-2.1/debian/patches/tcl-version.patch --- dirdiff-2.1/debian/patches/tcl-version.patch +++ dirdiff-2.1/debian/patches/tcl-version.patch @@ -5,15 +5,15 @@ # You may need to change the -I arguments depending on your system -CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl -+CFLAGS=-O3 -I/usr/include/tcl8.5 ++CFLAGS=-O3 -I/usr/include/tcl8.6 + -+LIBS = -ltcl8.5 ++LIBS = -ltcl8.6 all: libfilecmp.so.0.0 libfilecmp.so.0.0: filecmp.c - $(CC) $(CFLAGS) -shared -o $@ filecmp.c -+ $(CC) $(CFLAGS) -shared -o $@ filecmp.c $(LIBS) ++ $(CC) $(CFLAGS) -DUSE_INTERP_RESULT -shared -o $@ filecmp.c $(LIBS) install: dirdiff libfilecmp.so.0.0 $(INSTALL) -c dirdiff $(BINDIR)