[SCM] qtquickcontrols packaging branch, master, updated. debian/5.1.1-1-5-g8f7baea

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Thu Oct 24 22:33:13 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtquickcontrols.git;a=commitdiff;h=8f7baea

The following commit has been merged in the master branch:
commit 8f7baea6668ef7af658d18cb7c2c21db179e1717
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Oct 24 19:32:41 2013 -0300

    The Controls module depends on the Layouts one.
    
    Swap the dependencies (Closes: #725161).
---
 debian/changelog |    2 ++
 debian/control   |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 596650a..5bd39df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ qtquickcontrols-opensource-src (5.1.1-2) UNRELEASED; urgency=low
     - Rename .install and .lintian-override files.
     - Make qtdeclarative5-quicklayouts-plugin depend on the new package.
   * Fix the description of the layouts plugin package.
+  * The Controls module depends on the Layouts one. Swap the dependencies
+    (Closes: #725161).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 24 Oct 2013 19:08:42 -0300
 
diff --git a/debian/control b/debian/control
index 98ba3a6..7d08ddb 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,8 @@ Package: qtdeclarative5-controls-plugin
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: libqt5qml5, ${misc:Depends}, ${shlibs:Depends}
+Depends: libqt5qml5, qtdeclarative5-quicklayouts-plugin (= ${binary:Version}),
+ ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt5qml-quickcontrols (<< 5.1.1-2~)
 Replaces: libqt5qml-quickcontrols (<< 5.1.1-2~)
 Description: Qt 5 Quick Controls module plugin
@@ -46,8 +47,7 @@ Description: transitional dummy package for Qt 5 Quick Controls module plugin
 Package: qtdeclarative5-quicklayouts-plugin
 Section: libdevel
 Architecture: any
-Depends: qtdeclarative5-controls-plugin (= ${binary:Version}),
-         ${misc:Depends},
+Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: Qt 5 Quick Layouts module plugin
  Qt is a cross-platform C++ application framework. Qt's primary feature

-- 
qtquickcontrols packaging



More information about the pkg-kde-commits mailing list