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

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-03-11 09:51:45 +0000 (Tue, 11 Mar 2008)
New Revision: 563

Added:
   trunk/debian/patches/07-autoconf-fix-gperf.dpatch
   trunk/debian/patches/09-autoconf-fix-no-base-include-headers.diff
Modified:
   trunk/debian/patches/00list
   trunk/debian/rules
Log:
fix autoconf errors


Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-03-11 07:52:48 UTC (rev 562)
+++ trunk/debian/patches/00list	2008-03-11 09:51:45 UTC (rev 563)
@@ -3,6 +3,7 @@
 02-qt4
 04-reduce-opt
 05-autoconf-fox
+07-autoconf-fix-gperf
 08-fix-perl-shebang
 15-fix-fltk-include
 34-bts386713

Added: trunk/debian/patches/07-autoconf-fix-gperf.dpatch
===================================================================
--- trunk/debian/patches/07-autoconf-fix-gperf.dpatch	                        (rev 0)
+++ trunk/debian/patches/07-autoconf-fix-gperf.dpatch	2008-03-11 09:51:45 UTC (rev 563)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07-autoconf-fix-gperf.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix an autotools error in GPERF handling.
+
+ at DPATCH@
+--- ACE_wrappers.orig/m4/ace.m4
++++ ACE_wrappers/m4/ace.m4
+@@ -535,7 +535,7 @@
+      AC_MSG_WARN([existing gperf may be overwritten during installation])
+     ],[])
+  fi
+- AM_CONDITIONAL([COMPILE_GPERF], [test X$ace_user_enable_gperf = Xyes])
++ AM_CONDITIONAL([BUILD_GPERF], [test X$ace_user_enable_gperf = Xyes])
+ 
+  ACE_ENABLE_QOS
+  ACE_ENABLE_SSL


Property changes on: trunk/debian/patches/07-autoconf-fix-gperf.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/debian/patches/09-autoconf-fix-no-base-include-headers.diff
===================================================================
--- trunk/debian/patches/09-autoconf-fix-no-base-include-headers.diff	                        (rev 0)
+++ trunk/debian/patches/09-autoconf-fix-no-base-include-headers.diff	2008-03-11 09:51:45 UTC (rev 563)
@@ -0,0 +1,19 @@
+--- ACE_wrappers.orig/ace/Makefile.am
++++ ACE_wrappers/ace/Makefile.am
+@@ -10,6 +10,7 @@
+ 
+ includedir = @includedir@/ace
+ pkgconfigdir = @libdir@/pkgconfig
++nobase_include_HEADERS =
+ 
+ ACE_BUILDDIR = $(top_builddir)
+ ACE_ROOT = $(top_srcdir)
+@@ -336,7 +337,7 @@
+ libACE_la_LDFLAGS = \
+  -release @ACE_VERSION_NAME@
+ 
+-nobase_include_HEADERS = \
++nobase_include_HEADERS += \
+   ACE.h \
+   ACE.inl \
+   ACE_export.h \

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-03-11 07:52:48 UTC (rev 562)
+++ trunk/debian/rules	2008-03-11 09:51:45 UTC (rev 563)
@@ -83,6 +83,7 @@
 	dpatch apply-until $(UNTIL)
 	cd $(ACE_ROOT) &&    bin/mwc.pl $(MWCFLAGS) ACE.mwc
 	cd $(TAO_ROOT) && ../bin/mwc.pl $(MWCFLAGS) TAO.mwc
+	patch -p0 < debian/patches/09-autoconf-fix-no-base-include-headers.diff
 	touch $@
 
 .PHONY: prepatch