Skip to content

Commit aa8370f

Browse files
jgoerzenjgoerzen
committed
Merge branch 'upstream'
Conflicts: ConfigFile.cabal
2 parents 2338a12 + 191bcbc commit aa8370f

File tree

8 files changed

+85
-81
lines changed

8 files changed

+85
-81
lines changed

‎BSD3‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Copyright (c) 2004-2010, John Goerzen
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without modification,
5+
are permitted provided that the following conditions are met:
6+
7+
1. Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
9+
10+
2. Redistributions in binary form must reproduce the above copyright notice,
11+
this list of conditions and the following disclaimer in the documentation and/or
12+
other materials provided with the distribution.
13+
14+
3. Neither the name of the copyright holder nor the names of its contributors
15+
may be used to endorse or promote products derived from this software without
16+
specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
22+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
23+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
25+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎COPYRIGHT‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
ConfigFile
2-
Copyright (C) 2004-2006 John Goerzen <jgoerzen@complete.org>
2+
Copyright (C) 2004-2010 John Goerzen <jgoerzen@complete.org>
33

4-
All code is under the following license unless otherwise noted:
5-
This program is free software; you can redistribute it and/or modify
6-
it under the terms of the GNU Lesser General Public License as published by
7-
the Free Software Foundation; either version 2.1 of the License, or
8-
(at your option) any later version.
4+
This program is free software; you can redistribute it and/or modify
5+
it under the terms of either:
96

10-
This program is distributed in the hope that it will be useful,
11-
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU Lesser General Public License for more details.
7+
a) the GNU Lesser General Public License as published by the Free
8+
Software Foundation; either version 2.1 (see the file LGPL-2.1),
9+
or (at your option) any later version, or
1410

15-
You should have received a copy of the GNU Lesser General Public License
16-
along with this program; if not, write to the Free Software
17-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
11+
b) the 3-clause BSD License (see the file BSD3).
1812

19-
The GNU Lesser General Public License is available in the file COPYING in the
20-
source distribution. Debian GNU/Linux users may find this in
21-
/usr/share/common-licenses/GPL-2.
13+
This program is distributed in the hope that it will be useful,
14+
but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
2216

23-
If the LGPL is unacceptable for your uses, please e-mail me; alternative
24-
terms can be negotiated for your project.
17+
You should have received a copy of the GNU Lesser General Public License
18+
along with this program; if not, write to the Free Software
19+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2520

21+
If these licenses are unacceptable for your uses, please e-mail me;
22+
alternative terms can be negotiated for your project.

‎ConfigFile.cabal‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Name: ConfigFile
2-
Version: 1.1.2
3-
License: LGPL
2+
Version: 1.1.3
3+
License: BSD3
44
Maintainer: John Goerzen <jgoerzen@complete.org>
55
Author: John Goerzen
6-
Copyright: Copyright (c) 2004-2010 John Goerzen
6+
Copyright: Copyright (c) 2004-2014 John Goerzen
77
license-file: COPYRIGHT
8-
extra-source-files: COPYING,
9-
README,
8+
license-files: COPYRIGHT, LGPL-2.1, BSD3
9+
extra-source-files: README,
1010
Makefile,
1111
testsrc/ConfigParser/test.cfg
1212
Category: Parsing

‎COPYING‎ renamed to ‎LGPL-2.1‎

File renamed without changes.

‎src/Data/ConfigFile.hs‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,15 @@
22
{-
33
Copyright (C) 2004-2008 John Goerzen <jgoerzen@complete.org>
44
5-
This program is free software; you can redistribute it and/or modify
6-
it under the terms of the GNU Lesser General Public License as published by
7-
the Free Software Foundation; either version 2.1 of the License, or
8-
(at your option) any later version.
9-
10-
This program is distributed in the hope that it will be useful,
11-
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU Lesser General Public License for more details.
14-
15-
You should have received a copy of the GNU Lesser General Public License
16-
along with this program; if not, write to the Free Software
17-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
5+
This program is free software; you can redistribute it and/or modify it, as
6+
specified in the COPYRIGHT file, under the terms of either version 2.1 of
7+
the LGPL (or, at your option, any later version) or the 3-clause BSD license.
188
-}
199

2010
{- |
2111
Module : Data.ConfigFile
2212
Copyright : Copyright (C) 2004-2008 John Goerzen
23-
License : GNU LGPL, version 2.1 or above
13+
License : Either LGPL or BSD3, as specified in the COPYRIGHT file.
2414
2515
Maintainer : John Goerzen <jgoerzen@complete.org>
2616
Stability : provisional
@@ -30,6 +20,10 @@ Configuration file parsing, generation, and manipulation
3020
3121
Copyright (c) 2004-2008 John Goerzen, jgoerzen\@complete.org
3222
23+
This program is distributed in the hope that it will be useful,
24+
but WITHOUT ANY WARRANTY; without even the implied warranty of
25+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
26+
3327
This module contains extensive documentation. Please scroll down to the Introduction section to continue reading.
3428
-}
3529
module Data.ConfigFile

‎src/Data/ConfigFile/Lexer.hs‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,15 @@
11
{- arch-tag: ConfigParser lexer support
22
Copyright (C) 2004, 2008 John Goerzen <jgoerzen@complete.org>
33
4-
This program is free software; you can redistribute it and/or modify
5-
it under the terms of the GNU Lesser General Public License as published by
6-
the Free Software Foundation; either version 2.1 of the License, or
7-
(at your option) any later version.
8-
9-
This program is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
GNU Lesser General Public License for more details.
13-
14-
You should have received a copy of the GNU Lesser General Public License
15-
along with this program; if not, write to the Free Software
16-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4+
This program is free software; you can redistribute it and/or modify it, as
5+
specified in the COPYRIGHT file, under the terms of either version 2.1 of
6+
the LGPL (or, at your option, any later version) or the 3-clause BSD license.
177
-}
188

199
{- |
2010
Module : Data.ConfigFile.Lexer
21-
Copyright : Copyright (C) 2004 John Goerzen
22-
License : GNU LGPL, version 2.1 or above
11+
Copyright : Copyright (C) 2004, 2008 John Goerzen
12+
License : Either LGPL or BSD3, as specified in the COPYRIGHT file.
2313
2414
Maintainer : John Goerzen <jgoerzen@complete.org>
2515
Stability : provisional
@@ -28,7 +18,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2818
Lexer support for "Data.ConfigFile". This module is not intended to be
2919
used directly by your programs.
3020
31-
Copyright (c) 2004 John Goerzen, jgoerzen\@complete.org
21+
Copyright (c) 2004, 2008 John Goerzen, jgoerzen\@complete.org
22+
23+
This program is distributed in the hope that it will be useful,
24+
but WITHOUT ANY WARRANTY; without even the implied warranty of
25+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
26+
3227
-}
3328
module Data.ConfigFile.Lexer
3429
(

‎src/Data/ConfigFile/Parser.hs‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
11
{-
22
Copyright (C) 2004-2008 John Goerzen <jgoerzen@complete.org>
33
4-
This program is free software; you can redistribute it and/or modify
5-
it under the terms of the GNU Lesser General Public License as published by
6-
the Free Software Foundation; either version 2.1 of the License, or
7-
(at your option) any later version.
4+
This program is free software; you can redistribute it and/or modify it, as
5+
specified in the COPYRIGHT file, under the terms of either version 2.1 of
6+
the LGPL (or, at your option, any later version) or the 3-clause BSD license.
87
9-
This program is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
GNU Lesser General Public License for more details.
13-
14-
You should have received a copy of the GNU Lesser General Public License
15-
along with this program; if not, write to the Free Software
16-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
178
-}
189

1910
{- |
2011
Module : Data.ConfigFile.Parser
2112
Copyright : Copyright (C) 2004-2008 John Goerzen
22-
License : GNU LGPL, version 2.1 or above
13+
License : Either LGPL or BSD3, as specified in the COPYRIGHT file.
2314
2415
Maintainer : John Goerzen <jgoerzen@complete.org>
2516
Stability : provisional
@@ -29,6 +20,11 @@ Parser support for "Data.ConfigFile". This module is not intended to be
2920
used directly by your programs.
3021
3122
Copyright (c) 2004-2008 John Goerzen, jgoerzen\@complete.org
23+
24+
This program is distributed in the hope that it will be useful,
25+
but WITHOUT ANY WARRANTY; without even the implied warranty of
26+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
27+
3228
-}
3329
module Data.ConfigFile.Parser
3430
(

‎src/Data/ConfigFile/Types.hs‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,15 @@
11
{-
22
Copyright (C) 2004-2008 John Goerzen <jgoerzen@complete.org>
33
4-
This program is free software; you can redistribute it and/or modify
5-
it under the terms of the GNU Lesser General Public License as published by
6-
the Free Software Foundation; either version 2.1 of the License, or
7-
(at your option) any later version.
8-
9-
This program is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
GNU Lesser General Public License for more details.
13-
14-
You should have received a copy of the GNU Lesser General Public License
15-
along with this program; if not, write to the Free Software
16-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4+
This program is free software; you can redistribute it and/or modify it, as
5+
specified in the COPYRIGHT file, under the terms of either version 2.1 of
6+
the LGPL (or, at your option, any later version) or the 3-clause BSD license.
177
-}
188

199
{- |
2010
Module : Data.ConfigFile.Types
2111
Copyright : Copyright (C) 2004-2008 John Goerzen
22-
License : GNU LGPL, version 2.1 or above
12+
License : Either LGPL or BSD3, as specified in the COPYRIGHT file.
2313
2414
Maintainer : John Goerzen <jgoerzen@complete.org>
2515
Stability : provisional
@@ -29,6 +19,11 @@ Internal types for "Data.ConfigFile". This module is not intended to be
2919
used directly by your programs.
3020
3121
Copyright (c) 2004-2008 John Goerzen, jgoerzen\@complete.org
22+
23+
This program is distributed in the hope that it will be useful,
24+
but WITHOUT ANY WARRANTY; without even the implied warranty of
25+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
26+
3227
-}
3328

3429
module Data.ConfigFile.Types (
@@ -108,4 +103,4 @@ data ConfigParser = ConfigParser
108103
-- will internally call defaulthandler to do the underlying lookup.
109104
-- The option value is not assumed to be transformed.
110105
accessfunc :: (ConfigParser -> SectionSpec -> OptionSpec -> Either CPError String)
111-
}
106+
}

0 commit comments

Comments
 (0)