From c93e13868e510e2d30f4231b5abb708faaa0fa1b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 1 Jun 2017 12:41:10 -0400
Subject: [PATCH] change to quilt frmo native.  Remove patches. We are
 upstream.

---
 .../ubuntu1204/patches/default_cgi-path.patch  | 16 ----------------
 distros/ubuntu1204/patches/series              |  2 --
 .../patches/use_libjs-mootools.patch           | 18 ------------------
 distros/ubuntu1204/source/format               |  2 +-
 4 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 distros/ubuntu1204/patches/default_cgi-path.patch
 delete mode 100644 distros/ubuntu1204/patches/use_libjs-mootools.patch

diff --git a/distros/ubuntu1204/patches/default_cgi-path.patch b/distros/ubuntu1204/patches/default_cgi-path.patch
deleted file mode 100644
index 8bfc2ba06..000000000
--- a/distros/ubuntu1204/patches/default_cgi-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Last-Update: 2015-08-16
-Forwarded: no
-Author: Dmitry Smirnov <onlyjob@member.fsf.org>
-Description: correct path to CGI app according to default web server configuration.
-
---- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
-+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
-@@ -428,7 +428,7 @@ our @options =
-     },
-     {
-         name        => "ZM_PATH_ZMS",
--        default     => "/cgi-bin/nph-zms",
-+        default     => "/zm/cgi-bin/nph-zms",
-         description => "Web path to zms streaming server",
-         help        => qqq("
-             The ZoneMinder streaming server is required to send streamed
diff --git a/distros/ubuntu1204/patches/series b/distros/ubuntu1204/patches/series
index fc70f4006..e69de29bb 100644
--- a/distros/ubuntu1204/patches/series
+++ b/distros/ubuntu1204/patches/series
@@ -1,2 +0,0 @@
-default_cgi-path.patch
-use_libjs-mootools.patch
diff --git a/distros/ubuntu1204/patches/use_libjs-mootools.patch b/distros/ubuntu1204/patches/use_libjs-mootools.patch
deleted file mode 100644
index b3925f6d0..000000000
--- a/distros/ubuntu1204/patches/use_libjs-mootools.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Last-Update: 2015-03-29
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/585590
-Reviewed-By: Dmitry Smirnov <onlyjob@member.fsf.org>
-Description: use mootools shipped by debian, rather than the zoneminder included mootools.
-
---- a/web/skins/classic/includes/functions.php
-+++ b/web/skins/classic/includes/functions.php
-@@ -63,9 +63,8 @@
-     }
- ?>
-   <script type="text/javascript" src="tools/mootools/mootools-core.js"></script>
-   <script type="text/javascript" src="tools/mootools/mootools-more.js"></script>
--  <script type="text/javascript" src="js/mootools.ext.js"></script>
-   <script type="text/javascript" src="js/logger.js"></script>
-   <script type="text/javascript" src="js/overlay.js"></script>
- <?php
-     if ( $skinJsPhpFile )
diff --git a/distros/ubuntu1204/source/format b/distros/ubuntu1204/source/format
index 89ae9db8f..163aaf8d8 100644
--- a/distros/ubuntu1204/source/format
+++ b/distros/ubuntu1204/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)