summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Undheim <ruben.undheim@gmail.com>2018-12-21 20:09:45 +0000
committerRuben Undheim <ruben.undheim@gmail.com>2018-12-21 20:15:50 +0000
commit75eaa68f66b1ad30e067e265e83bf5f923ef408b (patch)
tree069341c402d3c73bf18211eb4e4f433e03d3c05b
parent7188ca832f2cc1888fccf49d5880074223968fec (diff)
Delete install of python2 files from package
Update copyright file
-rw-r--r--debian/control1
-rw-r--r--debian/copyright122
-rwxr-xr-xdebian/rules4
3 files changed, 19 insertions, 108 deletions
diff --git a/debian/control b/debian/control
index fc85c3f..1aec80c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 11),
python3-all,
python3-setuptools
Standards-Version: 4.2.1
-X-Python3-Version: >= 3.4
Vcs-Browser: https://salsa.debian.org/python-team/modules/netdisco
Vcs-Git: https://salsa.debian.org/python-team/modules/netdisco.git
Homepage: https://github.com/home-assistant/netdisco
diff --git a/debian/copyright b/debian/copyright
index d85774d..6f4d0a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,118 +3,26 @@ Upstream-Name: netdisco
Source: https://github.com/home-assistant/netdisco
Files: *
-Copyright: 2005-2018 PyVISA Authors and contributors
- 2005, 2006, 2007, 2008 Torsten Bronger <bronger@physik.rwth-aachen.de>
- 2005, 2006, 2007, 2008 Gregor Thalhammer <gth@users.sourceforge.net>
- 2012, 2013 Florian Bauer
- 2013-2015 Hernan E. Grecco <hernan.grecco@gmail.com>
-License: MIT
-Comment: Hernan E. Grecco is the current upstream and his commits (and copyright
- dates) can be checked at https://github.com/hgrecco/pyvisa
+Copyright: 2015-2018 Paulus Schoutsen <balloob@gmail.com>
+License: Apache-2.0
Files: debian/*
Copyright: 2018 Ruben Undheim <ruben.undheim@gmail.com>
-License: GPL-2+
+License: Apache-2.0
-
-License: MIT
- 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 to
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is furnished to do
- so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
-
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package 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 General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND 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.
-
-License: PSF
- 1. This LICENSE AGREEMENT is between the Python Software Foundation
- ("PSF"), and the Individual or Organization ("Licensee") accessing and
- otherwise using this software ("Python") in source or binary form and
- its associated documentation.
- .
- 2. Subject to the terms and conditions of this License Agreement, PSF
- hereby grants Licensee a nonexclusive, royalty-free, world-wide
- license to reproduce, analyze, test, perform and/or display publicly,
- prepare derivative works, distribute, and otherwise use Python
- alone or in any derivative version, provided, however, that PSF's
- License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
- 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
- Reserved" are retained in Python alone or in any derivative version
- prepared by Licensee.
- .
- 3. In the event Licensee prepares a derivative work that is based on
- or incorporates Python or any part thereof, and wants to make
- the derivative work available to others as provided herein, then
- Licensee hereby agrees to include in any such work a brief summary of
- the changes made to Python.
- .
- 4. PSF is making Python available to Licensee on an "AS IS"
- basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
- INFRINGE ANY THIRD PARTY RIGHTS.
- .
- 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
- FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
- A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
- OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+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
.
- 6. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
+ http://www.apache.org/licenses/LICENSE-2.0
.
- 7. Nothing in this License Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between PSF and
- Licensee. This License Agreement does not grant permission to use PSF
- trademarks or trade name in a trademark sense to endorse or promote
- products or services of Licensee, or any third party.
+ 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.
.
- 8. By copying, installing or otherwise using Python, Licensee
- agrees to be bound by the terms and conditions of this License
- Agreement.
+ On Debian systems, the complete text of the Apache-2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
diff --git a/debian/rules b/debian/rules
index d33ad56..09bdc78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,3 +6,7 @@
override_dh_auto_clean:
dh_auto_clean
$(RM) -r netdisco.egg-info
+
+override_dh_install:
+ dh_install
+ $(RM) -r debian/python3-netdisco/usr/lib/python2*/