[mupen64plus-video-glide64] 01/01: Sort debian control files with `wrap-and-sort -abst`
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Sun Jan 31 14:55:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-glide64.
commit 90f691bd73302376b2bedc7290f9e6b2200fc904
Author: Sven Eckelmann <sven at narfation.org>
Date: Sun Jan 31 15:38:00 2016 +0100
Sort debian control files with `wrap-and-sort -abst`
---
debian/changelog | 1 +
debian/control | 6 ++--
debian/copyright | 84 ++++++++++++++++++++++++++++----------------------------
3 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9965771..67bd76f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mupen64plus-video-glide64 (2.0.0+33+g764d9fe-4) UNRELEASED; urgency=medium
* debian/control
- Change Vcs-Git to https://
+ * Sort debian control files with `wrap-and-sort -abst`
-- Sven Eckelmann <sven at narfation.org> Mon, 25 Jan 2016 22:01:17 +0100
diff --git a/debian/control b/debian/control
index e9f0130..96d1e67 100644
--- a/debian/control
+++ b/debian/control
@@ -18,16 +18,16 @@ Build-Depends:
pkg-config,
Package: mupen64plus-video-glide64
-Architecture: any-i386 any-amd64
+Architecture: any-amd64 any-i386
Multi-Arch: same
Pre-Depends:
${misc:Pre-Depends},
Depends:
- ${misc:Depends},
- ${shlibs:Depends},
mupen64plus-config-abi-2.2,
mupen64plus-gfx-abi-2.2,
mupen64plus-vidext-abi-3,
+ ${misc:Depends},
+ ${shlibs:Depends},
Provides:
mupen64plus-video,
Breaks:
diff --git a/debian/copyright b/debian/copyright
index ed5f761..c94b8b1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -82,17 +82,17 @@ License: other
.
1. PREAMBLE
.
- This license is for software that provides a 3D graphics application
+ This license is for software that provides a 3D graphics application
program interface (API).The license is intended to offer terms similar
- to some standard General Public Licenses designed to foster open
+ to some standard General Public Licenses designed to foster open
standards and unrestricted accessibility to source code. Some of these
licenses require that, as a condition of the license of the software,
any derivative works (that is, new software which is a work containing
the original program or a portion of it) must be available for general
use, without restriction other than for a minor transfer fee, and that
- the source code for such derivative works must likewise be made
+ the source code for such derivative works must likewise be made
available. The only restriction is that such derivative works must be
- subject to the same General Public License terms as the original work.
+ subject to the same General Public License terms as the original work.
.
This 3dfx GLIDE Source Code General Public License differs from the
standard licenses of this type in that it does not require the entire
@@ -100,24 +100,24 @@ License: other
nor is the recipient required to make available the source code for
the entire derivative work. Rather, the license is limited to only the
identifiable portion of the derivative work that is derived from the
- licensed software. The precise terms and conditions for copying,
+ licensed software. The precise terms and conditions for copying,
distribution and modification follow.
.
2. DEFINITIONS
.
- 2.1 This License applies to any program (or other "work") which
- contains a notice placed by the copyright holder saying it may be
- distributed under the terms of this 3dfx GLIDE Source Code General
- Public License.
+ 2.1 This License applies to any program (or other "work") which
+ contains a notice placed by the copyright holder saying it may be
+ distributed under the terms of this 3dfx GLIDE Source Code General
+ Public License.
.
- 2.2 The term "Program" as used in this Agreement refers to 3DFX's
+ 2.2 The term "Program" as used in this Agreement refers to 3DFX's
GLIDE source code and object code and any Derivative Work.
.
- 2.3 "Derivative Work" means, for the purpose of the License, that
- portion of any work that contains the Program or the identifiable
+ 2.3 "Derivative Work" means, for the purpose of the License, that
+ portion of any work that contains the Program or the identifiable
portion of a work that is derived from the Program, either verbatim or
- with modifications and/or translated into another language, and that
- performs 3D graphics API operations. It does not include any other
+ with modifications and/or translated into another language, and that
+ performs 3D graphics API operations. It does not include any other
portions of a work.
.
2.4 "Modifications of the Program" means any work, which includes a
@@ -135,7 +135,7 @@ License: other
.
3. LICENSED ACTIVITIES
.
- 3.1 COPYING - You may copy and distribute verbatim copies of the
+ 3.1 COPYING - You may copy and distribute verbatim copies of the
Program's Source Code as you receive it, in any medium, subject to the
provision of section 3.3 and provided also that:
.
@@ -149,7 +149,7 @@ License: other
to the absence of any warranty; and
.
(c) do not make any use of the GLIDE trademark without the prior
- written permission of 3dfx, and
+ written permission of 3dfx, and
.
(d) give all recipients of the Program a copy of this License
along with the Program or instructions on how to easily receive a copy
@@ -158,7 +158,7 @@ License: other
3.2 MODIFICATION OF THE PROGRAM/DERIVATIVE WORKS - You may modify your
copy or copies of the Program or any portion of it, and copy and
distribute such modifications subject to the provisions of section 3.3
- and provided that you also meet all of the following conditions:
+ and provided that you also meet all of the following conditions:
.
(a) you conspicuously and appropriately publish on each copy
of a Derivative Work an appropriate copyright notice, a notice that
@@ -175,44 +175,44 @@ License: other
.
(d) You must cause the modified files of the Derivative Work
to carry prominent notices stating that you changed the files and the
- date of any change.
+ date of any change.
.
(e) You must cause any Derivative Work that you distribute or
publish to be licensed at no charge to all third parties under the
- terms of this License.
+ terms of this License.
.
- (f) You do not make any use of the GLIDE trademark without the
+ (f) You do not make any use of the GLIDE trademark without the
prior written permission of 3dfx.
.
- (g) If the Derivative Work normally reads commands
+ (g) If the Derivative Work normally reads commands
interactively when run, you must cause it, when started running for
such interactive use, to print or display an announcement as follows:
.
- "COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED THIS
- SOFTWARE IS FREE AND PROVIDED "AS IS," WITHOUT WARRANTY OF ANY KIND,
- EITHER EXPRESSED OR IMPLIED. THERE IS NO RIGHT TO USE THE GLIDE
- TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX INTERACTIVE,
+ "COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED THIS
+ SOFTWARE IS FREE AND PROVIDED "AS IS," WITHOUT WARRANTY OF ANY KIND,
+ EITHER EXPRESSED OR IMPLIED. THERE IS NO RIGHT TO USE THE GLIDE
+ TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX INTERACTIVE,
INC. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A FULL TEXT OF THE
- DISTRIBUTION AND NON-WARRANTY PROVISIONS (REQUEST COPY FROM
+ DISTRIBUTION AND NON-WARRANTY PROVISIONS (REQUEST COPY FROM
INFO at 3DFX.COM)."
.
(h) The requirements of this section 3.2 do not apply to the
modified work as a whole but only to the Derivative Work. It is not
the intent of this License to claim rights or contest your rights to
work written entirely by you; rather, the intent is to exercise the
- right to control the distribution of Derivative Works.
+ right to control the distribution of Derivative Works.
.
- 3.3 DISTRIBUTION
+ 3.3 DISTRIBUTION
.
(a) All copies of the Program or Derivative Works which are
distributed must include in the file headers the following language
verbatim:
.
- "THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED
- ONLY PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO
- RIGHT TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF
- 3DFX INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM
- THE DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC (info at 3dfx.com).
+ "THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED
+ ONLY PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO
+ RIGHT TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF
+ 3DFX INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM
+ THE DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC (info at 3dfx.com).
THIS PROGRAM. IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
FULL TEXT OF THE NON-WARRANTY PROVISIONS.
@@ -228,17 +228,17 @@ License: other
.
(b) You may distribute the Program or a Derivative Work in
object code or executable form under the terms of Sections 3.1 and 3.2
- provided that you also do one of the following:
+ provided that you also do one of the following:
.
(1) Accompany it with the complete corresponding
- machine-readable source code, which must be distributed under the
+ machine-readable source code, which must be distributed under the
terms of Sections 3.1 and 3.2; or,
.
(2) Accompany it with a written offer, valid for at
least three years, to give any third party, for a charge no more than
your cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 3.1 and 3.2 on a medium
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 3.1 and 3.2 on a medium
customarily used for software interchange; or,
.
(3) Accompany it with the information you received as
@@ -257,17 +257,17 @@ License: other
by offering access to copy from a designated place, then offering
equivalent access to copy the source code from the same place counts
as distribution of the source code, even though third parties are not
- compelled to copy the source along with the object code.
+ compelled to copy the source along with the object code.
.
(e) Each time you redistribute the Program or any Derivative
Work, the recipient automatically receives a license from 3dfx and
successor licensors to copy, distribute or modify the Program and
Derivative Works subject to the terms and conditions of the License.
- You may not impose any further restrictions on the recipients'
+ You may not impose any further restrictions on the recipients'
exercise of the rights granted herein. You are not responsible for
enforcing compliance by third parties to this License.
.
- (f) You may not make any use of the GLIDE trademark without
+ (f) You may not make any use of the GLIDE trademark without
the prior written permission of 3dfx.
.
(g) You may not copy, modify, sublicense, or distribute the
@@ -282,7 +282,7 @@ License: other
4. MISCELLANEOUS
.
4.1 Acceptance of this License is voluntary. By using, modifying or
- distributing the Program or any Derivative Work, you indicate your
+ distributing the Program or any Derivative Work, you indicate your
acceptance of this License to do so, and all its terms and conditions
for copying, distributing or modifying the Program or works based on
it. Nothing else grants you permission to modify or distribute the
@@ -297,7 +297,7 @@ License: other
or among countries not thus excluded. In such case, this License
incorporates the limitation as if written in the body of this License.
.
- 4.3 This License is to be construed according to the laws of the
+ 4.3 This License is to be construed according to the laws of the
State of California and you consent to personal jurisdiction in the
State of California in the event it is necessary to enforce the
provisions of this License.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64.git
More information about the Pkg-games-commits
mailing list