From 0b35a6f09a769f0019202fe6aca52cdbcff5c992 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 18 Jan 2021 07:59:54 -0600 Subject: [PATCH] remove mootools from debian packaging --- distros/beowulf/control | 1 - distros/beowulf/copyright | 6 ------ distros/beowulf/source/lintian-overrides | 8 ++------ distros/beowulf/zoneminder.linktrees | 12 ++---------- distros/ubuntu1604/control | 1 - distros/ubuntu1604/copyright | 6 ------ distros/ubuntu1604/source/lintian-overrides | 8 ++------ distros/ubuntu1604/zoneminder.linktrees | 12 ++---------- distros/ubuntu2004/control | 1 - distros/ubuntu2004/copyright | 6 ------ distros/ubuntu2004/source/lintian-overrides | 8 ++------ distros/ubuntu2004/zoneminder.linktrees | 12 ++---------- 12 files changed, 12 insertions(+), 69 deletions(-) diff --git a/distros/beowulf/control b/distros/beowulf/control index dd410c0ba..803d54dcc 100644 --- a/distros/beowulf/control +++ b/distros/beowulf/control @@ -34,7 +34,6 @@ Build-Depends: debhelper, sphinx-doc, dh-linktree, dh-apache2 ,libdata-entropy-perl # Unbundled (dh_linktree): ,libjs-jquery - ,libjs-mootools Standards-Version: 3.9.8 Homepage: http://www.zoneminder.com/ Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git diff --git a/distros/beowulf/copyright b/distros/beowulf/copyright index c48025a25..a932efa2f 100644 --- a/distros/beowulf/copyright +++ b/distros/beowulf/copyright @@ -9,7 +9,6 @@ Comment: on Fri, 8 Dec 2006 10:19:43 +1100 Files-Excluded: web/skins/*/js/jquery-* - web/tools/mootools/*-yc.js Files: * Copyright: 2001-2014 Philip Coombes @@ -37,11 +36,6 @@ Comment: Includes Sizzle.js http://sizzlejs.com/ Released under the MIT, BSD, and GPL Licenses. -Files: web/tools/mootools/*.js -Copyright: 2009 Marcelo Jorge Vieira (metal) - 2006-2010 Valerio Proietti (http://mad4milk.net/) -License: Expat - Files: web/api/* Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org) License: Expat diff --git a/distros/beowulf/source/lintian-overrides b/distros/beowulf/source/lintian-overrides index 3669e5de8..f905a5a2f 100644 --- a/distros/beowulf/source/lintian-overrides +++ b/distros/beowulf/source/lintian-overrides @@ -1,9 +1,5 @@ -## Actually sources are there: "*-nc.js". -source-is-missing web/tools/mootools/mootools-*-yc.js - ## We're using "libjs-jquery" instead. -source-is-missing web/skins/*/js/jquery-1.4.2.min.js +source-is-missing web/skins/*/js/jquery-3.5.1.min.js ## Acknowledged, will repack eventually. -source-contains-prebuilt-javascript-object web/tools/mootools/mootools-*-yc.js -source-contains-prebuilt-javascript-object web/skins/*/js/jquery-1.4.2.min.js +source-contains-prebuilt-javascript-object web/skins/*/js/jquery-3.5.1.min.js diff --git a/distros/beowulf/zoneminder.linktrees b/distros/beowulf/zoneminder.linktrees index 2e843bbf1..8a9ca2723 100644 --- a/distros/beowulf/zoneminder.linktrees +++ b/distros/beowulf/zoneminder.linktrees @@ -1,14 +1,6 @@ ## cakephp #replace /usr/share/php/Cake /usr/share/zoneminder/www/api/lib/Cake -## libjs-mootools -replace /usr/share/javascript/mootools/mootools.js /usr/share/zoneminder/www/tools/mootools/mootools-core.js -replace /usr/share/javascript/mootools/mootools.js /usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-nc.js -replace /usr/share/javascript/mootools/mootools.js /usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-yc.js -replace /usr/share/javascript/mootools/mootools-more.js /usr/share/zoneminder/www/tools/mootools/mootools-more.js -replace /usr/share/javascript/mootools/mootools-more.js /usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-nc.js -replace /usr/share/javascript/mootools/mootools-more.js /usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-yc.js - ## libjs-jquery -replace /usr/share/javascript/jquery/jquery.min.js /usr/share/zoneminder/www/skins/classic/js/jquery-1.4.2.min.js -replace /usr/share/javascript/jquery/jquery.min.js /usr/share/zoneminder/www/skins/flat/js/jquery-1.4.2.min.js +replace /usr/share/javascript/jquery/jquery.min.js /usr/share/zoneminder/www/skins/classic/js/jquery-3.5.1.min.js +replace /usr/share/javascript/jquery/jquery.min.js /usr/share/zoneminder/www/skins/flat/js/jquery-3.5.1.min.js diff --git a/distros/ubuntu1604/control b/distros/ubuntu1604/control index 34af7cef1..8900db428 100644 --- a/distros/ubuntu1604/control +++ b/distros/ubuntu1604/control @@ -36,7 +36,6 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa ,libvncserver-dev # Unbundled (dh_linktree): ,libjs-jquery - ,libjs-mootools Standards-Version: 3.9.8 Homepage: http://www.zoneminder.com/ Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git diff --git a/distros/ubuntu1604/copyright b/distros/ubuntu1604/copyright index c48025a25..a932efa2f 100644 --- a/distros/ubuntu1604/copyright +++ b/distros/ubuntu1604/copyright @@ -9,7 +9,6 @@ Comment: on Fri, 8 Dec 2006 10:19:43 +1100 Files-Excluded: web/skins/*/js/jquery-* - web/tools/mootools/*-yc.js Files: * Copyright: 2001-2014 Philip Coombes @@ -37,11 +36,6 @@ Comment: Includes Sizzle.js http://sizzlejs.com/ Released under the MIT, BSD, and GPL Licenses. -Files: web/tools/mootools/*.js -Copyright: 2009 Marcelo Jorge Vieira (metal) - 2006-2010 Valerio Proietti (http://mad4milk.net/) -License: Expat - Files: web/api/* Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org) License: Expat diff --git a/distros/ubuntu1604/source/lintian-overrides b/distros/ubuntu1604/source/lintian-overrides index 3669e5de8..f905a5a2f 100644 --- a/distros/ubuntu1604/source/lintian-overrides +++ b/distros/ubuntu1604/source/lintian-overrides @@ -1,9 +1,5 @@ -## Actually sources are there: "*-nc.js". -source-is-missing web/tools/mootools/mootools-*-yc.js - ## We're using "libjs-jquery" instead. -source-is-missing web/skins/*/js/jquery-1.4.2.min.js +source-is-missing web/skins/*/js/jquery-3.5.1.min.js ## Acknowledged, will repack eventually. -source-contains-prebuilt-javascript-object web/tools/mootools/mootools-*-yc.js -source-contains-prebuilt-javascript-object web/skins/*/js/jquery-1.4.2.min.js +source-contains-prebuilt-javascript-object web/skins/*/js/jquery-3.5.1.min.js diff --git a/distros/ubuntu1604/zoneminder.linktrees b/distros/ubuntu1604/zoneminder.linktrees index 2e843bbf1..8a9ca2723 100644 --- a/distros/ubuntu1604/zoneminder.linktrees +++ b/distros/ubuntu1604/zoneminder.linktrees @@ -1,14 +1,6 @@ ## cakephp #replace /usr/share/php/Cake /usr/share/zoneminder/www/api/lib/Cake -## libjs-mootools -replace /usr/share/javascript/mootools/mootools.js /usr/share/zoneminder/www/tools/mootools/mootools-core.js -replace /usr/share/javascript/mootools/mootools.js /usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-nc.js -replace /usr/share/javascript/mootools/mootools.js /usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-yc.js -replace /usr/share/javascript/mootools/mootools-more.js /usr/share/zoneminder/www/tools/mootools/mootools-more.js -replace /usr/share/javascript/mootools/mootools-more.js /usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-nc.js -replace /usr/share/javascript/mootools/mootools-more.js /usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-yc.js - ## libjs-jquery -replace /usr/share/javascript/jquery/jquery.min.js /usr/share/zoneminder/www/skins/classic/js/jquery-1.4.2.min.js -replace /usr/share/javascript/jquery/jquery.min.js /usr/share/zoneminder/www/skins/flat/js/jquery-1.4.2.min.js +replace /usr/share/javascript/jquery/jquery.min.js /usr/share/zoneminder/www/skins/classic/js/jquery-3.5.1.min.js +replace /usr/share/javascript/jquery/jquery.min.js /usr/share/zoneminder/www/skins/flat/js/jquery-3.5.1.min.js diff --git a/distros/ubuntu2004/control b/distros/ubuntu2004/control index f0cf23a27..ca59cedbd 100644 --- a/distros/ubuntu2004/control +++ b/distros/ubuntu2004/control @@ -36,7 +36,6 @@ Build-Depends: debhelper, dh-systemd, sphinx-doc, python3-sphinx, dh-linktree, d ,libvncserver-dev # Unbundled (dh_linktree): ,libjs-jquery - ,libjs-mootools Standards-Version: 3.9.8 Homepage: http://www.zoneminder.com/ Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git diff --git a/distros/ubuntu2004/copyright b/distros/ubuntu2004/copyright index c48025a25..a932efa2f 100644 --- a/distros/ubuntu2004/copyright +++ b/distros/ubuntu2004/copyright @@ -9,7 +9,6 @@ Comment: on Fri, 8 Dec 2006 10:19:43 +1100 Files-Excluded: web/skins/*/js/jquery-* - web/tools/mootools/*-yc.js Files: * Copyright: 2001-2014 Philip Coombes @@ -37,11 +36,6 @@ Comment: Includes Sizzle.js http://sizzlejs.com/ Released under the MIT, BSD, and GPL Licenses. -Files: web/tools/mootools/*.js -Copyright: 2009 Marcelo Jorge Vieira (metal) - 2006-2010 Valerio Proietti (http://mad4milk.net/) -License: Expat - Files: web/api/* Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org) License: Expat diff --git a/distros/ubuntu2004/source/lintian-overrides b/distros/ubuntu2004/source/lintian-overrides index 3669e5de8..f905a5a2f 100644 --- a/distros/ubuntu2004/source/lintian-overrides +++ b/distros/ubuntu2004/source/lintian-overrides @@ -1,9 +1,5 @@ -## Actually sources are there: "*-nc.js". -source-is-missing web/tools/mootools/mootools-*-yc.js - ## We're using "libjs-jquery" instead. -source-is-missing web/skins/*/js/jquery-1.4.2.min.js +source-is-missing web/skins/*/js/jquery-3.5.1.min.js ## Acknowledged, will repack eventually. -source-contains-prebuilt-javascript-object web/tools/mootools/mootools-*-yc.js -source-contains-prebuilt-javascript-object web/skins/*/js/jquery-1.4.2.min.js +source-contains-prebuilt-javascript-object web/skins/*/js/jquery-3.5.1.min.js diff --git a/distros/ubuntu2004/zoneminder.linktrees b/distros/ubuntu2004/zoneminder.linktrees index 2e843bbf1..8a9ca2723 100644 --- a/distros/ubuntu2004/zoneminder.linktrees +++ b/distros/ubuntu2004/zoneminder.linktrees @@ -1,14 +1,6 @@ ## cakephp #replace /usr/share/php/Cake /usr/share/zoneminder/www/api/lib/Cake -## libjs-mootools -replace /usr/share/javascript/mootools/mootools.js /usr/share/zoneminder/www/tools/mootools/mootools-core.js -replace /usr/share/javascript/mootools/mootools.js /usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-nc.js -replace /usr/share/javascript/mootools/mootools.js /usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-yc.js -replace /usr/share/javascript/mootools/mootools-more.js /usr/share/zoneminder/www/tools/mootools/mootools-more.js -replace /usr/share/javascript/mootools/mootools-more.js /usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-nc.js -replace /usr/share/javascript/mootools/mootools-more.js /usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-yc.js - ## libjs-jquery -replace /usr/share/javascript/jquery/jquery.min.js /usr/share/zoneminder/www/skins/classic/js/jquery-1.4.2.min.js -replace /usr/share/javascript/jquery/jquery.min.js /usr/share/zoneminder/www/skins/flat/js/jquery-1.4.2.min.js +replace /usr/share/javascript/jquery/jquery.min.js /usr/share/zoneminder/www/skins/classic/js/jquery-3.5.1.min.js +replace /usr/share/javascript/jquery/jquery.min.js /usr/share/zoneminder/www/skins/flat/js/jquery-3.5.1.min.js