Skip to content

Commit ad0506a

Browse files
committed
feat: debian packaging modifications for Pop!_OS
1 parent 0c71cad commit ad0506a

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
lines changed

debian/control

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,23 @@ Depends: ${misc:Depends}, ${shlibs:Depends}
107107
# The libcurl4 is loaded through dlopen("libcurl.so.4").
108108
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988521
109109
Recommends: libcurl4
110-
Breaks: libzfs2, libzfs4, libzfs4linux
111-
Replaces: libzfs2, libzfs4, libzfs4linux
110+
Breaks: libzfs2, libzfs4, libzfs4linux (<< 2.3.0)
111+
Replaces: libzfs2, libzfs4, libzfs4linux (<< 2.3.0)
112112
Description: OpenZFS filesystem library for Linux - general support
113113
OpenZFS is a storage platform that encompasses the functionality of
114114
traditional filesystems and volume managers. It supports data checksums,
115115
compression, encryption, snapshots, and more.
116116
.
117117
The OpenZFS library provides support for managing OpenZFS filesystems.
118118

119+
Package: libzfs4linux
120+
Section: contrib/libs
121+
Architecture: linux-any
122+
Depends: libzfs6linux
123+
Description: Transitional package for libzfs6linux
124+
This is a transitional package for libzfs6linux, and can be
125+
safely removed after the installation is complete.
126+
119127
Package: libzfsbootenv1linux
120128
Section: contrib/libs
121129
Architecture: linux-any
@@ -135,15 +143,23 @@ Section: contrib/libs
135143
Architecture: linux-any
136144
Multi-Arch: same
137145
Depends: ${misc:Depends}, ${shlibs:Depends}
138-
Breaks: libzpool2, libzpool5, libzpool5linux
139-
Replaces: libzpool2, libzpool5, libzpool5linux
146+
Breaks: libzpool2, libzpool5, libzpool5linux (<< 2.3.0)
147+
Replaces: libzpool2, libzpool5, libzpool5linux (<< 2.3.0)
140148
Description: OpenZFS pool library for Linux
141149
OpenZFS is a storage platform that encompasses the functionality of
142150
traditional filesystems and volume managers. It supports data checksums,
143151
compression, encryption, snapshots, and more.
144152
.
145153
This zpool library provides support for managing zpools.
146154

155+
Package: libzpool5linux
156+
Section: contrib/libs
157+
Architecture: linux-any
158+
Depends: libzpool6linux
159+
Description: Transitional package for libzpool6linux
160+
This is a transitional package for libzpool6linux, and can be
161+
safely removed after the installation is complete.
162+
147163
Package: python3-pyzfs
148164
Section: contrib/python
149165
Architecture: linux-any

debian/rules

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ override_dh_auto_build:
7979
dh_auto_build
8080

8181
override_dh_auto_test:
82-
ifeq (amd64,$(DEB_HOST_ARCH))
83-
# Upstream provides an ABI guarantee that we validate here
84-
-$(MAKE) checkabi
85-
endif
82+
#ifeq (amd64,$(DEB_HOST_ARCH))
83+
# # Upstream provides an ABI guarantee that we validate here
84+
# -$(MAKE) checkabi
85+
#endif
8686

8787
# The dh_auto_test rule is disabled because
8888
# `make check` cannot run in an unprivileged build environment.

debian/source/format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0 (quilt)
1+
3.0 (native)

0 commit comments

Comments
 (0)