The following commit has been merged in the master branch:
commit 3fe3b239e0a700e0d2ccfe359dad280e8484d986
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sat Jul 20 13:19:50 2013 +0200
Update libmapserver Multi-Arch path. Use dh_autoreconf for retooling.
diff --git a/debian/control b/debian/control
index 8b5f0ad..1f81fb1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1),
autotools-dev,
apache2-prefork-dev, libfcgi-dev,
libpcre3-dev, libpixman-1-dev,
libsqlite3-dev, libtiff4-dev,
- libmapserver-6.2.1, libmapserver-6.2.1-dev,
+ libmapserver-6.2.1, libmapserver-6.2.1-dev, dh-autoreconf,
autoconf, chrpath,
docbook2x, docbook-xsl, docbook-xml, xsltproc
Standards-Version: 3.9.4
diff --git a/debian/patches/fixwithmapserv.patch
b/debian/patches/fixwithmapserv.patch
index 980f57e..f26d707 100644
--- a/debian/patches/fixwithmapserv.patch
+++ b/debian/patches/fixwithmapserv.patch
@@ -3,834 +3,12 @@ Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Last-Update: 2013-06-12
--- a/configure.in
+++ b/configure.in
-@@ -484,7 +484,7 @@
+@@ -484,7 +484,7 @@ AC_DEFUN([MAPSERVER_CHECK],[
AC_SUBST(MAPSERVER_ENABLED,-DUSE_MAPSERVER)
AC_SUBST(MAPSERVER_DEFS,$MSDEFS)
AC_SUBST(MAPSERVER_INC,-I $MAPSERVER_DIR
`$MAPSERVER_DIR/mapserver-config --includes`)
- AC_SUBST(MAPSERVER_LIB,$MAPSERVER_DIR/libmapserver.la)
-+ AC_SUBST(MAPSERVER_LIB,/usr/lib/libmapserver.la)
++ AC_SUBST(MAPSERVER_LIB,/usr/lib/`dpkg-architecture
-qDEB_HOST_MULTIARCH`/libmapserver.la)
fi
])
a/configure
-+++ b/configure
-@@ -1,9 +1,11 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.69.
-+# Generated by GNU Autoconf 2.68.
- #
- #
--# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-+# Foundation, Inc.
- #
- #
- # This configure script is free software; the Free Software Foundation
-@@ -132,31 +134,6 @@
- # CDPATH.
- (unset CDPATH) /dev/null 21 unset CDPATH
-
--# Use a proper internal environment variable to ensure we don't fall
-- # into an infinite loop, continuously re-executing ourselves.
-- if test x${_as_can_reexec} != xno test x$CONFIG_SHELL != x; then
--_as_can_reexec=no; export _as_can_reexec;
--# We cannot yet assume a decent shell, so we have to provide a
--# neutralization value for shells without unset; and this also
--# works around shells that cannot unset nonexistent variables.
--# Preserve -v and -x to the replacement shell.
--BASH_ENV=/dev/null
--ENV=/dev/null
--(unset BASH_ENV) /dev/null 21 unset BASH_ENV ENV
--case $- in #
-- *v*x* | *x*v* ) as_opts=-vx ;;
-- *v* ) as_opts=-v ;;
-- *x* ) as_opts=-x ;;
-- * ) as_opts= ;;
--esac
--exec $CONFIG_SHELL $as_opts $as_myself ${1+$@}
--# Admittedly, this is quite paranoid, since all the known shells bail
--# out after a failed `exec'.
--$as_echo $0: could not re-execute with $CONFIG_SHELL 2
--as_fn_exit 255
-- fi
-- # We don't want this to propagate to other subprocesses.
-- { _as_can_reexec=; unset _as_can_reexec;}
- if test x$CONFIG_SHELL = x; then
- as_bourne_compatible=if test -n \\${ZSH_VERSION+set}\ (emulate sh)
/dev/null 21; then :
- emulate sh
-@@ -190,8 +167,7 @@
- else
- exitcode=1; echo positional parameters were not saved.
- fi
--test x\$exitcode = x0 || exit 1
--test -x / || exit 1
-+test x\$exitcode = x0 || exit 1
- as_suggested=
as_lineno_1=;as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested
as_lineno_1a=\$LINENO
- as_lineno_2=;as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested
as_lineno_2a=\$LINENO
- eval 'test \x\$as_lineno_1'\$as_run'\ != \x\$as_lineno_2'\$as_run'\
-@@ -244,25 +220,21 @@
-
-
- if test x$CONFIG_SHELL != x; then :
-- export CONFIG_SHELL
-- # We cannot yet assume a decent shell, so we have to provide a
--# neutralization value for shells without unset; and this also
--# works around shells that cannot unset nonexistent variables.
--# Preserve -v and -x to the replacement shell.
--BASH_ENV=/dev/null
--ENV=/dev/null
--(unset BASH_ENV) /dev/null 21 unset BASH_ENV ENV
--case $- in #
-- *v*x* | *x*v* ) as_opts=-vx ;;
-- *v* ) as_opts=-v ;;
-- *x* ) as_opts=-x ;;
-- * ) as_opts= ;;
--esac
--exec $CONFIG_SHELL $as_opts $as_myself ${1+$@}
--# Admittedly, this is quite paranoid, since all the known shells bail
--# out after a failed `exec'.
--$as_echo $0: could not re-execute with $CONFIG_SHELL 2
--exit 255
-+ # We cannot yet assume a decent shell, so we have to provide a
-+ # neutralization value for shells without unset; and this also
-+ # works around shells that cannot unset nonexistent variables.
-+ # Preserve -v and -x to the replacement shell.
-+
