Wed Nov 28 08:55:49 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * debian/ace.dsc:
        * debian/debian.changelog:
        * debian/debian.compat:
        * debian/debian.control:
        * debian/debian.rules:
        * debian/libace-6.1.6.install:
        * debian/libace-dev.install:
        * debian/libtao-dev.install:
          Added rle compressor and added files as currently work
          on OBS

9 files changed, 72 insertions, 51 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index f7a5381351f..e1568bb877e 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,16 @@
+Wed Nov 28 08:55:49 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * debian/ace.dsc:
+        * debian/debian.changelog:
+        * debian/debian.compat:
+        * debian/debian.control:
+        * debian/debian.rules:
+        * debian/libace-6.1.6.install:
+        * debian/libace-dev.install:
+        * debian/libtao-dev.install:
+          Added rle compressor and added files as currently work
+          on OBS
+
 Wed Nov 28 07:35:14 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * debian/debian.control:
diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc
index 5e663639204..4f12ae018fe 100644
--- a/ACE/debian/ace.dsc
+++ b/ACE/debian/ace.dsc
@@ -4,7 +4,6 @@ Version: 2.1.6
 Binary: ace
 Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
 Architecture: any
-Build-Depends: gcc, make, g++, debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz
+Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev, libzzip-dev, libbz2-dev
 Files:
- 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-6.1.6.tar.gz
-
+ 0bc68574264c446762fce17a87ec7631 45030125 ACE+TAO+CIAO-src-6.1.6.tar.gz
diff --git a/ACE/debian/debian.changelog b/ACE/debian/debian.changelog
index bddb3b02cd7..4fd7ec54d79 100644
--- a/ACE/debian/debian.changelog
+++ b/ACE/debian/debian.changelog
@@ -1,3 +1,9 @@
+ace (6.1.6-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Johnny Willemsen <jwillemsen@remedy.nl>  Wed, 28 Nov 2012 20:51:01 +0200
+
 ace (6.1.2-1) experimental; urgency=low
 
   * New upstream release.
@@ -189,7 +195,7 @@ ace (5.7.7-3) unstable; urgency=low
   [ Marek Brudka ]
   * Configuration file for KFreeBSD created. Closes: #591586.
   * Restored pkgconfig files. Closes: #591610.
-  * Provided manpages for tao_catior, tao_nslist, tao_nsdel, 
+  * Provided manpages for tao_catior, tao_nslist, tao_nsdel,
     tao_nsadd, ace_netsvcs.
 
   [ Thomas Girard ]
@@ -293,7 +299,7 @@ ace (5.6.3-6) unstable; urgency=low
   [ Pau Garcia i Quiles ]
   * Add new patches:
     - Remove duplicate files from .mpc files so that Makefile.am files do
-      not have duplicates 
+      not have duplicates
     - Run autoupdate and autoreconf in the ACE and TAO directories in order
       to update from libtool 1.5 (what upstream uses) to libtool 2.2
 
@@ -553,9 +559,9 @@ ace (5.4.7-6) unstable; urgency=low
   * debian/patches/16-g++4-visibility-tweaks.dpatch:
     Backport upstream tweaks for g++ 4 visibility feature and disable
     visibility hiding for now. (Closes: #324271).
-  * debian/rules: g++ 4.0.2 was ICE'ing on #pragma once. This is no 
+  * debian/rules: g++ 4.0.2 was ICE'ing on #pragma once. This is no
     longer true as of g++-4.0_4.0.2-4, so we can use g++4 again. For the
-    record, another possible fix was to #define ACE_LACKS_PRAGMA_ONCE in 
+    record, another possible fix was to #define ACE_LACKS_PRAGMA_ONCE in
     `$ACE_ROOT/ace/config.h`.
   * Add `c2a` suffix to all libs for libstdc++ allocator change.
     (Closes: #339142).
@@ -606,7 +612,7 @@ ace (5.4.7-1) unstable; urgency=low
  -- Konstantinos Margaritis <markos@debian.org>  Fri, 12 Aug 2005 12:45:13 +0300
 
 ace (5.4.2.1.0-4) unstable; urgency=high
-  
+
     * Thomas Girard <thomas.g.girard@free.fr>
       - debian/control:
         o libacexml-dev depends on libace-dev.
@@ -617,7 +623,7 @@ ace (5.4.2.1.0-4) unstable; urgency=high
         reported by lintian.
       - debian/libciao-dev.install: add missing .idl and .pidl files.
         (Closes: #307258)
-  
+
  -- Thomas Girard <thomas.g.girard@free.fr>  Mon,  2 May 2005 19:30:01 +0200
 
 ace (5.4.2.1.0-3) unstable; urgency=high
@@ -711,9 +717,9 @@ ace (5.4.2.1-1) unstable; urgency=low
   * Konstantinos Margaritis
     - Fixed missed path for libACE.so.5.4.2 in dh_shlibdeps
     - Fixed incorrect timestamp of original archive (1970 etc).
- 
+
  -- Konstantinos Margaritis <markos@debian.org>  Thu,  2 Sep 2004 23:04:56 +0200
- 
+
 ace (5.4.0.1-1.1) unstable; urgency=low
 
   * Fixed ACE_NDEBUG configuration of ACE. (Closes: #242881)
@@ -779,7 +785,7 @@ ace (5.3.1-7) unstable; urgency=low
 
 ace (5.3.1-6) unstable; urgency=low
 
-  * Added the ORB services .idl files that were left out from the 
+  * Added the ORB services .idl files that were left out from the
     libtao-orbsvcs-dev package. (Closes: #213568)
 
  -- Konstantinos Margaritis <markos@debian.org>  Sun,  5 Oct 2003 12:31:21 +0300
@@ -805,7 +811,7 @@ ace (5.3.1-3) unstable; urgency=low
 
   * Updated to new standards version 3.6.1
   * Fixed the section of a couple of packages.
-  * Now the getrlimit, etc functions are always defined 
+  * Now the getrlimit, etc functions are always defined
     as ints. g++ 3.x does not complain anymore (Closes: #104681).
 
  -- Konstantinos Margaritis <markos@debian.org>  Tue, 16 Sep 2003 10:31:03 +0300
@@ -820,7 +826,7 @@ ace (5.3.1-2) unstable; urgency=low
   * Full doxygen documentation not included due to size concerns.
     (Closes: #108749).
   * tao-config included in libtao-dev. (Closes: #159234).
-  * All -dev packages carry their respective examples in full and 
+  * All -dev packages carry their respective examples in full and
     uncompressed. (Closes: #52145, #76967).
   * libACE.a is compiled with thread support enabled. (Closes: #126717).
     dbbalancer now builds successfully with -static.
@@ -861,7 +867,7 @@ ace (5.2.4-1.2) unstable; urgency=low
 
 ace (5.2.4-1.1) unstable; urgency=low
 
-  * gcc-3.2 transition, NMU patch by Andreas Metzler <ametzler@debian.org> 
+  * gcc-3.2 transition, NMU patch by Andreas Metzler <ametzler@debian.org>
   * (Closes: #188328)
 
  -- Konstantinos Margaritis <markos@debian.org>  Fri, 11 Apr 2003 23:25:38 +0200
@@ -931,7 +937,7 @@ ace (5.1.8-5) unstable; urgency=low
     5.0 debian packages, since both sets of packages have files with the
     same name.  libace5.1-dev also conflicts with libace4.6-dev.  (#74031)
   * Added xlib6g-dev to the list of build dependencies.  The X11 libraries
-    aren't strictly necessary to build ACE, but the Debian packages enable    
+    aren't strictly necessary to build ACE, but the Debian packages enable
     ACE's XtReactor support.
   * Updated `README.Debian'.  The Debian ACE packages are no longer built
     using experimental ACE Configuration Project distributions.  They are
diff --git a/ACE/debian/debian.compat b/ACE/debian/debian.compat
new file mode 100644
index 00000000000..45a4fb75db8
--- /dev/null
+++ b/ACE/debian/debian.compat
@@ -0,0 +1 @@
+8
diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control
index 36dde1f3ff5..ebea7397a52 100644
--- a/ACE/debian/debian.control
+++ b/ACE/debian/debian.control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel@lists.alioth.debian.org>
 Uploaders: Thomas Girard <thomas.g.girard@free.fr>, Pau Garcia i Quiles <pgquiles@elpauer.org>, Marek Brudka <mbrudka@aster.pl>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8.9.7), dpkg-dev (>= 1.16.2), libssl-dev (>= 0.9.7d), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.5), libfox-1.6-dev, zlib1g-dev, libzzip-dev, liblzo2-dev, docbook-to-man, bzip2, libbz2-dev
+Build-Depends: debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, libfox-1.6-dev, zlib1g-dev, libzzip-dev, docbook-to-man, bzip2, libbz2-dev
 Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 3.9.2
 Vcs-Git: git://anonscm.debian.org/pkg-ace/pkg-ace.git
@@ -74,7 +74,7 @@ Description: ACE secure socket layer library
 Package: libace-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-ssl-6.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.1.6d), ${misc:Depends}
+Depends: libace-ssl-6.1.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.1.6d), ${misc:Depends}
 Description: ACE secure socket layer library - development files
  This package contains the header files and static library for the ACE
  SSL library.
@@ -155,7 +155,7 @@ Description: ACE Inet protocol library - development files
 Package: libace-inet-ssl-6.1.6
 Architecture: any
 Section: libs
-Depends: libace-inet-6.1.2, libace-ssl-6.1.6, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.1.6, libace-ssl-6.1.6, ${shlibs:Depends}, ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library
  This package provides an ACE addon library for clients (and possibly
  servers at some point) using Inet protocols which support SSL, such as
@@ -274,7 +274,7 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-6.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.1.6), ${misc:Depends}
+Depends: libace-xtreactor-6.1.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.1.6), ${misc:Depends}
 Description: ACE-GUI reactor integration for Xt - development files
  This package contains header files and static library for the ACE-Xt
  reactor integration.
@@ -321,7 +321,7 @@ Description: ACE-GUI reactor integration for Fl
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-6.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.1.6), ${misc:Depends}
+Depends: libace-flreactor-6.1.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.1.6), ${misc:Depends}
 Description: ACE-GUI reactor integration for Fl - development files
  This package contains header files and static library for the ACE-Fl
  reactor integration.
diff --git a/ACE/debian/debian.rules b/ACE/debian/debian.rules
index 9487350e616..ad2c1e37095 100644
--- a/ACE/debian/debian.rules
+++ b/ACE/debian/debian.rules
@@ -8,10 +8,10 @@
 
 MWCFLAGS := -type gnuace -noreldefs
 DSO_MAKE_FLAG := versioned_so=2
-INSTALL_FLAGS := DESTDIR=$(CURDIR)/debian/tmp INSTALL_PREFIX=/usr install_rpath=0 $(DSO_MAKE_FLAG)
+export DESTDIR := $(CURDIR)/debian/tmp
+INSTALL_FLAGS := install_rpath=0 $(DSO_MAKE_FLAG)
 
-MAN1 := debian/ace_netsvcs.1 \
-	debian/tao_catior.1 \
+MAN1 := debian/tao_catior.1 \
 	debian/tao_nslist.1 \
 	debian/tao_nsadd.1 \
 	debian/tao_nsdel.1 \
@@ -38,7 +38,8 @@ export MPC_ROOT := $(ACE_ROOT)/MPC
 export TAO_ROOT := $(ACE_ROOT)/TAO
 export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib
 export QTDIR := /usr/share/qt4
-
+export INSTALL_PREFIX := /usr
+export DESTDIR := $(CURDIR)/debian/tmp
 %:
 	dh $@
 
@@ -50,21 +51,20 @@ configure-stamp:
 	cp debian/platform_macros.GNU $(ACE_ROOT)/include/makeinclude
 	cp debian/config*.h $(ACE_ROOT)/ace/
 	cp debian/default.features $(ACE_ROOT)/bin/MakeProjectCreator/config
-	cp debian/ACE-DPKG.mwc $(ACE_ROOT)
-	cd $(ACE_ROOT) && $(ACE_ROOT)/bin/mwc.pl $(MWCFLAGS) ACE-DPKG.mwc
-	cp debian/TAO-DPKG.mwc $(TAO_ROOT)
-	cd $(TAO_ROOT) && $(ACE_ROOT)/bin/mwc.pl $(MWCFLAGS) TAO-DPKG.mwc
+	cd $(TAO_ROOT) && $(ACE_ROOT)/bin/mwc.pl $(MWCFLAGS) TAO_ACE.mwc
 	touch $@
 
-override_dh_auto_build-arch: configure-stamp
-	$(MAKE) -C $(ACE_ROOT) $(DSO_MAKE_FLAG) $(FIXUP)
-	$(MAKE) -C $(TAO_ROOT) $(DSO_MAKE_FLAG) $(FIXUP)
+build: configure-stamp
+	$(MAKE) -j 3 -C $(TAO_ROOT) $(DSO_MAKE_FLAG) $(FIXUP)
 
-override_dh_auto_install-arch: manpages-stamp
-	$(MAKE) -C $(ACE_ROOT) install $(INSTALL_FLAGS) $(FIXUP)
+override_dh_auto_install:
+	dh_auto_install
 	$(MAKE) -C $(TAO_ROOT) install $(INSTALL_FLAGS) $(FIXUP)
-	mkdir -p $(DT)/usr/share/man/man1
-	cp $(ACE_ROOT)/apps/gperf/ace_gperf.1 $(DT)/usr/share/man/man1
+	echo create direc
+	mkdir -p -v $(DESTDIR)/usr/share/man/man1
+	echo created
+	cp -v $(ACE_ROOT)/apps/gperf/ace_gperf.1 $(DESTDIR)/usr/share/man/man1
+#	touch $(DT)/usr/share/man/man1
 #	Relocate .idl and .pidl files
 	cd $(DT) && for f in $$(find usr/include -name '*.idl' -o -name '*.pidl') ; do \
 	   g=$$(echo $${f%%include*}share/idl/$${f##*usr/include/}) ; \
@@ -77,45 +77,41 @@ override_dh_auto_install-arch: manpages-stamp
 	mv $(DT)/usr/bin/tao_idl $(DT)/usr/bin/tao_ifr $(DT)/usr/lib/ace/TAO
 	cp debian/tao_idl debian/tao_ifr $(DT)/usr/bin
 
-override_dh_auto_install-indep:
-
-override_dh_auto_clean-arch:
-	[ -f $(ACE_ROOT)/GNUmakefile ] && $(MAKE) -C $(ACE_ROOT) realclean $(DSO_MAKE_FLAG) $(FIXUP) || true
+clean:
 	[ -f $(TAO_ROOT)/GNUmakefile ] && $(MAKE) -C $(TAO_ROOT) realclean $(DSO_MAKE_FLAG) $(FIXUP) || true
 	find $(ACE_ROOT) -name 'GNUmakefile*' -o -name '.depend.*' | xargs -r rm
 	rm -f $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
 	rm -f $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features
 	rm -f $(ACE_ROOT)/ace/config.h $(ACE_ROOT)/ace/config-hurd.h
-	rm -f $(ACE_ROOT)/ACE-DPKG.mwc $(TAO_ROOT)/TAO-DPKG.mwc
 	rm -f debian/*.1 debian/mpc-ace.sgml
 	rm -f *-stamp
 # Remove stubs that get generated during TAO compilation but for some reason
 # are not removed on make realclean
 	rm -f `cat debian/TOREMOVE`
 
-override_dh_auto_clean-indep:
+clean-indep:
 	rm -Rf $(ACE_ROOT)/html/libace-doc $(ACE_ROOT)/html/libtao-doc $(ACE_ROOT)/html/libacexml-doc
 
-override_dh_compress:
+compress:
 	dh_compress -Xexamples
 
-# Add --list-missing to make sure we don't miss new binaries
-override_dh_install:
-	dh_install --list-missing
-
 # ACE+TAO has different changelogs. Use the right one in every package.
-override_dh_installchangelogs:
+installchangelogs:
 	dh_installchangelogs -pace-gperf -pgperf-ace apps/gperf/ChangeLog
 	dh_installchangelogs -pmpc-ace MPC/ChangeLog
 	dh_installchangelogs $(addprefix -p,$(ALL_TAO)) TAO/ChangeLog
 	dh_installchangelogs $(addprefix -p,$(ALL_ACEXML)) ACEXML/ChangeLog
 	dh_installchangelogs --remaining-packages ChangeLog
+# Add --list-missing to make sure we don't miss new binariesoverride_dh_install:        dh_install --list-missing
+
+# Add --list-missing to make sure we don't miss new binaries
+
+override_dh_install:
+	dh_install --list-missing
 
 override_dh_fixperms:
 ifneq (,$(filter libtao-doc, $(shell dh_listpackages)))
-	chmod -x debian/libtao-doc/usr/share/doc/libtao-doc/examples/RTCORBA/Activity/svc.conf.client
-	chmod -x debian/libtao-doc/usr/share/doc/libtao-doc/examples/RTCORBA/Activity/svc.conf.server
-	chmod -x debian/libtao-doc/usr/share/doc/libtao-doc/examples/Simulator/DOVEBrowser/make.bat
+#	chmod -x debian/libtao-doc/usr/share/doc/libtao-doc/examples/Simulator/DOVEBrowser/make.bat
 endif
 ifneq (,$(filter libace-doc libtao-doc, $(shell dh_listpackages)))
 	find debian -name '*.pl' | xargs -r sed -i -e '1i#!/usr/bin/perl'
diff --git a/ACE/debian/libace-6.1.6.install b/ACE/debian/libace-6.1.6.install
index d9afda38c12..36eddb1e23f 100644
--- a/ACE/debian/libace-6.1.6.install
+++ b/ACE/debian/libace-6.1.6.install
@@ -2,3 +2,4 @@ usr/lib/libACE-*.so
 usr/lib/libACE_ETCL-*.so
 usr/lib/libACE_Monitor_Control-*.so
 usr/lib/libACE_ETCL_Parser-*.so
+usr/lib/libACE_RLECompression-*.so
diff --git a/ACE/debian/libace-dev.install b/ACE/debian/libace-dev.install
index faf0c1c7cc1..c4fc532a9f5 100644
--- a/ACE/debian/libace-dev.install
+++ b/ACE/debian/libace-dev.install
@@ -13,6 +13,10 @@ usr/include/ace/os_include
 usr/lib/libACE.so
 usr/include/ace/ETCL/*.h
 usr/include/ace/ETCL/*.inl
+usr/include/ace/Compression/*.h
+usr/include/ace/Compression/*.inl
+usr/include/ace/Compression/rle/*.h
+usr/include/ace/Compression/rle/*.inl
 usr/include/ace/Monitor_Control/*.h
 usr/lib/libACE_ETCL_Parser.so
 usr/lib/libACE_Monitor_Control.so
diff --git a/ACE/debian/libtao-dev.install b/ACE/debian/libtao-dev.install
index 7b09d87f5cd..d2aa36d89fb 100644
--- a/ACE/debian/libtao-dev.install
+++ b/ACE/debian/libtao-dev.install
@@ -69,6 +69,7 @@ usr/include/tao/ZIOP
 usr/lib/libTAO_ZIOP.so
 usr/lib/libTAO_ZlibCompressor.so
 usr/lib/libTAO_Bzip2Compressor.so
+usr/lib/libTAO_RLECompressor.so
 usr/include/tao/ETCL
 usr/lib/libTAO_ETCL.so
 usr/include/tao/Monitor