[lemonldap-ng] 03/05: Update patches

[Xavier Guimard]

This is an automated email from the git hooks/post-receive script.

xguimard-guest pushed a commit to branch master
in repository lemonldap-ng.

commit b8868f9e9becc1014e1e5aadc8eee3af202d9ffb
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Tue Apr 5 21:43:35 2016 +0200

    Update patches
---
 debian/patches/javascript-path.patch    | 11 -----------
 debian/patches/keep-angular-files.patch |  8 ++++----
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/debian/patches/javascript-path.patch b/debian/patches/javascript-path.patch
index f2e9e67..1027c93 100644
--- a/debian/patches/javascript-path.patch
+++ b/debian/patches/javascript-path.patch
@@ -3,17 +3,6 @@ Author: Xavier Guimard <x.guimard at free.fr>
 Forwarded: http://websvn.ow2.org/comp.php?repname=lemonldap&compare[]=%2F at 4708&compare[]=%2F at 4709
 Last-Update: 2016-03-05
 
---- a/_example/etc/manager-apache2.X.conf
-+++ b/_example/etc/manager-apache2.X.conf
-@@ -27,7 +27,7 @@
-     # RewriteCond "%{REQUEST_FILENAME}" "!\.html$"
- 
-     # REST URLs
--    RewriteCond "%{REQUEST_FILENAME}" "!^/(?:static|doc|fr-doc|lib).*"
-+    RewriteCond "%{REQUEST_FILENAME}" "!^/(?:static|doc|fr-doc|lib|javascript|favicon).*"
-     RewriteRule "^/(.+)$" "/psgi/manager-server.fcgi/$1" [PT]
- 
-     Alias /psgi/ __MANAGERPSGIDIR__/
 --- a/_example/etc/manager-nginx.conf
 +++ b/_example/etc/manager-nginx.conf
 @@ -24,9 +24,9 @@
diff --git a/debian/patches/keep-angular-files.patch b/debian/patches/keep-angular-files.patch
index 710dd87..a52fde2 100644
--- a/debian/patches/keep-angular-files.patch
+++ b/debian/patches/keep-angular-files.patch
@@ -5,8 +5,8 @@ Author: Xavier Guimard <x.guimard at free.fr>
 Forwarded: not-needed
 Last-Update: 2016-03-05
 
---- lemonldap-ng-1.9.0.orig/Makefile
-+++ lemonldap-ng-1.9.0/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -158,9 +158,6 @@ DIFFPREFIX=
  
  
@@ -17,8 +17,8 @@ Last-Update: 2016-03-05
  			$(RMANAGERSTATICDIR)/bwr/bootstrap/ \
  			$(RMANAGERSTATICDIR)/bwr/es5-shim/
  PORTALLIBSTOREMOVEFORDEBIAN=$(RPORTALSKINSDIR)/bootstrap/fonts \
---- lemonldap-ng-1.9.0.orig/lemonldap-ng-manager/site/templates/scripts.tpl
-+++ lemonldap-ng-1.9.0/lemonldap-ng-manager/site/templates/scripts.tpl
+--- a/lemonldap-ng-manager/site/templates/scripts.tpl
++++ b/lemonldap-ng-manager/site/templates/scripts.tpl
 @@ -33,10 +33,10 @@
  <!-- //if:usedebianlibs
  <script type="text/javascript" src="/javascript/jquery/jquery.min.js"></script>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/lemonldap-ng.git