[SCM] kqtquickcharts packaging branch, master, updated. debian/16.08.0-1-39-ga9e5e25

Maximiliano Curia maxy at moszumanska.debian.org
Tue Nov 21 15:22:35 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kqtquickcharts.git;a=commitdiff;h=71506b3

The following commit has been merged in the master branch:
commit 71506b384256f6dfb4dffdcb206f1210658d5be3
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Dec 15 14:11:18 2016 +0000

    port to kf5
---
 debian/.gitattributes | 1 -
 debian/control        | 8 +++++---
 debian/rules          | 5 ++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/control b/debian/control
index 2432543..5b7d496 100644
--- a/debian/control
+++ b/debian/control
@@ -14,11 +14,13 @@ Homepage: https://projects.kde.org/projects/kde/kdeedu/kqtquickcharts
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kqtquickcharts.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kqtquickcharts.git
 
-Package: qtdeclarative4-kqtquickcharts-1
+Package: qml-module-org-kde-charts
 Architecture: any
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: qtdeclarative4-kqtquickcharts-1
+Conflicts: qtdeclarative4-kqtquickcharts-1
 Description: QtQuick plugin to render interactive charts
- A QtQuick 1 plugin to render beautiful and interactive charts.
+ A QtQuick plugin to render beautiful and interactive charts.
  .
- kqtquickcharts is part of KDE SC.
+ kqtquickcharts is part of KDE Applications.
diff --git a/debian/rules b/debian/rules
index 6a77e53..b887671 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+
+override_dh_auto_test:
+	:

-- 
kqtquickcharts packaging



More information about the pkg-kde-commits mailing list