Simon Quigley has proposed merging
~tsimonq2/kubuntu-packaging/+git/kubuntu-artikulate:kubuntu_unstable into
~kubuntu-packagers/kubuntu-packaging/+git/ark:kubuntu_unstable.
Requested reviews:
Kubuntu Packagers (kubuntu-packagers)
For more details, see:
https://code.launchpad.net/~tsimonq2/kubuntu-packaging/+git/kubuntu-artikulate/+merge/300932
This fixes the path for the org.kde.artikulate.appdata.xml file by deleting the
existing entry and adding usr/share/metainfo at the bottom of the install file.
--
Your team Kubuntu Packagers is requested to review the proposed merge of
~tsimonq2/kubuntu-packaging/+git/kubuntu-artikulate:kubuntu_unstable into
~kubuntu-packagers/kubuntu-packaging/+git/ark:kubuntu_unstable.
diff --git a/debian/artikulate.install b/debian/artikulate.install
new file mode 100644
index 0000000..5e18232
--- /dev/null
+++ b/debian/artikulate.install
@@ -0,0 +1,13 @@
+etc/xdg/artikulate.knsrc
+usr/bin/artikulate
+usr/bin/artikulate_editor
+usr/lib/*/libartikulatecore.so.0
+usr/lib/*/libartikulatelearnerprofile.so.0
+usr/lib/*/libartikulatesound.so.0
+usr/lib/*/qt5/plugins/artikulate/libsound/qtmultimediabackend.so
+usr/share/applications/org.kde.artikulate.desktop
+usr/share/artikulate
+usr/share/config.kcfg/artikulate.kcfg
+usr/share/doc
+usr/share/icons/hicolor
+usr/share/metainfo
diff --git a/debian/artikulate.lintian-overrides b/debian/artikulate.lintian-overrides
new file mode 100644
index 0000000..6979abc
--- /dev/null
+++ b/debian/artikulate.lintian-overrides
@@ -0,0 +1 @@
+artikulate: package-name-doesnt-match-sonames libartikulatecore0 libartikulatelearnerprofile0 libartikulatesound0
diff --git a/debian/changelog b/debian/changelog
index 5c03f87..4b588d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
ark (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium
[ Scarlett Clark ]
@@ -7,12 +8,24 @@ ark (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium
is adding a slash.
* Still failing, remove dash in front of rm?
* Remove merge markers.. bump SO version for libkerfuffle.
+=======
+artikulate (4:16.04.3-0ubuntu2) UNRELEASED; urgency=medium
+
+ [ Scarlett Clark ]
+ * This application is now kf5 adding stable/unstable branches.
+ * New upstream release.
+ * Seems to be defaulting the install to «PKGBUILDDIR»/debian/artikulate
+ Which makes dh_install go boom, setting the install to tmp/debian in
+ rules file.
+ * Add missing file to install.
+>>>>>>> debian/changelog
[ Philip Muškovac ]
* Update the Vcs URLs now that the repositories are hosted on
Launchpad
[ Scarlett Clark ]
+<<<<<<< debian/changelog
* Fix merge markers.
* New upstream bugfix release
@@ -35,10 +48,38 @@ ark (4:15.12.3-0ubuntu1) xenial; urgency=medium
-- Scarlett Clark <[email protected]> Thu, 14 Apr 2016 14:46:31 -0700
ark (4:15.12.1-1) experimental; urgency=medium
+=======
+ * New upstream bugfix release.
+
+ [ Clive Johnston ]
+ * New upstream release 16.04.2
+ * New upstream release (16.04.3)
+ * Added new build dep qtmultimedia5-dev
+ * Removing qtgstreamerbackend.so from install file
+
+ [ Rik Mills ]
+ * Add new file qtmultimediabackend.so to install file
+
+ [ Simon Quigley ]
+ * Fix the path for org.kde.artikulate.appdata.xml in the install file
+
+ -- Simon Quigley <[email protected]> Fri, 22 Jul 2016 12:32:49 -0500
+
+artikulate (4:15.12.3-0ubuntu1) xenial; urgency=medium
+
+ * New upstream bugfix release
+ * This application is now kf5 adding stable/unstable branches.
+ * New upstream bugfix release
+
+ -- Scarlett Clark <[email protected]> Thu, 14 Apr 2016 14:48:29 -0700
+
+artikulate (4:15.12.1-1) experimental; urgency=medium
+>>>>>>> debian/changelog
* New upstream release (15.12.0).
* New upstream release (15.12.1).
+<<<<<<< debian/changelog
-- Maximiliano Curia <[email protected]> Mon, 01 Feb 2016 10:24:09 +0100
ark (4:15.12.1-0ubuntu1) xenial; urgency=medium
@@ -84,10 +125,57 @@ ark (4:15.08.1-0ubuntu1) wily; urgency=medium
-- Clive Johnston <[email protected]> Tue, 22 Sep 2015 16:03:32 +0100
ark (4:15.08.0-1) unstable; urgency=medium
+=======
+ -- Maximiliano Curia <[email protected]> Mon, 01 Feb 2016 10:22:23 +0100
+
+artikulate (4:15.12.1-0ubuntu2) xenial; urgency=medium
+
+ [ Pino Toscano ]
+ * Remove unused libqtmultimediakit1 and qtmobility-dev build dependencies.
+
+ -- Martin Pitt <[email protected]> Thu, 10 Mar 2016 09:32:36 +0100
+
+artikulate (4:15.12.1-0ubuntu1) xenial; urgency=medium
+
+ [ Clive Johnston ]
+ * New upstream release
+ * Adding new build dependencies
+ * Disabled autotests completely due to problems upstream
+ * Fixed the install file
+ * 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 <[email protected]> Wed, 09 Mar 2016 10:21:06 +0100
+
+artikulate (4:15.08.3-1) experimental; urgency=medium
+
+ * New upstream release (15.08.3).
+
+ -- Maximiliano Curia <[email protected]> Wed, 02 Dec 2015 12:38:42 +0100
+
+artikulate (4:15.08.2-0ubuntu1) wily; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <[email protected]> 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 <[email protected]> Tue, 22 Sep 2015 16:03:51 +0100
+
+artikulate (4:15.08.0-1) experimental; urgency=medium
+>>>>>>> debian/changelog
* New upstream release (15.04.0).
* New upstream release (15.04.1).
* New upstream release (15.04.2).
+<<<<<<< debian/changelog
* New upstream release (15.04.3).
* Drop usage of libarchive for zip files.
* Rename patch: use_libarchive_for_zip_files ->
@@ -126,6 +214,24 @@ ark (4:15.07.90-0ubuntu1) wily; urgency=medium
-- Jonathan Riddell <[email protected]> Tue, 18 Aug 2015 08:55:10 +0100
ark (4:15.04.2-0ubuntu1) wily; urgency=medium
+=======
+
+ [ Pino Toscano ]
+ * Remove unused libqtmultimediakit1 and qtmobility-dev build dependencies.
+
+ [ Maximiliano Curia ]
+ * New upstream release (15.08.0).
+
+ -- Maximiliano Curia <[email protected]> Sat, 19 Sep 2015 19:13:46 +0200
+
+artikulate (4:15.08.0-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+
+ -- Jonathan Riddell <[email protected]> Wed, 26 Aug 2015 16:54:06 +0100
+
+artikulate (4:15.04.2-0ubuntu1) wily; urgency=medium
+>>>>>>> debian/changelog
[ Scarlett Clark ]
* New upstream release
@@ -134,6 +240,7 @@ ark (4:15.04.2-0ubuntu1) wily; urgency=medium
[ Jonathan Riddell ]
* New upstream release
+<<<<<<< debian/changelog
-- Jonathan Riddell <[email protected]> Tue, 09 Jun 2015 18:19:31 +0200
ark (4:14.12.3-1) experimental; urgency=medium
@@ -169,10 +276,53 @@ ark (4:14.12.2-0ubuntu1) vivid; urgency=medium
-- Scarlett Clark <[email protected]> Tue, 10 Feb 2015 09:09:12 -0800
ark (4:14.12.0-0ubuntu1) vivid; urgency=medium
+=======
+ -- Jonathan Riddell <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Tue, 24 Feb 2015 15:03:35 +0100
+
+artikulate (4:14.12.2-0ubuntu1) vivid; urgency=medium
+
+ [ Scarlett Clark ]
+ * New upstream release
+
+ [ José Manuel Santamaría Lema ]
+ * Bump build depend on libqtgstreamer-dev to 1.2.0
+
+ -- Scarlett Clark <[email protected]> Tue, 10 Feb 2015 08:53:09 -0800
+
+artikulate (4:14.12.0-0ubuntu1) vivid; urgency=medium
+>>>>>>> debian/changelog
* New upstream release
* Remove kdelibs5-dev depend version as there was not a new release.
+<<<<<<< debian/changelog
-- Scarlett Clark <[email protected]> Mon, 15 Dec 2014 16:50:30 +0100
ark (4:14.11.97-0ubuntu1) vivid; urgency=medium
@@ -539,10 +689,87 @@ ark (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
-- Jonathan Riddell <[email protected]> Fri, 07 Dec 2012 17:30:48 +0000
ark (4:4.9.80-0ubuntu1) raring; urgency=low
+=======
+ -- Scarlett Clark <[email protected]> Mon, 15 Dec 2014 16:20:52 +0100
+
+artikulate (4:14.11.97-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release candidate
+ - build-depend on extra-cmake-modules
+ - add new files to artikulate.install, docs and not-installed
+ - update artikulate.lintian-overrides for an added file
+ * Import Packaging into Debian Git
+ * PPA build
+
+ -- Philip Muškovac <[email protected]> Fri, 28 Nov 2014 19:53:37 +0100
+
+artikulate (4:4.14.2-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+ * New upstream release
+
+ -- Scarlett Clark <[email protected]> Fri, 10 Oct 2014 02:29:46 -0700
+
+artikulate (4:4.14.0-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <[email protected]> Wed, 20 Aug 2014 12:25:22 +0200
+
+artikulate (4:4.13.97-0ubuntu1) utopic; urgency=medium
+
+ * New upstream beta release RC
+
+ -- Scarlett Clark <[email protected]> Fri, 01 Aug 2014 16:01:55 +0200
+
+artikulate (4:4.13.95-0ubuntu1) utopic; urgency=medium
+
+ * New upstream beta release
+
+ -- Scarlett Clark <[email protected]> Wed, 30 Jul 2014 17:19:14 +0200
+
+artikulate (4:4.13.90-0ubuntu1) utopic; urgency=medium
+
+ * New upstream beta release
+ * Add libqtgstreamer-dev as a build depend
+
+ -- Scarlett Clark <[email protected]> Thu, 17 Jul 2014 10:23:53 -0700
+
+artikulate (4:4.13.2-0ubuntu1) utopic; urgency=medium
+
+ * new upstream release
+
+ -- Jonathan Riddell <[email protected]> Wed, 18 Jun 2014 11:37:50 +0100
+
+artikulate (4:4.13.0-0ubuntu1) trusty; urgency=medium
+
+ * New upstream KDE Software Compilation release
+
+ -- Jonathan Riddell <[email protected]> Thu, 10 Apr 2014 21:32:21 +0100
+
+artikulate (4:4.12.97-0ubuntu1) trusty; urgency=medium
+
+ * New upstream release candidate
+
+ -- Philip Muškovac <[email protected]> Wed, 02 Apr 2014 11:03:53 +0200
+
+artikulate (4:4.12.95-0ubuntu1) trusty; urgency=medium
+
+ [ Rohan Garg ]
+ * New upstream beta release
+
+ [ Philip Muškovac ]
+ * Drop upstream_add-library-versions.diff, applied upstream
+
+ -- Rohan Garg <[email protected]> Sun, 23 Mar 2014 11:51:01 +0100
+
+artikulate (4:4.12.90-0ubuntu1) trusty; urgency=medium
+>>>>>>> debian/changelog
[ Jonathan Riddell ]
* New upstream beta release
+<<<<<<< debian/changelog
[ Rohan Garg ]
* Add libqjson-dev as a build-dep to run tests
- Drop the PHONY test target from rules
@@ -676,3 +903,29 @@ ark (4:4.7.90-0ubuntu1) precise; urgency=low
- ark does not support CD images - fix description
-- Jonathan Riddell <[email protected]> Thu, 15 Dec 2011 14:20:40 +0000
+=======
+ [ Philip Muškovac ]
+ * Use dhmk
+ * Move the libraries from artikulate-dev to artikulate as the libs are not
+ just dev symlinks and drop artikulate-dev as it's now empty
+ * Add da9a92aca3a7af07feb8bde506129fb9314f9e60 as
+ upstream_add-library-versions.diff so the libraries are properly versioned
+ * Override package-name-doesnt-match-sonames for artikulate as the libs are
+ private
+
+ -- Jonathan Riddell <[email protected]> Wed, 19 Mar 2014 10:29:51 +0000
+
+artikulate (0.2.0-0ubuntu1) trusty; urgency=medium
+
+ * New upstream release
+ - Update install files
+ - Update symbols
+
+ -- Rohan Garg <[email protected]> Wed, 12 Mar 2014 11:37:03 +0100
+
+artikulate (0.1.0-0ubuntu1) trusty; urgency=low
+
+ * Initial release. (LP: #1208021)
+
+ -- Howard Chan <[email protected]> Sat, 03 Aug 2013 23:47:00 +0800
+>>>>>>> debian/changelog
diff --git a/debian/control b/debian/control
index 78f212e..5aab84d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,3 +1,4 @@
+<<<<<<< debian/control
Source: ark
Section: kde
Priority: optional
@@ -48,3 +49,46 @@ Description: archive utility
modify archives.
.
This package is part of the KDE SC utilities module.
+=======
+Source: artikulate
+Section: education
+Priority: extra
+Maintainer: Debian/Kubuntu Qt/KDE Maintainers <[email protected]>
+Uploaders: Maximiliano Curia <[email protected]>
+Build-Depends: cmake (>= 3.0.0~),
+ debhelper (>= 9),
+ extra-cmake-modules (>= 5.13.0~),
+ kdoctools-dev,
+ libkf5config-dev,
+ libkf5configwidgets-dev,
+ libkf5crash-dev,
+ libkf5declarative-dev,
+ libkf5i18n-dev,
+ libkf5newstuff-dev,
+ libkf5widgetsaddons-dev,
+ libkf5xmlgui-dev,
+ libqt5gstreamer-dev (>= 1.2.0),
+ libqt5xmlpatterns5-dev (>= 5.5~),
+ pkg-kde-tools,
+ qtbase5-dev (>= 5.5~),
+ qtdeclarative5-dev (>= 5.5~),
+ qtmultimedia5-dev
+Standards-Version: 3.9.6
+Homepage: https://edu.kde.org/
+Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/artikulate
+Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/artikulate
+
+Package: artikulate
+Architecture: any
+Depends: qml-module-org-kde-kquickcontrolsaddons,
+ qml-module-qtquick-controls,
+ qml-module-qtquick-layouts,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Language learning application
+ Artikulate is a language learning application that helps improving
+ pronunciation skills for various languages. This is included in the
+ KDE Education project.
+ .
+ This package contains the main application for Artikulate.
+>>>>>>> debian/control
diff --git a/debian/copyright b/debian/copyright
index 6cbf2d5..e7bd320 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,5 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+<<<<<<< debian/copyright
Upstream-Name: ark
Source: ftp://ftp.kde.org
@@ -109,6 +110,105 @@ License: GFDL-1.2+
Files: debian/*
Copyright: 2012, Eshat Cakar <[email protected]>
License: GPL-2+
+=======
+Upstream-Name: artikulate
+Source: git://anongit.kde.org/artikulate
+
+Files: *
+Copyright: 2013-2014, Andreas Cord-Landwehr <[email protected]>
+ 2013, Andreas Cord-Landwehr <[email protected]>
+ 2013-2014, Andreas Cord-Landwehr <[email protected]>
+ 2013, Magdalena Konkiewicz <[email protected]>
+ 2013, Oindrila Gupta <[email protected]>
+ 2013, Samikshan Bairagya <[email protected]>
+ 2012, Sebastian Gottfried <[email protected]>
+ 2013-2014, The Artikulate Developers
+License: GPL-2+3+KDEeV
+
+Files: CMakeLists.txt
+ autotests/CMakeLists.txt
+ data/CMakeLists.txt
+ data/languages/CMakeLists.txt
+ icons/CMakeLists.txt
+ icons/actions/CMakeLists.txt
+ images/CMakeLists.txt
+ liblearnerprofile/src/CMakeLists.txt
+ libsound/src/CMakeLists.txt
+ schemes/CMakeLists.txt
+ sounds/CMakeLists.txt
+ src/CMakeLists.txt
+ src/qml/CMakeLists.txt
+Copyright: 2013-2014, Andreas Cord-Landwehr <[email protected]>
+License: BSD-2-clause
+
+Files: liblearnerprofile/src/learner.cpp
+ liblearnerprofile/src/learner.h
+ liblearnerprofile/src/learner_p.h
+ liblearnerprofile/src/learninggoal.cpp
+ liblearnerprofile/src/learninggoal.h
+ liblearnerprofile/src/liblearnerprofile_export.h
+ liblearnerprofile/src/profilemanager.cpp
+ liblearnerprofile/src/profilemanager.h
+ liblearnerprofile/src/profilemanager_p.h
+ liblearnerprofile/src/storage.cpp
+ liblearnerprofile/src/storage.h
+ libsound/src/libsound_export.h
+Copyright: 2013-2014, Andreas Cord-Landwehr <[email protected]>
+License: LGPL-2.1+3+KDEeV
+
+Files: COPYING
+ artikulate.appdata.xml
+ src/declarativeitems/applicationbackground.cpp
+ src/declarativeitems/applicationbackground.h
+Copyright: 1989-1991, Free Software Foundation, Inc
+ 2012, Sebastian Gottfried <[email protected]>
+License: GPL-2+
+
+Files: libsound/src/qtgstreameroutputbackend.cpp
+ libsound/src/qtgstreameroutputbackend.h
+Copyright: 2014, Andreas Cord-Landwehr <[email protected]>
+ 2011, Collabora Ltd
+ 2010, Marco Ballesio <[email protected]>
+License: LGPL-2.1+
+
+Files: src/qml/RecordingIcon.qml
+Copyright: 2011, Davide Bettio <[email protected]>
+ 2011, Marco Martin <[email protected]>
+License: LGPL-2+
+
+Files: icons/*
+ images/*
+Copyright: 2013 Andreas Cord-Landwehr <[email protected]>
+License: LGPL-3+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
+
+Files: CONCEPT.txt
+ COPYING.DOC
+ README
+ doc/*
+Copyright: 2013 Andreas Cord-Landwehr <[email protected]>
+ 2000-2002, Free Software Foundation, Inc
+ 2014, The Artikulate Developers
+License: GFDL-1.2+
+
+Files: debian/*
+Copyright: 2013 Howard Chan <[email protected]>
+License: GPL-3+
+>>>>>>> debian/copyright
License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
@@ -125,17 +225,26 @@ License: BSD-2-clause
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+<<<<<<< debian/copyright
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ( INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION ) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
( INCLUDING NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE OF
+=======
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+>>>>>>> debian/copyright
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
License: GFDL-1.2+
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2
or any later version published by the Free Software Foundation;
+<<<<<<< debian/copyright
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
A copy of the license is included in the section entitled "GNU
Free Documentation License".
@@ -162,11 +271,131 @@ License: LGPL-3+
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 3 of the License, or (at your option) any later version.
+=======
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+ Texts.
+ .
+ A copy of the license can be obtained from <http://www.gnu.org/
+ licenses/old-licenses/fdl-1.2.html>
+ .
+ On Debian systems, the complete text of the GNU Free Documentation
+ License version 1.2 can be found in "/usr/share/common-licenses/GFDL-1.2"
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GPL-2+3+KDEeV
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License or (at your option) version 3 or any later version
+ accepted by the membership of KDE e.V. (or its successor approved
+ by the membership of KDE e.V.), which shall act as a proxy
+ defined in Section 14 of version 3 of the license.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2", likewise, the
+ complete text of the GNU General Public License version 3 can be found in
+ "/usr/share/common-liceses/GPL-3".
+
+License: GPL-3+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: LGPL-2+
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Library General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at your option) any
+ later version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for
+ more details.
+ .
+ You should have received a copy of the GNU Library General Public License
+ along with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA .
+ .
+ On Debian systems, the complete text of the GNU Library General Public
+ License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
+
+License: LGPL-2.1+3+KDEeV
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+>>>>>>> debian/copyright
.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
+<<<<<<< debian/copyright
The complete text of the GNU Lesser General Public License version 3 can be
found in the file `/usr/share/common-licenses/GPL-3'.
+=======
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1", likewise,
+ the complete text of the GNU Lesser General Public License version 3 can be
+ found in "/usr/share/common-liceses/LGPL-3".
+>>>>>>> debian/copyright
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..6a1dcb1
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+CONCEPT.txt
+README.md
diff --git a/debian/not-installed b/debian/not-installed
index 145698c..dd0e2d9 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +1,9 @@
+<<<<<<< debian/not-installed
# False positives
usr/share/man/
+=======
+# unused dev symlinks
+./usr/lib/*/libartikulatecore.so
+./usr/lib/*/libartikulatesound.so
+./usr/lib/*/libartikulatelearnerprofile.so
+>>>>>>> debian/not-installed
diff --git a/debian/rules b/debian/rules
index 01c4ed9..8489d16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,14 @@
#!/usr/bin/make -f
+<<<<<<< debian/rules
+=======
+# -*- makefile -*-
+#
+>>>>>>> debian/rules
include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
override_dh_strip:
+<<<<<<< debian/rules
$(overridden_command) --ddeb-migration='ark-dbg (<= 4:15.12.1-1~~)'
override_dh_auto_install:
@@ -11,4 +17,13 @@ override_dh_auto_install:
override_dh_auto_test:
# Disable auto tests at build time
+=======
+ $(overridden_command) --ddeb-migration='artikulate-dbg (<= 4:15.12.1-1~~)'
+
+override_dh_auto_install:
+ dh_auto_install --destdir=debian/tmp
+
+override_dh_auto_test:
+ # Disable autotests at build time
+>>>>>>> debian/rules
:
diff --git a/debian/tests/acc b/debian/tests/acc
new file mode 100755
index 0000000..ecd74f2
--- /dev/null
+++ b/debian/tests/acc
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+dh_acc
diff --git a/debian/tests/control b/debian/tests/control
index a8d28d3..c2bcca2 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,14 @@
Tests: testsuite
+<<<<<<< debian/tests/control
Depends: @, @builddeps@, build-essential
Restrictions: build-needed
+=======
+Depends: @, cmake, libqt5test5, libqt5xcbqpa5, debhelper, build-essential,
+ xvfb, xauth, dbus-x11
+Restrictions: build-needed
+
+# Tests: acc
+# Depends: @,
+# dh-acc, exuberant-ctags
+# Restrictions: allow-stderr
+>>>>>>> debian/tests/control
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index dabe645..fd9cd45 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,3 +1,12 @@
#!/bin/sh
+<<<<<<< debian/tests/testsuite
dh_auto_test
+=======
+export HOME=$(mktemp -d)
+xvfb-run -a --server-args="-screen 0 1024x768x24" \
+ dbus-launch --exit-with-session debian/tests/testsuite.xsession
+ret=$?
+rm -rf ${HOME}
+exit $ret
+>>>>>>> debian/tests/testsuite
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
new file mode 100755
index 0000000..35976a5
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,4 @@
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+dh_auto_test
diff --git a/debian/watch b/debian/watch
index f635523..35d2615 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,8 @@
version=3
+<<<<<<< debian/watch
http://download.kde.org/stable/applications/([\d.]+)/src/ark-([\d.]+).tar.xz
http://download.kde.org/unstable/applications/([\d.]+)/src/ark-([\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
+>>>>>>> debian/watch
--
kubuntu-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
