diff --git a/.gitignore b/.gitignore index 63e76c0f5276118d8c42114e432c8353645a3613..5d0b081c9a337df66fac01017606240dfd8e6d76 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,8 @@ mauikit/ .directory *.*~ -~*.* -~.* +#~*.* +#~.* # C++ objects and libs *.slo diff --git a/.travis.yml b/.travis.yml index 93b7d73fab183a1934898b05c7fc478d64b68ac9..bf438bad24bae27f9475e66e7b50d87736191899 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,39 +1,36 @@ 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: X851cagOqK3vxSgI+WiK86PQ7x5comdCp3wJjHsO6kIKMITRHwJhpxBIx2gUN4Y/KOPO34I/n9B/s/kZv/gColAvCkwJXKyoTt+counQZzFz2QVAFmfs95hfJY87FGSZe3rP/8/rw0wRONvGcjjaeFMLRsrP02mG9BBYdFzS27fvEQl1HKIpn3WI59aHvhwBhFPUWm8DnJhphtcJCxFACoQZs3BHPWCQ7EvEvKZZEPGctMD7NHz45KtrzJFYfuBQ6cy5lsfDRZZ+8SiWgtJorz+/S4Ed7JHKHlSfwtMuKjCK3MWgrhQgwXOfVCM9Oxmba1puPR7mGIleZ58s+2DmwbsCGIyxV5JOZd7PPjTgqFe2QLqPTzQIUFyYm3hp2+LFg8uoKTmutfPSca6uUWd9I7+R+uB2dSPhII70+dqXfAtROjJngrV1Y+qxC1smgykFy704kfxkKbl4mG6RJMp+tly2a2lY+Fv1ICE9klCGpM/iwSZlYd1xYm+653cOQh4ZgS2y3v1yJmufG9N2ElM9JB3qCCBg73zCl5jtmcGgEzhYjI6twhSqctBAxrTdXGhmeFQUVPux/Ucnq4VubyB9Rz2Y2h60OJzEmErhmRNT3b2TFTef8Yrx4SZEQWqQVnAdY0uIydmzcNo5dx18DQJrZt5yI30b8qHkoHmdBiAKUnQ= + - secure: cPw/mGqmpsHuzXpI7FqlKC1FUE8EZKBNdEj63UlEwyzTLZDgH5XImcouxzh0hgYV6q3nIZfrNcs0A53oyC4Xh+0Jsa1ICr3INl/rErTpsHHeETeXvLNkDW2Maw2LewOH70Vmanx4IHcOT08e7+EFQ0U7umoZcD2uvUvQ3iyIhJ/FYbza9lKw5nH7LyMYDxVBfS6MZtaYbERbudQYqcaByZXTRCDDEJ/3YbXQhOJLBlys41bgCOILEdw1N1iBpszifj6WuiOiBrM+2RfS0uGHb+cAwPJLS0aFa+7aOF66lEicnoblTG5oP7aziKGUrCc5CuBtmJw3+J5D3B2I76MXTzGXyCWqT1nd7I2JEJXAcv2/FB8hsPOWVjmzydPGXAknJgD65zr4ITZRi43PtOvPlrA6fW5mVO+OiXzl5p+hRaL/pp1HCArtMMXWnsiXAV5MoGbX1xURVvo1eNTNibX1CUkTlKNMFkn8sXSyl7uE1Jfurwp78uBwmJHk+X60VfGZT2a0gZg2PttUEb43bN0uxDhEAYE6Ifh4+m+BEFvhI574A+VP+BhdpZelHw2CeNwInGhGNsKTD3xdTVdxVnJG33CRen0h+DncK7wc3rQitsnE9PharmKqN9IeWv28YWZeBIpRBucRh3U4419R8XFxnhgF0wuViLP6i3iu0A8NWe8= diff --git a/debian/changelog b/debian/changelog index 2201e5c6e3eae9f16a4355a2efbf90a4ae224d24..07cc7165dbb4bfe3ba8ed3e6289fc5ead7d10030 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ -index (1.0-1) unstable; urgency=medium +index (0+git20181114-1) UNRELEASED; urgency=medium - * Initial release (Closes: #nnnn) + * New snapshot - -- Bruno Queiros Sat, 01 Dec 2018 16:08:24 +0000 + -- Jonah Brüchert Wed, 14 Nov 2018 15:43:56 +0100 + +index (0+git20180905-1) unstable; urgency=medium + + * Initial release + + -- Jonah Brüchert Wed, 05 Sep 2018 14:37:52 +0200 diff --git a/debian/compat b/debian/compat index f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2..b4de3947675361a7770d29b8982c407b0ec6b2a0 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index 127308f1de659195941e609f0312843fb12ee41e..c546e7de51b6dd8758015b4c5ab59d28d8f0b188 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,32 @@ Source: index -Section: unknown +Section: utils Priority: optional -Maintainer: Bruno Queiros -Build-Depends: debhelper (>= 10) -Standards-Version: 4.1.2 -Homepage: -Vcs-Git: https://github.com/mauikit/index.git -#Vcs-Browser: https://github.com/mauikit/index.git +Maintainer: Jonah Brüchert +Build-Depends: cmake, + debhelper (>= 11), + extra-cmake-modules, + 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, + qtbase5-dev (>= 5.5.0~), + qtdeclarative5-dev, + qtquickcontrols2-5-dev, + qtwebengine5-dev +Standards-Version: 4.2.1 +Homepage: https://github.com/maui-project/index +Vcs-Browser: https://gitlab.com/debian-pm/apps/index +Vcs-Git: https://gitlab.com/debian-pm/apps/index.git Package: index Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: - +Depends: qml-module-org-kde-mauikit, ${misc:Depends}, ${shlibs:Depends} +Description: Maui File manager + Index is a file manager that works on desktops, Android and Plasma Mobile. + Index lets you browse your system files and applications and preview + your music, text, image and video files and share them with external applications + . diff --git a/debian/copyright b/debian/copyright index 1608084d23539d062b58ff44771138b9778e73b8..d72038f284c5984346ab2849d701534fa6f35e81 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: index -Source: +Source: https://github.com/maui-project/index 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 e1c367c12388dca85fb368ef66b356702f03a77a..8f92f1a96ae9e5d79268d42cd5db3caa001b877f 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 afc0f42df96fc4f3bd0d175c3db28cb022a780a1..187aa9fc92d5e126175d52fdc9a0278063362c4b 100755 --- a/travis-build.sh +++ b/travis-build.sh @@ -1,7 +1,7 @@ #!/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 @@ -10,7 +10,15 @@ 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 +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