[Pkg-nagios-changes] [pkg-icingaweb2] 01/04: Embed forked version of ZF1

[Markus Frosch]

This is an automated email from the git hooks/post-receive script.

lazyfrosch pushed a commit to branch master
in repository pkg-icingaweb2.

commit 9608ebe781728964610cc2f2369fcf33b464fd67
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Tue Dec 13 13:58:26 2016 +0100

    Embed forked version of ZF1
    
    ZF1 has been forked as a minimal base library inside Icingaweb2.
    
    It is maintained as part of Icingaweb2. See README for reference:
    /usr/share/doc/php-icinga/README-ZF1.md
    
    Closes: #814143
    Git-Dch: long
---
 debian/control            | 7 ++++---
 debian/copyright          | 1 +
 debian/php-icinga.install | 6 ++++++
 debian/rules              | 2 ++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 0099c7f..c8332d1 100644
--- a/debian/control
+++ b/debian/control
@@ -90,15 +90,16 @@ Section: php
 Architecture: all
 Depends:
  php,
- zendframework,
  ${misc:Depends}
 Recommends:
  php-mysql | php-pgsql,
  php-json,
 Description: PHP library to communicate with and use Icinga
- Icinga is a PHP library providing a PHP API to interact with Icinga's data.
+ Icinga Web 2 is a very modular, fast and simple web interface for your Icinga
+ monitoring environment.
  .
- The main dependency here is the Zend Framework.
+ Icinga is a PHP library providing a PHP API to interact with Icinga's data
+ and other core parts of Icinga web 2 that may be used by modules.
  .
  This library is mainly used by Icinga Web 2 to get its data.
 
diff --git a/debian/copyright b/debian/copyright
index 1c5fb7b..1eabc4e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -157,6 +157,7 @@ License: MIT
 
 Files: library/vendor/Zend/*
 Copyright: 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+           2016 Icinga Development Team <info at icinga.com>
 License: New-BSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
diff --git a/debian/php-icinga.install b/debian/php-icinga.install
index 6cbd03f..eb29afd 100644
--- a/debian/php-icinga.install
+++ b/debian/php-icinga.install
@@ -1 +1,7 @@
 library/Icinga        usr/share/php
+
+# embedded fork of ZendFramework 1
+# see library/vendor/Zend/README.md
+# Maintained as part of Icingaweb2 upstream!
+library/vendor/Zend/*.php usr/share/icingaweb2/library/vendor/Zend
+library/vendor/Zend/*/    usr/share/icingaweb2/library/vendor/Zend
diff --git a/debian/rules b/debian/rules
index 93f6dca..81e6d0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@ override_dh_auto_clean:
 override_dh_install:
 	dh_install -X.min.js -X.min.map -XSOURCE
 	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
 
 override_dh_auto_test:
 	dh_auto_test

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icingaweb2.git