[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.5.0-2-4-gfeac981

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 1a83cf00aabf6d95fd09f07621ae4ba144544a0e
Author: Modestas Vainius <modax at debian.org>
Date:   Wed Apr 27 15:25:12 2011 +0300

    Replace $(overriden_command) with $(overridden_command) in debian/rules.
    
    Requires pkg-kde-tools 0.12.
---
 debian/changelog |    4 ++++
 debian/control   |    2 +-
 debian/rules     |   10 +++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a546c0c..4e0b7cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ phonon (4:4.6.0really4.5.0-3) UNRELEASED; urgency=low
   * Backport macro usage for registerMetaTypes() from upstream branch 4.5
     (commit 974fb5f, patch upstream_PHONON_EXPORT_DEPRECATED.diff).
 
+  [ Modestas Vainius ]
+  * Replace $(overriden_command) with $(overridden_command) in debian/rules.
+    Requires pkg-kde-tools 0.12.
+
  -- Modestas Vainius <modax at debian.org>  Tue, 05 Apr 2011 11:04:10 +0200
 
 phonon (4:4.6.0really4.5.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 973cf29..74243b3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: sound
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Modestas Vainius <modax at debian.org>, Fathi Boudra <fabo at debian.org>
-Build-Depends: debhelper (>= 7.4.13), cmake (>= 2.6.2), pkg-kde-tools (>= 0.11),
+Build-Depends: debhelper (>= 7.4.13), cmake (>= 2.6.2), pkg-kde-tools (>= 0.12),
  dpkg-dev (>= 1.15.5), automoc, libglib2.0-dev,
  libpulse-dev (>= 0.9.21), libqt4-dev (>= 4.5)
 Standards-Version: 3.9.1
diff --git a/debian/rules b/debian/rules
index 268c542..b0ecc5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,15 +11,15 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 RECOMMENDED_PHONON_BACKEND := phonon-backend-vlc
 
 override_dh_auto_configure:
-	$(overriden_command) -- -DPLUGIN_INSTALL_DIR=/usr/lib/qt4/
+	$(overridden_command) -- -DPLUGIN_INSTALL_DIR=/usr/lib/qt4/
 
 # shlibs is needed for library-packages.mk (strict shlibs) to work
 override_dh_makeshlibs:
-	$(overriden_command) -plibphonon4 -V'libphonon4 (>= $(dqk_upstream_version)), phonon'
-	$(overriden_command) -V --remaining-packages
+	$(overridden_command) -plibphonon4 -V'libphonon4 (>= $(dqk_upstream_version)), phonon'
+	$(overridden_command) -V --remaining-packages
 
 override_dh_shlibdeps:
-	$(overriden_command) -- -xphonon
+	$(overridden_command) -- -xphonon
 
 override_dh_gencontrol:
 	# Expand some variables in maintainer scripts and debconf templates
@@ -36,4 +36,4 @@ override_dh_gencontrol:
 	    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)
+	$(overridden_command) -- -Vphonon:Recommended-Backend=$(RECOMMENDED_PHONON_BACKEND)

-- 
Phonon Multimedia Framework packaging