From: Jakub Ružička <jakub.ruzicka@nic.cz>
Date: Thu, 6 Jun 2024 15:04:24 +0000 (+0200)
Subject: distro/pkg/deb: run `wrap-and-sort -bast` for git friendlier formatting
X-Git-Tag: v6.0.8~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdce7b87dc8f91e6770597c8109f380c19a44693;p=thirdparty%2Fknot-resolver.git

distro/pkg/deb: run `wrap-and-sort -bast` for git friendlier formatting
---

diff --git a/distro/pkg/deb/control b/distro/pkg/deb/control
index 7b97da5b0..173a3bc81 100644
--- a/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@ -5,26 +5,26 @@ Maintainer: Knot Resolver <knot-resolver@labs.nic.cz>
 Build-Depends:
  debhelper (>= 12~),
  dh-python,
+ libcap-ng-dev,
  libcmocka-dev (>= 1.0.0),
  libfstrm-dev,
  libgnutls28-dev,
+ libjemalloc-dev,
  libknot-dev (>= 3.0.2),
  liblmdb-dev,
  libluajit-5.1-dev,
  libnghttp2-dev,
  libprotobuf-c-dev,
+ libssl-dev,
  libsystemd-dev (>= 227) [linux-any],
- libcap-ng-dev,
  libuv1-dev,
- libjemalloc-dev,
  luajit,
- pkg-config,
  meson (>= 0.49),
+ pkg-config,
  protobuf-c-compiler,
  python3,
  python3-dev,
  python3-setuptools,
- libssl-dev,
 Standards-Version: 4.7.0
 Homepage: https://www.knot-resolver.cz/
 Rules-Requires-Root: no
@@ -40,8 +40,8 @@ Depends:
  supervisor,
  systemd,
  ${misc:Depends},
- ${shlibs:Depends},
  ${python3:Depends},
+ ${shlibs:Depends},
 Breaks:
  knot-resolver (<< 6),
  knot-resolver-core (<< 6.0.8),
@@ -84,7 +84,7 @@ Architecture: any
 Depends:
  knot-resolver6 (= ${binary:Version}),
  ${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Section: libdevel
 Description: Knot Resolver development files
  This package provides the development headers for Knot Resolver.
diff --git a/distro/pkg/deb/knot-resolver6-module-http.install b/distro/pkg/deb/knot-resolver6-module-http.install
index ffa04d01a..ff9d94a3b 100644
--- a/distro/pkg/deb/knot-resolver6-module-http.install
+++ b/distro/pkg/deb/knot-resolver6-module-http.install
@@ -1,7 +1,7 @@
 usr/lib/knot-resolver/kres_modules/http*.lua
-usr/lib/knot-resolver/kres_modules/prometheus.lua
 usr/lib/knot-resolver/kres_modules/http/*.css
 usr/lib/knot-resolver/kres_modules/http/*.ico
 usr/lib/knot-resolver/kres_modules/http/*.js
 usr/lib/knot-resolver/kres_modules/http/*.tpl
 usr/lib/knot-resolver/kres_modules/http/*.woff2
+usr/lib/knot-resolver/kres_modules/prometheus.lua
diff --git a/distro/pkg/deb/knot-resolver6.dirs b/distro/pkg/deb/knot-resolver6.dirs
index f8981d8db..375cca35b 100644
--- a/distro/pkg/deb/knot-resolver6.dirs
+++ b/distro/pkg/deb/knot-resolver6.dirs
@@ -1,2 +1,2 @@
-/var/lib/knot-resolver
 /var/cache/knot-resolver
+/var/lib/knot-resolver