[SCM] qtbase packaging branch, master, updated. 6d72332fbeaad0e283fb33215ad9e1606b4de954

[Fathi Boudra]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=6d72332

The following commit has been merged in the master branch:
commit 6d72332fbeaad0e283fb33215ad9e1606b4de954
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Sep 2 16:54:13 2012 +0300

    Remove Qt4 leftovers
---
 debian/control              |    1 -
 debian/manpages/qmake-qt5.1 |    2 +-
 debian/rules                |    4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 7f79e34..a46a5c3 100644
--- a/debian/control
+++ b/debian/control
@@ -338,7 +338,6 @@ Priority: extra
 Architecture: any
 Section: debug
 Depends: qtbase5-dbg (= ${binary:Version}), ${misc:Depends}
-Recommends: libqt4-dbg
 Description: Qt 5 base binaries debugging symbols
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/manpages/qmake-qt5.1 b/debian/manpages/qmake-qt5.1
index 89ec32e..f13a2a4 100644
--- a/debian/manpages/qmake-qt5.1
+++ b/debian/manpages/qmake-qt5.1
@@ -104,7 +104,7 @@ Do not look for files in pwd [project mode only]
 
 .SH SEE ALSO
 .PP
-.BR /usr/share/qt4/doc/html/qmake-manual.html,
+.BR /usr/share/qt5/doc/html/qmake-manual.html,
 .BR assistant (1)
 .SH AUTHOR
 This manual page was written by Brian Nelson <pyro at debian.org> based on
diff --git a/debian/rules b/debian/rules
index 85f8990..ce90720 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 # Packages with own debug package
 pkgs_dbg := $(shell dh_listpackages | grep dbg | sed -e '/qtbase5-dbg/d; s|-dbg||')
-# Packages whose debug symbols belong to qt4-bin-dbg
+# Packages whose debug symbols belong to qtbase5-bin-dbg
 pkgs_dbgbin := qtbase5-dev-bin $(filter-out %-dbg lib% $(pkgs_dbg),$(shell dh_listpackages))
 # Library package list for override_dh_makeshlibs, excludes -dev -dbg -bin
 pkgs_lib := $(filter-out %-dev %-dbg %-bin,$(filter lib%,$(shell dh_listpackages)))
@@ -94,7 +94,7 @@ ifeq ($(DEB_HOST_ARCH),hppa)
 	cd $(CURDIR)/doc/src/images && ls -a | sort > $(CURDIR)/debian/hppa-tmp/ls-a-out
 	@if ! diff -q $(CURDIR)/debian/hppa-tmp/readdir_r-out $(CURDIR)/debian/hppa-tmp/ls-a-out ; \
 		then \
-		echo "Kernel bug present. This will misbuild qt4 if proceeding. Failing" ; \
+		echo "Kernel bug present. This will misbuild Qt if proceeding. Failing" ; \
 		echo "Please update kernel and test again" ; \
 		exit 5 ; \
 	fi

-- 
qtbase packaging