Removed debian/patches/Updated_incorrect_name_for_angular_lrdragndrop.patch applied...

Rewritten-From: b31a0099595cc94f3537b414c96cf13c85daecc8

diff --git a/trusty/debian/patches/Updated_incorrect_name_for_angular_lrdragndrop.patch b/trusty/debian/patches/Updated_incorrect_name_for_angular_lrdragndrop.patch
deleted file mode 100644 (file)
index 363f822..0000000
--- a/trusty/debian/patches/Updated_incorrect_name_for_angular_lrdragndrop.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Subject: Updated incorrect name for angular lrdragndrop
- Updated incorrect name for angular lrdragndrop
- .
- Updated incorrect package name.
- Currently blocking packager from uploading due to incorrect name.
-Author: Thai Tran <tqtran@us.ibm.com>
-Date: Tue, 31 Mar 2015 01:41:47 +0000 (-0700)
-X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fhorizon.git;a=commitdiff_plain;h=4623b448559c814711de3aa814db09540994da63
-Depends-On: I808b34a9d13a16d82968904dd44515f3d67f0fde
-Bug-Ubuntu: https://launchpad.net/bugs/1438543
-Change-Id: Iecf00771f42b2eb76a9ff790b2ad857cf3cdc809
-Origin: Upstream, https://review.openstack.org/#/c/169133
-Last-Update: 2015-03-31
-
---- horizon-2015.1~b3.orig/requirements.txt
-+++ horizon-2015.1~b3/requirements.txt
-@@ -42,7 +42,7 @@ six>=1.9.0
- XStatic>=1.0.0  # MIT License
- XStatic-Angular>=1.3.7  # MIT License
- XStatic-Angular-Bootstrap>=0.11.0.2  # MIT License
--XStatic-Angular-Irdragndrop>=1.0.2.1  # MIT License
-+XStatic-Angular-lrdragndrop>=1.0.2.1  # MIT License
- XStatic-Bootstrap-Datepicker>=1.3.1.0  # Apache 2.0 License
- XStatic-Bootstrap-SCSS>=3  # Apache 2.0 License
- XStatic-D3>=3.1.6.2  # BSD License (3 clause)
---- horizon-2015.1~b3.orig/horizon/templates/horizon/_scripts.html
-+++ horizon-2015.1~b3/horizon/templates/horizon/_scripts.html
-@@ -11,7 +11,7 @@
- {% compress js %}
- <script type="text/javascript">var STATIC_URL = "{{ STATIC_URL }}";</script>
- <script src='{{ STATIC_URL }}horizon/lib/angular/angular-cookies.js'></script>
--<script src="{{ STATIC_URL }}horizon/lib/angular/irdragndrop.js"></script>
-+<script src="{{ STATIC_URL }}horizon/lib/angular/lrdragndrop.js"></script>
- <script src="{{ STATIC_URL }}horizon/lib/angular/smart-table.js"></script>
- 
- <script src='{{ STATIC_URL }}horizon/js/angular/controllers/namespace-controller.js'></script>
---- horizon-2015.1~b3.orig/horizon/templates/horizon/jasmine/jasmine.html
-+++ horizon-2015.1~b3/horizon/templates/horizon/jasmine/jasmine.html
-@@ -15,7 +15,7 @@
-   <script src="{{ STATIC_URL }}horizon/lib/angular/angular-cookies.js"></script>
-   <script src="{{ STATIC_URL }}horizon/lib/angular/angular-bootstrap.js"></script>
-   <script src="{{ STATIC_URL }}horizon/lib/angular/smart-table.js"></script>
--  <script src="{{ STATIC_URL }}horizon/lib/angular/irdragndrop.js"></script>
-+  <script src="{{ STATIC_URL }}horizon/lib/angular/lrdragndrop.js"></script>
-   <script src="{{ STATIC_URL }}horizon/lib/d3.js"></script>
- 
-   <script type="text/javascript">
---- horizon-2015.1~b3.orig/openstack_dashboard/static_settings.py
-+++ horizon-2015.1~b3/openstack_dashboard/static_settings.py
-@@ -20,7 +20,7 @@ to match their distribution's standards.
- import xstatic.main
- import xstatic.pkg.angular
- import xstatic.pkg.angular_bootstrap
--import xstatic.pkg.angular_irdragndrop
-+import xstatic.pkg.angular_lrdragndrop
- import xstatic.pkg.angular_smart_table
- import xstatic.pkg.bootstrap_datepicker
- import xstatic.pkg.bootstrap_scss
-@@ -46,7 +46,7 @@ STATICFILES_DIRS = [
-     ('horizon/lib/angular',
-         xstatic.main.XStatic(xstatic.pkg.angular_bootstrap).base_dir),
-     ('horizon/lib/angular',
--        xstatic.main.XStatic(xstatic.pkg.angular_irdragndrop).base_dir),
-+        xstatic.main.XStatic(xstatic.pkg.angular_lrdragndrop).base_dir),
-     ('horizon/lib/angular',
-         xstatic.main.XStatic(xstatic.pkg.angular_smart_table).base_dir),
-     ('horizon/lib/bootstrap_datepicker',

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 173dd2043556ef54bc54474dc16f113c67a846c2..e883b0358c2035eff2581538e242ec72baf1c5fe 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,4 +1,3 @@
 fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
-Updated_incorrect_name_for_angular_lrdragndrop.patch