[DRE-commits] [diaspora] 07/14: add bootstrap-sass license to copyright

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora.

commit bc27cf05aa93f175488e7bf0ad57dffe120ecd56
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Aug 2 17:46:20 2015 +0530

    add bootstrap-sass license to copyright
---
 debian/copyright                  | 20 ++++++++++++++++++++
 debian/diaspora.lintian-overrides |  3 +++
 2 files changed, 23 insertions(+)

diff --git a/debian/copyright b/debian/copyright
index f2f8da1..4d9369b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,6 +14,10 @@ Copyright: 2014 Pirate Praveen <praveen at debian.org>
 License: AGPL-3+ with OpenSSL exception
 Comment: the Debian packaging is licensed under the same terms as the original package.
 
+Files: debian/bootstrap-sass-2.3.2.2/*
+Copyright: 2011 Twitter, Inc.
+License: Apache-2.0
+
 License: AGPL-3+ with OpenSSL exception
  Diaspora is copyright Diaspora Inc., 2010, and files herein are licensed
  under the Affero General Public License version 3, the text of which can
@@ -41,3 +45,19 @@ License: AGPL-3+ with OpenSSL exception
  .
  You can find the full text of the GNU Affero General Public License
  version 3 can be found in the file /usr/share/diaspora/GNU-AGPL-3.0
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+     http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the full text of the Apache License version 2.0 can be
+ found in the file `/usr/share/common-licenses/Apache-2.0'.
diff --git a/debian/diaspora.lintian-overrides b/debian/diaspora.lintian-overrides
new file mode 100644
index 0000000..a013252
--- /dev/null
+++ b/debian/diaspora.lintian-overrides
@@ -0,0 +1,3 @@
+# This bootstrap-sass copy is for providing compatibility only
+# It will be removed when diaspora porting to bootstrap 3 is completed upstream
+diaspora: extra-license-file usr/share/diaspora/vendor/gems/bootstrap-sass-2.3.2.2/LICENSE

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git