[pve-devel] [PATCH libspice-server] build: use wrap-and-sort to cleanup debian/
Fabian Grünbichler
f.gruenbichler at proxmox.com
Fri Sep 29 12:54:23 CEST 2017
Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
debian/control | 43 ++++++++++++++++++++++++-------------
debian/copyright | 64 ++++++++++++++++++++++++++++----------------------------
2 files changed, 61 insertions(+), 46 deletions(-)
diff --git a/debian/control b/debian/control
index bd6c361..783f678 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,33 @@
-Source: pve-libspice-server
+Source: pve-libspice-server
Priority: extra
Maintainer: Proxmox Support Team <support at proxmox.com>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, pkg-config, libjpeg-dev, zlib1g-dev, python-pyparsing, libpixman-1-dev (>= 0.17.7~), libogg-dev, libsasl2-dev, quilt, libglib2.0-dev, libssl-dev
+Build-Depends: autotools-dev,
+ debhelper (>= 8.0.0),
+ libglib2.0-dev,
+ libjpeg-dev,
+ libogg-dev,
+ libpixman-1-dev (>= 0.17.7~),
+ libsasl2-dev,
+ libssl-dev,
+ pkg-config,
+ python-pyparsing,
+ quilt,
+ zlib1g-dev,
Standards-Version: 3.9.3
Section: libs
Package: pve-libspice-server-dev
Section: libdevel
Architecture: amd64
-Depends: pve-libspice-server1 (= ${binary:Version}), ${misc:Depends}, libpixman-1-dev (>= 0.17.7~), libssl-dev, libxinerama-dev
-Suggests: pkg-config
-Conflicts: libspice-server-dev
-Provides: libspice-server-dev
-Replaces: libspice-server-dev
+Depends: libpixman-1-dev (>= 0.17.7~),
+ libssl-dev,
+ libxinerama-dev,
+ pve-libspice-server1 (= ${binary:Version}),
+ ${misc:Depends},
+Suggests: pkg-config,
+Conflicts: libspice-server-dev,
+Provides: libspice-server-dev,
+Replaces: libspice-server-dev,
Description: Header and development files for SPICE server
SPICE is a remote display system built for virtual environments which
allows you to view a computing 'desktop' environment not only on the
@@ -20,21 +35,21 @@ Description: Header and development files for SPICE server
from a wide variety of machine architectures.
.
This package contains the header files, static libraries and development
- documentation for spice-server.
+ documentation for spice-server.
Package: pve-libspice-server1
Section: libs
Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libspice-server1
-Provides: libspice-server1
-Replaces: libspice-server1
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+Conflicts: libspice-server1,
+Provides: libspice-server1,
+Replaces: libspice-server1,
Description: SPICE remote display system server library
SPICE is a remote display system built for virtual environments which
allows you to view a computing 'desktop' environment not only on the
machine where it is running, but from anywhere on the Internet and
from a wide variety of machine architectures.
.
- This package contains the run-time libraries for any application that
+ This package contains the run-time libraries for any application that
wishes to be a SPICE server.
-
diff --git a/debian/copyright b/debian/copyright
index f3b5660..3d33363 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ License: LGPL-2.1+
Files: client/windows/stdint.h
Copyright: NOT COPYRIGHTED
-License:
+License:
Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794)
THIS SOFTWARE IS NOT COPYRIGHTED
Contributor: Danny Smith <danny_r_smith_2001 at yahoo.co.nz>
@@ -19,7 +19,7 @@ License:
DISCLAIMED. This includes but is not limited to warranties of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-Files: spice-common/common/draw.h spice-common/common/messages.h
+Files: spice-common/common/draw.h spice-common/common/messages.h
server/zlib_encoder.h server/jpeg_encoder.h
Copyright: Copyright (C) 2009-2010 Red Hat, Inc.
License: BSD-3-clause
@@ -27,7 +27,7 @@ License: BSD-3-clause
Files: spice-common/common/lines.h spice-common/common/lines.c
Copyright: Copyright 1987, 1998 The Open Group
Copyright 1987 by Digital Equipment Corporation
-License:
+License:
Copyright 1987, 1998 The Open Group
.
Permission to use, copy, modify, distribute, and sell this software and its
@@ -72,7 +72,7 @@ License:
Files: client/windows/my_getopt.cpp
Copyright: Copyright 1997-2001, Benjamin Sittler
-License:
+License:
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
@@ -93,7 +93,7 @@ License:
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-Files: spice-common/common/lz_decompress_tmpl.c spice-common/common/lz.c
+Files: spice-common/common/lz_decompress_tmpl.c spice-common/common/lz.c
spice-common/common/lz_compress_tmpl.c
Copyright: Copyright 2009 Red Hat, Inc. and/or its affiliates
Copyright (C) 2005, 2006, 2007 Ariya Hidayat (ariya at kde.org)
@@ -110,7 +110,7 @@ License: LGPL-2.1+
.
This file incorporates work covered by the following copyright and
permission notice:
- .
+ .
Copyright (C) 2007 Ariya Hidayat (ariya at kde.org)
Copyright (C) 2006 Ariya Hidayat (ariya at kde.org)
Copyright (C) 2005 Ariya Hidayat (ariya at kde.org)
@@ -125,7 +125,7 @@ License: LGPL-2.1+
.
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
- .
+ .
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -208,57 +208,57 @@ License: MIT
THE SOFTWARE.
License: CC-BY-SA-3.0
- THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
- COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
- COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+ COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+ COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
.
BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
- BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE
- CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED
+ BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE
+ CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED
HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
.
1. Definitions
.
- a. "Adaptation" means a work based upon the Work, or upon the Work and
- other pre-existing works, such as a translation, adaptation, derivative
- work, arrangement of music or other alterations of a literary or artistic
+ a. "Adaptation" means a work based upon the Work, or upon the Work and
+ other pre-existing works, such as a translation, adaptation, derivative
+ work, arrangement of music or other alterations of a literary or artistic
work, or phonogram or performance and includes cinematographic adaptations
or any other form in which the Work may be recast, transformed, or adapted
- including in any form recognizably derived from the original, except that
+ including in any form recognizably derived from the original, except that
a work that constitutes a Collection will not be considered an Adaptation
- for the purpose of this License. For the avoidance of doubt, where the
+ for the purpose of this License. For the avoidance of doubt, where the
Work is a musical work, performance or phonogram, the synchronization of
- the Work in timed-relation with a moving image ("synching") will be
+ the Work in timed-relation with a moving image ("synching") will be
considered an Adaptation for the purpose of this License.
.
b. "Collection" means a collection of literary or artistic works, such as
encyclopedias and anthologies, or performances, phonograms or broadcasts,
- or other works or subject matter other than works listed in Section 1(f)
- below, which, by reason of the selection and arrangement of their
+ or other works or subject matter other than works listed in Section 1(f)
+ below, which, by reason of the selection and arrangement of their
contents, constitute intellectual creations, in which the Work is included
in its entirety in unmodified form along with one or more other
contributions, each constituting separate and independent works in
themselves, which together are assembled into a collective whole. A work
- that constitutes a Collection will not be considered an Adaptation (as
+ that constitutes a Collection will not be considered an Adaptation (as
defined below) for the purposes of this License.
.
c. "Creative Commons Compatible License" means a license that is listed at
- http://creativecommons.org/compatiblelicenses that has been approved by
- Creative Commons as being essentially equivalent to this License,
- including, at a minimum, because that license: (i) contains terms that
+ http://creativecommons.org/compatiblelicenses that has been approved by
+ Creative Commons as being essentially equivalent to this License,
+ including, at a minimum, because that license: (i) contains terms that
have the same purpose, meaning and effect as the License Elements of this
- License; and, (ii) explicitly permits the relicensing of adaptations of
- works made available under that license under this License or a Creative
+ License; and, (ii) explicitly permits the relicensing of adaptations of
+ works made available under that license under this License or a Creative
Commons jurisdiction license with the same License Elements as this
License.
.
- d. "Distribute" means to make available to the public the original and
+ d. "Distribute" means to make available to the public the original and
copies of the Work or Adaptation, as appropriate, through sale or other
transfer of ownership.
.
e. "License Elements" means the following high-level license attributes as
- selected by Licensor and indicated in the title of this License:
+ selected by Licensor and indicated in the title of this License:
Attribution, ShareAlike.
.
f. "Licensor" means the individual, individuals, entity or entities that
@@ -270,7 +270,7 @@ License: CC-BY-SA-3.0
(i) in the case of a performance the actors, singers, musicians, dancers,
and other persons who act, sing, deliver, declaim, play in, interpret or
otherwise perform literary or artistic works or expressions of folklore;
- (ii) in the case of a phonogram the producer being the person or legal
+ (ii) in the case of a phonogram the producer being the person or legal
entity who first fixes the sounds of a performance or other sounds; and,
(iii) in the case of broadcasts, the organization that transmits the
broadcast.
@@ -278,14 +278,14 @@ License: CC-BY-SA-3.0
h. "Work" means the literary and/or artistic work offered under the terms
of this License including without limitation any production in the
literary, scientific and artistic domain, whatever may be the mode or form
- of its expression including digital form, such as a book, pamphlet and
- other writing; a lecture, address, sermon or other work of the same
+ of its expression including digital form, such as a book, pamphlet and
+ other writing; a lecture, address, sermon or other work of the same
nature; a dramatic or dramatico-musical work; a choreographic work or
entertainment in dumb show; a musical composition with or without words;
a cinematographic work to which are assimilated works expressed by a
process analogous to cinematography; a work of drawing, painting,
architecture, sculpture, engraving or lithography; a photographic work to
- which are assimilated works expressed by a process analogous to
+ which are assimilated works expressed by a process analogous to
photography; a work of applied art; an illustration, map, plan, sketch or
three-dimensional work relative to geography, topography, architecture or
science; a performance; a broadcast; a phonogram; a compilation of data to
--
2.14.1
More information about the pve-devel
mailing list