[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.8.0-2-3-g4b1590d

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/phonon.git;a=commitdiff;h=4b1590d

The following commit has been merged in the master branch:
commit 4b1590d28cb935d862fe0b138bd04d710b9373d5
Author: Diane Trout <diane at ghic.org>
Date:   Fri Sep 26 21:17:12 2014 -0700

    Simplify merginging expand4qt5_vars.awk into expand_vars.awk
---
 debian/changelog           |  1 +
 debian/expand4qt5_vars.awk | 23 -----------------------
 debian/expand_vars.awk     |  1 +
 debian/rules               |  6 +-----
 4 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75440e1..a43723a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 phonon (4:4.8.0-3) UNRELEASED; urgency=medium
 
   * Remove debian/installgen, no longer used.
+  * Simplify merginging expand4qt5_vars.awk into expand_vars.awk
 
  -- Diane Trout <diane at ghic.org>  Fri, 26 Sep 2014 21:10:59 -0700
 
diff --git a/debian/expand4qt5_vars.awk b/debian/expand4qt5_vars.awk
deleted file mode 100644
index 6609961..0000000
--- a/debian/expand4qt5_vars.awk
+++ /dev/null
@@ -1,23 +0,0 @@
-function readfile(file)
-{
-    while (getline < file) {
-        process()
-    }
-}
-
-function process()
-{
-    gsub(/#RECOMMENDED4QT5_BACKEND#/,recommended4qt5_backend);
-    if (/^#INCLUDE [^#]+#$/) {
-        readfile(substr($0,10,length($0)-9-1));
-        return
-    } else if (/^INCLUDE#: .+/) {
-        readfile(substr($0,11,length($0)-10));
-        return
-    }
-    print
-}
-
-{
-    process()
-}
diff --git a/debian/expand_vars.awk b/debian/expand_vars.awk
index e4a1f3d..7522eb1 100644
--- a/debian/expand_vars.awk
+++ b/debian/expand_vars.awk
@@ -7,6 +7,7 @@ function readfile(file)
 
 function process()
 {
+    gsub(/#RECOMMENDED4QT5_BACKEND#/,recommended4qt5_backend);
     gsub(/#RECOMMENDED_BACKEND#/,recommended_backend);
     if (/^#INCLUDE [^#]+#$/) {
         readfile(substr($0,10,length($0)-9-1));
diff --git a/debian/rules b/debian/rules
index 954054a..3901142 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,11 +52,7 @@ override_dh_gencontrol:
 	          debian/*/DEBIAN/config \
 	          debian/*/DEBIAN/templates; do \
 	    if [ -f "$$f" ]; then \
-	        cmd="awk -f debian/expand_vars.awk -v recommended_backend='$(RECOMMENDED_PHONON4_QT4_BACKEND)' -- $$f > $$f.tmp && cat $$f.tmp >| $$f && rm -f $$f.tmp"; \
-	        echo "$$cmd"; eval "$$cmd"; \
-	    fi; \
-	    if [ -f "$$f" ]; then \
-	        cmd="awk -f debian/expand4qt5_vars.awk -v recommended4qt5_backend='$(RECOMMENDED_PHONON4_QT5_BACKEND)' -- $$f > $$f.tmp && cat $$f.tmp >| $$f && rm -f $$f.tmp"; \
+	        cmd="awk -f debian/expand_vars.awk -v recommended_backend='$(RECOMMENDED_PHONON4_QT4_BACKEND)' -v  recommended4qt5_backend='$(RECOMMENDED_PHONON4_QT5_BACKEND)' -- $$f > $$f.tmp && cat $$f.tmp >| $$f && rm -f $$f.tmp"; \
 	        echo "$$cmd"; eval "$$cmd"; \
 	    fi; \
 	done

-- 
Phonon Multimedia Framework packaging