From: Boyuan Yang <073plan@gmail.com> Date: Wed, 17 Jan 2018 15:34:12 +0000 (+0800) Subject: debian: Backport upstream patch to fix FTBFS with hurd X-Git-Tag: archive/raspbian/5.7.12-2+rpi1^2~140 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c8a50ac50c7749a50bed3d47dac2b981c6eae483;p=dtkcore.git debian: Backport upstream patch to fix FTBFS with hurd --- diff --git a/debian/changelog b/debian/changelog index 02648c4..21c0a6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ dtkcore (2.0.6-1) unstable; urgency=medium * New upstream release. + Add cmake files to ease package searching. + * Backport one upstream patch to fix FTBFS on hurd systems. - -- Boyuan Yang <073plan@gmail.com> Wed, 17 Jan 2018 23:13:27 +0800 + -- Boyuan Yang <073plan@gmail.com> Wed, 17 Jan 2018 23:33:32 +0800 dtkcore (2.0.5.3-1) unstable; urgency=medium diff --git a/debian/patches/0002-fix-a-bug-cause-packaging-on-hurd-failed.patch b/debian/patches/0002-fix-a-bug-cause-packaging-on-hurd-failed.patch new file mode 100644 index 0000000..675305b --- /dev/null +++ b/debian/patches/0002-fix-a-bug-cause-packaging-on-hurd-failed.patch @@ -0,0 +1,21 @@ +From: Yanhao Mo +Date: Tue, 16 Jan 2018 10:19:20 +0800 +Subject: fix a bug cause packaging on hurd failed + +Change-Id: I06024cdb2c691983681f986e1f6844db650a78a1 +--- + dtkcore.pro | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/dtkcore.pro b/dtkcore.pro +index 9fe4a1e..c776e70 100644 +--- a/dtkcore.pro ++++ b/dtkcore.pro +@@ -6,6 +6,4 @@ SUBDIRS += \ + src \ + tests + +-linux { +-SUBDIRS += tool +-} ++!mac:!win*: SUBDIRS += tool diff --git a/debian/patches/series b/debian/patches/series index 0ea5738..83c8d03 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0003-Workaround-qt-private-header-problem.patch +0002-fix-a-bug-cause-packaging-on-hurd-failed.patch