[SCM] qtwebsockets packaging branch, experimental, updated. debian/5.3.2-1-7-gfe28aba
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Fri Sep 19 12:59:02 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebsockets.git;a=commitdiff;h=a964507
The following commit has been merged in the experimental branch:
commit a9645076bd94b6813dce49d456053d942a97b38f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Fri Sep 19 09:58:19 2014 -0300
Revert "Add Qt Declarative build dependency and build the QML module"
This reverts commit b0db95574a1f4db7c082974ec2d23ab352ef6367.
Pushed in experimental.
---
debian/changelog | 3 ---
debian/control | 16 ++--------------
debian/qml-module-qt-websockets.install | 1 -
debian/qtwebsockets5-examples.install | 4 ----
4 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 23e0ce9..75d41d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,9 +8,6 @@ qtwebsockets-opensource-src (5.3.1-2) UNRELEASED; urgency=medium
* Update my e-mail address.
* Update Vcs-Browser field to point to cgit interface.
- [ Timo Jyrinki ]
- * Add Qt Declarative build dependency and build the QML module
-
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 11 Sep 2014 14:18:42 -0300
qtwebsockets-opensource-src (5.3.1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index b6807b1..f27089c 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,7 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
Dmitry Shachnev <mitya57 at debian.org>
Build-Depends: debhelper (>= 9.0.0),
pkg-kde-tools,
- qtbase5-private-dev (>= 5.3.1+dfsg~),
- qtdeclarative5-dev (>= 5.3.1~)
+ qtbase5-private-dev (>= 5.3.1+dfsg~)
Build-Depends-Indep: libqt5sql5-sqlite (>= 5.3.1+dfsg~),
qtbase5-doc-html (>= 5.3.1~),
qttools5-dev-tools (>= 5.3.1~)
@@ -45,23 +44,12 @@ Description: Qt 5 Web Sockets module - development files
This package contains the development files needed to build Qt applications
using Qt 5 Web Sockets library.
-Package: qml-module-qt-websockets
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libqt5websockets5, ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 Web Sockets QML module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the Qt Web Sockets QML module.
-
Package: qtwebsockets5-examples
Architecture: any
Multi-Arch: same
Section: doc
Pre-Depends: ${misc:Pre-Depends}
-Depends: qml-module-qtquick2, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Examples for Qt 5 Web Sockets module
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/qml-module-qt-websockets.install b/debian/qml-module-qt-websockets.install
deleted file mode 100644
index 99a09e1..0000000
--- a/debian/qml-module-qt-websockets.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5/qml/Qt/WebSockets/*
diff --git a/debian/qtwebsockets5-examples.install b/debian/qtwebsockets5-examples.install
index ac4b467..d9592ad 100644
--- a/debian/qtwebsockets5-examples.install
+++ b/debian/qtwebsockets5-examples.install
@@ -6,10 +6,6 @@ usr/lib/*/qt5/examples/websockets/echoserver/echoserver.cpp
usr/lib/*/qt5/examples/websockets/echoserver/echoserver.h
usr/lib/*/qt5/examples/websockets/echoserver/echoserver.pro
usr/lib/*/qt5/examples/websockets/echoserver/main.cpp
-usr/lib/*/qt5/examples/websockets/qmlwebsocketclient/data.qrc
-usr/lib/*/qt5/examples/websockets/qmlwebsocketclient/main.cpp
-usr/lib/*/qt5/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
-usr/lib/*/qt5/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
usr/lib/*/qt5/examples/websockets/simplechat/chatserver.cpp
usr/lib/*/qt5/examples/websockets/simplechat/chatserver.h
usr/lib/*/qt5/examples/websockets/simplechat/main.cpp
--
qtwebsockets packaging
More information about the pkg-kde-commits
mailing list