diff -Nru hfsutils-3.2.6/debian/changelog hfsutils-3.2.6/debian/changelog --- hfsutils-3.2.6/debian/changelog 2017-04-12 15:47:50.000000000 +0000 +++ hfsutils-3.2.6/debian/changelog 2018-01-28 16:15:33.000000000 +0000 @@ -1,17 +1,15 @@ -hfsutils (3.2.6-13ubuntu2) zesty; urgency=medium +hfsutils (3.2.6-14) unstable; urgency=medium - * No-change rebuild to pick up -fPIE compiler default in static - libraries - - -- Steve Langasek Wed, 12 Apr 2017 15:47:50 +0000 - -hfsutils (3.2.6-13ubuntu1) utopic; urgency=medium - - * Resynchronise with Debian. Remaining changes: - - Configure for the Tcl/Tk multiarch installation. - - Build for Tcl/Tk 8.6. + * QA upload. + * Switch to the default Tcl/Tk from 8.5 since 8.5 is to be removed from + Debian. + * Ensure that there's no -L/usr/lib in the build process. Closes: #722779. + * Replace dh_clean -k by dh_prep. + * Use priority optional instead of deprecated extra. + * Bump the debhelper compatibility level to 10. + * Conforms to Standards version 4.1.3. - -- Colin Watson Thu, 21 Aug 2014 01:52:39 +0100 + -- Sergei Golovan Sun, 28 Jan 2018 19:15:33 +0300 hfsutils (3.2.6-13) unstable; urgency=medium @@ -21,24 +19,6 @@ -- Juhani Numminen Sun, 10 Aug 2014 18:52:52 +0300 -hfsutils (3.2.6-12ubuntu3) trusty; urgency=medium - - * Build for Tcl/Tk 8.6. - - -- Matthias Klose Thu, 02 Jan 2014 17:14:49 +0100 - -hfsutils (3.2.6-12ubuntu2) raring; urgency=low - - * Configure for the Tk 8.5 multiarch installation. - - -- Matthias Klose Tue, 02 Apr 2013 07:57:31 +0200 - -hfsutils (3.2.6-12ubuntu1) raring; urgency=low - - * Configure for the Tcl 8.5 multiarch installation. - - -- Matthias Klose Thu, 14 Mar 2013 17:15:15 -0700 - hfsutils (3.2.6-12) unstable; urgency=low * QA upload. diff -Nru hfsutils-3.2.6/debian/compat hfsutils-3.2.6/debian/compat --- hfsutils-3.2.6/debian/compat 2013-03-14 19:42:52.000000000 +0000 +++ hfsutils-3.2.6/debian/compat 2018-01-28 16:15:33.000000000 +0000 @@ -1 +1 @@ -5 +10 diff -Nru hfsutils-3.2.6/debian/control hfsutils-3.2.6/debian/control --- hfsutils-3.2.6/debian/control 2014-08-21 00:53:00.000000000 +0000 +++ hfsutils-3.2.6/debian/control 2018-01-28 16:15:33.000000000 +0000 @@ -1,10 +1,9 @@ Source: hfsutils Section: otherosfs -Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian QA Group -Standards-Version: 3.9.4 -Build-Depends: debhelper (>= 5), tcl8.6-dev, tk8.6-dev +Priority: optional +Maintainer: Debian QA Group +Standards-Version: 4.1.3 +Build-Depends: debhelper (>= 10), tcl-dev, tk-dev Homepage: http://www.mars.org/home/rob/proj/hfs/ Package: hfsutils diff -Nru hfsutils-3.2.6/debian/patches/series hfsutils-3.2.6/debian/patches/series --- hfsutils-3.2.6/debian/patches/series 2014-08-21 00:52:01.000000000 +0000 +++ hfsutils-3.2.6/debian/patches/series 2018-01-19 11:55:04.000000000 +0000 @@ -3,4 +3,4 @@ hattrib-man.diff man-macros.diff lfs.diff -tcl8.6.diff +use-interp-result.diff diff -Nru hfsutils-3.2.6/debian/patches/tcl8.6.diff hfsutils-3.2.6/debian/patches/tcl8.6.diff --- hfsutils-3.2.6/debian/patches/tcl8.6.diff 2014-08-21 00:52:01.000000000 +0000 +++ hfsutils-3.2.6/debian/patches/tcl8.6.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -Index: b/config.h.in -=================================================================== ---- a/config.h.in -+++ b/config.h.in -@@ -91,3 +91,5 @@ - # ifndef HAVE_STRTOL - long strtol(const char *, char **, int); - # endif -+ -+#define USE_INTERP_RESULT 1 diff -Nru hfsutils-3.2.6/debian/patches/use-interp-result.diff hfsutils-3.2.6/debian/patches/use-interp-result.diff --- hfsutils-3.2.6/debian/patches/use-interp-result.diff 1970-01-01 00:00:00.000000000 +0000 +++ hfsutils-3.2.6/debian/patches/use-interp-result.diff 2018-01-19 11:58:24.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -43,7 +43,7 @@ + + CC = @CC@ + INCLUDES = @CPPFLAGS@ -Ilibhfs @TCL_INCLUDES@ @TK_INCLUDES@ +-DEFINES = @DEFS@ ++DEFINES = @DEFS@ -DUSE_INTERP_RESULT + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + diff -Nru hfsutils-3.2.6/debian/rules hfsutils-3.2.6/debian/rules --- hfsutils-3.2.6/debian/rules 2014-08-21 00:52:01.000000000 +0000 +++ hfsutils-3.2.6/debian/rules 2018-01-28 16:15:33.000000000 +0000 @@ -10,8 +10,6 @@ CFLAGS = -Wall $(shell dpkg-buildflags --get CPPFLAGS; dpkg-buildflags --get CFLAGS) LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) -DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - build-arch: build build-indep: build build: build-stamp @@ -21,8 +19,8 @@ # Add here commands to compile the package. CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=/usr \ --mandir=\$${prefix}/share/man \ - --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl8.6 \ - --with-tk=/usr/lib/$(DEB_HOST_MULTIARCH)/tk8.6 + --with-tcl=/usr/lib \ + --with-tk=/usr/lib $(MAKE) touch build-stamp @@ -40,7 +38,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Add here commands to install the package into debian/