From 2951df802584cc3b31ff87ed6181634fdbc433ae Mon Sep 17 00:00:00 2001 From: Christian Bayle Date: Tue, 20 Sep 2011 18:05:56 +0000 Subject: [PATCH] Revert last change --- .gitattributes | 2 +- 3rd-party/php-jpgraph/libphp-jpgraph_1.5.2-12.diff | 1604 -------------------- .../php-jpgraph/libphp-jpgraph_1.5.2-12.diff.gz | Bin 0 -> 8595 bytes 3 files changed, 1 insertion(+), 1605 deletions(-) delete mode 100644 3rd-party/php-jpgraph/libphp-jpgraph_1.5.2-12.diff create mode 100644 3rd-party/php-jpgraph/libphp-jpgraph_1.5.2-12.diff.gz diff --git a/.gitattributes b/.gitattributes index a9a912c..998397d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -49,7 +49,7 @@ 3rd-party/php-htmlpurifier/php-htmlpurifier_4.0.0+dfsg1.orig.tar.gz -text svneol=unset#application/gzip 3rd-party/php-jpgraph/jpgraph-1.5.2-php5_and_liberation_fonts.patch -text 3rd-party/php-jpgraph/jpgraph-rhel-fonts.patch -text -3rd-party/php-jpgraph/libphp-jpgraph_1.5.2-12.diff -text +3rd-party/php-jpgraph/libphp-jpgraph_1.5.2-12.diff.gz -text svneol=unset#unset 3rd-party/php-jpgraph/libphp-jpgraph_1.5.2.orig.tar.gz -text svneol=unset#application/gzip 3rd-party/php-jpgraph/php-jpgraph.spec -text 3rd-party/php-mail-mbox/Makefile -text diff --git a/3rd-party/php-jpgraph/libphp-jpgraph_1.5.2-12.diff b/3rd-party/php-jpgraph/libphp-jpgraph_1.5.2-12.diff deleted file mode 100644 index 9ff0211..0000000 --- a/3rd-party/php-jpgraph/libphp-jpgraph_1.5.2-12.diff +++ /dev/null @@ -1,1604 +0,0 @@ ---- libphp-jpgraph-1.5.2.orig/debian/changelog -+++ libphp-jpgraph-1.5.2/debian/changelog -@@ -0,0 +1,110 @@ -+libphp-jpgraph (1.5.2-12) unstable; urgency=low -+ -+ * Add support for free LIBERATION fonts -+ and depends on ttf-liberation (Thanks to Alain Peyrat) or non free -+ alternate ttf-mscorefonts-installer (Closes: #490037) -+ * Claim support for php5 and remove php4 depends in control -+ file (Closes: #524172) -+ * Changed section from web to php -+ -+ -- Christian Bayle Sun, 26 Apr 2009 23:46:16 +0200 -+ -+libphp-jpgraph (1.5.2-11+u1) unstable; urgency=low -+ -+ * Non-maintainer upload. -+ * Applied patch that prevented PHP5 compile time generated warning -+ "Non-static method called statically" to appear on screen and corrupts -+ the output of graphics. The usual error_reporting and display_errors -+ had no effect as a custom error handler was installed by the library. -+ Closes: #436289 -+ -+ -- Christian Hammers Sat, 10 Jan 2009 00:10:30 +0100 -+ -+libphp-jpgraph (1.5.2-11) unstable; urgency=low -+ -+ * Added support for php5(-gd), reviewed all example that seems to work -+ (Closes: #424795) affected by php4-removal -+ -+ -- Christian Bayle Wed, 23 May 2007 01:24:50 +0200 -+ -+libphp-jpgraph (1.5.2-10.1) unstable; urgency=low -+ -+ * Non-Maintainer upload with maintainer consent. -+ -+ * Apply patch to make $gd2 global really global (Closes: #354637). -+ -+ * Bring out-of-sync debhelper version in sync to level 5. -+ * Install upstream Changelog. -+ * Update FSF address in debian/copyright. -+ * Checked for policy version 3.7.2. -+ -+ -- Thijs Kinkhorst Wed, 5 Jul 2006 16:51:18 +0200 -+ -+libphp-jpgraph (1.5.2-10) unstable; urgency=low -+ -+ * msttcorefonts dir changed (in package msttcorefonts) -+ from /usr/share/fonts/truetype/ to /usr/share/fonts/truetype/msttcorefonts/ -+ (Closes: #275281) -+ -+ -- Christian Bayle Thu, 7 Oct 2004 21:24:42 +0200 -+ -+libphp-jpgraph (1.5.2-9) unstable; urgency=low -+ -+ * Applied a patch proposed by Guillaume Smet that add a fake -+ SetMargin method and a doing nothing ExplodeSlice method, to make this -+ make work better with gforge package. -+ * Finnaly commented the fake SetMargin -+ -+ -- Christian Bayle Mon, 13 Sep 2004 22:34:42 +0200 -+ -+libphp-jpgraph (1.5.2-8) unstable; urgency=low -+ -+ * Changed dependancy on php4-gd2 with php4-gd (Closes: #257999) -+ * I explain in copyright file why I don't upgrade to new QPLed + non -+ commercial use clause upstream version, this is not DFSG compliant (Closes: #258104) -+ -+ -- Christian Bayle Wed, 1 Sep 2004 22:58:59 +0200 -+ -+libphp-jpgraph (1.5.2-7) unstable; urgency=low -+ -+ * Added alternate depend on libapache2-mod-php4 to support apache2 -+ (closes bug#255315) -+ -+ -- Christian Bayle Fri, 25 Jun 2004 09:52:29 +0200 -+ -+libphp-jpgraph (1.5.2-6) stable; urgency=low -+ -+ * Woody backport -+ -+ -- Christian Bayle Thu, 15 Apr 2004 11:22:26 +0200 -+ -+libphp-jpgraph (1.5.2-5) unstable; urgency=low -+ -+ * Changed dependancy on php4-gd for php4-gd2 -+ * Changed density in jpgraph_gantt.php as suggested by Joseph Miller (joff) -+ -+ -- Christian Bayle Thu, 15 Apr 2004 11:20:58 +0200 -+ -+libphp-jpgraph (1.5.2-4) stable; urgency=low -+ -+ * Woody backport -+ -+ -- Christian Bayle Sat, 27 Mar 2004 17:45:25 +0100 -+ -+libphp-jpgraph (1.5.2-3) unstable; urgency=low -+ -+ * New First upload (closes #173601) ITP -+ * This package was released by Luis Bustamante -+ * Luis who allowed me to upload the package will maintain the package -+ when he will have more time to work on it. -+ * For some licensing reason it was probably rejected -+ * This is the packaging of and older GPLed release -+ * I changed cache and ttf path in ./src/jpgraph_dir.php -+ * I disabled caching in ./src/jpgraph.php -+ * I corrected imagefilledelipse broken function -+ * I corrected path in examples -+ * I corrected font names -+ * I added gantt->SetMargin function needed by gforge package -+ -+ -- Christian Bayle Thu, 19 Feb 2004 23:50:14 +0100 -+ ---- libphp-jpgraph-1.5.2.orig/debian/libphp-jpgraph.dirs -+++ libphp-jpgraph-1.5.2/debian/libphp-jpgraph.dirs -@@ -0,0 +1,3 @@ -+usr/share/jpgraph/ -+var/cache/jpgraph/ -+ ---- libphp-jpgraph-1.5.2.orig/debian/compat -+++ libphp-jpgraph-1.5.2/debian/compat -@@ -0,0 +1 @@ -+5 ---- libphp-jpgraph-1.5.2.orig/debian/copyright -+++ libphp-jpgraph-1.5.2/debian/copyright -@@ -0,0 +1,37 @@ -+This package was debianized by Luis Bustamante on -+Thu, 19 Dec 2002 13:48:02 -0500. -+For licensing reasons only GPLed 1.5.2 is now packaged by Christian Bayle -+ -+ -+To be clear for those that would ask why I don't upload the new 1.17 QPLed -+version. You can read on the home page: -+ -+"JpGraph is released under a dual license. QPL 1.0 (Qt Free Licensee) For -+non-commercial, open-source and educational use and JpGraph Professional -+License for commercial use." -+This is not compliant with DFSG #6 -+"The license must not restrict anyone from making use of the program in a -+specific field of endeavor. For example, it may not restrict the program from -+being used in a business, or from being used for genetic research." -+ -+It was downloaded from: -+http://www.aditus.nu/jpgraph/downloads/jpgraph-1.5.2.tar.gz -+ -+Upstream Author: Johan Persson -+Copyright (C) 2001 Johan Persson -+ -+Copyright: -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License with -+ the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2; -+ if not, write to the Free Software Foundation, Inc., 51 Franklin Street, -+ Fifth Floor, Boston, MA 02110-1301, USA ---- libphp-jpgraph-1.5.2.orig/debian/rules -+++ libphp-jpgraph-1.5.2/debian/rules -@@ -0,0 +1,34 @@ -+#!/usr/bin/make -f -+# rules for libphp-jpgraph package -+# by Luis Bustamante (luferbu@fluidsignal.com) -+ -+build: -+ -+clean: -+ dh_testdir -+ dh_testroot -+ dh_clean -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ dh_install -+ -+binary: binary-indep -+ -+binary-arch: install -+ -+binary-indep: install -+ dh_testdir -+ dh_testroot -+ dh_installdocs -+ dh_installexamples -plibphp-jpgraph-examples src/Examples/* -+ chmod 644 $(CURDIR)/debian/libphp-jpgraph-examples/usr/share/doc/libphp-jpgraph-examples/examples/* -+ dh_installchangelogs src/Changelog -+ dh_compress -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ ---- libphp-jpgraph-1.5.2.orig/debian/install -+++ libphp-jpgraph-1.5.2/debian/install -@@ -0,0 +1 @@ -+src/*.php /usr/share/jpgraph ---- libphp-jpgraph-1.5.2.orig/debian/libphp-jpgraph.docs -+++ libphp-jpgraph-1.5.2/debian/libphp-jpgraph.docs -@@ -0,0 +1 @@ -+README ---- libphp-jpgraph-1.5.2.orig/debian/control -+++ libphp-jpgraph-1.5.2/debian/control -@@ -0,0 +1,33 @@ -+Source: libphp-jpgraph -+Section: php -+Priority: optional -+Maintainer: Christian Bayle -+Build-Depends: debhelper (>= 5) -+Standards-Version: 3.8.1.0 -+ -+Package: libphp-jpgraph -+Architecture: all -+Depends: libapache2-mod-php5 | php5 | php5-cgi, php5-gd, ttf-liberation | ttf-mscorefonts-installer -+Description: Object oriented graph library for php5 -+ JpGraph is an object oriented class library for php5. JpGraph makes -+ it easy to draw both "quick and dirty" graphs with a minimum of code -+ and complex professional graphs which requires a very fine grain -+ control. JpGraph is equally well suited for both scientific and -+ business type of graphs. Though claimed as non php5 works perfectly -+ for all samples with php5. This is the last GPLed version, -+ more recent version are non DFSG complianti (See copyright file). -+ -+Package: libphp-jpgraph-examples -+Architecture: all -+Depends: libphp-jpgraph -+Description: Object oriented graph library for php5 (examples) -+ JpGraph is an object oriented class library for php5. JpGraph makes -+ it easy to draw both "quick and dirty" graphs with a minimum of code -+ and complex professional graphs which requires a very fine grain -+ control. JpGraph is equally well suited for both scientific and -+ business type of graphs. Though claimed as non php5 works perfectly -+ for all samples with php5. This is the last GPLed version, -+ more recent version are non DFSG complianti (See copyright file). -+ . -+ This package contains examples for using JpGraph library. -+ ---- libphp-jpgraph-1.5.2.orig/src/jpgraph_gantt.php -+++ libphp-jpgraph-1.5.2/src/jpgraph_gantt.php -@@ -1157,9 +1157,9 @@ - $this->iCaptionMargin=$aMarg; - } - -- function GetLineNbr() { -- return 0; -- } -+// function GetLineNbr() { -+// return 0; -+// } - - function GetAbsHeight($aImg) { - return 0; -@@ -1189,7 +1189,7 @@ - $this->iProgress = $aProg; - } - -- function SetPattern($aPattern,$aColor="blue",$aDensity=98) { -+ function SetPattern($aPattern,$aColor="blue",$aDensity=100) { - $this->iPattern = $aPattern; - $this->iColor = $aColor; - $this->iDensity = $aDensity; ---- libphp-jpgraph-1.5.2.orig/src/jpgraph_dir.php -+++ libphp-jpgraph-1.5.2/src/jpgraph_dir.php -@@ -16,7 +16,7 @@ - //------------------------------------------------------------------ - // The full absolute name of directory to be used as a cache. This directory MUST - // be readable and writable for PHP. Must end with '/' --DEFINE("CACHE_DIR","/tmp/jpgraph_cache/"); -+DEFINE("CACHE_DIR","/var/cache/jpgraph/"); - - // The URL relative name where the cache can be found, i.e - // under what HTTP directory can the cache be found. Normally -@@ -25,6 +25,9 @@ - DEFINE("APACHE_CACHE_DIR","/jpgraph_cache/"); - - // Directory for TTF fonts. Must end with '/' --DEFINE("TTF_DIR","/usr/local/fonts/ttf/"); -+DEFINE("TTF_DIR","/usr/share/fonts/truetype/msttcorefonts/"); -+ -+// Add Free liberation font as suggested by Alain Peyrat -+DEFINE("LIBERATION_DIR","/usr/share/fonts/truetype/ttf-liberation/"); - - ?> ---- libphp-jpgraph-1.5.2.orig/src/jpgraph.php -+++ libphp-jpgraph-1.5.2/src/jpgraph.php -@@ -30,7 +30,8 @@ - // regenerate the image. Note that even if reading the cache is - // disabled the cached will still be updated with the newly generated - // image. Set also "USE_CACHE" below. --DEFINE("READ_CACHE",true); -+//DEFINE("READ_CACHE",true); -+DEFINE("READ_CACHE",false); - - // Should the cache be used at all? By setting this to false no - // files will be generated in the cache directory. -@@ -38,7 +39,8 @@ - // false will still create the image in the cache directory - // just not use it. By setting USE_CACHE=false no files will even - // be generated in the cache directory. --DEFINE("USE_CACHE",true); -+//DEFINE("USE_CACHE",true); -+DEFINE("USE_CACHE",false); - - // If the color palette is full should JpGraph try to allocate - // the closest match? If you plan on using background image or -@@ -104,6 +106,7 @@ - DEFINE("FF_COMIC",14); - DEFINE("FF_ARIAL",15); - DEFINE("FF_BOOK",16); -+DEFINE("FF_LIBERATION_SANS",17); - - // TTF Font styles - DEFINE("FS_NORMAL",1); -@@ -244,18 +247,20 @@ - //user - // - if( isset($GLOBALS['php_errormsg']) ) { -- JpGraphError::Raise("General PHP error:
".$GLOBALS['php_errormsg']); -+ // Disabled by Debian to prevent showing PHP5 warnings -+ // ("Non-static method called statically") -+ // JpGraphError::Raise("General PHP error:
".$GLOBALS['php_errormsg']); - } - - // - // Check what version of the GD library is being used - // - if(function_exists('imagecopyresampled') ) { -- $gd2 = true; -+ $GLOBALS['gd2'] = true; - $copyfunc = "imagecopyresampled"; - } elseif(function_exists('imagecopyresized')) { - $copyfunc = "imagecopyresized"; -- $gd2 = false; -+ $GLOBALS['gd2'] = false; - } - else { - JpGraphError::Raise("JpGraph Error: Your PHP installation does not -@@ -280,10 +285,10 @@ - $img_format="gif"; - elseif( $supported & IMG_JPG ) - $img_format="jpeg"; -- if( !isset($HTTP_SERVER_VARS['PHP_SELF']) ) -+ if( !isset($_SERVER['PHP_SELF']) ) - JpGraphError::Raise("JpGraph Error: Can't access PHP_SELF, PHP global variable. You can't run PHP from command line - if you want to use the 'auto' naming of cache or image files."); -- $fname=basename($HTTP_SERVER_VARS['PHP_SELF']); -+ $fname=basename($_SERVER['PHP_SELF']); - // Replace the ".php" extension with the image format extension - return substr($fname,0,strlen($fname)-4).".".$img_format; - } -@@ -426,6 +431,11 @@ - //--------------- - // PUBLIC METHODS - -+ // OW : fake method to have reporting working -+ //function SetMargin($x1, $x2, $x3, $x4) { -+ // return true; -+ //} -+ - // Should the grid be in front or back of the plot? - function SetGridDepth($aDepth) { - $this->grid_depth=$aDepth; -@@ -490,6 +500,8 @@ - // Specify a background image - function SetBackgroundImage($aFileName,$aBgType=BKIMG_FILLPLOT,$aImgFormat="png") { - -+/* CB Not any more bugging -+ - if( $GLOBALS["gd2"] && !USE_TRUECOLOR ) { - JpGraphError::Raise("JpGraph Error:You are using GD 2.x and are - trying to use a background images on a non truecolor image.
-@@ -500,6 +512,7 @@ - using any truetype fonts with truecolor images will result in very - poor quality fonts."); - } -+*/ - - $this->background_image = $aFileName; - $this->background_image_type=$aBgType; -@@ -1064,6 +1077,10 @@ - $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1); - } - } -+ // Set Margin by Christian Bayle -+ function SetMargin($lm,$rm,$tm,$bm) { -+ $this->img->SetMargin($lm,$rm,$tm,$bm); -+ } - } // Class - - -@@ -1078,13 +1095,14 @@ - function TTF() { - // Base file names for available fonts - $this->font_fam=array( -- FF_COURIER => TTF_DIR."courier", -- FF_VERDANA => TTF_DIR."verdana", -- FF_TIMES => TTF_DIR."times", -- FF_HANDWRT => TTF_DIR."handwriting", -- FF_COMIC => TTF_DIR."comic", -- FF_ARIAL => TTF_DIR."arial", -- FF_BOOK => TTF_DIR."bookant"); -+ FF_COURIER => TTF_DIR."Courier_New", -+ FF_VERDANA => TTF_DIR."Verdana", -+ FF_TIMES => TTF_DIR."Times", -+ FF_HANDWRT => TTF_DIR."Handwriting", -+ FF_COMIC => TTF_DIR."Comic", -+ FF_ARIAL => TTF_DIR."Arial", -+ FF_BOOK => TTF_DIR."Bookant", -+ FF_LIBERATION_SANS => LIBERATION_DIR."LiberationSans-Regular"); - } - - //--------------- -@@ -1096,11 +1114,11 @@ - switch( $style ) { - case FS_NORMAL: - break; -- case FS_BOLD: $f .= "bd"; -+ case FS_BOLD: $f .= "_Bold"; - break; -- case FS_ITALIC: $f .= "i"; -+ case FS_ITALIC: $f .= "_Italic"; - break; -- case FS_BOLDIT: $f .= "bi"; -+ case FS_BOLDIT: $f .= "_Bold_Italic"; - break; - default: - JpGraphError::Raise("JpGraph Error: Unknown TTF Style."); -@@ -3183,7 +3201,7 @@ - } - } - } -- elseif($this->font_family >= FF_COURIER && $this->font_family <= FF_BOOK) { // TTF font -+ elseif($this->font_family >= FF_COURIER && $this->font_family <= FF_LIBERATION_SANS) { // TTF font - $file = $this->ttf->File($this->font_family,$this->font_style); - $angle=$dir; - $bbox=ImageTTFBBox($this->font_size,$angle,$file,$txt); -@@ -3208,7 +3226,7 @@ - } - } - else -- JpGraphError::Raise("JpGraph Error: Unknown font font family specification. "); -+ JpGraphError::Raise("JpGraph Error: Unknown font family specification: ". $this->font_family); - } - - function SetMargin($lm,$rm,$tm,$bm) { -@@ -3490,7 +3508,16 @@ - } - - function FilledCircle($xc,$yc,$r) { -- imagefilledellipse($this->img,$xc,$yc,2*$r,2*$r,$this->current_color); -+ if( $GLOBALS['gd2'] ) { -+ imagefilledellipse($this->img,$xc,$yc,2*$r,2*$r,$this->current_color); -+ } -+ else { -+ for( $i=1; $i < 2*$r; $i += 2 ) { -+ $this->Arc($xc,$yc,$i,$i,0,360); -+ $this->Arc($xc,$yc,$i+1,$i,0,360); -+ $this->Arc($xc,$yc,$i+1,$i+1,0,360); -+ } -+ } - } - - // Linear Color InterPolation ---- libphp-jpgraph-1.5.2.orig/src/jpgraph_pie3d.php -+++ libphp-jpgraph-1.5.2/src/jpgraph_pie3d.php -@@ -88,7 +88,7 @@ - - - function ExplodeSlice($e) { -- JpGraphError::Raise("JpGraph Error: Exploding slices are not (yet) implemented for 3d pies graphs."); -+ //JpGraphError::Raise("JpGraph Error: Exploding slices are not (yet) implemented for 3d pies graphs."); - //$this->explode_slice=$e; - } - ---- libphp-jpgraph-1.5.2.orig/src/Examples/example1.1.php -+++ libphp-jpgraph-1.5.2/src/Examples/example1.1.php -@@ -1,8 +1,8 @@ - SetColor("white"); ---- libphp-jpgraph-1.5.2.orig/src/Examples/impulsex1.php -+++ libphp-jpgraph-1.5.2/src/Examples/impulsex1.php -@@ -1,6 +1,6 @@ - #noBgw%k>LekY^7|uEQ?{`;qO9*Tac9Qe$ zPBLRqS65fpb9c2|E|-O4kNl}${^Cyp!=IMxl~$!u@dA5NwdBY)+^RV>+=+C&$#$_= ze3twv<;RbrTr1T?v0kdzYvSX_?c(Z0k>{D^dZQp>H;jytBacKJOr&crjva5lUED4T z@ssFSmI!0t_ku`_y+DiuDaCd7^rGJxcJFTS%#A`KHC#(r(wD9k3eOc$G%jOF85og` zulXTldkjV7iH>8~uIR}Hh6(~KU5qnZX5&OMaE(YZhgoQPf#fyHHi_vtG7$MQ#|vfH z7Vnyewc74}L5X?>#&H0%3~gfZ(C zdXOe>W*m4kF_$CS4Op_OV9B#-V22S5Ax@12xP2JWkB`bYFzMt(h(YX@L}O2M{6I8n zwL{U^Z8!JY^*vFn;XAQ zjY#-`{3_iD4|`X=7L+mbNePiXlLEZSbQqf(for=H;vz(jmVgA2ZHk$Urk*8CvI%s< z5Ak`CBefX5FO7g4Av9rHm#qL>2C=W)ML-5Ayg2gXNO)txo3+ibB8GS#hq2)Z83bPN z5J<8oL{KhfhrVMh9(YW1ni>|INXYRR1`U-z2K2JWx}S>+&^p;guxn9x}ex7 zbDTi)Z*l3*(t=CxiW_4=8{ZeTdb`nVw`v<*x>k9ON8hY_w3yq`RAd|-VI0DdE2+ZZ z>x;zGJy1SMu`{t6V&Zrs>@JYxr^&aaT6SB_J!F%V&uKtj2Olka<8rugP2`TzR60J^ z{0b+aT!1XXBUr~lI60!F1Fowa4Kjxj7M$rUg6ymb?tP2W+~wd>7?u^tkW*5U$~}L9 z8ZeD2NeYtYBMimX_Z-_?q!R2__E9ksiw&ptmr(p_yN^@EM5FdvPHT&3b1%NeyAhe0)*8iB0xNHq## z87+KSCGEaEy27ry>gkRBR^tF(_7;a8PGhKNU)&*?KpjodV25rtHmT=uQy}XcY-r!~ z1J8$?9Dbi-+i{E-sds?Hsv;O}0opO#m*x*-bYlb)=uu~0N{5E9JaSUkgPrm7;u}K5 zk^^{%)O4jZ20+3YlfO__5F;5ylo%BRZv;1d^M2dauz1U#tMnuRy#V^LpGaqFPnI^3k<{a4kYB|uZECN+bf0l%5b zMtSC0WrkVMPExY;7;7hQ^47#Co?vsW-FoXyo4X8b6dOuiuG(Dfu-$638yh#bR}kOX z+Go$R7Gea~XMx|GE$XcV(KSUK*#Z)6M0Bmc;?W5VVDDb1cSAc`kQ3__A0}|Br~+~V zM`1jf$WT}PUtkP~bYm-E{ly!P-(-(xcVC0QZQ6bFzhw``VU2yjkwl{XcC*!n&uqY9 zyPL2GV*S#lnyO();>z#p`@4HJ6q)X@r$~ns+DWw|)EP)e8amTo#~3^XJ~d`A3pU}z zV;PL%>^2k|rkqbb!gd~Eycs7Qy*wr2bPd=qMMT*Vg=*(hAn>Usn;JL?%}_5D($@fy ze9KPI#wDC9^kxK(P4Xrb7UZswNq9e~Tq7uIfyZAML1y-i|Ca(VfEshD@*E2;_KCBl z)<=?e6Odq1o?v1e{-{V!$%`x1Ffgl$F9TFm_|T=M;ygeWQ*&vx^$A&GI)Es^YtNvZ zF?qcu9ot8O9tGYbv^0)gKIA=}l8B>0cKDQn0Elpn*>cR_l*!>&K3Nvku8N`QChEEL)ZRSER#@Xx4qAcJxKy;j{UCMZg(4*HiTYwhZ-AbMD0skU{vkhLh4fML4NmsqZVW1p6xxR1v>>F(TI`c^OF% z@su);59!*pZ0;BT6Q^lAlSX5gatXjMwF%U&WknEoEK?Kte?&kE)TmNJvOp_*R$<$HlQ#u<$Vw~LxFD`FM!RdU+&8rm&U9b-^N zdhhm7(sILTl3GH`kvvKzOqo39j&%q97(;J#r%QQ;8WOpNpJ%Y0%a&j z1Jo^|mJoQtJIpERV7u5=wZih|E;$0xVlIq2jUvBYte_+Zcmh(Y}jJ@^!rs1JJH$CNkR_bi3;`LhB=P z?z1_f7mwfyiN6v|^XW-A579(oh$#LwIhy{qn=kD<8?tUmbx4(6wI7+4JyQo`Y%4&d0O*d1!_7ti>@VlWVw zcYVb7_x}i7p+_3rgbD3nQ9w(-ET9sMl-d z`fjaW68D47>#AiCGZ@-XDHT<=N;bJlzWafIf!r6Yu+FZ7q{Pnc~^ zk=evvvnh7+XZQW{Zolw67)*I&yc-g{NF}qYEM-iuw3IAo%eyevG-@j~PSrO$u_YHe z^nGTv!g!_!*>sTfwKy|X?gqb3=+=-X3HuWrJ+`V(@b90)<7~Y*;&Ga@CRqQXbAEI2 zS{$skxe)~`x@>eS>_1>^)n1#8=jtY{t**~{fsJJ&1cE9{1hAG}|Mn|RLEFVsvTylZ z-R-qAjr#n_v7jE)AVO(20xK;4rYc=q>{bpcfQuAaJ(X9UO4>mTBIBA-9AK0^B3Yw#`R<2Ny((oRT6`u+|VW z+qGx$j4Gt*SyX=2l^;d*H-Zu=dQK-!ZF7nW3&sdyumA*sSg<)!P+vK@psi##2711} znM**9Ft#HNLRretq`fj0#`55hU{^s`1?fd2Uo(2~WJ)@*XH?%qZs4-9KBLlh} z!%AR73(##&s1sw-Pi|FKnjTPaq>o!^pBJ+kXb_aZDIkGpRIzEr)z+^q@`PVjyU*%I z>ID}qFZ&T2e09aI|Ac>ue6m#G|6T3B<7$7&)BYYu6ZChbcR`wgj>5F_#WKd+XGoN_ zyhYzoTC%OYv@QK|g?XNw3QfJ<+AkfV)~KJTHezds?o`Sr_L;$st-5W;I|h9?+NMsZ z_+wjam+3>=gZm^SfOB~}3i1W<@9pwdAQ3>Ws2wT7Kemh2>i1?~I5S5P(=uXxQfCxi zNm6!x$LP)`G*@J1s$Cr%miB2^{BvbjJvxq&e;tb*gTB1DrGbok2HotrSV?~>?HFgC z;|0gLkrT@tzMiX#g5$#jNV2u1TE%~oN4-{4OfurCIZ9gf`6z26V#I^|DLbT@@}T~F z^ai&|JH)SXs)U%8zsIWI(~7TF%YXR~ap5;wa4L3$F$z708U@rOrVN4A5%*re2~ZuM zE&T!u;R+q{ORAgu!H`*wB)80{_07qTj)nY%LbG?(tB4!wDAD~KCy@8m_uJ+3i_7lq zMLu`dIlH=e0Cvxna@A<&r^-+**<1l${4DL$wk^?$bd&e}YwFPf-h9=2oKI!I$8p`; zrjg7P&1|=hY6MlnmN35KnTC_Rn-Gmx)wo9ciuV|JI%gAl1&>eq z8SKbc4eOVA**EK!OD|v6+bF>*Kuy&1^U3Rj@6~~q2HkFrf)4*4=%9lKC2ybU<`BJ( z0E;d4YrC9$|47Bk;A1$6w{0bP3S&ro)~k$g zw=e-hk;>(CV{1ZOp3jr{u9({IkvaXDSW*YscL+PX8cflB_avYMr?u(@sxH-l74zX*8Q9dXKEp+%Gk1+J9j9fPQWxYV%MWte@ZcbbWW) zxgPw_dn5w&Hs>syy#HrGFbE?kqE&i9W9@d|utS;8eHfjjjn}K5dcm{(p*lMGFbYm` zl^59_DR{%FUMB}+Ox>WR_juLIuw>3T*@9n*)$hKB>D>IQUVts6^nddf6s#mgf;Ybs zsETF+^^@-Od3y4KmoD#WQX3>7??HaE!zj$ZXLsYXfK=xW>wU%${O;tjpm@=0T*`={ z_y0@>8ISG|BU%EFb5A+vXdgl%z&1%jSEcU@43odhm*{dwE3$F`zbLF8C3TV<$pSA~ zD~auk)KYX$z&I;u!m6rlc~V{asaQCumFhLb!a=K~Ucv{&wP%xuF@cxpI5)A!Iju9T z4zZ)(nSw+8D7rVF9)9V45{31NUwk=9HcYdA&@n~e>0xlu|Lvmx@LQ*k9YaJsxW44T zQtHS~(8TL>V(Sg6I5X(7*Dy^wnk0NmtQ`G@EnuTfA(vkFf)=#{ z#kXvg9p`jwN-w;Gs?@wU;>deXz*4_fqG|w=vPzd+Ix2)(lq-x0f*y~IP|}AD>Pehs zebRF((ndoN_9ardsl>|>rpe)y9MPEt?vR2DEgoBMIj)%K^IsT`!YIhAB{yp}_NY2Ecjr!p{LZ&}N$h-U&_BEMPm|BadWq#mGg+is#o0Pl zWd`j`0^6dZZ}ab3xYSqT;+WokJ6`nj+W8uie8RMI=||H%og48}ov`(>l9)bN^!Qj0 ztCH0`tdag&wFH7D^6;hlg6_Z9>hjZ-Pg9C65n%mG_~I>@a>qEG3<0i>Pk*I&zU*FK z_pa}TC2j#+>VWp$NsfgDRQXAqof6vRyIF4Ni~#ak`Pd96i6o)rkkE4f6hHnbejxBN z?B8FU-Cf`Hh1&SravH@Z^@-GL zRM=S8q-4@{y`hneT8ws@975E=OUKSCBMl3Y@na_<=b$d$w(va=P^XT12I|i6wQXrnaY1+5Uc--Z_KlF2-z9KIsFT8t%lA z`5Iz6J2JPe2*;w8XH#wtm4T(Wk@82<-bsRp4kG#uvgcmgS$E1LFr8UxC&1qbe@C-4 zDz~yrzf7)U^$#lAggU6POFGp`*gq)McS#F}D00m-eo{FA9`ni@G5OR8RhCw7$*ErF zSHpI6>wSpa-}61lJHnYtv2_y3r z5-N{QmV`k13dP9t9#IUrC-6NroGCRt+{!ul6~Cv7-%?c+UslCXtD^WlRa~v8qWH2Z z&a^6uFRP-XRZ)CV6{lJiCFPgNpQmRSnzh>dsN}BG=ElHq!*X9vV#f$_g-j>)nd+%L z{cw-!Yq4IhH<_Q@)`tZ?2uPS{YZ?u1I$Gi#T!kJvM*qHHCM zxF8+xSay(@WoI<pyqq z@x^>NTFvJX{3B#d5zY#Rr16Z&HaM&8I}+LazwFky+v(qDU;@B%jIZ6lz}5QR!U^g2 z4m!vLa5zChT8Nggk) zi>GM$9o1<@W*;EhZr;5GPqs)B-SJ|)ynLN+LW|PSGK&A-Tbk;+6XnNQEw(3Nupeq}20-V$q3DCS2{Cgz!`!X#gIW8h|?n zHx#{(2kLC3a^Yk6P-!5T55opZ!<*iB`=r-XBrYDt_t89BYX;(rFxxPHwiET0pWenZ zrwBb`p?|N@rLRC~i_Yu~Zc`yjVESM(Lqn}opiB^`zN36Fi-0Zx56MV#7%_?%NG`%O zmc0>&Pbm@|TMqz>j_o<#fPU%tFWsYGafYi(xHuqO9EXSYJ22vKbN4!6;JpMCBOXhW zOhJNC0Vo*_jH#fa8W5uxm64s3-yf9axR;K1>A03Vxbl6O_JF5)YyFac1er!cjQl5} zeUkBxRAi1136oqWECRgY5;ypM{43@Z-*Ad~vqz|42)YrKEiols5vaaZXeK`3LM(kl zvKH6rTJ-Edd3F!N<)N|?v_6bxV*L=<%*}3<1U>Miqq-nB zx;+#l-H^rz_>v>gi!cr6ONm(CVO*u2o5al)2yb_=g9tA-lMZbIS!K%wP~RtnE7ws$ z;)U;zO0f4~{>R~D6-8@@6Sk;=Y$e3v@?i}4;2<&wP#^wa(gWfzH@hh`O)P7J&73WO z%HItgL>EOzYq6EA5dWX5yE)k7F9-0P2*Y8A}~T zist7xZsASY9ZYcwiVMS9J@iYo$8`GAAWF2BgkB6(Q+ZVsd=V&rPZDGI>|KJOAu;xS z-7T&uKq;cz(PI3Kt-nfe_4&p*MYDB4oYy+MrrR4Jd!T2OV=87~F=%G|g2XT<#+U#u_lZnVp*??=RX04DUSzz@XJ5qHWzw5Z?D*Hp{|M0LvP!PQ4pt}Tg0>O?W4qiuV zK?EcLs#elM8z>DSznztodjz3f#WAe}(W<^6TGel(RXf7cEWuO-+QzF=Rtx#u88%v- zGKyeyVWb!M6uH)6paw7yAO~0&(+43RC_V6$4wylh5_572k}5%4zFu5XvzKV?ISgbL zVXAF=GQ|FY1Jlz|Jcr)w{Ct096{b*+mTPP37JBLGORce&xb9u~Jv9BXgwg6qsFF6a zIS^e6^BdFCbU&lr%G4;pY~deLQitHmi5{GV{GAKHBfMUa>(LxC7GYZLY0v^}xlEdU zaa89fTz&FoG@L#T7YAhJ;ulz3s!L0p`-y;J)}<2DT%uA`5FFZ^5PKQwU?suTL#SiG z8!rUDzfgK?;d-06Mb{0LyVBtBd9m|G13MF4a_~H3I1DIh;852Lk&_^(MRs@Td>NAn zQ28Qa5$fTsEw~4?>X7h1P`#v3Ja*2FXgvRAI6YVAKSg(N{dG8p>kkiex_>&Ck;1b% zVZjnmn_$?X$_0rV-FSb^-KNFO=Q{Zu+z8whLAgg?Ru>aWST}{LH8AwNwmCvga%@^b z+nhvC3Fy>BQP)%5J}i#_Jqja?x&mpGY$)LbK8i5!Z4-*-Z$iO7vVgFAq$@LVQwjRY zvgz=4(2MO{D@n)+lNBO)ByeVQ{Ut+h;*4+A;~$<;$hpz$Qzi7g6M^= zKkjzI=4HIjKvXhoD9T{3s5VN{=Li%>NmvyN^fFOZlvLUWO#+0)K9*DvHt4B7P}u9q zO2Ay6X;p@5GfO9*SxO6*IaWjosLm?qni^6ZOO^AXT1SvW&ryUqfF?%(4!19BK3fi# z%)OaKm^LKva-Syd3MhyNR{%CVwNcUsHp+S%uxw+j7HDJx@@+sh#%k?BtRHBuog3*z zNf1eR=6wcd1f94*t(fg`%#B6`sCSe5)}q{ZTnCGbOjsIT0&Ot5Yb&7@VY3pCZ8bqo z?thz2mtPEx;O`v~l;7d{%W6v33BJGj4A-0J0j|G&UBdOBvq!l87>(GHzgRcU%7Ryc zw(BL=$yHK*(^ih{*#v|WsI35Osu6$4CLpC+3l95Mg0^KEZ(62dcCx}le-*W!%mX%i z2QMv~U-4k7p*5m@_{kCAW-J-|0*8rHR#1d_Zw`|nC6_eJ<3ucrF!d!SN<8%@nn1F0 zHex_EG?YxE!W?U{1k^Unc%_CJ>5c@pDcWp1Y42bsGa4`Jj8xGV>6F_0l>_p!3?|=M z3U^5P_ikn$O*sc;q&U>g0i0|Ki&}jtzh^SO-2QBW)@*H8HeOdY?AFs$K4^(R4Vb4t zq`^;)+ARUK5z`9eDZilPzObN^RUWX}zVNYkv(mP}5=ekfEo@r7%T2V=4OY`~wFDk! zW*_rFbj&rLNaLFmX<$j>QOf2(=g+h3sB&{c=fbxB{bjtc;5D3DFm$z8;=!qpQQ9_T z_FtNZ{2_BL_h|SqycFC8XzaUHDw_GXLDU99UcPEUbApCC@LecouYma-G*EUAxOk zT8Y5f!&V7;8iI~WzR}L^DRvz~8gl2Q$_qekoc@*K^r`pH(MlztHe^s|$RJS~g016j zP`9Fa)`iIjfRDq8DLj$I3`q0h(UR0X>m0lS%zI1S3u>Jcgt4@E0jBv#E;xQS^m)Pk z%le=uW4nL7iI$&cliB>@{Esi=WyECdr1*j39~NOwAhh|`rxKPb;W%QZ613qFlgaQd znk=#dDt;R+u@SNp$D)$kAEQxn3zD8XCCB1ExdoY@+=AfG-hGO1vkWFLIwSW_SiyrT z(9`fwUREhxLJX^#t_rlpX_gTYw2;;HcaA#Y?g^=<%nZlofp+wk-{oCzbFPn_)2rO- zjg8caQ@!a^hq6eaz<;Y*nw&uCTVV?YFNL@P*i^(Ga_>dLd4k?u?ko-?s@y z&(6+L-o@m1Um?#13TqNVy7N@b&Y&%0u|A$Y%x9nH(PEL!63=1z1Q`%y5AN{Crx|>j zLE~Y>vWC2p9@fvavpe=huzxFFk=-IV9xH!3R-4s1uB=YV^n!KL