[SCM] telepathy-qt4 packaging branch, master, updated. debian/0.9.3-1-15-gd45c890

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/telepathy-qt4.git;a=commitdiff;h=dc1cbf1

The following commit has been merged in the master branch:
commit dc1cbf15942510eed8634d2ba020398a272763c5
Author: Diane Trout <diane at ghic.org>
Date:   Mon Jan 20 14:26:32 2014 -0800

    Revert "Simplify debian/rules by removing override_dh_strip and override_dh_install and passing their arguments to the default dh rule."
    
    This reverts commit f02a81b9ed0915a9b7f390d46695abf59786ad2e.
    
    Conflicts:
    	debian/changelog
    	debian/rules
---
 debian/changelog | 2 --
 debian/rules     | 8 +++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d7efb6f..c1ee6e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,6 @@ telepathy-qt (0.9.3-3) UNRELEASED; urgency=low
   * Remove version requirement from pkg-config dependency (Closes: #734489)
   * Update Standards-Version to 3.9.5. No Changes needed.
   * Update debian/libtelepathy-qt4-2.symbols for 0.9.3 symbols.
-  * Simplify debian/rules by removing override_dh_strip and override_dh_install
-    and passing their arguments to the default dh rule.
   * Explicitly use pkg-kde-tools for its symbol helper utilities.
   * Explicitly force build type RelWithDebInfo
 
diff --git a/debian/rules b/debian/rules
index bc21ae6..80ac957 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/dpkg/architecture.mk
 
 %:
-	dh $@ --with pkgkde_symbolshelper --parallel --dbg-package=libtelepathy-qt4-dbg --list-missing
+	dh $@ --with pkgkde_symbolshelper --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DDISABLE_WERROR=ON -DHAVE_DOT=YES \
@@ -19,6 +19,12 @@ endif
 # Do not run tests, as they fall into race conditions sometimes
 override_dh_auto_test:
 
+override_dh_strip:
+	dh_strip --dbg-package=libtelepathy-qt4-dbg
+
+override_dh_install:
+	dh_install --list-missing
+
 # -i is for the doc package, which doesn't depend on the shared library
 override_dh_installdocs:
 	dh_installdocs -a --link-doc=libtelepathy-qt4-2

-- 
telepathy-qt4 packaging