diff options
-rw-r--r-- | debian/btrfs-progs.install | 4 | ||||
-rw-r--r-- | debian/changelog | 4 | ||||
-rw-r--r-- | debian/control | 57 | ||||
-rw-r--r-- | debian/libbtrfs-dev.install | 4 | ||||
-rw-r--r-- | debian/libbtrfs0.install | 1 | ||||
-rw-r--r-- | debian/libbtrfs0.symbols | 48 | ||||
-rw-r--r-- | debian/libbtrfsutil-dev.install | 3 | ||||
-rw-r--r-- | debian/libbtrfsutil1.install | 1 | ||||
-rw-r--r-- | debian/libbtrfsutil1.symbols | 43 | ||||
-rw-r--r-- | debian/patches/python3-use-deb-layout.patch | 16 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rw-r--r-- | debian/python3-btrfsutil.install | 1 | ||||
-rwxr-xr-x | debian/rules | 8 |
13 files changed, 185 insertions, 6 deletions
diff --git a/debian/btrfs-progs.install b/debian/btrfs-progs.install index f74518e2..b50850bd 100644 --- a/debian/btrfs-progs.install +++ b/debian/btrfs-progs.install @@ -1 +1,3 @@ -ioctl.h /usr/include/btrfs +lib/ +bin/ +usr/share/ diff --git a/debian/changelog b/debian/changelog index 87c0f3af..d4f5d16e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,7 @@ btrfs-progs (4.16.1-1) unstable; urgency=medium * New upstream release. * Drop transitional btrfs-tools package. * Drop cross.patch, similar change done upstream. - * Package without libbtrfsutils, or python bindings for now, as these - appear to be statically linked only. Clarification is sought from - linux-btrfs mailing list if these should be publically exposed or not. + * Package libbtrfs, libbtrfsutil, and python bindings. -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 08 May 2018 14:17:03 -0700 diff --git a/debian/control b/debian/control index c7005158..570dcdb5 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,9 @@ Build-Depends: debhelper (>= 10), asciidoc, xmlto, bash-completion, + python3-dev, + python3-setuptools, + dh-python, Standards-Version: 3.9.8 Homepage: http://btrfs.wiki.kernel.org/ Vcs-Browser: https://browse.dgit.debian.org/btrfs-progs.git @@ -35,6 +38,60 @@ Description: Checksumming Copy on Write Filesystem utilities This package contains utilities (mkfs, fsck) used to work with btrfs and an utility (btrfs-convert) to make a btrfs filesystem from an ext3. +Package: libbtrfs0 +Architecture: linux-any +Depends: ${misc:Depends}, ${shlibs:Depends} +Replaces: btrfs-progs (<< 4.16.1-1) +Breaks: btrfs-progs (<< 4.16.1-1) +Description: Checksumming Copy on Write Filesystem utilities (runtime library) + Btrfs is a new copy on write filesystem for Linux aimed at implementing + advanced features while focusing on fault tolerance, repair and easy + administration. + . + This package contains userspace shared code library libbtrfs. + +Package: libbtrfs-dev +Architecture: linux-any +Depends: ${misc:Depends}, ${shlibs:Depends}, libbtrfs0 (= ${binary:Version}) +Replaces: btrfs-progs (<< 4.16.1-1) +Breaks: btrfs-progs (<< 4.16.1-1) +Description: Checksumming Copy on Write Filesystem utilities (development headers) + Btrfs is a new copy on write filesystem for Linux aimed at implementing + advanced features while focusing on fault tolerance, repair and easy + administration. + . + This package contains development headers for the libbtrfs library. + +Package: libbtrfsutil1 +Architecture: linux-any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Checksumming Copy on Write Filesystem utilities (runtime util library) + Btrfs is a new copy on write filesystem for Linux aimed at implementing + advanced features while focusing on fault tolerance, repair and easy + administration. + . + This package contains userspace shared code library libbtrfsutil. + +Package: libbtrfsutil-dev +Architecture: linux-any +Depends: ${misc:Depends}, ${shlibs:Depends}, libbtrfsutil1 (= ${binary:Version}) +Description: Checksumming Copy on Write Filesystem utilities (util development headers) + Btrfs is a new copy on write filesystem for Linux aimed at implementing + advanced features while focusing on fault tolerance, repair and easy + administration. + . + This package contains development headers for the libbtrfsutil library. + +Package: python3-btrfsutil +Architecture: linux-any +Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends} +Description: Checksumming Copy on Write Filesystem utilities (python3 bindings) + Btrfs is a new copy on write filesystem for Linux aimed at implementing + advanced features while focusing on fault tolerance, repair and easy + administration. + . + This package contains python3 bindings. + Package: btrfs-progs-udeb Package-Type: udeb Section: debian-installer diff --git a/debian/libbtrfs-dev.install b/debian/libbtrfs-dev.install new file mode 100644 index 00000000..64b520ab --- /dev/null +++ b/debian/libbtrfs-dev.install @@ -0,0 +1,4 @@ +usr/include/btrfs/*.h +usr/lib/*/libbtrfs.so +usr/lib/*/libbtrfs.a + diff --git a/debian/libbtrfs0.install b/debian/libbtrfs0.install new file mode 100644 index 00000000..e47220f0 --- /dev/null +++ b/debian/libbtrfs0.install @@ -0,0 +1 @@ +usr/lib/*/libbtrfs.so.0* diff --git a/debian/libbtrfs0.symbols b/debian/libbtrfs0.symbols new file mode 100644 index 00000000..9f72cc71 --- /dev/null +++ b/debian/libbtrfs0.symbols @@ -0,0 +1,48 @@ +libbtrfs.so.0 libbtrfs0 #MINVER# + __btrfs_error@Base 4.16.1 + __btrfs_error_on@Base 4.16.1 + __btrfs_warning@Base 4.16.1 + __btrfs_warning_on@Base 4.16.1 + __crc32c_le@Base 4.16.1 + __rb_erase_color@Base 4.16.1 + __rb_insert_augmented@Base 4.16.1 + arg_strtou64@Base 4.16.1 + btrfs_get_subvol@Base 4.16.1 + btrfs_get_toplevel_subvol@Base 4.16.1 + btrfs_list_alloc_comparer_set@Base 4.16.1 + btrfs_list_alloc_filter_set@Base 4.16.1 + btrfs_list_find_updated_files@Base 4.16.1 + btrfs_list_get_default_subvolume@Base 4.16.1 + btrfs_list_get_path_rootid@Base 4.16.1 + btrfs_list_parse_filter_string@Base 4.16.1 + btrfs_list_parse_sort_string@Base 4.16.1 + btrfs_list_path_for_root@Base 4.16.1 + btrfs_list_setup_filter@Base 4.16.1 + btrfs_list_setup_print_column@Base 4.16.1 + btrfs_list_subvols_print@Base 4.16.1 + btrfs_lookup_uuid_received_subvol_item@Base 4.16.1 + btrfs_lookup_uuid_subvol_item@Base 4.16.1 + btrfs_read_and_process_send_stream@Base 4.16.1 + btrfs_subvolid_resolve@Base 4.16.1 + crc32c_le@Base 4.16.1 + crc32c_optimization_init@Base 4.16.1 + lookup_path_rootid@Base 4.16.1 + path_cat3_out@Base 4.16.1 + path_cat_out@Base 4.16.1 + rb_erase@Base 4.16.1 + rb_first@Base 4.16.1 + rb_first_postorder@Base 4.16.1 + rb_free_nodes@Base 4.16.1 + rb_insert@Base 4.16.1 + rb_insert_color@Base 4.16.1 + rb_last@Base 4.16.1 + rb_next@Base 4.16.1 + rb_next_postorder@Base 4.16.1 + rb_prev@Base 4.16.1 + rb_replace_node@Base 4.16.1 + rb_search@Base 4.16.1 + subvol_uuid_search2@Base 4.16.1 + subvol_uuid_search@Base 4.16.1 + subvol_uuid_search_add@Base 4.16.1 + subvol_uuid_search_finit@Base 4.16.1 + subvol_uuid_search_init@Base 4.16.1 diff --git a/debian/libbtrfsutil-dev.install b/debian/libbtrfsutil-dev.install new file mode 100644 index 00000000..22afcea9 --- /dev/null +++ b/debian/libbtrfsutil-dev.install @@ -0,0 +1,3 @@ +usr/include/btrfsutil.h +usr/lib/*/libbtrfsutil.so +usr/lib/*/libbtrfsutil.a diff --git a/debian/libbtrfsutil1.install b/debian/libbtrfsutil1.install new file mode 100644 index 00000000..4ef0f1b0 --- /dev/null +++ b/debian/libbtrfsutil1.install @@ -0,0 +1 @@ +usr/lib/*/libbtrfsutil.so.1* diff --git a/debian/libbtrfsutil1.symbols b/debian/libbtrfsutil1.symbols new file mode 100644 index 00000000..7da0e167 --- /dev/null +++ b/debian/libbtrfsutil1.symbols @@ -0,0 +1,43 @@ +libbtrfsutil.so.1 libbtrfsutil1 #MINVER# + btrfs_util_create_qgroup_inherit@Base 4.16.1 + btrfs_util_create_snapshot@Base 4.16.1 + btrfs_util_create_snapshot_fd2@Base 4.16.1 + btrfs_util_create_snapshot_fd@Base 4.16.1 + btrfs_util_create_subvolume@Base 4.16.1 + btrfs_util_create_subvolume_fd@Base 4.16.1 + btrfs_util_create_subvolume_iterator@Base 4.16.1 + btrfs_util_create_subvolume_iterator_fd@Base 4.16.1 + btrfs_util_delete_subvolume@Base 4.16.1 + btrfs_util_delete_subvolume_fd@Base 4.16.1 + btrfs_util_deleted_subvolumes@Base 4.16.1 + btrfs_util_deleted_subvolumes_fd@Base 4.16.1 + btrfs_util_destroy_qgroup_inherit@Base 4.16.1 + btrfs_util_destroy_subvolume_iterator@Base 4.16.1 + btrfs_util_get_default_subvolume@Base 4.16.1 + btrfs_util_get_default_subvolume_fd@Base 4.16.1 + btrfs_util_get_subvolume_read_only@Base 4.16.1 + btrfs_util_get_subvolume_read_only_fd@Base 4.16.1 + btrfs_util_is_subvolume@Base 4.16.1 + btrfs_util_is_subvolume_fd@Base 4.16.1 + btrfs_util_qgroup_inherit_add_group@Base 4.16.1 + btrfs_util_qgroup_inherit_get_groups@Base 4.16.1 + btrfs_util_set_default_subvolume@Base 4.16.1 + btrfs_util_set_default_subvolume_fd@Base 4.16.1 + btrfs_util_set_subvolume_read_only@Base 4.16.1 + btrfs_util_set_subvolume_read_only_fd@Base 4.16.1 + btrfs_util_start_sync@Base 4.16.1 + btrfs_util_start_sync_fd@Base 4.16.1 + btrfs_util_strerror@Base 4.16.1 + btrfs_util_subvolume_id@Base 4.16.1 + btrfs_util_subvolume_id_fd@Base 4.16.1 + btrfs_util_subvolume_info@Base 4.16.1 + btrfs_util_subvolume_info_fd@Base 4.16.1 + btrfs_util_subvolume_iterator_fd@Base 4.16.1 + btrfs_util_subvolume_iterator_next@Base 4.16.1 + btrfs_util_subvolume_iterator_next_info@Base 4.16.1 + btrfs_util_subvolume_path@Base 4.16.1 + btrfs_util_subvolume_path_fd@Base 4.16.1 + btrfs_util_sync@Base 4.16.1 + btrfs_util_sync_fd@Base 4.16.1 + btrfs_util_wait_sync@Base 4.16.1 + btrfs_util_wait_sync_fd@Base 4.16.1 diff --git a/debian/patches/python3-use-deb-layout.patch b/debian/patches/python3-use-deb-layout.patch new file mode 100644 index 00000000..467c044e --- /dev/null +++ b/debian/patches/python3-use-deb-layout.patch @@ -0,0 +1,16 @@ +Description: Use debian install layout +Author: Dimitri John Ledkov <xnox@ubuntu.com> +Forwarded: not-needed +Last-Update: 2018-05-14 + +--- btrfs-progs-4.16.1.orig/Makefile ++++ btrfs-progs-4.16.1/Makefile +@@ -651,7 +651,7 @@ endif + ifeq ($(PYTHON_BINDINGS),1) + install_python: libbtrfsutil_python + $(Q)cd libbtrfsutil/python; \ +- $(PYTHON) setup.py install --skip-build $(if $(DESTDIR),--root $(DESTDIR)) --prefix $(prefix) ++ $(PYTHON) setup.py install --install-layout=deb --skip-build $(if $(DESTDIR),--root $(DESTDIR)) --prefix $(prefix) + + .PHONY: install_python + endif diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..c010bd16 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +python3-use-deb-layout.patch diff --git a/debian/python3-btrfsutil.install b/debian/python3-btrfsutil.install new file mode 100644 index 00000000..eae3930a --- /dev/null +++ b/debian/python3-btrfsutil.install @@ -0,0 +1 @@ +usr/lib/python3/ diff --git a/debian/rules b/debian/rules index d5f052a5..0314608e 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ CFLAGS := $(patsubst -O2,-Os,$(CFLAGS)) ZSTD := $(shell grep '^udeb: ' /var/lib/dpkg/info/libzstd*.shlibs) %: - dh ${@} --with bash-completion + dh ${@} --with bash-completion,python3 override_dh_autoreconf: dh_autoreconf ./autogen.sh @@ -31,7 +31,7 @@ override_dh_auto_build: dh_auto_build -- V=1 override_dh_auto_install: - dh_auto_install --destdir=debian/btrfs-progs + dh_auto_install -- install install_python # Adding initramfs-tools integration install -D -m 0755 debian/local/btrfs.hook debian/btrfs-progs/usr/share/initramfs-tools/hooks/btrfs @@ -40,6 +40,10 @@ override_dh_auto_install: # Needs autopkgtest override_dh_auto_test: +override_dh_install: + dh_install + dh_missing --list-missing + override_dh_strip: dh_strip --dbgsym-migration='btrfs-progs (<< 4.11.1+dfsg-1~)' |