[SCM] Debian branch, master, updated. debian/1.2.2-1-10-g4e660f6
Xavier Guimard
x.guimard at free.fr
Tue Nov 27 05:34:16 UTC 2012
The following commit has been merged in the master branch:
commit 4e660f6a7149ae5c922324ac41b04d8b497337e2
Author: Xavier Guimard <x.guimard at free.fr>
Date: Tue Nov 27 06:30:16 2012 +0100
Fix little errors
diff --git a/debian/liblemonldap-ng-portal-perl.dirs b/debian/liblemonldap-ng-portal-perl.dirs
index 8e28a0c..eb44c8a 100644
--- a/debian/liblemonldap-ng-portal-perl.dirs
+++ b/debian/liblemonldap-ng-portal-perl.dirs
@@ -3,6 +3,7 @@
/usr/share/lemonldap-ng/portal
/usr/share/lemonldap-ng/portal-skins
/var/lib/lemonldap-ng/portal
+/var/lib/lemonldap-ng/portal/captcha_output
/var/lib/lemonldap-ng/sessions
/var/lib/lemonldap-ng/sessions/lock
/var/lib/lemonldap-ng/notifications
diff --git a/debian/patches/change-js-libs-by-shared-packages.patch b/debian/patches/change-js-libs-by-shared-packages.patch
index e7f8000..eb6a935 100644
--- a/debian/patches/change-js-libs-by-shared-packages.patch
+++ b/debian/patches/change-js-libs-by-shared-packages.patch
@@ -10,11 +10,11 @@ Last-Update: 2012-11-27
<link rel="openid2.provider" href="<TMPL_VAR NAME="PROVIDERURI">" />
</TMPL_IF>
- <script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/jquery-1.4.2.min.js"></script>
-+ <script type="text/javascript" src= /javascript/jquery/jquery.min.js"></script>
++ <script type="text/javascript" src="/javascript/jquery/jquery.min.js"></script>
<script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/jquery-ui-1.8.5.custom.min.js"></script>
<script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/jquery.base64.js"></script>
- <script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/jquery.cookie.js"></script>
-+ <script type="text/javascript" src= /javascript/jquery-cookie/jquery.cookie.min.js"></script>
++ <script type="text/javascript" src="/javascript/jquery-cookie/jquery.cookie.min.js"></script>
<script type="text/javascript">//<![CDATA[
var displaytab='<TMPL_VAR NAME="DISPLAY_TAB">';
var choicetab='<TMPL_VAR NAME="CHOICE_VALUE">';
@@ -25,11 +25,11 @@ Last-Update: 2012-11-27
<link rel="openid2.provider" href="<TMPL_VAR NAME="PROVIDERURI">" />
</TMPL_IF>
- <script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/jquery-1.4.2.min.js"></script>
-+ <script type="text/javascript" src= /javascript/jquery/jquery.min.js"></script>
++ <script type="text/javascript" src="/javascript/jquery/jquery.min.js"></script>
<script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/jquery-ui-1.8.5.custom.min.js"></script>
<script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/jquery.base64.js"></script>
- <script type="text/javascript" src="<TMPL_VAR NAME="SKIN_PATH">/common/jquery.cookie.js"></script>
-+ <script type="text/javascript" src= /javascript/jquery-cookie/jquery.cookie.min.js"></script>
++ <script type="text/javascript" src="/javascript/jquery-cookie/jquery.cookie.min.js"></script>
<script type="text/javascript">//<![CDATA[
var displaytab='<TMPL_VAR NAME="DISPLAY_TAB">';
var choicetab='<TMPL_VAR NAME="CHOICE_VALUE">';
@@ -40,10 +40,10 @@ Last-Update: 2012-11-27
<!-- Manager CSS -->
<link rel="stylesheet" type="text/css" id="cssmenu" href="<TMPL_VAR NAME="DIR">/css/<TMPL_VAR NAME="CSS">" />
-<script src="<TMPL_VAR NAME="DIR">/js/jquery-1.4.2.min.js" type="text/JavaScript"></script>
-+<script src= /javascript/jquery/jquery.min.js" type="text/JavaScript"></script>
++<script src="/javascript/jquery/jquery.min.js" type="text/JavaScript"></script>
<script src="<TMPL_VAR NAME="DIR">/js/jquery-ui-1.8.6.custom.min.js" type="text/JavaScript"></script>
-<script src="<TMPL_VAR NAME="DIR">/js/jquery.cookie.js" type="text/JavaScript"></script>
-+<script src= /javascript/jquery-cookie/jquery.cookie.min.js" type="text/JavaScript"></script>
++<script src="/javascript/jquery-cookie/jquery.cookie.min.js" type="text/JavaScript"></script>
<script src="<TMPL_VAR NAME="DIR">/js/tree.js" type="text/JavaScript"></script>
<script src="<TMPL_VAR NAME="DIR">/js/notifications.js" type="text/JavaScript"></script>
<script type="text/JavaScript">//<![CDATA[
@@ -54,10 +54,10 @@ Last-Update: 2012-11-27
<!-- Manager CSS -->
<link rel="stylesheet" type="text/css" id="cssmenu" href="<TMPL_VAR NAME="DIR">/css/<TMPL_VAR NAME="CSS">" />
-<script src="<TMPL_VAR NAME="DIR">/js/jquery-1.4.2.min.js" type="text/JavaScript"></script>
-+<script src= /javascript/jquery/jquery.min.js" type="text/JavaScript"></script>
++<script src="/javascript/jquery/jquery.min.js" type="text/JavaScript"></script>
<script src="<TMPL_VAR NAME="DIR">/js/jquery-ui-1.8.6.custom.min.js" type="text/JavaScript"></script>
-<script src="<TMPL_VAR NAME="DIR">/js/jquery.cookie.js" type="text/JavaScript"></script>
-+<script src= /javascript/jquery-cookie/jquery.cookie.min.js" type="text/JavaScript"></script>
++<script src="/javascript/jquery-cookie/jquery.cookie.min.js" type="text/JavaScript"></script>
<script src="<TMPL_VAR NAME="DIR">/js/tree.js" type="text/JavaScript"></script>
<script src="<TMPL_VAR NAME="DIR">/js/sessions.js" type="text/JavaScript"></script>
<script type="text/JavaScript">//<![CDATA[
@@ -68,10 +68,10 @@ Last-Update: 2012-11-27
<!-- Manager CSS -->
<link rel="stylesheet" type="text/css" id="cssmenu" href="<TMPL_VAR NAME="DIR">/css/<TMPL_VAR NAME="CSS">" />
-<script src="<TMPL_VAR NAME="DIR">/js/jquery-1.4.2.min.js" type="text/JavaScript"></script>
-+<script src= /javascript/jquery/jquery.min.js" type="text/JavaScript"></script>
++<script src="/javascript/jquery/jquery.min.js" type="text/JavaScript"></script>
<script src="<TMPL_VAR NAME="DIR">/js/jquery-ui-1.8.6.custom.min.js" type="text/JavaScript"></script>
-<script src="<TMPL_VAR NAME="DIR">/js/jquery.cookie.js" type="text/JavaScript"></script>
-+<script src= /javascript/jquery-cookie/jquery.cookie.min.js" type="text/JavaScript"></script>
++<script src="/javascript/jquery-cookie/jquery.cookie.min.js" type="text/JavaScript"></script>
<script src="<TMPL_VAR NAME="DIR">/js/jquery.ajaxfileupload.js" type="text/JavaScript"></script>
<script src="<TMPL_VAR NAME="DIR">/js/jquery.elastic.source.js" type="text/JavaScript"></script>
<script src="<TMPL_VAR NAME="DIR">/js/tree.js" type="text/JavaScript"></script>
--
Debian
More information about the Pkg-perl-cvs-commits
mailing list