[Pkg-corba-commits] r310 - in /trunk/omniorb/debian: changelog control libomnithread4-2.install libomnithread4-dev.install libomnithread4.install patches/formatstring patches/pkgconfig patches/series rules

tgg at users.alioth.debian.org tgg at users.alioth.debian.org
Tue Oct 28 14:59:18 UTC 2014 

Author: tgg
Date: Tue Oct 28 14:59:17 2014
New Revision: 310

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=310
Log:
fix many issues, notably ABI change

Added:
    trunk/omniorb/debian/libomnithread4.install
      - copied unchanged from r309, trunk/omniorb/debian/libomnithread4-2.install
    trunk/omniorb/debian/patches/formatstring
    trunk/omniorb/debian/patches/pkgconfig
Removed:
    trunk/omniorb/debian/libomnithread4-2.install
Modified:
    trunk/omniorb/debian/changelog
    trunk/omniorb/debian/control
    trunk/omniorb/debian/libomnithread4-dev.install
    trunk/omniorb/debian/patches/series
    trunk/omniorb/debian/rules

Modified: trunk/omniorb/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/changelog?rev=310&op=diff
==============================================================================
--- trunk/omniorb/debian/changelog	(original)
+++ trunk/omniorb/debian/changelog	Tue Oct 28 14:59:17 2014
@@ -9,10 +9,13 @@
   [ Thomas Girard ]
   * d/p/revert_abi_breakage: remove, no longer needed since the ABI has
     changed again.
+  * d/rules: change dh_makeshlibs invocation accordingly.
   * d/p/hurd: remove, applied upstream.
-  * d/rules: change dh_makeshlibs invocation accordingly
-  * d/control: bump standards-version to 3.9.6.
-  * d/control: rename packages to reflect new 4.2 ABI.
+  * d/p/pkgconfig: fix omnithread pkgconfig file.
+  * d/p/formatstring: fix FTBFS when building with hardening flags.
+  * d/control:
+    - bump standards-version to 3.9.6.
+    - rename packages to reflect new 4.2 ABI.
 
  -- Thomas Girard <thomas.g.girard at free.fr>  Fri, 10 Oct 2014 17:06:33 +0200
 

Modified: trunk/omniorb/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/control?rev=310&op=diff
==============================================================================
--- trunk/omniorb/debian/control	(original)
+++ trunk/omniorb/debian/control	Tue Oct 28 14:59:17 2014
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian CORBA Team <pkg-corba-devel at lists.alioth.debian.org>
 Uploaders: Floris Bruynooghe <flub at devork.be>, Thomas Girard <thomas.g.girard at free.fr>
-Build-Depends: debhelper (>= 6.0.0), python-dev (>= 2.6.6-3~), libssl-dev, autotools-dev, pkg-config
+Build-Depends: debhelper (>= 6.0.0), python-dev (>= 2.6.6-3~), libssl-dev, autotools-dev, pkg-config, dh-python, dh-autoreconf
 Standards-Version: 3.9.6
 Vcs-Svn: svn://svn.debian.org/svn/pkg-corba/trunk/omniorb
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb
@@ -100,6 +100,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libomniorb4-1
+Replaces: libomniorb4-1
 Description: omniORB core libraries
  omniORB4 is a freely available Common Object Request Broker
  Architecture (CORBA) 2.6 compliant object request broker (ORB)
@@ -139,7 +141,7 @@
  This includes developer files for libomniorb4, libomnicodesets4,
  libomnidynamic4 and libomnissltp4.
 
-Package: libomnithread4-2
+Package: libomnithread4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -150,13 +152,13 @@
  protocol and should be interoperable with any other
  CORBA 2.6 compliant ORB.
  .
- This includes libomnithread3.
+ This includes libomnithread4.
 
-Package: libomnithread4-2-dbg
+Package: libomnithread4-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: libomnithread4-2 (= ${binary:Version}), ${misc:Depends}
+Depends: libomnithread4 (= ${binary:Version}), ${misc:Depends}
 Description: C++ threading library debugging symbols
  omniORB4 is a freely available Common Object Request Broker
  Architecture (CORBA) 2.6 compliant object request broker (ORB)
@@ -164,12 +166,12 @@
  protocol and should be interoperable with any other
  CORBA 2.6 compliant ORB.
  .
- This includes the debug version of libomnithread3.
+ This includes the debug version of libomnithread4.
 
 Package: libomnithread4-dev
 Architecture: any
 Section: libdevel
-Depends: libomnithread4-2 (= ${binary:Version}), pkg-config, ${misc:Depends}
+Depends: libomnithread4 (= ${binary:Version}), pkg-config, ${misc:Depends}
 Description: C++ threading library development files
  omniORB4 is a freely available Common Object Request Broker
  Architecture (CORBA) 2.6 compliant object request broker (ORB)
@@ -177,7 +179,7 @@
  protocol and should be interoperable with any other
  CORBA 2.6 compliant ORB.
  .
- This includes developer files libomnithread3.
+ This includes developer files libomnithread4.
 
 Package: omniidl
 Architecture: any

Modified: trunk/omniorb/debian/libomnithread4-dev.install
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/libomnithread4-dev.install?rev=310&op=diff
==============================================================================
--- trunk/omniorb/debian/libomnithread4-dev.install	(original)
+++ trunk/omniorb/debian/libomnithread4-dev.install	Tue Oct 28 14:59:17 2014
@@ -1,5 +1,5 @@
 usr/lib/libomnithread.a
 usr/lib/libomnithread.so
-usr/lib/pkgconfig/omnithread3.pc
+usr/lib/pkgconfig/omnithread4.pc
 usr/include/omnithread.h
 usr/include/omnithread/

Added: trunk/omniorb/debian/patches/formatstring
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/formatstring?rev=310&op=file
==============================================================================
--- trunk/omniorb/debian/patches/formatstring	(added)
+++ trunk/omniorb/debian/patches/formatstring	Tue Oct 28 14:59:17 2014
@@ -0,0 +1,11 @@
+--- a/src/tool/omniidl/cxx/cccp/cccp.c
++++ b/src/tool/omniidl/cxx/cccp/cccp.c
+@@ -8034,7 +8034,7 @@
+       else
+ 	parse_error = macarg (NULL_PTR, 0);
+       if (parse_error) {
+-	error_with_line (line_for_error (start_line), parse_error);
++	error_with_line (line_for_error (start_line), "%s", parse_error);
+ 	break;
+       }
+       i++;

Added: trunk/omniorb/debian/patches/pkgconfig
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/pkgconfig?rev=310&op=file
==============================================================================
--- trunk/omniorb/debian/patches/pkgconfig	(added)
+++ trunk/omniorb/debian/patches/pkgconfig	Tue Oct 28 14:59:17 2014
@@ -0,0 +1,62 @@
+Description: Adapt pkgconfig files to new release
+--- a/contrib/pkgconfig/GNUmakefile.in
++++ b/contrib/pkgconfig/GNUmakefile.in
+@@ -6,7 +6,7 @@
+ 
+ INSTALLDIR = $(INSTALLLIBDIR)/pkgconfig
+ 
+-PKGFILES = omnithread3.pc omniORB4.pc omniDynamic4.pc \
++PKGFILES = omnithread4.pc omniORB4.pc omniDynamic4.pc \
+            omniCOS4.pc omniCOSDynamic4.pc omniConnectionMgmt4.pc \
+            omniZIOP4.pc omniZIOPDynamic4.pc
+ 
+--- a/contrib/pkgconfig/omniORB4.pc.in
++++ b/contrib/pkgconfig/omniORB4.pc.in
+@@ -9,7 +9,7 @@
+ Name: omniORB4
+ Description: CORBA Object Request Broker.
+ Version: @PACKAGE_VERSION@
+-Requires: omnithread3
++Requires: omnithread4
+ Libs: -L${libdir} -lomniORB4
+ Cflags: -I${includedir}
+ unloadable_stubs=-DOMNI_UNLOADABLE_STUBS
+--- a/contrib/pkgconfig/omnithread3.pc.in
++++ b/contrib/pkgconfig/omnithread3.pc.in
+@@ -1,11 +0,0 @@
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
+-
+-Name: omnithread3
+-Description: Threading library for omniORB4
+-Version: @PACKAGE_VERSION@
+-Requires:
+-Libs: -L${libdir} -lomnithread
+-Cflags: -D at PROCESSOR_DEFINE@ -D at PLATFORM_DEFINE@ -D__OSVERSION__=@OSVERSION@ -I${includedir}
+--- a/contrib/pkgconfig/omnithread4.pc.in
++++ b/contrib/pkgconfig/omnithread4.pc.in
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: omnithread4
++Description: Threading library for omniORB4
++Version: @PACKAGE_VERSION@
++Requires:
++Libs: -L${libdir} -lomnithread
++Cflags.private: -D at PROCESSOR_DEFINE@ -D at PLATFORM_DEFINE@ -D__OSVERSION__=@OSVERSION@ -I${includedir}
+--- a/configure.ac
++++ b/configure.ac
+@@ -330,7 +330,7 @@
+                 contrib/pkgconfig/GNUmakefile)
+ 
+ AC_OUTPUT([
+-contrib/pkgconfig/omnithread3.pc
++contrib/pkgconfig/omnithread4.pc
+ contrib/pkgconfig/omniORB4.pc
+ contrib/pkgconfig/omniDynamic4.pc
+ contrib/pkgconfig/omniCOS4.pc

Modified: trunk/omniorb/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/series?rev=310&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/series	(original)
+++ trunk/omniorb/debian/patches/series	Tue Oct 28 14:59:17 2014
@@ -5,4 +5,6 @@
 spurious_hashbang
 set_ipv6_v6only_to_0
 catior_manpage
+pkgconfig
+formatstring
 #hurd

Modified: trunk/omniorb/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/rules?rev=310&op=diff
==============================================================================
--- trunk/omniorb/debian/rules	(original)
+++ trunk/omniorb/debian/rules	Tue Oct 28 14:59:17 2014
@@ -2,6 +2,9 @@
 
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -13,11 +16,14 @@
 endif
 
 PRG_PACKAGES := omniorb omniorb-nameserver omniidl
-DEV_PACKAGES := libcos4-dev libomniorb4-dev libomnithread3-dev
+DEV_PACKAGES := libcos4-dev libomniorb4-dev libomnithread4-dev
 
-build/config.status:
+configure-stamp: configure.ac
+	dh_autoreconf
+	touch $@
+
+build/config.status: configure-stamp
 	dh_testdir
-	cp -f /usr/share/misc/config.sub /usr/share/misc/config.guess bin/scripts
 	-mkdir build
 	cd build && \
 	../configure $(confflags) \
@@ -43,7 +49,7 @@
 	rm -f build-stamp configure-stamp
 	-rm -rf build
 	-find . -name "*.pyc" -exec rm {} \;
-	-rm bin/scripts/config.guess bin/scripts/config.sub
+	dh_autoreconf_clean
 	dh_clean
 
 install: build
@@ -77,7 +83,7 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdirs -a
-	install -m 0644 sample.cfg debian/libomniorb4-1/etc/omniORB.cfg
+	install -m 0644 sample.cfg debian/libomniorb4-2/etc/omniORB.cfg
 	dh_installdocs -a
 	dh_installexamples -a
 	dh_installinit -a --name=omniorb4-nameserver
@@ -86,11 +92,11 @@
 	dh_strip $(addprefix -p,$(PRG_PACKAGES)) $(addprefix -p,$(DEV_PACKAGES))
 	dh_strip -plibcos4-2 --dbg-package=libcos4-2-dbg
 	dh_strip -plibomniorb4-2 --dbg-package=libomniorb4-2-dbg
-	dh_strip -plibomnithread4-2 --dbg-package=libomnithread4-2-dbg
+	dh_strip -plibomnithread4 --dbg-package=libomnithread4-dbg
 	dh_link -a
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -plibomnithread4-2 -V 'libomnithread4-2 (>= 4.2.0)'
+	dh_makeshlibs -plibomnithread4 -V 'libomnithread4 (>= 4.2.0)'
 	dh_makeshlibs -plibomniorb4-2 -V 'libomniorb4-2 (>= 4.2.0)'
 	dh_makeshlibs -plibcos4-2 -V 'libcos4-2 (>= 4.2.0)'
 	dh_python2 -pomniidl

More information about the Pkg-corba-commits mailing list