[Pkg-ace-commits] [pkg-ace] r686 - in trunk/debian: . patches

[Thomas Girard]

Author: tgg
Date: 2010-05-16 08:06:32 +0000 (Sun, 16 May 2010)
New Revision: 686

Modified:
   trunk/debian/changelog
   trunk/debian/libace-5.7.7.install
   trunk/debian/libace-dev.install
   trunk/debian/patches/00list
   trunk/debian/rules
Log:
Cleanup stuff


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-05-15 18:43:21 UTC (rev 685)
+++ trunk/debian/changelog	2010-05-16 08:06:32 UTC (rev 686)
@@ -5,30 +5,30 @@
   * Remove dependencies on autotools; these are no longer needed now that we
     have agreed to move back to the traditional compilation method.
   * Add bzip2 and lzo ZIOP implementation.
+  * New patch: 20-versioned_libs.dpatch, to generate libraries with names
+    following libACE-5.7.7.so pattern instead of libACE.so.5.7.7.
+  * Rename binaries and packages to follow what is used in RPMs.
 
   [ Marek Brudka ]
-  * New upstream release
-  * Install fix related with MPC bug for *.ins files
-  * Reverted mpc-ace changes
-  * Dropped 25-remove-duplicate-file patch
-  * Added PerlACE to mpc-ace. Closes: #522557.
-  * Removed patches no longer needed because traditional method is used
-  * Created patch to reduce the size of doxygen doc. Closes: #562164.
+  * New upstream release:
+    o add libACE_gperf, libACE_ETCL and libACE_Monitor_Control to libace
+    o add headers and libraries for Monitor, ZIOP, ETCL to libtao package
+    o renamed gperf-ace to ace_gperf to follow the upstream convention
+    o renamed utilities (ns{add,del,list} to tao_ns{add,del,list}) in tao-utils
+      to follow the upstream changes
+  * Change compilation back to traditional ACE+TAO build method:
+    o adapt existing Debian build mechanism
+    o remove patches no longer needed because of this switch
+    o use MPC generated makefiles
+    o install build result using MPC/prj_install.pl and .ins files
+    o temporarily excluded logWalker from build
+  * New patch: 10-fix-prj-install to work-around a problem installing files
+  * Added PerlACE to mpc-ace. Closes: #522557
+  * Created patch to reduce the size of doxygen doc. Closes: #562164
   * Created patch to fix cross references in doxygen tags
-  * Created ace-netsvcs packages. Closes: #466137. Addresses: LP#185285.
-  * Change build method to MPC generated makefiles
-  * Changed installation method to MPC/prj_install.pl
-  * renamed gperf-ace to ace_gperf to follow the upstream convention
-  * included number of runtime and static libraries with headers
-    (Monitor, ZIOP, ETCL, Catior) to libtao-orbsvcs-* packages
-  * renamed utilities (ns{add,del,list} to tao_ns{add,del,list}) in tao-utils 
-    to follow the upstream changes
-  * removed permission fixes for example in debian/rules as there is nothing to
+  * Created ace-netsvcs packages. Closes: #466137. Addresses: LP#185285
+  * Removed permission fixes for example in debian/rules as there is nothing to
     fix
-  * added libACE_ETCL to libace (separate package?)
-  * added libACE_Monitor_Control to libace (separate package?)
-  * added libACE_gperf to libace
-  * temporarily excluded logWalker from build
 
   [ Pau Garcia i Quiles ]
   * New upstream release

Modified: trunk/debian/libace-5.7.7.install
===================================================================
--- trunk/debian/libace-5.7.7.install	2010-05-15 18:43:21 UTC (rev 685)
+++ trunk/debian/libace-5.7.7.install	2010-05-16 08:06:32 UTC (rev 686)
@@ -3,4 +3,3 @@
 usr/lib/libACE_Monitor_Control-*.so
 usr/lib/libACE_ETCL_Parser-*.so
 usr/lib/libACE_gperf_lib-*.so
-

Modified: trunk/debian/libace-dev.install
===================================================================
--- trunk/debian/libace-dev.install	2010-05-15 18:43:21 UTC (rev 685)
+++ trunk/debian/libace-dev.install	2010-05-16 08:06:32 UTC (rev 686)
@@ -15,4 +15,3 @@
 usr/lib/libACE_Monitor_Control.so
 usr/lib/libACE_ETCL.so
 usr/lib/libACE_gperf_lib.so
-usr/include/apps/gperf/src

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2010-05-15 18:43:21 UTC (rev 685)
+++ trunk/debian/patches/00list	2010-05-16 08:06:32 UTC (rev 686)
@@ -4,14 +4,14 @@
 14-fix-tcl-flags.dpatch
 15-fix-lzo-flags.dpatch
 16-rename-tao-programs.dpatch
-19-gcc43
+19-gcc43.dpatch
 20-versioned_libs.dpatch
-24-add-missing-headers
-34-bts386713
+24-add-missing-headers.dpatch
+34-bts386713.dpatch
 47-change-netsvcs.dpatch
 48-fix-doxygen-cross-links.dpatch
 49-reduce-doxygen-doc.dpatch
-50-prepatch-dummy-mark
-90-patch-mpc-basedir
-91-patch-dg-basedir
-92-default-ACE_ROOT
+50-prepatch-dummy-mark.dpatch
+90-patch-mpc-basedir.dpatch
+91-patch-dg-basedir.dpatch
+92-default-ACE_ROOT.dpatch

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2010-05-15 18:43:21 UTC (rev 685)
+++ trunk/debian/rules	2010-05-16 08:06:32 UTC (rev 686)
@@ -118,6 +118,8 @@
 	for p in ace apps ACEXML Kokyu; do \
 	  cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_ALL) $(CURDIR)/$(DT) $$p; \
 	done
+#	Remove gperf headers -- we don't need them
+	rm -Rf $(CURDIR)/$(DT)/usr/include/apps/gperf
 
 	cd $(ACE_ROOT)/protocols && ../MPC/prj_install.pl $(PRJ_INSTALL_ALL) $(CURDIR)/$(DT) ace