debian: split libraries out of qubes-utils package

According to Debian Policy:
https://www.debian.org/doc/debian-policy/ch-sharedlibs.html

This is the proper way to handle shared libraries (and dependencies on
them) in Debian.

Fixes QubesOS/qubes-issues#1416
This commit is contained in:
Marek Marczykowski-Górecki 2015-11-26 22:24:39 +01:00
parent d95174f52c
commit b625704edd
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
8 changed files with 50 additions and 6 deletions

45
debian/control vendored
View File

@ -12,18 +12,55 @@ Package: qubes-utils
Architecture: any Architecture: any
Depends: qubesdb-vm, libvchan-xen, lsb-base, ${shlibs:Depends}, ${misc:Depends} Depends: qubesdb-vm, libvchan-xen, lsb-base, ${shlibs:Depends}, ${misc:Depends}
Conflicts: qubes-linux-utils Conflicts: qubes-linux-utils
Breaks: qubes-core-agent (<< 3.1.4)
Recommends: python2.7 Recommends: python2.7
Description: Qubes Linux utilities Description: Qubes Linux utilities
This package includes the basic qubes utilities necessary for domU. This package includes the basic qubes utilities necessary for domU.
Package: qubes-kernel-vm-support Package: qubes-kernel-vm-support
Architecture: any Architecture: any
Depends: dkms, initramfs-tools, ${shlibs:Depends}, ${misc:Depends} Depends: dkms, initramfs-tools, ${misc:Depends}
Description: Qubes VM kernel and initramfs modules Description: Qubes VM kernel and initramfs modules
This package contains: This package contains:
1. mkinitramfs module required to setup Qubes VM root filesystem. This package is 1. mkinitramfs module required to setup Qubes VM root filesystem. This package
needed in VM only when the VM uses its own kernel (via pvgrub or so). Otherwise is needed in VM only when the VM uses its own kernel (via pvgrub or so).
initrd is provided by dom0. Otherwise initrd is provided by dom0.
. .
2. u2mfn kernel module sources (dkms) required by GUI agent and R2 version of 2. u2mfn kernel module sources (dkms) required by GUI agent and R2 version of
libvchan library. libvchan library.
Package: libqrexec-utils2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: qubes-utils (<< 3.1.4)
Replaces: qubes-utils (<< 3.1.4)
Description: Library of common functions of qrexec agent and daemon
This library contains common helper functions for qrexec agent and daemon.
Package: libqubes-rpc-filecopy2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: qubes-utils (<< 3.1.4)
Replaces: qubes-utils (<< 3.1.4)
Description: Qubes file copy protocol library
This library can be used for both sending files using qfile protocol and for
receiving them.
Package: libqrexec-utils-dev
Architecture: any
Section: libdevel
Depends: libqrexec-utils2 (= ${binary:Version}), ${misc:Depends}
Breaks: qubes-utils (<< 3.1.4)
Replaces: qubes-utils (<< 3.1.4)
Description: Development headers for libqrexec-utils
This package contains files required to compile qrexec-agent and qrexec-daemon.
Package: libqubes-rpc-filecopy-dev
Architecture: any
Section: libdevel
Depends: libqubes-rpc-filecopy2 (= ${binary:Version}), ${misc:Depends}
Breaks: qubes-utils (<< 3.1.4)
Replaces: qubes-utils (<< 3.1.4)
Description: Development headers for libqrexec-utils
This package contains files required to compile Qubes file copy related
utilities like qfile-agent.

3
debian/libqrexec-utils-dev.install vendored Normal file
View File

@ -0,0 +1,3 @@
usr/include/libqrexec-utils.h
usr/include/qrexec.h
usr/lib/libqrexec-utils.so

1
debian/libqrexec-utils2.install vendored Normal file
View File

@ -0,0 +1 @@
usr/lib/libqrexec-utils.so.2*

1
debian/libqrexec-utils2.shlibs vendored Normal file
View File

@ -0,0 +1 @@
libqrexec-utils 2 libqrexec-utils2 (>= 3.1.3)

View File

@ -0,0 +1,2 @@
usr/include/libqubes-rpc-filecopy.h
usr/lib/libqubes-rpc-filecopy.so

1
debian/libqubes-rpc-filecopy2.install vendored Normal file
View File

@ -0,0 +1 @@
usr/lib/libqubes-rpc-filecopy.so.2*

1
debian/libqubes-rpc-filecopy2.shlibs vendored Normal file
View File

@ -0,0 +1 @@
libqubes-rpc-filecopy 2 libqubes-rpc-filecopy2 (>= 3.1.3)

View File

@ -1,6 +1,4 @@
usr/sbin/meminfo-writer usr/sbin/meminfo-writer
lib/systemd/system/qubes-meminfo-writer.service lib/systemd/system/qubes-meminfo-writer.service
usr/lib/qubes/* usr/lib/qubes/*
usr/include/*
usr/lib/*
lib/udev/* lib/udev/*