summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2022-04-23 23:59:52 +0100
committerColin Watson <cjwatson@debian.org>2022-04-24 00:03:53 +0100
commit1b1f072e2e99fe4ba0a45210e0fd4d4a0ee43561 (patch)
tree8534a38306ee27d254f20f6f3f01bb6c8147aba8 /lib
parent695a3560fdf91f829f21f00a502244b0cf28e29d (diff)
Stop GitLab from getting confused about licences
GitLab uses https://github.com/licensee/licensee to detect the project's licence, and if that finds multiple matching files then it throws up its hands and refuses to make a licence assertion, with no apparent way to override it. To avoid this problem, move the secondary licence files (those that apply only to some files, rather than to the project as a whole) back into a subdirectory, so that `licensee` doesn't notice them. * COPYING.GPLv2: Move to ... * docs/COPYING.GPLv2: ... here. Update all references. * COPYING.LIB: Move to ... * docs/COPYING.LIB: ... here. Update all references. * Makefile.am (dist_noinst_DATA): Remove COPYING.GPLv2. * docs/Makefile.am (dist_noinst_DATA): Add COPYING.GPLv2 and COPYING.LIB.
Diffstat (limited to 'lib')
-rw-r--r--lib/README3
-rw-r--r--lib/appendstr.c2
-rw-r--r--lib/appendstr.h2
-rw-r--r--lib/cleanup.c2
-rw-r--r--lib/cleanup.h2
5 files changed, 6 insertions, 5 deletions
diff --git a/lib/README b/lib/README
index 49a4b166..4f2a0705 100644
--- a/lib/README
+++ b/lib/README
@@ -2,7 +2,8 @@ These library source files have various authors and specific licenses,
but may all be used as part of a complete work that is distributed under
the terms of the GNU General Public License version 2 or later.
-See the files ../COPYING.GPLv2 and ../COPYING.LIB for relevant information.
+See the files ../docs/COPYING.GPLv2 and ../docs/COPYING.LIB for relevant
+information.
appendstr.* author - Markus Armbruster
cleanup.* author - Markus Armbruster, Colin Watson
diff --git a/lib/appendstr.c b/lib/appendstr.c
index 21cdae1f..3be8bff4 100644
--- a/lib/appendstr.c
+++ b/lib/appendstr.c
@@ -12,7 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; see the file COPYING.LIB. If not, write
+ along with this program; see the file docs/COPYING.LIB. If not, write
to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
02139, USA. */
diff --git a/lib/appendstr.h b/lib/appendstr.h
index 30b18b81..9875faa1 100644
--- a/lib/appendstr.h
+++ b/lib/appendstr.h
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.LIB. If not, write
+ * along with this program; see the file docs/COPYING.LIB. If not, write
* to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
* 02139, USA.
*/
diff --git a/lib/cleanup.c b/lib/cleanup.c
index b122de82..6bbf363b 100644
--- a/lib/cleanup.c
+++ b/lib/cleanup.c
@@ -14,7 +14,7 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; see the file COPYING.LIB. If not,
+ * License along with this library; see the file docs/COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
* Floor, Boston, MA 02110-1301 USA.
*/
diff --git a/lib/cleanup.h b/lib/cleanup.h
index 555900db..162249ce 100644
--- a/lib/cleanup.h
+++ b/lib/cleanup.h
@@ -14,7 +14,7 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; see the file COPYING.LIB. If not,
+ * License along with this library; see the file docs/COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
* Floor, Boston, MA 02110-1301 USA.
*/