[Pkg-javascript-commits] [rainloop] 01/01: Added missing copyright references in debian/copyright. Fixed some minor lintian errors instead of overriding them.

Sun Jan 7 08:34:50 UTC 2018

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

techwolf-guest pushed a commit to branch master
in repository rainloop.

commit f0c44736858829e22651f1eba4fdcca89ed03fa1
Author: Daniel Ring <dring at wolfishly.me>
Date:   Thu Jan 4 22:44:17 2018 -0800

    Added missing copyright references in debian/copyright.
    Fixed some minor lintian errors instead of overriding them.
---
 debian/Makefile                   | 11 ++++--
 debian/control                    |  4 +--
 debian/copyright                  | 73 +++++++++++++++++++++++++++++++--------
 debian/rainloop.links             |  1 -
 debian/rainloop.lintian-overrides |  9 -----
 debian/source/lintian-overrides   |  5 ---
 6 files changed, 69 insertions(+), 34 deletions(-)

diff --git a/debian/Makefile b/debian/Makefile
index 4b0e2e9..1219d3f 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -213,11 +213,18 @@ copy: | jsMin cssMin vendors
 	rm -rf build/dist/rainloop/app/libraries/GuzzleHttp/
 	rm -rf build/dist/rainloop/app/libraries/phpseclib/
 	rm -rf build/dist/rainloop/app/libraries/Predis/
-	rm -rf build/dist/rainloop/app/libraries/SabreForRainLoop/
-	#Remove VCS control files for upstream bunded libraries
+	#Remove VCS control files for upstream bundled libraries
 	rm -f build/dist/rainloop/app/libraries/Mobile_Detect/.gitignore
 	rm -f build/dist/rainloop/app/libraries/Mobile_Detect/.gitmodules
 	rm -f build/dist/rainloop/static/ckeditor/plugins/quicktable/.gitignore
+	#Remove extra license files for upstream bundled libraries
+	rm -f build/dist/rainloop/app/libraries/MailSo/LICENSE
+	rm -f build/dist/rainloop/app/libraries/Mobile_Detect/LICENSE.txt
+	rm -f build/dist/rainloop/app/libraries/lessphp/LICENSE
+	rm -f build/dist/rainloop/app/libraries/spyc/COPYING
+	rm -f build/dist/rainloop/app/libraries/tmhOAuth/LICENSE
+	rm -f build/dist/rainloop/static/ckeditor/plugins/base64image/LICENSE.md
+	rm -f build/dist/rainloop/static/ckeditor/plugins/quicktable/LICENSE
 
 .PHONY: setup
 setup: | copy
diff --git a/debian/control b/debian/control
index 6edd8e6..a015cc6 100644
--- a/debian/control
+++ b/debian/control
@@ -51,9 +51,7 @@ Depends: ${misc:Depends},
  php-pclzip,
  php-guzzlehttp,
  php-seclib,
- libphp-predis,
- php-sabre-dav,
- php-sabre-vobject
+ libphp-predis
 Suggests: php5-sqlite | php5-mysql | php5-pgsql
 Description: Simple, modern & fast web-based email client
  Rainloop is a PHP-based MUA with a modern interface and no database
diff --git a/debian/copyright b/debian/copyright
index 87c36a7..1fc6f00 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: <https://github.com/rainloop/rainloop-webmail>
 
 
 Files: *
-Copyright: 2012-2017 Timur Usenko <support at rainloop.net>
+Copyright: 2012-2018 Timur Usenko <support at rainloop.net>
 License: AGPL-3
 
 Files: debian/*
@@ -16,13 +16,29 @@ Files: rainloop/v/0.0.0/app/libraries/Facebook/*
 Copyright: 2017 Facebook, Inc.
 License: Facebook
 
+Files: rainloop/v/0.0.0/app/libraries/GuzzleHttp/*
+Copyright: 2011-2016 Michael Dowling <mtdowling at gmail.com>
+License: Expat
+
 Files: rainloop/v/0.0.0/app/libraries/Imagine/*
 Copyright: 2017 Bulat Shakirzyanov <mallluhuct at gmail.com>
-License: MIT
+License: Expat
+
+Files: rainloop/v/0.0.0/app/libraries/lessphp/*
+Copyright: 2010 Leaf Corcoran
+License: Expat or GPL-3
+
+Files: rainloop/v/0.0.0/app/libraries/MailSo/*
+Copyright: 2014 Timur Usenko
+License: Expat
 
 Files: rainloop/v/0.0.0/app/libraries/Mobile_Detect/*
 Copyright: 2011-2017 Serban Ghita <serbanghita at gmail.com>, Nick Ilyin and contributors
-License: MIT
+License: Expat
+
+Files: rainloop/v/0.0.0/app/libraries/pclzip/*
+Copyright: 2009 Vincent Blavet
+License: LGPL-2.1
 
 Files: rainloop/v/0.0.0/app/libraries/PHPGangsta/*
 Copyright: 2012-2016 Michael Kliewe and contributors
@@ -34,15 +50,23 @@ License: LGPL-3
 
 Files: rainloop/v/0.0.0/app/libraries/phpseclib/*
 Copyright: 2007-2016 TerraFrost <terrafrost at php.net> and other conributors
-License: MIT
+License: Expat
 
 Files: rainloop/v/0.0.0/app/libraries/PHPThumb/*
 Copyright: 2015 Ian Selby <ianrselby at gmail.com>
-License: MIT
+License: Expat
+
+Files: rainloop/v/0.0.0/app/libraries/Predis/*
+Copyright: 2009-2013 Daniele Alessandri <suppakilla at gmail.com>
+License: Expat
+
+Files: rainloop/v/0.0.0/app/libraries/SabreForRainLoop/*
+Copyright: 2007-2013 fruux GmbH
+License: BSD-3-clause
 
 Files: rainloop/v/0.0.0/app/libraries/spyc/*
 Copyright: 2011-2017 Vladimir Andersen <vlad.andersen at gmail.com>
-License: MIT
+License: Expat
 
 Files: rainloop/v/0.0.0/app/libraries/tmhOAuth/*
 Copyright: 2014 Matt Harris
@@ -57,17 +81,21 @@ Files: vendors/ckeditor/* vendors/ckeditor-plugins/*
 Copyright: 2003-2017 CKSource - Frederico Knabben
 License: GPL-3
 
-Files: vendors/jquery-letterfix/*
+Files: vendors/inputosaurus/*
+Copyright: 2012 Dan Kielp <dan at sproutsocial.com>
+License: Expat
+
+Files: vendors/jquery-letterfx/*
 Copyright: 2014 Jared Anderson, dba tuxsudo.com
-License: MIT
+License: Expat
 
 Files: vendors/jquery-nanoscroller/*
 Copyright: 2013 James Florentino
-License: MIT
+License: Expat
 
 Files: vendors/jquery-ui/*
 Copyright: 2013 jQuery Foundation and other contributors
-License: MIT
+License: Expat
 
 Files: vendors/jquery-wakeup/*
 Copyright: 2013 Paul Okopny <paul.okopny at gmail.com>
@@ -75,11 +103,11 @@ License: ISC
 
 Files: vendors/keymaster/*
 Copyright: 2011-2013 Thomas Fuchs
-License: MIT
+License: Expat
 
 Files: vendors/modernizr/*
 Copyright: 2009-2017 Faruk Ates, Paul Irish, Alex Sexton, Ryan Seddon, Patrick Kettner, Stu Cox, Richard Herrera
-License: MIT
+License: Expat
 
 Files: vendors/qr.js/*
 Copyright: 2015 Alasdair Mercer
@@ -87,7 +115,7 @@ License: GPL-3
 
 Files: vendors/routes/*
 Copyright: 2012 Miller Medeiros
-License: MIT
+License: Expat
 
 
 License: AGPL-3
@@ -774,7 +802,7 @@ License: Facebook
  DEALINGS IN THE SOFTWARE.
 
 
-License: MIT
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -822,6 +850,23 @@ License: BSD-3-clause
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
+License: LGPL-2.1
+ FFmpeg is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ FFmpeg 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with FFmpeg; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License can be found in "/usr/share/common-licenses/LGPL-2.1".
 
 License: LGPL-3
  This package is free software; you can redistribute it and/or
diff --git a/debian/rainloop.links b/debian/rainloop.links
index c09af2a..992b742 100644
--- a/debian/rainloop.links
+++ b/debian/rainloop.links
@@ -4,4 +4,3 @@ usr/share/php/pclzip.lib.php	usr/share/rainloop/app/libraries/pclzip/pclzip.lib.
 usr/share/php/GuzzleHttp/	usr/share/rainloop/app/libraries/GuzzleHttp
 usr/share/php/			usr/share/rainloop/app/libraries/phpseclib
 usr/share/php/Predis/		usr/share/rainloop/app/libraries/Predis
-usr/share/php/Sabre/		usr/share/rainloop/app/libraries/SabreForRainLoop
diff --git a/debian/rainloop.lintian-overrides b/debian/rainloop.lintian-overrides
index a2a7b89..50d62b0 100644
--- a/debian/rainloop.lintian-overrides
+++ b/debian/rainloop.lintian-overrides
@@ -1,12 +1,3 @@
-#License information included in debian/copyright
-rainloop: extra-license-file usr/share/rainloop/app/libraries/MailSo/LICENSE
-rainloop: extra-license-file usr/share/rainloop/app/libraries/Mobile_Detect/LICENSE.txt
-rainloop: extra-license-file usr/share/rainloop/app/libraries/lessphp/LICENSE
-rainloop: extra-license-file usr/share/rainloop/app/libraries/spyc/COPYING
-rainloop: extra-license-file usr/share/rainloop/app/libraries/tmhOAuth/LICENSE
-rainloop: extra-license-file usr/share/rainloop/static/ckeditor/plugins/base64image/LICENSE.md
-rainloop: extra-license-file usr/share/rainloop/static/ckeditor/plugins/quicktable/LICENSE
-
 #Youtube API is dynamically loaded when necessary to display content
 rainloop: privacy-breach-generic usr/share/rainloop/static/js/libs.js *
 rainloop: privacy-breach-generic usr/share/rainloop/static/js/min/libs.min.js *
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 73fce61..b872b0d 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -10,8 +10,3 @@ rainloop source: source-is-missing vendors/ckeditor/*
 rainloop source: source-is-missing vendors/bootstrap/js/bootstrap.min.orig.js *
 rainloop source: source-is-missing vendors/bootstrap/js/old.bootstrap.min.js
 rainloop source: source-is-missing vendors/bootstrap/js/old.bootstrap.min.orig.js *
-
-#Long lines in source files of bundled libraries
-rainloop source: source-is-missing debian/lib/openpgp/openpgp.js *
-rainloop source: source-is-missing debian/lib/openpgp/openpgp.worker.js *
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/rainloop.git

