Skip to content

Copyright & Licensing #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/COPYING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Version 2, June 1991

Copyright (C) 1989, 1991 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.

Expand Down Expand Up @@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.

You should have received a copy of the GNU General Public License
along with this program; 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.
Expand Down
2 changes: 1 addition & 1 deletion samples/DIME/DimeDataSetService/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
2 changes: 1 addition & 1 deletion samples/DIME/DimeDataSetServiceConsumer/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
2 changes: 1 addition & 1 deletion samples/HttpCompressionModule/src/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// Set the CompanyName, LegalCopyright, and LegalTrademark fields
// You shouldn't have to mess with these
[assembly: AssemblyCompany("blowery.org")]
[assembly: AssemblyCopyright("Copyright (c) 2002 Ben Lowery")]
[assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")]

#endregion

Expand Down
2 changes: 1 addition & 1 deletion samples/cs/CreateZipFile/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("A SharpDevelop sample")]
[assembly: AssemblyCopyright("Mike Krueger 2000")]
[assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
2 changes: 1 addition & 1 deletion samples/cs/CreateZipFile/Main.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SharpZipLibrary samples
// Copyright (c) 2007, AlphaSierraPapa
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
Expand Down
2 changes: 1 addition & 1 deletion samples/cs/FastZip/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("Copyright 2005 John Reilly")]
[assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
2 changes: 1 addition & 1 deletion samples/cs/FastZip/Main.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SharpZipLibrary samples
// Copyright (c) 2007, AlphaSierraPapa
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
Expand Down
2 changes: 1 addition & 1 deletion samples/cs/minibzip2/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SharpDevelop")]
[assembly: AssemblyCopyright("Mike Krueger 2000")]
[assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
2 changes: 1 addition & 1 deletion samples/cs/minibzip2/Main.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SharpZipLibrary samples
// Copyright (c) 2007, AlphaSierraPapa
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
Expand Down
2 changes: 1 addition & 1 deletion samples/cs/minigzip/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SharpDevelop")]
[assembly: AssemblyCopyright("Mike Krueger 2000")]
[assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
2 changes: 1 addition & 1 deletion samples/cs/minigzip/Main.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SharpZipLibrary samples
// Copyright (c) 2007, AlphaSierraPapa
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
Expand Down
4 changes: 2 additions & 2 deletions samples/cs/sz/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("#ZipLibrary")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("Copyright 2004 John Reilly")]
[assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// The assembly version has following format :
Expand Down
5 changes: 3 additions & 2 deletions samples/cs/sz/sz.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// $Id$
// $URL$
//
// Copyright (c) 2007, AlphaSierraPapa
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
Expand Down Expand Up @@ -520,7 +520,8 @@ void ShowEnvironment()
/// </summary>
void ShowVersion() {
seenHelp = true;
Console.WriteLine("SharpZip Archiver v0.37 Copyright 2004 John Reilly");
Console.WriteLine("SharpZip Archiver v0.37");
Console.WriteLine("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team");
#if !NETCF
Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();

Expand Down
2 changes: 1 addition & 1 deletion samples/cs/tar/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("#ZipLibrary")]
[assembly: AssemblyCopyright("Copyright 2003 ICSharpCode.NET")]
[assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
5 changes: 2 additions & 3 deletions samples/cs/tar/Main.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SharpZipLibrary samples
// Copyright (c) 2007, AlphaSierraPapa
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
Expand Down Expand Up @@ -590,8 +590,7 @@ static void Version()
Console.Error.WriteLine( "tar 2.0.6.2" );
Console.Error.WriteLine( "" );
Console.Error.WriteLine( "{0}", SharpZipVersion() );
Console.Error.WriteLine( "Copyright (c) 2002 by Mike Krueger" );
Console.Error.WriteLine( "Copyright (c) 1998,1999 by Tim Endres (Java version)" );
Console.Error.WriteLine( "Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team" );
Console.Error.WriteLine( "" );
Console.Error.WriteLine( "This program is free software licensed to you under the" );
Console.Error.WriteLine( "GNU General Public License. See the accompanying LICENSE" );
Expand Down
2 changes: 1 addition & 1 deletion samples/cs/unzipfile/UnZipFile.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SharpZipLibrary samples
// Copyright (c) 2007, AlphaSierraPapa
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
Expand Down
2 changes: 1 addition & 1 deletion samples/cs/zf/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("Copyright 2006 John Reilly")]
[assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
5 changes: 3 additions & 2 deletions samples/cs/zf/zf.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// zf - A command line archiver using the ZipFile class from SharpZipLib
// for compression
//
// Copyright 2006, 2010 John Reilly
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
//
//------------------------------------------------------------------------------
// Version History
Expand Down Expand Up @@ -403,7 +403,8 @@ void ShowEnvironment()
void ShowVersion()
{
seenHelp_ = true;
Console.Out.WriteLine("ZipFile Archiver v0.3 Copyright 2006 John Reilly");
Console.Out.WriteLine("ZipFile Archiver v0.3");
Console.Out.WriteLine("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team");

Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();

Expand Down
2 changes: 1 addition & 1 deletion samples/cs/zipfiletest/ZipFileTest.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SharpZipLibrary samples
// Copyright (c) 2007, AlphaSierraPapa
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
Expand Down
2 changes: 1 addition & 1 deletion samples/vb/CreateZipFile/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Imports System.Runtime.CompilerServices
<assembly: AssemblyConfiguration("")>
<assembly: AssemblyCompany("ICSharpCode.NET")>
<assembly: AssemblyProduct("")>
<assembly: AssemblyCopyright("")>
<Assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")>
<assembly: AssemblyTrademark("")>
<assembly: AssemblyCulture("")>

Expand Down
2 changes: 1 addition & 1 deletion samples/vb/CreateZipFile/MainForm.vb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
' SharpZipLibrary samples
' Copyright (c) 2007, AlphaSierraPapa
' Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
' All rights reserved.
'
' Redistribution and use in source and binary forms, with or without modification, are
Expand Down
2 changes: 1 addition & 1 deletion samples/vb/minibzip2/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("SharpZipLib MiniBZip2 Sample")>
<Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("")>
<Assembly: AssemblyCopyright("")>
<Assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")>
<Assembly: AssemblyTrademark("")>

'The following GUID is for the ID of the typelib if this project is exposed to COM
Expand Down
2 changes: 1 addition & 1 deletion samples/vb/minibzip2/Main.vb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
' SharpZipLibrary samples
' Copyright (c) 2007, AlphaSierraPapa
' Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
' All rights reserved.
'
' Redistribution and use in source and binary forms, with or without modification, are
Expand Down
2 changes: 1 addition & 1 deletion samples/vb/viewzipfile/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("")>
<Assembly: AssemblyCopyright("")>
<Assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")>
<Assembly: AssemblyTrademark("")>

'The following GUID is for the ID of the typelib if this project is exposed to COM
Expand Down
2 changes: 1 addition & 1 deletion samples/vb/viewzipfile/Main.vb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
' SharpZipLibrary samples
' Copyright (c) 2007, AlphaSierraPapa
' Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
' All rights reserved.
'
' Redistribution and use in source and binary forms, with or without modification, are
Expand Down
2 changes: 1 addition & 1 deletion samples/vb/zipfiletest/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("")>
<Assembly: AssemblyCopyright("")>
<Assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")>
<Assembly: AssemblyTrademark("")>

' Version information for an assembly consists of the following four values:
Expand Down
15 changes: 7 additions & 8 deletions src/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// AssemblyInfo.cs
//
// Copyright (C) 2001 Mike Krueger
// Copyright 2004 John Reilly
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
Expand All @@ -15,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; 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.
//
// Linking this library statically or dynamically with other modules is
// making a combined work based on this library. Thus, the terms and
Expand Down Expand Up @@ -60,11 +59,11 @@
#elif (MONO_2_0)
[assembly: AssemblyTitle("SharpZipLib for Mono 2.0")]
#else
[assembly: AssemblyTitle("SharpZipLibrary unlabelled version")]
[assembly: AssemblyTitle("SharpZipLib unlabelled version")]
#endif

[assembly: AssemblyDescription("A free C# compression library")]
[assembly: AssemblyProduct("#ZipLibrary")]
[assembly: AssemblyProduct("#ZipLib")]
[assembly: AssemblyDefaultAlias("SharpZipLib")]
[assembly: AssemblyCulture("")]

Expand All @@ -75,9 +74,9 @@
#endif


[assembly: AssemblyCompany("ICSharpCode.net")]
[assembly: AssemblyCopyright("Copyright 2001-2010 Mike Krueger, John Reilly")]
[assembly: AssemblyTrademark("Copyright 2001-2010 Mike Krueger, John Reilly")]
[assembly: AssemblyCompany("AlphaSierraPapa")]
[assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")]
[assembly: AssemblyTrademark("")]

[assembly: AssemblyVersion("0.86.0.518")]
[assembly: AssemblyInformationalVersionAttribute("0.86.0")]
Expand Down
4 changes: 2 additions & 2 deletions src/BZip2/BZip2.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// BZip2.cs
//
// Copyright (C) 2010 David Pierson
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
Expand All @@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; 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.
//
// Linking this library statically or dynamically with other modules is
// making a combined work based on this library. Thus, the terms and
Expand Down
4 changes: 2 additions & 2 deletions src/BZip2/BZip2Constants.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// BZip2Constants.cs
// Copyright (C) 2001 Mike Krueger
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
Expand All @@ -13,7 +13,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; 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.
//
// Linking this library statically or dynamically with other modules is
// making a combined work based on this library. Thus, the terms and
Expand Down
4 changes: 2 additions & 2 deletions src/BZip2/BZip2Exception.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// BZip2.cs
//
// Copyright 2004 John Reilly
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
Expand All @@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; 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.
//
// Linking this library statically or dynamically with other modules is
// making a combined work based on this library. Thus, the terms and
Expand Down
4 changes: 2 additions & 2 deletions src/BZip2/BZip2InputStream.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// BZip2InputStream.cs
//
// Copyright (C) 2001 Mike Krueger
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
Expand All @@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; 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.
//
// Linking this library statically or dynamically with other modules is
// making a combined work based on this library. Thus, the terms and
Expand Down
4 changes: 2 additions & 2 deletions src/BZip2/BZip2OutputStream.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// BZip2OutputStream.cs
//
// Copyright (C) 2001 Mike Krueger
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
Expand All @@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; 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.
//
// Linking this library statically or dynamically with other modules is
// making a combined work based on this library. Thus, the terms and
Expand Down
Loading