debian/README.source

-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

+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@debian.org>  Sun, 06 May 2018 19:40:04 +0200
+
 icingaweb2 (2.5.3-1~exp1) experimental; urgency=medium
 
   * Team upload.

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

-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

 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

@@ -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

+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

@@ -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

-<?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);
-}