summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/TODO.Debian24
-rw-r--r--debian/changelog6
-rw-r--r--debian/control5
-rw-r--r--debian/copyright260
4 files changed, 236 insertions, 59 deletions
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 2f1124a05..dd701cfa5 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1,20 +1,4 @@
-* De-vendorize JS/font libraries
- * bootstrap, raphael, jquery + some jquery plugins exist.
- - web/lib/c3.min.js: #819891
- - web/css/c3.min.css #819891
- - web/lib/dygraph-combined.js: #749603
- - web/lib/dygraph-smooth-plotter.js
- - web/lib/bootstrap-toggle.min.js
- - web/lib/ElementQueries.js
- - web/lib/ResizeSensor.js
- - web/lib/gauge.min.js
- - web/lib/jquery.easypiechart.min.js
- - web/lib/jquery.nanoscroller.min.js
- - web/lib/jquery.peity.min.js
- - web/lib/jquery.sparkline.min.js
- - web/lib/morris.min.js
- - web/css/bootstrap.slate.min.css
- - web/css/bootstrap-toggle.min.css
- - web/css/morris.css
- * Create additional or keep them in mind for future linking
-* Restrict security permissions in netdata.service
+* Add missing-sources for all the libraries in web/{css,lib}
+* Update patches for 1.5.0
+ * Check if still necessary
+* Ensure backport compability
diff --git a/debian/changelog b/debian/changelog
index ee0ac9088..c3cdb6dfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+netdata (1.5.0+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstre release (Closes: #850004)
+
+ -- Lennart Weller <lhw@ring0.de> Tue, 24 Jan 2017 16:22:44 +0100
+
netdata (1.4.0+dfsg-3) unstable; urgency=medium
* Install Python plugins
diff --git a/debian/control b/debian/control
index aa7b89bb8..55985e2df 100644
--- a/debian/control
+++ b/debian/control
@@ -21,16 +21,13 @@ Architecture: any
Depends: adduser,
fonts-font-awesome (>= 4.6),
libcap2-bin (>= 1:2.0),
- libjs-bootstrap (>= 3.3.7),
- libjs-d3 (>= 3.5.17),
- libjs-jquery (>= 3.1.1-2),
- libjs-raphael (>= 2.1.0),
lsb-base (>= 3.1-23.2),
netdata-data (=${source:Version}),
python,
${misc:Depends},
${misc:Pre-Depends},
${shlibs:Depends}
+Recommends: nodejs
Description: real-time charts for system monitoring
Netdata is a daemon that collects data in realtime (per second)
and presents a web site to view and analyze them. The presentation
diff --git a/debian/copyright b/debian/copyright
index 3f5c69993..c5f2b2f7d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,13 +15,13 @@ Comment:
distributed with the tarball.
Files: *
-Copyright: 2014-2016, Costa Tsaousis
+Copyright: 2014-2017, Costa Tsaousis
License: GPL-3+
Files: debian/*
Copyright: 2016 Matthew Newton <mcn4@leicester.ac.uk>
- 2016 Lennart Weller <lhw@ring0.de>
- 2016 Federico Ceratto <federico@debian.org>
+ 2017 Lennart Weller <lhw@ring0.de>
+ 2017 Federico Ceratto <federico@debian.org>
License: GPL-3+
Files: src/avl.*
@@ -48,77 +48,97 @@ Copyright: 2015 Joseph Huckaby
License: Expat
Files:
- web/css/bootstrap.slate.min.css
- debian/missing-sources/bootstrap.slate.css
+ web/css/bootstrap-3.3.7.css
+ web/lib/bootstrap-3.3.7.min.js
+ debian/missing-sources/bootstrap-3.3.7.js
+Copyright: 2011-2016 Twitter, Inc
+License: Expat
+
+Files:
+ web/css/bootstrap-slate-flat-3.3.7.css
Copyright: 2016 Thomas Park
License: Expat
Files:
- web/lib/bootstrap-toggle.min.js
- web/css/bootstrap-toggle.min.css
- debian/missing-sources/bootstrap-toggle.js
- debian/missing-sources/bootstrap-toggle.css
+ web/lib/bootstrap-toggle-2.2.2.min.js
+ web/css/bootstrap-toggle-2.2.2.min.css
+ debian/missing-sources/bootstrap-toggle-2.2.2.js
+ debian/missing-sources/bootstrap-toggle-2.2.2.css
Copyright: 2014 Min Hur, The New York Times Company
License: Expat
Files:
- web/lib/c3.min.js
- web/css/c3.min.css
- debian/missing-sources/c3.js
- debian/missing-sources/c3.css
+ web/lib/c3-0.4.11.min.js
+ web/css/c3-0.4.11.min.css
+ debian/missing-sources/c3-0.4.11.min.js
+ debian/missing-sources/c3-0.4.11.min.css
Copyright: 2013 Masayuki Tanaka
License: Expat
Files:
- web/lib/dygraph-combined.js
- web/lib/dygraph-smooth-plotter.js
- debian/missing-sources/dygraph-combined.js
+ web/lib/dygraph-combined-dd74404.js
+ web/lib/dygraph-smooth-plotter-dd74404.js
+ debian/missing-sources/dygraph-combined-dd74404.js
Copyright: 2014 Dan Vanderkam <danvdk@gmail.com>
License: Expat
Files:
- web/lib/gauge.min.js
- debian/missing-sources/gauge.coffee
+ web/lib/gauge-d5260c3.min.js
+ debian/missing-sources/gauge-d5260c3.coffee
Copyright: 2016 Bernard Kobos <bkobos@extensa.pl>
License: Expat
Files:
- web/lib/jquery.easypiechart.min.js
- debian/missing-sources/jquery.easypiechart.js
+ web/lib/jquery.easypiechart-97b5824.min.js
+ debian/missing-sources/jquery.easypiechart-97b5824.js
Copyright: 2013 Robert Fleischmann
License: Expat
Files:
- web/lib/jquery.nanoscroller.min.js
- debian/missing-sources/jquery.nanoscroller.js
-Copyright: 2015 James Florentino
+ web/lib/perfect-scrollbar-0.6.15.min.js
+ debian/missing-sources/perfect-scrollbar-0.6.15.js
+Copyright: 2016 Hyunje Alex Jun
License: Expat
Files:
- web/lib/jquery.peity.min.js
- debian/missing-sources/jquery.peity.js
+ web/lib/jquery.peity-3.2.0.min.js
+ debian/missing-sources/jquery.peity-3.2.0.js
Copyright: 2015 Ben Pickles
License: Expat
Files:
- web/lib/jquery.sparkline.min.js
- debian/missing-sources/jquery.sparkline.js
+ web/lib/jquery.sparkline-2.1.2.min.js
+ debian/missing-sources/jquery.sparkline-2.1.2.js
Copyright: 2013 Gareth Watts <gareth@splunk.com>, Splunk Inc
License: BSD-3-clause
Files:
- web/lib/morris.min.js
- web/css/morris.css
- debian/missing-sources/morris.js
- debian/missing-sources/morris.css
+ web/lib/morris-0.5.1.min.js
+ web/css/morris-0.5.1.css
+ debian/missing-sources/morris-0.5.1.min.js
+ debian/missing-sources/morris-0.5.1.css
Copyright: 2014 Olly Smith
License: BSD-2-clause
Files:
- web/lib/ElementQueries.js
- web/lib/ResizeSensor.js
-Copyright: 2016 Marc J. Schmidt
-License: Expat
+ web/lib/jquery-2.2.4.min.js
+ debian/missing-sources/jquery-2.2.4.js
+Copyright: 2016 JS Foundation
+License: Apache-2.0
+
+Files:
+ web/lib/d3-3.5.17.min.js
+ debian/missing-sources/d3-3.5.17.js
+Copyright: Copyright (C) 2013 Michael Bostock
+License: BSD-3-Clause
+
+Files:
+ web/images/seo-performance*
+ web/images/check-mark*
+ web/images/alert-*
+ web/images/post.png
+Copyright: 2016 IconsDB.com Icons
+License: CC0
License: LGPL-3+
This library is free software; you can redistribute it and/or modify it under
@@ -222,3 +242,173 @@ License: BSD-3-clause
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.
+
+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.
+ .
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of portions of this program with the
+ OpenSSL library under certain conditions as described in each
+ individual source file, and distribute linked combinations including
+ the two.
+ .
+ You must obey the GNU General Public License in all respects for all
+ of the code used other than OpenSSL. If you modify file(s) with this
+ exception, you may extend this exception to your version of the
+ file(s), but you are not obligated to do so. If you do not wish to do
+ so, delete this exception statement from your version. If you delete
+ this exception statement from all source files in the program, then
+ also delete it here.
+ .
+ Comment:
+ .
+ On Debian systems, the complete text of the Apache License 2.0 can be found in
+ `/usr/share/common-licenses/Apache-2.0'.
+
+License: CC0
+ Creative Commons Legal Code
+ CC0 1.0 Universal
+ .
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO
+ WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR
+ WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES
+ RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+ PROVIDED HEREUNDER.
+ .
+ Statement of Purpose
+ .
+ The laws of most jurisdictions throughout the world automatically confer
+ exclusive Copyright and Related Rights (defined below) upon the creator
+ and subsequent owner(s) (each and all, an "owner") of an original work
+ of authorship and/or a database (each, a "Work").
+ .
+ Certain owners wish to permanently relinquish those rights to a Work for
+ the purpose of contributing to a commons of creative, cultural and
+ scientific works ("Commons") that the public can reliably and without
+ fear of later claims of infringement build upon, modify, incorporate in
+ other works, reuse and redistribute as freely as possible in any form
+ whatsoever and for any purposes, including without limitation commercial
+ purposes. These owners may contribute to the Commons to promote the
+ ideal of a free culture and the further production of creative, cultural
+ and scientific works, or to gain reputation or greater distribution for
+ their Work in part through the use and efforts of others.
+ .
+ For these and/or other purposes and motivations, and without any
+ expectation of additional consideration or compensation, the person
+ associating CC0 with a Work (the "Affirmer"), to the extent that he or
+ she is an owner of Copyright and Related Rights in the Work, voluntarily
+ elects to apply CC0 to the Work and publicly distribute the Work under
+ its terms, with knowledge of his or her Copyright and Related Rights in
+ the Work and the meaning and intended legal effect of CC0 on those
+ rights.
+ .
+ 1. Copyright and Related Rights. A Work made available under CC0 may be
+ protected by copyright and related or neighboring rights ("Copyright
+ and Related Rights"). Copyright and Related Rights include, but are not
+ limited to, the following:
+ .
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ .
+ ii. moral rights retained by the original author(s) and/or
+ performer(s);
+ .
+ iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ .
+ iv. rights protecting against unfair competition in regards to a
+ Work, subject to the limitations in paragraph 4(a), below;
+ .
+ v. rights protecting the extraction, dissemination, use and reuse
+ of data in a Work;
+ .
+ vi. database rights (such as those arising under Directive 96/9/EC
+ of the European Parliament and of the Council of 11 March 1996 on
+ the legal protection of databases, and under any national
+ implementation thereof, including any amended or successor version
+ of such directive); and
+ .
+ vii. other similar, equivalent or corresponding rights throughout
+ the world based on applicable law or treaty, and any national
+ implementations thereof.
+ .
+ 2. Waiver. To the greatest extent permitted by, but not in
+ contravention of, applicable law, Affirmer hereby overtly, fully,
+ permanently, irrevocably and unconditionally waives, abandons, and
+ surrenders all of Affirmer's Copyright and Related Rights and
+ associated claims and causes of action, whether now known or unknown
+ (including existing as well as future claims and causes of action), in
+ the Work (i) in all territories worldwide, (ii) for the maximum
+ duration provided by applicable law or treaty (including future time
+ extensions), (iii) in any current or future medium and for any number
+ of copies, and (iv) for any purpose whatsoever, including without
+ limitation commercial, advertising or promotional purposes (the
+ "Waiver"). Affirmer makes the Waiver for the benefit of each member of
+ the public at large and to the detriment of Affirmer's heirs and
+ successors, fully intending that such Waiver shall not be subject to
+ revocation, rescission, cancellation, termination, or any other legal
+ or equitable action to disrupt the quiet enjoyment of the Work by the
+ public as contemplated by Affirmer's express Statement of Purpose.
+ .
+ 3. Public License Fallback. Should any part of the Waiver for any
+ reason be judged legally invalid or ineffective under applicable law,
+ then the Waiver shall be preserved to the maximum extent permitted
+ taking into account Affirmer's express Statement of Purpose. In
+ addition, to the extent the Waiver is so judged Affirmer hereby grants
+ to each affected person a royalty-free, non transferable, non
+ sublicensable, non exclusive, irrevocable and unconditional license to
+ exercise Affirmer's Copyright and Related Rights in the Work (i) in all
+ territories worldwide, (ii) for the maximum duration provided by
+ applicable law or treaty (including future time extensions), (iii) in
+ any current or future medium and for any number of copies, and (iv) for
+ any purpose whatsoever, including without limitation commercial,
+ advertising or promotional purposes (the "License"). The License shall
+ be deemed effective as of the date CC0 was applied by Affirmer to the
+ Work. Should any part of the License for any reason be judged legally
+ invalid or ineffective under applicable law, such partial invalidity or
+ ineffectiveness shall not invalidate the remainder of the License, and
+ in such case Affirmer hereby affirms that he or she will not (i)
+ exercise any of his or her remaining Copyright and Related Rights in
+ the Work or (ii) assert any associated claims and causes of action with
+ respect to the Work, in either case contrary to Affirmer's express
+ Statement of Purpose.
+ .
+ 4. Limitations and Disclaimers.
+ .
+ a. No trademark or patent rights held by Affirmer are waived,
+ abandoned, surrendered, licensed or otherwise affected by this
+ document.
+ .
+ b. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied,
+ statutory or otherwise, including without limitation warranties of
+ title, merchantability, fitness for a particular purpose, non
+ infringement, or the absence of latent or other defects, accuracy,
+ or the present or absence of errors, whether or not discoverable,
+ all to the greatest extent permissible under applicable law.
+ .
+ c. Affirmer disclaims responsibility for clearing rights of other
+ persons that may apply to the Work or any use thereof, including
+ without limitation any person's Copyright and Related Rights in the
+ Work. Further, Affirmer disclaims responsibility for obtaining any
+ necessary consents, permissions or other rights required for any use
+ of the Work.
+ .
+ d. Affirmer understands and acknowledges that Creative Commons is
+ not a party to this document and has no duty or obligation with
+ respect to this CC0 or use of the Work.
+ .
+ https://creativecommons.org/choose/zero/