zabbly: Tweak Debian packaging

Signed-off-by: Stéphane Graber <[email protected]>

contrib/debian/changelog

@@ -1,3 +1,9 @@
+openzfs-linux (2.2.0~rc3-amd64-202308241729-ubuntu22.04) jammy; urgency=medium
+
+  * Automated ZFS build
+
+ -- Zabbly ZFS builds <[email protected]>  Thu, 24 Aug 2023 13:29:37 -0400
+
 openzfs-linux (2.2.0-0) unstable; urgency=low
 
   * OpenZFS 2.2.0 is tagged.

contrib/debian/control

@@ -1,7 +1,7 @@
 Source: openzfs-linux
 Section: contrib/kernel
 Priority: optional
-Maintainer: ZFS on Linux specific mailing list <[email protected]>
+Maintainer: Zabbly ZFS builds <[email protected]>
 Build-Depends: debhelper-compat (= 12),
                dh-python,
                dh-sequence-dkms | dkms (>> 2.1.1.2-5),
@@ -162,7 +162,7 @@ Description: wrapper for libzfs_core C library
 
 Package: openzfs-pyzfs-doc
 Section: contrib/doc
-Architecture: all
+Architecture: any
 Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Recommends: openzfs-python3-pyzfs
 Replaces: pyzfs-doc
@@ -184,7 +184,7 @@ Description: wrapper for libzfs_core C library (documentation)
  This package contains the documentation.
 
 Package: openzfs-zfs-dkms
-Architecture: all
+Architecture: any
 Depends: dkms (>> 2.1.1.2-5),
          file,
          libc6-dev | libc-dev,
@@ -208,7 +208,7 @@ Description: OpenZFS filesystem kernel modules for Linux
  OpenZFS.
 
 Package: openzfs-zfs-initramfs
-Architecture: all
+Architecture: any
 Depends: busybox-initramfs | busybox-static | busybox,
          initramfs-tools,
          openzfs-zfs-modules | openzfs-zfs-dkms,
@@ -226,7 +226,7 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs
  for the initramfs-tools infrastructure.
 
 Package: openzfs-zfs-dracut
-Architecture: all
+Architecture: any
 Depends: dracut,
          openzfs-zfs-modules | openzfs-zfs-dkms,
          openzfs-zfsutils (>= ${source:Version}),

contrib/debian/openzfs-zfs-dkms.templates

@@ -1,7 +1,7 @@
 Template: zfs-dkms/stop-build-for-32bit-kernel
 Type: boolean
 Default: true
-_Description: Abort building OpenZFS on a 32-bit kernel?
+Description: Abort building OpenZFS on a 32-bit kernel?
  You are attempting to build OpenZFS against a 32-bit running kernel.
  .
  Although possible, building in a 32-bit environment is unsupported and
@@ -13,7 +13,7 @@ _Description: Abort building OpenZFS on a 32-bit kernel?
 Template: zfs-dkms/stop-build-for-unknown-kernel
 Type: boolean
 Default: true
-_Description: Abort building OpenZFS on an unknown kernel?
+Description: Abort building OpenZFS on an unknown kernel?
  You are attempting to build OpenZFS against a running kernel that could not
  be identified as 32-bit or 64-bit. If you are not completely sure that
  the running kernel is a 64-bit one, you should probably stop the build.
@@ -26,7 +26,7 @@ _Description: Abort building OpenZFS on an unknown kernel?
 
 Template: zfs-dkms/note-incompatible-licenses
 Type: note
-_Description: Licenses of OpenZFS and Linux are incompatible
+Description: Licenses of OpenZFS and Linux are incompatible
  OpenZFS is licensed under the Common Development and Distribution License (CDDL),
  and the Linux kernel is licensed under the GNU General Public License Version 2
  (GPL-2). While both are free open source licenses they are restrictive

contrib/debian/rules.in

@@ -27,12 +27,6 @@ NJOBS    = -j$(or $(PARALLEL),$(NUM_CPUS),1)
 %:
 	dh $@ --with autoreconf,dkms,python3,sphinxdoc
 
-override_dh_autoreconf:
-	@# Embed the downstream version in the module.
-	@sed -e 's/^Version:.*/Version:       $(DEB_VERSION_UPSTREAM)/' -i.orig META
-
-	dh_autoreconf
-
 override_dh_auto_configure:
 	@# Build the userland, but don't build the kernel modules.
 	dh_auto_configure -- @CFGOPTS@ \
@@ -64,6 +58,7 @@ override_dh_auto_build:
 	@# This creates the $(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/ tree, which does not
 	@# contain the userland sources. NB: Remove-userland-dist-rules.patch
 	$(MAKE) distdir
+	mv zfs-*/ $(NAME)-$(DEB_VERSION_UPSTREAM)
 
 	dh_auto_build