[SCM] Qt Assistant compatibility version packaging branch, master, updated. debian/4.6.3-4-5-g39fe682

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Wed Jun 26 03:27:47 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt-assistant-compat.git;a=commitdiff;h=80cadd0

The following commit has been merged in the master branch:
commit 80cadd06a894bccf283232121201f5fec781f44f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jun 26 00:16:28 2013 -0300

    Make sure we use Qt 4 for building by setting QT_SELECT = qt4.
    
    Now there is no need to use lrelease-qt4 anymore.
---
 debian/changelog |    4 ++++
 debian/rules     |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25c5c08..e5084df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qt-assistant-compat (4.6.3-5) UNRELEASED; urgency=low
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Make sure we use Qt 4 for building by setting QT_SELECT = qt4.
+    Now there is no need to use lrelease-qt4 anymore.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 26 Jun 2013 00:14:07 -0300
 
 qt-assistant-compat (4.6.3-4) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 8f5ab6e..cd6bba2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,8 @@
 #export DH_VERBOSE=1
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-export LRELEASE := /usr/bin/lrelease-qt4
+export QT_SELECT := qt4
+export LRELEASE := /usr/bin/lrelease
 
 %:
 	dh $@ --with=pkgkde-symbolshelper --parallel --list-missing

-- 
Qt Assistant compatibility version packaging



More information about the pkg-kde-commits mailing list