[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.1-4-16-gca8d3bc

[Markus Frosch]

The following commit has been merged in the master branch:
commit ca8d3bc74264a1d1a5055864963b34a8e1449960
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Fri Sep 14 17:42:19 2012 +0200

    some cleanup for lintian

diff --git a/debian/control b/debian/control
index f0f20aa..540f3ae 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: php
 Priority: extra
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
 Uploaders: Markus Frosch <markus at lazyfrosch.de>, Alexander Wirt <formorer at debian.org>, Jan Wagner <waja at cyconet.org>
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf, quilt
+Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf
 Standards-Version: 3.9.3
 Homepage: http://www.icinga.org
 Vcs-Git: git://git.debian.org/git/pkg-nagios/pkg-icinga-web.git
diff --git a/debian/copyright b/debian/copyright
index 9450b62..1faacf3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -345,7 +345,7 @@ License: MIT
  (as referenced by author)
 
 Files: lib/phing/*
-Copyright: Copyright, Phing Developement Team
+Copyright: Copyright, Phing Development Team
 License: GPL-3
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/icinga-web.lintian-overrides b/debian/icinga-web.lintian-overrides
deleted file mode 100644
index 7db5e57..0000000
--- a/debian/icinga-web.lintian-overrides
+++ /dev/null
@@ -1,10 +0,0 @@
-not-using-po-debconf
-script-not-executable
-extra-license-file usr/share/icinga-web/lib/agavi/LICENSE
-extra-license-file usr/share/icinga-web/lib/doctrine/LICENSE
-extra-license-file usr/share/icinga-web/lib/doctrine/lib/LICENSE
-extra-license-file usr/share/icinga-web/lib/ext3/examples/image-organizer/SWFUpload/plugins/SWFObject_License.txt
-extra-license-file usr/share/icinga-web/lib/ext3/examples/image-organizer/SWFUpload/swfupload_license.txt
-extra-license-file usr/share/icinga-web/lib/ext3/license.txt
-extra-license-file usr/share/icinga-web/lib/jsgettext/COPYING.LESSER
-
diff --git a/debian/rules b/debian/rules
index 23421ae..11117f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,9 @@ override_dh_install:
 	# Upstream CHANGELOG by debian policy
 	cat ${b}/tmp/usr/doc/CHANGELOG-1.7 ${b}/tmp/usr/doc/CHANGELOG-1.6 ${b}/tmp/usr/doc/CHANGELOG-1.x > ${b}/tmp/usr/doc/changelog
 	rm ${b}/tmp/usr/doc/CHANGELOG-1.7 ${b}/tmp/usr/doc/CHANGELOG-1.6 ${b}/tmp/usr/doc/CHANGELOG-1.x
+	# Remove empty paths
+	rm -rf ${b}/tmp/usr/lib/agavi/src/build/
+	rmdir ${b}/tmp/usr/app/modules/Reporting/data/
 	# Install the rest
 	dh_install
 	# MySQL schema for dbconfig-common

-- 
Debian packaging of icinga-web