Howdy,Actually at the time of this writing, 4.7 is the current release. I had gone ahead and jumped to the latest version a while ago, mainly to unify my system on one Lua version, and I've attached the debdiff (debian/ only) to this message.
Use it, don't use it, or laugh at it. I don't care about attribution so just claim it even if you want.
Note: The only place I use highlight is with cgit. Regards, ~Unit 193 Unit193 @ Libera Unit193 @ OFTC
diff -Nur highlight-3.41/debian/changelog highlight-4.7/debian/changelog --- highlight-3.41/debian/changelog 2018-07-27 05:25:44.000000000 -0400 +++ highlight-4.7/debian/changelog 2023-08-07 17:21:57.862529038 -0400 @@ -1,3 +1,27 @@ +highlight (4.7-0) UNRELEASED; urgency=medium + + * New upstream release. + - Refresh patches. + * d/compat, d/control: Replace d/compat with debhelper-compat, bump to 13. + * d/control: + - R³: no. + - Replace Lua Build-Depend to liblua5.4-dev. + * d/docs: Update paths and drop TODO. + * d/highlight-common.install: Update paths and install plugins, completions. + * d/highlight.(examples,install): Update paths. + * d/libhighlight-perl.(examples,install): Ditto. + * d/highlight.manpages: Update name and add filetypes.conf.5. + * d/not-installed: Add otherwise installed and extraneous files. + * d/rules: + - Drop get-orig-source target. + - Override dh_installchangelogs to install ChangeLog.adoc. + - Enable all hardening options. + - Pass LUA_LIBS=-llua5.4. + * Update Standards-Version to 4.6.2. + * Remove trailing whitespace from previous changelog entries. + + -- Unit 193 <[email protected]> Thu, 03 Aug 2023 20:57:55 -0400 + highlight (3.41-2) unstable; urgency=medium * Fix location of examples (Closes: #904727). @@ -171,7 +195,7 @@ * New upstream version - restores @highlight pass-through - + -- David Bremner <[email protected]> Wed, 29 Dec 2010 16:16:12 -0400 highlight (3.2+svn19-1) experimental; urgency=low @@ -221,7 +245,7 @@ * New Upstream 2.14 * convert to 3.0 (quilt) source format to support tar.bz2 upstream - + -- David Bremner <[email protected]> Mon, 15 Feb 2010 08:55:16 -0400 highlight (2.12-1) unstable; urgency=low @@ -236,7 +260,7 @@ * New upstream version. * Change from co-maintainer/uploader to maintainer (Closes: #541332) * Update standards version to 3.8.3 (no changes) - + -- David Bremner <[email protected]> Thu, 27 Aug 2009 22:45:19 -0300 highlight (2.10-1) unstable; urgency=low @@ -318,7 +342,7 @@ highlight (2.2.6-2) unstable; urgency=low - * applied patch to fix amd64 building error using gcc-4.0 + * applied patch to fix amd64 building error using gcc-4.0 Thanks to Andreas Jochens <[email protected]> (closes: #286352) -- Ayman Negm <[email protected]> Tue, 21 Dec 2004 21:09:35 +0100 @@ -386,5 +410,3 @@ * Initial Release (closes: #218144). -- Ayman Negm <[email protected]> Fri, 20 Feb 2004 09:40:57 +0100 - - diff -Nur highlight-3.41/debian/compat highlight-4.7/debian/compat --- highlight-3.41/debian/compat 2018-07-27 05:25:44.000000000 -0400 +++ highlight-4.7/debian/compat 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -10 diff -Nur highlight-3.41/debian/control highlight-4.7/debian/control --- highlight-3.41/debian/control 2018-07-27 05:25:44.000000000 -0400 +++ highlight-4.7/debian/control 2023-03-16 20:59:16.000000000 -0400 @@ -2,12 +2,13 @@ Section: devel Priority: optional Maintainer: David Bremner <[email protected]> -Build-Depends: debhelper (>= 10), swig, liblua5.2-dev, libboost-dev, - pkg-config -Standards-Version: 4.0.0 +Build-Depends: debhelper-compat (= 13), swig, liblua5.4-dev, libboost-dev, + pkg-config +Rules-Requires-Root: no +Standards-Version: 4.6.2 Homepage: http://www.andre-simon.de Vcs-Git: https://salsa.debian.org/bremner/highlight.git -Vcs-Browser: https://salsa.debian.org/bremner/highlight.git +Vcs-Browser: https://salsa.debian.org/bremner/highlight Package: highlight @@ -23,7 +24,7 @@ Package: highlight-common Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends} Breaks: highlight (<<3.2), libhighlight-perl (<<3.2), gtk-doc-tools (<< 1.17-2) Replaces: highlight (<<2.9) Description: source code to formatted text converter (architecture independent files) diff -Nur highlight-3.41/debian/docs highlight-4.7/debian/docs --- highlight-3.41/debian/docs 2018-07-27 05:25:44.000000000 -0400 +++ highlight-4.7/debian/docs 2021-02-13 01:54:21.000000000 -0500 @@ -1,5 +1 @@ -README -README_DE -README_LANGLIST -README_REGEX -TODO +usr/share/doc/highlight/README* diff -Nur highlight-3.41/debian/highlight-common.install highlight-4.7/debian/highlight-common.install --- highlight-3.41/debian/highlight-common.install 2018-07-27 05:25:44.000000000 -0400 +++ highlight-4.7/debian/highlight-common.install 2022-10-15 20:51:55.000000000 -0400 @@ -1,4 +1,7 @@ -usr/share/highlight/langDefs/* usr/share/highlight/langDefs -etc/highlight/* etc/highlight -usr/share/highlight/themes/* usr/share/highlight/themes/ - +etc/highlight/ +usr/share/bash-completion/ +usr/share/fish/ +usr/share/highlight/langDefs/ +usr/share/highlight/plugins/ +usr/share/highlight/themes/ +usr/share/zsh/ diff -Nur highlight-3.41/debian/highlight.examples highlight-4.7/debian/highlight.examples --- highlight-3.41/debian/highlight.examples 2018-07-27 05:25:44.000000000 -0400 +++ highlight-4.7/debian/highlight.examples 2022-10-15 20:51:06.000000000 -0400 @@ -1,5 +1,2 @@ -extras/web_plugins/dokuwiki/* -extras/web_plugins/movabletype/* -extras/web_plugins/wordpress/* -extras/swig/*.py -extras/highlight_pipe.* +usr/share/doc/highlight/extras/swig/*.py +usr/share/doc/highlight/extras/highlight_pipe.* diff -Nur highlight-3.41/debian/highlight.install highlight-4.7/debian/highlight.install --- highlight-3.41/debian/highlight.install 2018-07-27 05:25:44.000000000 -0400 +++ highlight-4.7/debian/highlight.install 2022-11-15 23:56:39.000000000 -0500 @@ -1,2 +1 @@ -src/highlight usr/bin - +usr/bin diff -Nur highlight-3.41/debian/highlight.manpages highlight-4.7/debian/highlight.manpages --- highlight-3.41/debian/highlight.manpages 2018-07-27 05:25:44.000000000 -0400 +++ highlight-4.7/debian/highlight.manpages 2021-02-13 01:54:21.000000000 -0500 @@ -1 +1,2 @@ -man/highlight.1.gz +usr/share/man/man5/filetypes.conf.5.gz +usr/share/man/man1/highlight.1.gz diff -Nur highlight-3.41/debian/libhighlight-perl.examples highlight-4.7/debian/libhighlight-perl.examples --- highlight-3.41/debian/libhighlight-perl.examples 2018-07-27 05:25:44.000000000 -0400 +++ highlight-4.7/debian/libhighlight-perl.examples 2021-02-13 01:54:21.000000000 -0500 @@ -1 +1 @@ -extras/swig/testmod.pl +usr/share/doc/highlight/extras/swig/testmod.pl diff -Nur highlight-3.41/debian/libhighlight-perl.install highlight-4.7/debian/libhighlight-perl.install --- highlight-3.41/debian/libhighlight-perl.install 2018-07-27 05:25:44.000000000 -0400 +++ highlight-4.7/debian/libhighlight-perl.install 2021-02-13 01:54:21.000000000 -0500 @@ -4,5 +4,5 @@ my $vendorarch = substr($Config{vendorarch}, 1); -print "extras/swig/highlight.so $vendorarch/auto/highlight\n"; -print "extras/swig/highlight.pm $vendorarch\n"; +print "usr/share/doc/highlight/extras/swig/highlight.so $vendorarch/auto/highlight\n"; +print "usr/share/doc/highlight/extras/swig/highlight.pm $vendorarch\n"; diff -Nur highlight-3.41/debian/not-installed highlight-4.7/debian/not-installed --- highlight-3.41/debian/not-installed 1969-12-31 19:00:00.000000000 -0500 +++ highlight-4.7/debian/not-installed 2022-10-15 23:12:50.000000000 -0400 @@ -0,0 +1,5 @@ +usr/share/doc/highlight/AUTHORS +usr/share/doc/highlight/COPYING +usr/share/doc/highlight/ChangeLog.adoc +usr/share/doc/highlight/extras/* +usr/share/doc/highlight/INSTALL diff -Nur highlight-3.41/debian/patches/0001-debcherry-fixup-patch.patch highlight-4.7/debian/patches/0001-debcherry-fixup-patch.patch --- highlight-3.41/debian/patches/0001-debcherry-fixup-patch.patch 2018-07-27 05:25:44.000000000 -0400 +++ highlight-4.7/debian/patches/0001-debcherry-fixup-patch.patch 2023-06-26 04:19:22.000000000 -0400 @@ -5,7 +5,7 @@ d2efbdc make pkg-config substitutable for cross compilation - no changes against upstream or conflicts -6f406e5 use lua5.2 on debian +6f406e5 use lua5.4 on debian - extra changes or conflicts 8956e2e pass LDFLAGS when compiling python and perl extension libs. - extra changes or conflicts @@ -22,12 +22,10 @@ a0f117c install swig generated perl bindings, and an example script - extra changes or conflicts --- - extras/swig/makefile | 13 +++++++------ - src/makefile | 7 ++++--- - 2 files changed, 11 insertions(+), 9 deletions(-) + extras/swig/makefile | 13 +++++++------ + src/makefile | 11 ++++++----- + 2 files changed, 13 insertions(+), 11 deletions(-) -diff --git a/extras/swig/makefile b/extras/swig/makefile -index acc32dc..b5af4cd 100644 --- a/extras/swig/makefile +++ b/extras/swig/makefile @@ -1,13 +1,14 @@ @@ -43,8 +41,8 @@ -LUA_CFLAGS=$(shell pkg-config --cflags lua) -LUA_LIBS=$(shell pkg-config --libs lua) -PYTHON_CFLAGS=$(shell pkg-config --cflags python-2.7) -+LUA_CFLAGS=$(shell $(PKG_CONFIG) --cflags lua5.2) -+LUA_LIBS=$(shell $(PKG_CONFIG) --libs lua5.2) ++LUA_CFLAGS=$(shell $(PKG_CONFIG) --cflags lua5.4) ++LUA_LIBS=$(shell $(PKG_CONFIG) --libs lua5.4) +PYTHON_CFLAGS=$(shell $(PKG_CONFIG) --cflags python-2.7) PERL_INC=$(shell perl -MExtUtils::Embed -eccopts) PHP_INC=$(shell php-config --includes) @@ -52,40 +50,45 @@ @@ -19,12 +20,12 @@ lib-stamp: python: lib-stamp swig -c++ -python -o highlight_wrap.cpp highlight.i - ${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC} + ${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC} - ${CXX} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -lpython2.7 -o _highlight.so + ${CXX} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -lpython2.7 -o _highlight.so perl: lib-stamp swig -c++ -perl -o highlight_wrap.cpp highlight.i - ${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC} + ${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC} - ${CXX} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so + ${CXX} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so php: lib-stamp swig -c++ -php -o highlight_wrap.cpp highlight.i -diff --git a/src/makefile b/src/makefile -index 20c5a80..df4adf1 100644 --- a/src/makefile +++ b/src/makefile @@ -14,6 +14,7 @@ - #CXX=clang++ - CXX=g++ + #CXX ?= clang++ + CXX ?= g++ +PKG_CONFIG ?= pkg-config - # was: qmake-qt5 - QMAKE=qmake -@@ -39,13 +40,13 @@ INCLUDE_DIR=./include/ - # If Lua 5.2 is not default on your system yet you have to - # use lua5.1 in the pkg-config calls + QMAKE ?= qmake --LUA_CFLAGS=$(shell pkg-config --cflags lua) -+LUA_CFLAGS=$(shell $(PKG_CONFIG) --cflags lua5.2) -DUSE_LUA52 +@@ -36,18 +37,18 @@ GUI_QT_DIR=./gui-qt/ + INCLUDE_DIR=./include/ - # default lua lib --LUA_LIBS=$(shell pkg-config --libs lua) -+LUA_LIBS=$(shell $(PKG_CONFIG) --libs lua5.2) + # try to detect Lua versioning scheme +-LUA_PKG_NAME=lua5.3 +-LUA_TEST=$(shell pkg-config --exists ${LUA_PKG_NAME}; echo $$?) ++LUA_PKG_NAME=lua5.4 ++LUA_TEST=$(shell $(PKG_CONFIG) --exists ${LUA_PKG_NAME}; echo $$?) + + ifeq (${LUA_TEST},1) + LUA_PKG_NAME=lua + endif + +-LUA_CFLAGS=$(shell pkg-config --cflags ${LUA_PKG_NAME}) +-LUA_LIBS=$(shell pkg-config --libs ${LUA_PKG_NAME}) ++LUA_CFLAGS=$(shell $(PKG_CONFIG) --cflags ${LUA_PKG_NAME}) ++LUA_LIBS=$(shell $(PKG_CONFIG) --libs ${LUA_PKG_NAME}) # luajit lib -# LUA_LIBS=$(shell pkg-config --libs luajit) diff -Nur highlight-3.41/debian/patches/0002-add-CPPFLAGS-to-C-compilation-line.patch highlight-4.7/debian/patches/0002-add-CPPFLAGS-to-C-compilation-line.patch --- highlight-3.41/debian/patches/0002-add-CPPFLAGS-to-C-compilation-line.patch 2018-07-27 05:25:44.000000000 -0400 +++ highlight-4.7/debian/patches/0002-add-CPPFLAGS-to-C-compilation-line.patch 2022-10-15 17:45:30.000000000 -0400 @@ -5,14 +5,12 @@ This is needed for hardening flags. --- - src/makefile | 2 +- + src/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/makefile b/src/makefile -index df4adf1..93a75b7 100644 ---- a/src/makefile -+++ b/src/makefile -@@ -74,7 +74,7 @@ LDFLAGS = -ldl +--- a/src/makefile 2022-10-15 17:45:27.641694763 -0400 ++++ b/src/makefile 2022-10-15 17:45:27.637694738 -0400 +@@ -78,7 +78,7 @@ #LDFLAGS = ${LDFLAGS} -s #LDFLAGS= -Wl,--as-needed diff -Nur highlight-3.41/debian/patches/0003-Add-on-to-LDFLAGS-rather-than-overwriting-them.patch highlight-4.7/debian/patches/0003-Add-on-to-LDFLAGS-rather-than-overwriting-them.patch --- highlight-3.41/debian/patches/0003-Add-on-to-LDFLAGS-rather-than-overwriting-them.patch 2018-07-27 05:25:44.000000000 -0400 +++ highlight-4.7/debian/patches/0003-Add-on-to-LDFLAGS-rather-than-overwriting-them.patch 2022-10-15 17:47:41.000000000 -0400 @@ -5,19 +5,17 @@ This is again useful for handling hardening flags on Debian. --- - src/makefile | 2 +- + src/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/makefile b/src/makefile -index 93a75b7..ae728e2 100644 ---- a/src/makefile -+++ b/src/makefile -@@ -67,7 +67,7 @@ ifdef PIC - CFLAGS+=-fPIC +--- a/src/makefile 2022-10-15 17:47:38.114517221 -0400 ++++ b/src/makefile 2022-10-15 17:47:38.106517171 -0400 +@@ -70,7 +70,7 @@ endif + ifneq ($(OS), Windows_NT) -LDFLAGS = -ldl +LDFLAGS += -ldl + endif # Do not strip by default (Mac OS X lazy pointer issues) # Add -static to avoid linking with shared libs (can cause trouble when highlight - # is run as service) diff -Nur highlight-3.41/debian/rules highlight-4.7/debian/rules --- highlight-3.41/debian/rules 2018-07-27 05:25:44.000000000 -0400 +++ highlight-4.7/debian/rules 2022-10-15 21:53:03.000000000 -0400 @@ -1,16 +1,16 @@ #!/usr/bin/make -f -UPSTREAMTAG=upstream/3.3 -SOURCEPKG=$(shell dpkg-parsechangelog | sed -n 's/^Source: \(.*\)/\1/p') -UPSTREAM=$(shell dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-[^-]*/\1/p') -ORIG=${SOURCEPKG}_${UPSTREAM}.orig.tar.bz2 -%: +DPKG_EXPORT_BUILDFLAGS = 1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +include /usr/share/dpkg/default.mk + +%: dh $@ override_dh_auto_build: dh_auto_build --sourcedirectory=extras/swig -- perl dh_auto_build --sourcedirectory=src -- clean - dh_auto_build -- LUA_LIBS=-llua5.2 + dh_auto_build -- LUA_LIBS=-llua5.4 -get-orig-source: - git archive --format=tar ${UPSTREAMTAG} | bzip2 -9 > ../${ORIG} +override_dh_installchangelogs: + dh_installchangelogs ChangeLog.adoc
