zabbly: Tweak Debian packaging

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

contrib/debian/changelog.in

@@ -1,8 +1,8 @@
-openzfs-linux (@VERSION@-1) unstable; urgency=low
+openzfs-linux (2.2.0~rc3-amd64-202308241729-ubuntu22.04) jammy; urgency=medium
 
-  * OpenZFS @VERSION@ is tagged.
+  * Automated ZFS build
 
- -- Umer Saleem <usaleem@ixsystems.com>  Wed, 15 Nov 2023 15:00:00 +0500
+ -- Zabbly ZFS builds <info@zabbly.com>  Thu, 24 Aug 2023 13:29:37 -0400
 
 openzfs-linux (2.2.0-0) unstable; urgency=low
 

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),
@@ -34,6 +34,7 @@ Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libnvpair1, libnvpair3
 Replaces: libnvpair1, libnvpair3, libnvpair3linux
+Provides: libnvpair3linux
 Conflicts: libnvpair3linux
 Description: Solaris name-value library for Linux
  This library provides routines for packing and unpacking nv pairs for
@@ -44,6 +45,7 @@ Package: openzfs-libpam-zfs
 Section: contrib/admin
 Architecture: linux-any
 Depends: libpam-runtime, ${misc:Depends}, ${shlibs:Depends}
+Provides: libpam-zfs
 Replaces: libpam-zfs
 Conflicts: libpam-zfs
 Description: PAM module for managing encryption keys for ZFS
@@ -59,6 +61,7 @@ Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libuutil1, libuutil3
+Provides: libuutil3linux
 Replaces: libuutil1, libuutil3, libuutil3linux
 Conflicts: libuutil3linux
 Description: Solaris userland utility library for Linux
@@ -84,7 +87,7 @@ Depends: libssl-dev | libssl1.0-dev,
          ${misc:Depends}
 Replaces: libzfslinux-dev
 Conflicts: libzfslinux-dev
-Provides: libnvpair-dev, libuutil-dev
+Provides: libnvpair-dev, libuutil-dev, libzfslinux-dev
 Description: OpenZFS filesystem development files for Linux
  Header files and static libraries for compiling software against
  libraries of OpenZFS filesystem.
@@ -100,6 +103,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988521
 Recommends: libcurl4
 Breaks: libzfs2, libzfs4
+Provides: libzfs4linux
 Replaces: libzfs2, libzfs4, libzfs4linux
 Conflicts: libzfs4linux
 Description: OpenZFS filesystem library for Linux - general support
@@ -114,6 +118,7 @@ Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libzfs2, libzfs4
+Provides: libzfsbootenv1linux
 Replaces: libzfs2, libzfs4, libzfsbootenv1linux
 Conflicts: libzfsbootenv1linux
 Description: OpenZFS filesystem library for Linux - label info support
@@ -128,6 +133,7 @@ Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libzpool2, libzpool5
+Provides: libzpool5linux
 Replaces: libzpool2, libzpool5, libzpool5linux
 Conflicts: libzpool5linux
 Description: OpenZFS pool library for Linux
@@ -144,6 +150,7 @@ Depends: python3-cffi,
          openzfs-zfsutils (= ${binary:Version}),
          ${misc:Depends},
          ${python3:Depends}
+Provides: python3-pyzfs
 Replaces: python3-pyzfs
 Conflicts: python3-pyzfs
 Description: wrapper for libzfs_core C library
@@ -162,9 +169,10 @@ 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
+Provides: pyzfs-doc
 Replaces: pyzfs-doc
 Conflicts: pyzfs-doc
 Description: wrapper for libzfs_core C library (documentation)
@@ -184,7 +192,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,
@@ -197,7 +205,7 @@ Recommends: openzfs-zfs-zed, openzfs-zfsutils (>= ${source:Version}), ${linux:Re
 Suggests: debhelper
 Breaks: spl-dkms (<< 0.8.0~rc1)
 Replaces: spl-dkms, zfs-dkms
-Provides: openzfs-zfs-modules
+Provides: openzfs-zfs-modules, zfs-dkms
 Description: OpenZFS filesystem kernel modules for Linux
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
@@ -207,13 +215,14 @@ 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,
          openzfs-zfsutils (>= ${source:Version}),
          ${misc:Depends}
 Breaks: zfsutils-linux (<= 0.7.11-2)
+Provides: zfs-initramfs
 Replaces: zfsutils-linux (<= 0.7.11-2), zfs-initramfs
 Conflicts: zfs-initramfs
 Description: OpenZFS root filesystem capabilities for Linux - initramfs
@@ -225,12 +234,13 @@ 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}),
          ${misc:Depends}
 Conflicts: zfs-dracut
+Provides: zfs-dracut
 Replaces: zfs-dracut
 Description: OpenZFS root filesystem capabilities for Linux - dracut
  OpenZFS is a storage platform that encompasses the functionality of
@@ -262,7 +272,7 @@ Conflicts: zfs, zfs-fuse, zfsutils-linux
 Suggests: nfs-kernel-server,
           samba-common-bin (>= 3.0.23),
           openzfs-zfs-initramfs | openzfs-zfs-dracut
-Provides: openzfsutils
+Provides: openzfsutils, zfsutils-linux
 Description: command-line tools to manage OpenZFS filesystems
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
@@ -280,6 +290,7 @@ Depends: openzfs-zfs-modules | openzfs-zfs-dkms,
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: zfs, zfs-zed
+Provides: zfs-zed
 Replaces: zfs-zed
 Description: OpenZFS Event Daemon
  OpenZFS is a storage platform that encompasses the functionality of
@@ -314,6 +325,7 @@ Depends: acl,
          ${shlibs:Depends}
 Recommends: nfs-kernel-server
 Breaks: zfsutils-linux (<= 0.7.9-2)
+Provides: zfs-test
 Replaces: zfsutils-linux (<= 0.7.9-2), zfs-test
 Conflicts: zutils, zfs-test
 Description: OpenZFS test infrastructure and support scripts

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