[SCM] qtserialport packaging branch, master, updated. debian/5.3.0-3-5-gfc35c2d

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit ddc33cb8ab3f49b6fe4b215858e91e47ac9e2d1f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Jul 1 12:17:30 2014 -0300

    Remove initialize_dataTerminalReady_and_requestToSend.patch.
    
    Applied upstream.
---
 debian/changelog                                   |   2 +
 ...alize_dataTerminalReady_and_requestToSend.patch | 119 ---------------------
 debian/patches/series                              |   1 -
 3 files changed, 2 insertions(+), 120 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 82c356d..1798dca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtserialport-opensource-src (5.3.1-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
   * Bump Qt build dependencies.
+  * Remove initialize_dataTerminalReady_and_requestToSend.patch, applied
+    upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 01 Jul 2014 12:13:33 -0300
 
diff --git a/debian/patches/initialize_dataTerminalReady_and_requestToSend.patch b/debian/patches/initialize_dataTerminalReady_and_requestToSend.patch
deleted file mode 100644
index 4d6c92d..0000000
--- a/debian/patches/initialize_dataTerminalReady_and_requestToSend.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 92c7ed1c92a945931b7a50895f111d8bcbe2ce5e Mon Sep 17 00:00:00 2001
-From: Dyami Caliri <dyami at dragonframe.com>
-Date: Mon, 19 May 2014 16:59:29 -0700
-Subject: [PATCH] Initialize dataTerminalReady and requestToSend.
-
-QSP::open should read values of DTR/RTS after a successful open,
-not try to write them. The user should not expect to set DTR/RTS
-before opening the port (unlike the other settings).
-
-Tested on Mac OS X 10.8.5.
-
-Task-number: QTBUG-38640
-Change-Id: Iffea464f412c6972aa26a408ba01e304fa813c76
----
- src/serialport/qserialport.cpp | 47 +++++++++++++++++++++++++++---------------
- 1 file changed, 30 insertions(+), 17 deletions(-)
-
-diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp
-index 6508940..7c83423 100644
---- a/src/serialport/qserialport.cpp
-+++ b/src/serialport/qserialport.cpp
-@@ -75,6 +75,8 @@ QSerialPortPrivateData::QSerialPortPrivateData(QSerialPort *q)
-     , stopBits(QSerialPort::OneStop)
-     , flowControl(QSerialPort::NoFlowControl)
-     , policy(QSerialPort::IgnorePolicy)
-+    , dataTerminalReady(false)
-+    , requestToSend(false)
-     , settingsRestoredOnClose(true)
-     , q_ptr(q)
- {
-@@ -534,13 +536,14 @@ bool QSerialPort::open(OpenMode mode)
-         || !d->setDataBits(d->dataBits)
-         || !d->setParity(d->parity)
-         || !d->setStopBits(d->stopBits)
--        || !d->setFlowControl(d->flowControl)
--        || !d->setDataTerminalReady(d->dataTerminalReady)
--        || !d->setRequestToSend(d->requestToSend)) {
-+        || !d->setFlowControl(d->flowControl)) {
-         close();
-         return false;
-     }
- 
-+    d->dataTerminalReady = isDataTerminalReady();
-+    d->requestToSend = isRequestToSend();
-+
-     return true;
- }
- 
-@@ -850,13 +853,12 @@ QSerialPort::FlowControl QSerialPort::flowControl() const
-     \property QSerialPort::dataTerminalReady
-     rief the state (high or low) of the line signal DTR
- 
--    If the setting is successful or set before opening the port, returns true;
--    otherwise returns false. If the flag is true then the DTR signal is set to
--    high; otherwise low.
-+    Returns true on success, false otherwise.
-+    If the flag is true then the DTR signal is set to high; otherwise low.
- 
--    
ote If the setting is set before opening the port, the actual serial port
--    setting is done automatically in the \l{QSerialPort::open()} method right
--    after that the opening of the port succeeds.
-+    
ote The serial port has to be open before trying to set or get this
-+    property; otherwise false is returned and the error code is set to
-+    NotOpenError.
- 
-     \sa pinoutSignals()
- */
-@@ -864,7 +866,13 @@ bool QSerialPort::setDataTerminalReady(bool set)
- {
-     Q_D(QSerialPort);
- 
--    bool retval = !isOpen() || d->setDataTerminalReady(set);
-+    if (!isOpen()) {
-+        setError(QSerialPort::NotOpenError);
-+        qWarning("%s: device not open", Q_FUNC_INFO);
-+        return false;
-+    }
-+
-+    const bool retval = d->setDataTerminalReady(set);
-     if (retval && (d->dataTerminalReady != set)) {
-         d->dataTerminalReady = set;
-         emit dataTerminalReadyChanged(set);
-@@ -893,13 +901,12 @@ bool QSerialPort::isDataTerminalReady()
-     \property QSerialPort::requestToSend
-     rief the state (high or low) of the line signal RTS
- 
--    If the setting is successful or set before opening the port, returns true;
--    otherwise returns false. If the flag is true then the RTS signal is set to
--    high; otherwise low.
-+    Returns true on success, false otherwise.
-+    If the flag is true then the RTS signal is set to high; otherwise low.
- 
--    
ote If the setting is set before opening the port, the actual serial port
--    setting is done automatically in the \l{QSerialPort::open()} method right
--    after that the opening of the port succeeds.
-+    
ote The serial port has to be open before trying to set or get this
-+    property; otherwise false is returned and the error code is set to
-+    NotOpenError.
- 
-     \sa pinoutSignals()
- */
-@@ -907,7 +914,13 @@ bool QSerialPort::setRequestToSend(bool set)
- {
-     Q_D(QSerialPort);
- 
--    bool retval = !isOpen() || d->setRequestToSend(set);
-+    if (!isOpen()) {
-+        setError(QSerialPort::NotOpenError);
-+        qWarning("%s: device not open", Q_FUNC_INFO);
-+        return false;
-+    }
-+
-+    const bool retval = d->setRequestToSend(set);
-     if (retval && (d->requestToSend != set)) {
-         d->requestToSend = set;
-         emit requestToSendChanged(set);
--- 
-2.0.0
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e6ac0d3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-initialize_dataTerminalReady_and_requestToSend.patch

-- 
qtserialport packaging