[SCM] Qt 4 packaging branch, master, updated. debian/4.8.7+dfsg-1-2-gb7525ab

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Wed Jul 29 21:52:19 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=b7525ab

The following commit has been merged in the master branch:
commit b7525abdb25eb9e98c36769621165c463bed97a3
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jul 29 18:52:00 2015 -0300

    Fix menu entries's paths for Qt4 apps (Closes: #793956).
---
 debian/changelog          | 1 +
 debian/qt4-designer.menu  | 2 +-
 debian/qt4-dev-tools.menu | 4 ++--
 debian/qt4-qtconfig.menu  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7218d37..d7998b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qt4-x11 (4:4.8.7+dfsg-2) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add Daniel Schepler's QtScript_x32_config.diff and x32.diff to let Qt4
     compile on x32 (Closes: #699862).
+  * Fix menu entries's paths for Qt4 apps (Closes: #793956).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 May 2015 14:14:19 -0300
 
diff --git a/debian/qt4-designer.menu b/debian/qt4-designer.menu
index b6475b5..8f224bb 100644
--- a/debian/qt4-designer.menu
+++ b/debian/qt4-designer.menu
@@ -3,4 +3,4 @@
 	section="Applications/Programming"\
 	hints="KDE"\
 	title="Qt4 Designer"\
-	command="/usr/lib/*/qt4/bin/designer"
+	command="/usr/bin/designer-qt4"
diff --git a/debian/qt4-dev-tools.menu b/debian/qt4-dev-tools.menu
index 288f5ba..dff0925 100644
--- a/debian/qt4-dev-tools.menu
+++ b/debian/qt4-dev-tools.menu
@@ -3,11 +3,11 @@
 	section="Applications/Programming"\
 	hints="KDE"\
 	title="Qt4 Assistant"\
-	command="/usr/lib/*/qt4/bin/assistant"
+	command="/usr/bin/assistant-qt4"
 
 ?package(qt4-dev-tools):\
 	needs="x11"\
 	section="Applications/Programming"\
 	hints="KDE"\
 	title="Qt4 Linguist"\
-	command="/usr/lib/*/qt4/bin/linguist"
+	command="/usr/bin/linguist-qt4"
diff --git a/debian/qt4-qtconfig.menu b/debian/qt4-qtconfig.menu
index 3ba170e..26eef10 100644
--- a/debian/qt4-qtconfig.menu
+++ b/debian/qt4-qtconfig.menu
@@ -4,4 +4,4 @@
 	title="QtConfig"\
 	longtitle="Qt Configuration Utility"\
 	hints="Qt4 config tool"\
-	command="/usr/lib/*/qt4/bin/qtconfig"
+	command="/usr/bin/qtconfig-qt4"

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list