[SCM] artikulate packaging branch, kubuntu_xenial_archive, updated. debian/15.08.3-1-27-g3dcf24c

Philip Muškovac yofel-guest at moszumanska.debian.org
Tue Jan 12 21:39:30 UTC 2016


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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 25f3e700ede6d4e2ff5dc33090e395e35fd40a47
Merge: da3d27398b18bba4549dbef9892ab9170ffec1cf 50e1978cfb3d19cde22a3b7dbcd6405d9483de39
Author: Philip Muškovac <yofel at gmx.net>
Date:   Tue Jan 12 22:39:01 2016 +0100

    Merge remote-tracking branch 'origin/master' into kubuntu_xenial_archive
    
    also fix the package up in general

 debian/.gitattributes |   1 +
 debian/changelog      |  50 +++++++++-
 debian/control        |  17 ++--
 debian/copyright      | 271 ++++++++++++++++++++++++++++++++++++--------------
 debian/rules          |   9 +-
 debian/watch          |   4 +-
 6 files changed, 259 insertions(+), 93 deletions(-)

diff --cc debian/changelog
index 07b075b,97e1dc3..46a2ebb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,55 -1,41 +1,95 @@@
 +artikulate (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
++  [ Clive Johnston ]
 +  * New upstream release
 +  * Adding new build dependencies
-   * Running autotests with XVFB
-     - Disabled autotests completely due to problems upstream
++  * Disabled autotests completely due to problems upstream
 +  * Fixed the install file
-   * Fixing not-installed
 +  * Adding W: artikulate: package-name-doesnt-match-sonames 
 +    libartikulatecore0 libartikulatelearnerprofile0 libartikulatesound0
 +    to lintian-errors file
 +
++  [ Philip Muškovac ]
++  * Update qml depends for the qt5 release
++
 + -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:24:01 +0000
 +
+ artikulate (4:15.08.3-1) experimental; urgency=medium
+ 
+   * New upstream release (15.08.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Dec 2015 12:38:42 +0100
+ 
 +artikulate (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 11:46:54 +0100
 +
 +artikulate (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 16:03:51 +0100
 +
+ artikulate (4:15.08.0-1) experimental; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.04.1).
+   * New upstream release (15.04.2).
+ 
+   [ Pino Toscano ]
+   * Remove unused libqtmultimediakit1 and qtmobility-dev build dependencies.
+ 
+   [ Maximiliano Curia ]
+   * New upstream release (15.08.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 19:13:46 +0200
+ 
 +artikulate (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 26 Aug 2015 16:54:06 +0100
 +
 +artikulate (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +  * New upstream release
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 18:19:59 +0200
 +
+ artikulate (4:14.12.3-1) experimental; urgency=medium
+ 
+   * New upstream release (14.12.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 29 Mar 2015 15:13:19 +0200
+ 
 +artikulate (4:14.12.3-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Add back in kdelibs5 parent version depend. 
 +  * kdelibs is actually in the 4.14 series. Adjust version. 
 +  * New upstream release. 
 +  * Fix version..
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 20 Feb 2015 11:03:44 -0800
 +
+ artikulate (4:14.12.2-1) experimental; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * Add back in kdelibs5 parent version depend.
+   * kdelibs is actually in the 4.14 series. Adjust version.
+ 
+   [ Maximiliano Curia ]
+   * Prepare initial Debian release.
+   * Bump Standards-Version to 3.9.6, no changes needed.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 15:03:35 +0100
+ 
  artikulate (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    [ Scarlett Clark ]
diff --cc debian/control
index 4e8ffcc,7c42fbf..d15bc30
--- a/debian/control
+++ b/debian/control
@@@ -5,34 -6,20 +6,34 @@@ Uploaders: Maximiliano Curia <maxy at debi
  Build-Depends: cmake,
                 debhelper (>= 9),
                 extra-cmake-modules,
--               kde-sc-dev-latest,
--               kdelibs5-dev (>= 4:4.14),
 -               libqtgstreamer-dev (>= 1.2.0),
 +               kdoctools-dev,
 +               libkf5config-dev,
 +               libkf5configwidgets-dev,
 +               libkf5crash-dev,
 +               libkf5declarative-dev,
 +               libkf5i18n-dev,
 +               libkf5newstuff-dev,
 +               libkf5widgetsaddons-dev,
 +               libkf5xmlgui-dev,
 +               libqt5gstreamer-dev,
 +               libqt5xmlpatterns5-dev,
 +               libqtmultimediakit1,
 +               pkg-kde-tools,
 +               qtbase5-dev,
 +               qtmobility-dev,
-                xvfb
+                pkg-kde-tools,
  Standards-Version: 3.9.6
  Homepage: https://edu.kde.org/
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/artikulate.git/
- Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/artikulate.git
+ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/artikulate.git
+ Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/artikulate.git
  
  Package: artikulate
  Architecture: any
--Depends: qtdeclarative4-kqtquickcharts-1 (>= 4:4.12.90),
--         ${misc:Depends},
--         ${shlibs:Depends}
++Depends: ${misc:Depends},
++         ${shlibs:Depends},
++         qml-module-qtquick-controls,
++         qml-module-qtquick-layouts,
++         qml-module-org-kde-kquickcontrolsaddons,
  Description: Language learning application
   Artikulate is a language learning application that helps improving
   pronunciation skills for various languages. This is included in the
diff --cc debian/rules
index b37c6db,2929ff9..9f84308
--- a/debian/rules
+++ b/debian/rules
@@@ -7,9 -7,10 +7,6 @@@ include /usr/share/pkg-kde-tools/qt-kde
  override_dh_strip:
  	$(overridden_command) --dbg-package=artikulate-dbg
  
- .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
+ override_dh_auto_test:
 -	-mkdir debian/home
 -	HOME=`pwd`/debian/home $(overridden_command)
 -
 -override_dh_clean:
 -	-rm -r debian/home
 -	$(overridden_command)
++	:
++	# Tests disabled as they don't work
diff --cc debian/watch
index 9f09061,a7b0fa1..cb6c02f
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,2 +1,3 @@@
  version=3
- http://download.kde.org/stable/applications/([\d.]+)/src/artikulate-([\d.]+).tar.xz
- http://download.kde.org/unstable/applications/([\d.]+)/src/artikulate-([\d.]+).tar.xz
+ http://download.kde.org/stable/applications/([\d.]+)/src/artikulate-([\d.]+)\.tar\.xz
++http://download.kde.org/unstable/applications/([\d.]+)/src/artikulate-([\d.]+)\.tar\.xz

-- 
artikulate packaging



More information about the pkg-kde-commits mailing list