[Python-apps-commits] r8448 - in packages/wapiti/trunk/debian (3 files)

[adejong at users.alioth.debian.org]

    Date: Sunday, April 8, 2012 @ 19:30:21
  Author: adejong
Revision: 8448

  * Only install the two JavaScript files that are actually used.

Added:
  packages/wapiti/trunk/debian/patches/remove-unused-js-scripts.patch
Modified:
  packages/wapiti/trunk/debian/patches/series
  packages/wapiti/trunk/debian/rules

Added: packages/wapiti/trunk/debian/patches/remove-unused-js-scripts.patch
===================================================================
--- packages/wapiti/trunk/debian/patches/remove-unused-js-scripts.patch	                        (rev 0)
+++ packages/wapiti/trunk/debian/patches/remove-unused-js-scripts.patch	2012-04-08 19:30:21 UTC (rev 8448)
@@ -0,0 +1,21 @@
+Description: Remove unused JavaScript files from report template.
+Origin: upstream, http://wapiti.svn.sourceforge.net/viewvc/wapiti?view=revision&revision=150
+Bug: http://sourceforge.net/tracker/?func=detail&aid=2971259&group_id=168625&atid=847490
+
+--- a/src/report_template/index.html
++++ b/src/report_template/index.html
+@@ -30,12 +30,6 @@
+             </div>
+         </div>
+         <script type="text/javascript" src="includes/js/jquery.js"></script>
+-        <script type="text/javascript" src="includes/js/chartplugin.js"></script>
+-        <script type="text/javascript" src="includes/js/excanvas.js"></script>
+-        <script type="text/javascript" src="includes/js/wz_jsgraphics.js"></script>
+-        <script type="text/javascript" src="includes/js/chart.js"></script>
+-        <script type="text/javascript" src="includes/js/canvaschartpainter.js"></script>
+-        <script type="text/javascript" src="includes/js/jgchartpainter.js"></script>
+         <script type="text/javascript" src="includes/js/report.js"></script>
+     </body>
+-</html>
+\ No newline at end of file
++</html>

Modified: packages/wapiti/trunk/debian/patches/series
===================================================================
--- packages/wapiti/trunk/debian/patches/series	2012-04-08 19:24:17 UTC (rev 8447)
+++ packages/wapiti/trunk/debian/patches/series	2012-04-08 19:30:21 UTC (rev 8448)
@@ -5,3 +5,4 @@
 use-local-scans-dir.patch
 disable-nikto-download.patch
 allow-local-nikto-db.patch
+remove-unused-js-scripts.patch

Modified: packages/wapiti/trunk/debian/rules
===================================================================
--- packages/wapiti/trunk/debian/rules	2012-04-08 19:24:17 UTC (rev 8447)
+++ packages/wapiti/trunk/debian/rules	2012-04-08 19:30:21 UTC (rev 8448)
@@ -5,7 +5,14 @@
 
 override_dh_install:
 	dh_install --exclude=generateSources.sh --exclude=generateTranslations.sh \
-	           --exclude=BeautifulSoup.py --exclude=httplib2
+	           --exclude=BeautifulSoup.py --exclude=httplib2 --exclude includes/js
+	# install the two used JavaScript files (excluded above)
+	install -d $(CURDIR)/debian/wapiti/usr/share/wapiti/report_template/includes/js
+	install -D -p -m 0644 \
+	  -t $(CURDIR)/debian/wapiti/usr/share/wapiti/report_template/includes/js \
+	  src/report_template/includes/js/jquery.js \
+	  src/report_template/includes/js/report.js
+	find $(CURDIR)/debian/wapiti -type d -empty -delete
 
 override_dh_link:
 	dh_link