From 58f48b2b218faf1ccbe59ad25b956f4da948ec30 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Fri, 8 Jan 2021 17:23:17 +0100 Subject: [PATCH] distro: introduce upstream cznic release prefix using cznic.1 release string for upstream packages ensures they are prefered over downstream ones and that their versions don't collide which was causing issues for users with both downstream and upstream packaging repos enabled. Following statements are true according to `dpkg --compare-versions`: 1.2.3-1 < 1.2.3-cznic.1 1.2.3-999 < 1.2.3-cznic.1 So upstream packages should always take precedence over downstream packages of the same version. --- distro/deb/changelog | 2 +- distro/rpm/knot-resolver.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distro/deb/changelog b/distro/deb/changelog index b0a6a3f1a..4d6f28b94 100644 --- a/distro/deb/changelog +++ b/distro/deb/changelog @@ -1,4 +1,4 @@ -knot-resolver (__VERSION__-1) unstable; urgency=medium +knot-resolver (__VERSION__-cznic.1) unstable; urgency=medium * move changelog to OBS * see NEWS or https://knot-resolver.cz diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec index 66d011510..45870cefb 100644 --- a/distro/rpm/knot-resolver.spec +++ b/distro/rpm/knot-resolver.spec @@ -10,7 +10,7 @@ Name: knot-resolver Version: %{VERSION} -Release: 1%{?dist} +Release: cznic.1%{?dist} Summary: Caching full DNS Resolver License: GPL-3.0-or-later -- 2.47.2