[DebianGIS-dev] CVS Update: postgis/debian/patches patch.level upstream-1.1.0.diff

pabs-guest at haydn.debian.org pabs-guest at haydn.debian.org
Wed Mar 22 15:41:18 UTC 2006


  User: pabs-guest
  Date: 06/03/22 15:41:18

  Added:       debian/patches patch.level upstream-1.1.0.diff
  Log:
  Add Alex's postgis 1.1 packaging. TODO: patches for stuff outside debian/
  
  Revision  Changes    Path
  1.1                  postgis/debian/patches/patch.level
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/postgis/debian/patches/patch.level?annotate=1.1&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/postgis/debian/patches/patch.level?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot=
  
  -----------------------------------
  
  Index: patch.level
  ===================================================================
  4
  
  
  
  1.1                  postgis/debian/patches/upstream-1.1.0.diff
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/postgis/debian/patches/upstream-1.1.0.diff?annotate=1.1&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/postgis/debian/patches/upstream-1.1.0.diff?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot=
  
  -----------------------------------
  
  Index: upstream-1.1.0.diff
  ===================================================================
  diff -Nar -U 4 -x debian /tmp/postgis_9853/postgis-1.1.0.orig/configure /tmp/postgis_9853/postgis-1.1.0.orig.debian/configure
  --- /tmp/postgis_9853/postgis-1.1.0.orig/configure	2005-12-21 22:25:14.000000000 +0000
  +++ /tmp/postgis_9853/postgis-1.1.0.orig.debian/configure	2006-01-04 13:29:24.000000000 +0000
  @@ -1,343 +1,56 @@
   #! /bin/sh
  +
   # Guess values for system-dependent variables and create Makefiles.
  -# Generated by GNU Autoconf 2.59.
  +# Generated automatically using autoconf version 2.13 
  +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
   #
  -# Copyright (C) 2003 Free Software Foundation, Inc.
   # This configure script is free software; the Free Software Foundation
   # gives unlimited permission to copy, distribute and modify it.
  -## --------------------- ##
  -## M4sh Initialization.  ##
  -## --------------------- ##
  -
  -# Be Bourne compatible
  -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
  -  emulate sh
  -  NULLCMD=:
  -  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
  -  # is contrary to our usage.  Disable this feature.
  -  alias -g '${1+"$@"}'='"$@"'
  -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
  -  set -o posix
  -fi
  -DUALCASE=1; export DUALCASE # for MKS sh
  -
  -# Support unset when possible.
  -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
  -  as_unset=unset
  -else
  -  as_unset=false
  -fi
  -
  -
  -# Work around bugs in pre-3.0 UWIN ksh.
  -$as_unset ENV MAIL MAILPATH
  -PS1='$ '
  -PS2='> '
  -PS4='+ '
  -
  -# NLS nuisances.
  -for as_var in \
  -  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
  -  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
  -  LC_TELEPHONE LC_TIME
  -do
  -  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
  -    eval $as_var=C; export $as_var
  -  else
  -    $as_unset $as_var
  -  fi
  -done
  -
  -# Required to use basename.
  -if expr a : '\(a\)' >/dev/null 2>&1; then
  -  as_expr=expr
  -else
  -  as_expr=false
  -fi
  -
  -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
  -  as_basename=basename
  -else
  -  as_basename=false
  -fi
  -
  -
  -# Name of the executable.
  -as_me=`$as_basename "$0" ||
  -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  -	 X"$0" : 'X\(//\)$' \| \
  -	 X"$0" : 'X\(/\)$' \| \
  -	 .     : '\(.\)' 2>/dev/null ||
  -echo X/"$0" |
  -    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
  -  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
  -  	  /^X\/\(\/\).*/{ s//\1/; q; }
  -  	  s/.*/./; q'`
  -
  -
  -# PATH needs CR, and LINENO needs CR and PATH.
  -# Avoid depending upon Character Ranges.
  -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
  -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
  -as_cr_digits='0123456789'
  -as_cr_alnum=$as_cr_Letters$as_cr_digits
  -
  -# The user is always right.
  -if test "${PATH_SEPARATOR+set}" != set; then
  -  echo "#! /bin/sh" >conf$$.sh
  -  echo  "exit 0"   >>conf$$.sh
  -  chmod +x conf$$.sh
  -  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
  -    PATH_SEPARATOR=';'
  -  else
  -    PATH_SEPARATOR=:
  -  fi
  -  rm -f conf$$.sh
  -fi
  -
  -
  -  as_lineno_1=$LINENO
  -  as_lineno_2=$LINENO
  -  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
  -  test "x$as_lineno_1" != "x$as_lineno_2" &&
  -  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
  -  # Find who we are.  Look in the path if we contain no path at all
  -  # relative or not.
  -  case $0 in
  -    *[\\/]* ) as_myself=$0 ;;
  -    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
  -done
  -
  -       ;;
  -  esac
  -  # We did not find ourselves, most probably we were run as `sh COMMAND'
  -  # in which case we are not to be found in the path.
  -  if test "x$as_myself" = x; then
  -    as_myself=$0
  -  fi
  -  if test ! -f "$as_myself"; then
  -    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
  -   { (exit 1); exit 1; }; }
  -  fi
  -  case $CONFIG_SHELL in
  -  '')
  -    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for as_base in sh bash ksh sh5; do
  -	 case $as_dir in
  -	 /*)
  -	   if ("$as_dir/$as_base" -c '
  -  as_lineno_1=$LINENO
  -  as_lineno_2=$LINENO
  -  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
  -  test "x$as_lineno_1" != "x$as_lineno_2" &&
  -  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
  -	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
  -	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
  -	     CONFIG_SHELL=$as_dir/$as_base
  -	     export CONFIG_SHELL
  -	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
  -	   fi;;
  -	 esac
  -       done
  -done
  -;;
  -  esac
  -
  -  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
  -  # uniformly replaced by the line number.  The first 'sed' inserts a
  -  # line-number line before each line; the second 'sed' does the real
  -  # work.  The second script uses 'N' to pair each line-number line
  -  # with the numbered line, and appends trailing '-' during
  -  # substitution so that $LINENO is not a special case at line end.
  -  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
  -  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
  -  sed '=' <$as_myself |
  -    sed '
  -      N
  -      s,$,-,
  -      : loop
  -      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
  -      t loop
  -      s,-$,,
  -      s,^['$as_cr_digits']*\n,,
  -    ' >$as_me.lineno &&
  -  chmod +x $as_me.lineno ||
  -    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
  -   { (exit 1); exit 1; }; }
  -
  -  # Don't try to exec as it changes $[0], causing all sort of problems
  -  # (the dirname of $[0] is not the place where we might find the
  -  # original and so on.  Autoconf is especially sensible to this).
  -  . ./$as_me.lineno
  -  # Exit status is that of the last command.
  -  exit
  -}
  -
  -
  -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
  -  *c*,-n*) ECHO_N= ECHO_C='
  -' ECHO_T='	' ;;
  -  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
  -  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
  -esac
  -
  -if expr a : '\(a\)' >/dev/null 2>&1; then
  -  as_expr=expr
  -else
  -  as_expr=false
  -fi
  -
  -rm -f conf$$ conf$$.exe conf$$.file
  -echo >conf$$.file
  -if ln -s conf$$.file conf$$ 2>/dev/null; then
  -  # We could just check for DJGPP; but this test a) works b) is more generic
  -  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
  -  if test -f conf$$.exe; then
  -    # Don't use ln at all; we don't have any links
  -    as_ln_s='cp -p'
  -  else
  -    as_ln_s='ln -s'
  -  fi
  -elif ln conf$$.file conf$$ 2>/dev/null; then
  -  as_ln_s=ln
  -else
  -  as_ln_s='cp -p'
  -fi
  -rm -f conf$$ conf$$.exe conf$$.file
  -
  -if mkdir -p . 2>/dev/null; then
  -  as_mkdir_p=:
  -else
  -  test -d ./-p && rmdir ./-p
  -  as_mkdir_p=false
  -fi
  -
  -as_executable_p="test -f"
  -
  -# Sed expression to map a string onto a valid CPP name.
  -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
  -
  -# Sed expression to map a string onto a valid variable name.
  -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  -
  -
  -# IFS
  -# We need space, tab and new line, in precisely that order.
  -as_nl='
  -'
  -IFS=" 	$as_nl"
  -
  -# CDPATH.
  -$as_unset CDPATH
  -
   
  -# Name of the host.
  -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
  -# so uname gets run too.
  -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
  -
  -exec 6>&1
  -
  -#
  -# Initializations.
  -#
  +# Defaults:
  +ac_help=
   ac_default_prefix=/usr/local
  -ac_config_libobj_dir=.
  -cross_compiling=no
  -subdirs=
  -MFLAGS=
  -MAKEFLAGS=
  -SHELL=${CONFIG_SHELL-/bin/sh}
  -
  -# Maximum number of lines to put in a shell here document.
  -# This variable seems obsolete.  It should probably be removed, and
  -# only ac_max_sed_lines should be used.
  -: ${ac_max_here_lines=38}
  -
  -# Identity of this package.
  -PACKAGE_NAME=
  -PACKAGE_TARNAME=
  -PACKAGE_VERSION=
  -PACKAGE_STRING=
  -PACKAGE_BUGREPORT=
  -
  -ac_unique_file="README.postgis"
  -# Factoring default headers for most tests.
  -ac_includes_default="\
  -#include <stdio.h>
  -#if HAVE_SYS_TYPES_H
  -# include <sys/types.h>
  -#endif
  -#if HAVE_SYS_STAT_H
  -# include <sys/stat.h>
  -#endif
  -#if STDC_HEADERS
  -# include <stdlib.h>
  -# include <stddef.h>
  -#else
  -# if HAVE_STDLIB_H
  -#  include <stdlib.h>
  -# endif
  -#endif
  -#if HAVE_STRING_H
  -# if !STDC_HEADERS && HAVE_MEMORY_H
  -#  include <memory.h>
  -# endif
  -# include <string.h>
  -#endif
  -#if HAVE_STRINGS_H
  -# include <strings.h>
  -#endif
  -#if HAVE_INTTYPES_H
  -# include <inttypes.h>
  -#else
  -# if HAVE_STDINT_H
  -#  include <stdint.h>
  -# endif
  -#endif
  -#if HAVE_UNISTD_H
  -# include <unistd.h>
  -#endif"
  -
  -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX LN_S USE_ICONV ICONV_LDFLAGS CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os PGCONFIG PGFEINCLUDES PGBEINCLUDES PGFELIBS PGBELIBS PGBIN PGTEMPLATE LPATH USE_GEOS GEOS_DIR USE_GEOS_CAPI GEOSCONFIG USE_PROJ PROJ_DIR PROJ USE_JTS JTS_INCLUDES JTS_LIBDIR JTSCONFIG FLEX DLLWRAP DLLTOOL YACC INSTALL PERL docdir XSLBASE XSLTPROC PDFXMLTEX JW DOC_RULE PORTNAME DLSUFFIX DLFLAGS EXE HOST_OS ELF_SYS LIBOBJS LTLIBOBJS'
  -ac_subst_files=''
  +# Any additions from configure.in:
  +ac_help="$ac_help
  +  --without-iconv         disable unicode support"
  +ac_help="$ac_help
  +  --with-pgsql[[=ARG]]      build for a specific pgsql version
  +                          [[ARG=path to pg_config]]"
  +ac_help="$ac_help
  +  --with-geos[[=ARG]]       enable spatial predicates and operators using GEOS
  +                          [[ARG=path to geos-config]]"
  +ac_help="$ac_help
  +  --with-proj[[=DIR]]       enable reprojection support"
  +ac_help="$ac_help
  +  --with-jts[[=ARG]]        use JTS for spatial predicates and operators
  +                          [[ARG=path to jts-config]]"
  +ac_help="$ac_help
  +  --with-docdir=DIR       install the documentation in DIR [[PREFIX/share/doc]]"
  +ac_help="$ac_help
  +  --with-datadir=DIR       install the scripts in DIR/contrib [[PREFIX/share/postgresql]]"
   
   # Initialize some variables set by options.
  -ac_init_help=
  -ac_init_version=false
   # The variables have the same names as the options, with
   # dashes changed to underlines.
  -cache_file=/dev/null
  +build=NONE
  +cache_file=./config.cache
   exec_prefix=NONE
  +host=NONE
   no_create=
  +nonopt=NONE
   no_recursion=
   prefix=NONE
   program_prefix=NONE
   program_suffix=NONE
   program_transform_name=s,x,x,
   silent=
   site=
   srcdir=
  +target=NONE
   verbose=
   x_includes=NONE
   x_libraries=NONE
  -
  -# Installation directory options.
  -# These are left unexpanded so users can "make install exec_prefix=/foo"
  -# and all the variables that are supposed to be based on exec_prefix
  -# by default will actually change.
  -# Use braces instead of parens because sh, perl, etc. also accept them.
   bindir='${exec_prefix}/bin'
   sbindir='${exec_prefix}/sbin'
   libexecdir='${exec_prefix}/libexec'
   datadir='${prefix}/share'
  @@ -349,141 +62,197 @@
   oldincludedir='/usr/include'
   infodir='${prefix}/info'
   mandir='${prefix}/man'
   
  +# Initialize some other variables.
  +subdirs=
  +MFLAGS= MAKEFLAGS=
  +SHELL=${CONFIG_SHELL-/bin/sh}
  +# Maximum number of lines to put in a shell here document.
  +ac_max_here_lines=12
  +
   ac_prev=
   for ac_option
   do
  +
     # If the previous option needs an argument, assign it.
     if test -n "$ac_prev"; then
       eval "$ac_prev=\$ac_option"
       ac_prev=
       continue
     fi
   
  -  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
  +  case "$ac_option" in
  +  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
  +  *) ac_optarg= ;;
  +  esac
   
     # Accept the important Cygnus configure options, so we can diagnose typos.
   
  -  case $ac_option in
  +  case "$ac_option" in
   
     -bindir | --bindir | --bindi | --bind | --bin | --bi)
       ac_prev=bindir ;;
     -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
  -    bindir=$ac_optarg ;;
  +    bindir="$ac_optarg" ;;
   
     -build | --build | --buil | --bui | --bu)
  -    ac_prev=build_alias ;;
  +    ac_prev=build ;;
     -build=* | --build=* | --buil=* | --bui=* | --bu=*)
  -    build_alias=$ac_optarg ;;
  +    build="$ac_optarg" ;;
   
     -cache-file | --cache-file | --cache-fil | --cache-fi \
     | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
       ac_prev=cache_file ;;
     -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
     | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
  -    cache_file=$ac_optarg ;;
  -
  -  --config-cache | -C)
  -    cache_file=config.cache ;;
  +    cache_file="$ac_optarg" ;;
   
     -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
       ac_prev=datadir ;;
     -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
     | --da=*)
  -    datadir=$ac_optarg ;;
  +    datadir="$ac_optarg" ;;
   
     -disable-* | --disable-*)
  -    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
  +    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
       # Reject names that are not valid shell variable names.
  -    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
  -      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
  -   { (exit 1); exit 1; }; }
  -    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
  -    eval "enable_$ac_feature=no" ;;
  +    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
  +      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
  +    fi
  +    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
  +    eval "enable_${ac_feature}=no" ;;
   
     -enable-* | --enable-*)
  -    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
  +    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
       # Reject names that are not valid shell variable names.
  -    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
  -      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
  -   { (exit 1); exit 1; }; }
  -    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
  -    case $ac_option in
  -      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
  +    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
  +      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
  +    fi
  +    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
  +    case "$ac_option" in
  +      *=*) ;;
         *) ac_optarg=yes ;;
       esac
  -    eval "enable_$ac_feature='$ac_optarg'" ;;
  +    eval "enable_${ac_feature}='$ac_optarg'" ;;
   
     -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
     | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
     | --exec | --exe | --ex)
       ac_prev=exec_prefix ;;
     -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
     | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
     | --exec=* | --exe=* | --ex=*)
  -    exec_prefix=$ac_optarg ;;
  +    exec_prefix="$ac_optarg" ;;
   
     -gas | --gas | --ga | --g)
       # Obsolete; use --with-gas.
       with_gas=yes ;;
   
  -  -help | --help | --hel | --he | -h)
  -    ac_init_help=long ;;
  -  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
  -    ac_init_help=recursive ;;
  -  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
  -    ac_init_help=short ;;
  +  -help | --help | --hel | --he)
  +    # Omit some internal or obsolete options to make the list less imposing.
  +    # This message is too long to be a string in the A/UX 3.1 sh.
  +    cat << EOF
  +Usage: configure [options] [host]
  
  Reached max line limit 500!
  
  



More information about the Pkg-grass-devel mailing list