From 96a7e9047659a2ff5dae4cbea70af0c69f86facb Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Sat, 16 Feb 2019 12:07:10 +0000 Subject: [PATCH] Use quilt to fix the path in the startup file --- .pc/.quilt_patches | 1 + .pc/.quilt_series | 1 + .pc/.version | 1 + debian/control | 2 +- debian/patches/paths.diff | 10 ++++++++++ debian/patches/series | 1 + 6 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 .pc/.quilt_patches create mode 100644 .pc/.quilt_series create mode 100644 .pc/.version create mode 100644 debian/patches/paths.diff create mode 100644 debian/patches/series diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches new file mode 100644 index 0000000..6857a8d --- /dev/null +++ b/.pc/.quilt_patches @@ -0,0 +1 @@ +debian/patches diff --git a/.pc/.quilt_series b/.pc/.quilt_series new file mode 100644 index 0000000..c206706 --- /dev/null +++ b/.pc/.quilt_series @@ -0,0 +1 @@ +series diff --git a/.pc/.version b/.pc/.version new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/.pc/.version @@ -0,0 +1 @@ +2 diff --git a/debian/control b/debian/control index 83afb51..db42a28 100755 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: sapphire-remote-dkms Section: misc Priority: optional Maintainer: Dynamic Kernel Modules Support Team -Build-Depends: debhelper (>= 7), dkms, gawk, dh-exec +Build-Depends: debhelper (>= 7), dkms, gawk, dh-exec, quilt Standards-Version: 3.8.1 Package: sapphire-remote-dkms diff --git a/debian/patches/paths.diff b/debian/patches/paths.diff new file mode 100644 index 0000000..35e075a --- /dev/null +++ b/debian/patches/paths.diff @@ -0,0 +1,10 @@ +Set the path that we're installing to. +--- a/sapphire-remote-7.1/sapphire_startup.sh ++++ b/sapphire-remote-7.1/sapphire_startup.sh +@@ -37,5 +37,5 @@ + fi + fi + done +-[ -e /etc/sapphire.keymap -a -x /usr/local/bin/sapphire_keymap.sh ] && /usr/local/bin/sapphire_keymap.sh ++[ -e /etc/sapphire.keymap -a -x /usr/lib/sapphire-remote/sapphire_keymap.sh ] && /usr/lib/sapphire-remote/sapphire_keymap.sh + exit 0 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..5f14c60 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +paths.diff -- 2.30.2