[Pkg-corba-commits] r25 - /branches/omniorb4/dev-flub-dbg/debian/

flub-guest at users.alioth.debian.org flub-guest at users.alioth.debian.org
Thu Oct 11 20:59:47 UTC 2007 

Author: flub-guest
Date: Thu Oct 11 20:59:47 2007
New Revision: 25

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=25
Log:
* Some clean of .dirs and .install files
* Do not use --sourcedir on dh_install
* Add -dbg packages for the libraries.

Added:
    branches/omniorb4/dev-flub-dbg/debian/libcos4-1-dbg.install
    branches/omniorb4/dev-flub-dbg/debian/libomniorb4-1-dbg.install
    branches/omniorb4/dev-flub-dbg/debian/libomniorb4-1.dirs
      - copied unchanged from r9, trunk/omniorb4/debian/libomniorb4c2.dirs
    branches/omniorb4/dev-flub-dbg/debian/libomnithread3c2-dbg.install
Removed:
    branches/omniorb4/dev-flub-dbg/debian/libcos4c2.install
    branches/omniorb4/dev-flub-dbg/debian/libomniorb4c2.dirs
    branches/omniorb4/dev-flub-dbg/debian/libomniorb4c2.install
    branches/omniorb4/dev-flub-dbg/debian/omniorb4.override
Modified:
    branches/omniorb4/dev-flub-dbg/debian/control
    branches/omniorb4/dev-flub-dbg/debian/libcos4-1.install
    branches/omniorb4/dev-flub-dbg/debian/libcos4-dev.install
    branches/omniorb4/dev-flub-dbg/debian/libomniorb4-1.install
    branches/omniorb4/dev-flub-dbg/debian/libomniorb4-dev.install
    branches/omniorb4/dev-flub-dbg/debian/libomnithread3-dev.install
    branches/omniorb4/dev-flub-dbg/debian/libomnithread3c2.install
    branches/omniorb4/dev-flub-dbg/debian/omniidl4.install
    branches/omniorb4/dev-flub-dbg/debian/omniorb4-doc.install
    branches/omniorb4/dev-flub-dbg/debian/omniorb4-idl.install
    branches/omniorb4/dev-flub-dbg/debian/omniorb4-nameserver.install
    branches/omniorb4/dev-flub-dbg/debian/omniorb4.install
    branches/omniorb4/dev-flub-dbg/debian/rules

Modified: branches/omniorb4/dev-flub-dbg/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/control?rev=25&op=diff
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/control (original)
+++ branches/omniorb4/dev-flub-dbg/debian/control Thu Oct 11 20:59:47 2007
@@ -65,6 +65,19 @@
  .
  This includes libcos4 and libcosdynamic4.
 
+Package: libcos4-1-dbg
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}
+Description: omniORB4 - CORBA ORB - libcos4 - debug version
+ 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
+ protocol and should be interoperable with any other
+ CORBA 2.6 compliant ORB.
+ .
+ This includes the debug versions of libcos4 and libcosdynamic4.
+
 Package: libcos4-dev
 Architecture: any
 Section: libdevel
@@ -91,6 +104,20 @@
  .
  This includes libomniorb4, libomnicodesets4, libomnidynamic4
  and libomnissltp4.
+
+Package: libomniorb4-1-dbg
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}
+Description: omniORB4 - CORBA ORB - libomniorb4 - debug version
+ 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
+ protocol and should be interoperable with any other
+ CORBA 2.6 compliant ORB.
+ .
+ This includes the debug versions of libomniorb4, libomnicodesets4,
+ libomnidynamic4 and libomnissltp4.
 
 Package: libomniorb4-dev
 Architecture: any
@@ -119,6 +146,19 @@
  .
  This includes libomnithread3.
 
+Package: libomnithread3c2-dbg
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}
+Description: omniORB4 - CORBA ORB - libomnithread3 - debug version
+ 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
+ protocol and should be interoperable with any other
+ CORBA 2.6 compliant ORB.
+ .
+ This includes the debug version of libomnithread3.
+
 Package: libomnithread3-dev
 Architecture: any
 Section: libdevel

Added: branches/omniorb4/dev-flub-dbg/debian/libcos4-1-dbg.install
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/libcos4-1-dbg.install?rev=25&op=file
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/libcos4-1-dbg.install (added)
+++ branches/omniorb4/dev-flub-dbg/debian/libcos4-1-dbg.install Thu Oct 11 20:59:47 2007
@@ -1,0 +1,2 @@
+debian/tmp-dbg/usr/lib/libCOS4.so.* usr/lib/debug/
+debian/tmp-dbg/usr/lib/libCOSDynamic4.so.* usr/lib/debug/

Modified: branches/omniorb4/dev-flub-dbg/debian/libcos4-1.install
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/libcos4-1.install?rev=25&op=diff
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/libcos4-1.install (original)
+++ branches/omniorb4/dev-flub-dbg/debian/libcos4-1.install Thu Oct 11 20:59:47 2007
@@ -1,2 +1,2 @@
-usr/lib/libCOS4.so.*
-usr/lib/libCOSDynamic4.so.*
+debian/tmp/usr/lib/libCOS4.so.* usr/lib/
+debian/tmp/usr/lib/libCOSDynamic4.so.* usr/lib/

Modified: branches/omniorb4/dev-flub-dbg/debian/libcos4-dev.install
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/libcos4-dev.install?rev=25&op=diff
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/libcos4-dev.install (original)
+++ branches/omniorb4/dev-flub-dbg/debian/libcos4-dev.install Thu Oct 11 20:59:47 2007
@@ -1,7 +1,7 @@
-usr/lib/libCOS4.a
-usr/lib/libCOS4.so
-usr/lib/libCOSDynamic4.a
-usr/lib/libCOSDynamic4.so
-usr/lib/pkgconfig/omniCOS4.pc
-usr/lib/pkgconfig/omniCOSDynamic4.pc
-usr/include/COS/
+debian/tmp/usr/lib/libCOS4.a usr/lib
+debian/tmp/usr/lib/libCOS4.so usr/lib
+debian/tmp/usr/lib/libCOSDynamic4.a usr/lib
+debian/tmp/usr/lib/libCOSDynamic4.so usr/lib
+debian/tmp/usr/lib/pkgconfig/omniCOS4.pc usr/lib/pkgconfig/
+debian/tmp/usr/lib/pkgconfig/omniCOSDynamic4.pc usr/lib/pkgconfig/
+debian/tmp/usr/include/COS/ usr/include/COS/

Added: branches/omniorb4/dev-flub-dbg/debian/libomniorb4-1-dbg.install
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/libomniorb4-1-dbg.install?rev=25&op=file
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/libomniorb4-1-dbg.install (added)
+++ branches/omniorb4/dev-flub-dbg/debian/libomniorb4-1-dbg.install Thu Oct 11 20:59:47 2007
@@ -1,0 +1,4 @@
+debian/tmp/usr/lib/libomniCodeSets4.so.* usr/lib/debug/
+debian/tmp/usr/lib/libomniDynamic4.so.* usr/lib/debug/
+debian/tmp/usr/lib/libomniORB4.so.* usr/lib/debug/
+debian/tmp/usr/lib/libomnisslTP4.so.* usr/lib/debug/

Modified: branches/omniorb4/dev-flub-dbg/debian/libomniorb4-1.install
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/libomniorb4-1.install?rev=25&op=diff
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/libomniorb4-1.install (original)
+++ branches/omniorb4/dev-flub-dbg/debian/libomniorb4-1.install Thu Oct 11 20:59:47 2007
@@ -1,4 +1,5 @@
-usr/lib/libomniCodeSets4.so.*
-usr/lib/libomniDynamic4.so.*
-usr/lib/libomniORB4.so.*
-usr/lib/libomnisslTP4.so.*
+debian/tmp/usr/lib/libomniCodeSets4.so.* usr/lib/
+debian/tmp/usr/lib/libomniDynamic4.so.* usr/lib/
+debian/tmp/usr/lib/libomniORB4.so.* usr/lib/
+debian/tmp/usr/lib/libomnisslTP4.so.* usr/lib/
+sample.cfg etc/omniORB4.cfg

Modified: branches/omniorb4/dev-flub-dbg/debian/libomniorb4-dev.install
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/libomniorb4-dev.install?rev=25&op=diff
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/libomniorb4-dev.install (original)
+++ branches/omniorb4/dev-flub-dbg/debian/libomniorb4-dev.install Thu Oct 11 20:59:47 2007
@@ -1,15 +1,15 @@
-usr/lib/libomniCodeSets4.a
-usr/lib/libomniCodeSets4.so
-usr/lib/libomniConnectionMgmt4.a
-usr/lib/libomniConnectionMgmt4.so
-usr/lib/libomniDynamic4.a
-usr/lib/libomniDynamic4.so
-usr/lib/libomniORB4.a
-usr/lib/libomniORB4.so
-usr/lib/libomnisslTP4.a
-usr/lib/libomnisslTP4.so
-usr/lib/pkgconfig/omniConnectionMgmt4.pc
-usr/lib/pkgconfig/omniDynamic4.pc
-usr/lib/pkgconfig/omniORB4.pc
-usr/include/omniconfig.h
-usr/include/omniORB4/
+debian/tmp/usr/lib/libomniCodeSets4.a usr/lib/
+debian/tmp/usr/lib/libomniCodeSets4.so usr/lib/
+debian/tmp/usr/lib/libomniConnectionMgmt4.a usr/lib/
+debian/tmp/usr/lib/libomniConnectionMgmt4.so usr/lib/
+debian/tmp/usr/lib/libomniDynamic4.a usr/lib/
+debian/tmp/usr/lib/libomniDynamic4.so usr/lib/
+debian/tmp/usr/lib/libomniORB4.a usr/lib/
+debian/tmp/usr/lib/libomniORB4.so usr/lib/
+debian/tmp/usr/lib/libomnisslTP4.a usr/lib/
+debian/tmp/usr/lib/libomnisslTP4.so usr/lib/
+debian/tmp/usr/lib/pkgconfig/omniConnectionMgmt4.pc usr/lib/pkgconfig/
+debian/tmp/usr/lib/pkgconfig/omniDynamic4.pc usr/lib/pkgconfig/
+debian/tmp/usr/lib/pkgconfig/omniORB4.pc usr/lib/pkgconfig/
+debian/tmp/usr/include/omniconfig.h usr/include/
+debian/tmp/usr/include/omniORB4/ usr/include/

Modified: branches/omniorb4/dev-flub-dbg/debian/libomnithread3-dev.install
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/libomnithread3-dev.install?rev=25&op=diff
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/libomnithread3-dev.install (original)
+++ branches/omniorb4/dev-flub-dbg/debian/libomnithread3-dev.install Thu Oct 11 20:59:47 2007
@@ -1,5 +1,5 @@
-usr/lib/libomnithread.a
-usr/lib/libomnithread.so
-usr/lib/pkgconfig/omnithread3.pc
-usr/include/omnithread.h
-usr/include/omnithread/
+debian/tmp/usr/lib/libomnithread.a usr/lib/
+debian/tmp/usr/lib/libomnithread.so usr/lib/
+debian/tmp/usr/lib/pkgconfig/omnithread3.pc usr/lib/pkgconfig/
+debian/tmp/usr/include/omnithread.h usr/include/
+debian/tmp/usr/include/omnithread/ usr/include/

Added: branches/omniorb4/dev-flub-dbg/debian/libomnithread3c2-dbg.install
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/libomnithread3c2-dbg.install?rev=25&op=file
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/libomnithread3c2-dbg.install (added)
+++ branches/omniorb4/dev-flub-dbg/debian/libomnithread3c2-dbg.install Thu Oct 11 20:59:47 2007
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/libomnithread.so.* usr/lib/debug/

Modified: branches/omniorb4/dev-flub-dbg/debian/libomnithread3c2.install
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/libomnithread3c2.install?rev=25&op=diff
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/libomnithread3c2.install (original)
+++ branches/omniorb4/dev-flub-dbg/debian/libomnithread3c2.install Thu Oct 11 20:59:47 2007
@@ -1,1 +1,1 @@
-usr/lib/libomnithread.so.*
+debian/tmp/usr/lib/libomnithread.so.* usr/lib/

Modified: branches/omniorb4/dev-flub-dbg/debian/omniidl4.install
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/omniidl4.install?rev=25&op=diff
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/omniidl4.install (original)
+++ branches/omniorb4/dev-flub-dbg/debian/omniidl4.install Thu Oct 11 20:59:47 2007
@@ -1,3 +1,3 @@
-usr/bin/omnicpp
-usr/bin/omniidl
-usr/lib/python*.*/site-packages/
+debian/tmp/usr/bin/omnicpp usr/bin/
+debian/tmp/usr/bin/omniidl usr/bin/
+debian/tmp/usr/lib/python*.* usr/lib/

Modified: branches/omniorb4/dev-flub-dbg/debian/omniorb4-doc.install
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/omniorb4-doc.install?rev=25&op=diff
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/omniorb4-doc.install (original)
+++ branches/omniorb4/dev-flub-dbg/debian/omniorb4-doc.install Thu Oct 11 20:59:47 2007
@@ -1,2 +1,2 @@
-../../doc/*.html usr/share/doc/omniorb4-doc/
-../../doc/omniORB/ usr/share/doc/omniorb4-doc/
+doc/*.html usr/share/doc/omniorb4-doc/
+doc/omniORB/ usr/share/doc/omniorb4-doc/

Modified: branches/omniorb4/dev-flub-dbg/debian/omniorb4-idl.install
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/omniorb4-idl.install?rev=25&op=diff
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/omniorb4-idl.install (original)
+++ branches/omniorb4/dev-flub-dbg/debian/omniorb4-idl.install Thu Oct 11 20:59:47 2007
@@ -1,1 +1,1 @@
-usr/share/idl/omniORB/
+debian/tmp/usr/share/idl/omniORB/ usr/share/idl/omniORB/

Modified: branches/omniorb4/dev-flub-dbg/debian/omniorb4-nameserver.install
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/omniorb4-nameserver.install?rev=25&op=diff
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/omniorb4-nameserver.install (original)
+++ branches/omniorb4/dev-flub-dbg/debian/omniorb4-nameserver.install Thu Oct 11 20:59:47 2007
@@ -1,1 +1,1 @@
-usr/bin/omniNames
+debian/tmp/usr/bin/omniNames usr/bin/

Modified: branches/omniorb4/dev-flub-dbg/debian/omniorb4.install
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/omniorb4.install?rev=25&op=diff
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/omniorb4.install (original)
+++ branches/omniorb4/dev-flub-dbg/debian/omniorb4.install Thu Oct 11 20:59:47 2007
@@ -1,5 +1,5 @@
-usr/bin/catior
-usr/bin/convertior
-usr/bin/genior
-usr/bin/nameclt
-usr/bin/omniMapper
+debian/tmp/usr/bin/catior usr/bin/
+debian/tmp/usr/bin/convertior usr/bin/
+debian/tmp/usr/bin/genior usr/bin/
+debian/tmp/usr/bin/nameclt usr/bin/
+debian/tmp/usr/bin/omniMapper usr/bin/

Modified: branches/omniorb4/dev-flub-dbg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/branches/omniorb4/dev-flub-dbg/debian/rules?rev=25&op=diff
==============================================================================
--- branches/omniorb4/dev-flub-dbg/debian/rules (original)
+++ branches/omniorb4/dev-flub-dbg/debian/rules Thu Oct 11 20:59:47 2007
@@ -23,12 +23,16 @@
 		--with-openssl=/usr \
 		--with-omniORB-config=/etc/omniORB4.cfg \
 		--with-omniNames-logdir=/var/lib/omniorb4
+	cp -R build build-dbg
+	sed -i -e '/^CDEBUGFLAGS  *= -O$$/s/-O/-g/' \
+	    -e '/^CXXDEBUGFLAGS  *= -o$$/s/-O2/-G/' build-dbg/mk/beforeauto.mk
 
 build: build-stamp
 build-stamp: build/config.status
 	dh_testdir
 	$(MAKE) -C build
-	touch build-stamp
+	$(MAKE) -C build-dbg
+	touch $@
 
 clean:
 	dh_testdir
@@ -44,20 +48,20 @@
 	dh_testroot
 	dh_clean -k
 	$(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C build-dbg install DESTDIR=$(CURDIR)/debian/tmp-dbg
 	-find debian/tmp -name "*.pyc" -exec rm {} \;
-	dh_install --sourcedir=debian/tmp
-	mkdir debian/libomniorb4-1/etc/
-	install -m 0644 sample.cfg debian/libomniorb4-1/etc/omniORB4.cfg
+	dh_installdirs
+	dh_install
 	sed -i '1d' debian/omniidl4/usr/lib/python2.*/site-packages/omniidl/main.py
 
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
-	dh_installdirs -i
+	#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/omniorb4-doc/usr/share/doc/omniorb4-doc/examples
 	dh_installman -i
 	dh_installchangelogs update.log -i
 	dh_link -i

More information about the Pkg-corba-commits mailing list