--- qgis-0.8.0.orig/config.sub +++ qgis-0.8.0/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-07-08' +timestamp='2007-01-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -119,8 +120,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -171,6 +173,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -187,6 +193,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -231,15 +241,16 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -257,28 +268,27 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | ms1 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -286,6 +296,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -305,18 +318,18 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -336,31 +349,30 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | ms1-* \ + | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -696,6 +708,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -803,6 +818,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -859,6 +880,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -885,6 +910,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -896,6 +925,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1101,7 +1133,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1174,21 +1206,23 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1340,6 +1374,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1349,9 +1389,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1377,6 +1417,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; --- qgis-0.8.0.orig/config.guess +++ qgis-0.8.0/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-08-03' +timestamp='2007-03-06' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -160,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -206,8 +208,11 @@ *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -764,12 +769,19 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -779,9 +791,15 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -817,6 +835,9 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -851,7 +872,11 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -870,7 +895,11 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) @@ -919,9 +948,15 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -964,7 +999,7 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -974,7 +1009,11 @@ LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1176,6 +1215,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1185,7 +1233,6 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1264,6 +1311,9 @@ i*86:skyos:*:*) echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 --- qgis-0.8.0.orig/tools/qgis.m4 +++ qgis-0.8.0/tools/qgis.m4 @@ -0,0 +1,674 @@ +dnl ------------------------------------------------------------------------ +dnl Detect if this is a 64bit environment +dnl +dnl it sets: +dnl _lib +dnl ------------------------------------------------------------------------ +AC_DEFUN([AQ_CHECK_LIB64], +[ +if test `echo ${libdir} | sed -e 's#.*lib64.*#64#'` = "64"; then + _lib="lib64" +else + _lib="lib" +fi +]) + +dnl ------------------------------------------------------------------------ +dnl Detect GDAL/OGR +dnl +dnl use AQ_CHECK_GDAL to detect GDAL and OGR +dnl it sets: +dnl GDAL_CFLAGS +dnl GDAL_LDADD +dnl ------------------------------------------------------------------------ + +# Check for GDAL and OGR compiler and linker flags + +AC_DEFUN([AQ_CHECK_GDAL], +[ +AC_ARG_WITH([gdal], + AC_HELP_STRING([--with-gdal=path], + [Full path to 'gdal-config' script, e.g. '--with-gdal=/usr/local/bin/gdal-config']), + [ac_gdal_config_path=$withval]) + +if test x"$ac_gdal_config_path" = x ; then + ac_gdal_config_path=`which gdal-config` +fi + +ac_gdal_config_path=`dirname $ac_gdal_config_path 2> /dev/null` +AC_PATH_PROG(GDAL_CONFIG, gdal-config, no, $ac_gdal_config_path) + +if test x${GDAL_CONFIG} = xno ; then + AC_MSG_ERROR([gdal-config not found! Supply it with --with-gdal=PATH]) +else + AC_MSG_CHECKING([for OGR in GDAL]) + if test x`$GDAL_CONFIG --ogr-enabled` = "xno" ; then + AC_MSG_ERROR([GDAL must be compiled with OGR support and currently is not.]) + fi + AC_MSG_RESULT(yes) + AC_MSG_CHECKING([GDAL_CFLAGS]) + GDAL_CFLAGS=`$GDAL_CONFIG --cflags` + AC_MSG_RESULT($GDAL_CFLAGS) + + AC_MSG_CHECKING([GDAL_LDADD]) + GDAL_LDADD=`$GDAL_CONFIG --libs` + AC_MSG_RESULT($GDAL_LDADD) + + ac_gdalogr_version=`$GDAL_CONFIG --version` + ac_gdalogr="yes" +fi + +AC_SUBST(GDAL_CFLAGS) +AC_SUBST(GDAL_LDADD) +]) + +dnl ------------------------------------------------------------------------ +dnl Detect GEOS +dnl +dnl use AQ_CHECK_GEOS to detect GEOS +dnl it sets: +dnl GEOS_CFLAGS +dnl GEOS_LDADD +dnl ------------------------------------------------------------------------ + +# Check for GEOS + +AC_DEFUN([AQ_CHECK_GEOS], +[ +AC_ARG_WITH([geos], + AC_HELP_STRING([--with-geos=path], + [Full path to 'geos-config' script, e.g. '--with-geos=/usr/local/bin/geos-config']), + [ac_geos_config_path=$withval]) + +if test x"$ac_geos_config_path" = x ; then + ac_geos_config_path=`which geos-config` +fi + +ac_geos_config_path=`dirname $ac_geos_config_path 2> /dev/null` +AC_PATH_PROG(GEOS_CONFIG, geos-config, no, $ac_geos_config_path) + +if test x${GEOS_CONFIG} = xno ; then + AC_MSG_ERROR([geos-config not found! Supply it with --with-geos=PATH]) +else + ac_geos_version=`${GEOS_CONFIG} --version` + if test `echo ${ac_geos_version} | sed -e 's#2\.[0-9].*#OK#'` != OK ; then + AC_MSG_ERROR([Geos Version 2.x.x is needed, but you have $ac_geos_version!]) + else + AC_MSG_CHECKING([GEOS_CFLAGS]) + GEOS_CFLAGS=`$GEOS_CONFIG --cflags` + AC_MSG_RESULT($GEOS_CFLAGS) + + AC_MSG_CHECKING([GEOS_LDADD]) + GEOS_LDADD=`$GEOS_CONFIG --libs` + AC_MSG_RESULT($GEOS_LDADD) + + ac_geos="yes" + fi +fi + +AC_SUBST(GEOS_CFLAGS) +AC_SUBST(GEOS_LDADD) +]) + +dnl ------------------------------------------------------------------------ +dnl Detect QT3 +dnl +dnl use AQ_CHECK_QT to detect QT3 +dnl it sets: +dnl QT_CXXFLAGS +dnl QT_LDADD +dnl QT_GUILINK +dnl QASSISTANTCLIENT_LDADD +dnl ------------------------------------------------------------------------ + +# Check for Qt compiler flags, linker flags, and binary packages + +AC_DEFUN([AQ_CHECK_QT], +[ +AC_REQUIRE([AC_PROG_CXX]) +AC_REQUIRE([AC_PATH_X]) + +AC_MSG_CHECKING([QTDIR]) +AC_ARG_WITH([qtdir], [ --with-qtdir=DIR Qt installation directory [default=/usr/local]], QTDIR=$withval) +# Check that QTDIR is defined or that --with-qtdir given +if test x$QTDIR = x ; then + QT_SEARCH=" /usr/lib/qt31 /usr/lib64/qt31 /usr/local/qt31 /usr/lib/qt3 /usr/lib64/qt3 /usr/local/qt3 /usr/lib/qt2 /usr/lib64/qt2 /usr/local/qt2 /usr/lib/qt /usr/lib64/qt /usr/local/qt /usr /usr/local" + for i in $QT_SEARCH; do + if test x$QTDIR = x; then + if test -f $i/include/qt/qglobal.h -o -f $i/include/qglobal.h -o -f $i/include/qt3/qglobal.h; then + QTDIR=$i + fi + fi + done +fi +if test x$QTDIR = x ; then + AC_MSG_ERROR([*** QTDIR must be defined, or --with-qtdir option given]) +fi +AC_MSG_RESULT([$QTDIR]) + +# Change backslashes in QTDIR to forward slashes to prevent escaping +# problems later on in the build process, mainly for Cygwin build +# environment using MSVC as the compiler +# TODO: Use sed instead of perl +QTDIR=`echo $QTDIR | perl -p -e 's/\\\\/\\//g'` + +# Check for QT includedir +if test -f $QTDIR/include/qt/qglobal.h; then + QTINC=$QTDIR/include/qt +elif test -f $QTDIR/include/qt3/qglobal.h; then + QTINC=$QTDIR/include/qt3 +else + QTINC=$QTDIR/include +fi + +# Figure out which version of Qt we are using +AC_MSG_CHECKING([Qt version]) +QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTINC/qglobal.h | perl -p -e 's/\D//g'` +case "${QT_VER}" in + 33*) + QT_MAJOR="3" + ;; + 32*) + QT_MAJOR="3" + ;; + 31*) + QT_MAJOR="3" + ;; + *) + AC_MSG_ERROR([*** Qt version 3.1.x or higher is required]) + ;; +esac +AC_MSG_RESULT([$QT_VER ($QT_MAJOR)]) + +# Check that moc is in path +AC_CHECK_PROG(MOC, moc, moc) +if test x$MOC = x ; then + AC_MSG_ERROR([*** moc must be in path]) +fi +# uic is the Qt user interface compiler +AC_CHECK_PROG(UIC, uic, uic) +if test x$UIC = x ; then + AC_MSG_ERROR([*** uic must be in path]) +fi +# qembed is the Qt data embedding utility. +# It is located in $QTDIR/tools/qembed, and must be compiled and installed +# manually, we'll let it slide if it isn't present +AC_CHECK_PROG(QEMBED, qembed, qembed) +# Calculate Qt include path +QT_CXXFLAGS="-I$QTINC" +QT_IS_EMBEDDED="no" +# On unix, figure out if we're doing a static or dynamic link +case "${host}" in + *-cygwin) + AC_DEFINE_UNQUOTED(WIN32, "", Defined if on Win32 platform) + echo "$QTDIR/lib/qt-mt$QT_VER.lib" + if test -f "$QTDIR/lib/qt-mt$QT_VER.lib" ; then + QT_LIB="qt-mt$QT_VER.lib" + QT_IS_STATIC="no" + QT_IS_MT="yes" + + elif test -f "$QTDIR/lib/qt$QT_VER.lib" ; then + QT_LIB="qt$QT_VER.lib" + QT_IS_STATIC="no" + QT_IS_MT="no" + elif test -f "$QTDIR/lib/qt.lib" ; then + QT_LIB="qt.lib" + QT_IS_STATIC="yes" + QT_IS_MT="no" + elif test -f "$QTDIR/lib/qt-mt.lib" ; then + QT_LIB="qt-mt.lib" + QT_IS_STATIC="yes" + QT_IS_MT="yes" + fi + ;; + *-darwin*) + # determin static or dynamic -- prefer dynamic + QT_IS_DYNAMIC=`ls $QTDIR/lib/libqt*.dylib 2> /dev/null` + if test "x$QT_IS_DYNAMIC" = x; then + QT_IS_STATIC=`ls $QTDIR/lib/libqt*.a 2> /dev/null` + if test "x$QT_IS_STATIC" = x; then + QT_IS_STATIC="no" + AC_MSG_ERROR([*** Couldn't find any Qt libraries in $QTDIR/${_lib}]) + else + QT_IS_STATIC="yes" + fi + else + QT_IS_STATIC="no" + fi + # set link parameters based on shared/mt libs or static lib + if test "x`ls $QTDIR/lib/libqt.a* 2> /dev/null`" != x ; then + QT_LIB="-lqt" + QT_IS_MT="no" + elif test "x`ls $QTDIR/lib/libqt-mt.*.dylib 2> /dev/null`" != x ; then + QT_LIB="-lqt-mt" + QT_IS_MT="yes" + elif test "x`ls $QTDIR/lib/libqt.*.dylib 2> /dev/null`" != x ; then + QT_LIB="-lqt" + QT_IS_MT="no" + elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then + QT_LIB="-lqte" + QT_IS_MT="no" + QT_IS_EMBEDDED="yes" + elif test "x`ls $QTDIR/lib/libqte-mt.* 2> /dev/null`" != x ; then + QT_LIB="-lqte-mt" + QT_IS_MT="yes" + QT_IS_EMBEDDED="yes" + fi + ;; + *) + # determin static or dynamic -- prefer dynamic + QT_IS_DYNAMIC=`ls $QTDIR/${_lib}/libqt*.so 2> /dev/null` + if test "x$QT_IS_DYNAMIC" = x; then + QT_IS_STATIC=`ls $QTDIR/${_lib}/libqt*.a 2> /dev/null` + if test "x$QT_IS_STATIC" = x; then + QT_IS_STATIC="no" + AC_MSG_ERROR([*** Couldn't find any Qt libraries in $QTDIR/${_lib}]) + else + QT_IS_STATIC="yes" + fi + else + QT_IS_STATIC="no" + fi + # set link parameters based on shared/mt libs or static lib + if test "x`ls $QTDIR/${_lib}/libqt.a* 2> /dev/null`" != x ; then + QT_LIB="-lqt" + QT_IS_MT="no" + elif test "x`ls $QTDIR/${_lib}/libqt-mt.so* 2> /dev/null`" != x ; then + QT_LIB="-lqt-mt" + QT_IS_MT="yes" + elif test "x`ls $QTDIR/${_lib}/libqt.so* 2> /dev/null`" != x ; then + QT_LIB="-lqt" + QT_IS_MT="no" + elif test "x`ls $QTDIR/${_lib}/libqte.* 2> /dev/null`" != x ; then + QT_LIB="-lqte" + QT_IS_MT="no" + QT_IS_EMBEDDED="yes" + elif test "x`ls $QTDIR/${_lib}/libqte-mt.* 2> /dev/null`" != x ; then + QT_LIB="-lqte-mt" + QT_IS_MT="yes" + QT_IS_EMBEDDED="yes" + fi + ;; +esac + +AC_MSG_CHECKING([if Qt is static]) +AC_MSG_RESULT([$QT_IS_STATIC]) +AC_MSG_CHECKING([if Qt is multithreaded]) +AC_MSG_RESULT([$QT_IS_MT]) +AC_MSG_CHECKING([if Qt is embedded]) +AC_MSG_RESULT([$QT_IS_EMBEDDED]) + +QT_GUILINK="" +QASSISTANTCLIENT_LDADD="-lqassistantclient" +case "${host}" in + *irix*) + QT_LIBS="$QT_LIB" + if test $QT_IS_STATIC = yes ; then + QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE" + fi + ;; + + *linux*) + QT_LIBS="$QT_LIB" + if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then + QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg" + fi + ;; + + *freebsd*) + QT_LIBS="$QT_LIB" + if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then + QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg -lpthread" + else + QT_LIBS="$QT_LIBS -lpthread" + fi + ;; + + *darwin*) + QT_LIBS="$QT_LIB" + if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then + QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg" + fi + ;; + + *osf*) + # Digital Unix (aka DGUX aka Tru64) + QT_LIBS="$QT_LIB" + if test $QT_IS_STATIC = yes ; then + QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE" + fi + ;; + + *solaris*) + QT_LIBS="$QT_LIB" + if test $QT_IS_STATIC = yes ; then + QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -lresolv -lsocket -lnsl" + fi + ;; + + *win*) + # linker flag to suppress console when linking a GUI app on Win32 + QT_GUILINK="/subsystem:windows" + if test $QT_MAJOR = "3" ; then + if test $QT_IS_MT = yes ; then + QT_LIBS="/nodefaultlib:libcmt" + else + QT_LIBS="/nodefaultlib:libc" + fi + fi + + if test $QT_IS_STATIC = yes ; then + QT_LIBS="$QT_LIBS $QT_LIB kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib shell32.lib imm32.lib advapi32.lib wsock32.lib winspool.lib winmm.lib netapi32.lib" + if test $QT_MAJOR = "3" ; then + QT_LIBS="$QT_LIBS qtmain.lib" + fi + else + QT_LIBS="$QT_LIBS $QT_LIB" + if test $QT_MAJOR = "3" ; then + QT_CXXFLAGS="$QT_CXXFLAGS -DQT_DLL" + QT_LIBS="$QT_LIBS qtmain.lib qui.lib user32.lib netapi32.lib" + fi + fi + QASSISTANTCLIENT_LDADD="qassistantclient.lib" + ;; +esac + +if test x"$QT_IS_EMBEDDED" = "xyes" ; then + QT_CXXFLAGS="-DQWS $QT_CXXFLAGS" +fi + +if test x"$QT_IS_MT" = "xyes" ; then + QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT" +fi + +QT_LDADD="-L$QTDIR/${_lib} $QT_LIBS" + +if test x$QT_IS_STATIC = xyes ; then + OLDLIBS="$LIBS" + LIBS="$QT_LDADD" + AC_CHECK_LIB(Xft, XftFontOpen, QT_LDADD="$QT_LDADD -lXft") + LIBS="$LIBS" +fi + +AC_MSG_CHECKING([QT_CXXFLAGS]) +AC_MSG_RESULT([$QT_CXXFLAGS]) +AC_MSG_CHECKING([QT_LDADD]) +AC_MSG_RESULT([$QT_LDADD]) + +AC_SUBST(QT_CXXFLAGS) +AC_SUBST(QT_LDADD) +AC_SUBST(QT_GUILINK) +AC_SUBST(QASSISTANTCLIENT_LDADD) +AC_SUBST(QTDIR) +]) + + + +# Configure path for the GNU Scientific Library +# Christopher R. Gabriel , April 2000 + + +AC_DEFUN([AM_PATH_GSL], +[ +AC_ARG_WITH(gsl-prefix,[ --with-gsl-prefix=PFX Prefix where GSL is installed (optional)], + gsl_prefix="$withval", gsl_prefix="") +AC_ARG_WITH(gsl-exec-prefix,[ --with-gsl-exec-prefix=PFX Exec prefix where GSL is installed (optional)], + gsl_exec_prefix="$withval", gsl_exec_prefix="") +AC_ARG_ENABLE(gsltest, [ --disable-gsltest Do not try to compile and run a test GSL program], + , enable_gsltest=yes) + + if test "x${GSL_CONFIG+set}" != xset ; then + if test "x$gsl_prefix" != x ; then + GSL_CONFIG="$gsl_prefix/bin/gsl-config" + fi + if test "x$gsl_exec_prefix" != x ; then + GSL_CONFIG="$gsl_exec_prefix/bin/gsl-config" + fi + fi + + AC_PATH_PROG(GSL_CONFIG, gsl-config, no) + min_gsl_version=ifelse([$1], ,0.2.5,$1) + AC_MSG_CHECKING(for GSL - version >= $min_gsl_version) + no_gsl="" + if test "$GSL_CONFIG" = "no" ; then + no_gsl=yes + else + GSL_CFLAGS=`$GSL_CONFIG --cflags` + GSL_LIBS=`$GSL_CONFIG --libs` + + gsl_major_version=`$GSL_CONFIG --version | \ + sed 's/^\([[0-9]]*\).*/\1/'` + if test "x${gsl_major_version}" = "x" ; then + gsl_major_version=0 + fi + + gsl_minor_version=`$GSL_CONFIG --version | \ + sed 's/^\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\).*/\2/'` + if test "x${gsl_minor_version}" = "x" ; then + gsl_minor_version=0 + fi + + gsl_micro_version=`$GSL_CONFIG --version | \ + sed 's/^\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\).*/\3/'` + if test "x${gsl_micro_version}" = "x" ; then + gsl_micro_version=0 + fi + + if test "x$enable_gsltest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GSL_CFLAGS" + LIBS="$LIBS $GSL_LIBS" + + rm -f conf.gsltest + AC_TRY_RUN([ +#include +#include +#include + +char* my_strdup (const char *str); + +char* +my_strdup (const char *str) +{ + char *new_str; + + if (str) + { + new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int main (void) +{ + int major = 0, minor = 0, micro = 0; + int n; + char *tmp_version; + + system ("touch conf.gsltest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_gsl_version"); + + n = sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) ; + + if (n != 2 && n != 3) { + printf("%s, bad version string\n", "$min_gsl_version"); + exit(1); + } + + if (($gsl_major_version > major) || + (($gsl_major_version == major) && ($gsl_minor_version > minor)) || + (($gsl_major_version == major) && ($gsl_minor_version == minor) && ($gsl_micro_version >= micro))) + { + exit(0); + } + else + { + printf("\n*** 'gsl-config --version' returned %d.%d.%d, but the minimum version\n", $gsl_major_version, $gsl_minor_version, $gsl_micro_version); + printf("*** of GSL required is %d.%d.%d. If gsl-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If gsl-config was wrong, set the environment variable GSL_CONFIG\n"); + printf("*** to point to the correct copy of gsl-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + exit(1); + } +} + +],, no_gsl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gsl" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$GSL_CONFIG" = "no" ; then + echo "*** The gsl-config script installed by GSL could not be found" + echo "*** If GSL was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the GSL_CONFIG environment variable to the" + echo "*** full path to gsl-config." + else + if test -f conf.gsltest ; then + : + else + echo "*** Could not run GSL test program, checking why..." + CFLAGS="$CFLAGS $GSL_CFLAGS" + LIBS="$LIBS $GSL_LIBS" + AC_TRY_LINK([ +#include +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GSL or finding the wrong" + echo "*** version of GSL. If it is not finding GSL, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GSL was incorrectly installed" + echo "*** or that you have moved GSL since it was installed. In the latter case, you" + echo "*** may want to edit the gsl-config script: $GSL_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi +# GSL_CFLAGS="" +# GSL_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GSL_CFLAGS) + AC_SUBST(GSL_LIBS) + rm -f conf.gsltest +]) + +dnl ------------------------------------------------------------------------ +dnl Detect QGIS +dnl +dnl use AQ_CHECK_QGIS to detect QGIS +dnl it sets: +dnl QGIS_CXXFLAGS +dnl QGIS_LDADD +dnl ------------------------------------------------------------------------ + +# Check for QGIS compiler and linker flags +# Jens Oberender 2004 + +AC_DEFUN([AQ_CHECK_QGIS], +[ +dnl +dnl Get the cflags and libraries from qgis-config +dnl +AC_ARG_WITH([qgis], +AC_HELP_STRING([--with-qgis=path], + [Full path to 'qgis-config', e.g. --with-qgis=/usr/local/bin/qgis-config]), + [ac_qgis_config_path=$withval]) + +if test x"$ac_qgis_config_path" = x ; then + ac_qgis_config_path=`which qgis-config` +fi + +ac_qgis_config_path=`dirname $ac_qgis_config_path 2> /dev/null` +AC_PATH_PROG(QGIS_CONFIG, qgis-config, no, $ac_qgis_config_path) + +if test x"$QGIS_CONFIG" = xno ; then + if test x"$ac_qgis_config_path" = x ; then + AC_MSG_ERROR([qgis-config not found in $ac_qgis_config_path! Supply a path with --with-qgis=PATH]) + else + AC_MSG_ERROR([qgis-config not found! Supply a path with --with-qgis=PATH]) + fi +else + AC_MSG_CHECKING([QGIS_CXXFLAGS]) + QGIS_CXXFLAGS=`$QGIS_CONFIG --cflags` + AC_MSG_RESULT($QGIS_CXXFLAGS) + + AC_MSG_CHECKING([QGIS_LDADD]) + QGIS_LDADD=`$QGIS_CONFIG --libs` + AC_MSG_RESULT($QGIS_LDADD) + + AC_MSG_CHECKING([QGIS_PREFIX]) + QGIS_PREFIX=`$QGIS_CONFIG --prefix` + AC_MSG_RESULT($QGIS_PREFIX) + + AC_MSG_CHECKING([QGIS_PLUGINPATH]) + QGIS_PLUGINPATH=`$QGIS_CONFIG --plugindir` + AC_MSG_RESULT($QGIS_PLUGINPATH) + + AC_MSG_CHECKING([QGIS_MAJOR_VERSION]) + QGIS_MAJOR_VERSION=`$QGIS_CONFIG --major_version` + AC_MSG_RESULT($QGIS_MAJOR_VERSION) + + AC_MSG_CHECKING([QGIS_MINOR_VERSION]) + QGIS_MINOR_VERSION=`$QGIS_CONFIG --minor_version` + AC_MSG_RESULT($QGIS_MINOR_VERSION) + + AC_MSG_CHECKING([QGIS_MICRO_VERSION]) + QGIS_MICRO_VERSION=`$QGIS_CONFIG --micro_version` + AC_MSG_RESULT($QGIS_MICRO_VERSION) + + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + CXXFLAGS="$CXXFLAGS $QGIS_CXXFLAGS $QT_CXXFLAGS" + LDFLAGS="$LDFLAGS $QGIS_LDADD $QT_LDADD $GDAL_LDADD" + + case "${host}" in + *darwin*) + LDFLAGS="$LDFALGS -flat_namespace -undefined suppress" + ;; + esac + + AC_LINK_IFELSE([ + #include + int main(int argc, char *argv[]) { + QgsFeature * myQgsFeature = new QgsFeature(1); + return 0; + } + ], [ac_qgis_linked='yes'], [ac_qgis_linked='no']) + CXXFLAGS="$ac_save_CXXFLAGS" + LDFLAGS="$ac_save_LDFLAGS" + + AC_MSG_CHECKING([if linking with QGIS works]) + if test x$ac_qgis_linked = xyes ; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi +fi + +AC_SUBST(QGIS_CXXFLAGS) +AC_SUBST(QGIS_LDADD) +AC_SUBST(QGIS_PREFIX) +AC_SUBST(QGIS_PLUGINPATH) +AC_SUBST(QGIS_MAJOR_VERSION) +AC_SUBST(QGIS_MINOR_VERSION) +AC_SUBST(QGIS_MICRO_VERSION) +]) --- qgis-0.8.0.orig/debian/compat +++ qgis-0.8.0/debian/compat @@ -0,0 +1 @@ +5 --- qgis-0.8.0.orig/debian/rules +++ qgis-0.8.0/debian/rules @@ -0,0 +1,117 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +config.status: configure + dh_testdir + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --with-qtdir=/usr/share/qt4 \ + --enable-spit \ + --with-postgresql \ + --with-grass=/usr/lib/grass \ + --disable-debug + +build: patch build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #/usr/bin/docbook-to-man debian/qgis.sgml > qgis.1 + + touch build-stamp + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp + rm -f i18n/*.qm + rm -rf debian/tmp + + # Add here commands to clean up after the build process. + -$(MAKE) distclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + rm -f config.status config.log + + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp. + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + # Install menu pixmap + install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps + install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-icon.xpm + + # Install desktop file + install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/applications + install -o root -g root -m 644 $(CURDIR)/debian/qgis.desktop $(CURDIR)/debian/tmp/usr/share/applications + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_install --sourcedir=debian/tmp + dh_installmenu + dh_installman -pqgis debian/gridmaker.1 + dh_installman -plibqgis0-dev debian/qgis-config.1 + dh_link + dh_strip + dh_compress --exclude=pdf + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- qgis-0.8.0.orig/debian/qgis-plugin-grass.install +++ qgis-0.8.0/debian/qgis-plugin-grass.install @@ -0,0 +1,4 @@ +usr/lib/libqgisgrass.so.* +usr/lib/qgis/grassplugin.so +usr/lib/qgis/grassprovider.so +usr/share/qgis/grass/* --- qgis-0.8.0.orig/debian/changelog +++ qgis-0.8.0/debian/changelog @@ -0,0 +1,217 @@ +qgis (0.8.0-3ubuntu2) gutsy; urgency=low + + * Add libhdf5-serial-dev and libcurl3-openssl-dev to build-depends. + Fixes FTBFS. + * Create /usr/share/applications before attempting to copy the .desktop. + + -- William Grant Sun, 20 May 2007 11:39:43 +1000 + +qgis (0.8.0-3ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/rules, debian/qgis.install, debian/qgis.dirs debian/qgis.desktop: + Add and install .desktop. + * debian/qgis.desktop: Remove Applications category; it's not real. + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- William Grant Sun, 06 May 2007 13:42:32 +1000 + +qgis (0.8.0-3) unstable; urgency=low + + * Added missing flex/bison build-deps. + (closes: #421143) + * Added gcc4.3-fixes based the patch by tbm. + (closes: #417522) + + -- Francesco Paolo Lovergine Mon, 30 Apr 2007 23:24:02 +0200 + +qgis (0.8.0-2) unstable; urgency=low + + * Releasing for unstable. + Moved to soname 1 instead of 0. + + -- Francesco Paolo Lovergine Tue, 10 Apr 2007 13:42:47 +0200 + +qgis (0.8.0-1) experimental; urgency=low + + * New upstream release. + * Patchset updated. + New patch: gridmaker_bin to generate gridmaker binary as it should. + + + -- Francesco Paolo Lovergine Wed, 4 Apr 2007 14:19:48 +0200 + +qgis (0.7.4-6) UNRELEASED; urgency=low + + * Moved to team maintainership as asked by Steve. + * Moved to new gdal 1.4.0 dependency (currently in experimental) + + -- Francesco Paolo Lovergine Wed, 4 Apr 2007 14:04:38 +0200 + +qgis (0.7.4-5ubuntu1) feisty; urgency=low + + * Merge from debian unstable. Remaining changes: + - Added .desktop. + + -- William Alexander Grant Sat, 9 Dec 2006 09:00:51 +1100 + +qgis (0.7.4-5) unstable; urgency=low + + * Acknowledge GCC 4.1 NMU (Closes: #356215) + * Update deps to libgdal1-1.3.2-dev and grass-dev (Closes: #383143, #360649) + * Bump standards version to 3.7.2. No changes made. + + -- Steve Halasz Sat, 19 Aug 2006 22:13:32 -0400 + +qgis (0.7.4-4.1ubuntu1) edgy; urgency=low + + * Re-sync with Debian + * Re-Add desktop file from Phil Bull (Closes Malone: #36436) + + -- Barry deFreese Sun, 9 Jul 2006 00:06:30 -0400 + +qgis (0.7.4-4.1) unstable; urgency=low + + * NMU as part of the GCC 4.1 transition. + * patches/gcc41-extra-qualifications.dpatch: Update to remove two more + extra qualifications from C++ files (Closes: #356215) + + -- Martin Michlmayr Fri, 26 May 2006 23:57:18 +0200 + +qgis (0.7.4-4) unstable; urgency=low + + * Apply patch for building with gcc 4.1 (Closes: #356215) + * Create patch for moving location of installed documentation + (Closes: #355208) + * Remove essentially empty README file (Closes: #324533) + + -- Steve Halasz Fri, 7 Apr 2006 10:12:58 -0400 + +qgis (0.7.4-3) unstable; urgency=low + + * Build with libgdal1-1.3.1 + * Build-dep on libmysqlclient15-dev + * Remove follow-on build-deps that are now pulled in by + libgdal1-1.3.1-dev + + -- Steve Halasz Mon, 20 Feb 2006 20:21:48 -0500 + +qgis (0.7.4-2) unstable; urgency=low + + * Build libqgis0 as separate package to conform to policy (Closes: #339254) + * Rename qgis-dev to libqgis0-dev + * Build-dep on libmysqlclient14-dev + * Acknowledge binary NMU (Closes: #345148) + + -- Steve Halasz Wed, 14 Dec 2005 23:14:35 -0500 + +qgis (0.7.4-1) unstable; urgency=low + + * New upstream release + * Build GRASS support in qgis-plugin-grass package (Closes: #248649) + + -- Steve Halasz Sat, 5 Nov 2005 16:04:45 -0500 + +qgis (0.7.0-1) unstable; urgency=low + + * New upstream release (Closes: #327592) + - Don't segfault when starting without X (Closes: #295872) + - GPX plugin uses less RAM (Closes: #284238) + * PostgreSQL transition: build-dep on libpq-dev | postgresql-dev + * C++ ABI transition. No explicit changes made. (Closes: #327597) + * Bump standards version to 3.6.2. No changes made. + + -- Steve Halasz Fri, 16 Sep 2005 10:43:49 -0400 + +qgis (0.6.0-2) unstable; urgency=low + + * Depend on xerces26 instead of xerces21 (Closes: #301709) + * Apply patch for PostGis 1.0 (Closes: #303743) + * Added note about setting QTDIR=/usr/share/qt3 (Closes: #281910) + * Patch for crash loading shapefiles exposed by gdal 1.2.6 + + -- Steve Halasz Thu, 14 Apr 2005 11:03:20 -0400 + +qgis (0.6.0-1) unstable; urgency=low + + * New upstream release + * Display version name consistently (Closes: #275608) + * Make Alt+F accelerators unique (Closes: #275611) + * Use upstream's new manpage for qgis + * Make delimited text plugin dialog more user-friendly (Closes: #282085) + * Fix for disappearing icons (Closes: #275610) + * Properly load shapefiles specified on the command line (Closes: #275607) + + -- Steve Halasz Tue, 21 Dec 2004 09:46:27 -0500 + +qgis (0.5.0-2) unstable; urgency=low + + * Fix typos in .install files that left out the delimitedtext plugin + (Closes: #282084) + + -- Steve Halasz Fri, 19 Nov 2004 10:51:07 -0500 + +qgis (0.5.0-1) unstable; urgency=low + + * New upstream release + * Create separate qgis-dev package (Closes: #264213) + + -- Steve Halasz Wed, 6 Oct 2004 07:34:28 -0400 + +qgis (0.4.0-3) unstable; urgency=medium + + * Add build-dep on libjasper-1.701-dev + * Add build-dep on libtiff4-dev - doh! :-/ + * Add build-dep on netcdfg-dev + + -- Steve Halasz Tue, 10 Aug 2004 11:22:29 -0400 + +qgis (0.4.0-2) unstable; urgency=low + + * Remove build-dep on libtiff3g-dev (Closes: #264573) + + -- Steve Halasz Mon, 9 Aug 2004 09:15:08 -0400 + +qgis (0.4.0-1) unstable; urgency=low + + * New upstream release + + -- Steve Halasz Fri, 2 Jul 2004 09:36:23 -0400 + +qgis (0.3.0-1) unstable; urgency=low + + * New upstream release + + -- Steve Halasz Wed, 26 May 2004 09:38:22 -0400 + +qgis (0.2.0-1) unstable; urgency=low + + * New upstream release + + -- Steve Halasz Mon, 26 Apr 2004 09:48:19 -0400 + +qgis (0.1-2) unstable; urgency=low + + * Build with the Shapefile to PostGIS Import Tool (SPIT) and + PostgreSQL support (Closes: #233191) + + -- Steve Halasz Wed, 7 Apr 2004 09:18:34 -0400 + +qgis (0.1-1) unstable; urgency=low + + * New upstream release + * changed install location of html documentation to /usr/share/doc/qgis + * updated man page to describe new command-line options and include pointers + to HTML and PDF documentation (Closes: #234600) + * debian/control: + - updated description to include raster support + + -- Steve Halasz Wed, 25 Feb 2004 08:56:18 -0500 + +qgis (0.0.13-1) unstable; urgency=low + + * Initial Release (Closes: #217237). + * clean out config.status and config.log before building + + -- Steve Halasz Fri, 9 Jan 2004 12:27:07 -0500 + --- qgis-0.8.0.orig/debian/libqgis1-dev.install +++ qgis-0.8.0/debian/libqgis1-dev.install @@ -0,0 +1,22 @@ +usr/bin/qgis-config +usr/lib/libqgis*a +usr/include/qgis/* +usr/share/aclocal/qgis.m4 +usr/lib/qgis/copyrightlabelplugin.a +usr/lib/qgis/libqgsprojectionselector.a +usr/lib/qgis/delimitedtextplugin.a +usr/lib/qgis/northarrowplugin.a +usr/lib/qgis/delimitedtextprovider.a +usr/lib/qgis/ogrprovider.a +usr/lib/qgis/georefplugin.a +usr/lib/qgis/pggeoprocessingplugin.a +usr/lib/qgis/gpsimporterplugin.a +usr/lib/qgis/postgresprovider.a +usr/lib/qgis/gpxprovider.a +usr/lib/qgis/scalebarplugin.a +usr/lib/qgis/grassplugin.a +usr/lib/qgis/spitplugin.a +usr/lib/qgis/grassprovider.a +usr/lib/qgis/wmsprovider.a +usr/lib/qgis/gridmakerplugin.a + --- qgis-0.8.0.orig/debian/qgis.desktop +++ qgis-0.8.0/debian/qgis.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=QGIS Geographic Information System +GenericName=Geographic Information System +Comment=View and manipulate detailed geographical information +Type=Application +Exec=qgis +Icon=qgis-icon +Categories=Education;Qt;Science; --- qgis-0.8.0.orig/debian/qgis.install +++ qgis-0.8.0/debian/qgis.install @@ -0,0 +1,27 @@ +usr/bin/gridmaker +usr/bin/qgis +usr/lib/qgis/copyrightlabelplugin.so +usr/lib/qgis/delimitedtextplugin.so +usr/lib/qgis/delimitedtextprovider.so +usr/lib/qgis/georefplugin.so +usr/lib/qgis/gpsimporterplugin.so +usr/lib/qgis/gpxprovider.so +usr/lib/qgis/gridmakerplugin.so +usr/lib/qgis/libqgsprojectionselector.so +usr/lib/qgis/northarrowplugin.so +usr/lib/qgis/ogrprovider.so +usr/lib/qgis/pggeoprocessingplugin.so +usr/lib/qgis/postgresprovider.so +usr/lib/qgis/scalebarplugin.so +usr/lib/qgis/spitplugin.so +usr/lib/qgis/wmsprovider.so +usr/share/doc/* +usr/share/man/* +usr/share/pixmaps/* +usr/share/qgis/doc/* +usr/share/qgis/i18n/* +usr/share/qgis/images/* +usr/share/qgis/resources/* +usr/share/qgis/svg/* +usr/share/qgis/themes/* +usr/share/applications/qgis.desktop --- qgis-0.8.0.orig/debian/control +++ qgis-0.8.0/debian/control @@ -0,0 +1,58 @@ +Source: qgis +Section: science +Priority: extra +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian GIS Project +Uploaders: Francesco Paolo Lovergine +Build-Depends: debhelper (>= 5.0.0), libgdal1-dev, libqt4-dev, libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), dpatch, + grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libmysqlclient15-dev | libmysqlclient14-dev, flex, bison, libhdf5-serial-dev, libcurl3-openssl-dev +Standards-Version: 3.7.2 + +Package: qgis +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: qgis-plugin-grass +Description: Geographic Information System (GIS) + A Geographic Information System (GIS) manages, + analyzes, and displays databases of geographic + information. Quantum GIS (QGIS) supports shapefile + viewing and editing, spatial data storage with + PostgreSQL/PostGIS, projection on-the-fly, map + composition, and a number of other features via + a plugin interface. QGIS also supports display + of various georeferenced raster and Digital + Elevation Model (DEM) formats including + GeoTIFF, Arc/Info ASCII Grid, and USGS ASCII DEM. + +Package: libqgis1 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: QGIS Geographic Information System - shared library + QGIS is a Geographic Information System (GIS) + which manages, analyzes and display databases of + geographic information. + . + This package contains the shared library that + provides an interface for plugins. + +Package: libqgis1-dev +Architecture: any +Depends: qgis (= ${Source-Version}), libgdal1-dev, libqt3-mt-dev (>= 3:3.2.1-6), libqt3-compat-headers (>= 3:3.2.3-2), libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev +Provides: libqgis-dev +Conflicts: libqgis-dev, qgis-dev +Replaces: qgis-dev +Suggests: qt3-designer +Description: QGIS Geographic Information System - development files + QGIS is a Geographic Information System (GIS) + which manages, analyzes and display databases of + geographic information. + . + This package contains the headers and libraries + needed to develop plugins for QGIS. + +Package: qgis-plugin-grass +Architecture: any +Depends: qgis (= ${Source-Version}), libgdal1-1.4.0-grass +Description: Plugin for accessing GRASS data from QGIS + This plugin enables display of GRASS data layers in the QGIS + geographic data viewer. --- qgis-0.8.0.orig/debian/qgis.1 +++ qgis-0.8.0/debian/qgis.1 @@ -0,0 +1,35 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH QGIS 1 "Januray 6, 2004" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +qgis \- geographic data viewer +.SH SYNOPSIS +.B qgis [project-file.qgs] | [shapefile.shp] [raster-file.tif] ... +.br +.SH DESCRIPTION +This manual page documents briefly the +.B qgis +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +\fBqgis\fP displays shapefiles, georeferenced raster files, and digital elevation models. You can specify a QGIS project file on the command line to be displayed at startup. Or you can specify a combination of multiple shapefiles and/or raster files to be displayed at startup. +.SH SEE ALSO +HTML and PDF documentation in /usr/share/doc/qgis and at http://qgis.sourceforge.net/docs/ +.SH AUTHOR +This manual page was written by Steve Halasz , +for the Debian project (but may be used by others). --- qgis-0.8.0.orig/debian/qgis.menu +++ qgis-0.8.0/debian/qgis.menu @@ -0,0 +1,3 @@ +?package(qgis):needs="X11" section="Apps/Science"\ + icon="/usr/share/pixmaps/qgis-icon.xpm" title="QGIS"\ + command="/usr/bin/qgis" --- qgis-0.8.0.orig/debian/qgis.dirs +++ qgis-0.8.0/debian/qgis.dirs @@ -0,0 +1,2 @@ +usr/share/pixmaps +usr/share/applications --- qgis-0.8.0.orig/debian/gridmaker.1 +++ qgis-0.8.0/debian/gridmaker.1 @@ -0,0 +1,11 @@ +.TH gridmaker 1 "August 2004" "gridmaker" "User Commands" +.SH NAME +gridmaker \- Graticule builder +.SH SYNOPSIS +.PP +.B gridmaker +[OPTIONS] +.SH DESCRIPTION +.PP +The \fIgridmaker\fP qgis plugin will help you to build a graticule shapefile +that you can use as an overlay within your qgis map viewer. --- qgis-0.8.0.orig/debian/libqgis1-dev.README.Debian +++ qgis-0.8.0/debian/libqgis1-dev.README.Debian @@ -0,0 +1,8 @@ +QGIS for Debian +--------------- + +Before building a QGIS plugin you'll need to tell it where to look for Qt: + + export QTDIR=/usr/share/qt3 + + -- Steve Halasz Thu, 14 Apr 2005 11:03:20 -0400 --- qgis-0.8.0.orig/debian/qgis-config.1 +++ qgis-0.8.0/debian/qgis-config.1 @@ -0,0 +1,44 @@ +.TH qgis-config 1 "August 2004" "qgis-config" "User Commands" +.SH NAME +qgis-config \- returns information about installed qgis libraries and binaries +.SH SYNOPSIS +.PP +.B qgis-config +[OPTIONS] +.SH DESCRIPTION +.PP +The \fIqgis-config\fP shell script is designed to retrieve the +configuration information about the libraries and binaries dealing with +QGIS + +.SH OPTIONS +.TP +\fB\-\-cflags\fR +print the prefix used by qgis +.TP +\fB\-\-bindir\fR +print destination of executable(s) +.TP +\fB\-\-cflags\fR +print the compiler flags that are necessary to compile a +plug-inshow location of C++ header files +.TP +\fB\-\-libs\fR +print the linker flags that are necessary to link a plug-in +.TP +\fB\-\-plugindir\fR +print the path where the plugins are installed +.TP +\fB\-\-major_version\fR +print major version of qgis +.TP +\fB\-\-minor_version\fR +print minor version of qgis +.TP +\fB\-\-micro_version\fR +print micro version of qgis +.TP +\fB\-\-extra_version\fR +print extra version of qgis +\fB\-\-help\fR +show help, then exit --- qgis-0.8.0.orig/debian/copyright +++ qgis-0.8.0/debian/copyright @@ -0,0 +1,20 @@ +This package was debianized by Steve Halasz on +Wed, 31 Dec 2003 10:07:40 -0500. + +It was downloaded from: + http://qgis.sourceforge.net/downloads.html + +The upstream contributors are listed in the AUTHORS file. + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License as +published by the Free Software Foundation; either version 2 of +the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +On Debian systems, the complete text of the GNU General Public +License can be found in the /usr/share/common-licenses/GPL file. --- qgis-0.8.0.orig/debian/docs +++ qgis-0.8.0/debian/docs @@ -0,0 +1,4 @@ +AUTHORS +BUGS +README +TODO --- qgis-0.8.0.orig/debian/patches/gcc43-fixes.dpatch +++ qgis-0.8.0/debian/patches/gcc43-fixes.dpatch @@ -0,0 +1,62 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## gcc43-fixes.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad qgis~/src/composer/qgscomposition.cpp qgis/src/composer/qgscomposition.cpp +--- qgis~/src/composer/qgscomposition.cpp 2006-12-08 05:26:10.000000000 +0100 ++++ qgis/src/composer/qgscomposition.cpp 2007-04-30 20:29:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + ++#include + #include + + QgsCompositionPaper::QgsCompositionPaper ( QString name, int w, int h, bool c) +diff -urNad qgis~/src/providers/grass/qgsgrass.cpp qgis/src/providers/grass/qgsgrass.cpp +--- qgis~/src/providers/grass/qgsgrass.cpp 2006-12-24 22:56:43.000000000 +0100 ++++ qgis/src/providers/grass/qgsgrass.cpp 2007-04-30 20:29:57.000000000 +0200 +@@ -15,6 +15,7 @@ + ***************************************************************************/ + /* $Id: qgsgrass.cpp 6290 2006-12-20 04:51:35Z telwertowski $ */ + ++#include + #include + + #include "qstring.h" +diff -urNad qgis~/src/providers/postgres/qgspostgisbox2d.cpp qgis/src/providers/postgres/qgspostgisbox2d.cpp +--- qgis~/src/providers/postgres/qgspostgisbox2d.cpp 2006-03-03 21:38:20.000000000 +0100 ++++ qgis/src/providers/postgres/qgspostgisbox2d.cpp 2007-04-30 20:30:26.000000000 +0200 +@@ -17,6 +17,7 @@ + ***************************************************************************/ + /* $Id: qgspostgisbox2d.cpp 4501 2006-01-08 01:17:57Z timlinux $ */ + ++#include + #include + + #include +diff -urNad qgis~/src/providers/postgres/qgspostgisbox3d.cpp qgis/src/providers/postgres/qgspostgisbox3d.cpp +--- qgis~/src/providers/postgres/qgspostgisbox3d.cpp 2006-03-03 21:38:20.000000000 +0100 ++++ qgis/src/providers/postgres/qgspostgisbox3d.cpp 2007-04-30 20:31:01.000000000 +0200 +@@ -17,6 +17,7 @@ + ***************************************************************************/ + /* $Id: qgspostgisbox3d.cpp 4501 2006-01-08 01:17:57Z timlinux $ */ + ++#include + #include + + #include +diff -urNad qgis~/src/providers/postgres/qgspostgresextentthread.cpp qgis/src/providers/postgres/qgspostgresextentthread.cpp +--- qgis~/src/providers/postgres/qgspostgresextentthread.cpp 2006-03-03 21:38:20.000000000 +0100 ++++ qgis/src/providers/postgres/qgspostgresextentthread.cpp 2007-04-30 20:32:38.000000000 +0200 +@@ -17,6 +17,7 @@ + ***************************************************************************/ + /* $Id: qgspostgresextentthread.cpp 4501 2006-01-08 01:17:57Z timlinux $ */ + ++#include + #include + #include + #include --- qgis-0.8.0.orig/debian/patches/gridmaker_bin.dpatch +++ qgis-0.8.0/debian/patches/gridmaker_bin.dpatch @@ -0,0 +1,67 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## gridmaker_bin.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. +## DP: Reintroduces gridmaker binary due to a fault in MING_FALSE definition for other platforms +## DP: Also a few header #include directives miss in 3 different files +## + +@DPATCH@ +diff -urNad qgis~/src/plugins/grid_maker/Makefile.in qgis/src/plugins/grid_maker/Makefile.in +--- qgis~/src/plugins/grid_maker/Makefile.in 2006-12-30 03:12:19.000000000 +0100 ++++ qgis/src/plugins/grid_maker/Makefile.in 2007-04-05 14:40:07.000000000 +0200 +@@ -49,7 +49,7 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-@MINGW_FALSE@bin_PROGRAMS = gridmaker$(EXEEXT) ++bin_PROGRAMS = gridmaker$(EXEEXT) + subdir = src/plugins/grid_maker + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -319,7 +319,7 @@ + plugingui.cpp \ + $(standalone_MOC) + +-gridmaker_LDADD = $(QT_LDADD) ++gridmaker_LDADD = $(QT_LDADD) ../../core/libqgis_core.la ../../gui/libqgis_gui.la -lproj + gridmaker_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS) + gridmaker_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../gui -I../../ui -I../../core + standalone_MOC = plugingui.moc.cpp +diff -urNad qgis~/src/plugins/grid_maker/dbfopen.c qgis/src/plugins/grid_maker/dbfopen.c +--- qgis~/src/plugins/grid_maker/dbfopen.c 2007-04-05 12:41:21.000000000 +0200 ++++ qgis/src/plugins/grid_maker/dbfopen.c 2007-04-05 14:39:23.000000000 +0200 +@@ -125,9 +125,8 @@ + + #include + #include +-#ifdef WIN32 + #include +-#endif ++ + typedef unsigned char uchar; + + #ifndef FALSE +diff -urNad qgis~/src/plugins/grid_maker/main.cpp qgis/src/plugins/grid_maker/main.cpp +--- qgis~/src/plugins/grid_maker/main.cpp 2007-04-05 12:41:33.000000000 +0200 ++++ qgis/src/plugins/grid_maker/main.cpp 2007-04-05 14:39:23.000000000 +0200 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + int main(int argc, char *argv[]) + { +diff -urNad qgis~/src/plugins/grid_maker/shpopen.c qgis/src/plugins/grid_maker/shpopen.c +--- qgis~/src/plugins/grid_maker/shpopen.c 2007-04-05 12:41:20.000000000 +0200 ++++ qgis/src/plugins/grid_maker/shpopen.c 2007-04-05 14:39:23.000000000 +0200 +@@ -137,6 +137,7 @@ + #include + #include + #include ++#include + + typedef unsigned char uchar; + --- qgis-0.8.0.orig/debian/patches/00list +++ qgis-0.8.0/debian/patches/00list @@ -0,0 +1,3 @@ +move-doc-dir +gridmaker_bin +gcc43-fixes --- qgis-0.8.0.orig/debian/patches/move-doc-dir.dpatch +++ qgis-0.8.0/debian/patches/move-doc-dir.dpatch @@ -0,0 +1,44 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## move-doc-dir.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Install and access docs in /usr/share/doc/qgis to conform to +## DP: policy. + +@DPATCH@ +diff -urNad qgis~/doc/Makefile.in qgis/doc/Makefile.in +--- qgis~/doc/Makefile.in 2007-04-04 14:16:22.000000000 +0200 ++++ qgis/doc/Makefile.in 2007-04-04 15:32:19.000000000 +0200 +@@ -239,7 +239,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-docdatadir = $(datadir)/$(PACKAGE)/doc ++docdatadir = $(datadir)/doc/$(PACKAGE)/doc + docdata_DATA = \ + favicon.ico \ + index.html \ +diff -urNad qgis~/doc/images/Makefile.in qgis/doc/images/Makefile.in +--- qgis~/doc/images/Makefile.in 2007-04-04 14:17:49.000000000 +0200 ++++ qgis/doc/images/Makefile.in 2007-04-04 15:34:11.000000000 +0200 +@@ -230,7 +230,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-docdatadir = $(datadir)/$(PACKAGE)/doc/images ++docdatadir = $(datadir)/doc/$(PACKAGE)/doc/images + docdata_DATA = qgis_new_80pct.png + + # generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)# \1 \\#' +diff -urNad qgis~/doc/install_guide/Makefile.in qgis/doc/install_guide/Makefile.in +--- qgis~/doc/install_guide/Makefile.in 2007-04-04 14:16:22.000000000 +0200 ++++ qgis/doc/install_guide/Makefile.in 2007-04-04 15:33:51.000000000 +0200 +@@ -230,7 +230,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-docdatadir = $(datadir)/$(PACKAGE)/doc/install_guide ++docdatadir = $(datadir)/doc/$(PACKAGE)/doc/install_guide + # The files needed for the doc install have to be manually added here and + # the next section enabled when doing a make dist or make release + docdata_DATA = #contents.png \ --- qgis-0.8.0.orig/debian/libqgis1.install +++ qgis-0.8.0/debian/libqgis1.install @@ -0,0 +1,5 @@ +usr/lib/libqgis_composer.so* +usr/lib/libqgis_core.so* +usr/lib/libqgis_gui.so* +usr/lib/libqgis_legend.so* +usr/lib/libqgis_raster.so* --- qgis-0.8.0.orig/debian/qgis-icon.xpm +++ qgis-0.8.0/debian/qgis-icon.xpm @@ -0,0 +1,255 @@ +/* XPM */ +static char * qgis_icon_xpm[] = { +"32 32 220 2", +" c None", +". c #324A00", +"+ c #257700", +"@ c #0F3700", +"# c #316E00", +"$ c #177B00", +"% c #0E7200", +"& c #0C2A00", +"* c #414202", +"= c #2C6000", +"- c #167800", +"; c #0F7400", +"> c #0E7100", +", c #0E7000", +"' c #0D2900", +") c #100F00", +"! c #1F5C00", +"~ c #103100", +"{ c #167A00", +"] c #0E6A00", +"^ c #106800", +"/ c #113B00", +"( c #5B55E0", +"_ c #4E49D6", +": c #423CCE", +"< c #403BC9", +"[ c #4440B9", +"} c #484297", +"| c #2A7003", +"1 c #0F7300", +"2 c #0E6E00", +"3 c #0B2C00", +"4 c #122000", +"5 c #173D00", +"6 c #4A43E0", +"7 c #3C37BB", +"8 c #2E2A7F", +"9 c #15143C", +"0 c #11102A", +"a c #191748", +"b c #282573", +"c c #384A53", +"d c #137B00", +"e c #0C5200", +"f c #040800", +"g c #1D1E00", +"h c #4942DC", +"i c #3833AA", +"j c #1E1D4C", +"k c #1F5F16", +"l c #091D02", +"m c #4841DB", +"n c #3934B2", +"o c #232163", +"p c #356701", +"q c #0B4300", +"r c #1A174A", +"s c #4F49D8", +"t c #3B35B8", +"u c #3631A6", +"v c #16152B", +"w c #197C00", +"x c #0C5B02", +"y c #0C1615", +"z c #302B99", +"A c #2B287A", +"B c #423CCC", +"C c #3631AB", +"D c #343093", +"E c #2F6C00", +"F c #0F7500", +"G c #0E6F00", +"H c #0C2A02", +"I c #282578", +"J c #3530A9", +"K c #3530A5", +"L c #1C1A3C", +"M c #4640C3", +"N c #3A35B7", +"O c #3631AA", +"P c #2A2776", +"Q c #147C00", +"R c #0B5700", +"S c #060A00", +"T c #3F3BA7", +"U c #282664", +"V c #3B36B5", +"W c #3833AF", +"X c #1B1950", +"Y c #247600", +"Z c #0E6D00", +"` c #092300", +" . c #423EA7", +".. c #2F2C7C", +"+. c #4640CA", +"@. c #3732AC", +"#. c #1C1A53", +"$. c #386401", +"%. c #127900", +"&. c #0C4A00", +"*. c #040500", +"=. c #423DA0", +"-. c #3832AE", +";. c #2E2B7A", +">. c #3E39B4", +",. c #1D7B00", +"'. c #0D6600", +"). c #071700", +"!. c #4641AA", +"~. c #2D2A79", +"{. c #332F99", +"]. c #307203", +"^. c #0F7600", +"/. c #0B3A00", +"(. c #4D48C3", +"_. c #2D2A78", +":. c #37339E", +"<. c #3732AB", +"[. c #27246D", +"}. c #3A6B73", +"|. c #4250AA", +"1. c #3E48A3", +"2. c #35347E", +"3. c #4641B5", +"4. c #232257", +"5. c #2E2B83", +"6. c #4D5AB0", +"7. c #423CC9", +"8. c #2B2D7A", +"9. c #212161", +"0. c #332F9C", +"a. c #3B36AD", +"b. c #413CC1", +"c. c #3530A6", +"d. c #14132B", +"e. c #343194", +"f. c #3631A9", +"g. c #3631A2", +"h. c #3B4262", +"i. c #433DCE", +"j. c #1B2444", +"k. c #083400", +"l. c #040600", +"m. c #1E1C48", +"n. c #322E9D", +"o. c #322E92", +"p. c #3F39C5", +"q. c #292673", +"r. c #342F9F", +"s. c #3A38A8", +"t. c #3634A2", +"u. c #093807", +"v. c #061800", +"w. c #342F91", +"x. c #3F3AB4", +"y. c #3C36BA", +"z. c #35309E", +"A. c #121129", +"B. c #2D2A72", +"C. c #3530A4", +"D. c #342FA1", +"E. c #0D2912", +"F. c #010100", +"G. c #423EAC", +"H. c #3530A2", +"I. c #161439", +"J. c #213E3F", +"K. c #2F2C90", +"L. c #2F2C84", +"M. c #4842CF", +"N. c #3732AD", +"O. c #1A183F", +"P. c #297500", +"Q. c #0E7300", +"R. c #114C15", +"S. c #24265C", +"T. c #2F2B8E", +"U. c #3832AD", +"V. c #3C37BC", +"W. c #3B36B2", +"X. c #1E1C4D", +"Y. c #287700", +"Z. c #0D5A00", +"`. c #050800", +" + c #020206", +".+ c #28265F", +"++ c #2E2A7D", +"@+ c #433DD4", +"#+ c #454902", +"$+ c #286800", +"%+ c #147300", +"&+ c #0E6700", +"*+ c #0E6C00", +"=+ c #0C4000", +"-+ c #3732A9", +";+ c #242252", +">+ c #3934AE", +",+ c #080E00", +"'+ c #070F00", +")+ c #050A00", +"!+ c #193400", +"~+ c #0F7000", +"{+ c #0E3500", +"]+ c #342F93", +"^+ c #3732A7", +"/+ c #433DCB", +"(+ c #312D89", +"_+ c #186000", +":+ c #0F3600", +"<+ c #322E95", +"[+ c #3530A7", +"}+ c #3530A8", +"|+ c #302D8E", +"1+ c #0F0E1F", +"2+ c #1F3A00", +"3+ c #123E00", +"4+ c #17163F", +"5+ c #131132", +"6+ c #080812", +"7+ c #192100", +" ", +" . ", +" + @ ", +" # $ % & ", +" * = - ; > , ' ", +" ) ! > > , ~ ", +" { > ] ^ / ", +" ( _ : < < [ } | 1 2 3 4 5 ", +" 6 7 8 9 0 a b c d > e f g ", +" h i j k % ] l ", +" m n o p % , q r ", +" s t u v w > x y z A ", +" B C D E F G H I J K L ", +" M N O P Q > R S T C O U ", +" V W O X Y % Z ` .C O .. ", +" +.@.O #. $.%.> &.*. =.-.O ;. ", +" >.O O #. ,.% '.). !.W O ~. ", +" {.C O #. ].^., /. (.W O _. ", +" :.<.O [. }.|.1.2. 3.<.O 4. ", +" <.O 5. 6.7.8.9.0.a. b.C c.d. ", +" e.f.g.h.i.j.k.l.m.n.o. p.O q. ", +" r.O s.t.u.v. w.O x.y.z.A. ", +" B.C.O D.E.F. G.@.O H.I. ", +" J.K.f.L. M.N.f.O. ", +" P.Q.R.S.T.U.y.V.W.O f.X. ", +" Y.^.> Z.`. + +.+@.O ++ @+ ", +" #+$+%+&+*+> =+ -+O C.;+ >+ ", +" ,+'+)+!+~+{+ ]+f.O ^+/+(+ ", +" _+:+ <+[+}+|+1+ ", +" 2+3+ 4+5+6+ ", +" 7+ ", +" "};