Relicense packaging under Apache-2

2 files changed, 26 insertions, 28 deletions

diff --git a/debian/copyright b/debian/copyright
index 85474af3..4c0b59ff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2013, 2014, 2015 Benjamin Barenblat <bbaren@mit.edu>
-License: GPL-3+
+License: Apache-2.0
 
 Files: m4/ax_check_openssl.m4
 Copyright: 2009, 2010 Zmanda Inc. <http://www.zmanda.com/>
@@ -47,6 +47,21 @@ Copyright: 1986 International Organization for Standardization
            2008-2011 Adam Chlipala <adamc@csail.mit.edu>
 License: BSD-3-clause
 
+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 complete text of the Apache License, Version 2.0, can be
+ found in "/usr/share/common-licenses/Apache-2.0".
+
 License: AX-free
  Copying and distribution of this file, with or without modification, are
  permitted in any medium without royalty provided the copyright notice and this
@@ -119,22 +134,6 @@ License: GPL-2+
  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: GPL-3+
- This program 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 3 of the License, or (at your option) any later
- version.
- .
- 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 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
- 3 can be found in "/usr/share/common-licenses/GPL-3".
-
 License: GPL-3+ with Autoconf exception
  This program 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
diff --git a/debian/urweb.1 b/debian/urweb.1
index 54179495..7df6cd8d 100644
--- a/debian/urweb.1
+++ b/debian/urweb.1
@@ -2,18 +2,17 @@
 .\" urweb.1 -- man page for urweb
  \" Copyright (C) 2013, 2015 Benjamin Barenblat <bbaren@mit.edu>
  \"
- \" This program 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 3 of the License, or (at your option)
- \" any later version.
+ \" 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 General Public License for
- \" more details.
+ \"     http://www.apache.org/licenses/LICENSE-2.0
  \"
- \" You should have received a copy of the GNU 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.
 .SH NAME
 \fBurweb\fP \- compiler for the Ur/Web programming language
 .SH SYNOPSIS
@@ -433,4 +432,4 @@ the Ur/Web mailing list, \fIur@impredicative.com\fP.
 3-clause BSD license <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
 This manual page is copyright \(co 2013, 2015 Benjamin Barenblat and licensed
-under the GNU GPL version 3 or later.
+under the Apache License, Version 2.0.