[Pkg-corba-commits] r3 - in /trunk/omniorb4/debian/patches: ./ 01_drop_omktools.diff 02_doc.diff 03_sample.diff

tgg at users.alioth.debian.org tgg at users.alioth.debian.org
Tue Aug 28 21:03:29 UTC 2007 

Author: tgg
Date: Tue Aug 28 21:03:29 2007
New Revision: 3

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=3
Log:
add patches again upstream sources as separate patches

Added:
    trunk/omniorb4/debian/patches/
    trunk/omniorb4/debian/patches/01_drop_omktools.diff
    trunk/omniorb4/debian/patches/02_doc.diff
    trunk/omniorb4/debian/patches/03_sample.diff

Added: trunk/omniorb4/debian/patches/01_drop_omktools.diff
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/patches/01_drop_omktools.diff?rev=3&op=file
==============================================================================
--- trunk/omniorb4/debian/patches/01_drop_omktools.diff (added)
+++ trunk/omniorb4/debian/patches/01_drop_omktools.diff Tue Aug 28 21:03:29 2007
@@ -1,0 +1,75 @@
+--- omniorb4-4.0.6.orig/configure.ac
++++ omniorb4-4.0.6/configure.ac
+@@ -2,7 +2,7 @@
+ AC_INIT(omniORB, 4.0.6, bugs at omniorb-support.com)
+ 
+ AC_PREREQ(2.52)
+-AC_CONFIG_SRCDIR(bin/scripts/omkdirhier)
++AC_CONFIG_SRCDIR(bin/scripts/distdate.py)
+ AC_CONFIG_AUX_DIR(bin/scripts)
+ 
+ AC_CANONICAL_BUILD
+--- omniorb4-4.0.6.orig/configure
++++ omniorb4-4.0.6/configure
+@@ -273,7 +273,7 @@
+ PACKAGE_STRING='omniORB 4.0.6'
+ PACKAGE_BUGREPORT='bugs at omniorb-support.com'
+ 
+-ac_unique_file="bin/scripts/omkdirhier"
++ac_unique_file="bin/scripts/distdate.py"
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+--- omniorb4-4.0.6.orig/src/tool/dir.mk
++++ omniorb4-4.0.6/src/tool/dir.mk
+@@ -7,7 +7,7 @@
+ endif
+ 
+ ifdef UnixPlatform
+-SUBDIRS = omkdepend omniidl
++SUBDIRS = omniidl
+ endif
+ 
+ ifdef Win32Platform
+--- omniorb4-4.0.6.orig/mk/beforeauto.mk.in
++++ omniorb4-4.0.6/mk/beforeauto.mk.in
+@@ -662,17 +662,16 @@
+ CC              = @CC@
+ CXX             = @CXX@
+ RANLIB		= @RANLIB@
+-MKDIRHIER	= $(BASE_OMNI_TREE)/bin/scripts/omkdirhier
++MKDIRHIER	= mkdir -p
+ INSTLIBFLAGS	= -m 0644
+ INSTEXEFLAGS	= -m 0755
+ CP		= cp
+ MV		= mv -f
+ CPP		= @CPP@
+-OMKDEPEND	= $(TOOLBINDIR)/omkdepend
+ RMDIRHIER	= $(RM) -rf
+ 
+-CXXMAKEDEPEND   = $(OMKDEPEND) -D__cplusplus
+-CMAKEDEPEND     = $(OMKDEPEND)
++CXXMAKEDEPEND   = @CXX@ -M -MD -MG
++CMAKEDEPEND     = @CC@ -M -MD -MG
+ 
+ 
+ #
+@@ -724,8 +723,6 @@
+ #
+ 
+ ifdef Compiler_GCC
+-CMAKEDEPEND     += -D__GNUC__
+-CXXMAKEDEPEND   += -D__GNUG__ -D__GNUC__
+ CXXOPTIONS       = -Wall -Wno-unused -fexceptions @EXTRA_GCC_CXXFLAGS@
+ EgcsMajorVersion = 1
+ EgcsMinorVersion = 1
+--- omniorb4-4.0.6.orig/include/omniconfig.h.in
++++ omniorb4-4.0.6/include/omniconfig.h.in
+@@ -37,7 +37,6 @@
+ #include <omniORB4/acconfig.h>
+ 
+ #define @PLATFORM_DEFINE@ 1
+-#define @PROCESSOR_DEFINE@ 1
+ #define __OSVERSION__ @OSVERSION@
+ 
+ #undef PACKAGE_BUGREPORT

Added: trunk/omniorb4/debian/patches/02_doc.diff
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/patches/02_doc.diff?rev=3&op=file
==============================================================================
--- trunk/omniorb4/debian/patches/02_doc.diff (added)
+++ trunk/omniorb4/debian/patches/02_doc.diff Tue Aug 28 21:03:29 2007
@@ -1,0 +1,94 @@
+--- omniorb4-4.0.6.orig/doc/tex/omniNames.tex
++++ omniorb4-4.0.6/doc/tex/omniNames.tex
+@@ -60,7 +60,7 @@
+ set with the \verb|OMNINAMES_ITBC| environment variable.  It defaults
+ to 15 minutes.
+ 
+-\section{Starting omniNames and setting omniORB.cfg}
++\section{Starting omniNames and setting omniORB4.cfg}
+ 
+ When starting omniNames for the first time, you can either let it
+ start with the default TCP port of 2809, or you can specify the port
+@@ -71,10 +71,10 @@
+ reference for its root context on standard error.
+ 
+ At startup, omniORB tries to read the configuration file
+-\verb|omniORB.cfg| to obtain the object reference to the root context
++\verb|omniORB4.cfg| to obtain the object reference to the root context
+ of the Naming Service.  This object reference is returned by
+ \verb|resolve_initial_references("NameService")|. There are a number
+ of methods of specifying the root naming context in
+-\verb|omniORB.cfg|---see the omniORB manual for details.
++\verb|omniORB4.cfg|---see the omniORB manual for details.
+ 
+ \end{document}
+--- omniorb4-4.0.6.orig/doc/tex/omniORB.tex
++++ omniorb4-4.0.6/doc/tex/omniORB.tex
+@@ -349,7 +349,7 @@
+ variable \envvar{OMNIORB_CONFIG}. If this variable is defined, it
+ contains the pathname of the omniORB configuration file. If the
+ variable is not set, omniORB will use the compiled-in pathname to
+-locate the file (by default \file{/etc/omniORB.cfg}).
++locate the file (by default \file{/etc/omniORB4.cfg}).
+ 
+ \item On Win32 platforms (Windows NT, 2000, 95, 98), omniORB first
+ checks the environment variable \envvar{OMNIORB_CONFIG} to obtain the
+@@ -1350,7 +1350,7 @@
+ 
+ Remember, omniORB constructs its internal list of initial references
+ at initialisation time using the information provided in the
+-configuration file \file{omniORB.cfg}, or given on the command
++configuration file \file{omniORB4.cfg}, or given on the command
+ line. If this file is not present, the internal list will be empty and
+ \op{resolve\_initial\_references} will raise a
+ \code{CORBA::ORB::\dsc{}InvalidName} exception.
+--- omniorb4-4.0.6.orig/doc/omniORB/omniORB001.html
++++ omniorb4-4.0.6/doc/omniORB/omniORB001.html
+@@ -114,7 +114,7 @@
+ variable <TT>OMNIORB_CONFIG</TT>. If this variable is defined, it
+ contains the pathname of the omniORB configuration file. If the
+ variable is not set, omniORB will use the compiled-in pathname to
+-locate the file (by default <TT>/etc/omniORB.cfg</TT>).<BR>
++locate the file (by default <TT>/etc/omniORB4.cfg</TT>).<BR>
+ <BR>
+ <LI>On Win32 platforms (Windows NT, 2000, 95, 98), omniORB first
+ checks the environment variable <TT>OMNIORB_CONFIG</TT> to obtain the
+--- omniorb4-4.0.6.orig/doc/omniORB/omniORB002.html
++++ omniorb4-4.0.6/doc/omniORB/omniORB002.html
+@@ -778,7 +778,7 @@
+ </PRE>
+ Remember, omniORB constructs its internal list of initial references
+ at initialisation time using the information provided in the
+-configuration file <TT>omniORB.cfg</TT>, or given on the command
++configuration file <TT>omniORB4.cfg</TT>, or given on the command
+ line. If this file is not present, the internal list will be empty and
+ <TT>resolve_initial_references()</TT> will raise a
+ <TT>CORBA::ORB::InvalidName</TT> exception.<BR>
+--- omniorb4-4.0.6.orig/doc/omniNames.html
++++ omniorb4-4.0.6/doc/omniNames.html
+@@ -61,9 +61,9 @@
+ set with the <CODE>OMNINAMES_ITBC</CODE> environment variable. It defaults
+ to 15 minutes.<BR>
+ <BR>
+-<!--TOC section Starting omniNames and setting omniORB.cfg-->
++<!--TOC section Starting omniNames and setting omniORB4.cfg-->
+ 
+-<H2>3&nbsp;&nbsp; Starting omniNames and setting omniORB.cfg</H2><!--SEC END -->
++<H2>3&nbsp;&nbsp; Starting omniNames and setting omniORB4.cfg</H2><!--SEC END -->
+ When starting omniNames for the first time, you can either let it
+ start with the default TCP port of 2809, or you can specify the port
+ number on which it should listen. This is written to the log file so
+@@ -73,11 +73,11 @@
+ reference for its root context on standard error.<BR>
+ <BR>
+ At startup, omniORB tries to read the configuration file
+-<CODE>omniORB.cfg</CODE> to obtain the object reference to the root context
++<CODE>omniORB4.cfg</CODE> to obtain the object reference to the root context
+ of the Naming Service. This object reference is returned by
+ <CODE>resolve_initial_references("NameService")</CODE>. There are a number
+ of methods of specifying the root naming context in
+-<CODE>omniORB.cfg</CODE>---see the omniORB manual for details.<BR>
++<CODE>omniORB4.cfg</CODE>---see the omniORB manual for details.<BR>
+ <BR>
+ <!--HTMLFOOT-->
+ <!--ENDHTML-->

Added: trunk/omniorb4/debian/patches/03_sample.diff
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/patches/03_sample.diff?rev=3&op=file
==============================================================================
--- trunk/omniorb4/debian/patches/03_sample.diff (added)
+++ trunk/omniorb4/debian/patches/03_sample.diff Tue Aug 28 21:03:29 2007
@@ -1,0 +1,11 @@
+--- omniorb4-4.0.6.orig/sample.cfg
++++ omniorb4-4.0.6/sample.cfg
+@@ -282,7 +282,7 @@
+ #   A call to resolve_initial_references("MyService") will return the object
+ #   reference denoted by `corbaloc::myhost.example.com/MyService'.
+ #
+-#   The default is empty.
++DefaultInitRef = corbaloc::
+ 
+ 
+ ############################################################################

More information about the Pkg-corba-commits mailing list