summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/libraries
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-06-03 15:11:29 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-06-03 15:11:32 +0200
commitea92c90cd2a28edf7e9f077282a8476c045a2a12 (patch)
tree11bdd7832e176b5c278e3e7c390601a763ea2443 /ubuntu/_base/libraries
parent81c2342a840202d6dd922229e9c7c0c929a46397 (diff)
downloadtde-packaging-ea92c90cd2a28edf7e9f077282a8476c045a2a12.tar.gz
tde-packaging-ea92c90cd2a28edf7e9f077282a8476c045a2a12.zip
DEB: Resolve FTBFS in support for using the $(DEB_HOST_MULTIARCH) variable
if the package does not contain any install and links files. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 6e6210f3042a985d937a1e354a3fa6f83259b2b5)
Diffstat (limited to 'ubuntu/_base/libraries')
-rw-r--r--ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk9
-rw-r--r--ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk9
-rw-r--r--ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk9
-rw-r--r--ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk9
-rw-r--r--ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk9
5 files changed, 35 insertions, 10 deletions
diff --git a/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
index 7c67fc9ca..4eeb672b0 100644
--- a/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
@@ -141,8 +141,11 @@ common-binary-arch::
done; \
rm -f $$tmpf )
# update multi-arch path in install files
- for a in debian/*install debian/*links; do \
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
[ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
done
@@ -152,7 +155,9 @@ clean::
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
# revert multi-arch path in install files
- for a in debian/*install debian/*links; do \
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
[ ! -f $$a.arch ] || \
mv $$a.arch $$a; \
done
diff --git a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
index 7c67fc9ca..4eeb672b0 100644
--- a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
@@ -141,8 +141,11 @@ common-binary-arch::
done; \
rm -f $$tmpf )
# update multi-arch path in install files
- for a in debian/*install debian/*links; do \
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
[ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
done
@@ -152,7 +155,9 @@ clean::
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
# revert multi-arch path in install files
- for a in debian/*install debian/*links; do \
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
[ ! -f $$a.arch ] || \
mv $$a.arch $$a; \
done
diff --git a/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
index 7c67fc9ca..4eeb672b0 100644
--- a/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
@@ -141,8 +141,11 @@ common-binary-arch::
done; \
rm -f $$tmpf )
# update multi-arch path in install files
- for a in debian/*install debian/*links; do \
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
[ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
done
@@ -152,7 +155,9 @@ clean::
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
# revert multi-arch path in install files
- for a in debian/*install debian/*links; do \
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
[ ! -f $$a.arch ] || \
mv $$a.arch $$a; \
done
diff --git a/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
index 7c67fc9ca..4eeb672b0 100644
--- a/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
@@ -141,8 +141,11 @@ common-binary-arch::
done; \
rm -f $$tmpf )
# update multi-arch path in install files
- for a in debian/*install debian/*links; do \
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
[ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
done
@@ -152,7 +155,9 @@ clean::
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
# revert multi-arch path in install files
- for a in debian/*install debian/*links; do \
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
[ ! -f $$a.arch ] || \
mv $$a.arch $$a; \
done
diff --git a/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
index 7c67fc9ca..4eeb672b0 100644
--- a/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
@@ -141,8 +141,11 @@ common-binary-arch::
done; \
rm -f $$tmpf )
# update multi-arch path in install files
- for a in debian/*install debian/*links; do \
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
[ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
done
@@ -152,7 +155,9 @@ clean::
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
# revert multi-arch path in install files
- for a in debian/*install debian/*links; do \
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
[ ! -f $$a.arch ] || \
mv $$a.arch $$a; \
done