[Debian-ha-commits] [pcs] 03/03: Link to the Liberation fonts instead of shipping them
Christoph Berg
myon at debian.org
Thu Jan 28 10:43:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
myon pushed a commit to branch master
in repository pcs.
commit 57885898dde91021d405de06ba95223497f9f604
Author: Christoph Berg <christoph.berg at credativ.de>
Date: Thu Jan 28 11:43:04 2016 +0100
Link to the Liberation fonts instead of shipping them
---
debian/changelog | 1 +
debian/control | 1 +
debian/copyright | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
debian/rules | 13 ++++++++----
4 files changed, 74 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1e1d589..0b64f1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
pcs (0.9.148-1) unstable; urgency=medium
+ [ Richard B Winters, Christoph Berg ]
* Initial release.
-- Richard B Winters <rik at mmogp.com> Thu, 28 Jan 2016 10:12:39 +0100
diff --git a/debian/control b/debian/control
index 880db65..d0cc847 100644
--- a/debian/control
+++ b/debian/control
@@ -38,6 +38,7 @@ Architecture: any
Depends: ${shlibs:Depends},
${python:Depends},
${misc:Depends},
+ fonts-liberation,
python2.7 (>=2.7.9),
ruby,
ruby-backports,
diff --git a/debian/copyright b/debian/copyright
index 1a51beb..ac2f0d2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -44,6 +44,69 @@ License: MIT
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+Files: pcsd/public/css/Liberation*.ttf
+Copyright: (C) 2007 Red Hat, Inc. All rights reserved.
+ LIBERATION is a trademark of Red Hat, Inc.
+License: Liberation
+ This agreement governs the use of the Software and any updates to the Software,
+ regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc.
+ ("Red Hat") grants to the user ("Client") a license to this work pursuant to
+ the GNU General Public License v.2 with the exceptions set forth below and such
+ other terms as our set forth in this End User License Agreement.
+ .
+ 1. The Software and License Exception. LIBERATION font software (the "Software")
+ consists of TrueType-OpenType formatted font software for rendering LIBERATION
+ typefaces in sans serif, serif, and monospaced character styles. You are licensed
+ to use, modify, copy, and distribute the Software pursuant to the GNU General
+ Public License v.2 with the following exceptions:
+ .
+ (a) As a special exception, if you create a document which uses this font, and
+ embed this font or unaltered portions of this font into the document, this
+ font does not by itself cause the resulting document to be covered by the
+ GNU General Public License. This exception does not however invalidate any
+ other reasons why the document might be covered by the GNU General Public
+ License. If you modify this font, you may extend this exception to your
+ version of the font, but you are not obligated to do so. If you do not
+ wish to do so, delete this exception statement from your version.
+ .
+ (b) As a further exception, any distribution of the object code of the Software
+ in a physical product must provide you the right to access and modify the
+ source code for the Software and to reinstall that modified version of the
+ Software in object code form on the same physical product on which you
+ received it.
+ .
+ 2. Intellectual Property Rights. The Software and each of its components, including
+ the source code, documentation, appearance, structure and organization are owned
+ by Red Hat and others and are protected under copyright and other laws. Title to
+ the Software and any component, or to any copy, modification, or merged portion
+ shall remain with the aforementioned, subject to the applicable license.
+ The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other
+ countries. This agreement does not permit Client to distribute modified versions
+ of the Software using Red Hat's trademarks. If Client makes a redistribution of
+ a modified version of the Software, then Client must modify the files names to
+ remove any reference to the Red Hat trademarks and must not use the Red Hat
+ trademarks in any way to reference or promote the modified Software.
+ .
+ 3. Limited Warranty. To the maximum extent permitted under applicable law, the
+ Software is provided and licensed "as is" without warranty of any kind,
+ expressed or implied, including the implied warranties of merchantability,
+ non-infringement or fitness for a particular purpose. Red Hat does not warrant
+ that the functions contained in the Software will meet Client's requirements or
+ that the operation of the Software will be entirely error free or appear precisely
+ as described in the accompanying documentation.
+ .
+ 4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable
+ law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any
+ incidental or consequential damages, including lost profits or lost savings arising
+ out of the use or inability to use the Software, even if Red Hat or such dealer has
+ been advised of the possibility of such damages.
+ .
+ 5. General. If any provision of this agreement is held to be unenforceable, that shall
+ not affect the enforceability of the remaining provisions. This agreement shall be
+ governed by the laws of the State of North Carolina and of the United States, without
+ regard to any conflict of laws provisions, except that the United Nations Convention
+ on the International Sale of Goods shall not apply.
+
Files: debian/*
Copyright: 2015-2016 Debian-HA Maintainers
2015-2016 Richard B Winters <rik at mmogp.com>
diff --git a/debian/rules b/debian/rules
index 144afcc..34930b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,13 +22,13 @@ override_dh_auto_build:
override_dh_auto_install:
mkdir -p $(CURDIR)/debian/tmp
-# Make pcs
+ # Make pcs
$(MAKE) install \
PREFIX=/usr \
DESTDIR=$(CURDIR)/debian/tmp \
PYTHON_SITELIB=/usr/lib/python2.7/dist-packages \
install_settings=true
-# Make pcsd
+ # Make pcsd
$(MAKE) install_pcsd \
PREFIX=/usr \
DESTDIR=$(CURDIR)/debian/tmp \
@@ -36,6 +36,11 @@ override_dh_auto_install:
BUILD_GEMS=false \
systemddir=/lib/systemd \
SYSTEMCTL_OVERRIDE=true
+ # remove embedded fonts
+ set -e && cd $(CURDIR)/debian/tmp/usr/share/pcsd/public/css && \
+ for ttf in Liberation*.ttf; do \
+ ln -sf /usr/share/fonts/truetype/liberation/$$ttf $$ttf; \
+ done
override_dh_python2:
dh_python2 -p pcs --skip-private
@@ -45,8 +50,8 @@ override_dh_installinit:
dh_installinit -n --name=pcsd --
override_dh_compress:
-# make non-scripts non-executable
- chmod -x $(CURDIR)/debian/pcs/usr/share/pcsd/public/css/*
+ # make non-scripts non-executable
+ chmod -x $(CURDIR)/debian/pcs/usr/share/pcsd/public/css/* || : # ignore *.ttf symlinks
chmod -x $(CURDIR)/debian/pcs/etc/pam.d/pcsd
chmod -x $(CURDIR)/debian/pcs/usr/lib/python*/*-packages/pcs/settings.py
chmod -x $(CURDIR)/debian/pcs/usr/share/bash-completion/completions/pcs
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pcs.git
More information about the Debian-HA-Commits
mailing list