[pkg-wine-party] [SCM] Debian Wine Gecko packaging branch, master, updated. debian/1.4+dfsg-1-10-g360b3f9
Stephen Kitt
steve at sk2.org
Tue Jun 12 12:41:16 UTC 2012
The following commit has been merged in the master branch:
commit 360b3f95d1a385ecff3daa1d348d8fffaa2e8f36
Author: Stephen Kitt <steve at sk2.org>
Date: Tue Jun 12 14:26:37 2012 +0200
wrap-and-sort debian/control and debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index 74289d1..1e1c643 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ wine-gecko-1.4 (1.4+dfsg-2) UNRELEASED; urgency=low
* Disable the 64-bit debug build until we can use 64-bit buildds to
build the package (either via multiarch or 64-bit wine-bin).
* Avoid ignoring errors in the debian/rules build-clean target.
+ * wrap-and-sort debian/control and debian/copyright.
-- Stephen Kitt <steve at sk2.org> Mon, 04 Jun 2012 23:40:29 +0200
diff --git a/debian/control b/debian/control
index ab1635a..bedabd2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,17 @@ Priority: optional
Maintainer: Debian Wine Party <pkg-wine-party at lists.alioth.debian.org>
Uploaders: Ove Kaaven <ovek at arcticnet.no>, Stephen Kitt <steve at sk2.org>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), autoconf2.13
-Build-Depends-Indep: libidl-dev, libx11-dev, g++-mingw-w64-i686, g++-mingw-w64-x86-64,
- python, zip, unzip, lcab, wine-bin (>= 1.4-0.2) | wine-bin-unstable (>= 1.3.15-0.2) | wine1.4, yasm
+Build-Depends: autoconf2.13, debhelper (>= 7)
+Build-Depends-Indep: g++-mingw-w64-i686,
+ g++-mingw-w64-x86-64,
+ lcab,
+ libidl-dev,
+ libx11-dev,
+ python,
+ unzip,
+ wine-bin (>= 1.4-0.2) | wine-bin-unstable (>= 1.3.15-0.2) | wine1.4,
+ yasm,
+ zip
Build-Conflicts: binfmt-support
Standards-Version: 3.9.3
Homepage: http://www.winehq.org/
diff --git a/debian/copyright b/debian/copyright
index eda52ec..fc1bcf5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -910,16 +910,16 @@ License: other
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
.
- 2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
+ 2. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
documentation would be appreciated but is not required.
.
3. Altered source versions must be plainly marked as such, and must
not be misrepresented as being the original software.
.
- 4. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
+ 4. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
permission.
.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@@ -2541,7 +2541,7 @@ License: LPPL-1+
.
The LaTeX Project Public License (LPPL) is the license under which the
base LaTeX distribution is distributed. As described below you may use
- this licence for any software that you wish to distribute.
+ this licence for any software that you wish to distribute.
.
It may be particularly suitable if your software is TeX related (such
as a LaTeX package file) but it may be used for any software, even if
@@ -2564,7 +2564,7 @@ License: LPPL-1+
Given such a notice in the file, the conditions of this document would
apply, with:
.
- `The Program' referring to the software `pig.sty' and
+ `The Program' referring to the software `pig.sty' and
`The Copyright Holder' referring to the person `M. Y. Name'.
.
To see a real example, see the file legal.txt which carries the
@@ -2573,7 +2573,7 @@ License: LPPL-1+
This license gives terms under which files of The Program may be
distributed and modified. Individual files may have specific further
constraints on modification, but no file should have restrictions on
- distribution other than those specified below.
+ distribution other than those specified below.
This is to ensure that a distributor wishing to distribute a complete
unmodified copy of The Program need only check the conditions in this
file, and does not need to check every file in The Program for extra
@@ -2582,7 +2582,7 @@ License: LPPL-1+
under a different license. You may use the parts of the text of LPPL as
a model for your own license, but your license should not directly refer
to the LPPL or otherwise give the impression that The Program is
- distributed under the LPPL.
+ distributed under the LPPL.
.
.
.
@@ -2644,7 +2644,7 @@ License: LPPL-1+
of those files, and any files derived from them, under the names used
by the original files in the distribution of The Program.
.
- * You change any `identification string' in The Program to clearly
+ * You change any `identification string' in The Program to clearly
indicate that the file is not part of the standard system.
.
* If The Program includes an `error report address' so that errors
@@ -2652,7 +2652,7 @@ License: LPPL-1+
addresses, this address must be changed in any modified versions of
The Program, so that reports for files not maintained by the
original program maintainers are directed to the maintainers of the
- changed files.
+ changed files.
.
* You acknowledge the source and authorship of the original version
in the modified file.
@@ -2702,7 +2702,7 @@ License: LPPL-1+
wish, whilst maintaining the availability, integrity and reliability of
The Program. If you do not see how to achieve your goal whilst
adhering to these requirements then read the document cfgguide.tex
- in the base LaTeX distribution for suggestions.
+ in the base LaTeX distribution for suggestions.
.
Because of the portability and exchangeability aspects of systems
like LaTeX, The LaTeX3 Project deprecates the distribution of
@@ -2784,7 +2784,7 @@ License: LPPL-1.2+
the freedom to make and distribute modified versions of The Program
that conform with whatever technical specifications you wish while
maintaining the availability, integrity, and reliability of
- The Program. If you do not see how to achieve your goal while
+ The Program. If you do not see how to achieve your goal while
meeting these conditions, then read the document `cfgguide.tex'
in the base LaTeX distribution for suggestions.
.
@@ -2845,7 +2845,7 @@ License: LPPL-1.2+
(B) provide to those who receive the modified file information
that is sufficient for them to obtain a copy of The Program;
for example, you may provide a Uniform Resource Locator (URL)
- for a site that you expect will provide them with a copy of
+ for a site that you expect will provide them with a copy of
The Program free of charge (either the version from which
your modification is derived, or perhaps a later version).
.
@@ -3006,7 +3006,7 @@ License: LPPL-1.2+
% of this license or (at your option) any later version.
% The latest version of this license is in
% http://www.latex-project.org/lppl.txt
- % and version 1.2 or later is part of all distributions of LaTeX
+ % and version 1.2 or later is part of all distributions of LaTeX
% version 1999/12/01 or later.
%
% This program consists of the files pig.dtx and pig.ins
@@ -3050,7 +3050,7 @@ License: LPPL-1.2+
modification. LaTeX configuration files (with filename extension
`.cfg') are examples of files bearing less restrictive conditions
on the distribution of a modified version of the file. The
- additional conditions on LaTeX software given above are examples
+ additional conditions on LaTeX software given above are examples
of declaring a category of files bearing exceptional additional
conditions.
@@ -3073,8 +3073,8 @@ License: LPPL-1.3+ LPPL-1.3a+
.
You may use this license for any work of which you hold the copyright
and which you wish to distribute. This license may be particularly
- suitable if your work is TeX-related (such as a LaTeX package), but
- it is written in such a way that you can use it even if your work is
+ suitable if your work is TeX-related (such as a LaTeX package), but
+ it is written in such a way that you can use it even if your work is
unrelated to TeX.
.
The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
@@ -3105,7 +3105,7 @@ License: LPPL-1.3+ LPPL-1.3a+
`Derived Work'
Any work that under any applicable law is derived from the Work.
.
- `Modification'
+ `Modification'
Any procedure that produces a Derived Work under any applicable
law -- for example, the production of a file containing an
original file associated with the Work or a significant portion of
@@ -3136,16 +3136,16 @@ License: LPPL-1.3+ LPPL-1.3a+
no such explicit nomination then it is the `Copyright Holder' under
any applicable law.
.
- `Base Interpreter'
+ `Base Interpreter'
A program or process that is normally needed for running or
- interpreting a part or the whole of the Work.
+ interpreting a part or the whole of the Work.
.
A Base Interpreter may depend on external components but these
are not considered part of the Base Interpreter provided that each
external component clearly identifies itself whenever it is used
interactively. Unless explicitly specified when applying the
license to the Work, the only applicable Base Interpreter is a
- `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-Format' or in the case of files belonging to the
`LaTeX-format' a program implementing the `TeX language'.
.
.
@@ -3186,8 +3186,8 @@ License: LPPL-1.3+ LPPL-1.3a+
distribute a Derived Work provided the following conditions are met
for every component of the Work unless that component clearly states
in the copyright notice that it is exempt from that condition. Only
- the Current Maintainer is allowed to add such statements of exemption
- to a component of the Work.
+ the Current Maintainer is allowed to add such statements of exemption
+ to a component of the Work.
.
a. If a component of this Derived Work can be a direct replacement
for a component of the Work when that component is used with the
@@ -3213,7 +3213,7 @@ License: LPPL-1.3+ LPPL-1.3a+
.
d. You distribute at least one of the following with the Derived Work:
.
- 1. A complete, unmodified copy of the Work;
+ 1. A complete, unmodified copy of the Work;
if your distribution of a modified component is made by
offering access to copy the modified component from a
designated place, then offering equivalent access to copy
@@ -3248,7 +3248,7 @@ License: LPPL-1.3+ LPPL-1.3a+
.
b. If a Derived Work is distributed under a different license, that
Derived Work must provide sufficient documentation as part of
- itself to allow each recipient of that Derived Work to honor the
+ itself to allow each recipient of that Derived Work to honor the
restrictions in Clause 6 above, concerning changes from the Work.
.
11. This license places no restrictions on works that are unrelated to
@@ -3330,7 +3330,7 @@ License: LPPL-1.3+ LPPL-1.3a+
.
b. If the Current Maintainer is not reachable and the Copyright
Holder agrees that maintenance of the Work be passed to you,
- then this takes effect immediately upon announcement.
+ then this takes effect immediately upon announcement.
.
4. If you make an `intention announcement' as described in 2b. above
and after three months your intention is challenged neither by
@@ -3420,7 +3420,7 @@ License: LPPL-1.3+ LPPL-1.3a+
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
- %
+ %
% The Current Maintainer of this work is M. Y. Name.
%
% This work consists of the files pig.dtx and pig.ins
@@ -3434,7 +3434,7 @@ License: LPPL-1.3+ LPPL-1.3a+
`Current Maintainer' referring to the person `M. Y. Name'.
.
If you do not want the Maintenance section of LPPL to apply to your
- Work, change `maintained' above into `author-maintained'.
+ Work, change `maintained' above into `author-maintained'.
However, we recommend that you use `maintained', as the Maintenance
section was added in order to ensure that your Work remains useful to
the community even when you can no longer maintain and support it
--
Debian Wine Gecko packaging
More information about the pkg-wine-party
mailing list