[Pkg-ace-commits] [pkg-ace] r672 - trunk/debian/patches

[Thomas Girard]

Author: tgg
Date: 2010-05-12 21:01:58 +0000 (Wed, 12 May 2010)
New Revision: 672

Modified:
   trunk/debian/patches/00list
   trunk/debian/patches/10-fix-prj-install.dpatch
Log:
Enable patch 20. Cosmetic changes to patch 10.


Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2010-05-12 11:22:41 UTC (rev 671)
+++ trunk/debian/patches/00list	2010-05-12 21:01:58 UTC (rev 672)
@@ -4,6 +4,7 @@
 14-fix-tcl-flags.dpatch
 15-fix-lzo-flags.dpatch
 19-gcc43
+20-versioned_libs.dpatch
 24-add-missing-headers
 34-bts386713
 47-change-netsvcs.dpatch

Modified: trunk/debian/patches/10-fix-prj-install.dpatch
===================================================================
--- trunk/debian/patches/10-fix-prj-install.dpatch	2010-05-12 11:22:41 UTC (rev 671)
+++ trunk/debian/patches/10-fix-prj-install.dpatch	2010-05-12 21:01:58 UTC (rev 672)
@@ -4,23 +4,24 @@
 ## DP: prj_install.pl simplifies installation 
 
 @DPATCH@
---- ACE_wrappers.orig/MPC/prj_install.pl	2008-08-20 10:38:13.000000000 +0200
-+++ ACE_wrappers/MPC/prj_install.pl	2010-03-25 15:43:52.000000000 +0100
-@@ -1,3 +1,4 @@
+--- ACE_wrappers.orig/MPC/prj_install.pl	2010-05-11 14:31:15.877240574 +0200
++++ ACE_wrappers/MPC/prj_install.pl	2010-05-11 14:33:37.136237170 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
 +#!/usr/bin/perl
- #! /usr/bin/perl
  eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
      & eval 'exec perl -w -S $0 $argv:q'
-@@ -123,7 +124,7 @@
+     if 0;
+@@ -123,7 +123,7 @@
      $insdir = '';
    }
  
 -  my $odir = ($dir eq '' ? '.' : $dir) . '/' . $insdir;
-+  my $odir = ($dir eq '' ? './' . $insdir: $dir) ;
++  my $odir = ($dir eq '' ? './' . $insdir : $dir);
    if ($tag eq 'exe_output') {
      my @exes;
      my $fh   = new FileHandle();
-@@ -131,7 +132,7 @@
+@@ -131,7 +131,7 @@
        foreach my $file (grep(!/^\.\.?$/, readdir($fh))) {
          if ($file =~ /^$name$/ ||
              $file =~ /^$name.*\.exe$/i) {
@@ -29,7 +30,7 @@
          }
        }
        closedir($fh);
-@@ -145,7 +146,7 @@
+@@ -145,7 +145,7 @@
        foreach my $file (grep(!/^\.\.?$/, readdir($fh))) {
          if ($file =~ /^lib$name\.(a|so|sl)/ ||
              $file =~ /^(lib)?$name.*\.(dll|lib)$/i) {