Bug#911997: git: Apply diff from Ubuntu
Hello, On 15/09/2019 04:55, Anders Kaseorg wrote: > Never mind, it looks like I wasn’t added to the Debian upload ACL, so my > upload was rejected. Sorry to jump into this discussion but it looks like the "git" package in Ubuntu is still different from the one in Debian. It looks like everything is/was ready but it was not applied for some reasons. Is there anything blocking to apply this diff from Ubuntu? Is there something I can do to help? Cheers, Matt PS: oops, it looks like I accidentally sent the previous draft of this message, pressing "Send" instead of "Save", sorry for that... The week is starting well... :) -- Tessares | Belgium | Hybrid Access Solutions www.tessares.net
Bug#911997: git: Apply diff from Ubuntu
On 15/09/2019 04:55, Anders Kaseorg wrote: > Never mind, it looks like I wasn’t added to the Debian upload ACL, so my > upload was rejected. > > Anders > > -- Tessares | Belgium | Hybrid Access Solutions www.tessares.net
Bug#911997: git: Apply diff from Ubuntu
Never mind, it looks like I wasn’t added to the Debian upload ACL, so my upload was rejected. Anders
Bug#911997: git: Apply diff from Ubuntu
I’ve gone ahead and uploaded these changes. Since I don’t have access to the repository on repo.or.cz, I’ve pushed my commits to https://salsa.debian.org/andersk-guest/git debian-sid. Jonathan, you can mirror these to repo.or.cz at your convenience, or we can take this opportunity to set up a shared repository on salsa. Anders
Bug#911997: git: Apply diff from Ubuntu
Ping! Jeremy On Wed, Jan 23, 2019 at 11:51 AM Jeremy Bicha wrote: > > 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
Bug#911997: git: Apply diff from Ubuntu
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
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
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
Uploaders: Jonathan Nieder , Anders Kaseorg
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
Bug#911997: git: Apply diff from Ubuntu
Hi, I thought you might have forgotten about this bug and proposed patch since it hasn't been included in your recent Debian releases for git. Thanks, Jeremy Bicha
Bug#911997: git: Apply diff from Ubuntu
On Sun, Dec 2, 2018 at 8:39 PM Jonathan Nieder wrote: > No, I didn't. I wonder if there was a mail delivery outage from the BTS > or something. Are you subscribed to https://tracker.debian.org/pkg/git ? The BTS itself only directly emails the listed Maintainer and not Uploaders. Anyone else can use Tracker to subscribe to bug mail. > Is there a way to distinguish between Ubuntu main builds and builds of > the PPA https://launchpad.net/~git-core/+archive/ubuntu/ppa? I am unaware of an official method for a package to identify that it's being built in a PPA. If it's really important, maybe you could grep for the ppa in the /etc/apt/ directory. Thanks, Jeremy Bicha
Bug#911997: git: Apply diff from Ubuntu
Hi Jeremy, Jeremy Bicha wrote: > Did you see https://bugs.debian.org/911997 ? No, I didn't. I wonder if there was a mail delivery outage from the BTS or something. > I believe you were interested before in getting the Debian and Ubuntu > packaging for git in sync so that Ubuntu would automatically sync the > latest stable git release (at least until the Debian Import Freeze > deadline). > > Please see my commits at > https://salsa.debian.org/jbicha/git/merge_requests/1 which should make > this possible. > > If we're lucky, maybe Ubuntu will promote pcre2 to main this cycle, > but it's probably best not to assume that will happen. Hooray, thank you! I'll take a look when I get in to work tomorrow morning. > +ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) Is there a way to distinguish between Ubuntu main builds and builds of the PPA https://launchpad.net/~git-core/+archive/ubuntu/ppa? If not, then that's fine and Anders may be able to just override this line, but I thought I should ask. Sincerely, Jonathan
Bug#911997: git: Apply diff from Ubuntu
Jonathan, Did you see https://bugs.debian.org/911997 ? Thanks, Jeremy Bicha
Bug#911997: git: Apply diff from Ubuntu
Source: git Version: 1:2.19.1-1 Tags: patch I believe you were interested before in getting the Debian and Ubuntu packaging for git in sync so that Ubuntu would automatically sync the latest stable git release (at least until the Debian Import Freeze deadline). Please see my commits at https://salsa.debian.org/jbicha/git/merge_requests/1 which should make this possible. If we're lucky, maybe Ubuntu will promote pcre2 to main this cycle, but it's probably best not to assume that will happen. Thanks, Jeremy Bicha
