diff -u fftw3-3.2.1/debian/changelog fftw3-3.2.1/debian/changelog --- fftw3-3.2.1/debian/changelog +++ fftw3-3.2.1/debian/changelog @@ -1,3 +1,11 @@ +fftw3 (3.2.1-2ubuntu2) karmic; urgency=low + + * Changed rules to conditionally package double long library only if + actually built; solves armel build failure. LP: #420145 + * Added README.source for quilt and bump Standards-Version to 3.8.2. + + -- David Sugar Fri, 28 Aug 2009 13:50:48 -0400 + fftw3 (3.2.1-2ubuntu1) karmic; urgency=low * Merge from debian unstable, remaining changes: LP: #381129 diff -u fftw3-3.2.1/debian/control fftw3-3.2.1/debian/control --- fftw3-3.2.1/debian/control +++ fftw3-3.2.1/debian/control @@ -6,12 +6,12 @@ Build-Depends: quilt (>= 0.40), gfortran, texinfo, debhelper (>=5.0.0) Build-Depends-Indep: transfig, ghostscript (>> 8.63) Homepage: http://fftw.org -Standards-Version: 3.8.1 +Standards-Version: 3.8.2 Package: libfftw3-3 Architecture: any Section: libs -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: libfftw3-dev Provides: fftw3 Replaces: fftw3 @@ -29,7 +29,7 @@ Package: libfftw3-dev Architecture: any Section: libdevel -Depends: libfftw3-3 (=${binary:Version}), ${shlibs:Depends} +Depends: libfftw3-3 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: fftw3-dev Replaces: fftw3-dev Conflicts: fftw3-dev @@ -47,6 +47,7 @@ Provides: fftw3-doc Replaces: fftw3-doc Conflicts: fftw3-doc +Depends: ${misc:Depends} Description: documentation for fftw version 3 The FFTW library computes Fast Fourier Transforms (FFT) in one or more dimensions. It is extremely fast. This package contains the documentation for diff -u fftw3-3.2.1/debian/rules fftw3-3.2.1/debian/rules --- fftw3-3.2.1/debian/rules +++ fftw3-3.2.1/debian/rules @@ -136,7 +136,8 @@ dh_installdirs -a dh_install -a --sourcedir=debian/tmp-single dh_install -a --sourcedir=debian/tmp-double - dh_install -a --sourcedir=debian/tmp-long-double + if test -d debian/tmp-long-double ; then \ + dh_install -a --sourcedir=debian/tmp-long-double ; fi dh_installman -a dh_strip -a dh_compress -a -X.c -X.pl -X.am -X.in only in patch2: unchanged: --- fftw3-3.2.1.orig/debian/README.source +++ fftw3-3.2.1/debian/README.source @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command.