diff --git a/.travis.yml b/.travis.yml index 93b7d73..58cbc19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,39 +1,38 @@ sudo: required - services: - - docker - +- docker addons: apt: packages: - - realpath - + - realpath install: - - docker pull ubuntu:bionic - - wget https://raw.githubusercontent.com/nomad-desktop/nxos-repository-util/master/nxos-repository-util.sh -O nxos-repository-util.sh - - chmod +x nxos-repository-util.sh - +- docker pull ubuntu:bionic +- wget https://raw.githubusercontent.com/nomad-desktop/nxos-repository-util/master/nxos-repository-util.sh + -O nxos-repository-util.sh +- chmod +x nxos-repository-util.sh script: - - docker run --rm -v $(pwd)/:/build/ -w /build/ ubuntu:bionic /bin/bash travis-build.sh - +- docker run --rm -v $(pwd)/:/build/ -w /build/ ubuntu:bionic /bin/bash travis-build.sh branches: only: - - master - - development - + - master + - development deploy: - - provider: script - script: ./source/nxos-repository-util.sh upload testing *.deb - skip_cleanup: true - on: - branch: master - - - provider: script - script: ./source/nxos-repository-util.sh upload development *.deb - skip_cleanup: true - on: - branch: development - +- provider: script + script: "./source/nxos-repository-util.sh upload testing *.deb" + skip_cleanup: true + on: + branch: master +- provider: script + script: "./source/nxos-repository-util.sh upload development *.deb" + skip_cleanup: true + on: + branch: development notifications: email: false slack: nitrux:LgpKKPnWky7IWShmzXsyVDWu +env: + global: + - secure: WiUg/WtCjSUfyWV1vWMwQT8YIS2sI0e+0Cp0hc+nIHVey/ztF1N1zuHUZOES7HddzfX5dN3uGzhE5SnbPs87WJYd41sPHcOcndgCItKl1r10vLHYvcnJZq5ItOTAIZE3f81DYO3RRfrXJLbEPzTnK4SjD/0xv8ZTA+A0dyVOejy0LqUUpIoI6W4q9wjd+Nq8EwTaT7PcKsW0Z4p4XCOXkZ3iQdiGnRuvtistkJw7Jh8Y+cISDymHEk+vXicpxXUkw9KVSXw02YfL1K5HS52/+ZrrPj4CloupgaYngtNHGvcwsuAh3KFnYkZW9QOHk1a3KCi+Nlbb2ppvFth0MGSXA4UyCLEXls2P3dCSx1PsghXDnRVqDciezVDbZPB1i4beULTJBPmJRtgZepjZsdr9EphMSmJ2PFZ5hg53dTvdbYJZdLyVvI/MlTxbepcXPftL9tfLCjJSbOhKWD4Ol9iavxnCyUcmAji9UDeWhV8PHekkjTiQgixxaIeXhAfhZh6JwPV2Gd5N5bUeGyheBgViqd0WsHaBOfPI7Uv1xfXCAnEc0ft4HkAc5EiZbJdat7GSgHcpmLverGwLi33lkKeiCFQNkMcD3fjh4H+SXXsoK4RwbZt+zpCWK6t9s/9n7Xspj6j/NOjdUkiPfwKXraAICr1r5+eDPW9kM7ABwG3/dqg= + - secure: rGXwNt1KVvCmk9cHEmUuDYQlxesC65XD9gzSSbMRNAMKxGs4WTFT6Hm6vN3EWKjhXxsGOBw9vk4rjlGF/FNAUW3ZJvGne16mzJfDN6/nwvRmHer7sTS37L44VpXVSQJaR5+LbKunY2XgttpJz0UHx2SU8RniLIw8N+i2DP2FqASW59P68DpyDP65HSWnHlFMZziW/eddY2Aye16zaPD8OrAA/0z6t/6rDy3//GE1NSs/0GQuTlP+xusbxhtIG/OqI1UiZ2Hhodr+Kgvqt+saA48CQhDjWxvLUHev32fRTSMHvu74dp8DuqyqlMGJ3zkjCbTaU2ppS3tdgQJwdltMvr+CvHnV91V2WKU+VVGwjhwQpa9WbWvUI2oQEwaFynH4Bp/OivDI7wzd5Cm2rTS2JzhcNS9ZTAjtWpSdgmU34XIIO4+qBdzcwY5V2MZQciUAD/YTJujKUNQ0meau+rgCUzMEVKtiClFjQUzg2aFca+HBbeyfbHeIFNfXNUI3mt8NH4O7h9vw1BRP5NU1R/A/VP+SkDEJEyXqHdRgSc/MkxzYICw2SlAdjxDiny/uBoTHgGauNA6UWbMsy/GyFbg9W9uq9DcESTNjUxMa//A2RxykhAaeCu7mt4o+lHGL9UeME6n2xQC7fo1kEcKp3e2zyKPPLhxbMG9tdxrEgaMXpi4= + - secure: '08U8nTk+JbG2yLY+Bur6yT01IFcyGjNaQZWBvzJC4XA8IIAfm99tQmTwCDvaIfCur5S5/CSw0g7hHe8sV6tWVsWh4rTueURDKDxCchyzBvgZcgndwYSrMbbPO3y/EvmbEk1t2dzcUIB/a9NR1SYm06hcdPDdFFJV74Y+Jq1p2vsT7hVNxTVTL88e/U/PzEGB3IMSbbAxbJMemkDPfMFHfZ5alVT0r76V1WaHD3LTsk0UCePumG7uNLr12FeFk7enDbyIzMMAOZhgEz60IKu1vbl+yJky5ZLM3rBkHvjcWNBZrcfDS3+iJhw3CZNSHqAYfCkM2K41KlsPmF/wCym+QpMQ71L1uR/2ACK1Ct0O8nz9tu9ZpS8T28dppojEnqwI3wv+x0KCg/JwSVKiDmnS1J3AN8PwHn95vGYSG01Maz2ySF1+6WYK56LQiHElyy4tf8imazaPCkxi02TNK7ypOy500LiPZNRwtTxy+jNRtNeYcCObDvke60YgQJveosL6iQRn6Jo+uzVigXp6FOA0NmhTuSWhZRUPSCFrw8jXBHdgO/3Xx+JF4X7y3sC8MJO9Udtyos65tJMIUfGtr1sTNkbxRqHSpIe3OBQ7zyamxt4BCYObxypEKalejETlt4khDPBLzumCssz6PvQhbwmdA917KYHXHHA53jYuSr1Xc6I=' + - secure: uxKtkaB6grBZRvmKQJPzlwmXEutdshQndYn7zViZuJriEdV2SZqTKqEAQBl5q/NuKlViw3jMWWDV2Gj/neQ5ECg/l5B9d15DEWhELTu0X4id65ROc0c7xUp0jczZItgF754uN4IdbOWDeo2jOtKJHWg55E7bMgjXxn1DHK6roa6crRiBmCESaCzqhWeLUmWJzElSKCQxvXTNC1LEs0PcDTiuaILGFU0d94GS1UfhUHCplc3+P7eLLAWmkf9yjSoIhUzGGUgEo9fQO9Yuh3svtr/zxGdmWKrAzgl5ZXLnAh3WhYCecmJErVddUAL0RO8VXHrNzB/IzskvmXm6zUPHNrACKa7jAFkekTJBFEce84IOOGY5/GPuoOt3EbdgHCKqLTRufnzj/wjPleLmIyNYD3tdXh7Ds7vn7cM/29BHZZzHm/He6Tyos5M1q+dsunydsjivQjWebkiPaYiOc7oYoLbSpIuOcj2P6F3sSKTUtb/wCWnFZWTewPc2gbtPOrrgeOuJNiuFiH89g1k0plKvVXnU3ObGLmX5oC7bLZ2t5hMMZjW4j3jyv5Oh5guFZhf86QtBbWzcNIYNckH1p+7fLdLR2fZWqDDtNCCXp+XjiAVNswZMyiNPZJQxOeuQw/ilXhLDDaFBSlz9JDKpNR2cy2Wp6+qHQjXB58mOrTXeDmc= diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml new file mode 100644 index 0000000..bb8b523 --- /dev/null +++ b/debian/.gitlab-ci.yml @@ -0,0 +1,3 @@ +include: 'https://gitlab.com/debian-pm/tools/build/raw/master/docker/gitlab-ci-base.yml' + +image: jbbgameich/build diff --git a/debian/changelog b/debian/changelog index c528fcd..1fb747c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ -vvave (1.0) nxos; urgency=medium +vvave (1.2+git20181114-1) UNRELEASED; urgency=medium - [ Camilo ] - * Initial release + * New snapshot - [ Ubuntu ] + -- Jonah Brüchert Wed, 14 Nov 2018 15:42:55 +0100 - -- Camilo Wed, 15 Mar 2017 00:54:53 +0000 +vvave (1.2-0ubuntu1) unstable; urgency=medium + + [ Clive Johnston ] + * Initial packaging for Ubuntu + + [ Rik Mills ] + * Initial upstream release (1.2) + + -- Clive Johnston Fri, 24 Feb 2017 12:41:11 +0000 diff --git a/debian/compat b/debian/compat index ec63514..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +11 diff --git a/debian/control b/debian/control index f90eb6e..ce00cfd 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,46 @@ -Source: vvave -Section: main +Source: vvave +Section: sound Priority: optional -Maintainer: Camilo -Build-Depends: debhelper (>=9) -Standards-Version: 3.9.6 -#Homepage: -Vcs-Git: https://github.com/mauikit/vvave.git +Maintainer: Debian/Kubuntu Qt/KDE Maintainers +Build-Depends: appstream, + cmake (>= 2.8.12), + debhelper (>= 11), + extra-cmake-modules (>= 5.24.0~), + libkf5config-dev (>= 5.24.0~), + libkf5coreaddons-dev (>= 5.24.0~), + libkf5i18n-dev (>= 5.24.0~), + libkf5kio-dev, + libkf5notifications-dev (>= 5.24.0~), + libqt5websockets5-dev, + libtag1-dev, + mauikit-dev, + pkg-kde-tools, + qtbase5-dev (>= 5.5.0~), + qtmultimedia5-dev (>= 5.5.0~), + qtquickcontrols2-5-dev, + qtwebengine5-dev +Standards-Version: 4.2.1 +Homepage: https://github.com/maui-project/vvave +Vcs-Browser: https://gitlab.com/debian-pm/apps/vvave +Vcs-Git: https://gitlab.com/debian-pm/apps/vvave.git Package: vvave Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common -Description: Music Player +Depends: qml-module-org-kde-mauikit, + youtube-dl, + ${misc:Depends}, + ${shlibs:Depends} +Description: Tiny Qt VVave Music Player + VVave is a tiny Qt music player to keep your favorite songs at hand + . + VVave will handle your whole music collection, letting you create + custom playlists to organize your music. + . + You can also filter your music by artist, title, album, genre, + date and location. VVave lets you vvave-mark your favorite YouTube + music videos into your local collection by using the Chromium + extension. + . + Think of VVave as the playlist where all your favorite tracks at + the moment are. And when needed you also have an integrated + collection manager. diff --git a/debian/copyright b/debian/copyright index 41f2466..0e10dfb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,28 +1,107 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: vvave -Source: https://github.com/mauikit/vvave +Upstream-Name: vvave +Source: https://cgit.kde.org/vvave.git Files: * -Copyright: 2017 Nitrux Latinoameriaca -License: GPL-3.0+ +Copyright: 2017-2018 Camilo Higuita +License: GPL-3+ Files: debian/* -Copyright: 2019 Camilo -License: GPL-3.0+ +Copyright: 2017 Clive Johnston + 2017-2108 Rik Mills + 2017-2018 Scarlett Clark +License: GPL-2+ -License: GPL-3.0+ - This program is free software: you can redistribute it and/or modify +Files: cmake/* +Copyright: 2006, Laurent Montel +License: BSD-3-clause + +Files: source/mpris2.h +Copyright: 2011-2016, Craig Drummond +License: GPL-2+ + +Files: org.kde.vvave.appdata.xml +Copyright: 2017-2018 Camilo Higuita +License: CC0 or GPL-3 + +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR 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 COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, 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 THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +License: GPL-2+ + 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 + the Free Software Foundation; either version 2 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 . + along with this program. If not, see . On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: CC0 + This software and associated documentation files (the "Software") is + released under the CC0 Public Domain Dedication, version 1.0, as + published by Creative Commons. To the extent possible under law, the + author(s) have dedicated all copyright and related and neighboring + rights to the Software to the public domain worldwide. The Software is + distributed WITHOUT ANY WARRANTY. + . + If you did not receive a copy of the CC0 Public Domain Dedication + along with the Software, see + + +License: GPL-3 + 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 3 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. + . + The complete text of the GNU General Public License version 3 can be found in + `/usr/share/common-licenses/GPL-3'. + +License: GPL-3+ + 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 3 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 . + . + On Debian systems, the complete text of the GNU General Public License + can be found in `/usr/share/common-licenses/GPL-3'. diff --git a/debian/install b/debian/install deleted file mode 100644 index 30048e1..0000000 --- a/debian/install +++ /dev/null @@ -1,7 +0,0 @@ -cd .. -# Make some build dirs -mkdir build -cd build -# Build -qmake -o Makefile ../vvave.pro -make diff --git a/debian/rules b/debian/rules index 2f54c47..f33fb73 100755 --- a/debian/rules +++ b/debian/rules @@ -1,25 +1,5 @@ #!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#export DH_VERBOSE = 1 - - -# see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - - -%: - dh $@ - - -# dh_make generated override targets -# This is example for Cmake (See https://bugs.debian.org/641051 ) -#override_dh_auto_configure: -# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) +include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk +override_dh_install: + dh_install --list-missing diff --git a/debian/vvave-docs.docs b/debian/vvave-docs.docs deleted file mode 100644 index e69de29..0000000 diff --git a/travis-build.sh b/travis-build.sh index afc0f42..660c918 100755 --- a/travis-build.sh +++ b/travis-build.sh @@ -1,20 +1,28 @@ #!/bin/bash apt-get --yes update -apt-get --yes install wget +apt-get --yes install wget gnupg2 ### Add KDENeon Repository echo 'deb http://archive.neon.kde.org/dev/stable/ bionic main' | tee /etc/apt/sources.list.d/neon-stable.list wget -qO - 'http://archive.neon.kde.org/public.key' | apt-key add - ### Install Dependencies apt-get --yes update apt-get --yes dist-upgrade -apt-get --yes install devscripts lintian build-essential automake autotools-dev equivs qt5-default qtdeclarative5-dev qtquickcontrols2-5-dev qtwebengine5-dev cmake +apt-get --yes install devscripts lintian build-essential automake autotools-dev equivs qt5-default qtdeclarative5-dev qtquickcontrols2-5-dev qtwebengine5-dev cmake debhelper extra-cmake-modules libkf5config-dev libkf5coreaddons-dev libkf5i18n-dev libkf5kio-dev libkf5notifications-dev libkf5service-dev libqt5svg5-dev qtbase5-dev qml-module-org-kde-kirigami2 qml-module-qtquick-controls2 qml-module-qtwebengine qt5-qmake qml-module-qtquick2 libqt5core5a libqt5gui5 libqt5network5 libqt5qml5 libqt5quick5 libqt5widgets5 appstream libqt5websockets5-dev libtag1-dev pkg-kde-tools qtmultimedia5-dev youtube-dl +wget https://raw.githubusercontent.com/lnxslck/home/master/nitrux/qml-module-qmltermwidget_0.1%2Bgit20180903-1_amd64.deb -O qml-module-qmltermwidget_0.1%2Bgit20180903-1_amd64.deb +dpkg -i qml-module-qmltermwidget_0.1%2Bgit20180903-1_amd64.deb +wget http://repo.nxos.org/development/pool/main/m/mauikit/libmauikit_0%2Bgit20181114-1_amd64.deb +dpkg -i libmauikit_0+git20181114-1_amd64.deb +wget http://repo.nxos.org/development/pool/main/m/mauikit/qml-module-org-kde-mauikit_0%2Bgit20181114-1_amd64.deb +dpkg -i qml-module-org-kde-mauikit_0+git20181114-1_amd64.deb +wget http://repo.nxos.org/development/pool/main/m/mauikit/mauikit-dev_0%2Bgit20181114-1_amd64.deb +dpkg -i mauikit-dev_0+git20181114-1_amd64.deb mk-build-deps -i -t "apt-get --yes" -r ### Build Deb mkdir source mv ./* source/ # Hack for debuild cd source debuild -b -uc -us