fix conflicts

This commit is contained in:
Ward Nakchbandi 2023-02-25 19:54:15 +03:00
parent 62f5216bfd
commit be37194712
2 changed files with 10 additions and 0 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
gamescope (3.11.52-beta2~99pika21) kinetic; urgency=medium
* Fix File duplication
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 15 Oct 2022 18:58:00 +0300
gamescope (3.11.52-beta2~99pika20) kinetic; urgency=medium gamescope (3.11.52-beta2~99pika20) kinetic; urgency=medium
* Fix missing deps * Fix missing deps

3
debian/rules vendored
View File

@ -6,12 +6,15 @@ DEB_BUILD_OPTIONS=nocheck
override_dh_install: override_dh_install:
dh_install dh_install
# Remove submodule conflicting files # Remove submodule conflicting files
rm -rf debian/gamescope/usr/bin/di-edid-decode
rm -rf debian/gamescope/usr/include rm -rf debian/gamescope/usr/include
rm -rf debian/gamescope/usr/lib/libopenvr_api.a rm -rf debian/gamescope/usr/lib/libopenvr_api.a
rm -rf debian/gamescope/usr/lib/x86_64-linux-gnu/libliftoff.a rm -rf debian/gamescope/usr/lib/x86_64-linux-gnu/libliftoff.a
rm -rf debian/gamescope/usr/lib/x86_64-linux-gnu/libwlroots.a rm -rf debian/gamescope/usr/lib/x86_64-linux-gnu/libwlroots.a
rm -rf debian/gamescope/usr/lib/x86_64-linux-gnu/libdisplay-info.a
rm -rf debian/gamescope/usr/lib/x86_64-linux-gnu/pkgconfig/libliftoff.pc rm -rf debian/gamescope/usr/lib/x86_64-linux-gnu/pkgconfig/libliftoff.pc
rm -rf debian/gamescope/usr/lib/x86_64-linux-gnu/pkgconfig/wlroots.pc rm -rf debian/gamescope/usr/lib/x86_64-linux-gnu/pkgconfig/wlroots.pc
rm -rf debian/gamescope/usr/lib/x86_64-linux-gnu/pkgconfig/display-info.pc
%: %:
dh $@ dh $@