packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use upstream default ${libexecdir} 

Now that Debian Policy allows /usr/libexec (via FHS 3.0), we can use
that.
This commit is contained in:
Simon McVittie 2018-07-25 15:48:31 +01:00
parent 83716f0d5d
commit 5e9ba0ab65
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,5 +1,7 @@
ostree (2018.7-1) UNRELEASED; urgency=medium ostree (2018.7-1) UNRELEASED; urgency=medium
* Use upstream default ${libexecdir} now that Debian Policy allows
/usr/libexec (via FHS 3.0)
* Standards-Version: 4.1.5 (no changes required) * Standards-Version: 4.1.5 (no changes required)
* New upstream release * New upstream release
- d/libostree-1-1.symbols: Update - d/libostree-1-1.symbols: Update

2
debian/ostree-boot.install vendored
View File

@ -5,7 +5,7 @@ lib/systemd/system/ostree-finalize-staged.service
lib/systemd/system/ostree-prepare-root.service lib/systemd/system/ostree-prepare-root.service
lib/systemd/system/ostree-remount.service lib/systemd/system/ostree-remount.service
usr/lib/dracut/modules.d/98ostree usr/lib/dracut/modules.d/98ostree
usr/lib/libostree/grub2-15_ostree
usr/lib/ostree/ostree-prepare-root usr/lib/ostree/ostree-prepare-root
usr/lib/ostree/ostree-remount usr/lib/ostree/ostree-remount
usr/lib/tmpfiles.d/ostree-tmpfiles.conf usr/lib/tmpfiles.d/ostree-tmpfiles.conf
usr/libexec/libostree/grub2-15_ostree

4
debian/ostree-tests.install vendored
View File

@ -1,3 +1,3 @@
usr/lib/installed-tests/libostree usr/libexec/installed-tests/libostree
usr/lib/libostree/ostree-trivial-httpd usr/libexec/libostree/ostree-trivial-httpd
usr/share/installed-tests/libostree usr/share/installed-tests/libostree

10
debian/ostree-tests.lintian-overrides vendored
View File

@ -1,14 +1,14 @@
# This is deliberate: it's just some random signed file to be verified, and # This is deliberate: it's just some random signed file to be verified, and
# upstream happens to have used the text of the LGPL as the signed file # upstream happens to have used the text of the LGPL as the signed file
ostree-tests: extra-license-file usr/lib/installed-tests/libostree/gpg-verify-data/lgpl2 ostree-tests: extra-license-file usr/libexec/installed-tests/libostree/gpg-verify-data/lgpl2
ostree-tests: extra-license-file usr/lib/installed-tests/libostree/gpg-verify-data/lgpl2.sig ostree-tests: extra-license-file usr/libexec/installed-tests/libostree/gpg-verify-data/lgpl2.sig
# This is deliberate, working around the assumption of recursive make # This is deliberate, working around the assumption of recursive make
ostree-tests: symlink-is-self-recursive usr/lib/installed-tests/libostree/tests . ostree-tests: symlink-is-self-recursive usr/libexec/installed-tests/libostree/tests .
# We won't run this on sparc64 currently # We won't run this on sparc64 currently
[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/lib/installed-tests/libostree/corrupt-repo-ref.js) [sparc64]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
# This shared object genuinely doesn't use any libc ABIs directly, # This shared object genuinely doesn't use any libc ABIs directly,
# only via GLib # only via GLib
library-not-linked-against-libc usr/lib/installed-tests/libostree/libreaddir-rand.so library-not-linked-against-libc usr/libexec/installed-tests/libostree/libreaddir-rand.so

6
debian/rules vendored
View File

@ -14,7 +14,7 @@ override_dh_autoreconf:
configure_options = \ configure_options = \
GJS=some-nonexistent-gjs-binary \ GJS=some-nonexistent-gjs-binary \
--enable-installed-tests \ --enable-installed-tests \
--libexecdir='$${prefix}/lib' \ --libexecdir='$${prefix}/libexec' \
--with-avahi \ --with-avahi \
--with-dracut \ --with-dracut \
--with-grub2 \ --with-grub2 \
@ -66,7 +66,7 @@ endif
override_dh_install: override_dh_install:
rm -f debian/tmp/usr/lib/*/*.la rm -f debian/tmp/usr/lib/*/*.la
rm -f debian/tmp/usr/lib/installed-tests/libostree/*.la rm -f debian/tmp/usr/libexec/installed-tests/libostree/*.la
: :
# TODO: when someone documents how to test these (#824649) they # TODO: when someone documents how to test these (#824649) they
# should be installed in a new ostree-boot package: see # should be installed in a new ostree-boot package: see
@ -78,7 +78,7 @@ override_dh_install:
rm -f debian/tmp/lib/systemd/system/ostree-prepare-root.service rm -f debian/tmp/lib/systemd/system/ostree-prepare-root.service
rm -f debian/tmp/lib/systemd/system/ostree-remount.service rm -f debian/tmp/lib/systemd/system/ostree-remount.service
rm -fr debian/tmp/usr/lib/dracut/modules.d/98ostree/ rm -fr debian/tmp/usr/lib/dracut/modules.d/98ostree/
rm -f debian/tmp/usr/lib/libostree/grub2-15_ostree rm -f debian/tmp/usr/libexec/libostree/grub2-15_ostree
rm -f debian/tmp/usr/lib/ostree/ostree-prepare-root rm -f debian/tmp/usr/lib/ostree/ostree-prepare-root
rm -f debian/tmp/usr/lib/ostree/ostree-remount rm -f debian/tmp/usr/lib/ostree/ostree-remount
rm -f debian/tmp/usr/lib/tmpfiles.d/ostree-tmpfiles.conf rm -f debian/tmp/usr/lib/tmpfiles.d/ostree-tmpfiles.conf