drop libkres9 and libkres-dev packages

Debian packaging as of 3.2.1-3 is no longer shipping libkres9 or
libkres-dev (see https://bugs.debian.org/923970).  This brings the
upstream debian-style packaging in line with the Debian packaging on
that front.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>

diff --git a/distro/deb/control b/distro/deb/control
index f0dc9ae8917c91b3ab4279aed8e08782f35985c5..4e5ba1d6cbc2e34debf08fce4ef5c912ac969315 100644 (file)
--- a/distro/deb/control
+++ b/distro/deb/control
@@ -28,13 +28,16 @@ Architecture: any
 Depends:
  adduser,
  dns-root-data,
- libkres9 (= ${binary:Version}),
  lua-sec,
  lua-socket,
  lua-filesystem,
  systemd,
  ${misc:Depends},
  ${shlibs:Depends},
+Replaces:
+  libkres9 (<< 3.2.1-2),
+Breaks:
+  libkres9 (<< 3.2.1-2),
 Recommends:
  knot-resolver-module-http,
  lua-cqueues,
@@ -94,44 +97,3 @@ Description: Documentation for Knot Resolver
  validator, and many external.
  .
  This package contains Knot Resolver Documentation.
-
-Package: libkres9
-Architecture: any
-Section: libs
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
-Breaks:
- knot-resolver (<< 3.2.0-1),
-Replaces:
- knot-resolver (<< 3.2.0-1),
-Description: caching, DNSSEC-validating DNS resolver (shared library)
- The Knot Resolver is a caching full resolver implementation
- written in C and LuaJIT, including both a resolver library and a
- daemon. Modular architecture of the library keeps the core tiny and
- efficient, and provides a state-machine like API for
- extensions.
- .
- This package contains the libkres shared library used by Knot
- Resolver.
-
-Package: libkres-dev
-Architecture: any
-Section: libdevel
-Depends:
- libkres9 (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends},
-Breaks:
- knot-resolver (<< 3.2.0-1),
-Replaces:
- knot-resolver (<< 3.2.0-1),
-Description: caching, DNSSEC-validating DNS resolver (shared library development files)
- The Knot Resolver is a caching full resolver implementation
- written in C and LuaJIT, including both a resolver library and a
- daemon. Modular architecture of the library keeps the core tiny and
- efficient, and provides a state-machine like API for
- extensions.
- .
- This package provides development files for use when building against
- the libkres shared library.

diff --git a/distro/deb/knot-resolver.install b/distro/deb/knot-resolver.install
index 7831166066b5ec6039dcdf6b84aa4bc6e861e02d..56ba4d233e52408e1c5e43159f8e46defaf3cd23 100644 (file)
--- a/distro/deb/knot-resolver.install
+++ b/distro/deb/knot-resolver.install
@@ -1,5 +1,6 @@
 etc/knot-resolver/kresd.conf
 usr/lib/systemd/system/* lib/systemd/system/
+usr/lib/*.so.*
 usr/lib/tmpfiles.d/knot-resolver.conf
 usr/lib/knot-resolver/*.so
 usr/lib/knot-resolver/*.lua

diff --git a/distro/deb/libkres-dev.install b/distro/deb/libkres-dev.install
deleted file mode 100644 (file)
index d565b38..0000000
--- a/distro/deb/libkres-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/libkres/*.h
-usr/lib/*.so
-usr/lib/pkgconfig/libkres.pc

diff --git a/distro/deb/libkres9.install b/distro/deb/libkres9.install
deleted file mode 100644 (file)
index 093956b..0000000
--- a/distro/deb/libkres9.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*.so.*

diff --git a/distro/deb/libkres9.symbols b/distro/deb/libkres9.symbols
deleted file mode 100644 (file)
index a1a2477..0000000
--- a/distro/deb/libkres9.symbols
+++ /dev/null
@@ -1,145 +0,0 @@
-libkres.so.9 libkres9 #MINVER#
- cache_api@Base 2.1.0
- iterate_api@Base 2.1.0
- kr_bitcmp@Base 2.1.0
- kr_cache_clear@Base 2.1.0
- kr_cache_close@Base 2.1.0
- kr_cache_closest_apex@Base 3.1.0
- kr_cache_emergency_file_to_remove@Base 3.1.0
- kr_cache_insert_rr@Base 3.0.0
- kr_cache_match@Base 3.1.0
- kr_cache_materialize@Base 2.1.0
- kr_cache_open@Base 2.1.0
- kr_cache_peek_exact@Base 2.1.0
- kr_cache_remove@Base 3.1.0
- kr_cache_remove_subtree@Base 3.1.0
- kr_cache_sync@Base 2.1.0
- kr_cache_ttl@Base 2.1.0
- kr_cdb_lmdb@Base 2.1.0
- kr_crypto_cleanup@Base 2.1.0
- kr_crypto_init@Base 2.1.0
- kr_crypto_reinit@Base 2.1.0
- kr_dnssec_key_ksk@Base 2.1.0
- kr_dnssec_key_match@Base 2.1.0
- kr_dnssec_key_revoked@Base 2.1.0
- kr_dnssec_key_tag@Base 2.1.0
- kr_dnssec_key_zsk@Base 2.1.0
- kr_family_len@Base 2.1.0
- kr_inaddr@Base 2.1.0
- kr_inaddr_family@Base 2.1.0
- kr_inaddr_len@Base 2.1.0
- kr_inaddr_port@Base 2.1.0
- kr_inaddr_set_port@Base 3.1.0
- kr_inaddr_str@Base 2.1.0
- kr_log_qverbose_impl@Base 3.2.0
- kr_log_trace@Base 2.1.0
- kr_log_verbose@Base 2.1.0
- kr_make_query@Base 3.0.0
- kr_memreserve@Base 2.1.0
- kr_module_call@Base 2.1.0
- kr_module_embedded@Base 2.1.0
- kr_module_load@Base 2.1.0
- kr_module_unload@Base 2.1.0
- kr_now@Base 2.1.0
- kr_nsrep_elect@Base 2.1.0
- kr_nsrep_elect_addr@Base 2.1.0
- kr_nsrep_set@Base 2.1.0
- kr_nsrep_sort@Base 3.2.0
- kr_nsrep_update_rep@Base 2.1.0
- kr_nsrep_update_rtt@Base 2.1.0
- kr_pkt_clear_payload@Base 2.1.0
- kr_pkt_make_auth_header@Base 2.1.0
- kr_pkt_put@Base 2.1.0
- kr_pkt_qclass@Base 3.0.0
- kr_pkt_qtype@Base 3.0.0
- kr_pkt_recycle@Base 2.1.0
- kr_qflags_clear@Base 2.1.0
- kr_qflags_set@Base 2.1.0
- kr_ranked_rrarray_add@Base 2.1.0
- kr_resolve_begin@Base 2.1.0
- kr_resolve_checkout@Base 2.1.0
- kr_resolve_consume@Base 2.1.0
- kr_resolve_finish@Base 2.1.0
- kr_resolve_plan@Base 2.1.0
- kr_resolve_pool@Base 2.1.0
- kr_resolve_produce@Base 2.1.0
- kr_rnd_buffered@Base 3.2.0
- kr_rplan_deinit@Base 2.1.0
- kr_rplan_empty@Base 2.1.0
- kr_rplan_find_resolved@Base 2.1.0
- kr_rplan_init@Base 2.1.0
- kr_rplan_last@Base 2.1.0
- kr_rplan_pop@Base 2.1.0
- kr_rplan_push@Base 2.1.0
- kr_rplan_push_empty@Base 2.1.0
- kr_rplan_resolved@Base 2.1.0
- kr_rplan_satisfies@Base 2.1.0
- kr_rrkey@Base 2.1.0
- kr_rrset_init@Base 3.0.0
- kr_rrsig_sig_expiration@Base 3.0.0
- kr_rrsig_sig_inception@Base 3.0.0
- kr_rrsig_type_covered@Base 3.0.0
- kr_sockaddr_cmp@Base 3.0.0
- kr_sockaddr_len@Base 2.1.0
- kr_straddr_family@Base 2.1.0
- kr_straddr_join@Base 2.1.0
- kr_straddr_socket@Base 2.1.0
- kr_straddr_split@Base 2.1.0
- kr_straddr_subnet@Base 2.1.0
- kr_strcatdup@Base 2.1.0
- kr_strptime_diff@Base 99
- kr_ta_add@Base 2.1.0
- kr_ta_clear@Base 2.1.0
- kr_ta_covers@Base 2.1.0
- kr_ta_covers_qry@Base 2.1.0
- kr_ta_del@Base 2.1.0
- kr_ta_get@Base 2.1.0
- kr_ta_get_longest_name@Base 2.1.0
- kr_unpack_cache_key@Base 3.1.0
- kr_verbose_set@Base 2.1.0
- kr_verbose_status@Base 2.1.0
- kr_zonecut_add@Base 3.2.0
- kr_zonecut_copy@Base 2.1.0
- kr_zonecut_copy_trust@Base 2.1.0
- kr_zonecut_deinit@Base 2.1.0
- kr_zonecut_del@Base 3.2.0
- kr_zonecut_del_all@Base 2.1.0
- kr_zonecut_find@Base 2.1.0
- kr_zonecut_find_cached@Base 2.1.0
- kr_zonecut_init@Base 2.1.0
- kr_zonecut_is_empty@Base 3.0.0
- kr_zonecut_move@Base 3.2.0
- kr_zonecut_set@Base 2.1.0
- kr_zonecut_set_sbelt@Base 2.1.0
- lru_apply_impl@Base 2.1.0
- lru_create_impl@Base 2.1.0
- lru_free_items_impl@Base 2.1.0
- lru_get_impl@Base 2.1.0
- map_clear@Base 2.1.0
- map_contains@Base 2.1.0
- map_del@Base 2.1.0
- map_get@Base 2.1.0
- map_set@Base 2.1.0
- map_walk_prefixed@Base 2.1.0
- mm_realloc@Base 3.2.0
- queue_deinit_impl@Base 3.1.0
- queue_init_impl@Base 3.1.0
- queue_push_head_impl@Base 3.1.0
- queue_push_impl@Base 3.1.0
- trie_clear@Base 3.0.0
- trie_create@Base 3.0.0
- trie_del@Base 3.0.0
- trie_del_first@Base 3.1.0
- trie_free@Base 3.0.0
- trie_get_first@Base 3.1.0
- trie_get_ins@Base 3.0.0
- trie_get_leq@Base 3.1.0
- trie_get_try@Base 3.0.0
- trie_it_begin@Base 3.0.0
- trie_it_finished@Base 3.0.0
- trie_it_free@Base 3.0.0
- trie_it_key@Base 3.0.0
- trie_it_next@Base 3.0.0
- trie_it_val@Base 3.0.0
- trie_weight@Base 3.0.0
- validate_api@Base 2.1.0

diff --git a/distro/deb/not-installed b/distro/deb/not-installed
index ee9c1044b4a20c598af9922b912bfeab67941c29..3c6707a8310d6533447e47ee75dfc565c319c7e7 100644 (file)
--- a/distro/deb/not-installed
+++ b/distro/deb/not-installed
@@ -1,3 +1,6 @@
 usr/lib/knot-resolver/kres_modules/http/LICENSE
 usr/lib/knot-resolver/kres_modules/etcd.lua
 debian/tmp/usr/share/doc/knot-resolver/html/.buildinfo
+usr/include/libkres/*.h
+usr/lib/*.so
+usr/lib/pkgconfig/libkres.pc