Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package enigmail
This upload finally fixes FTBFS on ppc64el: configure requires an updated
config.sub on ppc64el, but autotools-dev does not provide it in the clean
target. Therefore we replace the call to configure in the clean target by
creating a stub of the file that is required to make dh_auto_clean not fail.
Additionally, we fix the XPCOM ABI name on ppc64el (otherwise, icedove would
show enigmail as disabled on this arch, without any explanation why)
unblock enigmail/2:1.7.2-3
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (990, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_AT.UTF-8, LC_CTYPE=de_AT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru enigmail-1.7.2/debian/changelog enigmail-1.7.2/debian/changelog
--- enigmail-1.7.2/debian/changelog 2014-11-02 19:14:42.000000000 +0100
+++ enigmail-1.7.2/debian/changelog 2014-11-23 15:52:04.000000000 +0100
@@ -1,3 +1,11 @@
+enigmail (2:1.7.2-3) unstable; urgency=medium
+
+ * d/rules - clean: Fake config/autoconf.mk if it doesn't exist, don't call
+ configure. Fixes FTBFS on ppc64el. closes: #760845
+ * Make enigmail use the right XPCOM_TARGET name on ppc64 archs.
+
+ -- Willi Mann <wi...@debian.org> Sun, 23 Nov 2014 15:47:07 +0100
+
enigmail (2:1.7.2-2) unstable; urgency=medium
* Update config.* files by using autotools-dev. closes: #760845
diff -Nru enigmail-1.7.2/debian/patches/0005-fix-target-os-ppc64.patch enigmail-1.7.2/debian/patches/0005-fix-target-os-ppc64.patch
--- enigmail-1.7.2/debian/patches/0005-fix-target-os-ppc64.patch 1970-01-01 01:00:00.000000000 +0100
+++ enigmail-1.7.2/debian/patches/0005-fix-target-os-ppc64.patch 2014-11-16 15:44:15.000000000 +0100
@@ -0,0 +1,14 @@
+Description: Fix XPCOM ABI name on ppc64el and ppc64
+Author: Willi Mann <wi...@debian.org>
+--- enigmail-1.7.2.orig/config/getOsTarget.pl
++++ enigmail-1.7.2/config/getOsTarget.pl
+@@ -76,6 +76,9 @@ if ($srcCpu =~ /x86[_-]64/i) {
+ elsif ($srcCpu =~ /i[3456]86/i) {
+ $targetCpu = "x86";
+ }
++elsif ($srcCpu =~ /p(?:ower)?pc64/i) {
++ $targetCpu = "ppc64";
++}
+ elsif ($srcCpu =~ /ppc/i) {
+ $targetCpu = "ppc";
+ }
diff -Nru enigmail-1.7.2/debian/patches/series enigmail-1.7.2/debian/patches/series
--- enigmail-1.7.2/debian/patches/series 2014-11-02 18:59:40.000000000 +0100
+++ enigmail-1.7.2/debian/patches/series 2014-11-16 15:32:44.000000000 +0100
@@ -1,2 +1,3 @@
0003-default-to-PGP-MIME.patch
0004-fix_target-os.patch
+0005-fix-target-os-ppc64.patch
diff -Nru enigmail-1.7.2/debian/rules enigmail-1.7.2/debian/rules
--- enigmail-1.7.2/debian/rules 2014-11-02 18:55:36.000000000 +0100
+++ enigmail-1.7.2/debian/rules 2014-11-16 15:26:23.000000000 +0100
@@ -10,7 +10,11 @@
override_dh_install:
install-xpi -penigmail build/*.xpi
-# ./configure is needed to create config/autoconf.mk when building from the git sources.
override_dh_auto_clean:
- ./configure
+ # if config/autoconf.mk is not present, create stub of it, such that make distclean works
+ if [ ! -f config/autoconf.mk ]; then \
+ echo 'DIST = $$(DEPTH)/build/dist' > config/autoconf.mk; \
+ echo 'BUILD = $$(DEPTH)/build' >> config/autoconf.mk; \
+ fi
+
dh_auto_clean
