Skip to content

Commit

Permalink
Relicense fileviewinfo under the MIT license
Browse files Browse the repository at this point in the history
The test files in the testfiles directory remain in the public domain,
where that is possible.
  • Loading branch information
dfandrich committed Mar 15, 2023
1 parent f895679 commit f1b7803
Show file tree
Hide file tree
Showing 13 changed files with 53 additions and 145 deletions.
121 changes: 0 additions & 121 deletions COPYING

This file was deleted.

21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2023 Dan Fandrich <dan@coneharvesters.com>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Makefile for installing fileviewinfo
# Placed into the public domain by Dan Fandrich <dan@coneharvesters.com>
# See the file COPYING for details of how CC0 applies to this file.
#
# Copyright (c) 2023 Dan Fandrich <dan@coneharvesters.com>
# Licensed under the MIT license (see LICENSE).
#
# This Makefile relies on some GNU make extensions.

Expand All @@ -13,7 +14,7 @@ NROFFFLAGS=-man -c

VERSION=$(shell ./fv -\? | sed -n '1s/^.*ver. //p')
SOURCES = fv fvi autodescribe automtime fv.1 fvi.1 autodescribe.1 automtime.1
DISTFILES = $(SOURCES) Makefile Makefile-testfiles README.md COPYING \
DISTFILES = $(SOURCES) Makefile Makefile-testfiles README.md LICENSE \
.gitignore test-fv-expected test-fvi-expected test-autodescribe-expected \
test-automtime-expected testfiles/*
DOC_TARGETS = fv.man fv.html fvi.man fvi.html autodescribe.man \
Expand Down
3 changes: 3 additions & 0 deletions Makefile-testfiles
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Instructions for generating sample test files
#
# Copyright (c) 2023 Dan Fandrich <dan@coneharvesters.com>
# Licensed under the MIT license (see LICENSE).
#
# The resulting files are checked in (with a few exceptions at the end) so that
# these commands never need to be run again. Smaller file size is sometimes
# prioritized over ease of creation. All generated files must also be able to
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ The project home is at https://github.com/dfandrich/fileviewinfo/ Report bugs
or issues there, or submit pull requests to support new file types.

[![Download](https://img.shields.io/github/v/release/dfandrich/fileviewinfo?sort=semver)](https://github.com/dfandrich/fileviewinfo/releases/latest)
[![License](https://img.shields.io/badge/License-CC0v1-blue.svg)](https://creativecommons.org/publicdomain/zero/1.0/)
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/license/mit/)
[![Github Actions Build Status](https://github.com/dfandrich/fileviewinfo/workflows/CI/badge.svg?branch=master)](https://github.com/dfandrich/fileviewinfo/actions?query=workflow%3A%22CI%22)

## Author

Daniel Fandrich <dan@coneharvesters.com>

The fileviewinfo package is placed into the public domain by Daniel Fandrich.
See the file [COPYING](COPYING) for details of how CC0 applies to this file.
Copyright (c) 2023 Dan Fandrich <dan@coneharvesters.com>
Licensed under the MIT license (see the file [LICENSE](LICENSE) for details)
with the exception of the files in testfiles/ which are hereby dedicated to the
public domain in jurisdictions where such a dedication is legally permitted.
5 changes: 3 additions & 2 deletions autodescribe
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/sh
# autodescribe - automatically extract comments from files
# Placed into the public domain by Dan Fandrich <dan@coneharvesters.com>
# See the file COPYING for details of how CC0 applies to this file.
#
# Copyright (c) 2023 Dan Fandrich <dan@coneharvesters.com>
# Licensed under the MIT license (see LICENSE).

# Print a shell-quoted version of the first argument
shquote () {
Expand Down
4 changes: 2 additions & 2 deletions autodescribe.1
Original file line number Diff line number Diff line change
Expand Up @@ -289,5 +289,5 @@ See https://github.com/dfandrich/fileviewinfo/
.\" ---------------------------------------------------------------------------
.SH COPYRIGHT
.B autodescribe
is placed into the public domain by Daniel Fandrich.
See the file COPYING for details of how CC0 applies to this file.
is Copyright (c) 2023 Dan Fandrich <dan@coneharvesters.com>.
Licensed under the MIT license (see LICENSE).
5 changes: 3 additions & 2 deletions automtime
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/sh
# automtime - automatically get modification time from internal file metadata
# Placed into the public domain by Dan Fandrich <dan@coneharvesters.com>
# See the file COPYING for details of how CC0 applies to this file.
#
# Copyright (c) 2023 Dan Fandrich <dan@coneharvesters.com>
# Licensed under the MIT license (see LICENSE).

###########################

Expand Down
4 changes: 2 additions & 2 deletions automtime.1
Original file line number Diff line number Diff line change
Expand Up @@ -253,5 +253,5 @@ See https://github.com/dfandrich/fileviewinfo/
.\" ---------------------------------------------------------------------------
.SH COPYRIGHT
.B automtime
is placed into the public domain by Daniel Fandrich.
See the file COPYING for details of how CC0 applies to this file.
is Copyright (c) 2023 Dan Fandrich <dan@coneharvesters.com>.
Licensed under the MIT license (see LICENSE).
5 changes: 3 additions & 2 deletions fv
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/sh
# fv - archive and package directory lister
# Placed into the public domain by Dan Fandrich <dan@coneharvesters.com>
# See the file COPYING for details of how CC0 applies to this file.
#
# Copyright (c) 2023 Dan Fandrich <dan@coneharvesters.com>
# Licensed under the MIT license (see LICENSE).
#
# Format of archive entries in this file:
#
Expand Down
4 changes: 2 additions & 2 deletions fv.1
Original file line number Diff line number Diff line change
Expand Up @@ -432,8 +432,8 @@ for displaying directories of MS-DOS archives.
.\" ---------------------------------------------------------------------------
.SH COPYRIGHT
.B fv
is placed into the public domain by Daniel Fandrich.
See the file COPYING for details of how CC0 applies to this file.
is Copyright (c) 2023 Dan Fandrich <dan@coneharvesters.com>.
Licensed under the MIT license (see LICENSE).
.\" ---------------------------------------------------------------------------
.SH "SEE ALSO"
.B fv
Expand Down
5 changes: 3 additions & 2 deletions fvi
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/sh
# fvi - file metainformation lister
# Placed into the public domain by Dan Fandrich <dan@coneharvesters.com>
# See the file COPYING for details of how CC0 applies to this file.
#
# Copyright (c) 2023 Dan Fandrich <dan@coneharvesters.com>
# Licensed under the MIT license (see LICENSE).
#
# Format of file type entries in this file:
#
Expand Down
4 changes: 2 additions & 2 deletions fvi.1
Original file line number Diff line number Diff line change
Expand Up @@ -374,5 +374,5 @@ See https://github.com/dfandrich/fileviewinfo/
.\" ---------------------------------------------------------------------------
.SH COPYRIGHT
.B fvi
is placed into the public domain by Daniel Fandrich.
See the file COPYING for details of how CC0 applies to this file.
is Copyright (c) 2023 Dan Fandrich <dan@coneharvesters.com>.
Licensed under the MIT license (see LICENSE).

0 comments on commit f1b7803

Please sign in to comment.