Skip to content

Commit 9128908

Browse files
committed
Merge branch 'develop'
2 parents 04f383b + 6db828a commit 9128908

File tree

60 files changed

+85
-84
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+85
-84
lines changed

README.rst

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
AboutCode Toolkit
22
=================
33

4-
Build and tests status
5-
----------------------
6-
7-
+-------+-----------------+--------------+
8-
|Branch | **Linux/macOS** | **Windows** |
9-
+=======+=================+==============+
10-
|Master | |master-posix| | |master-win| |
11-
+-------+-----------------+--------------+
12-
|Develop| |devel-posix| | |devel-win| |
13-
+-------+-----------------+--------------+
14-
15-
4+
Introduction
5+
------------
166
The AboutCode Toolkit and ABOUT files provide a simple way to document the
177
origin, license, usage and other important or interesting information about
188
third-party software components that you use in your project.
@@ -35,6 +25,18 @@ This version of the AboutCode Toolkit follows the ABOUT specification version 3.
3525
https://github.com/nexB/aboutcode-toolkit/blob/develop/SPECIFICATION.rst
3626

3727

28+
Build and tests status
29+
----------------------
30+
31+
+-------+-----------------+--------------+
32+
|Branch | **Linux/macOS** | **Windows** |
33+
+=======+=================+==============+
34+
|Master | |master-posix| | |master-win| |
35+
+-------+-----------------+--------------+
36+
|Develop| |devel-posix| | |devel-win| |
37+
+-------+-----------------+--------------+
38+
39+
3840
REQUIREMENTS
3941
------------
4042
The AboutCode Toolkit is tested with Python 2.7 and 3.6 on Linux, Mac and Windows.

about.ABOUT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: AboutCode-toolkit
33
version: 4.0.0
44
author: Jillian Daguil, Chin Yeung Li, Philippe Ombredanne, Thomas Druez
55
copyright: Copyright (c) 2013-2019 nexB Inc.
6-
description: |-
6+
description: |
77
AboutCode Toolkit is a tool to process ABOUT files. An ABOUT file
88
provides a simple way to document the provenance (origin and license)
99
'about' a software component. This is a small text file stored in the

docs/CHANGELOG.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Release 4.0.1
33

44
* Declare to follow SemVer for versioning schema
5-
5+
* Update REFERENCE.rst and README.rst
66

77
2019-10-09
88

etc/scripts/irc-notify.py.ABOUT

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
about_resource: irc-notify.py
22
name: irc-notify.py
33
version: def54f8166089b733d166665fdabcad4cdc526d8
4-
copyright: >-
5-
Copyright (C) 2015-2016 Christopher R. Wood
4+
copyright: Copyright (C) 2015-2016 Christopher R. Wood
65
description: Quick and dirty IRC notification script.
76
download_url: https://raw.githubusercontent.com/gridsync/gridsync/def54f8166089b733d166665fdabcad4cdc526d8/misc/irc-notify.py
87
homepage_url: https://github.com/gridsync/gridsync

example/e2fsprogs-1.39/e2fsprogs-about/e2fsprogs-1.39/alocal.m4.ABOUT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
about_resource: alocal.m4
22
name: alocal.m4
3-
copyright: >-
3+
copyright: |
44
Copyright (c) 1995-2003 Free Software Foundation, Inc.
55
license_expression: public-domain
66
licenses:

example/e2fsprogs-1.39/e2fsprogs-about/e2fsprogs-1.39/config/config.guess.ABOUT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ about_resource: config.guess
22
name: config.guess
33
attribute: yes
44
checksum_sha1: 6bf255982f9104c1423347581c55b4a34336e933
5-
copyright: >-
5+
copyright: |
66
Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
77
2003, 2004, 2005 Free Software Foundation, Inc.
88
license_expression: gpl-2.0-autoconf

example/e2fsprogs-1.39/e2fsprogs-about/e2fsprogs-1.39/config/config.rpath.ABOUT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ about_resource: config.rpath
22
name: config.rpath
33
attribute: yes
44
checksum_sha1: 98461658e371e01ef48f2ea173823c96fecc6145
5-
copyright: >-
5+
copyright: |
66
Copyright 1996-2002 Free Software Foundation, Inc.
77
license_expression: gpl-2.0-autoconf
88
licenses:

example/e2fsprogs-1.39/e2fsprogs-about/e2fsprogs-1.39/config/config.sub.ABOUT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ about_resource: config.sub
22
name: config.sub
33
attribute: yes
44
checksum_sha1: c6aba2045763f997fc81c1d881304755b09d2e02
5-
copyright: >-
5+
copyright: |
66
Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
77
2003, 2004, 2005 Free Software Foundation, Inc.
88
license_expression: gpl-2.0-autoconf

example/e2fsprogs-1.39/e2fsprogs-about/e2fsprogs-1.39/e2fsck/dict.c.ABOUT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ about_resource: dict.c
22
name: dict.c
33
attribute: yes
44
checksum_sha1: 52e5af00e28008e9fb264a88f46566947e4b09f7
5-
copyright: >-
5+
copyright: |
66
Copyright (C) 1997 Kaz Kylheku <[email protected]>
77
licenses:
88
- file: KazKylheku.LICENSE

example/e2fsprogs-1.39/e2fsprogs-about/e2fsprogs-1.39/e2fsck/dict.h.ABOUT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ about_resource: dict.h
22
name: dict.h
33
attribute: yes
44
checksum_sha1: 0f99603368345b82318e0fb186421cbaa3d8c3a2
5-
copyright: >-
5+
copyright: |
66
Copyright (C) 1997 Kaz Kylheku <[email protected]>
77
licenses:
88
- file: KazKylheku.LICENSE

0 commit comments

Comments
 (0)