File 0001-Correct-inconsistent-licensing-text.patch of Package libmusicbrainz5

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Correct-inconsistent-licensing-text.patch of Package libmusicbrainz5 (Revision 844e94dad88d137856b08de99b8bd36f)

Currently displaying revision 844e94dad88d137856b08de99b8bd36f , Show latest

From ef8deae7c758a46f78ef87a11a99460272cea718 Mon Sep 17 00:00:00 2001
From: Andy Hawkins <andy@gently.org.uk>
Date: Mon, 3 Sep 2012 21:28:15 +0100
Subject: [PATCH] Correct inconsistent licensing text

diff --git a/examples/cdlookup.cc b/examples/cdlookup.cc
index b079b49..c8b2cc0 100644
--- a/examples/cdlookup.cc
+++ b/examples/cdlookup.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/examples/cdlookup_c.c b/examples/cdlookup_c.c
index 14b4a56..adfdb75 100644
--- a/examples/cdlookup_c.c
+++ b/examples/cdlookup_c.c
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/examples/collections.cc b/examples/collections.cc
index 4751643..ebaa279 100644
--- a/examples/collections.cc
+++ b/examples/collections.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/examples/search.cc b/examples/search.cc
index 89cd57e..bee827f 100644
--- a/examples/search.cc
+++ b/examples/search.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/examples/search_c.c b/examples/search_c.c
index 17c66d0..77da2c7 100644
--- a/examples/search_c.c
+++ b/examples/search_c.c
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Alias.h b/include/musicbrainz5/Alias.h
index f6c2e35..263c835 100644
--- a/include/musicbrainz5/Alias.h
+++ b/include/musicbrainz5/Alias.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/AliasList.h b/include/musicbrainz5/AliasList.h
index e3355cd..dda09cc 100644
--- a/include/musicbrainz5/AliasList.h
+++ b/include/musicbrainz5/AliasList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Annotation.h b/include/musicbrainz5/Annotation.h
index 2cfb1e7..7ad0d92 100644
--- a/include/musicbrainz5/Annotation.h
+++ b/include/musicbrainz5/Annotation.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/AnnotationList.h b/include/musicbrainz5/AnnotationList.h
index 343705e..18c50d9 100644
--- a/include/musicbrainz5/AnnotationList.h
+++ b/include/musicbrainz5/AnnotationList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Artist.h b/include/musicbrainz5/Artist.h
index 915464c..c7b4fe6 100644
--- a/include/musicbrainz5/Artist.h
+++ b/include/musicbrainz5/Artist.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/ArtistCredit.h b/include/musicbrainz5/ArtistCredit.h
index dd579cc..1ed4f31 100644
--- a/include/musicbrainz5/ArtistCredit.h
+++ b/include/musicbrainz5/ArtistCredit.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/ArtistList.h b/include/musicbrainz5/ArtistList.h
index c10a611..eb92759 100644
--- a/include/musicbrainz5/ArtistList.h
+++ b/include/musicbrainz5/ArtistList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Attribute.h b/include/musicbrainz5/Attribute.h
index 98357da..2fac33c 100644
--- a/include/musicbrainz5/Attribute.h
+++ b/include/musicbrainz5/Attribute.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/AttributeList.h b/include/musicbrainz5/AttributeList.h
index 2ad082d..66b867a 100644
--- a/include/musicbrainz5/AttributeList.h
+++ b/include/musicbrainz5/AttributeList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/CDStub.h b/include/musicbrainz5/CDStub.h
index dfbe01f..85a5834 100644
--- a/include/musicbrainz5/CDStub.h
+++ b/include/musicbrainz5/CDStub.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/CDStubList.h b/include/musicbrainz5/CDStubList.h
index 1c5ec85..57c401d 100644
--- a/include/musicbrainz5/CDStubList.h
+++ b/include/musicbrainz5/CDStubList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Collection.h b/include/musicbrainz5/Collection.h
index 96a03a7..a2b9fd7 100644
--- a/include/musicbrainz5/Collection.h
+++ b/include/musicbrainz5/Collection.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/CollectionList.h b/include/musicbrainz5/CollectionList.h
index f3d53bb..a9ac83f 100644
--- a/include/musicbrainz5/CollectionList.h
+++ b/include/musicbrainz5/CollectionList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Disc.h b/include/musicbrainz5/Disc.h
index aeeb504..b9a399e 100644
--- a/include/musicbrainz5/Disc.h
+++ b/include/musicbrainz5/Disc.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/DiscList.h b/include/musicbrainz5/DiscList.h
index f5ef1d6..a9f29fb 100644
--- a/include/musicbrainz5/DiscList.h
+++ b/include/musicbrainz5/DiscList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Entity.h b/include/musicbrainz5/Entity.h
index 0d72722..fca7a14 100644
--- a/include/musicbrainz5/Entity.h
+++ b/include/musicbrainz5/Entity.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/FreeDBDisc.h b/include/musicbrainz5/FreeDBDisc.h
index a52e86e..4b2f1f1 100644
--- a/include/musicbrainz5/FreeDBDisc.h
+++ b/include/musicbrainz5/FreeDBDisc.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/FreeDBDiscList.h b/include/musicbrainz5/FreeDBDiscList.h
index ff0c7e1..c132206 100644
--- a/include/musicbrainz5/FreeDBDiscList.h
+++ b/include/musicbrainz5/FreeDBDiscList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/HTTPFetch.h b/include/musicbrainz5/HTTPFetch.h
index 7ef7194..b13cef2 100644
--- a/include/musicbrainz5/HTTPFetch.h
+++ b/include/musicbrainz5/HTTPFetch.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/IPI.h b/include/musicbrainz5/IPI.h
index 4ee360f..e308e9d 100644
--- a/include/musicbrainz5/IPI.h
+++ b/include/musicbrainz5/IPI.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/IPIList.h b/include/musicbrainz5/IPIList.h
index 2b1b5c4..9fe58e6 100644
--- a/include/musicbrainz5/IPIList.h
+++ b/include/musicbrainz5/IPIList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/ISRC.h b/include/musicbrainz5/ISRC.h
index 55b02bc..75b9619 100644
--- a/include/musicbrainz5/ISRC.h
+++ b/include/musicbrainz5/ISRC.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/ISRCList.h b/include/musicbrainz5/ISRCList.h
index f43f8ea..df54db9 100644
--- a/include/musicbrainz5/ISRCList.h
+++ b/include/musicbrainz5/ISRCList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/ISWC.h b/include/musicbrainz5/ISWC.h
index eca92e8..d693e10 100644
--- a/include/musicbrainz5/ISWC.h
+++ b/include/musicbrainz5/ISWC.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/ISWCList.h b/include/musicbrainz5/ISWCList.h
index b0f130a..22354b7 100644
--- a/include/musicbrainz5/ISWCList.h
+++ b/include/musicbrainz5/ISWCList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Label.h b/include/musicbrainz5/Label.h
index 6e712a8..ba7df2f 100644
--- a/include/musicbrainz5/Label.h
+++ b/include/musicbrainz5/Label.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/LabelInfo.h b/include/musicbrainz5/LabelInfo.h
index ee4d6a1..220cce9 100644
--- a/include/musicbrainz5/LabelInfo.h
+++ b/include/musicbrainz5/LabelInfo.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/LabelInfoList.h b/include/musicbrainz5/LabelInfoList.h
index a44aec9..c9de4bb 100644
--- a/include/musicbrainz5/LabelInfoList.h
+++ b/include/musicbrainz5/LabelInfoList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/LabelList.h b/include/musicbrainz5/LabelList.h
index 0f5d5fd..7ddba6d 100644
--- a/include/musicbrainz5/LabelList.h
+++ b/include/musicbrainz5/LabelList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Lifespan.h b/include/musicbrainz5/Lifespan.h
index 833efde..b50dbd6 100644
--- a/include/musicbrainz5/Lifespan.h
+++ b/include/musicbrainz5/Lifespan.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/List.h b/include/musicbrainz5/List.h
index 2722fa9..5b8b21a 100644
--- a/include/musicbrainz5/List.h
+++ b/include/musicbrainz5/List.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/ListImpl.h b/include/musicbrainz5/ListImpl.h
index 540746d..17d64a7 100644
--- a/include/musicbrainz5/ListImpl.h
+++ b/include/musicbrainz5/ListImpl.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Medium.h b/include/musicbrainz5/Medium.h
index e2ed715..0894fb4 100644
--- a/include/musicbrainz5/Medium.h
+++ b/include/musicbrainz5/Medium.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/MediumList.h b/include/musicbrainz5/MediumList.h
index 5f6b389..15fc3fa 100644
--- a/include/musicbrainz5/MediumList.h
+++ b/include/musicbrainz5/MediumList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Message.h b/include/musicbrainz5/Message.h
index 866d141..583907a 100644
--- a/include/musicbrainz5/Message.h
+++ b/include/musicbrainz5/Message.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Metadata.h b/include/musicbrainz5/Metadata.h
index 37c6cbb..dcaba89 100644
--- a/include/musicbrainz5/Metadata.h
+++ b/include/musicbrainz5/Metadata.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/NameCredit.h b/include/musicbrainz5/NameCredit.h
index f916eaf..058adfd 100644
--- a/include/musicbrainz5/NameCredit.h
+++ b/include/musicbrainz5/NameCredit.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/NameCreditList.h b/include/musicbrainz5/NameCreditList.h
index f2a8d0b..18a31b3 100644
--- a/include/musicbrainz5/NameCreditList.h
+++ b/include/musicbrainz5/NameCreditList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/NonMBTrack.h b/include/musicbrainz5/NonMBTrack.h
index 108f3db..f37fa83 100644
--- a/include/musicbrainz5/NonMBTrack.h
+++ b/include/musicbrainz5/NonMBTrack.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/NonMBTrackList.h b/include/musicbrainz5/NonMBTrackList.h
index 8a7db8c..1b5d2fd 100644
--- a/include/musicbrainz5/NonMBTrackList.h
+++ b/include/musicbrainz5/NonMBTrackList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/PUID.h b/include/musicbrainz5/PUID.h
index fd72834..0679894 100644
--- a/include/musicbrainz5/PUID.h
+++ b/include/musicbrainz5/PUID.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/PUIDList.h b/include/musicbrainz5/PUIDList.h
index b730cf2..b4e5512 100644
--- a/include/musicbrainz5/PUIDList.h
+++ b/include/musicbrainz5/PUIDList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Query.h b/include/musicbrainz5/Query.h
index 561338f..f6e15e3 100644
--- a/include/musicbrainz5/Query.h
+++ b/include/musicbrainz5/Query.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Rating.h b/include/musicbrainz5/Rating.h
index 1e97be6..c8bc3eb 100644
--- a/include/musicbrainz5/Rating.h
+++ b/include/musicbrainz5/Rating.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Recording.h b/include/musicbrainz5/Recording.h
index 5436001..0b8952e 100644
--- a/include/musicbrainz5/Recording.h
+++ b/include/musicbrainz5/Recording.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/RecordingList.h b/include/musicbrainz5/RecordingList.h
index 1d0cf87..1c28641 100644
--- a/include/musicbrainz5/RecordingList.h
+++ b/include/musicbrainz5/RecordingList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Relation.h b/include/musicbrainz5/Relation.h
index 3f9b2d0..9d692b0 100644
--- a/include/musicbrainz5/Relation.h
+++ b/include/musicbrainz5/Relation.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/RelationList.h b/include/musicbrainz5/RelationList.h
index 0bd6ada..fb16e75 100644
--- a/include/musicbrainz5/RelationList.h
+++ b/include/musicbrainz5/RelationList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/RelationListList.h b/include/musicbrainz5/RelationListList.h
index 35c140f..56cb9e1 100644
--- a/include/musicbrainz5/RelationListList.h
+++ b/include/musicbrainz5/RelationListList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Release.h b/include/musicbrainz5/Release.h
index 9a3d9ff..15b3fcb 100644
--- a/include/musicbrainz5/Release.h
+++ b/include/musicbrainz5/Release.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/ReleaseGroup.h b/include/musicbrainz5/ReleaseGroup.h
index 6bd46ca..e106f4a 100644
--- a/include/musicbrainz5/ReleaseGroup.h
+++ b/include/musicbrainz5/ReleaseGroup.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/ReleaseGroupList.h b/include/musicbrainz5/ReleaseGroupList.h
index c4e13c2..6bf8be0 100644
--- a/include/musicbrainz5/ReleaseGroupList.h
+++ b/include/musicbrainz5/ReleaseGroupList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/ReleaseList.h b/include/musicbrainz5/ReleaseList.h
index 6f15151..2b19e64 100644
--- a/include/musicbrainz5/ReleaseList.h
+++ b/include/musicbrainz5/ReleaseList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/SecondaryType.h b/include/musicbrainz5/SecondaryType.h
index 705a7c9..056649c 100644
--- a/include/musicbrainz5/SecondaryType.h
+++ b/include/musicbrainz5/SecondaryType.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/SecondaryTypeList.h b/include/musicbrainz5/SecondaryTypeList.h
index 6d67d41..6c51cd0 100644
--- a/include/musicbrainz5/SecondaryTypeList.h
+++ b/include/musicbrainz5/SecondaryTypeList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Tag.h b/include/musicbrainz5/Tag.h
index 9c601d0..fcbb350 100644
--- a/include/musicbrainz5/Tag.h
+++ b/include/musicbrainz5/Tag.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/TagList.h b/include/musicbrainz5/TagList.h
index faa8ecb..e2c3860 100644
--- a/include/musicbrainz5/TagList.h
+++ b/include/musicbrainz5/TagList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/TextRepresentation.h b/include/musicbrainz5/TextRepresentation.h
index a0557a1..fdb27c5 100644
--- a/include/musicbrainz5/TextRepresentation.h
+++ b/include/musicbrainz5/TextRepresentation.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Track.h b/include/musicbrainz5/Track.h
index f707875..25d4416 100644
--- a/include/musicbrainz5/Track.h
+++ b/include/musicbrainz5/Track.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/TrackList.h b/include/musicbrainz5/TrackList.h
index 43016bd..24e71b9 100644
--- a/include/musicbrainz5/TrackList.h
+++ b/include/musicbrainz5/TrackList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/UserRating.h b/include/musicbrainz5/UserRating.h
index cce7ecb..a2215fa 100644
--- a/include/musicbrainz5/UserRating.h
+++ b/include/musicbrainz5/UserRating.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/UserTag.h b/include/musicbrainz5/UserTag.h
index e56d095..2115d84 100644
--- a/include/musicbrainz5/UserTag.h
+++ b/include/musicbrainz5/UserTag.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/UserTagList.h b/include/musicbrainz5/UserTagList.h
index 3962818..2e8f6af 100644
--- a/include/musicbrainz5/UserTagList.h
+++ b/include/musicbrainz5/UserTagList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/Work.h b/include/musicbrainz5/Work.h
index 0189aec..c73cf52 100644
--- a/include/musicbrainz5/Work.h
+++ b/include/musicbrainz5/Work.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/WorkList.h b/include/musicbrainz5/WorkList.h
index 3c1b76b..3bf5fd7 100644
--- a/include/musicbrainz5/WorkList.h
+++ b/include/musicbrainz5/WorkList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz5/defines.h b/include/musicbrainz5/defines.h
index 0112370..c33e8ad 100644
--- a/include/musicbrainz5/defines.h
+++ b/include/musicbrainz5/defines.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Alias.cc b/src/Alias.cc
index c5ce398..bdafc99 100644
--- a/src/Alias.cc
+++ b/src/Alias.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Annotation.cc b/src/Annotation.cc
index eefdff2..e138c83 100644
--- a/src/Annotation.cc
+++ b/src/Annotation.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Artist.cc b/src/Artist.cc
index 3705b35..bcf37c3 100644
--- a/src/Artist.cc
+++ b/src/Artist.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ArtistCredit.cc b/src/ArtistCredit.cc
index 420edbd..6ad7e64 100644
--- a/src/ArtistCredit.cc
+++ b/src/ArtistCredit.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Attribute.cc b/src/Attribute.cc
index 02a52a5..9e0afce 100644
--- a/src/Attribute.cc
+++ b/src/Attribute.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/CDStub.cc b/src/CDStub.cc
index 837cfe1..f237351 100644
--- a/src/CDStub.cc
+++ b/src/CDStub.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Collection.cc b/src/Collection.cc
index 91af50a..293af2c 100644
--- a/src/Collection.cc
+++ b/src/Collection.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Disc.cc b/src/Disc.cc
index 4d75bfd..0616ea7 100644
--- a/src/Disc.cc
+++ b/src/Disc.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Entity.cc b/src/Entity.cc
index 0644377..b54d4ec 100644
--- a/src/Entity.cc
+++ b/src/Entity.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/FreeDBDisc.cc b/src/FreeDBDisc.cc
index 2eddbd8..a888192 100644
--- a/src/FreeDBDisc.cc
+++ b/src/FreeDBDisc.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/HTTPFetch.cc b/src/HTTPFetch.cc
index 86ff4ad..ac3f9b4 100644
--- a/src/HTTPFetch.cc
+++ b/src/HTTPFetch.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/IPI.cc b/src/IPI.cc
index 307f3e0..8c5e9ad 100644
--- a/src/IPI.cc
+++ b/src/IPI.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ISRC.cc b/src/ISRC.cc
index f91bece..bd63a76 100644
--- a/src/ISRC.cc
+++ b/src/ISRC.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ISWC.cc b/src/ISWC.cc
index 7d93fed..d8d75a4 100644
--- a/src/ISWC.cc
+++ b/src/ISWC.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ISWCList.cc b/src/ISWCList.cc
index 120b8aa..b78dece 100644
--- a/src/ISWCList.cc
+++ b/src/ISWCList.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Label.cc b/src/Label.cc
index 9fc9d0b..8add21c 100644
--- a/src/Label.cc
+++ b/src/Label.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/LabelInfo.cc b/src/LabelInfo.cc
index dd94501..ad04652 100644
--- a/src/LabelInfo.cc
+++ b/src/LabelInfo.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Lifespan.cc b/src/Lifespan.cc
index 89de3a1..35b49d1 100644
--- a/src/Lifespan.cc
+++ b/src/Lifespan.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/List.cc b/src/List.cc
index 2582946..6a8a47c 100644
--- a/src/List.cc
+++ b/src/List.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Medium.cc b/src/Medium.cc
index fb79011..03e27da 100644
--- a/src/Medium.cc
+++ b/src/Medium.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/MediumList.cc b/src/MediumList.cc
index c050c0e..e3d5705 100644
--- a/src/MediumList.cc
+++ b/src/MediumList.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Message.cc b/src/Message.cc
index 4e80d39..63e034b 100644
--- a/src/Message.cc
+++ b/src/Message.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Metadata.cc b/src/Metadata.cc
index 19ba262..57b4732 100644
--- a/src/Metadata.cc
+++ b/src/Metadata.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/NameCredit.cc b/src/NameCredit.cc
index 57b45a0..f587caa 100644
--- a/src/NameCredit.cc
+++ b/src/NameCredit.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/NonMBTrack.cc b/src/NonMBTrack.cc
index 4b06b5f..0bd6367 100644
--- a/src/NonMBTrack.cc
+++ b/src/NonMBTrack.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/PUID.cc b/src/PUID.cc
index 83ab8fb..153d13a 100644
--- a/src/PUID.cc
+++ b/src/PUID.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Query.cc b/src/Query.cc
index d132ae7..6b4c359 100644
--- a/src/Query.cc
+++ b/src/Query.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Rating.cc b/src/Rating.cc
index 068671f..2e6e754 100644
--- a/src/Rating.cc
+++ b/src/Rating.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Recording.cc b/src/Recording.cc
index 4bbe44e..76536f3 100644
--- a/src/Recording.cc
+++ b/src/Recording.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Relation.cc b/src/Relation.cc
index f27b9e0..df044c7 100644
--- a/src/Relation.cc
+++ b/src/Relation.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/RelationList.cc b/src/RelationList.cc
index ef55b84..d2addb1 100644
--- a/src/RelationList.cc
+++ b/src/RelationList.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/RelationListList.cc b/src/RelationListList.cc
index e1545f2..6ee2d8d 100644
--- a/src/RelationListList.cc
+++ b/src/RelationListList.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Release.cc b/src/Release.cc
index 1636c58..59a58b5 100644
--- a/src/Release.cc
+++ b/src/Release.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ReleaseGroup.cc b/src/ReleaseGroup.cc
index fcbfaf2..a8c4edd 100644
--- a/src/ReleaseGroup.cc
+++ b/src/ReleaseGroup.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/SecondaryType.cc b/src/SecondaryType.cc
index 1359f99..46db98d 100644
--- a/src/SecondaryType.cc
+++ b/src/SecondaryType.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/SecondaryTypeList.cc b/src/SecondaryTypeList.cc
index ba6a207..603cb04 100644
--- a/src/SecondaryTypeList.cc
+++ b/src/SecondaryTypeList.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Tag.cc b/src/Tag.cc
index a60a490..e9f2d6b 100644
--- a/src/Tag.cc
+++ b/src/Tag.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/TextRepresentation.cc b/src/TextRepresentation.cc
index de19c82..0d08414 100644
--- a/src/TextRepresentation.cc
+++ b/src/TextRepresentation.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Track.cc b/src/Track.cc
index c76531f..a1b0730 100644
--- a/src/Track.cc
+++ b/src/Track.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/UserRating.cc b/src/UserRating.cc
index 74987a4..8890786 100644
--- a/src/UserRating.cc
+++ b/src/UserRating.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/UserTag.cc b/src/UserTag.cc
index 406ecf7..157a31f 100644
--- a/src/UserTag.cc
+++ b/src/UserTag.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Work.cc b/src/Work.cc
index 5d99489..3dd8683 100644
--- a/src/Work.cc
+++ b/src/Work.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/c-int-medium-defines.inc b/src/c-int-medium-defines.inc
index f9e1b71..b3c438a 100644
--- a/src/c-int-medium-defines.inc
+++ b/src/c-int-medium-defines.inc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/c-int-medium-source.inc b/src/c-int-medium-source.inc
index 6438d35..ceed53b 100644
--- a/src/c-int-medium-source.inc
+++ b/src/c-int-medium-source.inc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/c-int-query-defines.inc b/src/c-int-query-defines.inc
index 88830ec..e9e3b84 100644
--- a/src/c-int-query-defines.inc
+++ b/src/c-int-query-defines.inc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/c-int-query-source.inc b/src/c-int-query-source.inc
index b1e6aa7..166a900 100644
--- a/src/c-int-query-source.inc
+++ b/src/c-int-query-source.inc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/c-int-release-defines.inc b/src/c-int-release-defines.inc
index a4c5e22..d540dfc 100644
--- a/src/c-int-release-defines.inc
+++ b/src/c-int-release-defines.inc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/c-int-release-source.inc b/src/c-int-release-source.inc
index 2e97b57..636fcad 100644
--- a/src/c-int-release-source.inc
+++ b/src/c-int-release-source.inc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/c-int-source-funcs.inc b/src/c-int-source-funcs.inc
index 8c2e54d..fdf2d56 100644
--- a/src/c-int-source-funcs.inc
+++ b/src/c-int-source-funcs.inc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/cinterface.xml b/src/cinterface.xml
index 33f356f..dd987d8 100644
--- a/src/cinterface.xml
+++ b/src/cinterface.xml
@@ -8,8 +8,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/make-c-interface.cc b/src/make-c-interface.cc
index 70dd6d7..8a8b882 100644
--- a/src/make-c-interface.cc
+++ b/src/make-c-interface.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -136,8 +137,9 @@ void ProcessHeader(const XMLNode& /*Node*/, std::ofstream& Source, std::ofstream
 	os << "   This file is part of libmusicbrainz5." << std::endl;
 	os << std::endl;
 	os << "   This library is free software; you can redistribute it and/or" << std::endl;
-	os << "   modify it under the terms of v2 of the GNU Lesser General Public" << std::endl;
-	os << "   License as published by the Free Software Foundation." << std::endl;
+	os << "   modify it under the terms of the GNU Lesser General Public" << std::endl;
+	os << "   License as published by the Free Software Foundation; either" << std::endl;
+	os << "   version 2.1 of the License, or (at your option) any later version." << std::endl;
 	os << std::endl;
 	os << "   libmusicbrainz5 is distributed in the hope that it will be useful," << std::endl;
 	os << "   but WITHOUT ANY WARRANTY; without even the implied warranty of" << std::endl;
diff --git a/tests/ctest.c b/tests/ctest.c
index 533cc41..4c4b506 100644
--- a/tests/ctest.c
+++ b/tests/ctest.c
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/mbtest.cc b/tests/mbtest.cc
index 2467a2d..99b9258 100644
--- a/tests/mbtest.cc
+++ b/tests/mbtest.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz5.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz5 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- 
1.7.11.5

Places

File 0001-Correct-inconsistent-licensing-text.patch of Package libmusicbrainz5 (Revision 844e94dad88d137856b08de99b8bd36f)

Places