From ea3eca02cbfa3235add1a2f632ba34bd9ef78bdf Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 7 Apr 2012 19:24:47 +0200 Subject: New patch (Closes: #660617) pkglibdir-FTBFS-fix.diff: cherry-pick upstream fix for pkglibdir not being a legitimate directory for 'SCRIPTS' --- debian/patches/pkglibdir-FTBFS-fix.diff | 20 ++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 21 insertions(+) create mode 100644 debian/patches/pkglibdir-FTBFS-fix.diff create mode 100644 debian/patches/series diff --git a/debian/patches/pkglibdir-FTBFS-fix.diff b/debian/patches/pkglibdir-FTBFS-fix.diff new file mode 100644 index 0000000..9d04d7f --- /dev/null +++ b/debian/patches/pkglibdir-FTBFS-fix.diff @@ -0,0 +1,20 @@ +Description: Fix FTBFS. + Workaround automake sanity check that would prevent us from + installing lib/* into lib/backupninja/. +Origin: upstream, https://labs.riseup.net/code/projects/backupninja/repository/revisions/0a0fbb46baa1fd5e6bb68c9e3f9f0b28dfa17e15 +Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660617 + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 11eba37..9a54736 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -1,6 +1,7 @@ +-pkglib_SCRIPTS = easydialog parseini tools vserver ++my_execbindir = $(pkglibdir) ++my_execbin_SCRIPTS = easydialog parseini tools vserver + +-CLEANFILES = $(pkglib_SCRIPTS) ++CLEANFILES = $(my_execbin_SCRIPTS) + + EXTRA_DIST = easydialog.in parseini.in tools.in vserver.in + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..d3b73e5 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +pkglibdir-FTBFS-fix.diff -- cgit v1.2.3