diff --git a/.gitignore b/.gitignore index 63e76c0..5d0b081 100644 --- a/.gitignore +++ b/.gitignore @@ -1,56 +1,56 @@ mauikit/ 3rdparty/kirigami 3rdparty/breeze-icons .directory *.*~ -~*.* -~.* +#~*.* +#~.* # C++ objects and libs *.slo *.lo *.o *.a *.la *.lai #*.so *.dll *.dylib # Qt-es object_script.*.Release object_script.*.Debug *_plugin_import.cpp /.qmake.cache /.qmake.stash *.pro.user *.pro.user.* *.qbs.user *.qbs.user.* *.moc moc_*.cpp moc_*.h qrc_*.cpp ui_*.h *.qmlc *.jsc Makefile* *build-* # Qt unit tests target_wrapper.* # QtCreator *.autosave # QtCreator Qml *.qmlproject.user *.qmlproject.user.* # QtCreator CMake CMakeLists.txt.user* # build folders and output build/ vvave diff --git a/buho-master/.gitlab-ci.yml b/buho-master/.gitlab-ci.yml new file mode 100644 index 0000000..bb8b523 --- /dev/null +++ b/buho-master/.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 c15b73d..f238cde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -buho (1.0-1) unstable; urgency=medium +buho (0+git20181114-1) UNRELEASED; urgency=medium - * Initial release (Closes: #nnnn) + * Initial release - -- Bruno Queiros Sat, 01 Dec 2018 16:08:24 +0000 + -- Jonah Brüchert Wed, 14 Nov 2018 15:47:04 +0100 diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index b0019c5..feb50d3 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,32 @@ Source: buho -Section: unknown +Section: utils Priority: optional -Maintainer: Bruno Queiros -Build-Depends: debhelper (>= 10) -Standards-Version: 4.1.2 -Homepage: -#Vcs-Git: https://anonscm.debian.org/git/collab-maint/buho.git -#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/buho.git +Maintainer: Jonah Brüchert +Build-Depends: debhelper (>= 11), + libkf5config-dev (>= 5.24.0~), + libkf5coreaddons-dev (>= 5.24.0~), + libkf5i18n-dev (>= 5.24.0~), + libkf5kio-dev, + libkf5notifications-dev (>= 5.24.0~), + libkf5service-dev (>= 5.24.0~), + libqt5svg5-dev, + mauikit-dev, + qt5-qmake, + qtbase5-dev (>= 5.5.0~), + qtdeclarative5-dev, + qtquickcontrols2-5-dev, + qtwebengine5-dev +Standards-Version: 4.2.1 +Homepage: https://github.com/maui-project/buho +Vcs-Browser: https://gitlab.com/debian-pm/buho +Vcs-Git: https://gitlab.com/debian-pm/buho.git Package: buho Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: - +Depends: qml-module-org-kde-mauikit, + qml-module-qmltermwidget, + ${misc:Depends}, + ${shlibs:Depends} +Description: Maui Note Taking App + Buho allows you to save links, write quick notes and organize pages as books. + Buho works on desktops, Android and Plasma Mobile. diff --git a/debian/copyright b/debian/copyright index ca92cc6..94eb169 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,38 +1,27 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: buho -Source: +Source: https://github.com/maui-project/buho Files: * -Copyright: - -License: - - - . - +Copyright: 2018, Camilo Higuita +License: GPL-3+ -# If you want to use GPL v2 or later for the /debian/* files use -# the following clauses, or change it to suit. Delete these two lines Files: debian/* -Copyright: 2018 Bruno Queiros +Copyright: 2018, Jonah Brüchert License: GPL-2+ - This package is free software; you can redistribute it and/or modify + +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 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 - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + the Free Software Foundation; version 2 dated June, 1991, or (at + your option) any later version. + On Debian systems, the complete text of version 2 of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL-2'. -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. -# Please avoid picking licenses with terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. +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; version 3 dated June, 2007, or (at + your option) any later version. + On Debian systems, the complete text of version 3 of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL-3'. diff --git a/debian/rules b/debian/rules index e1c367c..8f92f1a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,25 +1,6 @@ #!/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 +export QT_SELECT=qt5 %: 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) - diff --git a/travis-build.sh b/travis-build.sh index df9eddc..06b657c 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 +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 +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