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.

diff --git a/distro/deb/changelog b/distro/deb/changelog
index b0a6a3f1adb7f68395a3c16b5ec6ccdbed7edc76..4d6f28b94f9373328649372c46a4e3956abdfc49 100644 (file)
--- 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 66d0115106bc3189be8a3ffefec4e2a8e0f49226..45870cefb39d9ea0c988e45067252d239cfb699c 100644 (file)
--- 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