[lemonldap-ng] 01/01: Use libjs-angularjs since version 1.5 is now available

[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 5b269349c0418c620638d7c9f621bc725198f877
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Tue Apr 12 07:24:15 2016 +0200

    Use libjs-angularjs since version 1.5 is now available
---
 debian/changelog                        |  7 +++++++
 debian/control                          |  1 +
 debian/patches/keep-angular-files.patch | 35 ---------------------------------
 debian/patches/series                   |  1 -
 4 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3ad9fd..15e2391 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lemonldap-ng (1.9.1-2) unstable; urgency=medium
+
+  * Remove keep-angular-files patch since libjs-angularjs >1.4 is now
+    available
+
+ -- Xavier Guimard <x.guimard at free.fr>  Tue, 12 Apr 2016 07:23:34 +0200
+
 lemonldap-ng (1.9.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index cc4412e..3e03942 100644
--- a/debian/control
+++ b/debian/control
@@ -211,6 +211,7 @@ Package: liblemonldap-ng-manager-perl
 Architecture: all
 Depends: ${misc:Depends},
          ${perl:Depends},
+         libjs-angularjs (>= 1.4),
          libconvert-pem-perl,
          libcrypt-openssl-rsa-perl,
          libhtml-template-perl,
diff --git a/debian/patches/keep-angular-files.patch b/debian/patches/keep-angular-files.patch
deleted file mode 100644
index a52fde2..0000000
--- a/debian/patches/keep-angular-files.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Keep angular files until v1.4
- Since lemonldap-ng requires at least angularjs-1.4, this patch preserve
- angular files in tree even if "USEDEBIANLIBS=yes" is given to make
-Author: Xavier Guimard <x.guimard at free.fr>
-Forwarded: not-needed
-Last-Update: 2016-03-05
-
---- a/Makefile
-+++ b/Makefile
-@@ -158,9 +158,6 @@ DIFFPREFIX=
- 
- 
- MANAGERLIBSTOREMOVEFORDEBIAN=$(RMANAGERSTATICDIR)/bwr/jquery/ \
--			$(RMANAGERSTATICDIR)/bwr/angular/ \
--			$(RMANAGERSTATICDIR)/bwr/angular-animate/ \
--			$(RMANAGERSTATICDIR)/bwr/angular-cookie/ \
- 			$(RMANAGERSTATICDIR)/bwr/bootstrap/ \
- 			$(RMANAGERSTATICDIR)/bwr/es5-shim/
- PORTALLIBSTOREMOVEFORDEBIAN=$(RPORTALSKINSDIR)/bootstrap/fonts \
---- 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>
- <script type="text/javascript" src="/javascript/es5-shim/es5-shim.min.js"></script>
--<script type="text/javascript" src="/javascript/angular.js/angular.min.js"></script>
--<script type="text/javascript" src="/javascript/angular.js/angular-cookies.min.js"></script>
-+<script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/angular/angular.min.js"></script>
-+<script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/angular-cookies/angular-cookies.min.js"></script>
- <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/angular-ui-tree/dist/angular-ui-tree.min.js"></script>
--<script type="text/javascript" src="/javascript/angular.js/angular-animate.min.js"></script>
-+<script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/angular-animate/angular-animate.min.js"></script>
- <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
- <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/file-saver.js/FileSaver.min.js"></script>
- <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">js/llApp.min.js"></script>
diff --git a/debian/patches/series b/debian/patches/series
index 3f07564..eaf23d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-keep-angular-files.patch
 javascript-path.patch
 avoid-modify-sources.patch

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