Changeset 1276 for pmb4.2/trunk/fuentes

Timestamp:

Apr 26, 2016, 12:12:07 PM (5 years ago)

Author:

jrpelegrina

Message:

WIP in compatibility with php5-lliurex

Location:

pmb4.2/trunk/fuentes

Files:

• debian/control (modified) (1 diff)
• debian/pmb.postinst (modified) (2 diffs)
• pmb/tejuelo.php (modified) (1 diff)

pmb4.2/trunk/fuentes/debian/control

@@ -9 +9 @@
 Package: pmb
 Architecture: any
-Depends: ${misc:Depends}, mysql-server, mysql-client, php5-mysql, libapache2-mod-php5, php5-gd, php5-recode, php-fpdf, php5-xsl, php5-yaz, yaz
+Depends: ${misc:Depends}, mysql-server, mysql-client, php5-mysql, libapache2-mod-php5, php5-gd, php5-recode, php-fpdf, php5-xsl, php5-curl, php5-yaz, yaz
 Description: Integrated Library Management System
  PMB (4.2.6) is an entirely free ILS (Integrated Library management System).

pmb4.2/trunk/fuentes/debian/pmb.postinst

@@ -19 +19 @@
                 mkdir -p /etc/lliurex-tokens/
 
-                if [ ! -e /etc/lliurex-tokens/pmb4.1_phpsize ]; then
+                if [ ! -e /etc/lliurex-tokens/pmb4.2_phpsize ]; then
                         
                         # Setting the lliurex-token for pmb
                         echo " [ PMB 4.2 ] : PHP Upload size fixed to 20MB "
-                        echo "PHP Size fixed to 20MB " > /etc/lliurex-tokens/pmb4.1_phpsize
-                        date >> /etc/lliurex-tokens/pmb4.1_phpsize
+                        echo "PHP Size fixed to 20MB " > /etc/lliurex-tokens/pmb4.2_phpsize
+                        date >> /etc/lliurex-tokens/pmb4.2_phpsize
                         
                         # Calling utility
@@ -35 +35 @@
                 fi
                 
-                if [ ! -e /etc/lliurex-tokens/pmb4.1_javascript ]; then
+                if [ ! -e /etc/lliurex-tokens/pmb4.2_javascript ]; then
                         
                         # Setting the lliurex-token for pmb
                         echo " [ PMB 4.2 ] : Disable Javascript Common "
-                        echo "Disabled Javascript Common " > /etc/lliurex-tokens/pmb4.1_javascript
-                        date >> /etc/lliurex-tokens/pmb4.1_javascript
+                        echo "Disabled Javascript Common " > /etc/lliurex-tokens/pmb4.2_javascript
+                        date >> /etc/lliurex-tokens/pmb4.2_javascript
                         
                         # Calling utility
-                        a2disconf javascript-common || true
-
+                        #a2disconf javascript-common || true
+                         
+                        DISCONF="/usr/local/sbin/a2disconf-lliurex"
+                        ${DISCONF} javascript-common || true    
                 else
 

pmb4.2/trunk/fuentes/pmb/tejuelo.php

@@ -18 +18 @@
 require_once("$include_path/notice_categories.inc.php");
 //--------------------- LLIUREX 14/03/2016-----------------------
-require '/usr/share/php/fpdf/fpdf.php';
+//require '/usr/share/php/fpdf/fpdf.php';
 //--------------------- FIN LLIUREX 14/03/2016-------------------