[SCM] qtbase packaging branch, experimental, updated. debian/5.6.0-beta+dfsg-4-25-g9410271

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Thu Jan 21 00:31:16 UTC 2016


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

The following commit has been merged in the experimental branch:
commit 9410271a7ec32bd10e3cd18f84dd6c829c64cc10
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jan 20 21:30:49 2016 -0300

    Bump B+R instroduced in 5.5.1+dfsg-13 and merged here.
---
 debian/changelog | 3 +++
 debian/control   | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61b1045..351b35d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtbase-opensource-src (5.6.0~beta+dfsg-5) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Fix URLs pointing to our "How to package Qt based stuff" page
     (Closes: #810282). Thanks Jakob Haufe for the pointer.
+  * Merge 5.5.1+dfsg-13's changes into the experimental branch.
+    - Bump libqt5gui5's Breaks+Replaces so that users who installed
+      the experimental version have a proper package update.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 Jan 2016 12:17:40 -0300
 
diff --git a/debian/control b/debian/control
index 2992582..ac5f739 100644
--- a/debian/control
+++ b/debian/control
@@ -93,10 +93,10 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends}
 Recommends: libqt5svg5
-Breaks: libqt5egldeviceintegration5 (<< 5.5.1+dfsg-13~),
-        libqt5xcbqpa5 (<< 5.5.1+dfsg-13~)
-Replaces: libqt5egldeviceintegration5 (<< 5.5.1+dfsg-13~),
-          libqt5xcbqpa5 (<< 5.5.1+dfsg-13~)
+Breaks: libqt5egldeviceintegration5 (<< 5.6.0~beta+dfsg-5~),
+        libqt5xcbqpa5 (<< 5.6.0~beta+dfsg-5~)
+Replaces: libqt5egldeviceintegration5 (<< 5.6.0~beta+dfsg-5~),
+          libqt5xcbqpa5 (<< 5.6.0~beta+dfsg-5~)
 Suggests: libqt5libqgtk2, qt5-image-formats-plugins, qtwayland5
 Description: Qt 5 GUI module
  Qt is a cross-platform C++ application framework. Qt's primary feature

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list