[Pkg-ace-commits] [pkg-ace] r691 - in trunk/debian: . patches

[Thomas Girard]

Author: tgg
Date: 2010-05-24 09:55:04 +0000 (Mon, 24 May 2010)
New Revision: 691

Modified:
   trunk/debian/libtao-orbsvcs-dev.install
   trunk/debian/patches/90-patch-mpc-basedir.dpatch
   trunk/debian/patches/91-patch-dg-basedir.dpatch
   trunk/debian/patches/92-default-ACE_ROOT.dpatch
Log:
s#usr/share/ace#usr/lib/ace#g


Modified: trunk/debian/libtao-orbsvcs-dev.install
===================================================================
--- trunk/debian/libtao-orbsvcs-dev.install	2010-05-23 18:09:17 UTC (rev 690)
+++ trunk/debian/libtao-orbsvcs-dev.install	2010-05-24 09:55:04 UTC (rev 691)
@@ -64,7 +64,7 @@
 usr/lib/libTAO_Catior_i.so
 usr/include/utils/catior
 usr/lib/libTAO_ReplicationManagerLib.so
-usr/lib/libTAO_ImR_Activator.so                                                                                   
+usr/lib/libTAO_ImR_Activator.so
 usr/lib/libTAO_ImR_Locator.so
 usr/lib/libTAO_ImR_Locator_IDL.so
 usr/lib/libTAO_ImR_Activator_IDL.so

Modified: trunk/debian/patches/90-patch-mpc-basedir.dpatch
===================================================================
--- trunk/debian/patches/90-patch-mpc-basedir.dpatch	2010-05-23 18:09:17 UTC (rev 690)
+++ trunk/debian/patches/90-patch-mpc-basedir.dpatch	2010-05-24 09:55:04 UTC (rev 691)
@@ -21,7 +21,7 @@
 -  $basePath = VMS::Filespec::unixify($basePath);
 -}
 -$basePath .= '/MakeProjectCreator';
-+my($basePath) = '/usr/share/ace/bin/MakeProjectCreator';
++my($basePath) = '/usr/lib/ace/bin/MakeProjectCreator';
  
  my($mpcroot) = $ENV{MPC_ROOT};
  my($mpcpath) = (defined $mpcroot ? $mpcroot :
@@ -39,7 +39,7 @@
 -  $basePath = VMS::Filespec::unixify($basePath);
 -}
 -$basePath .= '/MakeProjectCreator';
-+my($basePath) = '/usr/share/ace/bin/MakeProjectCreator';
++my($basePath) = '/usr/lib/ace/bin/MakeProjectCreator';
  
  my($mpcroot) = $ENV{MPC_ROOT};
  my($mpcpath) = (defined $mpcroot ? $mpcroot :

Modified: trunk/debian/patches/91-patch-dg-basedir.dpatch
===================================================================
--- trunk/debian/patches/91-patch-dg-basedir.dpatch	2010-05-23 18:09:17 UTC (rev 690)
+++ trunk/debian/patches/91-patch-dg-basedir.dpatch	2010-05-24 09:55:04 UTC (rev 691)
@@ -17,7 +17,7 @@
 -  $basePath = VMS::Filespec::unixify($basePath);
 -}
 -unshift(@INC, $basePath . '/DependencyGenerator');
-+my($basePath) = '/usr/share/ace/bin/DependencyGenerator';
++my($basePath) = '/usr/lib/ace/bin/DependencyGenerator';
 +unshift(@INC, $basePath);
  
  require DependencyEditor;

Modified: trunk/debian/patches/92-default-ACE_ROOT.dpatch
===================================================================
--- trunk/debian/patches/92-default-ACE_ROOT.dpatch	2010-05-23 18:09:17 UTC (rev 690)
+++ trunk/debian/patches/92-default-ACE_ROOT.dpatch	2010-05-24 09:55:04 UTC (rev 691)
@@ -13,7 +13,7 @@
              "  KEEP_GOING = -$crlf",
              "endif$crlf$crlf",
 +            "ifndef ACE_ROOT$crlf",
-+            "  export ACE_ROOT = /usr/share/ace$crlf",
++            "  export ACE_ROOT = /usr/lib/ace$crlf",
 +            "endif$crlf",
              "include \$(ACE_ROOT)/include/makeinclude/macros.GNU$crlf";