[Pkg-nagios-changes] [pkg-pnp4nagios] 05/12: Changes for the DFSG tarball, JQuery depends, links and cleanup

[Markus Frosch]

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

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

commit 45e91cc29c1af22aad49d100dfb86221720e23e4
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Thu Apr 10 14:04:37 2014 +0200

    Changes for the DFSG tarball, JQuery depends, links and cleanup
---
 debian/control              |  3 ++-
 debian/pnp4nagios-web.links |  2 ++
 debian/rules                | 15 +++++++++++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index c35bc1b..24293a2 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
     Sebastian Harl <tokkee at debian.org>,
     Markus Frosch <markus at lazyfrosch.de>
 Build-Depends: autotools-dev, debhelper (>= 7), po-debconf, quilt,
- rrdtool, librrds-perl
+ rrdtool, librrds-perl, node-uglify
 Standards-Version: 3.9.4
 Homepage: http://www.pnp4nagios.org/
 Vcs-Git: git://git.debian.org/pkg-nagios/pkg-pnp4nagios.git
@@ -86,6 +86,7 @@ Depends: libapache2-mod-php5 | php5-cgi | php5, php5-gd,
  libkohana2-php,
  libfpdi-php,
  libjs-jquery (>= 1.6.2), libjs-jquery-ui (>= 1.8.ooops.14),
+ libjs-jquery-mobile,
  rrdtool,
  adduser,
  ${misc:Depends}
diff --git a/debian/pnp4nagios-web.links b/debian/pnp4nagios-web.links
index 9864443..b3200b7 100644
--- a/debian/pnp4nagios-web.links
+++ b/debian/pnp4nagios-web.links
@@ -2,3 +2,5 @@
 /usr/share/php/fpdi /usr/share/pnp4nagios/html/application/vendor/fpdi
 /usr/share/javascript/jquery/jquery.min.js /usr/share/pnp4nagios/html/media/js/jquery-min.js
 /usr/share/javascript/jquery-ui/jquery-ui.js /usr/share/pnp4nagios/html/media/js/jquery-ui.min.js
+/usr/share/javascript/jquery-mobile/jquery.mobile.min.js /usr/share/pnp4nagios/html/media/js/jquery.mobile.min.js
+/usr/share/javascript/jquery-mobile/jquery.mobile.min.css /usr/share/pnp4nagios/html/media/css/jquery.mobile.min.css
diff --git a/debian/rules b/debian/rules
index fbf8dfb..67ce765 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,8 @@ build: build-arch build-indep
 build-arch: build-stamp
 
 build-indep: build-stamp
+	uglifyjs share/pnp/media/js/jquery.imgareaselect.js \
+	       > share/pnp/media/js/jquery.imgareaselect.min.js
 
 build-stamp: $(QUILT_STAMPFN) config.status
 	dh_testdir
@@ -67,6 +69,8 @@ clean: unpatch
 	dh_testroot
 	rm -f build-stamp
 
+	rm -f share/pnp/media/js/jquery.imgareaselect.min.js
+
 	for file in config.guess config.sub; do \
 		if [ -e $$file.upstream ]; then \
 			rm -f $$file; \
@@ -131,9 +135,14 @@ install: build
 	# Remove external PHP classes/libraries: FPDF, FPDF-TPL, FPDI
 	rm -r debian/tmp/usr/share/pnp4nagios/html/application/vendor/fpdf
 
+	# remove source files
+	rm debian/tmp/usr/share/pnp4nagios/html/media/js/jquery.imgareaselect.Debian.txt
+	rm debian/tmp/usr/share/pnp4nagios/html/media/js/jquery.imgareaselect.js
+
 	# Remove external JavaScript files: jQuery and jQuery-UI
-	rm debian/tmp/usr/share/pnp4nagios/html/media/js/jquery-min.js
-	rm debian/tmp/usr/share/pnp4nagios/html/media/js/jquery-ui.min.js
+	# no longer present in DFSG tarball
+	#rm debian/tmp/usr/share/pnp4nagios/html/media/js/jquery-min.js
+	#rm debian/tmp/usr/share/pnp4nagios/html/media/js/jquery-ui.min.js
 
 	# Clean up some files
 	rmdir debian/tmp/usr/bin
@@ -218,3 +227,5 @@ binary-arch: build install
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
+
+# vi: noexpandtab ts=4 sw=4 :

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