[Pkg-gnupg-commit] [gnupg2] 04/118: common: Change license of mbox-util to LGPLv2.1+.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch encoding-and-speling
in repository gnupg2.

commit 54245979e691129ed9d3a6c642087fb8d3227449
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 22 20:44:23 2016 +0200

    common: Change license of mbox-util to LGPLv2.1+.
    
    --
    
    Noet that the code has entirely been written by me.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 common/mbox-util.c | 18 ++++--------------
 common/mbox-util.h | 18 ++++--------------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/common/mbox-util.c b/common/mbox-util.c
index 2029324..c451198 100644
--- a/common/mbox-util.c
+++ b/common/mbox-util.c
@@ -5,26 +5,16 @@
  * This file is part of GnuPG.
  *
  * This file is free software; you can redistribute it and/or modify
- * it under the terms of either
- *
- *   - the GNU Lesser General Public License as published by the Free
- *     Software Foundation; either version 3 of the License, or (at
- *     your option) any later version.
- *
- * or
- *
- *   - 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.
- *
- * or both in parallel, as here.
+ * 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.
  *
  * This file 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
diff --git a/common/mbox-util.h b/common/mbox-util.h
index 4dd48ec..9c7271f 100644
--- a/common/mbox-util.h
+++ b/common/mbox-util.h
@@ -4,26 +4,16 @@
  * This file is part of GnuPG.
  *
  * This file is free software; you can redistribute it and/or modify
- * it under the terms of either
- *
- *   - the GNU Lesser General Public License as published by the Free
- *     Software Foundation; either version 3 of the License, or (at
- *     your option) any later version.
- *
- * or
- *
- *   - 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.
- *
- * or both in parallel, as here.
+ * 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.
  *
  * This file 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GNUPG_COMMON_MBOX_UTIL_H

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