tags 396417 + patch
thanks
Hi,
The following is the diff for my camas 1.2.21-2.2 NMU.
diff -Nru /tmp/Z4jTBCLLnL/camas-1.2.21/configure.ac
/tmp/x62d0OzsLZ/camas-1.2.21/configure.ac
--- /tmp/Z4jTBCLLnL/camas-1.2.21/configure.ac 2003-11-24 22:43:37.000000000
+0100
+++ /tmp/x62d0OzsLZ/camas-1.2.21/configure.ac 2006-11-10 13:19:40.000000000
+0100
@@ -250,6 +250,12 @@
## Caudium Detection
#######################
+AC_ARG_WITH(forced-caudium,
+AC_HELP_STRING([--with-forced-caudium=[DIR]],[Where Caudium web server is
installed (skip sanity checks).]),
+[
+ CAUDIUMDIR="$withval"
+])
+
AC_ARG_WITH(caudium,
AC_HELP_STRING([--with-caudium=[DIR]],[Where Caudium web server is
installed.]),
[
@@ -261,47 +267,49 @@
fi
])
-RESULT=no
-AC_MSG_CHECKING(for Caudium support)
-AC_MSG_RESULT( )
-if test "$prefix" != "NONE"; then
- PREFIXCAUDIUM="$prefix"
-fi
-for a in $DEFCAUDIUM $PREFIXCAUDIUM /usr/local /usr/local/caudium /opt \
- /opt/caudium /sw/caudium /sw/local /sw/local/caudium /opt/local
/opt/local/caudium \
- /usr/gnu /usr/gnu/caudium /usr/pkg /usr/pkg/caudium /usr /usr/caudium \
- /usr/local/caudium/caudium /usr/lib /usr/lib/caudium /usr/lib/caudium-1.1; do
-
- test "$RESULT" != "no" && break;
-
- AC_MSG_CHECKING(in ${a})
- if test -d ${a}; then
- AC_MSG_RESULT( )
- for b in ${a}/caudium/server ${a}/server ${a}; do
- AC_MSG_CHECKING(${b})
- if test -f ${b}/base_server/caudiumlib.pike; then
- RESULT=found
- AC_MSG_RESULT(found)
- CAUDIUMDIR="${b}"
- break;
- else
- AC_MSG_RESULT(no)
- fi
- done
- else
- AC_MSG_RESULT(don't exist)
+if test "$CAUDIUMDIR" = ""; then
+ RESULT=no
+ AC_MSG_CHECKING(for Caudium support)
+ AC_MSG_RESULT( )
+ if test "$prefix" != "NONE"; then
+ PREFIXCAUDIUM="$prefix"
fi
-done
-
-if test "$RESULT" = "no"; then
- cat << EOF
-*****
-***** Cannot find Caudium webserver, please make sure you have
-***** correct installed it.
-***** Please provide --with-caudium=/the/path/where/is/caudium
-*****
+ for a in $DEFCAUDIUM $PREFIXCAUDIUM /usr/local /usr/local/caudium /opt \
+ /opt/caudium /sw/caudium /sw/local /sw/local/caudium /opt/local
/opt/local/caudium \
+ /usr/gnu /usr/gnu/caudium /usr/pkg /usr/pkg/caudium /usr /usr/caudium \
+ /usr/local/caudium/caudium /usr/lib /usr/lib/caudium /usr/lib/caudium-1.1;
do
+
+ test "$RESULT" != "no" && break;
+
+ AC_MSG_CHECKING(in ${a})
+ if test -d ${a}; then
+ AC_MSG_RESULT( )
+ for b in ${a}/caudium/server ${a}/server ${a}; do
+ AC_MSG_CHECKING(${b})
+ if test -f ${b}/base_server/caudiumlib.pike; then
+ RESULT=found
+ AC_MSG_RESULT(found)
+ CAUDIUMDIR="${b}"
+ break;
+ else
+ AC_MSG_RESULT(no)
+ fi
+ done
+ else
+ AC_MSG_RESULT(don't exist)
+ fi
+ done
+
+ if test "$RESULT" = "no"; then
+ cat << EOF
+ *****
+ ***** Cannot find Caudium webserver, please make sure you have
+ ***** correct installed it.
+ ***** Please provide --with-caudium=/the/path/where/is/caudium
+ *****
EOF
- exit 1;
+ exit 1;
+ fi
fi
AC_SUBST(CAUDIUMDIR)
diff -Nru /tmp/Z4jTBCLLnL/camas-1.2.21/debian/changelog
/tmp/x62d0OzsLZ/camas-1.2.21/debian/changelog
--- /tmp/Z4jTBCLLnL/camas-1.2.21/debian/changelog 2006-11-10
13:19:40.000000000 +0100
+++ /tmp/x62d0OzsLZ/camas-1.2.21/debian/changelog 2006-11-10
13:19:40.000000000 +0100
@@ -1,3 +1,16 @@
+camas (1.2.21-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build-depending on a daemon like caudium is bad; we do not normally want
+ servers running on buildds. Thus, don't build-depend on caudium anymore;
+ all it's used for during build is sanity checking for the Caudium path in
+ the configure script. Instead, make a new configure parameter
+ --with-forced-caudium= that skips all the sanity checks and just accepts
+ the path. Fixes FTBFS in the cases where caudium would have problems
+ starting up on the buildd. (Closes: #396417)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Fri, 10 Nov 2006 12:55:03 +0100
+
camas (1.2.21-2.1) unstable; urgency=high
* Non-maintainer upload.
diff -Nru /tmp/Z4jTBCLLnL/camas-1.2.21/debian/rules
/tmp/x62d0OzsLZ/camas-1.2.21/debian/rules
--- /tmp/Z4jTBCLLnL/camas-1.2.21/debian/rules 2006-11-10 13:19:40.000000000
+0100
+++ /tmp/x62d0OzsLZ/camas-1.2.21/debian/rules 2006-11-10 13:19:40.000000000
+0100
@@ -33,7 +33,7 @@
./autogen.sh; \
fi
# Add here commands to configure the package.
- ./configure --prefix=/usr --with-caudium=/usr/lib/$(CAUDIUM)
--with-pike=/usr/bin/$(PIKEBIN)
+ ./configure --prefix=/usr --with-forced-caudium=/usr/lib/$(CAUDIUM)
--with-pike=/usr/bin/$(PIKEBIN)
touch configure-stamp
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
