From: Cristian Morales Vega Date: Sun, 14 Apr 2013 15:45:27 +0000 (+0100) Subject: Update licensing information X-Git-Tag: release-1.4.1~5^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40a5b6e13030b43fe1fdd0b3315387bb445cc07d;p=libmatroska Update licensing information - Substitute LICENSE.LGPL for the latest copy from http://www.gnu.org/ - Update the FSF address and links in all the file headers - Relicense QPL/GPL files to LGPL --- diff --git a/LICENSE.LGPL b/LICENSE.LGPL index b1e3f5a..4362b49 100644 --- a/LICENSE.LGPL +++ b/LICENSE.LGPL @@ -1,8 +1,8 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -112,7 +112,7 @@ modification follow. Pay close attention to the difference between a former contains code derived from the library, whereas the latter must be combined with the library in order to run. - GNU LESSER GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library or other @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an @@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. @@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Libraries @@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. @@ -500,5 +500,3 @@ necessary. Here is a sample; alter the names: Ty Coon, President of Vice That's all there is to it! - - diff --git a/matroska/FileKax.h b/matroska/FileKax.h index af138e4..3cabd72 100644 --- a/matroska/FileKax.h +++ b/matroska/FileKax.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxAttached.h b/matroska/KaxAttached.h index 2e07752..0cf1a94 100644 --- a/matroska/KaxAttached.h +++ b/matroska/KaxAttached.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxAttachments.h b/matroska/KaxAttachments.h index feff215..91a543a 100644 --- a/matroska/KaxAttachments.h +++ b/matroska/KaxAttachments.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxBlock.h b/matroska/KaxBlock.h index 1d160b2..aedec5a 100644 --- a/matroska/KaxBlock.h +++ b/matroska/KaxBlock.h @@ -17,9 +17,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxBlockData.h b/matroska/KaxBlockData.h index c8a0c25..b65137f 100644 --- a/matroska/KaxBlockData.h +++ b/matroska/KaxBlockData.h @@ -17,9 +17,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxChapters.h b/matroska/KaxChapters.h index 1656057..9cbd278 100644 --- a/matroska/KaxChapters.h +++ b/matroska/KaxChapters.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxCluster.h b/matroska/KaxCluster.h index 5b194ce..17f7e68 100644 --- a/matroska/KaxCluster.h +++ b/matroska/KaxCluster.h @@ -17,9 +17,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxClusterData.h b/matroska/KaxClusterData.h index 1c314af..1dc18b9 100644 --- a/matroska/KaxClusterData.h +++ b/matroska/KaxClusterData.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxConfig.h b/matroska/KaxConfig.h index 7740b66..cad0fee 100644 --- a/matroska/KaxConfig.h +++ b/matroska/KaxConfig.h @@ -17,9 +17,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxContentEncoding.h b/matroska/KaxContentEncoding.h index 933d951..6228005 100644 --- a/matroska/KaxContentEncoding.h +++ b/matroska/KaxContentEncoding.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxContexts.h b/matroska/KaxContexts.h index ac393f6..fc1457f 100644 --- a/matroska/KaxContexts.h +++ b/matroska/KaxContexts.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxCues.h b/matroska/KaxCues.h index acce111..4f852ac 100644 --- a/matroska/KaxCues.h +++ b/matroska/KaxCues.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxCuesData.h b/matroska/KaxCuesData.h index b5471c6..a15306b 100644 --- a/matroska/KaxCuesData.h +++ b/matroska/KaxCuesData.h @@ -17,9 +17,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxDefines.h b/matroska/KaxDefines.h index bd56372..fbe69cb 100644 --- a/matroska/KaxDefines.h +++ b/matroska/KaxDefines.h @@ -17,9 +17,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxInfo.h b/matroska/KaxInfo.h index a42f7a1..896c721 100644 --- a/matroska/KaxInfo.h +++ b/matroska/KaxInfo.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxInfoData.h b/matroska/KaxInfoData.h index 51a8b63..3831858 100644 --- a/matroska/KaxInfoData.h +++ b/matroska/KaxInfoData.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxSeekHead.h b/matroska/KaxSeekHead.h index 14fd13e..392c081 100644 --- a/matroska/KaxSeekHead.h +++ b/matroska/KaxSeekHead.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxSegment.h b/matroska/KaxSegment.h index 84423b9..2ab6e98 100644 --- a/matroska/KaxSegment.h +++ b/matroska/KaxSegment.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h index 5914de7..36ecdf3 100644 --- a/matroska/KaxSemantic.h +++ b/matroska/KaxSemantic.h @@ -20,9 +20,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxTag.h b/matroska/KaxTag.h index e44d3d7..8940f6f 100644 --- a/matroska/KaxTag.h +++ b/matroska/KaxTag.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxTags.h b/matroska/KaxTags.h index 6981ed3..af9ff6f 100644 --- a/matroska/KaxTags.h +++ b/matroska/KaxTags.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxTrackAudio.h b/matroska/KaxTrackAudio.h index 33bf4e6..fa3cc98 100644 --- a/matroska/KaxTrackAudio.h +++ b/matroska/KaxTrackAudio.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxTrackEntryData.h b/matroska/KaxTrackEntryData.h index 339a9e4..438f5a6 100644 --- a/matroska/KaxTrackEntryData.h +++ b/matroska/KaxTrackEntryData.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxTrackVideo.h b/matroska/KaxTrackVideo.h index 00d0e5e..4f8407e 100644 --- a/matroska/KaxTrackVideo.h +++ b/matroska/KaxTrackVideo.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxTracks.h b/matroska/KaxTracks.h index 7903daa..0b1a0c1 100644 --- a/matroska/KaxTracks.h +++ b/matroska/KaxTracks.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxTypes.h b/matroska/KaxTypes.h index 0a90361..11f34ec 100644 --- a/matroska/KaxTypes.h +++ b/matroska/KaxTypes.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/KaxVersion.h b/matroska/KaxVersion.h index df1d1c7..365516f 100644 --- a/matroska/KaxVersion.h +++ b/matroska/KaxVersion.h @@ -17,9 +17,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/matroska/c/libmatroska.h b/matroska/c/libmatroska.h index 36f7a1d..ec00fc1 100644 --- a/matroska/c/libmatroska.h +++ b/matroska/c/libmatroska.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information. +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information. ** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. diff --git a/matroska/c/libmatroska_t.h b/matroska/c/libmatroska_t.h index 9c4fc2c..689b7df 100644 --- a/matroska/c/libmatroska_t.h +++ b/matroska/c/libmatroska_t.h @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/FileKax.cpp b/src/FileKax.cpp index 0d8903f..5a5bb90 100644 --- a/src/FileKax.cpp +++ b/src/FileKax.cpp @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/KaxAttached.cpp b/src/KaxAttached.cpp index 0955fdb..b3fcdc0 100644 --- a/src/KaxAttached.cpp +++ b/src/KaxAttached.cpp @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/KaxAttachments.cpp b/src/KaxAttachments.cpp index 9bfc7ee..8739850 100644 --- a/src/KaxAttachments.cpp +++ b/src/KaxAttachments.cpp @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/KaxBlock.cpp b/src/KaxBlock.cpp index b5501e5..e111038 100644 --- a/src/KaxBlock.cpp +++ b/src/KaxBlock.cpp @@ -17,9 +17,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/KaxBlockData.cpp b/src/KaxBlockData.cpp index d41c4f2..c9b6e3c 100644 --- a/src/KaxBlockData.cpp +++ b/src/KaxBlockData.cpp @@ -17,9 +17,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/KaxCluster.cpp b/src/KaxCluster.cpp index 438729a..deacace 100644 --- a/src/KaxCluster.cpp +++ b/src/KaxCluster.cpp @@ -17,9 +17,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/KaxContexts.cpp b/src/KaxContexts.cpp index 52f777c..12a1278 100644 --- a/src/KaxContexts.cpp +++ b/src/KaxContexts.cpp @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/KaxCues.cpp b/src/KaxCues.cpp index 5e877a4..184654c 100644 --- a/src/KaxCues.cpp +++ b/src/KaxCues.cpp @@ -17,9 +17,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/KaxCuesData.cpp b/src/KaxCuesData.cpp index a967a9c..3596ad4 100644 --- a/src/KaxCuesData.cpp +++ b/src/KaxCuesData.cpp @@ -17,9 +17,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/KaxInfoData.cpp b/src/KaxInfoData.cpp index 2d90f7f..f871b1f 100644 --- a/src/KaxInfoData.cpp +++ b/src/KaxInfoData.cpp @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/KaxSeekHead.cpp b/src/KaxSeekHead.cpp index 25b9083..4bddc95 100644 --- a/src/KaxSeekHead.cpp +++ b/src/KaxSeekHead.cpp @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/KaxSegment.cpp b/src/KaxSegment.cpp index e0ad5be..4c5ee4a 100644 --- a/src/KaxSegment.cpp +++ b/src/KaxSegment.cpp @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp index ab8d111..c320296 100644 --- a/src/KaxSemantic.cpp +++ b/src/KaxSemantic.cpp @@ -20,9 +20,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/KaxTracks.cpp b/src/KaxTracks.cpp index 20ed386..e4b216e 100644 --- a/src/KaxTracks.cpp +++ b/src/KaxTracks.cpp @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/src/KaxVersion.cpp b/src/KaxVersion.cpp index dd646bd..e6be48f 100644 --- a/src/KaxVersion.cpp +++ b/src/KaxVersion.cpp @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/test/Makefile b/test/Makefile index 5d70369..a99616f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,6 +1,6 @@ ## libmatroska Makefile ## (c) 2002 Steve Lhomme -## This software is licensed under the LGPL, see LGPL.txt +## This software is licensed under the LGPL, see LICENSE.LGPL all: endian echo "Making endianess tests" diff --git a/test/ebml/test0.cpp b/test/ebml/test0.cpp index 63aab33..dab8b44 100644 --- a/test/ebml/test0.cpp +++ b/test/ebml/test0.cpp @@ -7,24 +7,21 @@ ** ** This file is part of libmatroska. ** -** This file may be distributed under the terms of the Q Public License -** as defined by Trolltech AS of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** Licensees holding an other license may use this file in accordance with -** the Agreement provided with the Software. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.matroska.org/license/qpl/ for QPL licensing information. -** See http://www.matroska.org/license/gpl/ for GPL licensing information. +** This library is free software; you can redistribute it and/or +** 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. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/test/ebml/test00.cpp b/test/ebml/test00.cpp index b593458..41a1c67 100644 --- a/test/ebml/test00.cpp +++ b/test/ebml/test00.cpp @@ -7,24 +7,21 @@ ** ** This file is part of libmatroska. ** -** This file may be distributed under the terms of the Q Public License -** as defined by Trolltech AS of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** Licensees holding an other license may use this file in accordance with -** the Agreement provided with the Software. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.matroska.org/license/qpl/ for QPL licensing information. -** See http://www.matroska.org/license/gpl/ for GPL licensing information. +** This library is free software; you can redistribute it and/or +** 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. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/test/mux/test6.cpp b/test/mux/test6.cpp index 14a41ce..6c4e37e 100644 --- a/test/mux/test6.cpp +++ b/test/mux/test6.cpp @@ -19,9 +19,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/test/mux/test8.cpp b/test/mux/test8.cpp index 797546d..c38f39d 100644 --- a/test/mux/test8.cpp +++ b/test/mux/test8.cpp @@ -17,9 +17,9 @@ ** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/test/tags/test9.cpp b/test/tags/test9.cpp index 16bd962..1c67aa9 100644 --- a/test/tags/test9.cpp +++ b/test/tags/test9.cpp @@ -7,24 +7,21 @@ ** ** This file is part of libmatroska. ** -** This file may be distributed under the terms of the Q Public License -** as defined by Trolltech AS of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** Licensees holding an other license may use this file in accordance with -** the Agreement provided with the Software. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.matroska.org/license/qpl/ for QPL licensing information. -** See http://www.matroska.org/license/gpl/ for GPL licensing information. +** This library is free software; you can redistribute it and/or +** 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. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. ** diff --git a/test/utf8/test5.cpp b/test/utf8/test5.cpp index 91d6371..127282e 100644 --- a/test/utf8/test5.cpp +++ b/test/utf8/test5.cpp @@ -7,24 +7,21 @@ ** ** This file is part of libmatroska. ** -** This file may be distributed under the terms of the Q Public License -** as defined by Trolltech AS of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** Licensees holding an other license may use this file in accordance with -** the Agreement provided with the Software. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.matroska.org/license/qpl/ for QPL licensing information. -** See http://www.matroska.org/license/gpl/ for GPL licensing information. +** This library is free software; you can redistribute it and/or +** 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. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ** +** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** ** Contact license@matroska.org if any conditions of this licensing are ** not clear to you. **