[pkg-nagios-changes] [Git][nagios-team/pkg-icingaweb2][master] 10 commits: Use dh_install --list-missing.
Bas Couwenberg
gitlab at salsa.debian.org
Sun May 6 18:54:28 BST 2018
Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / pkg-icingaweb2
Commits:
604fc93b by Bas Couwenberg at 2018-05-06T18:36:51+02:00
Use dh_install --list-missing.
- - - - -
ae108030 by Bas Couwenberg at 2018-05-06T19:11:48+02:00
Include dompdf & HTMLPurfifier in icingaweb2 package.
- - - - -
32239ff5 by Bas Couwenberg at 2018-05-06T19:11:48+02:00
Drop obsolete README.source.
- - - - -
de8b15f4 by Bas Couwenberg at 2018-05-06T19:11:48+02:00
Drop unused dependencies from icingaweb2 package.
- - - - -
67286b4e by Bas Couwenberg at 2018-05-06T19:11:48+02:00
Include migrate module in icingaweb2-common.
- - - - -
3bb001db by Bas Couwenberg at 2018-05-06T19:11:48+02:00
Drop php-htmlpurifier build dependency & test.
- - - - -
ab9c65f2 by Bas Couwenberg at 2018-05-06T19:35:34+02:00
Remove extra license files.
- - - - -
b4f1651c by Bas Couwenberg at 2018-05-06T19:42:31+02:00
Remove duplicate DejaVu fonts, symlink to packaged files.
- - - - -
c6c162ee by Bas Couwenberg at 2018-05-06T19:45:12+02:00
Update copyright format URL to use HTTPS.
- - - - -
1edbf429 by Bas Couwenberg at 2018-05-06T19:45:12+02:00
Set distribution to experimental.
- - - - -
9 changed files:
- − debian/README.source
- debian/changelog
- debian/control
- debian/copyright
- debian/icingaweb2-common.install
- debian/icingaweb2.install
- + debian/icingaweb2.links
- debian/rules
- − debian/test/php-htmlpurifier.php
Changes:
=====================================
debian/README.source deleted
=====================================
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-PLEASE DO NOT BUILD PACKAGES BASES ON THIS
-
-Packaging is not final, and there are no official builds for Debian yet.
-
-They are meant for testing.
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+icingaweb2 (2.5.3-1~exp2) experimental; urgency=medium
+
+ * Team upload.
+ * Use dh_install --list-missing.
+ * Include dompdf & HTMLPurfifier in icingaweb2 package.
+ * Drop obsolete README.source.
+ * Drop unused dependencies from icingaweb2 package.
+ * Include migrate module in icingaweb2-common.
+ * Drop php-htmlpurifier build dependency & test.
+ * Remove extra license files.
+ * Remove duplicate DejaVu fonts, symlink to packaged files.
+ * Update copyright format URL to use HTTPS.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 06 May 2018 19:40:04 +0200
+
icingaweb2 (2.5.3-1~exp1) experimental; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Priority: optional
Build-Depends: bash-completion,
debhelper (>= 9),
php-cli,
- php-htmlpurifier (>= 4.3),
node-uglify (>= 2) | yui-compressor,
node-source-map | yui-compressor
Standards-Version: 4.1.4
@@ -16,12 +15,10 @@ Homepage: https://www.icinga.com
Package: icingaweb2
Architecture: all
-Depends: icingaweb2-common (= ${source:Version}),
- php-htmlpurifier (>= 4.3),
+Depends: fonts-dejavu-core,
+ fonts-dejavu-extra,
+ icingaweb2-common (= ${source:Version}),
php-xml,
-# php-parsedown,
-# php-lessphp,
-# php-jshrink,
${misc:Depends}
Recommends: apache2 | httpd,
php,
=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Icingaweb2
Source: https://github.com/Icinga/icingaweb2
=====================================
debian/icingaweb2-common.install
=====================================
--- a/debian/icingaweb2-common.install
+++ b/debian/icingaweb2-common.install
@@ -1,5 +1,6 @@
application/locale usr/share/icingaweb2/application
+modules/migrate usr/share/icingaweb2/modules
modules/setup usr/share/icingaweb2/modules
modules/test usr/share/icingaweb2/modules
modules/translation usr/share/icingaweb2/modules
=====================================
debian/icingaweb2.install
=====================================
--- a/debian/icingaweb2.install
+++ b/debian/icingaweb2.install
@@ -12,6 +12,9 @@ packages/files/public/index.php usr/share/icingaweb2/public
debian/icingaweb2.conf etc/apache2/conf-available
# TODO: vendor libraries - should be moved to a proper package
+library/vendor/dompdf/* usr/share/icingaweb2/library/vendor/dompdf
+library/vendor/HTMLPurifier/* usr/share/icingaweb2/library/vendor/HTMLPurifier
+library/vendor/HTMLPurifier.* usr/share/icingaweb2/library/vendor
library/vendor/JShrink/*.php usr/share/icingaweb2/library/vendor/JShrink
-library/vendor/Parsedown/*.php usr/share/icingaweb2/library/vendor/Parsedown
library/vendor/lessphp/*.php usr/share/icingaweb2/library/vendor/lessphp
+library/vendor/Parsedown/*.php usr/share/icingaweb2/library/vendor/Parsedown
=====================================
debian/icingaweb2.links
=====================================
--- /dev/null
+++ b/debian/icingaweb2.links
@@ -0,0 +1,14 @@
+usr/share/fonts/truetype/dejavu/DejaVuSans.ttf usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSans.ttf
+usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSans-Bold.ttf
+usr/share/fonts/truetype/dejavu/DejaVuSans-BoldOblique.ttf usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSans-BoldOblique.ttf
+usr/share/fonts/truetype/dejavu/DejaVuSans-Oblique.ttf usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSans-Oblique.ttf
+
+usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSansMono.ttf
+usr/share/fonts/truetype/dejavu/DejaVuSansMono-Bold.ttf usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSansMono-Bold.ttf
+usr/share/fonts/truetype/dejavu/DejaVuSansMono-BoldOblique.ttf usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSansMono-BoldOblique.ttf
+usr/share/fonts/truetype/dejavu/DejaVuSansMono-Oblique.ttf usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSansMono-Oblique.ttf
+
+usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSerif.ttf
+usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSerif-Bold.ttf
+usr/share/fonts/truetype/dejavu/DejaVuSerif-BoldItalic.ttf usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSerif-BoldItalic.ttf
+usr/share/fonts/truetype/dejavu/DejaVuSerif-Italic.ttf usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSerif-Italic.ttf
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -6,23 +6,37 @@
override_dh_auto_clean:
dh_auto_clean
+
cd debian/uglify && $(MAKE) clean
override_dh_auto_build:
dh_auto_build
- cd debian/uglify && $(MAKE) all
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- dh_auto_test
- # test if php-htmlpurifier can be loaded
- php debian/test/php-htmlpurifier.php
-endif
+ cd debian/uglify && $(MAKE) all
override_dh_install:
- dh_install -X.min.js -X.min.map -XSOURCE
+ dh_install -X.min.js -X.min.map -XSOURCE --list-missing
+
cp -r debian/uglify/*.min.* debian/icingaweb2/usr/share/icingaweb2/public/js/vendor/
+
mkdir -p debian/php-icinga/usr/share/doc/php-icinga
cp library/vendor/Zend/README.md debian/php-icinga/usr/share/doc/php-icinga/README-ZF1.md
+ # Remove extra license files
+ find debian/*/usr/share/icingaweb2 -name LICENSE -delete
+
+ # Remove duplicate font files
+ $(RM) debian/*/usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSans.ttf \
+ debian/*/usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSans-Bold.ttf \
+ debian/*/usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSans-BoldOblique.ttf \
+ debian/*/usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSans-Oblique.ttf \
+ debian/*/usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSansMono.ttf \
+ debian/*/usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSansMono-Bold.ttf \
+ debian/*/usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSansMono-BoldOblique.ttf \
+ debian/*/usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSansMono-Oblique.ttf \
+ debian/*/usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSerif.ttf \
+ debian/*/usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSerif-Bold.ttf \
+ debian/*/usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSerif-BoldItalic.ttf \
+ debian/*/usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/DejaVuSerif-Italic.ttf
+
# vi: ts=4 sw=4 noexpandtab :
=====================================
debian/test/php-htmlpurifier.php deleted
=====================================
--- a/debian/test/php-htmlpurifier.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-require_once 'HTMLPurifier/Bootstrap.php';
-require_once 'HTMLPurifier.php';
-require_once 'HTMLPurifier.autoload.php';
-
-$config = HTMLPurifier_Config::createDefault();
-$config->set('Core.EscapeNonASCIICharacters', true);
-$config->set('HTML.Allowed', 'p,br,b,a[href],i,table,tr,td[colspan],div[class]');
-
-if (assert(get_class($config) == 'HTMLPurifier_Config') === true) {
- echo "HTMLPurifier loaded successfully.\n";
-}
-else {
- exit(1);
-}
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icingaweb2/compare/d13707bce72839c34456ab405422f94ac46c78ac...1edbf429cffddb50de8ea61ad53aaae12f743863
---
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icingaweb2/compare/d13707bce72839c34456ab405422f94ac46c78ac...1edbf429cffddb50de8ea61ad53aaae12f743863
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-nagios-changes/attachments/20180506/50283bbd/attachment-0001.html>
More information about the pkg-nagios-changes
mailing list