[Pkg-ace-devel] r470 - /trunk/debian/patches/

tgg-guest at users.alioth.debian.org tgg-guest at users.alioth.debian.org
Sat Feb 10 23:03:32 CET 2007 

Author: tgg-guest
Date: Sat Feb 10 23:03:31 2007
New Revision: 470

URL: http://svn.debian.org/wsvn/pkg-ace/?sc=1&rev=470
Log:
start repairing patches.

Added:
    trunk/debian/patches/01-change_tao_sonames.dpatch
      - copied, changed from r453, trunk/debian/patches/01-change_tao_sonames.diff
    trunk/debian/patches/02-tao-sonames-release-am.dpatch
      - copied, changed from r469, trunk/debian/patches/02-tao-sonames-release-am.diff
Removed:
    trunk/debian/patches/01-change_tao_sonames.diff
    trunk/debian/patches/02-tao-sonames-release-am.diff
    trunk/debian/patches/20-debian-compiler-definitions.dpatch
    trunk/debian/patches/23-TTY_IO-compilation-fix.dpatch
    trunk/debian/patches/80-update-makefile.dpatch
    trunk/debian/patches/84-skip-DAnCE-compilation.dpatch
Modified:
    trunk/debian/patches/00list
    trunk/debian/patches/90-patch-mpc-basedir.dpatch

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/00list?rev=470&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Sat Feb 10 23:03:31 2007
@@ -1,11 +1,10 @@
+01-change_tao_sonames
+02-tao-sonames-release-am
 08-fix-perl-shebang
 15-fix-fltk-include
-20-debian-compiler-definitions
-21-always-inline
-#??24-collocated-oneway+SYNC_WITH_SERVER-fix
+#21-always-inline
 #34-bts386713
 79-prepatch-dummy-mark
-#80-update-makefile
-#90-patch-mpc-basedir
-#91-patch-dg-basedir
+90-patch-mpc-basedir
+91-patch-dg-basedir
 92-default-ACE_ROOT

Copied: trunk/debian/patches/01-change_tao_sonames.dpatch (from r453, trunk/debian/patches/01-change_tao_sonames.diff)
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/01-change_tao_sonames.dpatch?rev=470&op=diff
==============================================================================
--- trunk/debian/patches/01-change_tao_sonames.diff (original)
+++ trunk/debian/patches/01-change_tao_sonames.dpatch Sat Feb 10 23:03:31 2007
@@ -1,5 +1,12 @@
---- TAO/configure.ac-	2007-02-03 14:03:18.000000000 +0000
-+++ TAO/configure.ac	2007-02-03 14:04:27.000000000 +0000
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-change_tao_sonames.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: propagate TAO_VERSION_NAME in all TAO Makefile.am files.
+
+ at DPATCH@
+--- ACE_wrappers.orig/TAO/configure.ac
++++ ACE_wrappers/TAO/configure.ac
 @@ -149,10 +149,12 @@
  TAO_MAJOR=$2
  TAO_MINOR=$3
@@ -13,8 +20,8 @@
  
  dnl We should have --with/--enable flags for these options.
  dnl Until we do, set them to reasonable defaults.
---- TAO/MPC/config/taodefaults.mpb-	2007-02-03 13:57:02.000000000 +0000
-+++ TAO/MPC/config/taodefaults.mpb	2007-02-03 14:05:19.000000000 +0000
+--- ACE_wrappers.orig/TAO/MPC/config/taodefaults.mpb
++++ ACE_wrappers/TAO/MPC/config/taodefaults.mpb
 @@ -7,7 +7,7 @@
    libpaths    += $(ACE_ROOT)/lib
  

Copied: trunk/debian/patches/02-tao-sonames-release-am.dpatch (from r469, trunk/debian/patches/02-tao-sonames-release-am.diff)
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/02-tao-sonames-release-am.dpatch?rev=470&op=diff
==============================================================================
--- trunk/debian/patches/02-tao-sonames-release-am.diff (original)
+++ trunk/debian/patches/02-tao-sonames-release-am.dpatch Sat Feb 10 23:03:31 2007
@@ -1,6 +1,12 @@
-diff -Nru ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/Makefile.am ACE_wrappers/TAO/orbsvcs/orbsvcs/Makefile.am
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/Makefile.am	2007-01-04 14:06:26.000000000 +0000
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/Makefile.am	2007-02-10 21:39:09.000000000 +0000
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-tao-sonames-release-am.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: result of debian/tao-sonames-release-am.sh application on Makefile.am.
+
+ at DPATCH@
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/Makefile.am
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/Makefile.am
 @@ -76,7 +76,7 @@
    Naming/Naming_Client.cpp
  
@@ -514,9 +520,8 @@
  
  libTAO_SSLIOP_la_LIBADD = \
    $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-diff -Nru ACE_wrappers.orig/TAO/tao/Makefile.am ACE_wrappers/TAO/tao/Makefile.am
---- ACE_wrappers.orig/TAO/tao/Makefile.am	2007-01-26 12:04:58.000000000 +0000
-+++ ACE_wrappers/TAO/tao/Makefile.am	2007-02-10 21:39:10.000000000 +0000
+--- ACE_wrappers.orig/TAO/tao/Makefile.am
++++ ACE_wrappers/TAO/tao/Makefile.am
 @@ -954,7 +954,7 @@
    target_specification.cpp
  

Modified: trunk/debian/patches/90-patch-mpc-basedir.dpatch
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/90-patch-mpc-basedir.dpatch?rev=470&op=diff
==============================================================================
--- trunk/debian/patches/90-patch-mpc-basedir.dpatch (original)
+++ trunk/debian/patches/90-patch-mpc-basedir.dpatch Sat Feb 10 23:03:31 2007
@@ -5,30 +5,35 @@
 ## DP: No description
 
 @DPATCH@
-
-Index: ACE_wrappers/bin/mwc.pl
-===================================================================
---- ACE_wrappers.orig/bin/mwc.pl	2004-10-16 16:36:16.167694688 +0200
-+++ ACE_wrappers/bin/mwc.pl	2004-10-16 16:36:31.604347960 +0200
-@@ -18,7 +18,7 @@
- use Cwd;
+--- ACE_wrappers.orig/bin/mwc.pl
++++ ACE_wrappers/bin/mwc.pl
+@@ -19,12 +19,7 @@
+ use File::Spec;
  use File::Basename;
  
--my($basePath) = getExecutePath($0) . '/MakeProjectCreator';
+-my($basePath) = $FindBin::Bin;
+-if ($^O eq 'VMS') {
+-  $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
+-  $basePath = VMS::Filespec::unixify($basePath);
+-}
+-$basePath .= '/MakeProjectCreator';
 +my($basePath) = '/usr/share/ace/bin/MakeProjectCreator';
- unshift(@INC, $basePath . '/modules');
  
  my($mpcroot) = $ENV{MPC_ROOT};
-Index: ACE_wrappers/bin/mpc.pl
-===================================================================
---- ACE_wrappers.orig/bin/mpc.pl	2004-10-16 16:36:16.168694536 +0200
-+++ ACE_wrappers/bin/mpc.pl	2004-10-16 16:36:31.604347960 +0200
-@@ -18,7 +18,7 @@
- use Cwd;
+ my($mpcpath) = (defined $mpcroot ? $mpcroot :
+--- ACE_wrappers.orig/bin/mpc.pl
++++ ACE_wrappers/bin/mpc.pl
+@@ -19,12 +19,7 @@
+ use File::Spec;
  use File::Basename;
  
--my($basePath) = getExecutePath($0) . '/MakeProjectCreator';
+-my($basePath) = $FindBin::Bin;
+-if ($^O eq 'VMS') {
+-  $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
+-  $basePath = VMS::Filespec::unixify($basePath);
+-}
+-$basePath .= '/MakeProjectCreator';
 +my($basePath) = '/usr/share/ace/bin/MakeProjectCreator';
- unshift(@INC, $basePath . '/modules');
  
  my($mpcroot) = $ENV{MPC_ROOT};
+ my($mpcpath) = (defined $mpcroot ? $mpcroot :

More information about the Pkg-ace-devel mailing list