Merge ~athos-ribeiro/ubuntu/+source/isc-dhcp:keama into ubuntu/+source/isc-dhcp:ubuntu/devel

[Athos Ribeiro]

This introduces a new binary package in the isc-dhcp package, as proposed in LP: #2020086. The new binary (keama) is a standalone binary to assist users during their config migration to kea.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/keama/+packages

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Athos.

It looks great. The package builds fine, and I verified that the new binary is correctly installed under /usr/sbin. I was going to ask if it's really necessary to install it under sbin, but I guess it doesn't hurt to keep it this way.

I tried to enable testing by executing "dh_auto_test -- -C keama", but it didn't work because apparently there's no Makefile target for it. I wonder if upstream intends to implement this.

I'm leaving some minor suggestions below, but otherwise I'm approving the MP. Thanks.

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks, Sergio!

Uploaded!

diff --git a/debian/changelog b/debian/changelog
index ede5c7f..c591c7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+isc-dhcp (4.4.3-P1-2ubuntu2) mantic; urgency=medium
+
+  * Ship keama, the KEA Migration Assistant in a new isc-dhcp-keama binary
+    package. (LP: #2020086)
+
+ -- Athos Ribeiro <[e-mail]>  Thu, 18 May 2023 21:30:57 -0300
+
 isc-dhcp (4.4.3-P1-2ubuntu1) mantic; urgency=low
 
   * Merge from Debian unstable, remaining changes:
diff --git a/debian/control b/debian/control
index c1498e5..a664acd 100644
--- a/debian/control
+++ b/debian/control
@@ -195,3 +195,15 @@ Description: ISC DHCP relay daemon
  .
  More information can be found in the ISC official announcement:
  https://www.isc.org/blogs/dhcp-client-relay-eom/
+
+Package: isc-dhcp-keama
+Priority: optional
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: KEA Migration Assistant
+ This is an ISC DHCP server to ISC KEA Migration Assistant.
+ .
+ The KEA Migration Assistant (aka keama) is an experimental tool
+ which helps to translate ISC DHCP configurations to Kea.
diff --git a/debian/isc-dhcp-keama.docs b/debian/isc-dhcp-keama.docs
new file mode 100644
index 0000000..8e9cf54
--- /dev/null
+++ b/debian/isc-dhcp-keama.docs
@@ -0,0 +1 @@
+keama/README.md
diff --git a/debian/isc-dhcp-keama.install b/debian/isc-dhcp-keama.install
new file mode 100644
index 0000000..8e8233c
--- /dev/null
+++ b/debian/isc-dhcp-keama.install
@@ -0,0 +1 @@
+usr/sbin/keama
diff --git a/debian/isc-dhcp-keama.manpages b/debian/isc-dhcp-keama.manpages
new file mode 100644
index 0000000..3d42c55
--- /dev/null
+++ b/debian/isc-dhcp-keama.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man8/keama.8
diff --git a/debian/rules b/debian/rules
index f6141e8..dee414a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,9 @@ endif
 %:
 	dh $@ --parallel --with autoreconf
 
+override_dh_clean:
+	dh_clean $@ -Xkeama/tests/samples/*
+
 # Ensure that the bind config.guess/config.sub are unpacked first,
 # otherwise they won't be updated and isc-dhcp will FTBFS on new arches
 # Thanks to Paul Wise
@@ -81,6 +84,13 @@ override_dh_auto_build:
 	test -f Makefile && $(MAKE) distclean || true
 	./configure CFLAGS="$(CFLAGS) -DNSUPDATE" $(CONFFLAGS) LIBS="$(LIBS) -latomic"
 	$(MAKE)
+	# keama build
+	$(MAKE) -C keama
+
+override_dh_auto_install:
+	dh_auto_install
+	# install keama
+	dh_auto_install -- -C keama
 
 override_dh_install:
 	# rename some upstream files