From: David Llewellyn-Jones Date: Sun, 16 Feb 2014 21:38:52 +0000 (+0000) Subject: Updated more copyright files X-Git-Url: https://www.flypig.org.uk/git/?p=openvpnui.git;a=commitdiff_plain;h=47f1326595263559a34d5db5e580fb2d1676e408 Updated more copyright files --- diff --git a/qml/OpenVPNUI.qml b/qml/OpenVPNUI.qml index 032e488..0e2e5f5 100644 --- a/qml/OpenVPNUI.qml +++ b/qml/OpenVPNUI.qml @@ -1,6 +1,6 @@ /* - Copyright (C) 2013 Jolla Ltd. - Contact: Thomas Perl + Copyright (C) 2014 David Llewellyn-Jones + Contact: David Llewellyn-Jones All rights reserved. You may use this file under the terms of BSD license as follows: @@ -26,6 +26,10 @@ 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. + + Built using the standard template from Jolla + Copyright (C) 2013 Jolla Ltd. + Contact: Thomas Perl */ import QtQuick 2.0 diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml index ba922be..3564d09 100644 --- a/qml/cover/CoverPage.qml +++ b/qml/cover/CoverPage.qml @@ -1,6 +1,6 @@ /* - Copyright (C) 2013 Jolla Ltd. - Contact: Thomas Perl + Copyright (C) 2014 David Llewellyn-Jones + Contact: David Llewellyn-Jones All rights reserved. You may use this file under the terms of BSD license as follows: @@ -26,6 +26,10 @@ 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. + + Built using the standard template from Jolla + Copyright (C) 2013 Jolla Ltd. + Contact: Thomas Perl */ import QtQuick 2.0 diff --git a/qml/pages/ConfigurePage.qml b/qml/pages/ConfigurePage.qml index b6ad3da..f02f335 100644 --- a/qml/pages/ConfigurePage.qml +++ b/qml/pages/ConfigurePage.qml @@ -1,6 +1,6 @@ /* - Copyright (C) 2013 Jolla Ltd. - Contact: Thomas Perl + Copyright (C) 2014 David Llewellyn-Jones + Contact: David Llewellyn-Jones All rights reserved. You may use this file under the terms of BSD license as follows: @@ -26,6 +26,10 @@ 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. + + Built using the standard template from Jolla + Copyright (C) 2013 Jolla Ltd. + Contact: Thomas Perl */ import QtQuick 2.0 diff --git a/qml/pages/ConnectPage.qml b/qml/pages/ConnectPage.qml index 88d0b8e..fcc2222 100644 --- a/qml/pages/ConnectPage.qml +++ b/qml/pages/ConnectPage.qml @@ -1,6 +1,6 @@ /* - Copyright (C) 2013 Jolla Ltd. - Contact: Thomas Perl + Copyright (C) 2014 David Llewellyn-Jones + Contact: David Llewellyn-Jones All rights reserved. You may use this file under the terms of BSD license as follows: @@ -26,6 +26,10 @@ 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. + + Built using the standard template from Jolla + Copyright (C) 2013 Jolla Ltd. + Contact: Thomas Perl */ import QtQuick 2.0 diff --git a/rpm/OpenVPNUI.spec b/rpm/OpenVPNUI.spec index ed8c99d..5ee1235 100644 --- a/rpm/OpenVPNUI.spec +++ b/rpm/OpenVPNUI.spec @@ -16,15 +16,15 @@ Summary: OpenVPN User Interface Version: 0.1 Release: 1 Group: Qt/Qt -License: LICENSE +License: BSD Licence URL: http://example.org/ Source0: %{name}-%{version}.tar.bz2 Source100: OpenVPNUI.yaml Requires: sailfishsilica-qt5 >= 0.10.9 -BuildRequires: pkgconfig(sailfishapp) >= 0.0.10 -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(sailfishapp) >= 0.0.10 BuildRequires: desktop-file-utils %description @@ -63,13 +63,13 @@ desktop-file-install --delete-original \ %files %defattr(-,root,root,-) -/usr/share/icons/hicolor/86x86/apps -/usr/share/applications -/usr/share/OpenVPNUI -/usr/bin -%{_datadir}/icons/hicolor/86x86/apps/%{name}.png -%{_datadir}/applications/%{name}.desktop -%{_datadir}/%{name}/qml %{_bindir} +%{_datadir}/%{name}/qml +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/86x86/apps/%{name}.png +/usr/bin +/usr/share/OpenVPNUI +/usr/share/applications +/usr/share/icons/hicolor/86x86/apps # >> files # << files diff --git a/rpm/OpenVPNUI.yaml b/rpm/OpenVPNUI.yaml index 6a4d8de..daa3264 100644 --- a/rpm/OpenVPNUI.yaml +++ b/rpm/OpenVPNUI.yaml @@ -4,7 +4,7 @@ Version: 0.1 Release: 1 Group: Qt/Qt URL: http://example.org/ -License: LICENSE +License: "BSD Licence" Sources: - '%{name}-%{version}.tar.bz2' Description: | @@ -27,3 +27,4 @@ Files: - /usr/share/OpenVPNUI - /usr/share/applications - /usr/share/icons/hicolor/86x86/apps +PkgBR: []