Control: tags -1 patch
Axel Beckert wrote on Thu, 28 Jun 2018 11:24 +0200:
> Daniel Shahaf wrote:
> > If that's the case, then removing the override_dh_installchangelogs
> > target would be the correct fix.
>
> Yes.
>
Okay. In this case the attached patch should fix it.
Getting a bit ahead of myself, we don't seem to have anywhere to push
that patch now, since the package's repository was on alioth and hasn't
been migrated to salsa. I'll have to look into migrating that. (Also would
need to test the patch and tag an 0.6.0-2 that has it.)
> > Does this make senes?
>
> Now that I verified that your guess was right, yes. :-)
Thanks again your the help, Axel. :-)
Daniel
From 7ce9697ed43d20e9a10fce052516b4b324654c6c Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <danie...@apache.org>
Date: Thu, 28 Jun 2018 09:29:06 +0000
Subject: [PATCH] Bump debhelper dependency to 11.3 and rely on new
dh_installchangelogs deduplication features. Closes: #902526.
---
debian/changelog | 2 ++
debian/control | 2 +-
debian/rules | 5 -----
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 233eab7..725c862 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ zsh-syntax-highlighting (0.6.0-1+git) UNRELEASED; urgency=medium
Debian maintainer and the upstream maintainer are currently the same
person.)
+ §9.2.3: Patch unit test to use /nonexistent. No functional change.
+ * Bump debhelper dependency to 11.3 and rely on new dh_installchangelogs
+ deduplication features. Closes: #902526.
-- Daniel Shahaf <danie...@apache.org> Wed, 30 Aug 2017 08:06:24 +0000
diff --git a/debian/control b/debian/control
index 16f9a20..4e10b7e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Zsh Maintainers <pkg-zsh-de...@lists.alioth.debian.org>
Uploaders: Daniel Shahaf <danie...@apache.org>
Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11.3),
zsh,
Standards-Version: 4.1.1
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-zsh/zsh-syntax-highlighting.git/
diff --git a/debian/rules b/debian/rules
index f8e3ec6..76ab9b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,6 @@ override_dh_auto_install:
dh_auto_install -- PREFIX=$(PREFIX)
rm debian/$(NAME)/usr/share/doc/$(NAME)/COPYING.md
-# Remove 'changelog.md' which both upstream and debhelper install to different names
-override_dh_installchangelogs:
- dh_installchangelogs
- rm debian/$(NAME)/usr/share/doc/$(NAME)/changelog.md
-
%:
dh $@
