Merge pull request #57 from opendesktop/develop

Develop

README.md

 # ocs-url
 
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
-[![Build Status](https://travis-ci.org/ocs-url/ocs-url.svg?branch=master)](https://travis-ci.org/ocs-url/ocs-url)
+[![Build Status](https://travis-ci.org/opendesktop/ocs-url.svg?branch=master)](https://travis-ci.org/opendesktop/ocs-url)
 
 An install helper program for items served on OpenCollaborationServices (OCS).
 
-Copyright: 2016-2017, Akira Ohgaki
+Copyright: 2016-2017, Opendesktop.org
 
 License: GPL-3+
 
@@ -15,4 +15,4 @@ https://www.linux-apps.com/p/1136805/
 
 And please check the ocs-url wiki for more information.
 
-https://github.com/ocs-url/ocs-url/wiki
+https://github.com/opendesktop/ocs-url/wiki

app/app.pri

 QT += \
     core \
     gui \
+    widgets \
     qml \
     quick \
     svg

app/configs/application.json

@@ -2,12 +2,12 @@
     "id": "ocs-url",
     "name": "ocs-url",
     "version": "3.0.0",
-    "organization": "ocs-url",
-    "domain": "com.ocs-url.ocs-url",
+    "organization": "Opendesktop.org",
+    "domain": "org.opendesktop.ocs-url",
     "icon": ":/desktop/ocs-url.svg",
     "description": "An install helper program for items served on OpenCollaborationServices (OCS).",
     "license": "GPL-3+",
-    "author": "Akira Ohgaki",
-    "contact": "akiraohgaki@gmail.com",
-    "homepage": "https://github.com/ocs-url/ocs-url"
+    "author": "Opendesktop.org",
+    "contact": "contact@opendesktop.org",
+    "homepage": "https://github.com/opendesktop/ocs-url"
 }

pkg/archlinux/PKGBUILD

@@ -5,11 +5,11 @@ pkgver='3.0.0'
 pkgrel='1'
 pkgdesc='An install helper program for items served on OpenCollaborationServices (OCS).'
 arch=('i686' 'x86_64')
-url='https://github.com/ocs-url/ocs-url'
+url='https://github.com/opendesktop/ocs-url'
 license=('GPL3')
 depends=('qt5-base>=5.2.0' 'qt5-svg>=5.2.0' 'qt5-declarative>=5.2.0' 'qt5-quickcontrols>=5.2.0')
 makedepends=('git')
-#source=("https://github.com/ocs-url/ocs-url/archive/release-${pkgver}.tar.gz")
+#source=("https://github.com/opendesktop/ocs-url/archive/release-${pkgver}.tar.gz")
 source=("${pkgname}.tar.gz")
 md5sums=() #autofill using updpkgsums
 

pkg/fedora/ocs-url.spec

@@ -4,9 +4,9 @@ Version: 3.0.0
 Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Internet
-URL: https://github.com/ocs-url/ocs-url
+URL: https://github.com/opendesktop/ocs-url
 
-#Source0: https://github.com/ocs-url/ocs-url/archive/release-%{version}.tar.gz
+#Source0: https://github.com/opendesktop/ocs-url/archive/release-%{version}.tar.gz
 Source0: %{name}.tar.gz
 
 Requires: qt5-qtbase >= 5.2.0, qt5-qtbase-gui >= 5.2.0, qt5-qtsvg >= 5.2.0, qt5-qtdeclarative >= 5.2.0, qt5-qtquickcontrols >= 5.2.0

pkg/opensuse/ocs-url.spec

@@ -4,9 +4,9 @@ Version: 3.0.0
 Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Internet
-URL: https://github.com/ocs-url/ocs-url
+URL: https://github.com/opendesktop/ocs-url
 
-#Source0: https://github.com/ocs-url/ocs-url/archive/release-%{version}.tar.gz
+#Source0: https://github.com/opendesktop/ocs-url/archive/release-%{version}.tar.gz
 Source0: %{name}.tar.gz
 
 Requires: libQt5Svg5 >= 5.2.0, libqt5-qtquickcontrols >= 5.2.0

pkg/ubuntu/debian/copyright

 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ocs-url
-Upstream-Contact: Akira Ohgaki <akiraohgaki@gmail.com>
-Source: https://github.com/ocs-url/ocs-url
+Upstream-Contact: Opendesktop.org <contact@opendesktop.org>
+Source: https://github.com/opendesktop/ocs-url
 
 Files: *
-Copyright: 2016-2017, Akira Ohgaki
+Copyright: 2016-2017, Opendesktop.org
 License: GPL-3+
  On Debian systems, the full text of the GNU General Public License version 3
  can be found in the `/usr/share/common-licenses/GPL-3' file.

scripts/build.sh

@@ -77,7 +77,7 @@ build_snap() {
 
     tar -xzvf "${SRCARCHIVE}" -C "${BUILDDIR}"
     cp "${PROJDIR}/pkg/snap/snapcraft.yaml" "${BUILDDIR}/${PKGNAME}"
-    cp -r "${PROJDIR}/pkg/snap/setup" "${BUILDDIR}/${PKGNAME}"
+    cp -r "${PROJDIR}/pkg/snap/snap" "${BUILDDIR}/${PKGNAME}"
     cd "${BUILDDIR}/${PKGNAME}"
     snapcraft
 }