X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php-pear-PHP_Beautifier-path_fix.patch;h=dffcf9e5fbfb7ffb56e744388238f368acda4df7;hb=HEAD;hp=ca0102004d334f222880767048fbcfa6e787c578;hpb=74fc9649aa5073b21adad13b99754d1bfb847f77;p=packages%2Fphp-pear-PHP_Beautifier.git

diff --git a/php-pear-PHP_Beautifier-path_fix.patch b/php-pear-PHP_Beautifier-path_fix.patch
index ca01020..dffcf9e 100644
--- a/php-pear-PHP_Beautifier-path_fix.patch
+++ b/php-pear-PHP_Beautifier-path_fix.patch
@@ -1,112 +1,106 @@
-diff -burN a.orig/b/Beautifier/Batch/Output/DirectoryBz2.php a/b/Beautifier/Batch/Output/DirectoryBz2.php
---- a.orig/b/Beautifier/Batch/Output/DirectoryBz2.php	2005-02-07 09:17:43.047075360 +0100
-+++ a/b/Beautifier/Batch/Output/DirectoryBz2.php	2005-02-07 09:18:31.882651224 +0100
+--- PHP_Beautifier-0.1.11/usr/share/pear/PHP/Beautifier.php~	2007-01-19 13:18:00.190033925 +0200
++++ PHP_Beautifier-0.1.11/usr/share/pear/PHP/Beautifier.php	2007-01-19 13:20:39.363592430 +0200
+@@ -27,15 +27,15 @@
+ /**
+  * Require PHP_Beautifier_Filter
+  */
+-include_once 'Beautifier/Filter.php';
++include_once ('PHP/Beautifier/Filter.php');
+ /**
+  * Require PHP_Beautifier_Filter_Default
+  */
+-include_once 'Beautifier/Filter/Default.filter.php';
++include_once ('PHP/Beautifier/Filter/Default.filter.php');
+ /**
+  * Require PHP_Beautifier_Common
+  */
+-include_once 'Beautifier/Common.php';
++include_once ('PHP/Beautifier/Common.php');
+ /**
+  * Require Log
+  */
+@@ -43,11 +43,11 @@
+ /**
+  * Require Exceptions
+  */
+-include_once 'Beautifier/Exception.php';
++include_once ('PHP/Beautifier/Exception.php');
+ /**
+  * Require StreamWrapper
+  */
+-include_once 'Beautifier/StreamWrapper.php';
++include_once ('PHP/Beautifier/StreamWrapper.php');
+ /**
+  * PHP_Beautifier
+  *
+--- PHP_Beautifier-0.1.11/usr/share/pear/PHP/Beautifier/Batch.php~	2007-01-19 13:21:45.095062133 +0200
++++ PHP_Beautifier-0.1.11/usr/share/pear/PHP/Beautifier/Batch.php	2007-01-19 13:51:20.504735118 +0200
+@@ -23,11 +23,11 @@
+ /**
+ * Require PHP_Beautifier_Decorator
+ */
+-require_once 'Decorator.php';
++require_once ('PHP/Beautifier/Decorator.php');
+ /**
+ * Require PHP_Beautifier_Batch_Output
+ */
+-require_once 'Batch/Output.php';
++require_once ('PHP/Beautifier/Batch/Output.php');
+ // ArrayNested->off();
+ // ArrayNested->on();
+ 
+--- PHP_Beautifier-0.1.11/usr/share/pear/PHP/Beautifier/Batch/Output/DirectoryBz2.php~	2007-01-19 13:52:05.935751365 +0200
++++ PHP_Beautifier-0.1.11/usr/share/pear/PHP/Beautifier/Batch/Output/DirectoryBz2.php	2007-01-19 13:52:47.166673703 +0200
 @@ -23,7 +23,7 @@
-     /**
-     * Include PHP_Beautifier_Batch_DirectoryTar
-     */    
--    require_once ('DirectoryTar.php');
-+    require_once ('PHP/Beautifier/Batch/Output/DirectoryTar.php');
-     /**
-     * PHP_Beautifier_Batch_FilesGz
-     *
-diff -burN a.orig/b/Beautifier/Batch/Output/DirectoryGz.php a/b/Beautifier/Batch/Output/DirectoryGz.php
---- a.orig/b/Beautifier/Batch/Output/DirectoryGz.php	2005-02-07 09:17:43.047075360 +0100
-+++ a/b/Beautifier/Batch/Output/DirectoryGz.php	2005-02-07 09:19:00.361321808 +0100
+ /**
+ * Include PHP_Beautifier_Batch_DirectoryTar
+ */
+-require_once ('DirectoryTar.php');
++require_once ('PHP/Beautifier/Batch/Output/DirectoryTar.php');
+ /**
+ * PHP_Beautifier_Batch_FilesGz
+ *
+--- PHP_Beautifier-0.1.11/usr/share/pear/PHP/Beautifier/Batch/Output/DirectoryGz.php~	2007-01-19 13:53:11.797224709 +0200
++++ PHP_Beautifier-0.1.11/usr/share/pear/PHP/Beautifier/Batch/Output/DirectoryGz.php	2007-01-19 13:53:50.188083573 +0200
 @@ -23,7 +23,7 @@
-     /**
-     * Include PHP_Beautifier_Batch_DirectoryTar
-     */    
--    require_once ('DirectoryTar.php');
-+    require_once ('PHP/Beautifier/Batch/Output/DirectoryTar.php');
-     /**
-     * PHP_Beautifier_Batch_FilesGz
-     *
-diff -burN a.orig/b/Beautifier/Batch/Output/FilesBz2.php a/b/Beautifier/Batch/Output/FilesBz2.php
---- a.orig/b/Beautifier/Batch/Output/FilesBz2.php	2005-02-07 09:17:43.048075208 +0100
-+++ a/b/Beautifier/Batch/Output/FilesBz2.php	2005-02-07 09:19:31.575576520 +0100
+ /**
+ * Include PHP_Beautifier_Batch_DirectoryTar
+ */
+-require_once ('DirectoryTar.php');
++require_once ('PHP/Beautifier/Batch/Output/DirectoryTar.php');
+ /**
+ * PHP_Beautifier_Batch_FilesGz
+ *
+--- PHP_Beautifier-0.1.11/usr/share/pear/PHP/Beautifier/Batch/Output/FilesBz2.php~	2007-01-19 13:53:11.797224709 +0200
++++ PHP_Beautifier-0.1.11/usr/share/pear/PHP/Beautifier/Batch/Output/FilesBz2.php	2007-01-19 13:54:40.409207150 +0200
 @@ -23,7 +23,7 @@
-     /**
-     * Include PHP_Beautifier_Batch_FilesGz
-     */    
--    require_once 'FilesTar.php';
-+    require_once 'PHP/Beautifier/Batch/Output/FilesTar.php';
-     /**
-     * Handle the batch process for one/multiple php files to one tar bzip2 file
-     *
-diff -burN a.orig/b/Beautifier/Batch/Output/FilesGz.php a/b/Beautifier/Batch/Output/FilesGz.php
---- a.orig/b/Beautifier/Batch/Output/FilesGz.php	2005-02-07 09:17:43.048075208 +0100
-+++ a/b/Beautifier/Batch/Output/FilesGz.php	2005-02-07 09:19:46.708276000 +0100
+ /**
+ * Include PHP_Beautifier_Batch_FilesGz
+ */
+-require_once 'FilesTar.php';
++require_once 'PHP/Beautifier/Batch/Output/FilesTar.php';
+ /**
+ * Handle the batch process for one/multiple php files to one tar bzip2 file
+ *
+--- PHP_Beautifier-0.1.11/usr/share/pear/PHP/Beautifier/Batch/Output/FilesGz.php~	2007-01-19 13:53:11.797224709 +0200
++++ PHP_Beautifier-0.1.11/usr/share/pear/PHP/Beautifier/Batch/Output/FilesGz.php	2007-01-19 13:55:07.499813262 +0200
 @@ -23,7 +23,7 @@
-     /**
-     * Include PHP_Beautifier_Batch_FilesGz
-     */    
--    require_once 'FilesTar.php';
-+    require_once 'PHP/Beautifier/Batch/Output/FilesTar.php';
-     /**
-     * Handle the batch process for one/multiple php files to one tar gzip file
-     *
-diff -burN a.orig/b/Beautifier/Batch.php a/b/Beautifier/Batch.php
---- a.orig/b/Beautifier/Batch.php	2005-02-07 09:17:43.051074752 +0100
-+++ a/b/Beautifier/Batch.php	2005-02-07 09:20:45.298368952 +0100
-@@ -23,11 +23,11 @@
-     /**
-     * Require PHP_Beautifier_Decorator
-     */
--    require_once ('Decorator.php');
-+    require_once ('PHP/Beautifier/Decorator.php');
-     /**
-     * Require PHP_Beautifier_Batch_Output
-     */
--    require_once ('Batch/Output.php');
-+    require_once ('PHP/Beautifier/Batch/Output.php');
-     // ArrayNested->off();
-     // ArrayNested->on();
-     
-diff -burN a.orig/b/Beautifier/StreamWrapper.php a/b/Beautifier/StreamWrapper.php
---- a.orig/b/Beautifier/StreamWrapper.php	2005-02-07 09:17:43.053074448 +0100
-+++ a/b/Beautifier/StreamWrapper.php	2005-02-07 09:21:05.335322872 +0100
-@@ -51,5 +51,5 @@
-         function dir_rewinddir();
-         function dir_closedir();
-     }
--    require_once('StreamWrapper/Tarz.php');
-+    require_once('PHP/Beautifier/StreamWrapper/Tarz.php');
- ?>
-\ Brak znaku nowej linii na koñcu pliku
-diff -burN a.orig/b/Beautifier.php a/b/Beautifier.php
---- a.orig/b/Beautifier.php	2005-02-07 09:17:43.023079008 +0100
-+++ a/b/Beautifier.php	2005-02-07 09:21:35.220779592 +0100
-@@ -28,15 +28,15 @@
-     /**
-     * Require PHP_Beautifier_Filter
-     */
--    include_once ('Beautifier/Filter.php');
-+    include_once ('PHP/Beautifier/Filter.php');
-     /**
-     * Require PHP_Beautifier_Filter_Default
-     */
--    include_once ('Beautifier/Filter/Default.filter.php');
-+    include_once ('PHP/Beautifier/Filter/Default.filter.php');
-     /**
-     * Require PHP_Beautifier_Common
-     */
--    include_once ('Beautifier/Common.php');
-+    include_once ('PHP/Beautifier/Common.php');
-     /**
-     * Require Log
-     */
-@@ -44,11 +44,11 @@
-     /**
-     * Require Exceptions
-     */
--    include_once ('Beautifier/Exception.php');
-+    include_once ('PHP/Beautifier/Exception.php');
-     /**
-     * Require StreamWrapper
-     */
--    include_once ('Beautifier/StreamWrapper.php');
-+    include_once ('PHP/Beautifier/StreamWrapper.php');
-     /**
-     * PHP_Beautifier
-     *
+ /**
+ * Include PHP_Beautifier_Batch_FilesGz
+ */
+-require_once 'FilesTar.php';
++require_once 'PHP/Beautifier/Batch/Output/FilesTar.php';
+ /**
+ * Handle the batch process for one/multiple php files to one tar gzip file
+ *
+--- PHP_Beautifier-0.1.11/usr/share/pear/PHP/Beautifier/StreamWrapper.php~	2007-01-19 13:53:11.807224933 +0200
++++ PHP_Beautifier-0.1.11/usr/share/pear/PHP/Beautifier/StreamWrapper.php	2007-01-19 13:55:42.550597495 +0200
+@@ -49,5 +49,5 @@
+     function dir_rewinddir();
+     function dir_closedir();
+ }
+-require_once ('StreamWrapper/Tarz.php');
+-?>
+\ No newline at end of file
++require_once ('PHP/Beautifier/StreamWrapper/Tarz.php');
++?>