Jonathan, Ubuntu has accepted pcre2 in to main so the Ubuntu diff is now a single line. Please apply this patch to your git tree. And I guess you can drop the pcre3 alternate Build-Depends too.
By the way, there are several other Debian bugs tagged 'patch' for git so please review those when you have time. Thanks, Jeremy Bicha
From 82adc501e6f03acb096674502c93d164455c2f48 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Wed, 23 Jan 2019 11:42:43 -0500 Subject: [PATCH] Build diff-highlight in the contrib dir LP: #1713690 Closes: #868871 Closes: #911997 --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index d5d81608d8..dce0f6a178 100755 --- a/debian/rules +++ b/debian/rules @@ -63,6 +63,7 @@ build-stamp: override_dh_auto_build-arch: build-stamp $(MAKE) -C contrib/subtree all $(OPTS) ln -s contrib/subtree/git-subtree + $(MAKE) -C contrib/diff-highlight $(OPTS) override_dh_auto_test-arch: test -z '$(TEST)' || \ -- 2.19.1
From 87937a42178dab5ded8a8c7df5984ba733e6a25d Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Wed, 23 Jan 2019 11:49:39 -0500 Subject: [PATCH 2/2] Drop alternate Build-Depends on libpcre3-dev --- debian/control | 2 +- debian/rules | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index e6be01c90a..8e7e39a261 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Gerrit Pape <[email protected]> Uploaders: Jonathan Nieder <[email protected]>, Anders Kaseorg <[email protected]> Build-Depends: libz-dev, gettext, - libpcre2-dev | libpcre3-dev, + libpcre2-dev, libcurl4-gnutls-dev, libexpat1-dev, subversion, libsvn-perl, libyaml-perl, tcl, python, diff --git a/debian/rules b/debian/rules index dce0f6a178..09d4e168d5 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,7 @@ OPTS =NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core \ SANE_TOOL_PATH= INSTALL=install TAR=tar \ NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 \ NO_PERL_CPAN_FALLBACKS=1 \ + USE_LIBPCRE2=1 \ DEFAULT_PAGER=pager DEFAULT_EDITOR=editor \ CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' DOCS =html @@ -41,11 +42,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) # output (unless dh is run as +dh, which causes other problems). %: MAKEFLAGS += -O endif -ifneq (,$(shell dpkg-query -f '$${Version}' -W libpcre2-dev)) - OPTS += USE_LIBPCRE2=1 -else - OPTS += USE_LIBPCRE1=1 -endif TMP = $(CURDIR)/debian/tmp GIT = $(CURDIR)/debian/git -- 2.19.1
