Upgrading to GitLab 11.10.0. Expect errors and see debian-infrastructure-announce@lists.debian.org for further information.

Commit bbbe9a6c authored by Julian Taylor's avatar Julian Taylor

Merge branch 'master' into ubuntu

Conflicts:
	debian/changelog
parents 20cccfb5 4b43b7e3
fftw3 (3.3.2-3.1ubuntu1) quantal; urgency=low
* merge with Debian, remaining changes:
- remove the mpi packages not suitable for main
- add debian/source/extended-diff-ignore to ignore generated files
- add hardening flags to long long test so build log check does not complain
-- Julian Taylor <jtaylor.debian@googlemail.com> Sat, 18 Aug 2012 16:29:47 +0200
fftw3 (3.3.2-3.1) unstable; urgency=low
* Non-maintainer upload.
* debian/rules: Use xz compression for binary packages.
-- Ansgar Burchardt <ansgar@debian.org> Sun, 05 Aug 2012 16:38:56 +0200
fftw3 (3.3.2-3ubuntu1) quantal; urgency=low
* merge with Debian (LP: #1007259, #781726)
......
......@@ -124,7 +124,7 @@ binary-indep: build-indep
dh_installdeb -i
dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
dh_builddeb -i -- -Zxz
binary-arch: build-arch
# build fftw3
......@@ -150,7 +150,7 @@ binary-arch: build-arch
dh_shlibdeps -a
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
dh_builddeb -a -- -Zxz
binary: binary-indep binary-arch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment