Followup-For: Bug #1027869 Control: tag -1 patch pending Hi,
In order to be able to drop the dkms -> dh-dkms dependency for bookworm I've prepared a NMU and uploaded it to DELAYED/10. Please let me know if I should delay it longer or cancel it. Andreas
diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/changelog dahdi-linux-2.11.1.0.20170917~dfsg/debian/changelog --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/changelog 2023-01-14 15:33:58.000000000 +0100 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/changelog 2023-01-21 01:53:57.000000000 +0100 @@ -1,3 +1,13 @@ +dahdi-linux (1:2.11.1.0.20170917~dfsg-8.2) unstable; urgency=medium + + * Non-maintainer upload. + * Switch to B-D: dh-dkms. (Closes: #1027869) + * Declare Testsuite: autopkgtest-pkg-dkms. + * Use upstream version without dfsg suffix and revision for dkms. + * Skip module build for kernels without CONFIG_USB. + + -- Andreas Beckmann <[email protected]> Sat, 21 Jan 2023 01:53:57 +0100 + dahdi-linux (1:2.11.1.0.20170917~dfsg-8.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/control dahdi-linux-2.11.1.0.20170917~dfsg/debian/control --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/control 2023-01-14 15:33:58.000000000 +0100 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/control 2023-01-20 20:11:53.000000000 +0100 @@ -4,7 +4,7 @@ Maintainer: Debian VoIP Team <[email protected]> Uploaders: Tzafrir Cohen <[email protected]>, Mark Purcell <[email protected]> Build-Depends: debhelper (>= 12), bzip2, asciidoc-base | asciidoc, - dkms, + dh-dkms, module-assistant, tar (>= 1.28) Standards-Version: 4.3.0 @@ -12,6 +12,7 @@ Vcs-Git: https://salsa.debian.org/pkg-voip-team/dahdi-linux.git Vcs-Browser: https://salsa.debian.org/pkg-voip-team/dahdi-linux Rules-Requires-Root: no +Testsuite: autopkgtest-pkg-dkms Package: dahdi-linux Architecture: all diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/dkms.conf.in dahdi-linux-2.11.1.0.20170917~dfsg/debian/dkms.conf.in --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/dkms.conf.in 2023-01-14 15:33:58.000000000 +0100 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/dkms.conf.in 2023-01-21 01:47:08.000000000 +0100 @@ -1,5 +1,8 @@ PACKAGE_VERSION="#CVERSION#" +# the xpp_usb module is only conditionally built but unconditionally listed below +BUILD_EXCLUSIVE_CONFIG="CONFIG_USB" + # Items below here should not have to change with each driver version PACKAGE_NAME="dahdi" MAKE[0]="(make modules KVERS=$kernelver MODULES_EXTRA='dahdi_dummy dahdi_echocan_oslec'; make KVERS=$kernelver)" diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/rules dahdi-linux-2.11.1.0.20170917~dfsg/debian/rules --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/rules 2023-01-14 15:33:58.000000000 +0100 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/rules 2023-01-20 20:12:00.000000000 +0100 @@ -9,9 +9,9 @@ CFLAGS += -g endif -# For DKMS. Use the full release (e.g.: 2.2.1+dfsg-1ubuntu1) +# For DKMS. Use the upstream version without dfsg suffix. include /usr/share/dpkg/pkg-info.mk -CVERSION = DEB_VERSION +DKMS_MODULE_VERSION = $(DEB_VERSION_UPSTREAM:~dfsg=) ## MODULE-ASSISTANT STUFF # prefix of the target package name @@ -70,9 +70,9 @@ exit 1 endif # For DKMS - sed -e "s|#CVERSION#|$(CVERSION)|" \ + sed -e "s|#CVERSION#|$(DKMS_MODULE_VERSION)|" \ debian/dkms.conf.in > debian/dkms.conf - sed -e "s|#CVERSION#|$(CVERSION)|" \ + sed -e "s|#CVERSION#|$(DKMS_MODULE_VERSION)|" \ debian/dahdi-dkms.install.in > debian/dahdi-dkms.install $(MAKE) docs
