[SCM] Qt 4 packaging branch, master, updated. debian/4.8.4+dfsg-4-46-gc31739a

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Wed Jul 3 16:48:17 UTC 2013


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

The following commit has been merged in the master branch:
commit c31739a72f3664d05775d8fbddb31f29391b7d22
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jul 3 13:28:10 2013 -0300

    Remove unused substitution variables.
---
 debian/changelog |    3 +++
 debian/control   |    7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 390a274..6eedf2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,9 @@ qt4-x11 (4:4.8.5+dfsg-1) UNRELEASED; urgency=low
     - Make qtcore4-l10n arch all.
     - Add proper Break and Replaces to qtcore4-l10n against libqtcore4.
     - Split the install files.
+  * Remove unused subtitution variables:
+    - ${misc:Pre-Depends} from qtcore4-l10n and libqt4-dbus.
+    - ${shlibs:Depends} from libqt4-private-dev and libqt4-opengl-dev.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Jun 2013 11:08:53 -0300
 
diff --git a/debian/control b/debian/control
index 269cc81..88f902c 100644
--- a/debian/control
+++ b/debian/control
@@ -77,7 +77,6 @@ Description: Qt 4 core module
 
 Package: qtcore4-l10n
 Architecture: all
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}
 Breaks: libqtcore4 (<< 4:4.8.5+dfsg-1~)
 Replaces: libqtcore4 (<< 4:4.8.5+dfsg-1~)
@@ -342,7 +341,6 @@ Description: Qt 4 XML patterns module
 Package: libqt4-dbus
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: qdbus (= ${binary:Version}), libqtdbus4 (= ${binary:Version}),
  ${misc:Depends}
 Replaces: libqt4-dev (<< 4:4.7.1)
@@ -578,7 +576,7 @@ Description: Qt 4 development programs
 Package: libqt4-private-dev
 Architecture: any
 Section: libdevel
-Depends: libqt4-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libqt4-dev (= ${binary:Version}), ${misc:Depends}
 Description: Qt 4 private development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -595,8 +593,7 @@ Depends: libgl1-mesa-dev,
          libglu1-mesa-dev,
          libqt4-dev (= ${binary:Version}),
          libqt4-opengl (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Description: Qt 4 OpenGL library development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list