tags 585590 patch
thanks
On Fri, Jun 11, 2010 at 06:21:29PM -0700, Vagrant Cascadian wrote:
> it appears that /usr/share/zoneminder/tools/mootools/* are essentially copies
> of an older version of files shipped in the package libjs-mootools.
following patch worked for me:
diff -ur zoneminder-1.24.2/debian/control
zoneminder-1.24.2.mootools//debian/control
--- zoneminder-1.24.2/debian/control 2010-06-28 00:11:46.000000000 -0700
+++ zoneminder-1.24.2.mootools//debian/control 2010-06-27 23:58:34.000000000
-0700
@@ -8,7 +8,7 @@
Package: zoneminder
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2,
libapache2-mod-php5 | libapache2-mod-php4, php5 | php4, php5-mysql |
php4-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-tools-perl,
libmime-lite-perl, mysql-server, mysql-client, libwww-perl,
libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3,
ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2,
libapache2-mod-php5 | libapache2-mod-php4, php5 | php4, php5-mysql |
php4-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-tools-perl,
libmime-lite-perl, mysql-server, mysql-client, libwww-perl,
libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3,
ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libjs-mootools
Description: Linux video camera security and surveillance solution
ZoneMinder is intended for use in single or multi-camera video security
applications, including commercial or home CCTV, theft prevention and child
diff -ur zoneminder-1.24.2/debian/patches/00list
zoneminder-1.24.2.mootools//debian/patches/00list
--- zoneminder-1.24.2/debian/patches/00list 2010-06-28 00:11:46.000000000
-0700
+++ zoneminder-1.24.2.mootools//debian/patches/00list 2010-06-27
23:49:25.000000000 -0700
@@ -4,3 +4,4 @@
04_gcc-4.4-fix.dpatch
07_fix_ffmpeg_defaults.dpatch
08_jpeg8.dpatch
+09_use_libjs-mootools.dpatch
diff -ur zoneminder-1.24.2/debian/patches/09_use_libjs-mootools.dpatch
zoneminder-1.24.2.mootools//debian/patches/09_use_libjs-mootools.dpatch
--- zoneminder-1.24.2/debian/patches/09_use_libjs-mootools.dpatch
2010-06-28 00:13:51.000000000 -0700
+++ zoneminder-1.24.2.mootools//debian/patches/09_use_libjs-mootools.dpatch
2010-06-27 23:43:04.000000000 -0700
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use-libjs-mootools.dpatch by Vagrant Cascadian <vagr...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+## DP: use mootools shipped with libjs-mootools rather than shipping private
+## DP: copy. http://bugs.debian.org/585590
+
+...@dpatch@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
zoneminder-1.24.2~/web/skins/classic/includes/functions.php
zoneminder-1.24.2/web/skins/classic/includes/functions.php
+--- zoneminder-1.24.2~/web/skins/classic/includes/functions.php
2009-03-27 09:01:29.000000000 -0700
++++ zoneminder-1.24.2/web/skins/classic/includes/functions.php 2010-06-27
23:38:29.000000000 -0700
+@@ -59,9 +59,8 @@
+ <?php
+ }
+ ?>
+- <script type="text/javascript"
src="tools/mootools/mootools-1.2.1-core-nc.js"></script>
+- <script type="text/javascript"
src="tools/mootools/mootools-1.2-more-nc.js"></script>
+- <script type="text/javascript" src="js/mootools.ext.js"></script>
++ <script type="text/javascript"
src="/javascript/mootools/mootools.js"></script>
++ <script type="text/javascript"
src="/javascript/mootools/mootools-more.js"></script>
+ <?php
+ if ( $skinJsPhpFile )
+ {
diff -ur zoneminder-1.24.2/debian/rules zoneminder-1.24.2.mootools//debian/rules
--- zoneminder-1.24.2/debian/rules 2010-06-28 00:11:46.000000000 -0700
+++ zoneminder-1.24.2.mootools//debian/rules 2010-06-27 23:48:27.000000000
-0700
@@ -88,6 +88,11 @@
ln -s /var/cache/zoneminder/images
debian/zoneminder/usr/share/zoneminder/
ln -s /var/cache/zoneminder/temp debian/zoneminder/usr/share/zoneminder/
+ # remove shipped mootools, as it is now patched to use mootools
+ # from the libjs-mootools package. http://bugs.debian.org/585590
+ rm -rf debian/zoneminder/usr/share/zoneminder/tools/mootools
+ rm -f debian/zoneminder/usr/share/zoneminder/js/mootools.ext.js
+
#
# This is a slightly lesser kludge; moving the cgi stuff to
# /usr/share/zoneminder/cgi-bin breaks one set of behavior,
live well,
vagrant
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
