diff options
author | Andy Grover <agrover@redhat.com> | 2013-07-23 16:08:11 -0700 |
---|---|---|
committer | Andy Grover <agrover@redhat.com> | 2013-07-23 16:08:11 -0700 |
commit | 865d2db6131392a17c59dfab591baec4ad57bd1b (patch) | |
tree | 9a2341fd183eef2de35098e63837083424f26323 /debian | |
parent | 2025abaaa15e2f3f13b3b74c9173c9061edc4d60 (diff) | |
parent | 5fcb00e77153b6a9e188c00a06d88783e7d273f7 (diff) | |
download | configshell-fb-865d2db6131392a17c59dfab591baec4ad57bd1b.tar.gz |
Merge branch 'upstream' into dev
Conflicts:
README
Diffstat (limited to 'debian')
-rw-r--r-- | debian/README.Debian | 20 | ||||
-rw-r--r-- | debian/copyright | 17 |
2 files changed, 22 insertions, 15 deletions
diff --git a/debian/README.Debian b/debian/README.Debian index 374bba0..78a1f14 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,13 +1,13 @@ -Copyright (c) 2011 by RisingTide Systems LLC +Copyright (c) 2011-2013 by Datera, Inc -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as -published by the Free Software Foundation, version 3 (AGPLv3). +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 -This program 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 Affero General Public License for more details. + http://www.apache.org/licenses/LICENSE-2.0 -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. +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. diff --git a/debian/copyright b/debian/copyright index 0869b07..28b41fa 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,11 +4,18 @@ on Thu Sep 09 23:13:01 CET 2010. It is currently maintained by Jerome Martin Upstream Author: Jerome Martin <jxm@risingtidesystems.com> -Copyright: +This file is part of ConfigShell. +Copyright (c) 2011-2013 by Datera, Inc - Copyright (c) 2010 by RisingTide Systems LLC. +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 - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as - published by the Free Software Foundation, version 3 (AGPLv3). + 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. |