[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/experimental] 5 commits: d/libvirt-doc.docs: fix whitespace issue

Thu May 9 18:28:40 BST 2019


Guido Günther pushed to branch debian/experimental at Libvirt Packaging Team / libvirt


Commits:
483e44a6 by Christian Ehrhardt at 2019-05-09T17:27:52Z
d/libvirt-doc.docs: fix whitespace issue

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
4f4751f7 by Christian Ehrhardt at 2019-05-09T17:27:52Z
d/libvirt-doc.docs: install new doc elements

I was comparing the versioned content that make install will put into
the debian/tmp build directory and what we have installed. We already
have a slight superset that I don't want to loose, but OTOH we also
have soem files missing that got added later.

Update debian/libvirt-doc.docs to include those extra files that we
miss.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
781e22e1 by Christian Ehrhardt at 2019-05-09T17:27:52Z
d/not-installed: ignore documentation already being installed

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
eda89b2e by Christian Ehrhardt at 2019-05-09T17:27:52Z
d/no-installed, d/libvirt-doc.docs: do not install fonts

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
ab67a286 by Christian Ehrhardt at 2019-05-09T17:27:52Z
d/copyright: add license for docs/fonts/

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -


3 changed files:

- debian/copyright
- debian/libvirt-doc.docs
- debian/not-installed


Changes:

=====================================
debian/copyright
=====================================
@@ -151,6 +151,10 @@ Files: gnulib/tests/
   build-aux/snippet/
 License: GPL-3 or later
 
+Files: docs/fonts/*
+Copyright: 2015 Red Hat, Inc
+License: SIL-1.1
+
 Files: docs/wrapstring.xsl:
 License:
    Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -171,6 +175,97 @@ License:
    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    THE SOFTWARE.
 
+License: SIL-1.1
+ This Font Software is licensed under the SIL Open Font License,
+ Version 1.1.
+ .
+ This license is copied below, and is also available with a FAQ at:
+ http://scripts.sil.org/OFL
+ .
+ SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+ .
+ PREAMBLE The goals of the Open Font License (OFL) are to stimulate
+ worldwide development of collaborative font projects, to support the font
+ creation efforts of academic and linguistic communities, and to provide
+ a free and open framework in which fonts may be shared and improved in
+ partnership with others.
+ .
+ The OFL allows the licensed fonts to be used, studied, modified and
+ redistributed freely as long as they are not sold by themselves.
+ The fonts, including any derivative works, can be bundled, embedded,
+ redistributed and/or sold with any software provided that any reserved
+ names are not used by derivative works.  The fonts and derivatives,
+ however, cannot be released under any other type of license.  The
+ requirement for fonts to remain under this license does not apply to
+ any document created using the fonts or their derivatives.
+ .
+ DEFINITIONS
+ "Font Software" refers to the set of files released by the Copyright
+ Holder(s) under this license and clearly marked as such.
+ This may include source files, build scripts and documentation.
+ .
+ "Reserved Font Name" refers to any names specified as such after the
+ copyright statement(s).
+ .
+ "Original Version" refers to the collection of Font Software components
+ as distributed by the Copyright Holder(s).
+ .
+ "Modified Version" refers to any derivative made by adding to, deleting,
+ or substituting ? in part or in whole ?
+ any of the components of the Original Version, by changing formats or
+ by porting the Font Software to a new environment.
+ .
+ "Author" refers to any designer, engineer, programmer, technical writer
+ or other person who contributed to the Font Software.
+ .
+ PERMISSION & CONDITIONS
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of the Font Software, to use, study, copy, merge, embed, modify,
+ redistribute, and sell modified and unmodified copies of the Font
+ Software, subject to the following conditions:
+ .
+ 1) Neither the Font Software nor any of its individual components,in
+  Original or Modified Versions, may be sold by itself.
+ .
+ 2) Original or Modified Versions of the Font Software may be bundled,
+  redistributed and/or sold with any software, provided that each copy
+  contains the above copyright notice and this license. These can be
+  included either as stand-alone text files, human-readable headers or
+  in the appropriate machine-readable metadata fields within text or
+  binary files as long as those fields can be easily viewed by the user.
+ .
+ 3) No Modified Version of the Font Software may use the Reserved Font
+  Name(s) unless explicit written permission is granted by the
+  corresponding Copyright Holder. This restriction only applies to the
+  primary font name as presented to the users.
+ .
+ 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+  Software shall not be used to promote, endorse or advertise any
+  Modified Version, except to acknowledge the contribution(s) of the
+  Copyright Holder(s) and the Author(s) or with their explicit written
+  permission.
+ .
+ 5) The Font Software, modified or unmodified, in part or in whole, must
+  be distributed entirely under this license, and must not be distributed
+  under any other license. The requirement for fonts to remain under
+  this license does not apply to any document created using the Font
+  Software.
+ .
+ TERMINATION
+ This license becomes null and void if any of the above conditions are not met.
+ .
+ DISCLAIMER
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT.  IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
+ DEALINGS IN THE FONT SOFTWARE.
+
 On Debian systems, the complete text of the GNU Lesser General Public License
 can be found in `/usr/share/common-licenses/LGPL', of the GNU General Public
 License Version 3 in '/usr/share/common-licenses/GPL-3', of the GNU General


=====================================
debian/libvirt-doc.docs
=====================================
@@ -1,9 +1,11 @@
 docs/*.rng
 docs/*.png
 docs/*.xml
-docs/*.html 
+docs/*.html
 docs/*.gif
 docs/*.css
 docs/html/
 docs/devhelp/
+docs/internals/
+docs/logos/
 examples/


=====================================
debian/not-installed
=====================================
@@ -8,3 +8,19 @@ usr/lib/*/libvirt/connection-driver/*.la
 etc/sysconfig/*
 # Installed in examples already
 usr/lib/sysctl.d/60-libvirtd.conf
+# installed via d/libvirt-doc.docs already
+# Ignore those placed by make install
+# list them explicitly to trigger if other (sub)paths are added later
+usr/share/doc/libvirt-*/html/*.rng
+usr/share/doc/libvirt-*/html/*.png
+usr/share/doc/libvirt-*/html/*.xml
+usr/share/doc/libvirt-*/html/*.html
+usr/share/doc/libvirt-*/html/*.gif
+usr/share/doc/libvirt-*/html/*.css
+usr/share/doc/libvirt-*/html/html/*
+usr/share/doc/libvirt-*/html/internals/*
+usr/share/doc/libvirt-*/html/logos/*
+# also already installed from docs/devhelp/ via d/libvirt-doc.docs
+usr/share/gtk-doc/html/libvirt/
+# do not add fonts (part of docs)
+usr/share/doc/libvirt-*/html/fonts/*



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/compare/b27cb9af2c340896cb92f6c97d7ec09c4bda88bb...ab67a28666fb6bebeb44314665d9f1e156073db0

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/compare/b27cb9af2c340896cb92f6c97d7ec09c4bda88bb...ab67a28666fb6bebeb44314665d9f1e156073db0
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20190509/c5fd1a35/attachment-0001.html>
