[SCM] artikulate packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-4-g8bc03a2

Clive Johnston clivejo-guest at moszumanska.debian.org
Wed Jan 6 23:56:19 UTC 2016


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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 8bc03a29e80bf3f574088af7483a84c246541d33
Author: Clive Johnston <clivejo at aol.com>
Date:   Wed Jan 6 23:56:04 2016 +0000

    Fixing packaging for KF5 port
    
    - Disabled autotests due to problems upstream
    - Fixed the install file
    - Bumped to pkg-kde-tools/qt-kde-team/3
---
 debian/artikulate.install | 27 +++++++++++++--------------
 debian/changelog          |  2 ++
 debian/rules              | 10 +++++++---
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/debian/artikulate.install b/debian/artikulate.install
index 34a3a36..10c6af4 100644
--- a/debian/artikulate.install
+++ b/debian/artikulate.install
@@ -1,16 +1,15 @@
+etc/xdg/artikulate.knsrc
 usr/bin/artikulate
-usr/lib/libartikulatecore.so.4*
-usr/lib/libartikulatelearnerprofile.so.4*
-usr/lib/libartikulatesound.so.4*
-usr/share/appdata/artikulate.appdata.xml
-usr/share/applications/kde4/artikulate.desktop
+usr/bin/artikulate_editor
+usr/lib/*/libartikulatecore.so
+usr/lib/*/libartikulatecore.so.0
+usr/lib/*/libartikulatelearnerprofile.so
+usr/lib/*/libartikulatelearnerprofile.so.0
+usr/lib/*/libartikulatesound.so
+usr/lib/*/libartikulatesound.so.0
+usr/share/appdata/org.kde.artikulate.appdata.xml
+usr/share/applications/org.kde.artikulate.desktop
+usr/share/artikulate
+usr/share/config.kcfg/artikulate.kcfg
 usr/share/doc
-usr/share/icons/hicolor/16x16/apps/artikulate.png
-usr/share/icons/hicolor/32x32/apps/artikulate.png
-usr/share/icons/hicolor/48x48/apps/artikulate.png
-usr/share/icons/hicolor/64x64/apps/artikulate.png
-usr/share/icons/hicolor/scalable/apps/artikulate.svgz
-usr/share/kde4/apps/artikulate/*
-usr/share/kde4/apps/artikulateui.rc
-usr/share/kde4/config.kcfg/artikulate.kcfg
-usr/share/kde4/config/artikulate.knsrc
+usr/share/icons/hicolor
diff --git a/debian/changelog b/debian/changelog
index d13f32c..c583d26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ artikulate (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
   * New upstream release
   * Adding new build dependencies
   * Running autotests with XVFB
+    - Disabled autotests completely due to problems upstream
+  * Fixed the install file
 
  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:24:01 +0000
 
diff --git a/debian/rules b/debian/rules
index e877ccb..b37c6db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,14 @@
 # -*- makefile -*-
 #
 
-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_strip:
 	$(overridden_command) --dbg-package=artikulate-dbg
 
-override_dh_auto_test:
-	xvfb-run dh_auto_test
+.PHONY: override_dh_auto_test
+
+# FIXME - Disabled auto tests due to not working correctly upstream
+#         to be enabled again when upstream fix them.
+#override_dh_auto_test:
+#	xvfb-run dh_auto_test

-- 
artikulate packaging



More information about the pkg-kde-commits mailing list