[DebianGIS-dev] r695 - in packages/qgis/trunk: . debian
debian/patches plugins/example plugins/example/.deps
plugins/geoprocessing plugins/grass plugins/maplayer
plugins/maplayer/.deps plugins/spit tools
Francesco Lovergine
frankie at alioth.debian.org
Wed Apr 4 11:05:38 UTC 2007
Author: frankie
Date: 2007-04-04 11:05:37 +0000 (Wed, 04 Apr 2007)
New Revision: 695
Added:
packages/qgis/trunk/debian/
packages/qgis/trunk/debian/changelog
packages/qgis/trunk/debian/compat
packages/qgis/trunk/debian/control
packages/qgis/trunk/debian/copyright
packages/qgis/trunk/debian/docs
packages/qgis/trunk/debian/gridmaker.1
packages/qgis/trunk/debian/libqgis0-dev.README.Debian
packages/qgis/trunk/debian/libqgis0-dev.install
packages/qgis/trunk/debian/libqgis0.install
packages/qgis/trunk/debian/patches/
packages/qgis/trunk/debian/patches/00list
packages/qgis/trunk/debian/patches/gcc41-extra-qualifications.dpatch
packages/qgis/trunk/debian/patches/move-doc-dir.dpatch
packages/qgis/trunk/debian/patches/ogr-path-fix.dpatch
packages/qgis/trunk/debian/patches/remove-empty-readme.dpatch
packages/qgis/trunk/debian/qgis-config.1
packages/qgis/trunk/debian/qgis-icon.xpm
packages/qgis/trunk/debian/qgis-plugin-grass.install
packages/qgis/trunk/debian/qgis.1
packages/qgis/trunk/debian/qgis.dirs
packages/qgis/trunk/debian/qgis.install
packages/qgis/trunk/debian/qgis.links
packages/qgis/trunk/debian/qgis.menu
packages/qgis/trunk/debian/rules
packages/qgis/trunk/plugins/example/.deps/
packages/qgis/trunk/plugins/example/.deps/exampleplugin_la-exampleplugin.Plo
packages/qgis/trunk/plugins/example/.deps/exampleplugin_la-exampleplugin.moc.Plo
packages/qgis/trunk/plugins/example/Makefile
packages/qgis/trunk/plugins/geoprocessing/qgsdlgpgbuffer.moc.cpp
packages/qgis/trunk/plugins/geoprocessing/qgsdlgpgbufferbase.moc.cpp
packages/qgis/trunk/plugins/geoprocessing/qgspggeoprocessing.moc.cpp
packages/qgis/trunk/plugins/grass/qgsgrassattributes.moc.cpp
packages/qgis/trunk/plugins/grass/qgsgrassattributesbase.moc.cpp
packages/qgis/trunk/plugins/grass/qgsgrassedit.moc.cpp
packages/qgis/trunk/plugins/grass/qgsgrasseditbase.moc.cpp
packages/qgis/trunk/plugins/grass/qgsgrassmodule.moc.cpp
packages/qgis/trunk/plugins/grass/qgsgrassmodulebase.moc.cpp
packages/qgis/trunk/plugins/grass/qgsgrassplugin.moc.cpp
packages/qgis/trunk/plugins/grass/qgsgrassregion.moc.cpp
packages/qgis/trunk/plugins/grass/qgsgrassregionbase.moc.cpp
packages/qgis/trunk/plugins/grass/qgsgrassselectbase.moc.cpp
packages/qgis/trunk/plugins/grass/qgsgrasstools.moc.cpp
packages/qgis/trunk/plugins/grass/qgsgrasstoolsbase.moc.cpp
packages/qgis/trunk/plugins/maplayer/.deps/
packages/qgis/trunk/plugins/maplayer/.deps/maplayerplugin_la-maplayertest.Plo
packages/qgis/trunk/plugins/maplayer/.deps/maplayerplugin_la-maplayertest.moc.Plo
packages/qgis/trunk/plugins/maplayer/Makefile
packages/qgis/trunk/plugins/spit/qgsspitplugin.moc.cpp
packages/qgis/trunk/tools/qgis.m4
Modified:
packages/qgis/trunk/config.guess
packages/qgis/trunk/config.sub
Log:
[svn-inject] Applying Debian modifications to trunk
Modified: packages/qgis/trunk/config.guess
===================================================================
--- packages/qgis/trunk/config.guess 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/config.guess 2007-04-04 11:05:37 UTC (rev 695)
@@ -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-04-22'
+timestamp='2006-07-02'
# 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
@@ -17,13 +18,15 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Originally written by Per Bothner <per at bothner.com>.
# Please send patches to <config-patches at gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
@@ -66,11 +69,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -104,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 ; } ;
@@ -123,7 +126,7 @@
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi at noc.rutgers.edu 1994-08-24)
@@ -196,55 +199,23 @@
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
- exit 0 ;;
- amd64:OpenBSD:*:*)
- echo x86_64-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- cats:OpenBSD:*:*)
- echo arm-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- luna88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- macppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvmeppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mips64-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ *:SolidBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
macppc:MirBSD:*:*)
- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
- exit 0 ;;
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -297,40 +268,43 @@
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
+ exit ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
- exit 0 ;;
+ exit ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
- exit 0 ;;
+ exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
- exit 0;;
+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
+ exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
+ exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
- exit 0 ;;
+ exit ;;
*:z/VM:*:*)
echo s390-ibm-zvmoe
- exit 0 ;;
+ exit ;;
*:OS400:*:*)
echo powerpc-ibm-os400
- exit 0 ;;
+ exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
+ exit ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -338,32 +312,32 @@
else
echo pyramid-pyramid-bsd
fi
- exit 0 ;;
+ exit ;;
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
- exit 0 ;;
+ exit ;;
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
- exit 0 ;;
+ exit ;;
DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
+ sparc) echo sparc-icl-nx7; exit ;;
esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
i86pc:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
@@ -372,10 +346,10 @@
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit 0 ;;
+ exit ;;
sun3*:SunOS:*:*)
echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -387,10 +361,10 @@
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
- exit 0 ;;
+ exit ;;
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -401,40 +375,40 @@
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
echo m68k-milan-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
echo m68k-hades-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
- exit 0 ;;
+ exit ;;
RISC*:ULTRIX:*:*)
echo mips-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -458,32 +432,33 @@
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c \
- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c &&
+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`$dummy $dummyarg` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
- exit 0 ;;
+ exit ;;
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
- exit 0 ;;
+ exit ;;
m88k:CX/UX:7*:*)
echo m88k-harris-cxux7
- exit 0 ;;
+ exit ;;
m88k:*:4*:R4*)
echo m88k-motorola-sysv4
- exit 0 ;;
+ exit ;;
m88k:*:3*:R3*)
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -499,29 +474,29 @@
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
- exit 0 ;;
+ exit ;;
M88*:*:R3*:*)
# Delta 88k system running SVR3
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
echo m88k-tektronix-sysv3
- exit 0 ;;
+ exit ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
echo m68k-tektronix-bsd
- exit 0 ;;
+ exit ;;
*:IRIX*:*:*)
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit 0 ;;
+ exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*)
echo i386-ibm-aix
- exit 0 ;;
+ exit ;;
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
@@ -529,7 +504,7 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
@@ -544,14 +519,18 @@
exit(0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo rs6000-ibm-aix3.2.5
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ then
+ echo "$SYSTEM_NAME"
+ else
+ echo rs6000-ibm-aix3.2.5
+ fi
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
else
echo rs6000-ibm-aix3.2
fi
- exit 0 ;;
+ exit ;;
*:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -565,28 +544,28 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
- exit 0 ;;
+ exit ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
- exit 0 ;;
+ exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit 0 ;; # report: romp-ibm BSD 4.3
+ exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
- exit 0 ;;
+ exit ;;
DPX/2?00:B.O.S.:*:*)
echo m68k-bull-sysv3
- exit 0 ;;
+ exit ;;
9000/[34]??:4.3bsd:1.*:*)
echo m68k-hp-bsd
- exit 0 ;;
+ exit ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
- exit 0 ;;
+ exit ;;
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
@@ -648,9 +627,19 @@
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
- # avoid double evaluation of $set_cc_for_build
- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ eval $set_cc_for_build
+
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
+ # generating 64-bit code. GNU and HP use different nomenclature:
+ #
+ # $ CC_FOR_BUILD=cc ./config.guess
+ # => hppa2.0w-hp-hpux11.23
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
@@ -658,11 +647,11 @@
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
ia64:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ia64-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -690,161 +679,179 @@
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
- exit 0 ;;
+ exit ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
echo hppa1.1-hp-bsd
- exit 0 ;;
+ exit ;;
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
- exit 0 ;;
+ exit ;;
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
- exit 0 ;;
+ exit ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
- exit 0 ;;
+ exit ;;
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
- exit 0 ;;
+ exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
echo ${UNAME_MACHINE}-unknown-osf1
fi
- exit 0 ;;
+ exit ;;
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
- exit 0 ;;
+ exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
*:UNICOS/mp:*:*)
echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
+ exit ;;
5000:UNIX_System_V:4.*:*)
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
+ exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sparc*:BSD/OS:*:*)
echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:FreeBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
+ 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 0 ;;
+ exit ;;
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
- exit 0 ;;
+ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
- exit 0 ;;
+ exit ;;
+ x86:Interix*:[3456]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T:Interix*:[3456]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
- exit 0 ;;
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
echo i586-pc-interix
- exit 0 ;;
+ exit ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
- exit 0 ;;
- amd64:CYGWIN*:*:*)
+ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
- exit 0 ;;
+ exit ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
- exit 0 ;;
+ exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
*:GNU:*:*)
# the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
+ exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
- exit 0 ;;
+ exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
- exit 0 ;;
+ exit ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
- exit 0 ;;
+ exit ;;
crisv32:Linux:*:*)
echo crisv32-axis-linux-gnu
- exit 0 ;;
+ exit ;;
frv:Linux:*:*)
echo frv-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
mips:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -861,8 +868,12 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ 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:*:*)
eval $set_cc_for_build
@@ -880,15 +891,22 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ 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:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -902,7 +920,7 @@
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit 0 ;;
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -910,25 +928,28 @@
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
esac
- exit 0 ;;
+ exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
- exit 0 ;;
+ exit ;;
sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
- exit 0 ;;
+ 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
@@ -946,15 +967,15 @@
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0 ;;
+ exit ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0 ;;
+ exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit 0 ;;
+ exit ;;
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
@@ -971,7 +992,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
@@ -981,16 +1002,23 @@
LIBC=dietlibc
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ 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
+ }
+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
# sysname and nodename.
echo i386-sequent-sysv4
- exit 0 ;;
+ exit ;;
i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
@@ -998,27 +1026,27 @@
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
+ exit ;;
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
- exit 0 ;;
+ exit ;;
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
- exit 0 ;;
- i*86:syllable:*:*)
+ exit ;;
+ i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
- exit 0 ;;
+ exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1026,15 +1054,16 @@
else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
- exit 0 ;;
- i*86:*:5:[78]*)
+ exit ;;
+ i*86:*:5:[678]*)
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1052,73 +1081,73 @@
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
- exit 0 ;;
+ exit ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
- exit 0 ;;
+ exit ;;
paragon:*:*:*)
echo i860-intel-osf1
- exit 0 ;;
+ exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
- exit 0 ;;
+ exit ;;
mini*:CTIX:SYS*5:*)
# "miniframe"
echo m68010-convergent-sysv
- exit 0 ;;
+ exit ;;
mc68k:UNIX:SYSTEM5:3.51m)
echo m68k-convergent-sysv
- exit 0 ;;
+ exit ;;
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
- exit 0 ;;
+ exit ;;
M68*:*:R3V[5678]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4 && exit 0 ;;
+ && { echo i486-ncr-sysv4; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
- exit 0 ;;
+ exit ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
RM*:SINIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1126,73 +1155,72 @@
else
echo ns32k-sni-sysv
fi
- exit 0 ;;
+ exit ;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel at ccMail.Census.GOV>
echo i586-unisys-sysv4
- exit 0 ;;
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes at openmarket.com>.
# How about differentiating between stratus architectures? -djm
echo hppa1.1-stratus-sysv4
- exit 0 ;;
+ exit ;;
*:*:*:FTX*)
# From seanf at swdc.stratus.com.
echo i860-stratus-sysv4
- exit 0 ;;
+ exit ;;
i*86:VOS:*:*)
# From Paul.Green at stratus.com.
echo ${UNAME_MACHINE}-stratus-vos
- exit 0 ;;
+ exit ;;
*:VOS:*:*)
# From Paul.Green at stratus.com.
echo hppa1.1-stratus-vos
- exit 0 ;;
+ exit ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
- exit 0 ;;
+ exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
- exit 0 ;;
+ exit ;;
BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
echo powerpc-apple-beos
- exit 0 ;;
+ exit ;;
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
- exit 0 ;;
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*: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}
- exit 0 ;;
+ exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1200,25 +1228,25 @@
UNAME_MACHINE=pc
fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
- exit 0 ;;
+ exit ;;
NSE-?:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
- exit 0 ;;
+ exit ;;
BS2000:POSIX*:*:*)
echo bs2000-siemens-sysv
- exit 0 ;;
+ exit ;;
DS/*:UNIX_System_V:*:*)
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
@@ -1229,41 +1257,47 @@
UNAME_MACHINE="$cputype"
fi
echo ${UNAME_MACHINE}-unknown-plan9
- exit 0 ;;
+ exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
- exit 0 ;;
+ exit ;;
*:TENEX:*:*)
echo pdp10-unknown-tenex
- exit 0 ;;
+ exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
- exit 0 ;;
+ exit ;;
XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
echo pdp10-xkl-tops20
- exit 0 ;;
+ exit ;;
*:TOPS-20:*:*)
echo pdp10-unknown-tops20
- exit 0 ;;
+ exit ;;
*:ITS:*:*)
echo pdp10-unknown-its
- exit 0 ;;
+ exit ;;
SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
+ exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in
- A*) echo alpha-dec-vms && exit 0 ;;
- I*) echo ia64-dec-vms && exit 0 ;;
- V*) echo vax-dec-vms && exit 0 ;;
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+ V*) echo vax-dec-vms ; exit ;;
esac ;;
*:XENIX:*:SysV)
echo i386-pc-xenix
- exit 0 ;;
+ exit ;;
+ 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
@@ -1295,7 +1329,7 @@
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix"); exit (0);
+ printf ("arm-acorn-riscix\n"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
@@ -1384,11 +1418,12 @@
}
EOF
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
# Apollos put the system type in the environment.
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
# Convex versions that predate uname can use getsysinfo(1)
@@ -1397,22 +1432,22 @@
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
c2*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
c34*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
c38*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
c4*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
esac
fi
Modified: packages/qgis/trunk/config.sub
===================================================================
--- packages/qgis/trunk/config.sub 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/config.sub 2007-04-04 11:05:37 UTC (rev 695)
@@ -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-04-22'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +22,15 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Please send patches to <config-patches at gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
#
@@ -83,11 +85,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -99,7 +101,7 @@
*local*)
# First pass through any local machine types.
echo $1
- exit 0;;
+ exit ;;
* )
break ;;
@@ -118,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/'`
;;
@@ -170,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/'`
@@ -186,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/'`
@@ -230,7 +241,7 @@
| 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 \
@@ -238,7 +249,8 @@
| 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 \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -247,6 +259,7 @@
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
@@ -255,21 +268,24 @@
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | mt \
| msp430 \
+ | nios | nios2 \
| ns16k | ns32k \
- | openrisc | or32 \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | 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
;;
@@ -280,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
@@ -299,7 +318,7 @@
| 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-* \
@@ -310,7 +329,7 @@
| 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-* \
@@ -321,6 +340,7 @@
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
@@ -329,24 +349,26 @@
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
+ | 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[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-*)
@@ -686,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
@@ -761,9 +786,8 @@
basic_machine=hppa1.1-oki
os=-proelf
;;
- or32 | or32-*)
+ openrisc | openrisc-*)
basic_machine=or32-unknown
- os=-coff
;;
os400)
basic_machine=powerpc-ibm
@@ -794,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
;;
@@ -850,6 +880,10 @@
basic_machine=i586-unknown
os=-pw32
;;
+ rdos)
+ basic_machine=i386-pc
+ os=-rdos
+ ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@@ -876,6 +910,10 @@
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1089,13 +1127,10 @@
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparc | sparcv8 | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
@@ -1168,20 +1203,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*)
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1199,7 +1237,7 @@
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
@@ -1333,6 +1371,12 @@
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
+ spu-*)
+ os=-elf
+ ;;
*-acorn)
os=-riscix1.2
;;
@@ -1342,9 +1386,9 @@
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
@@ -1388,6 +1432,9 @@
*-be)
os=-beos
;;
+ *-haiku)
+ os=-haiku
+ ;;
*-ibm)
os=-aix
;;
@@ -1559,7 +1606,7 @@
esac
echo $basic_machine$os
-exit 0
+exit
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
Added: packages/qgis/trunk/debian/changelog
===================================================================
--- packages/qgis/trunk/debian/changelog 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/changelog 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,153 @@
+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 <debian at adkgis.org> Sat, 19 Aug 2006 22:13:32 -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 <tbm at cyrius.com> 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 <debian at adkgis.org> 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 <debian at adkgis.org> 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 <debian at adkgis.org> 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 <debian at adkgis.org> 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 <debian at adkgis.org> 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 <debian at adkgis.org> 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 <debian at adkgis.org> 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 <debian at adkgis.org> 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 <debian at adkgis.org> 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 <debian at adkgis.org> 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 <debian at adkgis.org> Mon, 9 Aug 2004 09:15:08 -0400
+
+qgis (0.4.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Steve Halasz <debian at adkgis.org> Fri, 2 Jul 2004 09:36:23 -0400
+
+qgis (0.3.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Steve Halasz <debian at adkgis.org> Wed, 26 May 2004 09:38:22 -0400
+
+qgis (0.2.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Steve Halasz <debian at adkgis.org> 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 <debian at adkgis.org> 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 <debian at adkgis.org> 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 <debian at adkgis.org> Fri, 9 Jan 2004 12:27:07 -0500
+
Added: packages/qgis/trunk/debian/compat
===================================================================
--- packages/qgis/trunk/debian/compat 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/compat 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1 @@
+4
Added: packages/qgis/trunk/debian/control
===================================================================
--- packages/qgis/trunk/debian/control 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/control 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,55 @@
+Source: qgis
+Section: science
+Priority: extra
+Maintainer: Steve Halasz <debian at adkgis.org>
+Build-Depends: debhelper (>= 4.0.0), libgdal1-1.3.2-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), dpatch, grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libmysqlclient15-dev | libmysqlclient14-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: libqgis0
+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: libqgis0-dev
+Architecture: any
+Depends: qgis (= ${Source-Version}), libgdal1-1.3.2-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.3.2-grass
+Description: Plugin for accessing GRASS data from QGIS
+ This plugin enables display of GRASS data layers in the QGIS
+ geographic data viewer.
Added: packages/qgis/trunk/debian/copyright
===================================================================
--- packages/qgis/trunk/debian/copyright 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/copyright 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,20 @@
+This package was debianized by Steve Halasz <debian at adkgis.org> 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.
Added: packages/qgis/trunk/debian/docs
===================================================================
--- packages/qgis/trunk/debian/docs 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/docs 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,4 @@
+AUTHORS
+BUGS
+README
+TODO
Added: packages/qgis/trunk/debian/gridmaker.1
===================================================================
--- packages/qgis/trunk/debian/gridmaker.1 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/gridmaker.1 2007-04-04 11:05:37 UTC (rev 695)
@@ -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.
Added: packages/qgis/trunk/debian/libqgis0-dev.README.Debian
===================================================================
--- packages/qgis/trunk/debian/libqgis0-dev.README.Debian 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/libqgis0-dev.README.Debian 2007-04-04 11:05:37 UTC (rev 695)
@@ -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 <debian at adkgis.org> Thu, 14 Apr 2005 11:03:20 -0400
Added: packages/qgis/trunk/debian/libqgis0-dev.install
===================================================================
--- packages/qgis/trunk/debian/libqgis0-dev.install 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/libqgis0-dev.install 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,20 @@
+usr/bin/qgis-config
+usr/lib/libqgis.*a
+usr/lib/qgis/copyrightlabelplugin.*a
+usr/lib/qgis/delimitedtext*.*a
+usr/lib/qgis/georefplugin.*a
+usr/lib/qgis/gpsimporterplugin.*a
+usr/lib/qgis/gpxprovider.*a
+usr/lib/qgis/grassplugin.*a
+usr/lib/qgis/grassprovider.*a
+usr/lib/qgis/gridmakerplugin.*a
+usr/lib/qgis/libqgsprojectionselector.*a
+usr/lib/qgis/libScaleBarplugin.*a
+usr/lib/qgis/northarrowplugin.*a
+usr/lib/qgis/ogrprovider.*a
+usr/lib/qgis/pggeoprocessingplugin.*a
+usr/lib/qgis/postgresprovider.*a
+usr/lib/qgis/spitplugin.*a
+usr/lib/qgis/designer/*.*a
+usr/include/qgis/*
+usr/share/aclocal/qgis.m4
Added: packages/qgis/trunk/debian/libqgis0.install
===================================================================
--- packages/qgis/trunk/debian/libqgis0.install 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/libqgis0.install 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1 @@
+usr/lib/libqgis.so.*
Added: packages/qgis/trunk/debian/patches/00list
===================================================================
--- packages/qgis/trunk/debian/patches/00list 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/patches/00list 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,5 @@
+gcc41-extra-qualifications
+move-doc-dir
+remove-empty-readme
+ogr-path-fix
+
Added: packages/qgis/trunk/debian/patches/gcc41-extra-qualifications.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/gcc41-extra-qualifications.dpatch 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/patches/gcc41-extra-qualifications.dpatch 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,108 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gcc41-extra-qualifications.dpatch by <debian at adkgis.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove extra qualifications so we can compile with gcc 4.1
+
+ at DPATCH@
+diff -urNad qgis-0.7.4~/plugins/geoprocessing/qgsdlgpgbuffer.h qgis-0.7.4/plugins/geoprocessing/qgsdlgpgbuffer.h
+--- qgis-0.7.4~/plugins/geoprocessing/qgsdlgpgbuffer.h 2006-08-19 22:17:21.000000000 -0400
++++ qgis-0.7.4/plugins/geoprocessing/qgsdlgpgbuffer.h 2006-08-19 22:17:29.000000000 -0400
+@@ -29,7 +29,7 @@
+ //! Constructor
+ QgsDlgPgBuffer( QgisIface * _qI = 0, QWidget * parent = 0, const char *name = 0);
+ //! Destructor
+- QgsDlgPgBuffer::~QgsDlgPgBuffer();
++ ~QgsDlgPgBuffer();
+ //! Set the information label in the dialog
+ void setBufferLabel(QString & lbl);
+ //! Get the buffer distance
+diff -urNad qgis-0.7.4~/plugins/georeferencer/datapointacetate.h qgis-0.7.4/plugins/georeferencer/datapointacetate.h
+--- qgis-0.7.4~/plugins/georeferencer/datapointacetate.h 2005-05-01 16:23:17.000000000 -0400
++++ qgis-0.7.4/plugins/georeferencer/datapointacetate.h 2006-08-19 22:23:15.000000000 -0400
+@@ -13,7 +13,7 @@
+ class DataPointAcetate : public QgsAcetateObject {
+ public:
+
+- DataPointAcetate::DataPointAcetate(const QgsPoint& pixelCoords,
++ DataPointAcetate(const QgsPoint& pixelCoords,
+ const QgsPoint& mapCoords)
+ // UGLY!
+ : QgsAcetateObject(const_cast<QgsPoint&>(pixelCoords)),
+diff -urNad qgis-0.7.4~/plugins/grid_maker/graticulecreator.h qgis-0.7.4/plugins/grid_maker/graticulecreator.h
+--- qgis-0.7.4~/plugins/grid_maker/graticulecreator.h 2006-08-19 22:17:21.000000000 -0400
++++ qgis-0.7.4/plugins/grid_maker/graticulecreator.h 2006-08-19 22:17:29.000000000 -0400
+@@ -19,8 +19,8 @@
+ double theXEndPointDouble,
+ double theYEndPointDouble);
+ ~GraticuleCreator() {};
+- DBFHandle GraticuleCreator::createDbf (QString theDbfName ) ;
+- SHPHandle GraticuleCreator::createShapeFile(QString theFileName );
++ DBFHandle createDbf (QString theDbfName ) ;
++ SHPHandle createShapeFile(QString theFileName );
+ void writeDbfRecord (DBFHandle theDbfHandle, int theRecordIdInt, QString theLabel) ;
+ void writePoint(SHPHandle theShapeHandle, int theRecordInt, double theXDouble, double y );
+ //! Writes a WGS 84 .prj file for the generated grid
+diff -urNad qgis-0.7.4~/providers/gpx/qgsgpxprovider.h qgis-0.7.4/providers/gpx/qgsgpxprovider.h
+--- qgis-0.7.4~/providers/gpx/qgsgpxprovider.h 2005-02-11 18:36:49.000000000 -0500
++++ qgis-0.7.4/providers/gpx/qgsgpxprovider.h 2006-08-19 22:22:21.000000000 -0400
+@@ -142,7 +142,7 @@
+ const std::map<QString, QString>& attrs);
+
+ /** Adds one feature (used by addFeatures()) */
+- bool QgsGPXProvider::addFeature(QgsFeature* f);
++ bool addFeature(QgsFeature* f);
+
+ /**Returns the default value for attribute @c attr for feature @c f. */
+ QString getDefaultValue(const QString& attr, QgsFeature* f);
+diff -urNad qgis-0.7.4~/src/qgslabel.h qgis-0.7.4/src/qgslabel.h
+--- qgis-0.7.4~/src/qgslabel.h 2006-08-19 22:17:21.000000000 -0400
++++ qgis-0.7.4/src/qgslabel.h 2006-08-19 22:17:29.000000000 -0400
+@@ -91,7 +91,7 @@
+ void addRequiredFields ( std::list<int> *fields );
+
+ //! Available vector fields
+- std::vector<QgsField> & QgsLabel::fields ( void );
++ std::vector<QgsField> & fields ( void );
+
+ //! Pointer to default attributes
+ QgsLabelAttributes *layerAttributes ( void );
+diff -urNad qgis-0.7.4~/src/qgsproject.h qgis-0.7.4/src/qgsproject.h
+--- qgis-0.7.4~/src/qgsproject.h 2006-08-19 22:17:21.000000000 -0400
++++ qgis-0.7.4/src/qgsproject.h 2006-08-19 22:17:29.000000000 -0400
+@@ -95,9 +95,9 @@
+ write()
+ */
+ //@{
+- bool QgsProject::dirty() const;
++ bool dirty() const;
+
+- void QgsProject::dirty( bool b );
++ void dirty( bool b );
+ //@}
+
+
+diff -urNad qgis-0.7.4~/src/qgsprojectproperties.h qgis-0.7.4/src/qgsprojectproperties.h
+--- qgis-0.7.4~/src/qgsprojectproperties.h 2006-08-19 22:17:21.000000000 -0400
++++ qgis-0.7.4/src/qgsprojectproperties.h 2006-08-19 22:17:29.000000000 -0400
+@@ -60,7 +60,7 @@
+ /*! Accessor for projection */
+ QString projectionWKT();
+ /*! Indicates that the projection switch is on */
+- bool QgsProjectProperties::isProjected();
++ bool isProjected();
+ public slots:
+ /*!
+ * Slot called when a new button (unit) is selected
+diff -urNad qgis-0.7.4~/src/qgsrasterlayerproperties.h qgis-0.7.4/src/qgsrasterlayerproperties.h
+--- qgis-0.7.4~/src/qgsrasterlayerproperties.h 2006-08-19 22:17:21.000000000 -0400
++++ qgis-0.7.4/src/qgsrasterlayerproperties.h 2006-08-19 22:17:29.000000000 -0400
+@@ -69,7 +69,7 @@
+ /** \brief slot executed when the three band radio button is pressed. */
+ void rbtnThreeBand_toggled( bool );
+ /** \brief slot executed when user wishes to refresh raster histogram */
+- void QgsRasterLayerProperties::pbnHistRefresh_clicked();
++ void pbnHistRefresh_clicked();
+ /** Override the SRS specified when the layer was loaded */
+ void pbnChangeSpatialRefSys_clicked();
+
Property changes on: packages/qgis/trunk/debian/patches/gcc41-extra-qualifications.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/qgis/trunk/debian/patches/move-doc-dir.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/move-doc-dir.dpatch 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/patches/move-doc-dir.dpatch 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,173 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## move-doc-dir.dpatch by <debian at adkgis.org>
+##
+## 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.
+
+ at DPATCH@
+diff -urNad qgis-0.7.4~/doc/Makefile.am qgis-0.7.4/doc/Makefile.am
+--- qgis-0.7.4~/doc/Makefile.am 2006-04-08 17:00:19.000000000 -0400
++++ qgis-0.7.4/doc/Makefile.am 2006-04-08 17:01:59.000000000 -0400
+@@ -8,7 +8,7 @@
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+-docdatadir = $(datadir)/$(PACKAGE)/doc
++docdatadir = $(datadir)/doc/$(PACKAGE)
+
+ docdata_DATA = \
+ favicon.ico \
+diff -urNad qgis-0.7.4~/doc/Makefile.in qgis-0.7.4/doc/Makefile.in
+--- qgis-0.7.4~/doc/Makefile.in 2006-04-08 17:00:19.000000000 -0400
++++ qgis-0.7.4/doc/Makefile.in 2006-04-08 17:02:49.000000000 -0400
+@@ -213,7 +213,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-docdatadir = $(datadir)/$(PACKAGE)/doc
++docdatadir = $(datadir)/doc/$(PACKAGE)
+ docdata_DATA = \
+ favicon.ico \
+ images \
+@@ -222,7 +222,7 @@
+ install.pdf \
+ plugins \
+ qgisdoc.css \
+- README \
++ README \
+ userguide.pdf
+
+
+diff -urNad qgis-0.7.4~/doc/images/Makefile.am qgis-0.7.4/doc/images/Makefile.am
+--- qgis-0.7.4~/doc/images/Makefile.am 2006-04-08 17:00:19.000000000 -0400
++++ qgis-0.7.4/doc/images/Makefile.am 2006-04-08 17:01:59.000000000 -0400
+@@ -8,7 +8,7 @@
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+-docdatadir = $(datadir)/$(PACKAGE)/doc/images
++docdatadir = $(datadir)/doc/$(PACKAGE)/images
+
+ docdata_DATA = qgis_new_80pct.png
+
+diff -urNad qgis-0.7.4~/doc/images/Makefile.in qgis-0.7.4/doc/images/Makefile.in
+--- qgis-0.7.4~/doc/images/Makefile.in 2006-04-08 17:00:19.000000000 -0400
++++ qgis-0.7.4/doc/images/Makefile.in 2006-04-08 17:01:59.000000000 -0400
+@@ -204,7 +204,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-docdatadir = $(datadir)/$(PACKAGE)/doc/images
++docdatadir = $(datadir)/doc/$(PACKAGE)/images
+ docdata_DATA = qgis_new_80pct.png
+
+ # generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)# \1 \\#'
+diff -urNad qgis-0.7.4~/doc/install_guide/Makefile.am qgis-0.7.4/doc/install_guide/Makefile.am
+--- qgis-0.7.4~/doc/install_guide/Makefile.am 2006-04-08 17:00:19.000000000 -0400
++++ qgis-0.7.4/doc/install_guide/Makefile.am 2006-04-08 17:01:59.000000000 -0400
+@@ -8,7 +8,7 @@
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+-docdatadir = $(datadir)/$(PACKAGE)/doc/install_guide
++docdatadir = $(datadir)/doc/$(PACKAGE)/install_guide
+
+ docdata_DATA = \
+ contents.png \
+diff -urNad qgis-0.7.4~/doc/install_guide/Makefile.in qgis-0.7.4/doc/install_guide/Makefile.in
+--- qgis-0.7.4~/doc/install_guide/Makefile.in 2006-04-08 17:00:19.000000000 -0400
++++ qgis-0.7.4/doc/install_guide/Makefile.in 2006-04-08 17:01:59.000000000 -0400
+@@ -204,7 +204,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-docdatadir = $(datadir)/$(PACKAGE)/doc/install_guide
++docdatadir = $(datadir)/doc/$(PACKAGE)/install_guide
+ docdata_DATA = \
+ contents.png \
+ index.html \
+diff -urNad qgis-0.7.4~/doc/plugins/delimited_text/Makefile.am qgis-0.7.4/doc/plugins/delimited_text/Makefile.am
+--- qgis-0.7.4~/doc/plugins/delimited_text/Makefile.am 2006-04-08 17:00:19.000000000 -0400
++++ qgis-0.7.4/doc/plugins/delimited_text/Makefile.am 2006-04-08 17:01:59.000000000 -0400
+@@ -8,7 +8,7 @@
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+-docdatadir = $(datadir)/$(PACKAGE)/doc/plugins/delimited_text
++docdatadir = $(datadir)/doc/$(PACKAGE)/plugins/delimited_text
+
+ docdata_DATA = \
+ index.html \
+diff -urNad qgis-0.7.4~/doc/plugins/delimited_text/Makefile.in qgis-0.7.4/doc/plugins/delimited_text/Makefile.in
+--- qgis-0.7.4~/doc/plugins/delimited_text/Makefile.in 2006-04-08 17:00:19.000000000 -0400
++++ qgis-0.7.4/doc/plugins/delimited_text/Makefile.in 2006-04-08 17:01:59.000000000 -0400
+@@ -204,7 +204,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-docdatadir = $(datadir)/$(PACKAGE)/doc/plugins/delimited_text
++docdatadir = $(datadir)/doc/$(PACKAGE)/plugins/delimited_text
+ docdata_DATA = \
+ index.html \
+ dialog.png \
+diff -urNad qgis-0.7.4~/doc/plugins/geoprocessing/buffer/Makefile.am qgis-0.7.4/doc/plugins/geoprocessing/buffer/Makefile.am
+--- qgis-0.7.4~/doc/plugins/geoprocessing/buffer/Makefile.am 2006-04-08 17:00:19.000000000 -0400
++++ qgis-0.7.4/doc/plugins/geoprocessing/buffer/Makefile.am 2006-04-08 17:01:59.000000000 -0400
+@@ -8,7 +8,7 @@
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+-docdatadir = $(datadir)/$(PACKAGE)/doc/plugins/geoprocessing/buffer
++docdatadir = $(datadir)/doc/$(PACKAGE)/plugins/geoprocessing/buffer
+
+ docdata_DATA = \
+ alaska_pglayer.png \
+diff -urNad qgis-0.7.4~/doc/plugins/geoprocessing/buffer/Makefile.in qgis-0.7.4/doc/plugins/geoprocessing/buffer/Makefile.in
+--- qgis-0.7.4~/doc/plugins/geoprocessing/buffer/Makefile.in 2006-04-08 17:00:19.000000000 -0400
++++ qgis-0.7.4/doc/plugins/geoprocessing/buffer/Makefile.in 2006-04-08 17:01:59.000000000 -0400
+@@ -204,7 +204,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-docdatadir = $(datadir)/$(PACKAGE)/doc/plugins/geoprocessing/buffer
++docdatadir = $(datadir)/doc/$(PACKAGE)/plugins/geoprocessing/buffer
+ docdata_DATA = \
+ alaska_pglayer.png \
+ buffer.png \
+diff -urNad qgis-0.7.4~/src/qgisapp.cpp qgis-0.7.4/src/qgisapp.cpp
+--- qgis-0.7.4~/src/qgisapp.cpp 2006-04-08 17:00:19.000000000 -0400
++++ qgis-0.7.4/src/qgisapp.cpp 2006-04-08 17:01:59.000000000 -0400
+@@ -4031,7 +4031,7 @@
+ // open help in user browser
+ if (useQgisDocDirectory)
+ {
+- url = "file://" + mAppDir + "/share/qgis/doc/" + url;
++ url = "file://" + mAppDir + "/share/doc/qgis/" + url;
+ }
+ #ifdef Q_OS_MACX
+ /* Use Mac OS X Launch Services which uses the user's default browser
+@@ -4084,7 +4084,7 @@
+ helpProcess->start();
+ }
+ /* mHelpViewer = new QgsHelpViewer(this,"helpviewer",false);
+- mHelpViewer->showContent(mAppDir +"/share/doc","index.html");
++ mHelpViewer->showContent(mAppDir +"/share/doc/qgis","index.html");
+ mHelpViewer->show(); */
+ #endif
+ }
+diff -urNad qgis-0.7.4~/src/qgsoptionsbase.ui qgis-0.7.4/src/qgsoptionsbase.ui
+--- qgis-0.7.4~/src/qgsoptionsbase.ui 2006-04-08 17:00:19.000000000 -0400
++++ qgis-0.7.4/src/qgsoptionsbase.ui 2006-04-08 17:01:59.000000000 -0400
+@@ -528,6 +528,11 @@
+ <widget class="QComboBox" row="0" column="1">
+ <item>
+ <property name="text">
++ <string>sensible-browser</string>
++ </property>
++ </item>
++ <item>
++ <property name="text">
+ <string>epiphany</string>
+ </property>
+ </item>
Property changes on: packages/qgis/trunk/debian/patches/move-doc-dir.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/qgis/trunk/debian/patches/ogr-path-fix.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/ogr-path-fix.dpatch 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/patches/ogr-path-fix.dpatch 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ogr-path-fix.dpatch by <debian at adkgis.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad qgis-0.7.4~/src/qgisapp.cpp qgis-0.7.4/src/qgisapp.cpp
+--- qgis-0.7.4~/src/qgisapp.cpp 2005-11-01 19:59:37.000000000 -0500
++++ qgis-0.7.4/src/qgisapp.cpp 2006-04-07 16:50:06.000000000 -0400
+@@ -1926,9 +1926,9 @@
+ filename = openFileDialog->selectedFile();
+ enc = openFileDialog->encoding();
+
+- settings.writeEntry("/qgis/UI//lastVectorFileFilter", openFileDialog->selectedFilter());
++ settings.writeEntry("/qgis/UI/lastVectorFileFilter", openFileDialog->selectedFilter());
+
+- settings.writeEntry("/qgis/UI//lastVectorFileFilterDir", openFileDialog->dirPath());
++ settings.writeEntry("/qgis/UI/lastVectorFileFilterDir", openFileDialog->dirPath());
+ settings.writeEntry("/qgis/UI/encoding", openFileDialog->encoding());
+
+ delete openFileDialog;
Property changes on: packages/qgis/trunk/debian/patches/ogr-path-fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/qgis/trunk/debian/patches/remove-empty-readme.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/remove-empty-readme.dpatch 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/patches/remove-empty-readme.dpatch 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove-empty-readme.dpatch by <debian at adkgis.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't install this README which essentially has nothing in it
+
+ at DPATCH@
+diff -urNad qgis-0.7.4~/doc/Makefile.am qgis-0.7.4/doc/Makefile.am
+--- qgis-0.7.4~/doc/Makefile.am 2006-04-08 17:03:34.000000000 -0400
++++ qgis-0.7.4/doc/Makefile.am 2006-04-08 17:03:35.000000000 -0400
+@@ -18,7 +18,6 @@
+ install.pdf \
+ plugins \
+ qgisdoc.css \
+- README \
+ userguide.pdf
+
+ # generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)# \1 \\#'
+diff -urNad qgis-0.7.4~/doc/Makefile.in qgis-0.7.4/doc/Makefile.in
+--- qgis-0.7.4~/doc/Makefile.in 2006-04-08 17:03:34.000000000 -0400
++++ qgis-0.7.4/doc/Makefile.in 2006-04-08 17:03:50.000000000 -0400
+@@ -222,7 +222,6 @@
+ install.pdf \
+ plugins \
+ qgisdoc.css \
+- README \
+ userguide.pdf
+
+
Property changes on: packages/qgis/trunk/debian/patches/remove-empty-readme.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/qgis/trunk/debian/qgis-config.1
===================================================================
--- packages/qgis/trunk/debian/qgis-config.1 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/qgis-config.1 2007-04-04 11:05:37 UTC (rev 695)
@@ -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
Added: packages/qgis/trunk/debian/qgis-icon.xpm
===================================================================
--- packages/qgis/trunk/debian/qgis-icon.xpm 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/qgis-icon.xpm 2007-04-04 11:05:37 UTC (rev 695)
@@ -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 .. ",
+" +. at .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. at .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.`. + +.+ at .O ++ @+ ",
+" #+$+%+&+*+> =+ -+O C.;+ >+ ",
+" ,+'+)+!+~+{+ ]+f.O ^+/+(+ ",
+" _+:+ <+[+}+|+1+ ",
+" 2+3+ 4+5+6+ ",
+" 7+ ",
+" "};
Added: packages/qgis/trunk/debian/qgis-plugin-grass.install
===================================================================
--- packages/qgis/trunk/debian/qgis-plugin-grass.install 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/qgis-plugin-grass.install 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,4 @@
+usr/lib/libqgisgrass.so.*
+usr/lib/qgis/grassplugin.so
+usr/lib/qgis/grassprovider.so
+usr/share/qgis/grass/*
Added: packages/qgis/trunk/debian/qgis.1
===================================================================
--- packages/qgis/trunk/debian/qgis.1 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/qgis.1 2007-04-04 11:05:37 UTC (rev 695)
@@ -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 <n> 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 <debian at adkgis.org>,
+for the Debian project (but may be used by others).
Added: packages/qgis/trunk/debian/qgis.dirs
===================================================================
--- packages/qgis/trunk/debian/qgis.dirs 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/qgis.dirs 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1 @@
+usr/share/pixmaps
Added: packages/qgis/trunk/debian/qgis.install
===================================================================
--- packages/qgis/trunk/debian/qgis.install 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/qgis.install 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,25 @@
+usr/bin/gridmaker
+usr/bin/qgis
+usr/lib/qgis/copyrightlabelplugin.so
+usr/lib/qgis/delimitedtext*.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/libScaleBarplugin.so
+usr/lib/qgis/northarrowplugin.so
+usr/lib/qgis/ogrprovider.so
+usr/lib/qgis/pggeoprocessingplugin.so
+usr/lib/qgis/postgresprovider.so
+usr/lib/qgis/spitplugin.so
+usr/lib/qgis/designer/*.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/*
Added: packages/qgis/trunk/debian/qgis.links
===================================================================
--- packages/qgis/trunk/debian/qgis.links 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/qgis.links 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1 @@
+usr/lib/libqgis.so.0.0.1 usr/lib/libqgis.so
Added: packages/qgis/trunk/debian/qgis.menu
===================================================================
--- packages/qgis/trunk/debian/qgis.menu 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/qgis.menu 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,3 @@
+?package(qgis):needs="X11" section="Apps/Science"\
+ icon="/usr/share/pixmaps/qgis-icon.xpm" title="QGIS"\
+ command="/usr/bin/qgis"
Added: packages/qgis/trunk/debian/rules
===================================================================
--- packages/qgis/trunk/debian/rules 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/debian/rules 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,113 @@
+#!/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/qt3 \
+ --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 -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/qgis/usr/share/pixmaps
+
+
+# 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
Property changes on: packages/qgis/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/qgis/trunk/plugins/example/.deps/exampleplugin_la-exampleplugin.Plo
===================================================================
--- packages/qgis/trunk/plugins/example/.deps/exampleplugin_la-exampleplugin.Plo 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/example/.deps/exampleplugin_la-exampleplugin.Plo 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1 @@
+# dummy
Added: packages/qgis/trunk/plugins/example/.deps/exampleplugin_la-exampleplugin.moc.Plo
===================================================================
--- packages/qgis/trunk/plugins/example/.deps/exampleplugin_la-exampleplugin.moc.Plo 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/example/.deps/exampleplugin_la-exampleplugin.moc.Plo 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1 @@
+# dummy
Added: packages/qgis/trunk/plugins/example/Makefile
===================================================================
--- packages/qgis/trunk/plugins/example/Makefile 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/example/Makefile 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,582 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# plugins/example/Makefile. Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+# Copyright (C) 2003 Gary Sherman <sherman at mrcc.com>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+SOURCES = $(exampleplugin_la_SOURCES) $(nodist_exampleplugin_la_SOURCES)
+
+srcdir = .
+top_srcdir = ../..
+
+pkgdatadir = $(datadir)/qgis
+pkglibdir = $(libdir)/qgis
+pkgincludedir = $(includedir)/qgis
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = i486-pc-linux-gnu
+subdir = plugins/example
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/qgsconfig.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(plugindir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+exampleplugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__objects_1 =
+am_exampleplugin_la_OBJECTS = exampleplugin_la-exampleplugin.lo \
+ $(am__objects_1)
+am__objects_2 = exampleplugin_la-exampleplugin.moc.lo
+nodist_exampleplugin_la_OBJECTS = $(am__objects_2)
+exampleplugin_la_OBJECTS = $(am_exampleplugin_la_OBJECTS) \
+ $(nodist_exampleplugin_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+DEP_FILES = \
+ ./$(DEPDIR)/exampleplugin_la-exampleplugin.Plo \
+ ./$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Plo
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(exampleplugin_la_SOURCES) \
+ $(nodist_exampleplugin_la_SOURCES)
+DIST_SOURCES = $(exampleplugin_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = ${SHELL} /home/steve/projects/qgis/debian/qgis-0.7.4/missing --run aclocal-1.8
+AMDEP_FALSE = #
+AMDEP_TRUE =
+AMTAR = ${SHELL} /home/steve/projects/qgis/debian/qgis-0.7.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /home/steve/projects/qgis/debian/qgis-0.7.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/steve/projects/qgis/debian/qgis-0.7.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/steve/projects/qgis/debian/qgis-0.7.4/missing --run automake-1.8
+AWK = gawk
+CC = ccache gcc
+CCDEPMODE = depmode=gcc3
+CFLAGS = -Wall -g -O2
+CPP = ccache gcc -E
+CPPFLAGS =
+CXX = ccache g++
+CXXCPP = ccache g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEBUG_QGIS = -DNO_DEBUG
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+ECHO = echo
+ECHO_C =
+ECHO_N = -n
+ECHO_T =
+EGREP = grep -E
+EXEEXT =
+EXTRA_VERSION = 0
+F77 =
+FFLAGS =
+GDAL_CFLAGS = -I/tmp/buildd/gdal-1.3.2/debian/tmp/usr/include
+GDAL_CONFIG = /usr/bin/gdal-config
+GDAL_LDADD = -L/tmp/buildd/gdal-1.3.2/debian/tmp/usr/lib -lgdal1.3.2
+GEOS_CFLAGS = -I/usr/include
+GEOS_CONFIG = /usr/bin/geos-config
+GEOS_LDADD = -L/usr/lib -lgeos
+GRASS_BASE = /usr/lib/grass
+GRASS_INC = /usr/lib/grass/include/
+GRASS_LIB = -L/usr/lib/grass/lib -lgrass_vect -lgrass_dig2 -lgrass_dbmiclient -lgrass_dbmibase -lgrass_shape -lgrass_dgl -lgrass_rtree -lgrass_gis -lgrass_datetime -lgrass_linkm -lgrass_form -lgrass_gproj
+GSL_CFLAGS = -I/usr/include
+GSL_CONFIG = /usr/bin/gsl-config
+GSL_LIBS = -L/usr/lib -lgsl -lgslcblas -lm
+HAVE_EXPAT_FALSE = #
+HAVE_EXPAT_TRUE =
+HAVE_GRASS = 1
+HAVE_GRASS_FALSE = #
+HAVE_GRASS_TRUE =
+HAVE_GSL_FALSE = #
+HAVE_GSL_TRUE =
+HAVE_POSTGRESQL_FALSE = #
+HAVE_POSTGRESQL_TRUE =
+HAVE_QTMAC_FALSE =
+HAVE_QTMAC_TRUE = #
+HAVE_SPIT_FALSE = #
+HAVE_SPIT_TRUE =
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+INTERFACE_VERSION = 0:1:0
+LDFLAGS =
+LIBOBJS =
+LIBS =
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LN_S = ln -s
+LTLIBOBJS =
+MAJOR_VERSION = 0
+MAKEINFO = ${SHELL} /home/steve/projects/qgis/debian/qgis-0.7.4/missing --run makeinfo
+MICRO_VERSION = 4
+MINOR_VERSION = 7
+MOC = moc
+OBJEXT = o
+PACKAGE = qgis
+PACKAGE_BUGREPORT =
+PACKAGE_NAME =
+PACKAGE_STRING =
+PACKAGE_TARNAME =
+PACKAGE_VERSION =
+PATH_SEPARATOR = :
+PG_CONFIG = /usr/bin/pg_config
+PG_INC = -I/usr/include/postgresql
+PG_LIB = -L/usr/lib -lpq
+PROJ_INC =
+PROJ_LIB = -lproj
+QASSISTANTCLIENT_LDADD = -lqassistantclient
+QEMBED = qembed
+QTDIR = /usr/share/qt3
+QT_CXXFLAGS = -I/usr/share/qt3/include -D_REENTRANT -DQT_THREAD_SUPPORT
+QT_GUILINK =
+QT_LDADD = -L/usr/share/qt3/lib -lqt-mt
+RANLIB = ranlib
+SET_MAKE =
+SHELL = /bin/sh
+SQLITE3_INC =
+SQLITE3_LIB = -lsqlite3
+STRIP = strip
+UIC = uic
+VERSION = 0.7.4
+WITH_COMMUNITY_FALSE =
+WITH_COMMUNITY_TRUE = #
+ac_ct_AR = ar
+ac_ct_CC =
+ac_ct_CXX =
+ac_ct_F77 =
+ac_ct_RANLIB = ranlib
+ac_ct_STRIP = strip
+ac_prefix_program =
+am__fastdepCC_FALSE = #
+am__fastdepCC_TRUE =
+am__fastdepCXX_FALSE = #
+am__fastdepCXX_TRUE =
+am__include = include
+am__leading_dot = .
+am__quote =
+bindir = ${exec_prefix}/bin
+build = i486-pc-linux-gnu
+build_alias = i486-linux-gnu
+build_cpu = i486
+build_os = linux-gnu
+build_vendor = pc
+datadir = ${prefix}/share
+exec_prefix = ${prefix}
+host = i486-pc-linux-gnu
+host_alias = i486-linux-gnu
+host_cpu = i486
+host_os = linux-gnu
+host_vendor = pc
+includedir = ${prefix}/include
+infodir = ${prefix}/share/info
+install_sh = /home/steve/projects/qgis/debian/qgis-0.7.4/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localstatedir = ${prefix}/var
+mandir = ${prefix}/share/man
+mkdir_p = mkdir -p -- .
+oldincludedir = /usr/include
+prefix = /usr
+program_transform_name = s,x,x,
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+sysconfdir = ${prefix}/etc
+target_alias =
+plugindir = ${pkglibdir}
+plugin_LTLIBRARIES = exampleplugin.la
+exampleplugin_la_SOURCES = exampleplugin.cpp \
+ $(example_UI)
+
+nodist_exampleplugin_la_SOURCES = $(example_MOC)
+example_MOC = exampleplugin.moc.cpp
+example_UI =
+
+# UI dependencies
+exampleplugin_la_LIBADD = $(QT_LDADD)
+exampleplugin_la_LDFLAGS = -avoid-version -module
+exampleplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I../../src
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/example/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign plugins/example/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
+ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-pluginLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+ done
+
+clean-pluginLTLIBRARIES:
+ -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
+ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+exampleplugin.la: $(exampleplugin_la_OBJECTS) $(exampleplugin_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(plugindir) $(exampleplugin_la_LDFLAGS) $(exampleplugin_la_OBJECTS) $(exampleplugin_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+include ./$(DEPDIR)/exampleplugin_la-exampleplugin.Plo
+include ./$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Plo
+
+.cpp.o:
+ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+# source='$<' object='$@' libtool=no \
+# depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+# source='$<' object='$@' libtool=no \
+# depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+# source='$<' object='$@' libtool=yes \
+# depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(LTCXXCOMPILE) -c -o $@ $<
+
+exampleplugin_la-exampleplugin.o: exampleplugin.cpp
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(exampleplugin_la_CXXFLAGS) $(CXXFLAGS) -MT exampleplugin_la-exampleplugin.o -MD -MP -MF "$(DEPDIR)/exampleplugin_la-exampleplugin.Tpo" -c -o exampleplugin_la-exampleplugin.o `test -f 'exampleplugin.cpp' || echo '$(srcdir)/'`exampleplugin.cpp; \
+ then mv -f "$(DEPDIR)/exampleplugin_la-exampleplugin.Tpo" "$(DEPDIR)/exampleplugin_la-exampleplugin.Po"; else rm -f "$(DEPDIR)/exampleplugin_la-exampleplugin.Tpo"; exit 1; fi
+# source='exampleplugin.cpp' object='exampleplugin_la-exampleplugin.o' libtool=no \
+# depfile='$(DEPDIR)/exampleplugin_la-exampleplugin.Po' tmpdepfile='$(DEPDIR)/exampleplugin_la-exampleplugin.TPo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(exampleplugin_la_CXXFLAGS) $(CXXFLAGS) -c -o exampleplugin_la-exampleplugin.o `test -f 'exampleplugin.cpp' || echo '$(srcdir)/'`exampleplugin.cpp
+
+exampleplugin_la-exampleplugin.obj: exampleplugin.cpp
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(exampleplugin_la_CXXFLAGS) $(CXXFLAGS) -MT exampleplugin_la-exampleplugin.obj -MD -MP -MF "$(DEPDIR)/exampleplugin_la-exampleplugin.Tpo" -c -o exampleplugin_la-exampleplugin.obj `if test -f 'exampleplugin.cpp'; then $(CYGPATH_W) 'exampleplugin.cpp'; else $(CYGPATH_W) '$(srcdir)/exampleplugin.cpp'; fi`; \
+ then mv -f "$(DEPDIR)/exampleplugin_la-exampleplugin.Tpo" "$(DEPDIR)/exampleplugin_la-exampleplugin.Po"; else rm -f "$(DEPDIR)/exampleplugin_la-exampleplugin.Tpo"; exit 1; fi
+# source='exampleplugin.cpp' object='exampleplugin_la-exampleplugin.obj' libtool=no \
+# depfile='$(DEPDIR)/exampleplugin_la-exampleplugin.Po' tmpdepfile='$(DEPDIR)/exampleplugin_la-exampleplugin.TPo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(exampleplugin_la_CXXFLAGS) $(CXXFLAGS) -c -o exampleplugin_la-exampleplugin.obj `if test -f 'exampleplugin.cpp'; then $(CYGPATH_W) 'exampleplugin.cpp'; else $(CYGPATH_W) '$(srcdir)/exampleplugin.cpp'; fi`
+
+exampleplugin_la-exampleplugin.lo: exampleplugin.cpp
+ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(exampleplugin_la_CXXFLAGS) $(CXXFLAGS) -MT exampleplugin_la-exampleplugin.lo -MD -MP -MF "$(DEPDIR)/exampleplugin_la-exampleplugin.Tpo" -c -o exampleplugin_la-exampleplugin.lo `test -f 'exampleplugin.cpp' || echo '$(srcdir)/'`exampleplugin.cpp; \
+ then mv -f "$(DEPDIR)/exampleplugin_la-exampleplugin.Tpo" "$(DEPDIR)/exampleplugin_la-exampleplugin.Plo"; else rm -f "$(DEPDIR)/exampleplugin_la-exampleplugin.Tpo"; exit 1; fi
+# source='exampleplugin.cpp' object='exampleplugin_la-exampleplugin.lo' libtool=yes \
+# depfile='$(DEPDIR)/exampleplugin_la-exampleplugin.Plo' tmpdepfile='$(DEPDIR)/exampleplugin_la-exampleplugin.TPlo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(exampleplugin_la_CXXFLAGS) $(CXXFLAGS) -c -o exampleplugin_la-exampleplugin.lo `test -f 'exampleplugin.cpp' || echo '$(srcdir)/'`exampleplugin.cpp
+
+exampleplugin_la-exampleplugin.moc.o: exampleplugin.moc.cpp
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(exampleplugin_la_CXXFLAGS) $(CXXFLAGS) -MT exampleplugin_la-exampleplugin.moc.o -MD -MP -MF "$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Tpo" -c -o exampleplugin_la-exampleplugin.moc.o `test -f 'exampleplugin.moc.cpp' || echo '$(srcdir)/'`exampleplugin.moc.cpp; \
+ then mv -f "$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Tpo" "$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Po"; else rm -f "$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Tpo"; exit 1; fi
+# source='exampleplugin.moc.cpp' object='exampleplugin_la-exampleplugin.moc.o' libtool=no \
+# depfile='$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Po' tmpdepfile='$(DEPDIR)/exampleplugin_la-exampleplugin.moc.TPo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(exampleplugin_la_CXXFLAGS) $(CXXFLAGS) -c -o exampleplugin_la-exampleplugin.moc.o `test -f 'exampleplugin.moc.cpp' || echo '$(srcdir)/'`exampleplugin.moc.cpp
+
+exampleplugin_la-exampleplugin.moc.obj: exampleplugin.moc.cpp
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(exampleplugin_la_CXXFLAGS) $(CXXFLAGS) -MT exampleplugin_la-exampleplugin.moc.obj -MD -MP -MF "$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Tpo" -c -o exampleplugin_la-exampleplugin.moc.obj `if test -f 'exampleplugin.moc.cpp'; then $(CYGPATH_W) 'exampleplugin.moc.cpp'; else $(CYGPATH_W) '$(srcdir)/exampleplugin.moc.cpp'; fi`; \
+ then mv -f "$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Tpo" "$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Po"; else rm -f "$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Tpo"; exit 1; fi
+# source='exampleplugin.moc.cpp' object='exampleplugin_la-exampleplugin.moc.obj' libtool=no \
+# depfile='$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Po' tmpdepfile='$(DEPDIR)/exampleplugin_la-exampleplugin.moc.TPo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(exampleplugin_la_CXXFLAGS) $(CXXFLAGS) -c -o exampleplugin_la-exampleplugin.moc.obj `if test -f 'exampleplugin.moc.cpp'; then $(CYGPATH_W) 'exampleplugin.moc.cpp'; else $(CYGPATH_W) '$(srcdir)/exampleplugin.moc.cpp'; fi`
+
+exampleplugin_la-exampleplugin.moc.lo: exampleplugin.moc.cpp
+ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(exampleplugin_la_CXXFLAGS) $(CXXFLAGS) -MT exampleplugin_la-exampleplugin.moc.lo -MD -MP -MF "$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Tpo" -c -o exampleplugin_la-exampleplugin.moc.lo `test -f 'exampleplugin.moc.cpp' || echo '$(srcdir)/'`exampleplugin.moc.cpp; \
+ then mv -f "$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Tpo" "$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Plo"; else rm -f "$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Tpo"; exit 1; fi
+# source='exampleplugin.moc.cpp' object='exampleplugin_la-exampleplugin.moc.lo' libtool=yes \
+# depfile='$(DEPDIR)/exampleplugin_la-exampleplugin.moc.Plo' tmpdepfile='$(DEPDIR)/exampleplugin_la-exampleplugin.moc.TPlo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(exampleplugin_la_CXXFLAGS) $(CXXFLAGS) -c -o exampleplugin_la-exampleplugin.moc.lo `test -f 'exampleplugin.moc.cpp' || echo '$(srcdir)/'`exampleplugin.moc.cpp
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+ for dir in "$(DESTDIR)$(plugindir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pluginLTLIBRARIES
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pluginLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-pluginLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am \
+ uninstall-pluginLTLIBRARIES
+
+%.moc.cpp: %.h
+ $(MOC) -o $@ $<
+
+%.h: %.ui
+ $(UIC) -o $@ $<
+
+%.cpp: %.ui
+ $(UIC) -o $@ -impl $*.h $<
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: packages/qgis/trunk/plugins/geoprocessing/qgsdlgpgbuffer.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/geoprocessing/qgsdlgpgbuffer.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/geoprocessing/qgsdlgpgbuffer.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,101 @@
+/****************************************************************************
+** QgsDlgPgBuffer meta object code from reading C++ file 'qgsdlgpgbuffer.h'
+**
+** Created: Fri Aug 25 12:26:30 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.6 edited Mar 8 17:43 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsdlgpgbuffer.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.6. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsDlgPgBuffer::className() const
+{
+ return "QgsDlgPgBuffer";
+}
+
+QMetaObject *QgsDlgPgBuffer::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsDlgPgBuffer( "QgsDlgPgBuffer", &QgsDlgPgBuffer::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsDlgPgBuffer::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsDlgPgBuffer", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsDlgPgBuffer::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsDlgPgBuffer", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsDlgPgBuffer::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QgsDlgPgBufferBase::staticMetaObject();
+ static const QUMethod slot_0 = {"help", 0, 0 };
+ static const QMetaData slot_tbl[] = {
+ { "help()", &slot_0, QMetaData::Public }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsDlgPgBuffer", parentObject,
+ slot_tbl, 1,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsDlgPgBuffer.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsDlgPgBuffer::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsDlgPgBuffer" ) )
+ return this;
+ return QgsDlgPgBufferBase::qt_cast( clname );
+}
+
+bool QgsDlgPgBuffer::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: help(); break;
+ default:
+ return QgsDlgPgBufferBase::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsDlgPgBuffer::qt_emit( int _id, QUObject* _o )
+{
+ return QgsDlgPgBufferBase::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsDlgPgBuffer::qt_property( int id, int f, QVariant* v)
+{
+ return QgsDlgPgBufferBase::qt_property( id, f, v);
+}
+
+bool QgsDlgPgBuffer::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/geoprocessing/qgsdlgpgbufferbase.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/geoprocessing/qgsdlgpgbufferbase.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/geoprocessing/qgsdlgpgbufferbase.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,104 @@
+/****************************************************************************
+** QgsDlgPgBufferBase meta object code from reading C++ file 'qgsdlgpgbufferbase.h'
+**
+** Created: Fri Apr 7 17:17:58 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsdlgpgbufferbase.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsDlgPgBufferBase::className() const
+{
+ return "QgsDlgPgBufferBase";
+}
+
+QMetaObject *QgsDlgPgBufferBase::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsDlgPgBufferBase( "QgsDlgPgBufferBase", &QgsDlgPgBufferBase::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsDlgPgBufferBase::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsDlgPgBufferBase", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsDlgPgBufferBase::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsDlgPgBufferBase", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsDlgPgBufferBase::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QDialog::staticMetaObject();
+ static const QUMethod slot_0 = {"help", 0, 0 };
+ static const QUMethod slot_1 = {"languageChange", 0, 0 };
+ static const QMetaData slot_tbl[] = {
+ { "help()", &slot_0, QMetaData::Public },
+ { "languageChange()", &slot_1, QMetaData::Protected }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsDlgPgBufferBase", parentObject,
+ slot_tbl, 2,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsDlgPgBufferBase.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsDlgPgBufferBase::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsDlgPgBufferBase" ) )
+ return this;
+ return QDialog::qt_cast( clname );
+}
+
+bool QgsDlgPgBufferBase::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: help(); break;
+ case 1: languageChange(); break;
+ default:
+ return QDialog::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsDlgPgBufferBase::qt_emit( int _id, QUObject* _o )
+{
+ return QDialog::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsDlgPgBufferBase::qt_property( int id, int f, QVariant* v)
+{
+ return QDialog::qt_property( id, f, v);
+}
+
+bool QgsDlgPgBufferBase::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/geoprocessing/qgspggeoprocessing.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/geoprocessing/qgspggeoprocessing.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/geoprocessing/qgspggeoprocessing.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,109 @@
+/****************************************************************************
+** QgsPgGeoprocessing meta object code from reading C++ file 'qgspggeoprocessing.h'
+**
+** Created: Fri Apr 7 17:17:58 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgspggeoprocessing.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsPgGeoprocessing::className() const
+{
+ return "QgsPgGeoprocessing";
+}
+
+QMetaObject *QgsPgGeoprocessing::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsPgGeoprocessing( "QgsPgGeoprocessing", &QgsPgGeoprocessing::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsPgGeoprocessing::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsPgGeoprocessing", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsPgGeoprocessing::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsPgGeoprocessing", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsPgGeoprocessing::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QObject::staticMetaObject();
+ static const QUMethod slot_0 = {"initGui", 0, 0 };
+ static const QUMethod slot_1 = {"buffer", 0, 0 };
+ static const QUMethod slot_2 = {"unload", 0, 0 };
+ static const QMetaData slot_tbl[] = {
+ { "initGui()", &slot_0, QMetaData::Public },
+ { "buffer()", &slot_1, QMetaData::Public },
+ { "unload()", &slot_2, QMetaData::Public }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsPgGeoprocessing", parentObject,
+ slot_tbl, 3,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsPgGeoprocessing.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsPgGeoprocessing::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsPgGeoprocessing" ) )
+ return this;
+ if ( !qstrcmp( clname, "QgisPlugin" ) )
+ return (QgisPlugin*)this;
+ return QObject::qt_cast( clname );
+}
+
+bool QgsPgGeoprocessing::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: initGui(); break;
+ case 1: buffer(); break;
+ case 2: unload(); break;
+ default:
+ return QObject::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsPgGeoprocessing::qt_emit( int _id, QUObject* _o )
+{
+ return QObject::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsPgGeoprocessing::qt_property( int id, int f, QVariant* v)
+{
+ return QObject::qt_property( id, f, v);
+}
+
+bool QgsPgGeoprocessing::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/grass/qgsgrassattributes.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/grass/qgsgrassattributes.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/grass/qgsgrassattributes.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,186 @@
+/****************************************************************************
+** QgsGrassAttributesKeyPress meta object code from reading C++ file 'qgsgrassattributes.h'
+**
+** Created: Fri Apr 7 17:20:38 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsgrassattributes.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsGrassAttributesKeyPress::className() const
+{
+ return "QgsGrassAttributesKeyPress";
+}
+
+QMetaObject *QgsGrassAttributesKeyPress::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassAttributesKeyPress( "QgsGrassAttributesKeyPress", &QgsGrassAttributesKeyPress::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassAttributesKeyPress::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassAttributesKeyPress", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassAttributesKeyPress::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassAttributesKeyPress", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassAttributesKeyPress::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QObject::staticMetaObject();
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassAttributesKeyPress", parentObject,
+ 0, 0,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassAttributesKeyPress.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassAttributesKeyPress::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassAttributesKeyPress" ) )
+ return this;
+ return QObject::qt_cast( clname );
+}
+
+bool QgsGrassAttributesKeyPress::qt_invoke( int _id, QUObject* _o )
+{
+ return QObject::qt_invoke(_id,_o);
+}
+
+bool QgsGrassAttributesKeyPress::qt_emit( int _id, QUObject* _o )
+{
+ return QObject::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassAttributesKeyPress::qt_property( int id, int f, QVariant* v)
+{
+ return QObject::qt_property( id, f, v);
+}
+
+bool QgsGrassAttributesKeyPress::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
+
+
+const char *QgsGrassAttributes::className() const
+{
+ return "QgsGrassAttributes";
+}
+
+QMetaObject *QgsGrassAttributes::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassAttributes( "QgsGrassAttributes", &QgsGrassAttributes::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassAttributes::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassAttributes", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassAttributes::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassAttributes", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassAttributes::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QgsGrassAttributesBase::staticMetaObject();
+ static const QUMethod slot_0 = {"updateAttributes", 0, 0 };
+ static const QUMethod slot_1 = {"addCat", 0, 0 };
+ static const QUMethod slot_2 = {"deleteCat", 0, 0 };
+ static const QUParameter param_slot_3[] = {
+ { "widget", &static_QUType_ptr, "QWidget", QUParameter::In }
+ };
+ static const QUMethod slot_3 = {"tabChanged", 1, param_slot_3 };
+ static const QMetaData slot_tbl[] = {
+ { "updateAttributes()", &slot_0, QMetaData::Public },
+ { "addCat()", &slot_1, QMetaData::Public },
+ { "deleteCat()", &slot_2, QMetaData::Public },
+ { "tabChanged(QWidget*)", &slot_3, QMetaData::Public }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassAttributes", parentObject,
+ slot_tbl, 4,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassAttributes.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassAttributes::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassAttributes" ) )
+ return this;
+ return QgsGrassAttributesBase::qt_cast( clname );
+}
+
+bool QgsGrassAttributes::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: updateAttributes(); break;
+ case 1: addCat(); break;
+ case 2: deleteCat(); break;
+ case 3: tabChanged((QWidget*)static_QUType_ptr.get(_o+1)); break;
+ default:
+ return QgsGrassAttributesBase::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsGrassAttributes::qt_emit( int _id, QUObject* _o )
+{
+ return QgsGrassAttributesBase::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassAttributes::qt_property( int id, int f, QVariant* v)
+{
+ return QgsGrassAttributesBase::qt_property( id, f, v);
+}
+
+bool QgsGrassAttributes::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/grass/qgsgrassattributesbase.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/grass/qgsgrassattributesbase.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/grass/qgsgrassattributesbase.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,110 @@
+/****************************************************************************
+** QgsGrassAttributesBase meta object code from reading C++ file 'qgsgrassattributesbase.h'
+**
+** Created: Fri Apr 7 17:20:38 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsgrassattributesbase.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsGrassAttributesBase::className() const
+{
+ return "QgsGrassAttributesBase";
+}
+
+QMetaObject *QgsGrassAttributesBase::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassAttributesBase( "QgsGrassAttributesBase", &QgsGrassAttributesBase::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassAttributesBase::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassAttributesBase", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassAttributesBase::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassAttributesBase", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassAttributesBase::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QWidget::staticMetaObject();
+ static const QUMethod slot_0 = {"updateAttributes", 0, 0 };
+ static const QUMethod slot_1 = {"addCat", 0, 0 };
+ static const QUMethod slot_2 = {"deleteCat", 0, 0 };
+ static const QUMethod slot_3 = {"languageChange", 0, 0 };
+ static const QMetaData slot_tbl[] = {
+ { "updateAttributes()", &slot_0, QMetaData::Public },
+ { "addCat()", &slot_1, QMetaData::Public },
+ { "deleteCat()", &slot_2, QMetaData::Public },
+ { "languageChange()", &slot_3, QMetaData::Protected }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassAttributesBase", parentObject,
+ slot_tbl, 4,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassAttributesBase.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassAttributesBase::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassAttributesBase" ) )
+ return this;
+ return QWidget::qt_cast( clname );
+}
+
+bool QgsGrassAttributesBase::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: updateAttributes(); break;
+ case 1: addCat(); break;
+ case 2: deleteCat(); break;
+ case 3: languageChange(); break;
+ default:
+ return QWidget::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsGrassAttributesBase::qt_emit( int _id, QUObject* _o )
+{
+ return QWidget::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassAttributesBase::qt_property( int id, int f, QVariant* v)
+{
+ return QWidget::qt_property( id, f, v);
+}
+
+bool QgsGrassAttributesBase::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/grass/qgsgrassedit.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/grass/qgsgrassedit.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/grass/qgsgrassedit.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,183 @@
+/****************************************************************************
+** QgsGrassEdit meta object code from reading C++ file 'qgsgrassedit.h'
+**
+** Created: Fri Apr 7 17:20:38 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsgrassedit.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsGrassEdit::className() const
+{
+ return "QgsGrassEdit";
+}
+
+QMetaObject *QgsGrassEdit::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassEdit( "QgsGrassEdit", &QgsGrassEdit::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassEdit::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassEdit", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassEdit::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassEdit", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassEdit::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QgsGrassEditBase::staticMetaObject();
+ static const QUParameter param_slot_0[] = {
+ { 0, &static_QUType_ptr, "QgsPoint", QUParameter::InOut }
+ };
+ static const QUMethod slot_0 = {"mouseEventReceiverMove", 1, param_slot_0 };
+ static const QUParameter param_slot_1[] = {
+ { "p", &static_QUType_ptr, "QgsPoint", QUParameter::InOut },
+ { "button", &static_QUType_ptr, "Qt::ButtonState", QUParameter::In }
+ };
+ static const QUMethod slot_1 = {"mouseEventReceiverClick", 2, param_slot_1 };
+ static const QUParameter param_slot_2[] = {
+ { 0, &static_QUType_ptr, "QPainter", QUParameter::In }
+ };
+ static const QUMethod slot_2 = {"postRender", 1, param_slot_2 };
+ static const QUMethod slot_3 = {"newPoint", 0, 0 };
+ static const QUMethod slot_4 = {"newLine", 0, 0 };
+ static const QUMethod slot_5 = {"newBoundary", 0, 0 };
+ static const QUMethod slot_6 = {"newCentroid", 0, 0 };
+ static const QUMethod slot_7 = {"moveVertex", 0, 0 };
+ static const QUMethod slot_8 = {"addVertex", 0, 0 };
+ static const QUMethod slot_9 = {"deleteVertex", 0, 0 };
+ static const QUMethod slot_10 = {"splitLine", 0, 0 };
+ static const QUMethod slot_11 = {"moveLine", 0, 0 };
+ static const QUMethod slot_12 = {"deleteLine", 0, 0 };
+ static const QUMethod slot_13 = {"editCats", 0, 0 };
+ static const QUMethod slot_14 = {"editAttributes", 0, 0 };
+ static const QUMethod slot_15 = {"catModeChanged", 0, 0 };
+ static const QUMethod slot_16 = {"fieldChanged", 0, 0 };
+ static const QUMethod slot_17 = {"closeEdit", 0, 0 };
+ static const QUParameter param_slot_18[] = {
+ { "item", &static_QUType_ptr, "QListViewItem", QUParameter::In },
+ { "pnt", &static_QUType_varptr, "\x0e", QUParameter::In },
+ { "col", &static_QUType_int, 0, QUParameter::In }
+ };
+ static const QUMethod slot_18 = {"changeSymbology", 3, param_slot_18 };
+ static const QUParameter param_slot_19[] = {
+ { "row", &static_QUType_int, 0, QUParameter::In },
+ { "col", &static_QUType_int, 0, QUParameter::In }
+ };
+ static const QUMethod slot_19 = {"columnTypeChanged", 2, param_slot_19 };
+ static const QUParameter param_slot_20[] = {
+ { "e", &static_QUType_ptr, "QCloseEvent", QUParameter::In }
+ };
+ static const QUMethod slot_20 = {"closeEvent", 1, param_slot_20 };
+ static const QMetaData slot_tbl[] = {
+ { "mouseEventReceiverMove(QgsPoint&)", &slot_0, QMetaData::Public },
+ { "mouseEventReceiverClick(QgsPoint&,Qt::ButtonState)", &slot_1, QMetaData::Public },
+ { "postRender(QPainter*)", &slot_2, QMetaData::Public },
+ { "newPoint()", &slot_3, QMetaData::Public },
+ { "newLine()", &slot_4, QMetaData::Public },
+ { "newBoundary()", &slot_5, QMetaData::Public },
+ { "newCentroid()", &slot_6, QMetaData::Public },
+ { "moveVertex()", &slot_7, QMetaData::Public },
+ { "addVertex()", &slot_8, QMetaData::Public },
+ { "deleteVertex()", &slot_9, QMetaData::Public },
+ { "splitLine()", &slot_10, QMetaData::Public },
+ { "moveLine()", &slot_11, QMetaData::Public },
+ { "deleteLine()", &slot_12, QMetaData::Public },
+ { "editCats()", &slot_13, QMetaData::Public },
+ { "editAttributes()", &slot_14, QMetaData::Public },
+ { "catModeChanged()", &slot_15, QMetaData::Public },
+ { "fieldChanged()", &slot_16, QMetaData::Public },
+ { "closeEdit()", &slot_17, QMetaData::Public },
+ { "changeSymbology(QListViewItem*,const QPoint&,int)", &slot_18, QMetaData::Public },
+ { "columnTypeChanged(int,int)", &slot_19, QMetaData::Public },
+ { "closeEvent(QCloseEvent*)", &slot_20, QMetaData::Public }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassEdit", parentObject,
+ slot_tbl, 21,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassEdit.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassEdit::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassEdit" ) )
+ return this;
+ return QgsGrassEditBase::qt_cast( clname );
+}
+
+bool QgsGrassEdit::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: mouseEventReceiverMove((QgsPoint&)*((QgsPoint*)static_QUType_ptr.get(_o+1))); break;
+ case 1: mouseEventReceiverClick((QgsPoint&)*((QgsPoint*)static_QUType_ptr.get(_o+1)),(Qt::ButtonState)(*((Qt::ButtonState*)static_QUType_ptr.get(_o+2)))); break;
+ case 2: postRender((QPainter*)static_QUType_ptr.get(_o+1)); break;
+ case 3: newPoint(); break;
+ case 4: newLine(); break;
+ case 5: newBoundary(); break;
+ case 6: newCentroid(); break;
+ case 7: moveVertex(); break;
+ case 8: addVertex(); break;
+ case 9: deleteVertex(); break;
+ case 10: splitLine(); break;
+ case 11: moveLine(); break;
+ case 12: deleteLine(); break;
+ case 13: editCats(); break;
+ case 14: editAttributes(); break;
+ case 15: catModeChanged(); break;
+ case 16: fieldChanged(); break;
+ case 17: closeEdit(); break;
+ case 18: changeSymbology((QListViewItem*)static_QUType_ptr.get(_o+1),(const QPoint&)*((const QPoint*)static_QUType_ptr.get(_o+2)),(int)static_QUType_int.get(_o+3)); break;
+ case 19: columnTypeChanged((int)static_QUType_int.get(_o+1),(int)static_QUType_int.get(_o+2)); break;
+ case 20: closeEvent((QCloseEvent*)static_QUType_ptr.get(_o+1)); break;
+ default:
+ return QgsGrassEditBase::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsGrassEdit::qt_emit( int _id, QUObject* _o )
+{
+ return QgsGrassEditBase::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassEdit::qt_property( int id, int f, QVariant* v)
+{
+ return QgsGrassEditBase::qt_property( id, f, v);
+}
+
+bool QgsGrassEdit::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/grass/qgsgrasseditbase.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/grass/qgsgrasseditbase.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/grass/qgsgrasseditbase.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,155 @@
+/****************************************************************************
+** QgsGrassEditBase meta object code from reading C++ file 'qgsgrasseditbase.h'
+**
+** Created: Fri Apr 7 17:20:38 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsgrasseditbase.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsGrassEditBase::className() const
+{
+ return "QgsGrassEditBase";
+}
+
+QMetaObject *QgsGrassEditBase::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassEditBase( "QgsGrassEditBase", &QgsGrassEditBase::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassEditBase::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassEditBase", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassEditBase::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassEditBase", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassEditBase::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QMainWindow::staticMetaObject();
+ static const QUMethod slot_0 = {"newLine", 0, 0 };
+ static const QUMethod slot_1 = {"closeEdit", 0, 0 };
+ static const QUMethod slot_2 = {"newPoint", 0, 0 };
+ static const QUMethod slot_3 = {"newBoundary", 0, 0 };
+ static const QUMethod slot_4 = {"newCentroid", 0, 0 };
+ static const QUMethod slot_5 = {"moveVertex", 0, 0 };
+ static const QUMethod slot_6 = {"deleteVertex", 0, 0 };
+ static const QUMethod slot_7 = {"addVertex", 0, 0 };
+ static const QUMethod slot_8 = {"moveLine", 0, 0 };
+ static const QUMethod slot_9 = {"deleteLine", 0, 0 };
+ static const QUMethod slot_10 = {"splitLine", 0, 0 };
+ static const QUMethod slot_11 = {"editCats", 0, 0 };
+ static const QUMethod slot_12 = {"editAttributes", 0, 0 };
+ static const QUMethod slot_13 = {"catModeChanged", 0, 0 };
+ static const QUMethod slot_14 = {"fieldChanged", 0, 0 };
+ static const QUMethod slot_15 = {"addColumn", 0, 0 };
+ static const QUMethod slot_16 = {"alterTable", 0, 0 };
+ static const QUMethod slot_17 = {"attributeTableFieldChanged", 0, 0 };
+ static const QUMethod slot_18 = {"languageChange", 0, 0 };
+ static const QMetaData slot_tbl[] = {
+ { "newLine()", &slot_0, QMetaData::Public },
+ { "closeEdit()", &slot_1, QMetaData::Public },
+ { "newPoint()", &slot_2, QMetaData::Public },
+ { "newBoundary()", &slot_3, QMetaData::Public },
+ { "newCentroid()", &slot_4, QMetaData::Public },
+ { "moveVertex()", &slot_5, QMetaData::Public },
+ { "deleteVertex()", &slot_6, QMetaData::Public },
+ { "addVertex()", &slot_7, QMetaData::Public },
+ { "moveLine()", &slot_8, QMetaData::Public },
+ { "deleteLine()", &slot_9, QMetaData::Public },
+ { "splitLine()", &slot_10, QMetaData::Public },
+ { "editCats()", &slot_11, QMetaData::Public },
+ { "editAttributes()", &slot_12, QMetaData::Public },
+ { "catModeChanged()", &slot_13, QMetaData::Public },
+ { "fieldChanged()", &slot_14, QMetaData::Public },
+ { "addColumn()", &slot_15, QMetaData::Public },
+ { "alterTable()", &slot_16, QMetaData::Public },
+ { "attributeTableFieldChanged()", &slot_17, QMetaData::Public },
+ { "languageChange()", &slot_18, QMetaData::Protected }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassEditBase", parentObject,
+ slot_tbl, 19,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassEditBase.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassEditBase::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassEditBase" ) )
+ return this;
+ return QMainWindow::qt_cast( clname );
+}
+
+bool QgsGrassEditBase::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: newLine(); break;
+ case 1: closeEdit(); break;
+ case 2: newPoint(); break;
+ case 3: newBoundary(); break;
+ case 4: newCentroid(); break;
+ case 5: moveVertex(); break;
+ case 6: deleteVertex(); break;
+ case 7: addVertex(); break;
+ case 8: moveLine(); break;
+ case 9: deleteLine(); break;
+ case 10: splitLine(); break;
+ case 11: editCats(); break;
+ case 12: editAttributes(); break;
+ case 13: catModeChanged(); break;
+ case 14: fieldChanged(); break;
+ case 15: addColumn(); break;
+ case 16: alterTable(); break;
+ case 17: attributeTableFieldChanged(); break;
+ case 18: languageChange(); break;
+ default:
+ return QMainWindow::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsGrassEditBase::qt_emit( int _id, QUObject* _o )
+{
+ return QMainWindow::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassEditBase::qt_property( int id, int f, QVariant* v)
+{
+ return QMainWindow::qt_property( id, f, v);
+}
+
+bool QgsGrassEditBase::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/grass/qgsgrassmodule.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/grass/qgsgrassmodule.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/grass/qgsgrassmodule.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,347 @@
+/****************************************************************************
+** QgsGrassModule meta object code from reading C++ file 'qgsgrassmodule.h'
+**
+** Created: Fri Apr 7 17:20:38 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsgrassmodule.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsGrassModule::className() const
+{
+ return "QgsGrassModule";
+}
+
+QMetaObject *QgsGrassModule::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassModule( "QgsGrassModule", &QgsGrassModule::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassModule::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassModule", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassModule::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassModule", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassModule::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QgsGrassModuleBase::staticMetaObject();
+ static const QUMethod slot_0 = {"run", 0, 0 };
+ static const QUMethod slot_1 = {"close", 0, 0 };
+ static const QUMethod slot_2 = {"finished", 0, 0 };
+ static const QUMethod slot_3 = {"readStdout", 0, 0 };
+ static const QUMethod slot_4 = {"readStderr", 0, 0 };
+ static const QMetaData slot_tbl[] = {
+ { "run()", &slot_0, QMetaData::Public },
+ { "close()", &slot_1, QMetaData::Public },
+ { "finished()", &slot_2, QMetaData::Public },
+ { "readStdout()", &slot_3, QMetaData::Public },
+ { "readStderr()", &slot_4, QMetaData::Public }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassModule", parentObject,
+ slot_tbl, 5,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassModule.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassModule::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassModule" ) )
+ return this;
+ return QgsGrassModuleBase::qt_cast( clname );
+}
+
+bool QgsGrassModule::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: run(); break;
+ case 1: close(); break;
+ case 2: finished(); break;
+ case 3: readStdout(); break;
+ case 4: readStderr(); break;
+ default:
+ return QgsGrassModuleBase::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsGrassModule::qt_emit( int _id, QUObject* _o )
+{
+ return QgsGrassModuleBase::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassModule::qt_property( int id, int f, QVariant* v)
+{
+ return QgsGrassModuleBase::qt_property( id, f, v);
+}
+
+bool QgsGrassModule::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
+
+
+const char *QgsGrassModuleOption::className() const
+{
+ return "QgsGrassModuleOption";
+}
+
+QMetaObject *QgsGrassModuleOption::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassModuleOption( "QgsGrassModuleOption", &QgsGrassModuleOption::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassModuleOption::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassModuleOption", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassModuleOption::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassModuleOption", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassModuleOption::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QVGroupBox::staticMetaObject();
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassModuleOption", parentObject,
+ 0, 0,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassModuleOption.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassModuleOption::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassModuleOption" ) )
+ return this;
+ if ( !qstrcmp( clname, "QgsGrassModuleItem" ) )
+ return (QgsGrassModuleItem*)this;
+ return QVGroupBox::qt_cast( clname );
+}
+
+bool QgsGrassModuleOption::qt_invoke( int _id, QUObject* _o )
+{
+ return QVGroupBox::qt_invoke(_id,_o);
+}
+
+bool QgsGrassModuleOption::qt_emit( int _id, QUObject* _o )
+{
+ return QVGroupBox::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassModuleOption::qt_property( int id, int f, QVariant* v)
+{
+ return QVGroupBox::qt_property( id, f, v);
+}
+
+bool QgsGrassModuleOption::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
+
+
+const char *QgsGrassModuleFlag::className() const
+{
+ return "QgsGrassModuleFlag";
+}
+
+QMetaObject *QgsGrassModuleFlag::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassModuleFlag( "QgsGrassModuleFlag", &QgsGrassModuleFlag::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassModuleFlag::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassModuleFlag", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassModuleFlag::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassModuleFlag", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassModuleFlag::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QCheckBox::staticMetaObject();
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassModuleFlag", parentObject,
+ 0, 0,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassModuleFlag.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassModuleFlag::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassModuleFlag" ) )
+ return this;
+ if ( !qstrcmp( clname, "QgsGrassModuleItem" ) )
+ return (QgsGrassModuleItem*)this;
+ return QCheckBox::qt_cast( clname );
+}
+
+bool QgsGrassModuleFlag::qt_invoke( int _id, QUObject* _o )
+{
+ return QCheckBox::qt_invoke(_id,_o);
+}
+
+bool QgsGrassModuleFlag::qt_emit( int _id, QUObject* _o )
+{
+ return QCheckBox::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassModuleFlag::qt_property( int id, int f, QVariant* v)
+{
+ return QCheckBox::qt_property( id, f, v);
+}
+
+bool QgsGrassModuleFlag::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
+
+
+const char *QgsGrassModuleInput::className() const
+{
+ return "QgsGrassModuleInput";
+}
+
+QMetaObject *QgsGrassModuleInput::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassModuleInput( "QgsGrassModuleInput", &QgsGrassModuleInput::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassModuleInput::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassModuleInput", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassModuleInput::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassModuleInput", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassModuleInput::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QVGroupBox::staticMetaObject();
+ static const QUMethod slot_0 = {"updateQgisLayers", 0, 0 };
+ static const QMetaData slot_tbl[] = {
+ { "updateQgisLayers()", &slot_0, QMetaData::Public }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassModuleInput", parentObject,
+ slot_tbl, 1,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassModuleInput.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassModuleInput::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassModuleInput" ) )
+ return this;
+ if ( !qstrcmp( clname, "QgsGrassModuleItem" ) )
+ return (QgsGrassModuleItem*)this;
+ return QVGroupBox::qt_cast( clname );
+}
+
+bool QgsGrassModuleInput::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: updateQgisLayers(); break;
+ default:
+ return QVGroupBox::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsGrassModuleInput::qt_emit( int _id, QUObject* _o )
+{
+ return QVGroupBox::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassModuleInput::qt_property( int id, int f, QVariant* v)
+{
+ return QVGroupBox::qt_property( id, f, v);
+}
+
+bool QgsGrassModuleInput::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/grass/qgsgrassmodulebase.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/grass/qgsgrassmodulebase.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/grass/qgsgrassmodulebase.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,107 @@
+/****************************************************************************
+** QgsGrassModuleBase meta object code from reading C++ file 'qgsgrassmodulebase.h'
+**
+** Created: Fri Apr 7 17:20:38 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsgrassmodulebase.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsGrassModuleBase::className() const
+{
+ return "QgsGrassModuleBase";
+}
+
+QMetaObject *QgsGrassModuleBase::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassModuleBase( "QgsGrassModuleBase", &QgsGrassModuleBase::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassModuleBase::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassModuleBase", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassModuleBase::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassModuleBase", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassModuleBase::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QWidget::staticMetaObject();
+ static const QUMethod slot_0 = {"run", 0, 0 };
+ static const QUMethod slot_1 = {"close", 0, 0 };
+ static const QUMethod slot_2 = {"languageChange", 0, 0 };
+ static const QMetaData slot_tbl[] = {
+ { "run()", &slot_0, QMetaData::Public },
+ { "close()", &slot_1, QMetaData::Public },
+ { "languageChange()", &slot_2, QMetaData::Protected }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassModuleBase", parentObject,
+ slot_tbl, 3,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassModuleBase.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassModuleBase::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassModuleBase" ) )
+ return this;
+ return QWidget::qt_cast( clname );
+}
+
+bool QgsGrassModuleBase::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: run(); break;
+ case 1: close(); break;
+ case 2: languageChange(); break;
+ default:
+ return QWidget::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsGrassModuleBase::qt_emit( int _id, QUObject* _o )
+{
+ return QWidget::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassModuleBase::qt_property( int id, int f, QVariant* v)
+{
+ return QWidget::qt_property( id, f, v);
+}
+
+bool QgsGrassModuleBase::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/grass/qgsgrassplugin.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/grass/qgsgrassplugin.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/grass/qgsgrassplugin.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,142 @@
+/****************************************************************************
+** QgsGrassPlugin meta object code from reading C++ file 'qgsgrassplugin.h'
+**
+** Created: Fri Apr 7 17:20:38 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsgrassplugin.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsGrassPlugin::className() const
+{
+ return "QgsGrassPlugin";
+}
+
+QMetaObject *QgsGrassPlugin::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassPlugin( "QgsGrassPlugin", &QgsGrassPlugin::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassPlugin::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassPlugin", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassPlugin::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassPlugin", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassPlugin::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QObject::staticMetaObject();
+ static const QUMethod slot_0 = {"initGui", 0, 0 };
+ static const QUMethod slot_1 = {"addVector", 0, 0 };
+ static const QUMethod slot_2 = {"addRaster", 0, 0 };
+ static const QUMethod slot_3 = {"edit", 0, 0 };
+ static const QUMethod slot_4 = {"unload", 0, 0 };
+ static const QUMethod slot_5 = {"help", 0, 0 };
+ static const QUParameter param_slot_6[] = {
+ { "painter", &static_QUType_ptr, "QPainter", QUParameter::In }
+ };
+ static const QUMethod slot_6 = {"displayRegion", 1, param_slot_6 };
+ static const QUParameter param_slot_7[] = {
+ { "on", &static_QUType_bool, 0, QUParameter::In }
+ };
+ static const QUMethod slot_7 = {"switchRegion", 1, param_slot_7 };
+ static const QUMethod slot_8 = {"changeRegion", 0, 0 };
+ static const QUParameter param_slot_9[] = {
+ { 0, &static_QUType_ptr, "QPainter", QUParameter::In }
+ };
+ static const QUMethod slot_9 = {"postRender", 1, param_slot_9 };
+ static const QUMethod slot_10 = {"openTools", 0, 0 };
+ static const QMetaData slot_tbl[] = {
+ { "initGui()", &slot_0, QMetaData::Public },
+ { "addVector()", &slot_1, QMetaData::Public },
+ { "addRaster()", &slot_2, QMetaData::Public },
+ { "edit()", &slot_3, QMetaData::Public },
+ { "unload()", &slot_4, QMetaData::Public },
+ { "help()", &slot_5, QMetaData::Public },
+ { "displayRegion(QPainter*)", &slot_6, QMetaData::Public },
+ { "switchRegion(bool)", &slot_7, QMetaData::Public },
+ { "changeRegion()", &slot_8, QMetaData::Public },
+ { "postRender(QPainter*)", &slot_9, QMetaData::Public },
+ { "openTools()", &slot_10, QMetaData::Public }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassPlugin", parentObject,
+ slot_tbl, 11,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassPlugin.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassPlugin::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassPlugin" ) )
+ return this;
+ if ( !qstrcmp( clname, "QgisPlugin" ) )
+ return (QgisPlugin*)this;
+ return QObject::qt_cast( clname );
+}
+
+bool QgsGrassPlugin::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: initGui(); break;
+ case 1: addVector(); break;
+ case 2: addRaster(); break;
+ case 3: edit(); break;
+ case 4: unload(); break;
+ case 5: help(); break;
+ case 6: displayRegion((QPainter*)static_QUType_ptr.get(_o+1)); break;
+ case 7: switchRegion((bool)static_QUType_bool.get(_o+1)); break;
+ case 8: changeRegion(); break;
+ case 9: postRender((QPainter*)static_QUType_ptr.get(_o+1)); break;
+ case 10: openTools(); break;
+ default:
+ return QObject::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsGrassPlugin::qt_emit( int _id, QUObject* _o )
+{
+ return QObject::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassPlugin::qt_property( int id, int f, QVariant* v)
+{
+ return QObject::qt_property( id, f, v);
+}
+
+bool QgsGrassPlugin::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/grass/qgsgrassregion.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/grass/qgsgrassregion.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/grass/qgsgrassregion.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,182 @@
+/****************************************************************************
+** QgsGrassRegion meta object code from reading C++ file 'qgsgrassregion.h'
+**
+** Created: Fri Apr 7 17:20:38 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsgrassregion.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsGrassRegion::className() const
+{
+ return "QgsGrassRegion";
+}
+
+QMetaObject *QgsGrassRegion::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassRegion( "QgsGrassRegion", &QgsGrassRegion::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassRegion::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassRegion", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassRegion::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassRegion", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassRegion::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QgsGrassRegionBase::staticMetaObject();
+ static const QUMethod slot_0 = {"accept", 0, 0 };
+ static const QUMethod slot_1 = {"reject", 0, 0 };
+ static const QUParameter param_slot_2[] = {
+ { 0, &static_QUType_ptr, "QPainter", QUParameter::In }
+ };
+ static const QUMethod slot_2 = {"postRender", 1, param_slot_2 };
+ static const QUParameter param_slot_3[] = {
+ { 0, &static_QUType_ptr, "QgsPoint", QUParameter::InOut }
+ };
+ static const QUMethod slot_3 = {"mouseEventReceiverMove", 1, param_slot_3 };
+ static const QUParameter param_slot_4[] = {
+ { 0, &static_QUType_ptr, "QgsPoint", QUParameter::InOut }
+ };
+ static const QUMethod slot_4 = {"mouseEventReceiverClick", 1, param_slot_4 };
+ static const QUMethod slot_5 = {"adjust", 0, 0 };
+ static const QUParameter param_slot_6[] = {
+ { "str", &static_QUType_QString, 0, QUParameter::In }
+ };
+ static const QUMethod slot_6 = {"northChanged", 1, param_slot_6 };
+ static const QUParameter param_slot_7[] = {
+ { "str", &static_QUType_QString, 0, QUParameter::In }
+ };
+ static const QUMethod slot_7 = {"southChanged", 1, param_slot_7 };
+ static const QUParameter param_slot_8[] = {
+ { "str", &static_QUType_QString, 0, QUParameter::In }
+ };
+ static const QUMethod slot_8 = {"eastChanged", 1, param_slot_8 };
+ static const QUParameter param_slot_9[] = {
+ { "str", &static_QUType_QString, 0, QUParameter::In }
+ };
+ static const QUMethod slot_9 = {"westChanged", 1, param_slot_9 };
+ static const QUParameter param_slot_10[] = {
+ { "str", &static_QUType_QString, 0, QUParameter::In }
+ };
+ static const QUMethod slot_10 = {"NSResChanged", 1, param_slot_10 };
+ static const QUParameter param_slot_11[] = {
+ { "str", &static_QUType_QString, 0, QUParameter::In }
+ };
+ static const QUMethod slot_11 = {"EWResChanged", 1, param_slot_11 };
+ static const QUParameter param_slot_12[] = {
+ { "str", &static_QUType_QString, 0, QUParameter::In }
+ };
+ static const QUMethod slot_12 = {"rowsChanged", 1, param_slot_12 };
+ static const QUParameter param_slot_13[] = {
+ { "str", &static_QUType_QString, 0, QUParameter::In }
+ };
+ static const QUMethod slot_13 = {"colsChanged", 1, param_slot_13 };
+ static const QUMethod slot_14 = {"radioChanged", 0, 0 };
+ static const QUMethod slot_15 = {"changeColor", 0, 0 };
+ static const QUMethod slot_16 = {"changeWidth", 0, 0 };
+ static const QMetaData slot_tbl[] = {
+ { "accept()", &slot_0, QMetaData::Public },
+ { "reject()", &slot_1, QMetaData::Public },
+ { "postRender(QPainter*)", &slot_2, QMetaData::Public },
+ { "mouseEventReceiverMove(QgsPoint&)", &slot_3, QMetaData::Public },
+ { "mouseEventReceiverClick(QgsPoint&)", &slot_4, QMetaData::Public },
+ { "adjust()", &slot_5, QMetaData::Public },
+ { "northChanged(const QString&)", &slot_6, QMetaData::Public },
+ { "southChanged(const QString&)", &slot_7, QMetaData::Public },
+ { "eastChanged(const QString&)", &slot_8, QMetaData::Public },
+ { "westChanged(const QString&)", &slot_9, QMetaData::Public },
+ { "NSResChanged(const QString&)", &slot_10, QMetaData::Public },
+ { "EWResChanged(const QString&)", &slot_11, QMetaData::Public },
+ { "rowsChanged(const QString&)", &slot_12, QMetaData::Public },
+ { "colsChanged(const QString&)", &slot_13, QMetaData::Public },
+ { "radioChanged()", &slot_14, QMetaData::Public },
+ { "changeColor()", &slot_15, QMetaData::Public },
+ { "changeWidth()", &slot_16, QMetaData::Public }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassRegion", parentObject,
+ slot_tbl, 17,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassRegion.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassRegion::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassRegion" ) )
+ return this;
+ return QgsGrassRegionBase::qt_cast( clname );
+}
+
+bool QgsGrassRegion::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: accept(); break;
+ case 1: reject(); break;
+ case 2: postRender((QPainter*)static_QUType_ptr.get(_o+1)); break;
+ case 3: mouseEventReceiverMove((QgsPoint&)*((QgsPoint*)static_QUType_ptr.get(_o+1))); break;
+ case 4: mouseEventReceiverClick((QgsPoint&)*((QgsPoint*)static_QUType_ptr.get(_o+1))); break;
+ case 5: adjust(); break;
+ case 6: northChanged((const QString&)static_QUType_QString.get(_o+1)); break;
+ case 7: southChanged((const QString&)static_QUType_QString.get(_o+1)); break;
+ case 8: eastChanged((const QString&)static_QUType_QString.get(_o+1)); break;
+ case 9: westChanged((const QString&)static_QUType_QString.get(_o+1)); break;
+ case 10: NSResChanged((const QString&)static_QUType_QString.get(_o+1)); break;
+ case 11: EWResChanged((const QString&)static_QUType_QString.get(_o+1)); break;
+ case 12: rowsChanged((const QString&)static_QUType_QString.get(_o+1)); break;
+ case 13: colsChanged((const QString&)static_QUType_QString.get(_o+1)); break;
+ case 14: radioChanged(); break;
+ case 15: changeColor(); break;
+ case 16: changeWidth(); break;
+ default:
+ return QgsGrassRegionBase::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsGrassRegion::qt_emit( int _id, QUObject* _o )
+{
+ return QgsGrassRegionBase::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassRegion::qt_property( int id, int f, QVariant* v)
+{
+ return QgsGrassRegionBase::qt_property( id, f, v);
+}
+
+bool QgsGrassRegion::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/grass/qgsgrassregionbase.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/grass/qgsgrassregionbase.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/grass/qgsgrassregionbase.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,107 @@
+/****************************************************************************
+** QgsGrassRegionBase meta object code from reading C++ file 'qgsgrassregionbase.h'
+**
+** Created: Fri Apr 7 17:20:38 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsgrassregionbase.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsGrassRegionBase::className() const
+{
+ return "QgsGrassRegionBase";
+}
+
+QMetaObject *QgsGrassRegionBase::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassRegionBase( "QgsGrassRegionBase", &QgsGrassRegionBase::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassRegionBase::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassRegionBase", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassRegionBase::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassRegionBase", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassRegionBase::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QWidget::staticMetaObject();
+ static const QUMethod slot_0 = {"accept", 0, 0 };
+ static const QUMethod slot_1 = {"reject", 0, 0 };
+ static const QUMethod slot_2 = {"languageChange", 0, 0 };
+ static const QMetaData slot_tbl[] = {
+ { "accept()", &slot_0, QMetaData::Public },
+ { "reject()", &slot_1, QMetaData::Public },
+ { "languageChange()", &slot_2, QMetaData::Protected }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassRegionBase", parentObject,
+ slot_tbl, 3,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassRegionBase.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassRegionBase::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassRegionBase" ) )
+ return this;
+ return QWidget::qt_cast( clname );
+}
+
+bool QgsGrassRegionBase::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: accept(); break;
+ case 1: reject(); break;
+ case 2: languageChange(); break;
+ default:
+ return QWidget::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsGrassRegionBase::qt_emit( int _id, QUObject* _o )
+{
+ return QWidget::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassRegionBase::qt_property( int id, int f, QVariant* v)
+{
+ return QWidget::qt_property( id, f, v);
+}
+
+bool QgsGrassRegionBase::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/grass/qgsgrassselectbase.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/grass/qgsgrassselectbase.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/grass/qgsgrassselectbase.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,122 @@
+/****************************************************************************
+** QgsGrassSelectBase meta object code from reading C++ file 'qgsgrassselectbase.h'
+**
+** Created: Fri Apr 7 17:20:38 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsgrassselectbase.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsGrassSelectBase::className() const
+{
+ return "QgsGrassSelectBase";
+}
+
+QMetaObject *QgsGrassSelectBase::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassSelectBase( "QgsGrassSelectBase", &QgsGrassSelectBase::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassSelectBase::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassSelectBase", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassSelectBase::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassSelectBase", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassSelectBase::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QDialog::staticMetaObject();
+ static const QUMethod slot_0 = {"SetGisdbase", 0, 0 };
+ static const QUMethod slot_1 = {"getGisdbase", 0, 0 };
+ static const QUMethod slot_2 = {"setLocations", 0, 0 };
+ static const QUMethod slot_3 = {"setMaps", 0, 0 };
+ static const QUMethod slot_4 = {"setMapsets", 0, 0 };
+ static const QUMethod slot_5 = {"setLayers", 0, 0 };
+ static const QUMethod slot_6 = {"reject", 0, 0 };
+ static const QUMethod slot_7 = {"languageChange", 0, 0 };
+ static const QMetaData slot_tbl[] = {
+ { "SetGisdbase()", &slot_0, QMetaData::Public },
+ { "getGisdbase()", &slot_1, QMetaData::Public },
+ { "setLocations()", &slot_2, QMetaData::Public },
+ { "setMaps()", &slot_3, QMetaData::Public },
+ { "setMapsets()", &slot_4, QMetaData::Public },
+ { "setLayers()", &slot_5, QMetaData::Public },
+ { "reject()", &slot_6, QMetaData::Public },
+ { "languageChange()", &slot_7, QMetaData::Protected }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassSelectBase", parentObject,
+ slot_tbl, 8,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassSelectBase.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassSelectBase::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassSelectBase" ) )
+ return this;
+ return QDialog::qt_cast( clname );
+}
+
+bool QgsGrassSelectBase::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: SetGisdbase(); break;
+ case 1: getGisdbase(); break;
+ case 2: setLocations(); break;
+ case 3: setMaps(); break;
+ case 4: setMapsets(); break;
+ case 5: setLayers(); break;
+ case 6: reject(); break;
+ case 7: languageChange(); break;
+ default:
+ return QDialog::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsGrassSelectBase::qt_emit( int _id, QUObject* _o )
+{
+ return QDialog::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassSelectBase::qt_property( int id, int f, QVariant* v)
+{
+ return QDialog::qt_property( id, f, v);
+}
+
+bool QgsGrassSelectBase::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/grass/qgsgrasstools.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/grass/qgsgrasstools.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/grass/qgsgrasstools.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,126 @@
+/****************************************************************************
+** QgsGrassTools meta object code from reading C++ file 'qgsgrasstools.h'
+**
+** Created: Fri Apr 7 17:20:38 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsgrasstools.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsGrassTools::className() const
+{
+ return "QgsGrassTools";
+}
+
+QMetaObject *QgsGrassTools::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassTools( "QgsGrassTools", &QgsGrassTools::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassTools::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassTools", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassTools::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassTools", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassTools::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QgsGrassToolsBase::staticMetaObject();
+ static const QUParameter param_slot_0[] = {
+ { 0, &static_QUType_bool, 0, QUParameter::Out },
+ { "filePath", &static_QUType_QString, 0, QUParameter::In }
+ };
+ static const QUMethod slot_0 = {"loadConfig", 2, param_slot_0 };
+ static const QUMethod slot_1 = {"close", 0, 0 };
+ static const QUParameter param_slot_2[] = {
+ { "e", &static_QUType_ptr, "QCloseEvent", QUParameter::In }
+ };
+ static const QUMethod slot_2 = {"closeEvent", 1, param_slot_2 };
+ static const QUMethod slot_3 = {"restorePosition", 0, 0 };
+ static const QUMethod slot_4 = {"saveWindowLocation", 0, 0 };
+ static const QUParameter param_slot_5[] = {
+ { "item", &static_QUType_ptr, "QListViewItem", QUParameter::In }
+ };
+ static const QUMethod slot_5 = {"moduleClicked", 1, param_slot_5 };
+ static const QMetaData slot_tbl[] = {
+ { "loadConfig(QString)", &slot_0, QMetaData::Public },
+ { "close()", &slot_1, QMetaData::Public },
+ { "closeEvent(QCloseEvent*)", &slot_2, QMetaData::Public },
+ { "restorePosition()", &slot_3, QMetaData::Public },
+ { "saveWindowLocation()", &slot_4, QMetaData::Public },
+ { "moduleClicked(QListViewItem*)", &slot_5, QMetaData::Public }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassTools", parentObject,
+ slot_tbl, 6,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassTools.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassTools::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassTools" ) )
+ return this;
+ return QgsGrassToolsBase::qt_cast( clname );
+}
+
+bool QgsGrassTools::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: static_QUType_bool.set(_o,loadConfig((QString)static_QUType_QString.get(_o+1))); break;
+ case 1: close(); break;
+ case 2: closeEvent((QCloseEvent*)static_QUType_ptr.get(_o+1)); break;
+ case 3: restorePosition(); break;
+ case 4: saveWindowLocation(); break;
+ case 5: moduleClicked((QListViewItem*)static_QUType_ptr.get(_o+1)); break;
+ default:
+ return QgsGrassToolsBase::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsGrassTools::qt_emit( int _id, QUObject* _o )
+{
+ return QgsGrassToolsBase::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassTools::qt_property( int id, int f, QVariant* v)
+{
+ return QgsGrassToolsBase::qt_property( id, f, v);
+}
+
+bool QgsGrassTools::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/grass/qgsgrasstoolsbase.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/grass/qgsgrasstoolsbase.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/grass/qgsgrasstoolsbase.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,101 @@
+/****************************************************************************
+** QgsGrassToolsBase meta object code from reading C++ file 'qgsgrasstoolsbase.h'
+**
+** Created: Fri Apr 7 17:20:38 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsgrasstoolsbase.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsGrassToolsBase::className() const
+{
+ return "QgsGrassToolsBase";
+}
+
+QMetaObject *QgsGrassToolsBase::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsGrassToolsBase( "QgsGrassToolsBase", &QgsGrassToolsBase::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsGrassToolsBase::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassToolsBase", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsGrassToolsBase::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsGrassToolsBase", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsGrassToolsBase::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QMainWindow::staticMetaObject();
+ static const QUMethod slot_0 = {"languageChange", 0, 0 };
+ static const QMetaData slot_tbl[] = {
+ { "languageChange()", &slot_0, QMetaData::Protected }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsGrassToolsBase", parentObject,
+ slot_tbl, 1,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsGrassToolsBase.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsGrassToolsBase::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsGrassToolsBase" ) )
+ return this;
+ return QMainWindow::qt_cast( clname );
+}
+
+bool QgsGrassToolsBase::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: languageChange(); break;
+ default:
+ return QMainWindow::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsGrassToolsBase::qt_emit( int _id, QUObject* _o )
+{
+ return QMainWindow::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsGrassToolsBase::qt_property( int id, int f, QVariant* v)
+{
+ return QMainWindow::qt_property( id, f, v);
+}
+
+bool QgsGrassToolsBase::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/plugins/maplayer/.deps/maplayerplugin_la-maplayertest.Plo
===================================================================
--- packages/qgis/trunk/plugins/maplayer/.deps/maplayerplugin_la-maplayertest.Plo 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/maplayer/.deps/maplayerplugin_la-maplayertest.Plo 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1 @@
+# dummy
Added: packages/qgis/trunk/plugins/maplayer/.deps/maplayerplugin_la-maplayertest.moc.Plo
===================================================================
--- packages/qgis/trunk/plugins/maplayer/.deps/maplayerplugin_la-maplayertest.moc.Plo 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/maplayer/.deps/maplayerplugin_la-maplayertest.moc.Plo 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1 @@
+# dummy
Added: packages/qgis/trunk/plugins/maplayer/Makefile
===================================================================
--- packages/qgis/trunk/plugins/maplayer/Makefile 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/maplayer/Makefile 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,581 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# plugins/maplayer/Makefile. Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+# Copyright (C) 2003 Gary Sherman <sherman at mrcc.com>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+SOURCES = $(maplayerplugin_la_SOURCES)
+
+srcdir = .
+top_srcdir = ../..
+
+pkgdatadir = $(datadir)/qgis
+pkglibdir = $(libdir)/qgis
+pkgincludedir = $(includedir)/qgis
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = i486-pc-linux-gnu
+subdir = plugins/maplayer
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/qgsconfig.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(plugindir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+maplayerplugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) ../../src/libqgis.la
+am__objects_1 =
+am__objects_2 = maplayerplugin_la-maplayertest.moc.lo
+am_maplayerplugin_la_OBJECTS = maplayerplugin_la-maplayertest.lo \
+ $(am__objects_1) $(am__objects_2)
+maplayerplugin_la_OBJECTS = $(am_maplayerplugin_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+DEP_FILES = \
+ ./$(DEPDIR)/maplayerplugin_la-maplayertest.Plo \
+ ./$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Plo
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(maplayerplugin_la_SOURCES)
+DIST_SOURCES = $(maplayerplugin_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = ${SHELL} /home/steve/projects/qgis/debian/qgis-0.7.4/missing --run aclocal-1.8
+AMDEP_FALSE = #
+AMDEP_TRUE =
+AMTAR = ${SHELL} /home/steve/projects/qgis/debian/qgis-0.7.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /home/steve/projects/qgis/debian/qgis-0.7.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/steve/projects/qgis/debian/qgis-0.7.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/steve/projects/qgis/debian/qgis-0.7.4/missing --run automake-1.8
+AWK = gawk
+CC = ccache gcc
+CCDEPMODE = depmode=gcc3
+CFLAGS = -Wall -g -O2
+CPP = ccache gcc -E
+CPPFLAGS =
+CXX = ccache g++
+CXXCPP = ccache g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEBUG_QGIS = -DNO_DEBUG
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+ECHO = echo
+ECHO_C =
+ECHO_N = -n
+ECHO_T =
+EGREP = grep -E
+EXEEXT =
+EXTRA_VERSION = 0
+F77 =
+FFLAGS =
+GDAL_CFLAGS = -I/tmp/buildd/gdal-1.3.2/debian/tmp/usr/include
+GDAL_CONFIG = /usr/bin/gdal-config
+GDAL_LDADD = -L/tmp/buildd/gdal-1.3.2/debian/tmp/usr/lib -lgdal1.3.2
+GEOS_CFLAGS = -I/usr/include
+GEOS_CONFIG = /usr/bin/geos-config
+GEOS_LDADD = -L/usr/lib -lgeos
+GRASS_BASE = /usr/lib/grass
+GRASS_INC = /usr/lib/grass/include/
+GRASS_LIB = -L/usr/lib/grass/lib -lgrass_vect -lgrass_dig2 -lgrass_dbmiclient -lgrass_dbmibase -lgrass_shape -lgrass_dgl -lgrass_rtree -lgrass_gis -lgrass_datetime -lgrass_linkm -lgrass_form -lgrass_gproj
+GSL_CFLAGS = -I/usr/include
+GSL_CONFIG = /usr/bin/gsl-config
+GSL_LIBS = -L/usr/lib -lgsl -lgslcblas -lm
+HAVE_EXPAT_FALSE = #
+HAVE_EXPAT_TRUE =
+HAVE_GRASS = 1
+HAVE_GRASS_FALSE = #
+HAVE_GRASS_TRUE =
+HAVE_GSL_FALSE = #
+HAVE_GSL_TRUE =
+HAVE_POSTGRESQL_FALSE = #
+HAVE_POSTGRESQL_TRUE =
+HAVE_QTMAC_FALSE =
+HAVE_QTMAC_TRUE = #
+HAVE_SPIT_FALSE = #
+HAVE_SPIT_TRUE =
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+INTERFACE_VERSION = 0:1:0
+LDFLAGS =
+LIBOBJS =
+LIBS =
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LN_S = ln -s
+LTLIBOBJS =
+MAJOR_VERSION = 0
+MAKEINFO = ${SHELL} /home/steve/projects/qgis/debian/qgis-0.7.4/missing --run makeinfo
+MICRO_VERSION = 4
+MINOR_VERSION = 7
+MOC = moc
+OBJEXT = o
+PACKAGE = qgis
+PACKAGE_BUGREPORT =
+PACKAGE_NAME =
+PACKAGE_STRING =
+PACKAGE_TARNAME =
+PACKAGE_VERSION =
+PATH_SEPARATOR = :
+PG_CONFIG = /usr/bin/pg_config
+PG_INC = -I/usr/include/postgresql
+PG_LIB = -L/usr/lib -lpq
+PROJ_INC =
+PROJ_LIB = -lproj
+QASSISTANTCLIENT_LDADD = -lqassistantclient
+QEMBED = qembed
+QTDIR = /usr/share/qt3
+QT_CXXFLAGS = -I/usr/share/qt3/include -D_REENTRANT -DQT_THREAD_SUPPORT
+QT_GUILINK =
+QT_LDADD = -L/usr/share/qt3/lib -lqt-mt
+RANLIB = ranlib
+SET_MAKE =
+SHELL = /bin/sh
+SQLITE3_INC =
+SQLITE3_LIB = -lsqlite3
+STRIP = strip
+UIC = uic
+VERSION = 0.7.4
+WITH_COMMUNITY_FALSE =
+WITH_COMMUNITY_TRUE = #
+ac_ct_AR = ar
+ac_ct_CC =
+ac_ct_CXX =
+ac_ct_F77 =
+ac_ct_RANLIB = ranlib
+ac_ct_STRIP = strip
+ac_prefix_program =
+am__fastdepCC_FALSE = #
+am__fastdepCC_TRUE =
+am__fastdepCXX_FALSE = #
+am__fastdepCXX_TRUE =
+am__include = include
+am__leading_dot = .
+am__quote =
+bindir = ${exec_prefix}/bin
+build = i486-pc-linux-gnu
+build_alias = i486-linux-gnu
+build_cpu = i486
+build_os = linux-gnu
+build_vendor = pc
+datadir = ${prefix}/share
+exec_prefix = ${prefix}
+host = i486-pc-linux-gnu
+host_alias = i486-linux-gnu
+host_cpu = i486
+host_os = linux-gnu
+host_vendor = pc
+includedir = ${prefix}/include
+infodir = ${prefix}/share/info
+install_sh = /home/steve/projects/qgis/debian/qgis-0.7.4/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localstatedir = ${prefix}/var
+mandir = ${prefix}/share/man
+mkdir_p = mkdir -p -- .
+oldincludedir = /usr/include
+prefix = /usr
+program_transform_name = s,x,x,
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+sysconfdir = ${prefix}/etc
+target_alias =
+plugindir = ${pkglibdir}
+plugin_LTLIBRARIES = maplayerplugin.la
+maplayer_MOC = maplayertest.moc.cpp
+maplayer_UI =
+maplayerplugin_la_SOURCES = maplayertest.cpp \
+ $(maplayer_UI)\
+ $(maplayer_MOC)
+
+
+# UI dependencies
+maplayerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.la
+maplayerplugin_la_LDFLAGS = -avoid-version -module
+maplayerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I../../src
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/maplayer/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign plugins/maplayer/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
+ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-pluginLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+ done
+
+clean-pluginLTLIBRARIES:
+ -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
+ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+maplayerplugin.la: $(maplayerplugin_la_OBJECTS) $(maplayerplugin_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(plugindir) $(maplayerplugin_la_LDFLAGS) $(maplayerplugin_la_OBJECTS) $(maplayerplugin_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+include ./$(DEPDIR)/maplayerplugin_la-maplayertest.Plo
+include ./$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Plo
+
+.cpp.o:
+ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+# source='$<' object='$@' libtool=no \
+# depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+# source='$<' object='$@' libtool=no \
+# depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+# source='$<' object='$@' libtool=yes \
+# depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(LTCXXCOMPILE) -c -o $@ $<
+
+maplayerplugin_la-maplayertest.o: maplayertest.cpp
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(maplayerplugin_la_CXXFLAGS) $(CXXFLAGS) -MT maplayerplugin_la-maplayertest.o -MD -MP -MF "$(DEPDIR)/maplayerplugin_la-maplayertest.Tpo" -c -o maplayerplugin_la-maplayertest.o `test -f 'maplayertest.cpp' || echo '$(srcdir)/'`maplayertest.cpp; \
+ then mv -f "$(DEPDIR)/maplayerplugin_la-maplayertest.Tpo" "$(DEPDIR)/maplayerplugin_la-maplayertest.Po"; else rm -f "$(DEPDIR)/maplayerplugin_la-maplayertest.Tpo"; exit 1; fi
+# source='maplayertest.cpp' object='maplayerplugin_la-maplayertest.o' libtool=no \
+# depfile='$(DEPDIR)/maplayerplugin_la-maplayertest.Po' tmpdepfile='$(DEPDIR)/maplayerplugin_la-maplayertest.TPo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(maplayerplugin_la_CXXFLAGS) $(CXXFLAGS) -c -o maplayerplugin_la-maplayertest.o `test -f 'maplayertest.cpp' || echo '$(srcdir)/'`maplayertest.cpp
+
+maplayerplugin_la-maplayertest.obj: maplayertest.cpp
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(maplayerplugin_la_CXXFLAGS) $(CXXFLAGS) -MT maplayerplugin_la-maplayertest.obj -MD -MP -MF "$(DEPDIR)/maplayerplugin_la-maplayertest.Tpo" -c -o maplayerplugin_la-maplayertest.obj `if test -f 'maplayertest.cpp'; then $(CYGPATH_W) 'maplayertest.cpp'; else $(CYGPATH_W) '$(srcdir)/maplayertest.cpp'; fi`; \
+ then mv -f "$(DEPDIR)/maplayerplugin_la-maplayertest.Tpo" "$(DEPDIR)/maplayerplugin_la-maplayertest.Po"; else rm -f "$(DEPDIR)/maplayerplugin_la-maplayertest.Tpo"; exit 1; fi
+# source='maplayertest.cpp' object='maplayerplugin_la-maplayertest.obj' libtool=no \
+# depfile='$(DEPDIR)/maplayerplugin_la-maplayertest.Po' tmpdepfile='$(DEPDIR)/maplayerplugin_la-maplayertest.TPo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(maplayerplugin_la_CXXFLAGS) $(CXXFLAGS) -c -o maplayerplugin_la-maplayertest.obj `if test -f 'maplayertest.cpp'; then $(CYGPATH_W) 'maplayertest.cpp'; else $(CYGPATH_W) '$(srcdir)/maplayertest.cpp'; fi`
+
+maplayerplugin_la-maplayertest.lo: maplayertest.cpp
+ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(maplayerplugin_la_CXXFLAGS) $(CXXFLAGS) -MT maplayerplugin_la-maplayertest.lo -MD -MP -MF "$(DEPDIR)/maplayerplugin_la-maplayertest.Tpo" -c -o maplayerplugin_la-maplayertest.lo `test -f 'maplayertest.cpp' || echo '$(srcdir)/'`maplayertest.cpp; \
+ then mv -f "$(DEPDIR)/maplayerplugin_la-maplayertest.Tpo" "$(DEPDIR)/maplayerplugin_la-maplayertest.Plo"; else rm -f "$(DEPDIR)/maplayerplugin_la-maplayertest.Tpo"; exit 1; fi
+# source='maplayertest.cpp' object='maplayerplugin_la-maplayertest.lo' libtool=yes \
+# depfile='$(DEPDIR)/maplayerplugin_la-maplayertest.Plo' tmpdepfile='$(DEPDIR)/maplayerplugin_la-maplayertest.TPlo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(maplayerplugin_la_CXXFLAGS) $(CXXFLAGS) -c -o maplayerplugin_la-maplayertest.lo `test -f 'maplayertest.cpp' || echo '$(srcdir)/'`maplayertest.cpp
+
+maplayerplugin_la-maplayertest.moc.o: maplayertest.moc.cpp
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(maplayerplugin_la_CXXFLAGS) $(CXXFLAGS) -MT maplayerplugin_la-maplayertest.moc.o -MD -MP -MF "$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Tpo" -c -o maplayerplugin_la-maplayertest.moc.o `test -f 'maplayertest.moc.cpp' || echo '$(srcdir)/'`maplayertest.moc.cpp; \
+ then mv -f "$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Tpo" "$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Po"; else rm -f "$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Tpo"; exit 1; fi
+# source='maplayertest.moc.cpp' object='maplayerplugin_la-maplayertest.moc.o' libtool=no \
+# depfile='$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Po' tmpdepfile='$(DEPDIR)/maplayerplugin_la-maplayertest.moc.TPo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(maplayerplugin_la_CXXFLAGS) $(CXXFLAGS) -c -o maplayerplugin_la-maplayertest.moc.o `test -f 'maplayertest.moc.cpp' || echo '$(srcdir)/'`maplayertest.moc.cpp
+
+maplayerplugin_la-maplayertest.moc.obj: maplayertest.moc.cpp
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(maplayerplugin_la_CXXFLAGS) $(CXXFLAGS) -MT maplayerplugin_la-maplayertest.moc.obj -MD -MP -MF "$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Tpo" -c -o maplayerplugin_la-maplayertest.moc.obj `if test -f 'maplayertest.moc.cpp'; then $(CYGPATH_W) 'maplayertest.moc.cpp'; else $(CYGPATH_W) '$(srcdir)/maplayertest.moc.cpp'; fi`; \
+ then mv -f "$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Tpo" "$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Po"; else rm -f "$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Tpo"; exit 1; fi
+# source='maplayertest.moc.cpp' object='maplayerplugin_la-maplayertest.moc.obj' libtool=no \
+# depfile='$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Po' tmpdepfile='$(DEPDIR)/maplayerplugin_la-maplayertest.moc.TPo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(maplayerplugin_la_CXXFLAGS) $(CXXFLAGS) -c -o maplayerplugin_la-maplayertest.moc.obj `if test -f 'maplayertest.moc.cpp'; then $(CYGPATH_W) 'maplayertest.moc.cpp'; else $(CYGPATH_W) '$(srcdir)/maplayertest.moc.cpp'; fi`
+
+maplayerplugin_la-maplayertest.moc.lo: maplayertest.moc.cpp
+ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(maplayerplugin_la_CXXFLAGS) $(CXXFLAGS) -MT maplayerplugin_la-maplayertest.moc.lo -MD -MP -MF "$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Tpo" -c -o maplayerplugin_la-maplayertest.moc.lo `test -f 'maplayertest.moc.cpp' || echo '$(srcdir)/'`maplayertest.moc.cpp; \
+ then mv -f "$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Tpo" "$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Plo"; else rm -f "$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Tpo"; exit 1; fi
+# source='maplayertest.moc.cpp' object='maplayerplugin_la-maplayertest.moc.lo' libtool=yes \
+# depfile='$(DEPDIR)/maplayerplugin_la-maplayertest.moc.Plo' tmpdepfile='$(DEPDIR)/maplayerplugin_la-maplayertest.moc.TPlo' \
+# $(CXXDEPMODE) $(depcomp) \
+# $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(maplayerplugin_la_CXXFLAGS) $(CXXFLAGS) -c -o maplayerplugin_la-maplayertest.moc.lo `test -f 'maplayertest.moc.cpp' || echo '$(srcdir)/'`maplayertest.moc.cpp
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+ for dir in "$(DESTDIR)$(plugindir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pluginLTLIBRARIES
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pluginLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-pluginLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am \
+ uninstall-pluginLTLIBRARIES
+
+
+%.moc.cpp: %.h
+ $(MOC) -o $@ $<
+
+%.h: %.ui
+ $(UIC) -o $@ $<
+
+%.cpp: %.ui
+ $(UIC) -o $@ -impl $*.h $<
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: packages/qgis/trunk/plugins/spit/qgsspitplugin.moc.cpp
===================================================================
--- packages/qgis/trunk/plugins/spit/qgsspitplugin.moc.cpp 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/plugins/spit/qgsspitplugin.moc.cpp 2007-04-04 11:05:37 UTC (rev 695)
@@ -0,0 +1,109 @@
+/****************************************************************************
+** QgsSpitPlugin meta object code from reading C++ file 'qgsspitplugin.h'
+**
+** Created: Fri Apr 7 17:19:46 2006
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#undef QT_NO_COMPAT
+#include "qgsspitplugin.h"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *QgsSpitPlugin::className() const
+{
+ return "QgsSpitPlugin";
+}
+
+QMetaObject *QgsSpitPlugin::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_QgsSpitPlugin( "QgsSpitPlugin", &QgsSpitPlugin::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString QgsSpitPlugin::tr( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsSpitPlugin", s, c, QApplication::DefaultCodec );
+ else
+ return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString QgsSpitPlugin::trUtf8( const char *s, const char *c )
+{
+ if ( qApp )
+ return qApp->translate( "QgsSpitPlugin", s, c, QApplication::UnicodeUTF8 );
+ else
+ return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* QgsSpitPlugin::staticMetaObject()
+{
+ if ( metaObj )
+ return metaObj;
+ QMetaObject* parentObject = QObject::staticMetaObject();
+ static const QUMethod slot_0 = {"initGui", 0, 0 };
+ static const QUMethod slot_1 = {"spit", 0, 0 };
+ static const QUMethod slot_2 = {"unload", 0, 0 };
+ static const QMetaData slot_tbl[] = {
+ { "initGui()", &slot_0, QMetaData::Public },
+ { "spit()", &slot_1, QMetaData::Public },
+ { "unload()", &slot_2, QMetaData::Public }
+ };
+ metaObj = QMetaObject::new_metaobject(
+ "QgsSpitPlugin", parentObject,
+ slot_tbl, 3,
+ 0, 0,
+#ifndef QT_NO_PROPERTIES
+ 0, 0,
+ 0, 0,
+#endif // QT_NO_PROPERTIES
+ 0, 0 );
+ cleanUp_QgsSpitPlugin.setMetaObject( metaObj );
+ return metaObj;
+}
+
+void* QgsSpitPlugin::qt_cast( const char* clname )
+{
+ if ( !qstrcmp( clname, "QgsSpitPlugin" ) )
+ return this;
+ if ( !qstrcmp( clname, "QgisPlugin" ) )
+ return (QgisPlugin*)this;
+ return QObject::qt_cast( clname );
+}
+
+bool QgsSpitPlugin::qt_invoke( int _id, QUObject* _o )
+{
+ switch ( _id - staticMetaObject()->slotOffset() ) {
+ case 0: initGui(); break;
+ case 1: spit(); break;
+ case 2: unload(); break;
+ default:
+ return QObject::qt_invoke( _id, _o );
+ }
+ return TRUE;
+}
+
+bool QgsSpitPlugin::qt_emit( int _id, QUObject* _o )
+{
+ return QObject::qt_emit(_id,_o);
+}
+#ifndef QT_NO_PROPERTIES
+
+bool QgsSpitPlugin::qt_property( int id, int f, QVariant* v)
+{
+ return QObject::qt_property( id, f, v);
+}
+
+bool QgsSpitPlugin::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
Added: packages/qgis/trunk/tools/qgis.m4
===================================================================
--- packages/qgis/trunk/tools/qgis.m4 2007-04-04 11:02:33 UTC (rev 694)
+++ packages/qgis/trunk/tools/qgis.m4 2007-04-04 11:05:37 UTC (rev 695)
@@ -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 <cgabriel at linux.it>, 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+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 <stdio.h>
+], [ 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 <j.obi at troja.net> 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 <qgsfeature.h>
+ 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)
+])
More information about the Pkg-grass-devel
mailing list