From 13a5fe715510f4985ba3017a13d15c92dd8d1dfe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 2 Oct 2016 02:31:30 -0500 Subject: [PATCH] Fix FFTS Debian packaging files --- lib/ffts/debian/changelog | 2 +- .../patches/fix_min_autoconf_version.diff | 11 -------- lib/ffts/debian/patches/series | 1 - lib/ffts/debian/rules | 25 ++++--------------- 4 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 lib/ffts/debian/patches/fix_min_autoconf_version.diff delete mode 100644 lib/ffts/debian/patches/series diff --git a/lib/ffts/debian/changelog b/lib/ffts/debian/changelog index a35d1f1..ce02eb3 100644 --- a/lib/ffts/debian/changelog +++ b/lib/ffts/debian/changelog @@ -2,4 +2,4 @@ libffts (0.1-0ubuntu0) karmic; urgency=low * Karmic rebuild - -- Timothy Pearson Thu, 02 July 2009 16:08:00 -0600 + -- Timothy Pearson Thu, 02 Jul 2009 16:08:00 -0600 diff --git a/lib/ffts/debian/patches/fix_min_autoconf_version.diff b/lib/ffts/debian/patches/fix_min_autoconf_version.diff deleted file mode 100644 index 44320ad..0000000 --- a/lib/ffts/debian/patches/fix_min_autoconf_version.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -1,7 +1,7 @@ - # -*- Autoconf -*- - # Process this file with autoconf to produce a configure script. - --AC_PREREQ([2.68]) -+AC_PREREQ([2.65]) - AC_INIT(ffts, 0.7, amb@anthonix.com) - AM_INIT_AUTOMAKE(ffts, 0.7) - diff --git a/lib/ffts/debian/patches/series b/lib/ffts/debian/patches/series deleted file mode 100644 index 7c09396..0000000 --- a/lib/ffts/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix_min_autoconf_version.diff diff --git a/lib/ffts/debian/rules b/lib/ffts/debian/rules index 04c2ace..dd8a73b 100755 --- a/lib/ffts/debian/rules +++ b/lib/ffts/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/debhelper.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include @@ -9,26 +9,11 @@ DEB_CONFIGURE_MANDIR := /usr/share/man DEB_CONFIGURE_PREFIX := /usr/ DEB_CONFIGURE_INFODIR := /usr/share/info -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to +# never build in parallel, regardless of DEB_BUILD_OPTIONS. +DEB_BUILD_PARALLEL = true -ifneq (,$(findstring x86_64-,$(DEB_BUILD_GNU_TYPE))) - cdbs_configure_flags := --enable-single --enable-sse --enable-shared --disable-rpath -else ifneq (,$(findstring arm-,$(DEB_BUILD_GNU_TYPE))) - cdbs_configure_flags := --enable-single --enable-neon --enable-shared --disable-rpath -else - cdbs_configure_flags := --enable-single --enable-shared --disable-rpath -endif +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - ! [ -f /usr/share/libtool/ltmain.sh ] || \ - cp -f /usr/share/libtool/ltmain.sh ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ - cp -f /usr/share/libtool/config/ltmain.sh ltmain.sh - autoreconf -i - - touch debian/stamp-bootstrap