[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.4.4-3

Modestas Vainius modax at alioth.debian.org
Sat Mar 12 17:32:29 UTC 2011


The following commit has been merged in the master branch:
commit 43fccb8b5e36b5ee42ab0a1f57f978e756bf390e
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Mar 12 19:27:54 2011 +0200

    Fix FTBFS with binary-arch target.
---
 debian/changelog |    1 +
 debian/rules     |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c5f8f1..b2fd67a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 phonon (4:4.6.0really4.4.4-3) UNRELEASED; urgency=low
 
+  * Fix FTBFS with binary-arch target.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 12 Mar 2011 19:25:38 +0200
 
diff --git a/debian/rules b/debian/rules
index 5be32c1..268c542 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,8 @@ override_dh_gencontrol:
 	        echo "$$cmd"; eval "$$cmd"; \
 	    fi; \
 	done
-	sed -i 's/\$${recommended_backend}/$(RECOMMENDED_PHONON_BACKEND)/g' \
-	    debian/phonon-backend-null/usr/share/doc/phonon-backend-null/README.Debian
+	if [ -d debian/phonon-backend-null ]; then \
+	    sed -i 's/\$${recommended_backend}/$(RECOMMENDED_PHONON_BACKEND)/g' \
+	        debian/phonon-backend-null/usr/share/doc/phonon-backend-null/README.Debian; \
+	fi
 	$(overriden_command) -- -Vphonon:Recommended-Backend=$(RECOMMENDED_PHONON_BACKEND)

-- 
Phonon Multimedia Framework packaging



More information about the pkg-kde-commits mailing list