Source: efl
Version: 1.24.3-5
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

efl fails to cross build from source since it was binNMUed. Now the
cross tool version check fails. Please consider applying the attached
patch.

Helmut
diff --minimal -Nru efl-1.24.3/debian/changelog efl-1.24.3/debian/changelog
--- efl-1.24.3/debian/changelog 2020-08-11 06:56:02.000000000 +0200
+++ efl-1.24.3/debian/changelog 2020-10-16 21:32:00.000000000 +0200
@@ -1,3 +1,10 @@
+efl (1.24.3-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix cross tool version check to cope with binNMUs. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Fri, 16 Oct 2020 21:32:00 +0200
+
 efl (1.24.3-5) unstable; urgency=medium
 
   * Upload to unstable, no further changes.
diff --minimal -Nru efl-1.24.3/debian/rules efl-1.24.3/debian/rules
--- efl-1.24.3/debian/rules     2020-08-11 06:54:29.000000000 +0200
+++ efl-1.24.3/debian/rules     2020-10-16 21:29:25.000000000 +0200
@@ -32,10 +32,10 @@
 override_dh_auto_configure:
 # cross-builds need host eolian_gen, but ensure the versions match
 ifneq (,$(filter cross,$(DEB_BUILD_PROFILES)))
-       test "`dpkg-query -f '$${Version}' -W libedje-bin`" = "$(DEB_VERSION)"
-       test "`dpkg-query -f '$${Version}' -W libeet-bin`" = "$(DEB_VERSION)"
-       test "`dpkg-query -f '$${Version}' -W libelementary-bin`" = 
"$(DEB_VERSION)"
-       test "`dpkg-query -f '$${Version}' -W libeolian-bin`" = "$(DEB_VERSION)"
+       test "`dpkg-query -f '$${Version}' -W libedje-bin | sed 
's/+b[0-9]*$$//'`" = "$(DEB_VERSION)"
+       test "`dpkg-query -f '$${Version}' -W libeet-bin | sed 
's/+b[0-9]*$$//'`" = "$(DEB_VERSION)"
+       test "`dpkg-query -f '$${Version}' -W libelementary-bin | sed 
's/+b[0-9]*$$//'`" = "$(DEB_VERSION)"
+       test "`dpkg-query -f '$${Version}' -W libeolian-bin | sed 
's/+b[0-9]*$$//'`" = "$(DEB_VERSION)"
 endif
 
        $(CURDIR)/debian/validate_symvers.sh

Reply via email to