[Pkg-corba-commits] r161 - in /trunk/omniorb4: debian/ doc/ include/
flub-guest at users.alioth.debian.org
flub-guest at users.alioth.debian.org
Thu May 8 19:55:48 UTC 2008
Author: flub-guest
Date: Thu May 8 19:55:48 2008
New Revision: 161
URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=161
Log:
Change the package name to omniob (instead of omniorb4). Binary
packages needed to change name too. Patches to the documentation are
no longer needed now.
Added:
trunk/omniorb4/debian/omniidl.install
- copied unchanged from r160, trunk/omniorb4/debian/omniidl4.install
trunk/omniorb4/debian/omniidl.manpages
- copied unchanged from r160, trunk/omniorb4/debian/omniidl4.manpages
trunk/omniorb4/debian/omniorb-doc.doc-base
- copied, changed from r160, trunk/omniorb4/debian/omniorb4-doc.doc-base
trunk/omniorb4/debian/omniorb-doc.docs
- copied unchanged from r160, trunk/omniorb4/debian/omniorb4-doc.docs
trunk/omniorb4/debian/omniorb-doc.examples
- copied unchanged from r160, trunk/omniorb4/debian/omniorb4-doc.examples
trunk/omniorb4/debian/omniorb-doc.install
- copied, changed from r160, trunk/omniorb4/debian/omniorb4-doc.install
trunk/omniorb4/debian/omniorb-idl.install
- copied unchanged from r160, trunk/omniorb4/debian/omniorb4-idl.install
trunk/omniorb4/debian/omniorb-nameserver.dirs
- copied, changed from r160, trunk/omniorb4/debian/omniorb4-nameserver.dirs
trunk/omniorb4/debian/omniorb-nameserver.init
- copied, changed from r160, trunk/omniorb4/debian/omniorb4-nameserver.init
trunk/omniorb4/debian/omniorb-nameserver.install
- copied unchanged from r160, trunk/omniorb4/debian/omniorb4-nameserver.install
trunk/omniorb4/debian/omniorb-nameserver.manpages
- copied unchanged from r160, trunk/omniorb4/debian/omniorb4-nameserver.manpages
trunk/omniorb4/debian/omniorb-nameserver.postrm
- copied, changed from r160, trunk/omniorb4/debian/omniorb4-nameserver.postrm
trunk/omniorb4/debian/omniorb-nameserver.preinst
- copied, changed from r160, trunk/omniorb4/debian/omniorb4-nameserver.preinst
trunk/omniorb4/debian/omniorb.install
- copied unchanged from r160, trunk/omniorb4/debian/omniorb4.install
trunk/omniorb4/debian/omniorb.manpages
- copied unchanged from r160, trunk/omniorb4/debian/omniorb4.manpages
Removed:
trunk/omniorb4/debian/omniidl4.install
trunk/omniorb4/debian/omniidl4.manpages
trunk/omniorb4/debian/omniorb4-doc.doc-base
trunk/omniorb4/debian/omniorb4-doc.docs
trunk/omniorb4/debian/omniorb4-doc.examples
trunk/omniorb4/debian/omniorb4-doc.install
trunk/omniorb4/debian/omniorb4-idl.install
trunk/omniorb4/debian/omniorb4-nameserver.dirs
trunk/omniorb4/debian/omniorb4-nameserver.init
trunk/omniorb4/debian/omniorb4-nameserver.install
trunk/omniorb4/debian/omniorb4-nameserver.manpages
trunk/omniorb4/debian/omniorb4-nameserver.postrm
trunk/omniorb4/debian/omniorb4-nameserver.preinst
trunk/omniorb4/debian/omniorb4.install
trunk/omniorb4/debian/omniorb4.manpages
trunk/omniorb4/doc/
trunk/omniorb4/include/omnithread.h
Modified:
trunk/omniorb4/debian/changelog
trunk/omniorb4/debian/control
trunk/omniorb4/debian/rules
trunk/omniorb4/debian/watch
Modified: trunk/omniorb4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/changelog?rev=161&op=diff
==============================================================================
--- trunk/omniorb4/debian/changelog (original)
+++ trunk/omniorb4/debian/changelog Thu May 8 19:55:48 2008
@@ -1,3 +1,14 @@
+omniorb (4.1.2-2) unstable; urgency=low
+
+ * Transition name from omniorb4 to omniorb:
+ - Binary packages renamed and transitional packages made where relevant.
+ - Configuration file is now same as upstream (/etc/omniORB.cfg).
+ - No more documentation changes needed.
+ - omniNames dbdir changed to /var/lib/omniorb (from /var/lib/omniorb4).
+ - omniNames logfile changed to /var/log/omniorb-nameserver.log.
+
+ -- Floris Bruynooghe <floris.bruynooghe at gmail.com> Wed, 07 May 2008 21:58:17 +0100
+
omniorb4 (4.1.2-1) unstable; urgency=low
[ Floris Bruynooghe ]
Modified: trunk/omniorb4/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/control?rev=161&op=diff
==============================================================================
--- trunk/omniorb4/debian/control (original)
+++ trunk/omniorb4/debian/control Thu May 8 19:55:48 2008
@@ -1,4 +1,4 @@
-Source: omniorb4
+Source: omniorb
Section: devel
Priority: optional
Maintainer: Debian CORBA Team <pkg-corba-devel at lists.alioth.debian.org>
@@ -10,9 +10,10 @@
Vcs-Browser: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4
Homepage: http://omniorb.sourceforge.net
-Package: omniorb4
-Architecture: any
-Depends: ${shlibs:Depends}
+Package: omniorb
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: omniorb4 (<< 4.1.2-2)
Description: omniORB naming service and IOR utilities
omniORB is a freely available Common Object Request Broker
Architecture (CORBA) 2.6 compliant object request broker (ORB)
@@ -20,8 +21,17 @@
protocol and should be interoperable with any other
CORBA 2.6 compliant ORB.
-Package: omniorb4-idl
-Architecture: all
+Package: omniorb4
+Architecture: all
+Depends: omniorb (>= 4.1.2-2)
+Description: Transitional package for omniORB
+ This package depends on omniorb to handle the transition.
+ .
+ It can be safely removed after installation.
+
+Package: omniorb-idl
+Architecture: all
+Conflicts: omniorb4-idl (<< 4.1.2-2)
Description: omniORB CORBA services idl files
omniORB is a freely available Common Object Request Broker
Architecture (CORBA) 2.6 compliant object request broker (ORB)
@@ -31,9 +41,18 @@
.
This includes the idl files.
-Package: omniorb4-nameserver
-Architecture: any
-Depends: ${shlibs:Depends}
+Package: omniorb4-idl
+Architecture: all
+Depends: omniorb-idl (>= 4.1.2-2)
+Description: Transitional package for the omniORB IDL files
+ This package depends on omniorb-idl to handle the transition.
+ .
+ It can be safely removed after installation.
+
+Package: omniorb-nameserver
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: omniorb4-nameserver (<< 4.1.2-2)
Description: omniORB naming service
omniORB is a freely available Common Object Request Broker
Architecture (CORBA) 2.6 compliant object request broker (ORB)
@@ -43,8 +62,17 @@
.
This includes the CORBA nameserver.
-Package: omniorb4-doc
-Architecture: all
+Package: omniorb4-nameserver
+Architecture: all
+Depends: omniorb-nameserver (>= 4.1.2-2)
+Description: Transitional package for the omniORB nameing service
+ This package depends on omniorb-nameserver to handle the transition.
+ .
+ It can be safely removed after installation.
+
+Package: omniorb-doc
+Architecture: all
+Conflicts: omniorb4-doc (<< 4.1.2-2)
Section: doc
Description: omniORB documentation
omniORB4 is a freely available Common Object Request Broker
@@ -54,6 +82,15 @@
CORBA 2.6 compliant ORB.
.
This includes the documentation.
+
+Package: omniorb4-doc
+Architecture: all
+Section: doc
+Depends: omniorb-doc (>= 4.1.2-2)
+Description: Transitional package for the omniORB documenation
+ This package depends on omniorb-doc to handle the transition.
+ .
+ It can be safely removed after installation.
Package: libcos4-1
Architecture: any
@@ -178,12 +215,13 @@
.
This includes developer files libomnithread3.
-Package: omniidl4
+Package: omniidl
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}
Suggests: omniidl4-python
+Conflicts: omniidl4 (<< 4.1.2-2)
XB-Python-Version: ${python:Versions}
-Description: omniORB idl to C++ and Python compiler
+Description: omniORB IDL to C++ and Python compiler
omniORB4 is a freely available Common Object Request Broker
Architecture (CORBA) 2.6 compliant object request broker (ORB)
implementation. It is based on the IIOP communications
@@ -191,3 +229,11 @@
CORBA 2.6 compliant ORB.
.
This includes the idl compiler.
+
+Package: omniidl4
+Architecture: all
+Depends: omniidl (>= 4.1.2-2)
+Description: Transition package for the omniORB IDL to C++ and Python compiler
+ This package depdends on omniidl to handle the transition.
+ .
+ It can be safely removed after installation.
Copied: trunk/omniorb4/debian/omniorb-doc.doc-base (from r160, trunk/omniorb4/debian/omniorb4-doc.doc-base)
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/omniorb-doc.doc-base?rev=161&op=diff
==============================================================================
--- trunk/omniorb4/debian/omniorb4-doc.doc-base (original)
+++ trunk/omniorb4/debian/omniorb-doc.doc-base Thu May 8 19:55:48 2008
@@ -1,4 +1,4 @@
-Document: omniorb4-user-guide
+Document: omniorb-user-guide
Title: The omniORB version 4.1 User's Guide
Author: Duncan Grisby, David Riddoch
Abstract: omniORB is an Object Request Broker (ORB) that implements
@@ -12,5 +12,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/omniorb4-doc/omniORB/index.html
-Files: /usr/share/doc/omniorb4-doc/omniORB/*.html
+Index: /usr/share/doc/omniorb-doc/omniORB/index.html
+Files: /usr/share/doc/omniorb-doc/omniORB/*.html
Copied: trunk/omniorb4/debian/omniorb-doc.install (from r160, trunk/omniorb4/debian/omniorb4-doc.install)
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/omniorb-doc.install?rev=161&op=diff
==============================================================================
--- trunk/omniorb4/debian/omniorb4-doc.install (original)
+++ trunk/omniorb4/debian/omniorb-doc.install Thu May 8 19:55:48 2008
@@ -1,2 +1,2 @@
-../../doc/*.html usr/share/doc/omniorb4-doc/
-../../doc/omniORB/ usr/share/doc/omniorb4-doc/
+../../doc/*.html usr/share/doc/omniorb-doc/
+../../doc/omniORB/ usr/share/doc/omniorb-doc/
Copied: trunk/omniorb4/debian/omniorb-nameserver.dirs (from r160, trunk/omniorb4/debian/omniorb4-nameserver.dirs)
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/omniorb-nameserver.dirs?rev=161&op=diff
==============================================================================
--- trunk/omniorb4/debian/omniorb4-nameserver.dirs (original)
+++ trunk/omniorb4/debian/omniorb-nameserver.dirs Thu May 8 19:55:48 2008
@@ -1,1 +1,1 @@
-var/lib/omniorb4/
+var/lib/omniorb/
Copied: trunk/omniorb4/debian/omniorb-nameserver.init (from r160, trunk/omniorb4/debian/omniorb4-nameserver.init)
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/omniorb-nameserver.init?rev=161&op=diff
==============================================================================
--- trunk/omniorb4/debian/omniorb4-nameserver.init (original)
+++ trunk/omniorb4/debian/omniorb-nameserver.init Thu May 8 19:55:48 2008
@@ -18,8 +18,8 @@
NAME=omniNames
DESC="omniORB name server"
SCRIPTNAME=/etc/init.d/$NAME
-LOGFILE=/var/log/omniorb4-nameserver.log
-DBPREFIX=/var/lib/omniorb4/omninames-$(uname -n)
+LOGFILE=/var/log/omniorb-nameserver.log
+DBPREFIX=/var/lib/omniorb/omninames-$(uname -n)
DBFILE=$DBPREFIX.log
BACKUPDBFILE=$DBPREFIX.bak
PIDFILE=/var/run/$NAME.pid
Copied: trunk/omniorb4/debian/omniorb-nameserver.postrm (from r160, trunk/omniorb4/debian/omniorb4-nameserver.postrm)
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/omniorb-nameserver.postrm?rev=161&op=diff
==============================================================================
--- trunk/omniorb4/debian/omniorb4-nameserver.postrm (original)
+++ trunk/omniorb4/debian/omniorb-nameserver.postrm Thu May 8 19:55:48 2008
@@ -1,10 +1,10 @@
#! /bin/sh
-# postrm script for omniorb4-nameserver
+# postrm script for omniorb-nameserver
set -e
-LIBDIR=/var/lib/omniorb4/
-LOGFILE=/var/log/omniorb4-nameserver.log
+LIBDIR=/var/lib/omniorb/
+LOGFILE=/var/log/omniorb-nameserver.log
OLDLIBDIR=/var/log/
DBFILE=$(uname -n).log
BAKFILE=$(uname -n).bak
Copied: trunk/omniorb4/debian/omniorb-nameserver.preinst (from r160, trunk/omniorb4/debian/omniorb4-nameserver.preinst)
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/omniorb-nameserver.preinst?rev=161&op=diff
==============================================================================
--- trunk/omniorb4/debian/omniorb4-nameserver.preinst (original)
+++ trunk/omniorb4/debian/omniorb-nameserver.preinst Thu May 8 19:55:48 2008
@@ -1,11 +1,11 @@
#! /bin/sh
-# preinst script for omniorb4-nameserver
+# preinst script for omniorb-nameserver
set -e
-LIBDIR=/var/lib/omniorb4/
+LIBDIR=/var/lib/omniorb/
OLDLIBDIR=/var/log/
DBFILE=omninames-$(uname -n).log
BAKFILE=omninames-$(uname -n).bak
Modified: trunk/omniorb4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/rules?rev=161&op=diff
==============================================================================
--- trunk/omniorb4/debian/rules (original)
+++ trunk/omniorb4/debian/rules Thu May 8 19:55:48 2008
@@ -27,7 +27,7 @@
CXX += -O2
endif
-PRG_PACKAGES := omniorb4 omniorb4-nameserver omniidl4
+PRG_PACKAGES := omniorb omniorb-nameserver omniidl
DEV_PACKAGES := libcos4-dev libomniorb4-dev libomnithread3-dev
build/config.status:
@@ -41,8 +41,8 @@
--infodir=\$${prefix}/share/info \
--disable-thread-tracing \
--with-openssl=/usr \
- --with-omniORB-config=/etc/omniORB4.cfg \
- --with-omniNames-logdir=/var/lib/omniorb4
+ --with-omniORB-config=/etc/omniORB.cfg \
+ --with-omniNames-logdir=/var/lib/omniorb
build: build-stamp
build-stamp: build/config.status
@@ -66,7 +66,7 @@
$(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp
-find debian/tmp -name "*.pyc" -exec rm {} \;
dh_install --sourcedir=debian/tmp --list-missing
- sed -i '1d' debian/omniidl4/usr/lib/python2.*/site-packages/omniidl/main.py
+ sed -i '1d' debian/omniidl/usr/lib/python2.*/site-packages/omniidl/main.py
# Build architecture-independent files here.
binary-indep: build install
@@ -75,7 +75,7 @@
dh_installdirs -i
dh_installdocs -i
dh_installexamples -i
- chmod -R -x debian/omniorb4-doc/usr/share/doc/omniorb4-doc/examples
+ chmod -R -x debian/omniorb-doc/usr/share/doc/omniorb-doc/examples
dh_installman -i
dh_installchangelogs update.log -i
dh_link -i
@@ -91,7 +91,7 @@
dh_testdir -a
dh_testroot -a
dh_installdirs -a
- install -m 0644 sample.cfg debian/libomniorb4-1/etc/omniORB4.cfg
+ install -m 0644 sample.cfg debian/libomniorb4-1/etc/omniORB.cfg
dh_installdocs -a
dh_installexamples -a
dh_installinit -a
@@ -107,7 +107,7 @@
dh_makeshlibs -plibomnithread3c2 -V 'libomnithread3c2 (>= 4.0.6)'
dh_makeshlibs -plibomniorb4-1 -V 'libomniorb4-1 (>= 4.1.2)'
dh_makeshlibs -plibcos4-1 -V 'libcos4-1 (>= 4.1.2)'
- dh_pycentral -pomniidl4
+ dh_pycentral -pomniidl
dh_installdeb -a
dh_shlibdeps -a
dh_gencontrol -a
Modified: trunk/omniorb4/debian/watch
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/watch?rev=161&op=diff
==============================================================================
--- trunk/omniorb4/debian/watch (original)
+++ trunk/omniorb4/debian/watch Thu May 8 19:55:48 2008
@@ -1,4 +1,4 @@
-# Watch file for omniorb4, see uscan(1) for details.
+# Watch file for omniorb, see uscan(1) for details.
version=3
More information about the Pkg-corba-commits
mailing list