From 487509cb0c7b7c8a8d9e544cbd9c7b8a4b5c472a Mon Sep 17 00:00:00 2001 From: rfc2822 Date: Sat, 8 Nov 2014 17:57:14 +0100 Subject: [PATCH] Add license info for dnsjava and some copyright notes --- README.md | 2 +- res/values-de/strings.xml | 3 ++- res/values/strings.xml | 3 ++- src/at/bitfire/davdroid/resource/DavResourceFinder.java | 7 +++++++ .../bitfire/davdroid/syncadapter/LoginEmailFragment.java | 7 +++++++ src/at/bitfire/davdroid/syncadapter/LoginTypeFragment.java | 7 +++++++ src/at/bitfire/davdroid/webdav/DavRedirectStrategy.java | 7 +++++++ src/at/bitfire/davdroid/webdav/NotAuthorizedException.java | 7 +++++++ 8 files changed, 40 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4e895139..a3039d9b 100644 --- a/README.md +++ b/README.md @@ -18,4 +18,4 @@ USED THIRD-PARTY LIBRARIES * [ez-vcard](https://code.google.com/p/ez-vcard/) – [New BSD License](http://opensource.org/licenses/BSD-3-Clause) * [Simple XML Serialization](http://simple.sourceforge.net/) – [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) * [Project Lombok](http://projectlombok.org/) – [MIT License](http://opensource.org/licenses/mit-license.php) - +* [dnsjava](http://www.xbill.org/dnsjava/) – [BSD license](http://www.xbill.org/dnsjava/dnsjava-current/LICENSE) diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index daf29d39..b6044702 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -82,7 +82,8 @@ * iCal4j – New BSD License
* ez-vcard – New BSD License
* Simple XML Serialization – Apache License, Version 2.0
- * Project Lombok – MIT License

+ * Project Lombok – MIT License
+ * dnsjava – BSD License

]]> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0b7842e3..102cb6cd 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -82,7 +82,8 @@ * iCal4j – New BSD License)
* ez-vcard – New BSD License
* Simple XML Serialization – Apache License, Version 2.0
- * Project Lombok – MIT License

+ * Project Lombok – MIT License
+ * dnsjava – BSD License

]]> diff --git a/src/at/bitfire/davdroid/resource/DavResourceFinder.java b/src/at/bitfire/davdroid/resource/DavResourceFinder.java index cd7163ce..76e330d5 100644 --- a/src/at/bitfire/davdroid/resource/DavResourceFinder.java +++ b/src/at/bitfire/davdroid/resource/DavResourceFinder.java @@ -1,3 +1,10 @@ +/******************************************************************************* + * Copyright (c) 2014 Ricki Hirner (bitfire web engineering). + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/gpl.html + ******************************************************************************/ package at.bitfire.davdroid.resource; import java.io.Closeable; diff --git a/src/at/bitfire/davdroid/syncadapter/LoginEmailFragment.java b/src/at/bitfire/davdroid/syncadapter/LoginEmailFragment.java index 72fb1d8b..e7d2e3ec 100644 --- a/src/at/bitfire/davdroid/syncadapter/LoginEmailFragment.java +++ b/src/at/bitfire/davdroid/syncadapter/LoginEmailFragment.java @@ -1,3 +1,10 @@ +/******************************************************************************* + * Copyright (c) 2014 Ricki Hirner (bitfire web engineering). + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/gpl.html + ******************************************************************************/ package at.bitfire.davdroid.syncadapter; import java.net.URI; diff --git a/src/at/bitfire/davdroid/syncadapter/LoginTypeFragment.java b/src/at/bitfire/davdroid/syncadapter/LoginTypeFragment.java index 51fbc909..8507bcc6 100644 --- a/src/at/bitfire/davdroid/syncadapter/LoginTypeFragment.java +++ b/src/at/bitfire/davdroid/syncadapter/LoginTypeFragment.java @@ -1,3 +1,10 @@ +/******************************************************************************* + * Copyright (c) 2014 Ricki Hirner (bitfire web engineering). + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/gpl.html + ******************************************************************************/ package at.bitfire.davdroid.syncadapter; import android.app.Fragment; diff --git a/src/at/bitfire/davdroid/webdav/DavRedirectStrategy.java b/src/at/bitfire/davdroid/webdav/DavRedirectStrategy.java index 8a62aab9..7019d06c 100644 --- a/src/at/bitfire/davdroid/webdav/DavRedirectStrategy.java +++ b/src/at/bitfire/davdroid/webdav/DavRedirectStrategy.java @@ -1,3 +1,10 @@ +/******************************************************************************* + * Copyright (c) 2014 Ricki Hirner (bitfire web engineering). + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/gpl.html + ******************************************************************************/ package at.bitfire.davdroid.webdav; import java.net.MalformedURLException; diff --git a/src/at/bitfire/davdroid/webdav/NotAuthorizedException.java b/src/at/bitfire/davdroid/webdav/NotAuthorizedException.java index e54bd358..4eab6adb 100644 --- a/src/at/bitfire/davdroid/webdav/NotAuthorizedException.java +++ b/src/at/bitfire/davdroid/webdav/NotAuthorizedException.java @@ -1,3 +1,10 @@ +/******************************************************************************* + * Copyright (c) 2014 Ricki Hirner (bitfire web engineering). + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/gpl.html + ******************************************************************************/ package at.bitfire.davdroid.webdav; import org.apache.http.HttpStatus;