From 921a66ac5afb3515b383d0e1ad6e758cc8ab5ee0 Mon Sep 17 00:00:00 2001 From: Frederic Culot Date: Sun, 5 Jul 2009 20:32:28 +0000 Subject: Switch to BSD license --- ChangeLog | 2 ++ Makefile.am | 4 ++-- autogen.sh | 48 +++++++++++++++++++++++++++--------------------- doc/manual.css | 41 +++++++++++++++++++++++++---------------- doc/manual_de.html | 42 ++++++++++++++++++++++++------------------ doc/manual_en.html | 42 ++++++++++++++++++++++++------------------ doc/manual_es.html | 41 ++++++++++++++++++++++++----------------- doc/manual_fr.html | 41 ++++++++++++++++++++++++----------------- doc/manual_it.html | 41 ++++++++++++++++++++++++----------------- doc/manual_nl.html | 41 ++++++++++++++++++++++++----------------- 10 files changed, 200 insertions(+), 143 deletions(-) diff --git a/ChangeLog b/ChangeLog index de4ca99..bfcd617 100755 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ * src/io.c (ical_store_event): Support for events which spans over several days added (thanks Andreas for reporting the bug) + + * Switch to the BSD license 2009-06-28 Frederic Culot diff --git a/Makefile.am b/Makefile.am index e5849f5..e1f1b25 100755 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ -# $calcurse: Makefile.am,v 1.5 2008/03/30 10:50:29 culot Exp $ +# $calcurse: Makefile.am,v 1.6 2009/07/05 20:32:29 culot Exp $ -AUTOMAKE_OPTIONS= gnu +AUTOMAKE_OPTIONS= foreign ACLOCAL_AMFLAGS = -I m4 diff --git a/autogen.sh b/autogen.sh index 9470889..94b747b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,26 +1,32 @@ #!/bin/sh # -# Copyright (c) 2004-2006, 2009 Frederic Culot -# -# 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 2 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, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. -# -# Send your feedback or comments to : calcurse@culot.org -# Calcurse home page : http://culot.org/calcurse +# Copyright (c) 2004-2006, 2009 Frederic Culot +# All rights reserved. # -# $calcurse: autogen.sh,v 1.2 2009/06/22 16:20:05 culot Exp $ +# 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. +# +# 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. # # # autogen.sh - Generates all the necessary files to build calcurse from @@ -33,7 +39,7 @@ AUTOCONF_VERSION=2.59 AC_FLAGS= AM_VERSION="1 9" AUTOMAKE_VERSION=1.9 -AM_FLAGS="--gnu --copy --add-missing" +AM_FLAGS="--foreign --copy --add-missing" GETTEXT_VERSION="0 14" GETTEXT_FLAGS="--copy --no-changelog" ACLOCAL_FLAGS="-I m4" diff --git a/doc/manual.css b/doc/manual.css index 783b243..d84028b 100644 --- a/doc/manual.css +++ b/doc/manual.css @@ -1,26 +1,35 @@ -/* $calcurse: manual.css,v 1.4 2008/02/14 20:16:30 culot Exp $ */ +/* $calcurse: manual.css,v 1.5 2009/07/05 20:32:47 culot Exp $ */ /* * Calcurse - text-based organizer - * Copyright (c) 2008 Frederic Culot * - * 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 2 of the License, or - * (at your option) any later version. + * Copyright (c) 2008 Frederic Culot + * All rights reserved. * - * 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. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. * - * Send your feedback or comments to : calcurse@culot.org - * Calcurse home page : http://culot.org/calcurse + * - 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. + * + * 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. */ body { diff --git a/doc/manual_de.html b/doc/manual_de.html index fd58a8c..abf3ca2 100755 --- a/doc/manual_de.html +++ b/doc/manual_de.html @@ -1,29 +1,35 @@ diff --git a/doc/manual_en.html b/doc/manual_en.html index 7e13671..b1cacbb 100755 --- a/doc/manual_en.html +++ b/doc/manual_en.html @@ -1,29 +1,35 @@ diff --git a/doc/manual_es.html b/doc/manual_es.html index 50d4898..15f3c83 100755 --- a/doc/manual_es.html +++ b/doc/manual_es.html @@ -1,28 +1,35 @@ diff --git a/doc/manual_fr.html b/doc/manual_fr.html index 81dbb23..b09ec5b 100755 --- a/doc/manual_fr.html +++ b/doc/manual_fr.html @@ -1,28 +1,35 @@ diff --git a/doc/manual_it.html b/doc/manual_it.html index d1ceb2d..1bdd0c9 100755 --- a/doc/manual_it.html +++ b/doc/manual_it.html @@ -1,28 +1,35 @@ diff --git a/doc/manual_nl.html b/doc/manual_nl.html index c6238e7..86dc3cd 100755 --- a/doc/manual_nl.html +++ b/doc/manual_nl.html @@ -1,28 +1,35 @@ -- cgit v1.2.3-54-g00ecf