[SCM] cantor packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-2-34-gfd67dcb

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit fd67dcb13a85a5e9d2635e9ce5dbca596d805a2b
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 8 19:06:06 2015 +0200

    PPA build
---
 debian/cantor.install | 2 +-
 debian/changelog      | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/cantor.install b/debian/cantor.install
index b2fc23b..27d1783 100644
--- a/debian/cantor.install
+++ b/debian/cantor.install
@@ -23,7 +23,7 @@ usr/lib/*/qt5/plugins/cantor_runscriptassistant.so
 usr/lib/*/qt5/plugins/cantor_solveassistant.so
 usr/lib/*/qt5/plugins/cantor_variablemanagerplugin.so
 usr/lib/*/qt5/plugins/libcantorpart.so
-usr/share/appdata/cantor.appdata.xml
+usr/share/appdata/org.kde.cantor.appdata.xml
 usr/share/applications/org.kde.cantor.desktop
 usr/share/cantor/cantor_advancedplot_assistant.rc
 usr/share/cantor/cantor_create_matrix_assistant.rc
diff --git a/debian/changelog b/debian/changelog
index b65bafc..6b75676 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,13 +2,11 @@ cantor (4:15.04.2-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Scarlett Clark ]
   * New upstream release
-  * New upstream release
-  * Vivid backport
 
   [ Jonathan Riddell ]
-  * New upstream release
+  * PPA build
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 06 Jun 2015 00:39:35 +0200
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 06 Jun 2015 00:39:51 +0200
 
 cantor (4:14.12.3-0ubuntu1) vivid; urgency=medium
 

-- 
cantor packaging