From: Sławomir Paszkiewicz <paszczus@pld-linux.org>
Date: Wed, 30 Jan 2013 11:16:54 +0000 (+0100)
Subject: - used pclean on this patch
X-Git-Tag: auto/th/otrs-3.2.1-1~6
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=d9cf4e806e241f2f2c13cea065ac13d1cb04878a;p=packages%2Fotrs.git

- used pclean on this patch
---

diff --git a/otrs-paths.patch b/otrs-paths.patch
index 74cf1b5..b8fdae4 100644
--- a/otrs-paths.patch
+++ b/otrs-paths.patch
@@ -1,4 +1,3 @@
-diff -ur otrs-3.2.1/bin/Cron.sh otrs-3.2.1.new/bin/Cron.sh
 --- otrs-3.2.1/bin/Cron.sh	2012-11-22 12:43:09.000000000 +0100
 +++ otrs-3.2.1.new/bin/Cron.sh	2013-01-29 12:39:20.521608435 +0100
 @@ -45,7 +45,7 @@
@@ -11,7 +10,6 @@ diff -ur otrs-3.2.1/bin/Cron.sh otrs-3.2.1.new/bin/Cron.sh
      OTRS_ROOT=$OTRS_HOME
  else
 Tylko w otrs-3.2.1.new/bin: Cron.sh~
-diff -ur otrs-3.2.1/bin/otrs.SetPermissions.pl otrs-3.2.1.new/bin/otrs.SetPermissions.pl
 --- otrs-3.2.1/bin/otrs.SetPermissions.pl	2013-01-24 11:21:14.000000000 +0100
 +++ otrs-3.2.1.new/bin/otrs.SetPermissions.pl	2013-01-29 12:39:39.175799680 +0100
 @@ -82,7 +82,7 @@
@@ -24,7 +22,6 @@ diff -ur otrs-3.2.1/bin/otrs.SetPermissions.pl otrs-3.2.1.new/bin/otrs.SetPermis
  
      if ( $#ARGV < 0 ) {
 Tylko w otrs-3.2.1.new/bin: otrs.SetPermissions.pl~
-diff -ur otrs-3.2.1/Kernel/Config/Defaults.pm otrs-3.2.1.new/Kernel/Config/Defaults.pm
 --- otrs-3.2.1/Kernel/Config/Defaults.pm	2013-01-17 10:06:52.000000000 +0100
 +++ otrs-3.2.1.new/Kernel/Config/Defaults.pm	2013-01-29 12:40:37.118464479 +0100
 @@ -297,7 +297,7 @@
@@ -55,7 +52,6 @@ diff -ur otrs-3.2.1/Kernel/Config/Defaults.pm otrs-3.2.1.new/Kernel/Config/Defau
  #    $Self->{'PGP::Options'} = '--batch --no-tty --yes';
  #    $Self->{'PGP::Key::Password'}->{'D2DF79FA'} = 1234;
 Tylko w otrs-3.2.1.new/Kernel/Config: Defaults.pm~
-diff -ur otrs-3.2.1/Kernel/Config/Files/Framework.xml otrs-3.2.1.new/Kernel/Config/Files/Framework.xml
 --- otrs-3.2.1/Kernel/Config/Files/Framework.xml	2013-01-03 10:12:36.000000000 +0100
 +++ otrs-3.2.1.new/Kernel/Config/Files/Framework.xml	2013-01-29 12:41:09.689962451 +0100
 @@ -493,7 +493,7 @@
@@ -77,7 +73,6 @@ diff -ur otrs-3.2.1/Kernel/Config/Files/Framework.xml otrs-3.2.1.new/Kernel/Conf
      </ConfigItem>
      <ConfigItem Name="PGP::Key::Password" Required="1" Valid="1">
 Tylko w otrs-3.2.1.new/Kernel/Config/Files: Framework.xml~
-diff -ur otrs-3.2.1/Kernel/Config.pm.dist otrs-3.2.1.new/Kernel/Config.pm.dist
 --- otrs-3.2.1/Kernel/Config.pm.dist	2012-11-22 12:43:05.000000000 +0100
 +++ otrs-3.2.1.new/Kernel/Config.pm.dist	2013-01-29 12:41:32.054324327 +0100
 @@ -63,7 +63,7 @@
@@ -90,7 +85,6 @@ diff -ur otrs-3.2.1/Kernel/Config.pm.dist otrs-3.2.1.new/Kernel/Config.pm.dist
      # ---------------------------------------------------- #
      # insert your own config settings "here"               #
 Tylko w otrs-3.2.1.new/Kernel: Config.pm.dist~
-diff -ur otrs-3.2.1/scripts/apache2-httpd.include.conf otrs-3.2.1.new/scripts/apache2-httpd.include.conf
 --- otrs-3.2.1/scripts/apache2-httpd.include.conf	2013-01-17 10:06:55.000000000 +0100
 +++ otrs-3.2.1.new/scripts/apache2-httpd.include.conf	2013-01-29 12:42:41.307509300 +0100
 @@ -3,8 +3,8 @@
@@ -148,7 +142,6 @@ diff -ur otrs-3.2.1/scripts/apache2-httpd.include.conf otrs-3.2.1.new/scripts/ap
              Header set Cache-Control "max-age=2592000 must-revalidate"
          </FilesMatch>
 Tylko w otrs-3.2.1.new/scripts: apache2-httpd.include.conf~
-diff -ur otrs-3.2.1/scripts/apache2-perl-startup.pl otrs-3.2.1.new/scripts/apache2-perl-startup.pl
 --- otrs-3.2.1/scripts/apache2-perl-startup.pl	2013-01-24 11:21:14.000000000 +0100
 +++ otrs-3.2.1.new/scripts/apache2-perl-startup.pl	2013-01-29 12:43:07.268703262 +0100
 @@ -35,15 +35,15 @@
@@ -172,7 +165,6 @@ diff -ur otrs-3.2.1/scripts/apache2-perl-startup.pl otrs-3.2.1.new/scripts/apach
  # Preload frequently used modules to speed up client spawning.
  use CGI ();
 Tylko w otrs-3.2.1.new/scripts: apache2-perl-startup.pl~
-diff -ur otrs-3.2.1/scripts/redhat-rcotrs-config otrs-3.2.1.new/scripts/redhat-rcotrs-config
 --- otrs-3.2.1/scripts/redhat-rcotrs-config	2012-10-11 09:11:09.000000000 +0200
 +++ otrs-3.2.1.new/scripts/redhat-rcotrs-config	2013-01-29 12:43:27.239621730 +0100
 @@ -12,7 +12,7 @@