[DebianGIS-dev] r1341 - in packages/qgis/branches/upstream/current: . cmake cmake_templates doc i18n images/developers images/icons images/splash mac python python/core python/gui python/plugins python/plugins/plugin_installer resources/context_help scripts src/app src/app/composer src/app/legend src/core src/core/raster src/core/spatialindex/geometry src/core/spatialindex/include src/core/spatialindex/rtree src/core/spatialindex/storagemanager src/core/spatialindex/tools src/gui src/helpviewer src/mac/Contents src/plugins/copyright_label src/plugins/delimited_text src/plugins/geoprocessing src/plugins/georeferencer src/plugins/gps_importer src/plugins/grass src/plugins/grass/config src/plugins/grass/modules src/plugins/grid_maker src/plugins/north_arrow src/plugins/plugin_template src/plugins/scale_bar src/plugins/spit src/plugins/wfs src/providers/delimitedtext src/providers/gpx src/providers/grass src/providers/mysql src/providers/ogr src/providers/postgres src/providers/wfs src/providers/wms src/ui tests/src/core tests/testdata tools/mapserver_export win_build
frankie at alioth.debian.org
frankie at alioth.debian.org
Fri Jan 18 16:51:52 UTC 2008
Author: frankie
Date: 2008-01-18 16:51:06 +0000 (Fri, 18 Jan 2008)
New Revision: 1341
Added:
packages/qgis/branches/upstream/current/CODING
packages/qgis/branches/upstream/current/CODING.t2t
packages/qgis/branches/upstream/current/i18n/qgis_lt.ts
packages/qgis/branches/upstream/current/i18n/qgis_th.ts
packages/qgis/branches/upstream/current/i18n/qt_ja_jp.ts
packages/qgis/branches/upstream/current/i18n/qt_pl.ts
packages/qgis/branches/upstream/current/i18n/qt_pt.ts
packages/qgis/branches/upstream/current/images/developers/Jurgen_Fischer.jpg
packages/qgis/branches/upstream/current/images/developers/Leonardo_Lami.jpg
packages/qgis/branches/upstream/current/images/developers/Tisham_Dhar.jpg
packages/qgis/branches/upstream/current/images/icons/qgis_icon.svg
packages/qgis/branches/upstream/current/mac/release-extra-py.sh
packages/qgis/branches/upstream/current/python/plugins/
packages/qgis/branches/upstream/current/python/plugins/CMakeLists.txt
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/CMakeLists.txt
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/INSTALL
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/LICENSE
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/Makefile
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/README
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/__init__.py
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/dialog.py
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/gui.py
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/gui.ui
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/icon.xpm
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/installer_plugin.py
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/qgis_plugins.py
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/resources.py
packages/qgis/branches/upstream/current/python/plugins/plugin_installer/resources.qrc
packages/qgis/branches/upstream/current/resources/context_help/1033030847_de_DE
packages/qgis/branches/upstream/current/resources/context_help/151694916_de_DE
packages/qgis/branches/upstream/current/resources/context_help/151694916_es_ES
packages/qgis/branches/upstream/current/resources/context_help/165149618_de_DE
packages/qgis/branches/upstream/current/resources/context_help/308026563_de_DE
packages/qgis/branches/upstream/current/resources/context_help/32338213_de_DE
packages/qgis/branches/upstream/current/resources/context_help/361087368_de_DE
packages/qgis/branches/upstream/current/resources/context_help/361087368_es_ES
packages/qgis/branches/upstream/current/resources/context_help/687883780_de_DE
packages/qgis/branches/upstream/current/resources/context_help/689216579_de_DE
packages/qgis/branches/upstream/current/resources/context_help/710979116_de_DE
packages/qgis/branches/upstream/current/resources/context_help/831088384_de_DE
packages/qgis/branches/upstream/current/resources/context_help/863656587_de_DE
packages/qgis/branches/upstream/current/resources/context_help/863656587_es_ES
packages/qgis/branches/upstream/current/resources/context_help/929865718_de_DE
packages/qgis/branches/upstream/current/resources/context_help/939347163_de_DE
packages/qgis/branches/upstream/current/resources/context_help/94000531_de_DE
packages/qgis/branches/upstream/current/resources/context_help/94000531_es_ES
packages/qgis/branches/upstream/current/resources/context_help/985715179_de_DE
packages/qgis/branches/upstream/current/resources/context_help/995980174_de_DE
packages/qgis/branches/upstream/current/src/plugins/georeferencer/qgsgeorefdescriptiondialog.cpp
packages/qgis/branches/upstream/current/src/plugins/georeferencer/qgsgeorefdescriptiondialog.h
packages/qgis/branches/upstream/current/src/plugins/georeferencer/qgsgeorefdescriptiondialogbase.ui
packages/qgis/branches/upstream/current/src/plugins/grass/modules/db.connect.schema.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/db.connect.schema.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/db.in.ogr.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/db.in.ogr.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/m.proj.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/m.proj.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.random.cells.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.reclass.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.reclass.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.reclass.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.recode.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.recode.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.recode.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.resamp.interp.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.resamp.rst.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.resamp.rst.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.resamp.rst.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.resamp.stats.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.build.all.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.build.all.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.bpol.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.bpol.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.break.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.break.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.chbridge.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.chbridge.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.chdangles.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.chdangles.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.prune.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.prune.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.rmarea.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.rmarea.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.rmbridge.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.rmbridge.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.rmdac.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.rmdac.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.rmdangles.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.rmdangles.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.rmdupl.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.rmdupl.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.rmline.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.rmline.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.rmsa.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.rmsa.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.snap.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.clean.snap.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.db.addtable.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.db.addtable.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.db.update_op_query.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.db.update_op_query.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.db.update_op_query.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.dissolve.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.dissolve.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.dissolve.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.segment.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.segment.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.segment.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.surf.bspline.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.surf.bspline.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.surf.bspline.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.transform.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.transform.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.transform.qgm
packages/qgis/branches/upstream/current/tests/src/core/testqgsmaplayer.cpp
packages/qgis/branches/upstream/current/tests/src/core/testqgsrasterlayer.cpp
packages/qgis/branches/upstream/current/tests/testdata/tenbytenraster.asc
Removed:
packages/qgis/branches/upstream/current/doc/install.pdf
packages/qgis/branches/upstream/current/doc/install_guide/
packages/qgis/branches/upstream/current/src/plugins/grass/modules/Thumbs.db
packages/qgis/branches/upstream/current/src/plugins/grass/modules/g.gisenv.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/g.gisenv.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/g.mlist.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/g.mlist.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/g.proj.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/g.proj.ascii.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/g.proj.ascii.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/g.proj.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.circle.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.circle.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.cluster.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.cross.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.in.arc.qgm.sitx
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.info.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.info.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.patch.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.profile.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.profile.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.proj.seg.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.proj.seg.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.random.surface.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.random.surface.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.region.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.region.3Dview.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.region.3Dview.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.series.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.spreadpath.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.spreadpath.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.timestamp.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.timestamp.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.to.rast3.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.to.rast3.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.to.rast3.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.to.rast3elev.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.to.rast3elev.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.to.rast3elev.3.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.to.rast3elev.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r3.in.ascii.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r3.in.ascii.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r3.in.ascii.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r3.in.v5d.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r3.in.v5d.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r3.in.v5d.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.adehabitat.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.adehabitat.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.adehabitat.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.animove.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.animove.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.animove.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.mcp.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.mcp.2.svg
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.mcp.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.to.rast3.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.to.rast3.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.to.rast3.qgm
Modified:
packages/qgis/branches/upstream/current/AUTHORS
packages/qgis/branches/upstream/current/CMakeLists.txt
packages/qgis/branches/upstream/current/CONTRIBUTORS
packages/qgis/branches/upstream/current/ChangeLog
packages/qgis/branches/upstream/current/INSTALL
packages/qgis/branches/upstream/current/INSTALL.t2t
packages/qgis/branches/upstream/current/README
packages/qgis/branches/upstream/current/cmake/Bison.cmake
packages/qgis/branches/upstream/current/cmake/FindExpat.cmake
packages/qgis/branches/upstream/current/cmake/FindGDAL.cmake
packages/qgis/branches/upstream/current/cmake/FindGEOS.cmake
packages/qgis/branches/upstream/current/cmake/FindGRASS.cmake
packages/qgis/branches/upstream/current/cmake/FindGSL.cmake
packages/qgis/branches/upstream/current/cmake/FindPostgres.cmake
packages/qgis/branches/upstream/current/cmake/FindProj.cmake
packages/qgis/branches/upstream/current/cmake/FindSqlite3.cmake
packages/qgis/branches/upstream/current/cmake/Flex.cmake
packages/qgis/branches/upstream/current/cmake/Python.cmake
packages/qgis/branches/upstream/current/cmake_templates/qgsconfig.h.in
packages/qgis/branches/upstream/current/cmake_templates/svnscript.cmake.in_cmake
packages/qgis/branches/upstream/current/doc/CMakeLists.txt
packages/qgis/branches/upstream/current/doc/index.html
packages/qgis/branches/upstream/current/doc/userguide.pdf
packages/qgis/branches/upstream/current/i18n/qgis_cs_CZ.ts
packages/qgis/branches/upstream/current/i18n/qgis_de.ts
packages/qgis/branches/upstream/current/i18n/qgis_es.ts
packages/qgis/branches/upstream/current/i18n/qgis_fr.ts
packages/qgis/branches/upstream/current/i18n/qgis_id.ts
packages/qgis/branches/upstream/current/i18n/qgis_it.ts
packages/qgis/branches/upstream/current/i18n/qgis_ja.ts
packages/qgis/branches/upstream/current/i18n/qgis_lv.ts
packages/qgis/branches/upstream/current/i18n/qgis_mn.ts
packages/qgis/branches/upstream/current/i18n/qgis_nl.ts
packages/qgis/branches/upstream/current/i18n/qgis_pl_PL.ts
packages/qgis/branches/upstream/current/i18n/qgis_pt_BR.ts
packages/qgis/branches/upstream/current/i18n/qgis_ro.ts
packages/qgis/branches/upstream/current/i18n/qgis_ru.ts
packages/qgis/branches/upstream/current/i18n/qgis_sk.ts
packages/qgis/branches/upstream/current/i18n/qgis_sv.ts
packages/qgis/branches/upstream/current/i18n/qgis_tr.ts
packages/qgis/branches/upstream/current/i18n/qgis_vi.ts
packages/qgis/branches/upstream/current/i18n/qgis_zh_CN.ts
packages/qgis/branches/upstream/current/i18n/qt_de.ts
packages/qgis/branches/upstream/current/i18n/qt_es.ts
packages/qgis/branches/upstream/current/i18n/qt_fr.ts
packages/qgis/branches/upstream/current/i18n/qt_ru.ts
packages/qgis/branches/upstream/current/i18n/qt_sk.ts
packages/qgis/branches/upstream/current/i18n/qt_sv.ts
packages/qgis/branches/upstream/current/i18n/qt_zh_CN.ts
packages/qgis/branches/upstream/current/images/splash/splash.png
packages/qgis/branches/upstream/current/images/splash/splash.xcf
packages/qgis/branches/upstream/current/mac/Read Me (Mac).rtf
packages/qgis/branches/upstream/current/mac/install-extra.sh
packages/qgis/branches/upstream/current/mac/release-check.sh
packages/qgis/branches/upstream/current/mac/release-extra-grass.sh
packages/qgis/branches/upstream/current/mac/release-extra-qt.sh
packages/qgis/branches/upstream/current/mac/release-extra.sh
packages/qgis/branches/upstream/current/mac/release-strip.sh
packages/qgis/branches/upstream/current/python/CMakeLists.txt
packages/qgis/branches/upstream/current/python/configure.py.in
packages/qgis/branches/upstream/current/python/core/qgscontinuouscolorrenderer.sip
packages/qgis/branches/upstream/current/python/core/qgsdatasourceuri.sip
packages/qgis/branches/upstream/current/python/core/qgsgraduatedsymbolrenderer.sip
packages/qgis/branches/upstream/current/python/core/qgssinglesymbolrenderer.sip
packages/qgis/branches/upstream/current/python/core/qgsuniquevaluerenderer.sip
packages/qgis/branches/upstream/current/python/core/qgsvectorlayer.sip
packages/qgis/branches/upstream/current/python/gui/qgisinterface.sip
packages/qgis/branches/upstream/current/python/gui/qgsprojectionselector.sip
packages/qgis/branches/upstream/current/python/gui/qgsrubberband.sip
packages/qgis/branches/upstream/current/resources/context_help/361087368_en_US
packages/qgis/branches/upstream/current/resources/context_help/689216579_en_US
packages/qgis/branches/upstream/current/resources/context_help/863656587_en_US
packages/qgis/branches/upstream/current/scripts/build_debian_package.sh
packages/qgis/branches/upstream/current/src/app/CMakeLists.txt
packages/qgis/branches/upstream/current/src/app/composer/qgscomposer.cpp
packages/qgis/branches/upstream/current/src/app/composer/qgscomposerlabel.cpp
packages/qgis/branches/upstream/current/src/app/composer/qgscomposerlabel.h
packages/qgis/branches/upstream/current/src/app/composer/qgscomposermap.cpp
packages/qgis/branches/upstream/current/src/app/composer/qgscomposermap.h
packages/qgis/branches/upstream/current/src/app/composer/qgscomposerpicture.cpp
packages/qgis/branches/upstream/current/src/app/composer/qgscomposerpicture.h
packages/qgis/branches/upstream/current/src/app/composer/qgscomposerscalebar.cpp
packages/qgis/branches/upstream/current/src/app/composer/qgscomposerscalebar.h
packages/qgis/branches/upstream/current/src/app/composer/qgscomposervectorlegend.cpp
packages/qgis/branches/upstream/current/src/app/composer/qgscomposervectorlegend.h
packages/qgis/branches/upstream/current/src/app/composer/qgscomposition.cpp
packages/qgis/branches/upstream/current/src/app/legend/qgslegend.cpp
packages/qgis/branches/upstream/current/src/app/legend/qgslegend.h
packages/qgis/branches/upstream/current/src/app/legend/qgslegendlayerfile.cpp
packages/qgis/branches/upstream/current/src/app/main.cpp
packages/qgis/branches/upstream/current/src/app/qgisapp.cpp
packages/qgis/branches/upstream/current/src/app/qgisappinterface.cpp
packages/qgis/branches/upstream/current/src/app/qgisappinterface.h
packages/qgis/branches/upstream/current/src/app/qgsattributedialog.cpp
packages/qgis/branches/upstream/current/src/app/qgsattributetable.cpp
packages/qgis/branches/upstream/current/src/app/qgsattributetabledisplay.cpp
packages/qgis/branches/upstream/current/src/app/qgsattributetabledisplay.h
packages/qgis/branches/upstream/current/src/app/qgsbookmarks.h
packages/qgis/branches/upstream/current/src/app/qgsdbsourceselect.cpp
packages/qgis/branches/upstream/current/src/app/qgsdbsourceselect.h
packages/qgis/branches/upstream/current/src/app/qgsgraduatedsymboldialog.cpp
packages/qgis/branches/upstream/current/src/app/qgsgraduatedsymboldialog.h
packages/qgis/branches/upstream/current/src/app/qgsidentifyresults.cpp
packages/qgis/branches/upstream/current/src/app/qgslabeldialog.cpp
packages/qgis/branches/upstream/current/src/app/qgsmaptooladdfeature.cpp
packages/qgis/branches/upstream/current/src/app/qgsmaptoolcapture.cpp
packages/qgis/branches/upstream/current/src/app/qgsmaptoolidentify.cpp
packages/qgis/branches/upstream/current/src/app/qgsmaptoolvertexedit.cpp
packages/qgis/branches/upstream/current/src/app/qgsmaptoolvertexedit.h
packages/qgis/branches/upstream/current/src/app/qgsmeasuredialog.cpp
packages/qgis/branches/upstream/current/src/app/qgsmeasuretool.cpp
packages/qgis/branches/upstream/current/src/app/qgsnewconnection.cpp
packages/qgis/branches/upstream/current/src/app/qgsoptions.cpp
packages/qgis/branches/upstream/current/src/app/qgsoptions.h
packages/qgis/branches/upstream/current/src/app/qgspgquerybuilder.cpp
packages/qgis/branches/upstream/current/src/app/qgspgquerybuilder.h
packages/qgis/branches/upstream/current/src/app/qgspluginmanager.cpp
packages/qgis/branches/upstream/current/src/app/qgspluginmanager.h
packages/qgis/branches/upstream/current/src/app/qgspythonutils.cpp
packages/qgis/branches/upstream/current/src/app/qgspythonutils.h
packages/qgis/branches/upstream/current/src/app/qgsrasterlayerproperties.cpp
packages/qgis/branches/upstream/current/src/app/qgsrasterlayerproperties.h
packages/qgis/branches/upstream/current/src/app/qgssearchquerybuilder.cpp
packages/qgis/branches/upstream/current/src/app/qgsserversourceselect.cpp
packages/qgis/branches/upstream/current/src/app/qgsuniquevaluedialog.cpp
packages/qgis/branches/upstream/current/src/app/qgsvectorlayerproperties.cpp
packages/qgis/branches/upstream/current/src/app/qgsvectorlayerproperties.h
packages/qgis/branches/upstream/current/src/core/CMakeLists.txt
packages/qgis/branches/upstream/current/src/core/qgis.cpp
packages/qgis/branches/upstream/current/src/core/qgis.h
packages/qgis/branches/upstream/current/src/core/qgsapplication.cpp
packages/qgis/branches/upstream/current/src/core/qgsapplication.h
packages/qgis/branches/upstream/current/src/core/qgsdatasourceuri.cpp
packages/qgis/branches/upstream/current/src/core/qgsdatasourceuri.h
packages/qgis/branches/upstream/current/src/core/qgsdistancearea.cpp
packages/qgis/branches/upstream/current/src/core/qgsfeature.cpp
packages/qgis/branches/upstream/current/src/core/qgsfeature.h
packages/qgis/branches/upstream/current/src/core/qgsgeometry.cpp
packages/qgis/branches/upstream/current/src/core/qgsgeometryvertexindex.cpp
packages/qgis/branches/upstream/current/src/core/qgsgeometryvertexindex.h
packages/qgis/branches/upstream/current/src/core/qgshttptransaction.cpp
packages/qgis/branches/upstream/current/src/core/qgslabel.cpp
packages/qgis/branches/upstream/current/src/core/qgslabel.h
packages/qgis/branches/upstream/current/src/core/qgslogger.cpp
packages/qgis/branches/upstream/current/src/core/qgslogger.h
packages/qgis/branches/upstream/current/src/core/qgsmaplayer.cpp
packages/qgis/branches/upstream/current/src/core/qgsmaplayerregistry.cpp
packages/qgis/branches/upstream/current/src/core/qgsmaprender.cpp
packages/qgis/branches/upstream/current/src/core/qgsspatialrefsys.cpp
packages/qgis/branches/upstream/current/src/core/qgsvectorfilewriter.cpp
packages/qgis/branches/upstream/current/src/core/qgsvectorfilewriter.h
packages/qgis/branches/upstream/current/src/core/qgsvectorlayer.cpp
packages/qgis/branches/upstream/current/src/core/qgsvectorlayer.h
packages/qgis/branches/upstream/current/src/core/raster/qgsrasterlayer.cpp
packages/qgis/branches/upstream/current/src/core/raster/qgsrasterlayer.h
packages/qgis/branches/upstream/current/src/core/spatialindex/geometry/LineSegment.cc
packages/qgis/branches/upstream/current/src/core/spatialindex/include/RTree.h
packages/qgis/branches/upstream/current/src/core/spatialindex/include/SpatialIndex.h
packages/qgis/branches/upstream/current/src/core/spatialindex/include/Tools.h
packages/qgis/branches/upstream/current/src/core/spatialindex/rtree/BulkLoader.cc
packages/qgis/branches/upstream/current/src/core/spatialindex/rtree/BulkLoader.h
packages/qgis/branches/upstream/current/src/core/spatialindex/rtree/Index.cc
packages/qgis/branches/upstream/current/src/core/spatialindex/rtree/Leaf.cc
packages/qgis/branches/upstream/current/src/core/spatialindex/rtree/Node.cc
packages/qgis/branches/upstream/current/src/core/spatialindex/rtree/RTree.cc
packages/qgis/branches/upstream/current/src/core/spatialindex/storagemanager/DiskStorageManager.cc
packages/qgis/branches/upstream/current/src/core/spatialindex/tools/ExternalSort.cc
packages/qgis/branches/upstream/current/src/core/spatialindex/tools/Tools.cc
packages/qgis/branches/upstream/current/src/gui/CMakeLists.txt
packages/qgis/branches/upstream/current/src/gui/qgisinterface.h
packages/qgis/branches/upstream/current/src/gui/qgsmapcanvas.cpp
packages/qgis/branches/upstream/current/src/gui/qgsmapcanvasmap.cpp
packages/qgis/branches/upstream/current/src/gui/qgsmessageviewer.cpp
packages/qgis/branches/upstream/current/src/gui/qgsmessageviewer.h
packages/qgis/branches/upstream/current/src/gui/qgsrubberband.cpp
packages/qgis/branches/upstream/current/src/gui/qgsrubberband.h
packages/qgis/branches/upstream/current/src/helpviewer/qgshelpviewer.cpp
packages/qgis/branches/upstream/current/src/helpviewer/qgshelpviewer.h
packages/qgis/branches/upstream/current/src/mac/Contents/Info.plist.in
packages/qgis/branches/upstream/current/src/plugins/copyright_label/plugin.cpp
packages/qgis/branches/upstream/current/src/plugins/copyright_label/plugingui.cpp
packages/qgis/branches/upstream/current/src/plugins/copyright_label/plugingui.h
packages/qgis/branches/upstream/current/src/plugins/copyright_label/pluginguibase.ui
packages/qgis/branches/upstream/current/src/plugins/delimited_text/CMakeLists.txt
packages/qgis/branches/upstream/current/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
packages/qgis/branches/upstream/current/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
packages/qgis/branches/upstream/current/src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui
packages/qgis/branches/upstream/current/src/plugins/geoprocessing/qgspggeoprocessing.cpp
packages/qgis/branches/upstream/current/src/plugins/georeferencer/CMakeLists.txt
packages/qgis/branches/upstream/current/src/plugins/georeferencer/mapcoordsdialog.cpp
packages/qgis/branches/upstream/current/src/plugins/georeferencer/plugin.cpp
packages/qgis/branches/upstream/current/src/plugins/georeferencer/plugin.h
packages/qgis/branches/upstream/current/src/plugins/georeferencer/plugingui.cpp
packages/qgis/branches/upstream/current/src/plugins/georeferencer/plugingui.h
packages/qgis/branches/upstream/current/src/plugins/georeferencer/pluginguibase.ui
packages/qgis/branches/upstream/current/src/plugins/georeferencer/qgsgeorefwarpoptionsdialog.cpp
packages/qgis/branches/upstream/current/src/plugins/georeferencer/qgsgeorefwarpoptionsdialog.h
packages/qgis/branches/upstream/current/src/plugins/georeferencer/qgsgeorefwarpoptionsdialogbase.ui
packages/qgis/branches/upstream/current/src/plugins/georeferencer/qgsimagewarper.cpp
packages/qgis/branches/upstream/current/src/plugins/georeferencer/qgsimagewarper.h
packages/qgis/branches/upstream/current/src/plugins/georeferencer/qgsleastsquares.cpp
packages/qgis/branches/upstream/current/src/plugins/georeferencer/qgsleastsquares.h
packages/qgis/branches/upstream/current/src/plugins/georeferencer/qgspointdialog.cpp
packages/qgis/branches/upstream/current/src/plugins/georeferencer/qgspointdialog.h
packages/qgis/branches/upstream/current/src/plugins/georeferencer/qgspointdialogbase.ui
packages/qgis/branches/upstream/current/src/plugins/gps_importer/CMakeLists.txt
packages/qgis/branches/upstream/current/src/plugins/gps_importer/qgsgpsplugin.cpp
packages/qgis/branches/upstream/current/src/plugins/grass/CMakeLists.txt
packages/qgis/branches/upstream/current/src/plugins/grass/config/default.qgc
packages/qgis/branches/upstream/current/src/plugins/grass/modules/CMakeLists.txt
packages/qgis/branches/upstream/current/src/plugins/grass/modules/db.connect.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.contour.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.contour2.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.in.gdal.loc.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.mapcalculator.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.mfilter.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.proj.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.random.cells.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.resamp.interp.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.resamp.interp.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.resamp.stats.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.resamp.stats.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.support.stats.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.support.stats.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.surf.gauss.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.surf.gauss.2.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.surf.gauss.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.surf.random.1.png
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.surf.random.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.texture.bis.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/r.texture.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.build.polylines.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.db.dropcol.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.db.update_const.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.db.update_op.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.db.update_query.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.in.ogr.loc.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.in.ogr.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.out.ogr.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.overlay.not.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.overlay.or.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.overlay.xor.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.sample.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/modules/v.univar.qgm
packages/qgis/branches/upstream/current/src/plugins/grass/qgsgrassattributes.cpp
packages/qgis/branches/upstream/current/src/plugins/grass/qgsgrassedit.cpp
packages/qgis/branches/upstream/current/src/plugins/grass/qgsgrasseditbase.ui
packages/qgis/branches/upstream/current/src/plugins/grass/qgsgrassedittools.cpp
packages/qgis/branches/upstream/current/src/plugins/grass/qgsgrassmodule.cpp
packages/qgis/branches/upstream/current/src/plugins/grass/qgsgrassmodule.h
packages/qgis/branches/upstream/current/src/plugins/grass/qgsgrassnewmapset.cpp
packages/qgis/branches/upstream/current/src/plugins/grass/qgsgrassplugin.cpp
packages/qgis/branches/upstream/current/src/plugins/grass/qgsgrassregion.cpp
packages/qgis/branches/upstream/current/src/plugins/grass/qgsgrassselect.cpp
packages/qgis/branches/upstream/current/src/plugins/grass/qgsgrassshell.cpp
packages/qgis/branches/upstream/current/src/plugins/grass/qgsgrassshell.h
packages/qgis/branches/upstream/current/src/plugins/grass/qgsgrassshellbase.ui
packages/qgis/branches/upstream/current/src/plugins/grass/qgsgrasstools.cpp
packages/qgis/branches/upstream/current/src/plugins/grid_maker/CMakeLists.txt
packages/qgis/branches/upstream/current/src/plugins/grid_maker/plugin.cpp
packages/qgis/branches/upstream/current/src/plugins/north_arrow/CMakeLists.txt
packages/qgis/branches/upstream/current/src/plugins/north_arrow/plugin.cpp
packages/qgis/branches/upstream/current/src/plugins/plugin_template/CMakeLists.txt
packages/qgis/branches/upstream/current/src/plugins/plugin_template/plugin.cpp
packages/qgis/branches/upstream/current/src/plugins/scale_bar/CMakeLists.txt
packages/qgis/branches/upstream/current/src/plugins/scale_bar/plugin.cpp
packages/qgis/branches/upstream/current/src/plugins/spit/CMakeLists.txt
packages/qgis/branches/upstream/current/src/plugins/spit/qgsconnectiondialog.cpp
packages/qgis/branches/upstream/current/src/plugins/spit/qgsshapefile.cpp
packages/qgis/branches/upstream/current/src/plugins/spit/qgsshapefile.h
packages/qgis/branches/upstream/current/src/plugins/spit/qgsspit.cpp
packages/qgis/branches/upstream/current/src/plugins/spit/qgsspitplugin.cpp
packages/qgis/branches/upstream/current/src/plugins/wfs/CMakeLists.txt
packages/qgis/branches/upstream/current/src/plugins/wfs/qgswfsplugin.cpp
packages/qgis/branches/upstream/current/src/plugins/wfs/qgswfssourceselect.cpp
packages/qgis/branches/upstream/current/src/plugins/wfs/qgswfssourceselect.h
packages/qgis/branches/upstream/current/src/providers/delimitedtext/CMakeLists.txt
packages/qgis/branches/upstream/current/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
packages/qgis/branches/upstream/current/src/providers/delimitedtext/qgsdelimitedtextprovider.h
packages/qgis/branches/upstream/current/src/providers/gpx/CMakeLists.txt
packages/qgis/branches/upstream/current/src/providers/gpx/gpsdata.h
packages/qgis/branches/upstream/current/src/providers/gpx/qgsgpxprovider.cpp
packages/qgis/branches/upstream/current/src/providers/grass/CMakeLists.txt
packages/qgis/branches/upstream/current/src/providers/grass/provider.cpp
packages/qgis/branches/upstream/current/src/providers/grass/qgsgrass.cpp
packages/qgis/branches/upstream/current/src/providers/grass/qgsgrass.h
packages/qgis/branches/upstream/current/src/providers/grass/qgsgrassprovider.cpp
packages/qgis/branches/upstream/current/src/providers/grass/qgsgrassprovider.h
packages/qgis/branches/upstream/current/src/providers/mysql/qgsmysqlprovider.cpp
packages/qgis/branches/upstream/current/src/providers/ogr/CMakeLists.txt
packages/qgis/branches/upstream/current/src/providers/ogr/qgsogrfactory.cpp
packages/qgis/branches/upstream/current/src/providers/ogr/qgsogrprovider.cpp
packages/qgis/branches/upstream/current/src/providers/postgres/CMakeLists.txt
packages/qgis/branches/upstream/current/src/providers/postgres/qgspostgresprovider.cpp
packages/qgis/branches/upstream/current/src/providers/postgres/qgspostgresprovider.h
packages/qgis/branches/upstream/current/src/providers/wfs/CMakeLists.txt
packages/qgis/branches/upstream/current/src/providers/wfs/qgswfsdata.cpp
packages/qgis/branches/upstream/current/src/providers/wfs/qgswfsdata.h
packages/qgis/branches/upstream/current/src/providers/wfs/qgswfsprovider.cpp
packages/qgis/branches/upstream/current/src/providers/wfs/qgswfsprovider.h
packages/qgis/branches/upstream/current/src/providers/wms/CMakeLists.txt
packages/qgis/branches/upstream/current/src/providers/wms/qgswmsprovider.cpp
packages/qgis/branches/upstream/current/src/ui/qgsattributeactiondialogbase.ui
packages/qgis/branches/upstream/current/src/ui/qgsattributetablebase.ui
packages/qgis/branches/upstream/current/src/ui/qgsbookmarksbase.ui
packages/qgis/branches/upstream/current/src/ui/qgscomposerbase.ui
packages/qgis/branches/upstream/current/src/ui/qgscomposerlabelbase.ui
packages/qgis/branches/upstream/current/src/ui/qgscomposermapbase.ui
packages/qgis/branches/upstream/current/src/ui/qgscomposerpicturebase.ui
packages/qgis/branches/upstream/current/src/ui/qgscomposerscalebarbase.ui
packages/qgis/branches/upstream/current/src/ui/qgscomposervectorlegendbase.ui
packages/qgis/branches/upstream/current/src/ui/qgscompositionbase.ui
packages/qgis/branches/upstream/current/src/ui/qgsdbsourceselectbase.ui
packages/qgis/branches/upstream/current/src/ui/qgsidentifyresultsbase.ui
packages/qgis/branches/upstream/current/src/ui/qgslabeldialogbase.ui
packages/qgis/branches/upstream/current/src/ui/qgsoptionsbase.ui
packages/qgis/branches/upstream/current/src/ui/qgspluginmanagerbase.ui
packages/qgis/branches/upstream/current/src/ui/qgsprojectionselectorbase.ui
packages/qgis/branches/upstream/current/src/ui/qgsrasterlayerpropertiesbase.ui
packages/qgis/branches/upstream/current/tests/src/core/CMakeLists.txt
packages/qgis/branches/upstream/current/tests/src/core/testqgsvectorfilewriter.cpp
packages/qgis/branches/upstream/current/tools/mapserver_export/ms_export.py
packages/qgis/branches/upstream/current/tools/mapserver_export/qgsmapserverexport.cpp
packages/qgis/branches/upstream/current/tools/mapserver_export/test_export.py
packages/qgis/branches/upstream/current/win_build/python.nsh
packages/qgis/branches/upstream/current/win_build/qgis.nsi
Log:
[svn-upgrade] Integrating new upstream version, qgis (0.9.1)
Modified: packages/qgis/branches/upstream/current/AUTHORS
===================================================================
--- packages/qgis/branches/upstream/current/AUTHORS 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/AUTHORS 2008-01-18 16:51:06 UTC (rev 1341)
@@ -29,3 +29,6 @@
Martin Dobias <wonder.sk at gmail.com>
Brendan Morley <morb at beagle.com.au>
Magnus Homann <magnus at homann.se>
+Jürgen Fischer <jef at norbit.de>
+Tisham Dhar <tisham at apogee.com.au>
+Leonardo Lami <lami at faunalia.it>
Modified: packages/qgis/branches/upstream/current/CMakeLists.txt
===================================================================
--- packages/qgis/branches/upstream/current/CMakeLists.txt 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/CMakeLists.txt 2008-01-18 16:51:06 UTC (rev 1341)
@@ -1,5 +1,5 @@
-PROJECT(qgis0.9.0)
+PROJECT(qgis0.9.1)
# TODO:
# - install includes for libs
@@ -139,13 +139,32 @@
# platform specific stuff
IF (WIN32)
+ SET (DEFAULT_BIN_SUBDIR .)
+ SET (DEFAULT_LIB_SUBDIR .)
+ SET (DEFAULT_DATA_SUBDIR .)
+ SET (DEFAULT_PLUGIN_SUBDIR plugins)
+ SET (DEFAULT_INCLUDE_SUBDIR include)
+
+ IF (MSVC)
+ #tell msvc compiler to use main instead of winmain as the
+ #application entry point
+ SET(QT_USE_QTMAIN TRUE)
+ # Turn on defines for non standard maths stuff
+ ADD_DEFINITIONS(-D_USE_MATH_DEFINES)
- SET (QGIS_BIN_DIR ${CMAKE_INSTALL_PREFIX})
- SET (QGIS_DATA_DIR ${CMAKE_INSTALL_PREFIX})
- SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/plugins)
- SET (QGIS_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
- SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
-
+ # Turn off deprecation warnings
+ ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
+ ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNINGS)
+ # Some file access stuff not defined in native win32
+ # environment
+ ADD_DEFINITIONS(-DF_OK=0)
+ ADD_DEFINITIONS(-DX_OK=1)
+ ADD_DEFINITIONS(-DW_OK=2)
+ ADD_DEFINITIONS(-DR_OK=4)
+
+ FILE(GLOB files "${CMAKE_SOURCE_DIR}/win_build/vcdeps/*.*")
+ INSTALL(FILES ${files} DESTINATION .)
+ ENDIF(MSVC)
ELSE (WIN32)
IF (APPLE)
@@ -156,17 +175,14 @@
ENDIF (APPLE)
# common for MAC and UNIX
- SET (QGIS_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
- SET (QGIS_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/qgis)
- SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis)
- SET(QGIS_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/qgis")
- SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
+ SET (DEFAULT_BIN_SUBDIR bin)
+ SET (DEFAULT_LIB_SUBDIR lib)
+ SET (DEFAULT_DATA_SUBDIR share/qgis)
+ SET (DEFAULT_PLUGIN_SUBDIR lib/qgis)
+ SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
-
IF (UNIX AND NOT APPLE)
ADD_DEFINITIONS(-DPREFIX=\\"${CMAKE_INSTALL_PREFIX}\\")
- ADD_DEFINITIONS(-DPLUGINPATH=\\"${QGIS_PLUGIN_DIR}\\")
- ADD_DEFINITIONS(-DPKGDATAPATH=\\"${QGIS_DATA_DIR}\\")
ENDIF (UNIX AND NOT APPLE)
ENDIF (WIN32)
@@ -189,7 +205,36 @@
ADD_DEFINITIONS(-DGUI_EXPORT=)
ENDIF (WIN32)
+#############################################################
+# user-changeable settings which can be used to customize
+# layout of QGIS installation
+# (default values are platform-specific)
+SET (QGIS_BIN_SUBDIR ${DEFAULT_BIN_SUBDIR} CACHE STRING "Subdirectory where executables will be installed")
+SET (QGIS_LIB_SUBDIR ${DEFAULT_LIB_SUBDIR} CACHE STRING "Subdirectory where libraries will be installed")
+SET (QGIS_DATA_SUBDIR ${DEFAULT_DATA_SUBDIR} CACHE STRING "Subdirectory where QGIS data will be installed")
+SET (QGIS_PLUGIN_SUBDIR ${DEFAULT_PLUGIN_SUBDIR} CACHE STRING "Subdirectory where plugins will be installed")
+SET (QGIS_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING "Subdirectory where header files will be installed")
+
+# mark *_SUBDIR variables as advanced as this is not something
+# that an average user would use
+MARK_AS_ADVANCED (QGIS_BIN_SUBDIR QGIS_LIB_SUBDIR QGIS_DATA_SUBDIR QGIS_PLUGIN_SUBDIR QGIS_INCLUDE_SUBDIR)
+
+# full paths for the installation
+SET (QGIS_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_SUBDIR})
+SET (QGIS_LIB_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_SUBDIR})
+SET (QGIS_DATA_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_DATA_SUBDIR})
+SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_PLUGIN_SUBDIR})
+SET (QGIS_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_INCLUDE_SUBDIR})
+
+# manual page - makes sense only on unix systems
+IF (UNIX)
+ SET (DEFAULT_MANUAL_SUBDIR man)
+ SET (QGIS_MANUAL_SUBDIR ${DEFAULT_MANUAL_SUBDIR} CACHE STRING "Subdirectory where manual files will be installed")
+ MARK_AS_ADVANCED (QGIS_MANUAL_SUBDIR)
+ SET (QGIS_MANUAL_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_MANUAL_SUBDIR})
+ENDIF (UNIX)
+
#############################################################
# create qgsconfig.h
@@ -230,18 +275,24 @@
ENDIF (HAVE_PYTHON)
IF (ENABLE_TESTS)
+ #create a variable to specify where our test data is
+ #so that unit tests can use TEST_DATA_DIR to locate
+ #the test data. See CMakeLists in test dirs for more info
+ SET (TEST_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata")
SUBDIRS(tests)
ENDIF (ENABLE_TESTS)
#############################################################
# install stuff
-INSTALL (FILES AUTHORS SPONSORS
+INSTALL (FILES AUTHORS SPONSORS INSTALL CODING
DESTINATION ${QGIS_DATA_DIR}/doc)
-# manual page... install also on windows?
-INSTALL (FILES qgis.man
- DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
+# manual page - makes sense only on unix systems
+IF (UNIX)
+ INSTALL (FILES qgis.man
+ DESTINATION ${QGIS_MANUAL_DIR}/man1)
+ENDIF (UNIX)
#############################################################
@@ -265,18 +316,20 @@
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
SET(CPACK_PACKAGE_VERSION_MAJOR "0")
SET(CPACK_PACKAGE_VERSION_MINOR "9")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Quantum GIS ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
IF(WIN32 AND NOT UNIX)
# There is a bug in NSI that does not handle full unix paths properly. Make
# sure there is at least one set of four (4) backlasshes.
- SET(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/win_build\\\\sidebar.bmp")
+ SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/win_build\\\\sidebar.bmp")
SET(CPACK_NSIS_INSTALLED_ICON_NAME "\\\\qgis.exe")
SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} Quantum GIS")
SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\qgis.org")
SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\qgis.org")
SET(CPACK_NSIS_CONTACT "tim at linfiniti.com")
SET(CPACK_NSIS_MODIFY_PATH ON)
+
+# SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " !include \\\"${CMAKE_SOURCE_DIR}\\\\win_build\\\\extra.nsh\\\"")
ELSE(WIN32 AND NOT UNIX)
#SET(CPACK_STRIP_FILES "Quantum GIS")
#SET(CPACK_SOURCE_STRIP_FILES "")
Added: packages/qgis/branches/upstream/current/CODING
===================================================================
--- packages/qgis/branches/upstream/current/CODING (rev 0)
+++ packages/qgis/branches/upstream/current/CODING 2008-01-18 16:51:06 UTC (rev 1341)
@@ -0,0 +1,1212 @@
+%!encoding: iso-8859-1
+
+
+------------------------------------------------------------------------
+
+ 1. QGIS Coding Standards
+ 1.1. Classes
+ 1.1.1. Names
+ 1.1.2. Members
+ 1.1.3. Accessor Functions
+ 1.1.4. Functions
+ 1.2. Qt Designer
+ 1.2.1. Generated Classes
+ 1.2.2. Dialogs
+ 1.3. C++ Files
+ 1.3.1. Names
+ 1.3.2. Standard Header and License
+ 1.3.3. CVS Keyword
+ 1.4. Variable Names
+ 1.5. Editing
+ 1.5.1. Tabs
+ 1.5.2. Indentation
+ 1.5.3. Braces
+ 1.6. Coding Style
+ 1.6.1. Where-ever Possible Generalize Code
+ 1.6.2. Prefer Having Constants First in Predicates
+ 1.6.3. Whitespace Can Be Your Friend
+ 1.6.4. Add Trailing Identifying Comments
+ 1.6.5. Use Braces Even for Single Line Statements
+ 1.6.6. Book recommendations
+ 2. SVN Access
+ 2.1. Accessing the Repository
+ 2.2. Anonymous Access
+ 2.3. QGIS documentation sources
+ 2.4. Documentation
+ 2.5. Development in branches
+ 2.5.1. Purpose
+ 2.5.2. Procedure
+ 2.5.3. Creating a branch
+ 2.5.4. Merge regularly from trunk to branch
+ 2.6. Submitting Patches
+ 2.6.1. Patch file naming
+ 2.6.2. Create your patch in the top level QGIS source dir
+ 2.6.3. Including non version controlled files in your patch
+ 2.6.4. Getting your patch noticed
+ 2.6.5. Due Diligence
+ 2.7. Obtaining SVN Write Access
+ 2.7.1. Procedure once you have access
+ 3. Unit Testing
+ 3.1. The QGIS testing framework - an overview
+ 3.2. Creating a unit test
+ 3.3. Adding your unit test to CMakeLists.txt
+ 3.4. Building your unit test
+ 3.5. Run your tests
+ 4. Authors
+
+
+------------------------------------------------------------------------
+
+
+ 1. QGIS Coding Standards
+ ========================
+
+These standards should be followed by all QGIS developers.
+
+
+ 1.1. Classes
+ ============
+
+
+ 1.1.1. Names
+ ============
+
+Class in QGIS begin with Qgs and are formed using mixed case.
+
+
+ Examples:
+ QgsPoint
+ QgsMapCanvas
+ QgsRasterLayer
+
+
+
+ 1.1.2. Members
+ ==============
+
+Class member names begin with a lower case m and are formed using mixed case.
+
+
+ mMapCanvas
+ mCurrentExtent
+
+
+All class members should be private.
+Public class members are STRONGLY discouraged
+
+
+ 1.1.3. Accessor Functions
+ =========================
+
+Class member values should be obtained through accesssor functions. The function should be named without a get prefix. Accessor functions for the two private members above would be:
+
+
+ mapCanvas()
+ currentExtent()
+
+
+
+ 1.1.4. Functions
+ ================
+
+Function names begin with a lowercase letter and are formed using mixed case. The function name should convey something about the purpose of the function.
+
+
+ updateMapExtent()
+ setUserOptions()
+
+
+
+ 1.2. Qt Designer
+ ================
+
+
+ 1.2.1. Generated Classes
+ ========================
+
+QGIS classes that are generated from Qt Designer (ui) files should have a Base suffix. This identifies the class as a generated base class.
+
+
+ Examples:
+ QgsPluginMangerBase
+ QgsUserOptionsBase
+
+
+ 1.2.2. Dialogs
+ ==============
+
+All dialogs should implement the following:
+ * Tooltip help for all toolbar icons and other relevant widgets
+ * WhatsThis help for all widgets on the dialog
+ * An optional (though highly recommended) context sensitive Help button that directs the user to the appropriate help page by launching their web browser
+
+
+ 1.3. C++ Files
+ ==============
+
+
+ 1.3.1. Names
+ ============
+
+C++ implementation and header files should be have a .cpp and .h extension respectively.
+Filename should be all lowercase and, in the case of classes, match the class name.
+
+
+ Example:
+ Class QgsFeatureAttribute source files are
+ qgsfeatureattribute.cpp and qgsfeatureattribute.h
+
+
+
+ 1.3.2. Standard Header and License
+ ==================================
+
+Each source file should contain a header section patterned after the following example:
+
+
+ /***************************************************************************
+ qgsfield.cpp - Describes a field in a layer or table
+ --------------------------------------
+ Date : 01-Jan-2004
+ Copyright : (C) 2004 by Gary E.Sherman
+ Email : sherman at mrcc.com
+ /***************************************************************************
+ * *
+ * 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. *
+ * *
+ ***************************************************************************/
+
+
+
+ 1.3.3. CVS Keyword
+ ==================
+
+Each source file should contain the $Id$ keyword. This will be expanded by CVS to contain useful information about the file, revision, last committer, and date/time of last checkin.
+
+Place the keyword right after the standard header/license that is found at the top of each source file:
+
+
+ /* $Id$ */
+
+
+
+ 1.4. Variable Names
+ ===================
+
+Variable names begin with a lower case letter and are formed using mixed case.
+
+
+ Examples:
+ mapCanvas
+ currentExtent
+
+
+
+ 1.5. Editing
+ ============
+
+Any text editor/IDE can be used to edit QGIS code, providing the following requirements are met.
+
+
+ 1.5.1. Tabs
+ ===========
+
+Set your editor to emulate tabs with spaces. Tab spacing should be set to 2 spaces.
+
+
+ 1.5.2. Indentation
+ ==================
+
+Source code should be indented to improve readability. There is a .indent.pro file in the QGIS src directory that contains the switches to be used when indenting code using the GNU indent program. If you don't use GNU indent, you should emulate these settings.
+
+
+ 1.5.3. Braces
+ =============
+
+Braces should start on the line following the expression:
+
+
+ if(foo == 1)
+ {
+ // do stuff
+ ...
+ }else
+ {
+ // do something else
+ ...
+ }
+
+
+
+ 1.6. Coding Style
+ =================
+
+Here are described some programming hints and tips that will hopefully reduce errors, development time, and maintenance.
+
+
+ 1.6.1. Where-ever Possible Generalize Code
+ ==========================================
+
+
+ If you are cut-n-pasting code, or otherwise writing the same thing more than once, consider consolidating the code
+ into a single function.
+
+
+This will:
+ * allow changes to be made in one location instead of in multiple places
+ * help prevent code bloat
+ * make it more difficult for multiple copies to evolve differences over time, thus making it harder to understand and
+maintain for others
+
+
+ 1.6.2. Prefer Having Constants First in Predicates
+ ==================================================
+
+Prefer to put constants first in predicates.
+
+
+ "0 == value" instead of "value == 0"
+
+
+This will help prevent programmers from accidentally using "=" when they meant to use "==", which can introduce very subtle
+logic bugs. The compiler will generate an error if you accidentally use "=" instead of "==" for comparisons since constants
+inherently cannot be assigned values.
+
+
+ 1.6.3. Whitespace Can Be Your Friend
+ ====================================
+
+Adding spaces between operators, statements, and functions makes it easier for humans to parse code.
+
+Which is easier to read, this:
+
+
+ if (!a&&b)
+
+
+or this:
+
+
+ if ( ! a && b )
+
+
+
+ 1.6.4. Add Trailing Identifying Comments
+ ========================================
+
+Adding comments at the end of function, struct and class implementations makes it easier to find them later.
+
+Consider that you're at the bottom of a source file and need to find a very long function -- without these kinds of trailing
+comments you will have to page up past the body of the function to find its name. Of course this is ok if you wanted to find
+the beginning of the function; but what if you were interested at code near its end? You'd have to page up and then back down
+again to the desired part.
+
+E.g.,
+
+
+ void foo::bar()
+ {
+ // ... imagine a lot of code here
+ } // foo::bar()
+
+
+
+ 1.6.5. Use Braces Even for Single Line Statements
+ =================================================
+
+Using braces for code in if/then blocks or similar code structures even for single line statements means that adding another
+statement is less likely to generate broken code.
+
+Consider:
+
+
+ if (foo)
+ bar();
+ else
+ baz();
+
+
+Adding code after bar() or baz() without adding enclosing braces would create broken code. Though most programmers would
+naturally do that, some may forget to do so in haste.
+
+So, prefer this:
+
+
+ if (foo)
+ {
+ bar();
+ }
+ else
+ {
+ baz();
+ }
+
+
+
+ 1.6.6. Book recommendations
+ ===========================
+
+ * Effective C++ (http://www.awprofessional.com/title/0321334876), Scott Meyers
+ * More Effective C++ (http://www.awprofessional.com/bookstore/product.asp?isbn=020163371X&rl=1), Scott Meyers
+ * Effective STL (http://www.awprofessional.com/title/0201749629), Scott Meyers
+ * Design Patterns (http://www.awprofessional.com/title/0201634988), GoF
+
+
+ 2. SVN Access
+ =============
+
+This page describes how to get started using the QGIS Subversion repository
+
+
+ 2.1. Accessing the Repository
+ =============================
+
+To check out QGIS HEAD:
+
+
+ svn --username [your user name] co https://svn.qgis.org/repos/qgis/trunk/qgis
+
+
+
+ 2.2. Anonymous Access
+ =====================
+
+You can use the following commands to perform an anonymous checkout from the QGIS Subversion repository.
+Note we recommend checking out the trunk (unless you are a developer or really HAVE to have the latest
+changes and dont mind lots of crashing!).
+
+You must have a subversion client installed prior to checking out the code. See the Subversion website
+for more information. The Links page contains a good selection of SVN clients for various platforms.
+
+To check out a branch
+
+
+ svn co https://svn.qgis.org/repos/qgis/branches/<branch name>
+
+To check out SVN stable trunk:
+
+
+ svn co https://svn.qgis.org/repos/qgis/trunk/qgis qgis_unstable
+
+
+/!\ Note: If you are behind a proxy server, edit your ~/subversion/servers file to specify
+your proxy settings first!
+
+/!\ Note: In QGIS we keep our most stable code in trunk. Periodically we will tag a release
+off trunk, and then continue stabilisation and selective incorporation of new features into trunk.
+
+See the INSTALL file in the source tree for specific instructions on building development versions.
+
+
+ 2.3. QGIS documentation sources
+ ===============================
+
+If you're interested in checking out Quantum GIS documentation sources:
+
+
+ svn co https://svn.qgis.org/repos/qgis_docs/trunk qgis_docs
+
+
+You can also take a look at DocumentationWritersCorner for more information.
+
+
+ 2.4. Documentation
+ ==================
+
+The repository is organized as follows:
+
+http://wiki.qgis.org/images/repo.png
+
+See the Subversion book http://svnbook.red-bean.com for information on becoming a SVN master.
+
+
+ 2.5. Development in branches
+ ============================
+
+
+ 2.5.1. Purpose
+ ==============
+
+The complexity of the QGIS source code has increased considerably during the last years. Therefore it is hard
+to anticipate the side effects that the addition of a feature will have. In the past, the QGIS project had very
+long release cycles because it was a lot of work to reetablish the stability of the software system after new
+features were added. To overcome these problems, QGIS switched to a development model where new features are
+coded in svn branches first and merged to trunk (the main branch) when they are finished and stable. This section
+describes the procedure for branching and merging in the QGIS project.
+
+
+ 2.5.2. Procedure
+ ================
+
+ * Initial announcement on mailing list
+Before starting, make an announcement on the developer mailing list to see if another developer is
+already working on the same feature. Also contact the technical advisor of the project steering committee
+(PSC). If the new feature requires any changes to the QGIS architecture, a request for comment (RFC) is needed.
+ * Create a branch
+Create a new svn branch for the development of the new feature (see UsingSubversion for the svn syntax). Now
+you can start developing.
+ * Merge from trunk regularly
+It is recommended to merge the changes in trunk to the branch on a regular basis. This makes it easier to merge
+the branch back to trunk later.
+ * Documentation on wiki
+It is also recommended to document the intended changes and the current status of the work on a wiki page.
+ * Testing before merging back to trunk
+When you are finished with the new feature and happy with the stability, make an announcement on the developer list.
+Before merging back, the changes will be tested by developers and users. Binary packages (especially for OsX and Windows)
+will be generated to also involve non-developers. In trac, a new Component will be opened to file tickets against.
+Once there are no remaining issues left, the technical advisor of the PSC merges the changes into trunk.
+
+
+ 2.5.3. Creating a branch
+ ========================
+
+We prefer that new feature developments happen out of trunk so that trunk remains in a
+stable state. To create a branch use the following command:
+
+
+ svn copy https://svn.qgis.org/repos/qgis/trunk/qgis https://svn.qgis.org/repos/qgis/branches/qgis_newfeature
+ svn commit -m "New feature branch"
+
+
+
+ 2.5.4. Merge regularly from trunk to branch
+ ===========================================
+
+When working in a branch you should regularly merge trunk into it so that your branch does not diverge more
+than necessary. In the top level dir of your branch, first type `svn info` to determine the revision
+numbers of your branch which will produce output something like this:
+
+
+ timlinux at timlinux-desktop:~/dev/cpp/qgis_raster_transparency_branch$ svn info
+ Caminho: .
+ URL: https://svn.qgis.org/repos/qgis/branches/raster_transparency_branch
+ Raiz do Repositório: https://svn.qgis.org/repos/qgis
+ UUID do repositório: c8812cc2-4d05-0410-92ff-de0c093fc19c
+ Revisão: 6546
+ Tipo de Nó: diretório
+ Agendado: normal
+ Autor da Última Mudança: timlinux
+ Revisão da Última Mudança: 6495
+ Data da Última Mudança: 2007-02-02 09:29:47 -0200 (Sex, 02 Fev 2007)
+ Propriedades da Última Mudança: 2007-01-09 11:32:55 -0200 (Ter, 09 Jan 2007)
+
+
+The second revision number shows the revision number of the start revision of your branch and the first the
+current revision. You can do a dry run of the merge like this:
+
+
+ svn merge --dry-run -r 6495:6546 https://svn.qgis.org/repos/qgis/trunk/qgis
+
+
+After you are happy with the changes that will be made do the merge for real like this:
+
+
+ svn merge -r 6495:6546 https://svn.qgis.org/repos/qgis/trunk/qgis
+ svn commit -m "Merged upstream changes from trunk to my branch"
+
+
+
+ 2.6. Submitting Patches
+ =======================
+
+There are a few guidelines that will help you to get your patches into QGIS easily, and help us
+deal with the patches that are sent to use easily.
+
+
+ 2.6.1. Patch file naming
+ ========================
+
+If the patch is a fix for a specific bug, please name the file with the bug number in it e.g.
+bug777fix.diff, and attach it to the original bug report in trac (https://svn.qgis.org/trac).
+
+If the bug is an enhancement or new feature, its usually a good idea to create a ticket in
+trac (https://svn.qgis.org/trac) first and then attach you
+
+
+ 2.6.2. Create your patch in the top level QGIS source dir
+ =========================================================
+
+This makes it easier for us to apply the patches since we don't need to navigate to a specific
+place in the source tree to apply the patch. Also when I receive patches I usually evaluate them
+using kompare, and having the patch from the top level dir makes this much easier. Below is an
+example of you you can include multiple changed files into your patch from the top level directory:
+
+
+ cd qgis
+ svn diff src/ui/somefile.ui src/app/somefile2.cpp > bug872fix.diff
+
+
+
+ 2.6.3. Including non version controlled files in your patch
+ ===========================================================
+
+If your improvements include new files that don't yet exist in the repository, you should indicate
+to svn that they need to be added before generating your patch e.g.
+
+
+ cd qgis
+ svn add src/lib/somenewfile.cpp
+ svn diff > bug7887fix.diff
+
+
+
+ 2.6.4. Getting your patch noticed
+ =================================
+
+QGIS developers are busy folk. We do scan the incoming patches on bug reports but sometimes we miss things.
+Don't be offended or alarmed. Try to identify a developer to help you - using the ["Project Organigram"] and
+contact them asking them if they can look at your patch. If you dont get any response, you can escalate your
+query to one of the Project Steering Committee members (contact details also available on the ["Project Organigram"]).
+
+
+ 2.6.5. Due Diligence
+ ====================
+
+QGIS is licensed under the GPL. You should make every effort to ensure you only submit patches which are
+unencumbered by conflicting intellectual property rights. Also do not submit code that you are not happy to
+have made available under the GPL.
+
+
+ 2.7. Obtaining SVN Write Access
+ ===============================
+
+Write access to QGIS source tree is by invitation. Typically when a person submits several (there is no fixed
+number here) substantial patches that demonstrate basic competance and understanding of C++ and QGIS coding
+conventions, one of the PSC members or other existing developers can nominate that person to the PSC for granting
+of write access. The nominator should give a basic promotional paragraph of why they think that person should gain
+write access. In some cases we will grant write access to non C++ developers e.g. for translators and documentors.
+In these cases, the person should still have demonstrated ability to submit patches and should ideally have submtted
+several substantial patches that demonstrate their understanding of modifying the code base without breaking things, etc.
+
+
+ 2.7.1. Procedure once you have access
+ =====================================
+
+Checkout the sources:
+
+
+ svn co https://svn.qgis.org/repos/qgis/trunk/qgis qgis
+
+
+Build the sources (see INSTALL document for proper detailed instructions)
+
+
+ cd qgis
+ mkdir build
+ ccmake .. (set your preferred options)
+ make
+ make install (maybe you need to do with sudo / root perms)
+
+
+Make your edits
+
+
+ cd ..
+
+
+Make your changes in sources. Always check that everything compiles before making any commits.
+Try to be aware of possible breakages your commits may cause for people building on other
+platforms and with older / newer versions of libraries.
+
+Add files (if you added any new files). The svn status command can be used to quickly see
+if you have added new files.
+
+
+ svn status src/pluguns/grass/modules
+
+
+Files listed with ? in front are not in SVN and possibly need to be added by you:
+
+
+ svn add src/pluguns/grass/modules/foo.xml
+
+
+Commit your changes
+
+
+ svn commit src/pluguns/grass/modules/foo.xml
+
+
+Your editor (as defined in $EDITOR environment variable) will appear and you should make a
+ comment at the top of the file (above the area that says 'dont change this'. Put a
+descriptive comment and rather do several small commits if the changes across a number of
+files are unrelated. Conversely we prefer you to group related changes into a single commit.
+
+Save and close in your editor. The first time you do this, you should be prompted to
+put in your username and password. Just use the same ones as your trac account.
+
+
+ 3. Unit Testing
+ ===============
+
+As of November 2007 we require all new features going into trunk to be accompanied with
+a unit test. Initially we have limited this requirement to qgis_core, and we will extend
+this requirement to other parts of the code base once people are familiar with the
+procedures for unit testing explained in the sections that follow.
+
+
+ 3.1. The QGIS testing framework - an overview
+ ==============================================
+
+Unit testing is carried out using a combination of QTestLib (the Qt testing library) and
+CTest (a framework for compiling and running tests as part of the CMake build process).
+Lets take an overview of the process before I delve into the details:
+
+ * There is some code you want to test, e.g. a class or function. Extreme programming
+ advocates suggest that the code should not even be written yet when you start
+ building your tests, and then as you implement your code you can immediately validate
+ each new functional part you add with your test. In practive you will probably
+ need to write tests for pre-existing code in QGIS since we are starting with a testing
+ framework well after much application logic has already been implemented.
+
+ * You create a unit test. This happens under <QGIS Source Dir>/tests/src/core
+ in the case of the core lib. The test is basically a client that creates an instance
+ of a class and calls some methods on that class. It will check the return from each
+ method to make sure it matches the expected value. If any one of the calls fails,
+ the unit will fail.
+
+ * You include QtTestLib macros in your test class. This macro is processed by
+ the Qt meta object compiler (moc) and expands your test class into a runnable application.
+
+ * You add a section to the CMakeLists.txt in your tests directory that will
+ build your test.
+
+ * You ensure you have ENABLE_TESTING enabled in ccmake / cmakesetup. This
+ will ensure your tests actually get compiled when you type make.
+
+ * You optionally add test data to <QGIS Source Dir>/tests/testdata if your
+ test is data driven (e.g. needs to load a shapefile). These test data should be
+ as small as possible and wherever possible you should use the existing datasets
+ already there. Your tests should never modify this data in situ, but rather
+ may a temporary copy somewhere if needed.
+
+ * You compile your sources and install. Do this using normal make && (sudo)
+ make install procedure.
+
+ * You run your tests. This is normally done simply by doing make test
+ after the make install step, though I will explain other aproaches that offer more
+ fine grained control over running tests.
+
+Right with that overview in mind, I will delve into a bit of detail. I've already
+done much of the configuration for you in CMake and other places in the source tree
+so all you need to do are the easy bits - writing unit tests!
+
+
+ 3.2. Creating a unit test
+ =========================
+
+Creating a unit test is easy - typically you will do this by just creating a
+single .cpp file (not .h file is used) and implement all your test methods as
+public methods that return void. I'll use a simple test class for QgsRasterLayer
+throughout the section that follows to illustrate. By convention we will name our
+test with the same name as the class they are testing but prefixed with 'Test'.
+So our test implementation goes in a file called testqgsrasterlayer.cpp and
+the class itself will be TestQgsRasterLayer. First we add our standard copyright
+banner:
+
+
+ /***************************************************************************
+ testqgsvectorfilewriter.cpp
+ --------------------------------------
+ Date : Frida Nov 23 2007
+ Copyright : (C) 2007 by Tim Sutton
+ Email : tim at linfiniti.com
+ ***************************************************************************
+ * *
+ * 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. *
+ * *
+ ***************************************************************************/
+
+
+Next we use start our includes needed for the tests we plan to run. There is
+one special include all tests should have:
+
+
+ #include <QtTest>
+
+
+Beyond that you just continue implementing your class as per normal, pulling
+in whatever headers you may need:
+
+
+ //Qt includes...
+ #include <QObject>
+ #include <QString>
+ #include <QObject>
+ #include <QApplication>
+ #include <QFileInfo>
+ #include <QDir>
+
+ //qgis includes...
+ #include <qgsrasterlayer.h>
+ #include <qgsrasterbandstats.h>
+ #include <qgsapplication.h>
+
+
+Since we are combining both class declaration and implementation in a single
+file the class declaration comes next. We start with our doxygen documentation.
+Every test case should be properly documented. We use the doxygen ingroup
+directive so that all the UnitTests appear as a module in the generated
+Doxygen documentation. After that comes a short description of the unit test:
+
+
+ /** \ingroup UnitTests
+ * This is a unit test for the QgsRasterLayer class.
+ */
+
+
+The class must inherit from QObject and include the Q_OBJECT macro.
+
+
+ class TestQgsRasterLayer: public QObject
+ {
+ Q_OBJECT;
+
+
+All our test methods are implemented as private slots. The QtTest framework
+will sequentially call each private slot method in the test class. There are
+four 'special' methods which if implemented will be called at the start of
+the unit test (initTestCase), at the end of the unit test (cleanupTestCase).
+Before each test method is called, the init() method will be called and
+after each test method is called the cleanup() method is called. These
+methods are handy in that they allow you to allocate and cleanup resources
+prior to running each test, and the test unit as a whole.
+
+
+ private slots:
+ // will be called before the first testfunction is executed.
+ void initTestCase();
+ // will be called after the last testfunction was executed.
+ void cleanupTestCase(){};
+ // will be called before each testfunction is executed.
+ void init(){};
+ // will be called after every testfunction.
+ void cleanup();
+
+
+Then come your test methods, all of which should take no parameters and
+should return void. The methods will be called in order of declaration.
+I am implementing two methods here which illustrates to types of testing. In
+the first case I want to generally test the various parts of the class are
+working, I can use a functional testing approach. Once again, extreme
+programmers would advocate writing these tests before implementing the
+class. Then as you work your way through your class implementation you
+iteratively run your unit tests. More and more test functions should complete
+sucessfully as your class implementation work progresses, and when the whole
+unit test passes, your new class is done and is now complete with a repeatable
+way to validate it.
+
+Typically your unit tests would only cover the public API of your
+class, and normally you do not need to write tests for accessors and mutators.
+If it should happen that an acccessor or mutator is not working as expected
+you would normally implement a regression test to check for this (see
+lower down).
+
+
+ //
+ // Functional Testing
+ //
+
+ /** Check if a raster is valid. */
+ void isValid();
+
+ // more functional tests here ...
+
+
+Next we implement our regression tests. Regression tests should be
+implemented to replicate the conditions of a particular bug. For example
+I recently received a report by email that the cell count by rasters was
+off by 1, throwing off all the statistics for the raster bands. I opened
+a bug (ticket #832) and then created a regression test that replicated
+the bug using a small test dataset (a 10x10 raster). Then I ran the test
+and ran it, verifying that it did indeed fail (the cell count was 99
+instead of 100). Then I went to fix the bug and reran the unit test and
+the regression test passed. I committed the regression test along with
+the bug fix. Now if anybody breakes this in the source code again in the
+future, we can immediatly identify that the code has regressed. Better
+yet before committing any changes in the future, running our tests will
+ensure our changes dont have unexpected side effects - like breaking
+existing functionality.
+
+There is one more benifit to regression tests - they can save you time.
+If you ever fixed a bug that involved making changes to the source,
+and then running the application and performing a series of convoluted
+steps to replicate the issue, it will be immediately apparent that
+simply implementing your regression test before fixing the bug
+will let you automate the testing for bug resolution in an efficient
+manner.
+
+To implement your regression test, you should follow the naming
+convention of regression<TicketID> for your test functions. If no
+trac ticket exists for the regression, you should create one first.
+Using this approach allows the person running a failed regression
+test easily go and find out more information.
+
+
+ //
+ // Regression Testing
+ //
+
+ /** This is our second test case...to check if a raster
+ reports its dimensions properly. It is a regression test
+ for ticket #832 which was fixed with change r7650.
+ */
+ void regression832();
+
+ // more regression tests go here ...
+
+
+Finally in our test class declaration you can declare privately
+any data members and helper methods your unit test may need. In our
+case I will declare a QgsRasterLayer * which can be used by any
+of our test methods. The raster layer will be created in the
+initTestCase() function which is run before any other tests, and then
+destroyed using cleanupTestCase() which is run after all tests. By
+declaring helper methods (which may be called by various test
+functions) privately, you can ensure that they wont be automatically
+run by the QTest executeable that is created when we compile our test.
+
+
+ private:
+ // Here we have any data structures that may need to
+ // be used in many test cases.
+ QgsRasterLayer * mpLayer;
+ };
+
+
+
+That ends our class declaration. The implementation is simply
+inlined in the same file lower down. First our init and cleanup functions:
+
+
+ void TestQgsRasterLayer::initTestCase()
+ {
+ // init QGIS's paths - true means that all path will be inited from prefix
+ QString qgisPath = QCoreApplication::applicationDirPath ();
+ QgsApplication::setPrefixPath(qgisPath, TRUE);
+ #ifdef Q_OS_LINUX
+ QgsApplication::setPkgDataPath(qgisPath + "/../share/qgis");
+ #endif
+ //create some objects that will be used in all tests...
+
+ std::cout << "Prefix PATH: " << QgsApplication::prefixPath().toLocal8Bit().data() << std::endl;
+ std::cout << "Plugin PATH: " << QgsApplication::pluginPath().toLocal8Bit().data() << std::endl;
+ std::cout << "PkgData PATH: " << QgsApplication::pkgDataPath().toLocal8Bit().data() << std::endl;
+ std::cout << "User DB PATH: " << QgsApplication::qgisUserDbFilePath().toLocal8Bit().data() << std::endl;
+
+ //create a raster layer that will be used in all tests...
+ QString myFileName (TEST_DATA_DIR); //defined in CmakeLists.txt
+ myFileName = myFileName + QDir::separator() + "tenbytenraster.asc";
+ QFileInfo myRasterFileInfo ( myFileName );
+ mpLayer = new QgsRasterLayer ( myRasterFileInfo.filePath(),
+ myRasterFileInfo.completeBaseName() );
+ }
+
+ void TestQgsRasterLayer::cleanupTestCase()
+ {
+ delete mpLayer;
+ }
+
+
+
+The above init function illustrates a couple of interesting things.
+
+ 1. I needed to manually set the QGIS application data path so that
+ resources such as srs.db can be found properly.
+ 2. Secondly, this is a data driven test so we needed to provide a
+ way to generically locate the 'tenbytenraster.asc file. This was
+ achieved by using the compiler define TEST_DATA_PATH. The
+ define is created in the CMakeLists.txt configuration file under
+ <QGIS Source Root>/tests/CMakeLists.txt and is available to all
+ QGIS unit tests. If you need test data for your test, commit it
+ under <QGIS Source Root>/tests/testdata. You should only commit
+ very small datasets here. If your test needs to modify the test
+ data, it should make a copy of if first.
+
+Qt also provides some other interesting mechanisms for data driven
+testing, so if you are interested to know more on the topic, consult
+the Qt documentation.
+
+Next lets look at our functional test. The isValid() test simply
+checks the raster layer was correctly loaded in the initTestCase.
+QVERIFY is a Qt macro that you can use to evaluate a test condition.
+There are a few other use macros Qt provide for use in your tests
+including:
+
+
+ QCOMPARE ( actual, expected )
+ QEXPECT_FAIL ( dataIndex, comment, mode )
+ QFAIL ( message )
+ QFETCH ( type, name )
+ QSKIP ( description, mode )
+ QTEST ( actual, testElement )
+ QTEST_APPLESS_MAIN ( TestClass )
+ QTEST_MAIN ( TestClass )
+ QTEST_NOOP_MAIN ()
+ QVERIFY2 ( condition, message )
+ QVERIFY ( condition )
+ QWARN ( message )
+
+
+Some of these macros are useful only when using the Qt framework
+for data driven testing (see the Qt docs for more detail).
+
+
+ void TestQgsRasterLayer::isValid()
+ {
+ QVERIFY ( mpLayer->isValid() );
+ }
+
+
+Normally your functional tests would cover all the range of
+functionality of your classes public API where feasible. With our
+functional tests out the way, we can look at our regression test example.
+
+Since the issue in bug #832 is a misreported cell count, writing
+our test if simply a matter of using QVERIFY to check that the
+cell count meets the expected value:
+
+
+ void TestQgsRasterLayer::regression832()
+ {
+ QVERIFY ( mpLayer->getRasterXDim() == 10 );
+ QVERIFY ( mpLayer->getRasterYDim() == 10 );
+ // regression check for ticket #832
+ // note getRasterBandStats call is base 1
+ QVERIFY ( mpLayer->getRasterBandStats(1).elementCountInt == 100 );
+ }
+
+
+With all the unit test functions implemented, there one final thing we
+need to add to our test class:
+
+
+ QTEST_MAIN(TestQgsRasterLayer)
+ #include "moc_testqgsrasterlayer.cxx"
+
+
+The purpose of these two lines is to signal to Qt's moc that his is a
+QtTest (it will generate a main method that in turn calls each test funtion.
+The last line is the include for the MOC generated sources. You should
+replace 'testqgsrasterlayer' with the name of your class in lower case.
+
+
+ 3.3. Adding your unit test to CMakeLists.txt
+ ============================================
+
+Adding your unit test to the build system is simply a matter of editing
+the CMakeLists.txt in the test directory, cloning one of the existing
+test blocks, and then search and replacing your test class name into it.
+For example:
+
+
+ #
+ # QgsRasterLayer test
+ #
+ SET(qgis_rasterlayertest_SRCS testqgsrasterlayer.cpp)
+ SET(qgis_rasterlayertest_MOC_CPPS testqgsrasterlayer.cpp)
+ QT4_WRAP_CPP(qgis_rasterlayertest_MOC_SRCS ${qgis_rasterlayertest_MOC_CPPS})
+ ADD_CUSTOM_TARGET(qgis_rasterlayertestmoc ALL DEPENDS ${qgis_rasterlayertest_MOC_SRCS})
+ ADD_EXECUTABLE(qgis_rasterlayertest ${qgis_rasterlayertest_SRCS})
+ ADD_DEPENDENCIES(qgis_rasterlayertest qgis_rasterlayertestmoc)
+ TARGET_LINK_LIBRARIES(qgis_rasterlayertest ${QT_LIBRARIES} qgis_core)
+ INSTALL(TARGETS qgis_rasterlayertest RUNTIME DESTINATION ${QGIS_BIN_DIR})
+ ADD_TEST(qgis_rasterlayertest ${QGIS_BIN_DIR}/qgis_rasterlayertest)
+
+
+I'll run through these lines briefly to explain what they do, but if
+you are not interested, just clone the block, search and replace e.g.
+
+
+ :'<,'>s/rasterlayer/mynewtest/g
+
+
+Lets look a little more in detail at the individual lines. First we
+define the list of sources for our test. Since we have only one source file
+(following the methodology I described above where class declaration and
+definition are in the same file) its a simple statement:
+
+
+ SET(qgis_rasterlayertest_SRCS testqgsrasterlayer.cpp)
+
+
+Since our test class needs to be run through the Qt meta object compiler (moc)
+we need to provide a couple of lines to make that happen too:
+
+
+ SET(qgis_rasterlayertest_MOC_CPPS testqgsrasterlayer.cpp)
+ QT4_WRAP_CPP(qgis_rasterlayertest_MOC_SRCS ${qgis_rasterlayertest_MOC_CPPS})
+ ADD_CUSTOM_TARGET(qgis_rasterlayertestmoc ALL DEPENDS ${qgis_rasterlayertest_MOC_SRCS})
+
+
+Next we tell cmake that it must make an executeable from the test class.
+Remember in the previous section on the last line of the class implementation
+I included the moc outputs directly into our test class, so that will
+give it (among other things) a main method so the class can be
+compiled as an executeable:
+
+
+ ADD_EXECUTABLE(qgis_rasterlayertest ${qgis_rasterlayertest_SRCS})
+ ADD_DEPENDENCIES(qgis_rasterlayertest qgis_rasterlayertestmoc)
+
+
+Next we need to specify any library dependencies. At the moment classes
+have been implemented with a catch-all QT_LIBRARIES dependency, but I will
+be working to replace that with the specific Qt libraries that each class
+needs only. Of course you also need to link to the relevant qgis
+libraries as required by your unit test.
+
+
+ TARGET_LINK_LIBRARIES(qgis_rasterlayertest ${QT_LIBRARIES} qgis_core)
+
+
+Next I tell cmake to the same place as the qgis binaries itself. This
+is something I plan to remove in the future so that the tests can
+run directly from inside the source tree.
+
+
+ INSTALL(TARGETS qgis_rasterlayertest RUNTIME DESTINATION ${QGIS_BIN_DIR})
+
+
+Finally here is where the best magic happens - we register the class with
+ctest. If you recall in the overview I gave in the beginning of this
+section we are using both QtTest and CTest together. To recap, QtTest adds a
+main method to your test unit and handles calling your test methods within
+the class. It also provides some macros like QVERIFY that you can use as
+to test for failure of the tests using conditions. The output from
+a QtTest unit test is an executeable which you can run from the command line.
+However when you have a suite of tests and you want to run each executeable
+in turn, and better yet integrate running tests into the build process,
+the CTest is what we use. The next line registers the unit test with
+CMake / CTest.
+
+
+ ADD_TEST(qgis_rasterlayertest ${QGIS_BIN_DIR}/qgis_rasterlayertest)
+
+
+The last thing I should add is that if your test requires optional
+parts of the build process (e.g. Postgresql support, GSL libs, GRASS etc.),
+you should take care to enclose you test block inside a IF () block
+in the CMakeLists.txt file.
+
+
+ 3.4. Building your unit test
+ ============================
+
+To build the unit test you need only to make sure that ENABLE_TESTS=true
+in the cmake configuration. There are two ways to do this:
+
+ 1. Run ccmake .. (cmakesetup .. under windows) and interactively set
+ the ENABLE_TESTS flag to ON.
+ 1. Add a command line flag to cmake e.g. cmake -DENABLE_TESTS=true ..
+
+Other than that, just build QGIS as per normal and the tests should build
+too.
+
+
+ 3.5. Run your tests
+ ===================
+
+The simplest way to run the tests is as part of your normal build process:
+
+
+ make && make install && make test
+
+
+The make test command will invoke CTest which will run each test that
+was registered using the ADD_TEST CMake directive described above. Typical
+output from make test will look like this:
+
+
+ Running tests...
+ Start processing tests
+ Test project /Users/tim/dev/cpp/qgis/build
+ 1/ 3 Testing qgis_applicationtest ***Exception: Other
+ 2/ 3 Testing qgis_filewritertest *** Passed
+ 3/ 3 Testing qgis_rasterlayertest *** Passed
+
+ 0% tests passed, 3 tests failed out of 3
+
+ The following tests FAILED:
+ 1 - qgis_applicationtest (OTHER_FAULT)
+ Errors while running CTest
+ make: *** [test] Error 8
+
+
+If a test fails, you can use the ctest command to examine more
+closely why it failed. User the -R option to specify a regex for
+which tests you want to run and -V to get verbose output:
+
+
+ [build] ctest -R appl -V
+ Start processing tests
+ Test project /Users/tim/dev/cpp/qgis/build
+ Constructing a list of tests
+ Done constructing a list of tests
+ Changing directory into /Users/tim/dev/cpp/qgis/build/tests/src/core
+ 1/ 3 Testing qgis_applicationtest
+ Test command: /Users/tim/dev/cpp/qgis/build/tests/src/core/qgis_applicationtest
+ ********* Start testing of TestQgsApplication *********
+ Config: Using QTest library 4.3.0, Qt 4.3.0
+ PASS : TestQgsApplication::initTestCase()
+ Prefix PATH: /Users/tim/dev/cpp/qgis/build/tests/src/core/../
+ Plugin PATH: /Users/tim/dev/cpp/qgis/build/tests/src/core/..//lib/qgis
+ PkgData PATH: /Users/tim/dev/cpp/qgis/build/tests/src/core/..//share/qgis
+ User DB PATH: /Users/tim/.qgis/qgis.db
+ PASS : TestQgsApplication::getPaths()
+ Prefix PATH: /Users/tim/dev/cpp/qgis/build/tests/src/core/../
+ Plugin PATH: /Users/tim/dev/cpp/qgis/build/tests/src/core/..//lib/qgis
+ PkgData PATH: /Users/tim/dev/cpp/qgis/build/tests/src/core/..//share/qgis
+ User DB PATH: /Users/tim/.qgis/qgis.db
+ QDEBUG : TestQgsApplication::checkTheme() Checking if a theme icon exists:
+ QDEBUG : TestQgsApplication::checkTheme()
+ /Users/tim/dev/cpp/qgis/build/tests/src/core/..//share/qgis/themes/default//mIconProjectionDisabled.png
+ FAIL! : TestQgsApplication::checkTheme() '!myPixmap.isNull()' returned FALSE. ()
+ Loc: [/Users/tim/dev/cpp/qgis/tests/src/core/testqgsapplication.cpp(59)]
+ PASS : TestQgsApplication::cleanupTestCase()
+ Totals: 3 passed, 1 failed, 0 skipped
+ ********* Finished testing of TestQgsApplication *********
+ -- Process completed
+ ***Failed
+
+ 0% tests passed, 1 tests failed out of 1
+
+ The following tests FAILED:
+ 1 - qgis_applicationtest (Failed)
+ Errors while running CTest
+
+
+
+Well that concludes this section on writing unit tests in QGIS. We hope you
+will get into the habit of writing test to test new functionality and to
+check for regressions. Some aspects of the test system (in particular the
+CMakeLists.txt parts) are still being worked on so that the testing framework
+works in a truly platform way. I will update this document as things progress.
+
+
+ 4. Authors
+ ==========
+
+ * Tim Sutton (author and editor)
+ * Gary Sherman
+ * Marco Hugentobler
+
+Original pages from wiki to deprecate:
+
+ * http://wiki.qgis.org/qgiswiki/CodingGuidelines (./)
+ * http://wiki.qgis.org/qgiswiki/CodingStandards (./)
+ * http://wiki.qgis.org/qgiswiki/UsingSubversion (./)
+ * http://wiki.qgis.org/qgiswiki/DebuggingPlugins
+ * http://wiki.qgis.org/qgiswiki/DevelopmentInBranches (./)
+ * http://wiki.qgis.org/qgiswiki/SubmittingPatchesAndSvnAccess (./)
+
+
+
+
+
Added: packages/qgis/branches/upstream/current/CODING.t2t
===================================================================
--- packages/qgis/branches/upstream/current/CODING.t2t (rev 0)
+++ packages/qgis/branches/upstream/current/CODING.t2t 2008-01-18 16:51:06 UTC (rev 1341)
@@ -0,0 +1,1081 @@
+%!encoding: iso-8859-1
+
+
+% These are comments and will not be generated in any output
+% -------------------
+
+%This document is in text2tags format. You can generate html, plain text and
+%moinmoin formatted documentation by running txt2tags on this document. See the
+%txt2tags home page for more details. Please insert manual line breaks in this
+%document as it makes diffing for changes much easier. To do this in vim
+%automatically, select a section then issue (gq) command. Please dont
+%apply vim formatting to the whole document as it screws up some formatting
+%rather apply it selectively to paragraphs where needed.
+
+% To generate the text version of this document:
+% txt2tags -t txt --toc --enum-title -o CODING CODING.t2t
+% To generate the moinmoin version of this document
+% txt2tags -t moin --toc --enum-title -o CODING.moin CODING.t2t
+
+% End of comments
+% -------------------
+
+
+%-----------------------------------------------------------------
+% Insert the following preamble on moinmoin generated output
+%-----------------------------------------------------------------
+
+%/!\ **Note:** Please do not edit this document directly.
+%
+%/!\ **Note:** Please do not remove this notice.
+%
+%(!) This document was generated using text2tags from INSTALL.t2t in the QGIS sources. Make your
+% edits to that file and use t2t to regenerate in moinmoin %format, then paste the procedure in below.
+%I have instated these changes so that we can have a single central document that contains all the
+%instructions developers contributing to QGIS. This page should always reflect the most current SVN trunk build
+%procedure - for release versions the CODING document in the sources will be generated according
+%to the current build procedure at the time.
+
+%Tim Sutton 2007
+
+%-----------------------------------------------------------------
+% Preamble ends
+%-----------------------------------------------------------------
+
+= QGIS Coding Standards =
+
+
+These standards should be followed by all QGIS developers.
+
+== Classes ==
+=== Names ===
+Class in QGIS begin with Qgs and are formed using mixed case.
+```
+Examples:
+ QgsPoint
+ QgsMapCanvas
+ QgsRasterLayer
+```
+
+=== Members ===
+Class member names begin with a lower case //m// and are formed using mixed case.
+```
+ mMapCanvas
+ mCurrentExtent
+```
+
+All class members should be private.
+**Public class members are STRONGLY discouraged**
+=== Accessor Functions ===
+Class member values should be obtained through accesssor functions. The function should be named without a //get// prefix. Accessor functions for the two private members above would be:
+```
+ mapCanvas()
+ currentExtent()
+```
+
+=== Functions ===
+Function names begin with a lowercase letter and are formed using mixed case. The function name should convey something about the purpose of the function.
+```
+ updateMapExtent()
+ setUserOptions()
+```
+
+== Qt Designer ==
+=== Generated Classes ===
+QGIS classes that are generated from Qt Designer (ui) files should have a //Base// suffix. This identifies the class as a generated base class.
+```
+Examples:
+ QgsPluginMangerBase
+ QgsUserOptionsBase
+```
+=== Dialogs ===
+All dialogs should implement the following:
+ * Tooltip help for all toolbar icons and other relevant widgets
+ * WhatsThis help for **all** widgets on the dialog
+ * An optional (though highly recommended) context sensitive //Help// button that directs the user to the appropriate help page by launching their web browser
+== C++ Files ==
+=== Names ===
+C++ implementation and header files should be have a .cpp and .h extension respectively.
+Filename should be all lowercase and, in the case of classes, match the class name.
+```
+Example:
+ Class QgsFeatureAttribute source files are
+ qgsfeatureattribute.cpp and qgsfeatureattribute.h
+```
+
+=== Standard Header and License ===
+Each source file should contain a header section patterned after the following example:
+```
+/***************************************************************************
+ qgsfield.cpp - Describes a field in a layer or table
+ --------------------------------------
+ Date : 01-Jan-2004
+ Copyright : (C) 2004 by Gary E.Sherman
+ Email : sherman at mrcc.com
+/***************************************************************************
+ * *
+ * 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. *
+ * *
+ ***************************************************************************/
+```
+
+=== CVS Keyword ===
+Each source file should contain the $Id$ keyword. This will be expanded by CVS to contain useful information about the file, revision, last committer, and date/time of last checkin.
+
+Place the keyword right after the standard header/license that is found at the top of each source file:
+```
+ /* $Id$ */
+```
+
+== Variable Names ==
+Variable names begin with a lower case letter and are formed using mixed case.
+```
+Examples:
+ mapCanvas
+ currentExtent
+```
+
+== Editing ==
+Any text editor/IDE can be used to edit QGIS code, providing the following requirements are met.
+
+=== Tabs ===
+Set your editor to emulate tabs with spaces. Tab spacing should be set to 2 spaces.
+
+=== Indentation ===
+Source code should be indented to improve readability. There is a .indent.pro file in the QGIS src directory that contains the switches to be used when indenting code using the GNU indent program. If you don't use GNU indent, you should emulate these settings.
+
+=== Braces ===
+Braces should start on the line following the expression:
+```
+ if(foo == 1)
+ {
+ // do stuff
+ ...
+ }else
+ {
+ // do something else
+ ...
+ }
+```
+
+
+== Coding Style ==
+
+Here are described some programming hints and tips that will hopefully reduce errors, development time, and maintenance.
+
+
+=== Where-ever Possible Generalize Code ===
+```
+If you are cut-n-pasting code, or otherwise writing the same thing more than once, consider consolidating the code
+into a single function.
+```
+
+This will:
+ * allow changes to be made in one location instead of in multiple places
+ * help prevent code bloat
+ * make it more difficult for multiple copies to evolve differences over time, thus making it harder to understand and
+maintain for others
+
+=== Prefer Having Constants First in Predicates ===
+
+Prefer to put constants first in predicates.
+```
+"0 == value" instead of "value == 0"
+```
+
+This will help prevent programmers from accidentally using "=" when they meant to use "==", which can introduce very subtle
+logic bugs. The compiler will generate an error if you accidentally use "=" instead of "==" for comparisons since constants
+inherently cannot be assigned values.
+
+=== Whitespace Can Be Your Friend ===
+
+Adding spaces between operators, statements, and functions makes it easier for humans to parse code.
+
+
+Which is easier to read, this:
+
+```
+if (!a&&b)
+```
+
+or this:
+
+```
+if ( ! a && b )
+```
+
+=== Add Trailing Identifying Comments ===
+
+Adding comments at the end of function, struct and class implementations makes it easier to find them later.
+
+
+Consider that you're at the bottom of a source file and need to find a very long function -- without these kinds of trailing
+comments you will have to page up past the body of the function to find its name. Of course this is ok if you wanted to find
+the beginning of the function; but what if you were interested at code near its end? You'd have to page up and then back down
+again to the desired part.
+
+E.g.,
+
+```
+void foo::bar()
+{
+ // ... imagine a lot of code here
+ } // foo::bar()
+```
+
+
+=== Use Braces Even for Single Line Statements ===
+
+Using braces for code in if/then blocks or similar code structures even for single line statements means that adding another
+statement is less likely to generate broken code.
+
+
+Consider:
+
+```
+ if (foo)
+ bar();
+ else
+ baz();
+```
+
+Adding code after bar() or baz() without adding enclosing braces would create broken code. Though most programmers would
+naturally do that, some may forget to do so in haste.
+
+So, prefer this:
+
+```
+ if (foo)
+ {
+ bar();
+ }
+ else
+ {
+ baz();
+ }
+```
+
+
+=== Book recommendations ===
+
+ * [Effective C++ http://www.awprofessional.com/title/0321334876], Scott Meyers
+ * [More Effective C++ http://www.awprofessional.com/bookstore/product.asp?isbn=020163371X&rl=1], Scott Meyers
+ * [Effective STL http://www.awprofessional.com/title/0201749629], Scott Meyers
+ * [Design Patterns http://www.awprofessional.com/title/0201634988], GoF
+
+
+
+
+
+= SVN Access =
+
+This page describes how to get started using the QGIS Subversion repository
+
+== Accessing the Repository ==
+To check out QGIS HEAD:
+```
+ svn --username [your user name] co https://svn.qgis.org/repos/qgis/trunk/qgis
+```
+
+
+== Anonymous Access ==
+You can use the following commands to perform an anonymous checkout from the QGIS Subversion repository.
+Note we recommend checking out the trunk (unless you are a developer or really HAVE to have the latest
+changes and dont mind lots of crashing!).
+
+You must have a subversion client installed prior to checking out the code. See the Subversion website
+for more information. The Links page contains a good selection of SVN clients for various platforms.
+
+To check out a branch
+```
+ svn co https://svn.qgis.org/repos/qgis/branches/<branch name>
+```
+To check out SVN stable trunk:
+```
+ svn co https://svn.qgis.org/repos/qgis/trunk/qgis qgis_unstable
+```
+
+/!\ **Note:** If you are behind a proxy server, edit your ~/subversion/servers file to specify
+your proxy settings first!
+
+/!\ **Note:** In QGIS we keep our most stable code in trunk. Periodically we will tag a release
+off trunk, and then continue stabilisation and selective incorporation of new features into trunk.
+
+See the INSTALL file in the source tree for specific instructions on building development versions.
+
+== QGIS documentation sources ==
+
+If you're interested in checking out Quantum GIS documentation sources:
+```
+ svn co https://svn.qgis.org/repos/qgis_docs/trunk qgis_docs
+```
+
+You can also take a look at DocumentationWritersCorner for more information.
+
+== Documentation ==
+The repository is organized as follows:
+
+http://wiki.qgis.org/images/repo.png
+
+See the Subversion book http://svnbook.red-bean.com for information on becoming a SVN master.
+
+
+
+
+== Development in branches ==
+
+=== Purpose ===
+The complexity of the QGIS source code has increased considerably during the last years. Therefore it is hard
+to anticipate the side effects that the addition of a feature will have. In the past, the QGIS project had very
+long release cycles because it was a lot of work to reetablish the stability of the software system after new
+features were added. To overcome these problems, QGIS switched to a development model where new features are
+coded in svn branches first and merged to trunk (the main branch) when they are finished and stable. This section
+describes the procedure for branching and merging in the QGIS project.
+
+
+=== Procedure ===
+ * Initial announcement on mailing list
+Before starting, make an announcement on the developer mailing list to see if another developer is
+already working on the same feature. Also contact the technical advisor of the project steering committee
+(PSC). If the new feature requires any changes to the QGIS architecture, a request for comment (RFC) is needed.
+ * Create a branch
+Create a new svn branch for the development of the new feature (see UsingSubversion for the svn syntax). Now
+you can start developing.
+ * Merge from trunk regularly
+It is recommended to merge the changes in trunk to the branch on a regular basis. This makes it easier to merge
+the branch back to trunk later.
+ * Documentation on wiki
+It is also recommended to document the intended changes and the current status of the work on a wiki page.
+ * Testing before merging back to trunk
+When you are finished with the new feature and happy with the stability, make an announcement on the developer list.
+Before merging back, the changes will be tested by developers and users. Binary packages (especially for OsX and Windows)
+will be generated to also involve non-developers. In trac, a new Component will be opened to file tickets against.
+Once there are no remaining issues left, the technical advisor of the PSC merges the changes into trunk.
+
+=== Creating a branch ===
+
+We prefer that new feature developments happen out of trunk so that trunk remains in a
+stable state. To create a branch use the following command:
+
+```
+svn copy https://svn.qgis.org/repos/qgis/trunk/qgis https://svn.qgis.org/repos/qgis/branches/qgis_newfeature
+svn commit -m "New feature branch"
+```
+
+=== Merge regularly from trunk to branch ===
+
+When working in a branch you should regularly merge trunk into it so that your branch does not diverge more
+than necessary. In the top level dir of your branch, first type ```svn info``` to determine the revision
+numbers of your branch which will produce output something like this:
+
+```
+timlinux at timlinux-desktop:~/dev/cpp/qgis_raster_transparency_branch$ svn info
+Caminho: .
+URL: https://svn.qgis.org/repos/qgis/branches/raster_transparency_branch
+Raiz do Repositório: https://svn.qgis.org/repos/qgis
+UUID do repositório: c8812cc2-4d05-0410-92ff-de0c093fc19c
+Revisão: 6546
+Tipo de Nó: diretório
+Agendado: normal
+Autor da Última Mudança: timlinux
+Revisão da Última Mudança: 6495
+Data da Última Mudança: 2007-02-02 09:29:47 -0200 (Sex, 02 Fev 2007)
+Propriedades da Última Mudança: 2007-01-09 11:32:55 -0200 (Ter, 09 Jan 2007)
+```
+
+The second revision number shows the revision number of the start revision of your branch and the first the
+current revision. You can do a dry run of the merge like this:
+
+```
+svn merge --dry-run -r 6495:6546 https://svn.qgis.org/repos/qgis/trunk/qgis
+```
+
+After you are happy with the changes that will be made do the merge for real like this:
+
+```
+svn merge -r 6495:6546 https://svn.qgis.org/repos/qgis/trunk/qgis
+svn commit -m "Merged upstream changes from trunk to my branch"
+```
+
+
+== Submitting Patches ==
+
+There are a few guidelines that will help you to get your patches into QGIS easily, and help us
+deal with the patches that are sent to use easily.
+
+=== Patch file naming ===
+
+If the patch is a fix for a specific bug, please name the file with the bug number in it e.g.
+**bug777fix.diff**, and attach it to the original bug report in trac (https://svn.qgis.org/trac).
+
+If the bug is an enhancement or new feature, its usually a good idea to create a ticket in
+trac (https://svn.qgis.org/trac) first and then attach you
+
+=== Create your patch in the top level QGIS source dir ===
+
+This makes it easier for us to apply the patches since we don't need to navigate to a specific
+place in the source tree to apply the patch. Also when I receive patches I usually evaluate them
+using kompare, and having the patch from the top level dir makes this much easier. Below is an
+example of you you can include multiple changed files into your patch from the top level directory:
+
+```
+cd qgis
+svn diff src/ui/somefile.ui src/app/somefile2.cpp > bug872fix.diff
+```
+
+=== Including non version controlled files in your patch ===
+
+If your improvements include new files that don't yet exist in the repository, you should indicate
+to svn that they need to be added before generating your patch e.g.
+
+```
+cd qgis
+svn add src/lib/somenewfile.cpp
+svn diff > bug7887fix.diff
+```
+
+=== Getting your patch noticed ===
+
+QGIS developers are busy folk. We do scan the incoming patches on bug reports but sometimes we miss things.
+Don't be offended or alarmed. Try to identify a developer to help you - using the ["Project Organigram"] and
+contact them asking them if they can look at your patch. If you dont get any response, you can escalate your
+query to one of the Project Steering Committee members (contact details also available on the ["Project Organigram"]).
+
+=== Due Diligence ===
+
+QGIS is licensed under the GPL. You should make every effort to ensure you only submit patches which are
+unencumbered by conflicting intellectual property rights. Also do not submit code that you are not happy to
+have made available under the GPL.
+
+
+
+== Obtaining SVN Write Access ==
+
+Write access to QGIS source tree is by invitation. Typically when a person submits several (there is no fixed
+number here) substantial patches that demonstrate basic competance and understanding of C++ and QGIS coding
+conventions, one of the PSC members or other existing developers can nominate that person to the PSC for granting
+of write access. The nominator should give a basic promotional paragraph of why they think that person should gain
+write access. In some cases we will grant write access to non C++ developers e.g. for translators and documentors.
+In these cases, the person should still have demonstrated ability to submit patches and should ideally have submtted
+several substantial patches that demonstrate their understanding of modifying the code base without breaking things, etc.
+
+
+
+=== Procedure once you have access ===
+
+
+Checkout the sources:
+
+```
+svn co https://svn.qgis.org/repos/qgis/trunk/qgis qgis
+```
+
+
+Build the sources (see INSTALL document for proper detailed instructions)
+
+```
+cd qgis
+mkdir build
+ccmake .. (set your preferred options)
+make
+make install (maybe you need to do with sudo / root perms)
+```
+
+Make your edits
+
+```
+cd ..
+```
+
+Make your changes in sources. Always check that everything compiles before making any commits.
+Try to be aware of possible breakages your commits may cause for people building on other
+platforms and with older / newer versions of libraries.
+
+
+Add files (if you added any new files). The svn status command can be used to quickly see
+if you have added new files.
+
+```
+svn status src/pluguns/grass/modules
+```
+
+Files listed with ? in front are not in SVN and possibly need to be added by you:
+
+```
+svn add src/pluguns/grass/modules/foo.xml
+```
+
+Commit your changes
+
+```
+svn commit src/pluguns/grass/modules/foo.xml
+```
+
+Your editor (as defined in $EDITOR environment variable) will appear and you should make a
+ comment at the top of the file (above the area that says 'dont change this'. Put a
+descriptive comment and rather do several small commits if the changes across a number of
+files are unrelated. Conversely we prefer you to group related changes into a single commit.
+
+Save and close in your editor. The first time you do this, you should be prompted to
+put in your username and password. Just use the same ones as your trac account.
+
+
+= Unit Testing =
+
+As of November 2007 we require all new features going into trunk to be accompanied with
+a unit test. Initially we have limited this requirement to qgis_core, and we will extend
+this requirement to other parts of the code base once people are familiar with the
+procedures for unit testing explained in the sections that follow.
+
+== The QGIS testing framework - an overview ==
+
+Unit testing is carried out using a combination of QTestLib (the Qt testing library) and
+CTest (a framework for compiling and running tests as part of the CMake build process).
+Lets take an overview of the process before I delve into the details:
+
+ * **There is some code you want to test**, e.g. a class or function. Extreme programming
+ advocates suggest that the code should not even be written yet when you start
+ building your tests, and then as you implement your code you can immediately validate
+ each new functional part you add with your test. In practive you will probably
+ need to write tests for pre-existing code in QGIS since we are starting with a testing
+ framework well after much application logic has already been implemented.
+
+ * **You create a unit test.** This happens under <QGIS Source Dir>/tests/src/core
+ in the case of the core lib. The test is basically a client that creates an instance
+ of a class and calls some methods on that class. It will check the return from each
+ method to make sure it matches the expected value. If any one of the calls fails,
+ the unit will fail.
+
+ * **You include QtTestLib macros in your test class.** This macro is processed by
+ the Qt meta object compiler (moc) and expands your test class into a runnable application.
+
+ * **You add a section to the CMakeLists.txt** in your tests directory that will
+ build your test.
+
+ * **You ensure you have ENABLE_TESTING enabled in ccmake / cmakesetup.** This
+ will ensure your tests actually get compiled when you type make.
+
+ * **You optionally add test data to <QGIS Source Dir>/tests/testdata** if your
+ test is data driven (e.g. needs to load a shapefile). These test data should be
+ as small as possible and wherever possible you should use the existing datasets
+ already there. Your tests should never modify this data in situ, but rather
+ may a temporary copy somewhere if needed.
+
+ * **You compile your sources and install.** Do this using normal make && (sudo)
+ make install procedure.
+
+ * **You run your tests.** This is normally done simply by doing **make test**
+ after the make install step, though I will explain other aproaches that offer more
+ fine grained control over running tests.
+
+Right with that overview in mind, I will delve into a bit of detail. I've already
+done much of the configuration for you in CMake and other places in the source tree
+so all you need to do are the easy bits - writing unit tests!
+
+== Creating a unit test ==
+
+Creating a unit test is easy - typically you will do this by just creating a
+single .cpp file (not .h file is used) and implement all your test methods as
+public methods that return void. I'll use a simple test class for QgsRasterLayer
+throughout the section that follows to illustrate. By convention we will name our
+test with the same name as the class they are testing but prefixed with 'Test'.
+So our test implementation goes in a file called testqgsrasterlayer.cpp and
+the class itself will be TestQgsRasterLayer. First we add our standard copyright
+banner:
+
+```
+/***************************************************************************
+ testqgsvectorfilewriter.cpp
+ --------------------------------------
+ Date : Frida Nov 23 2007
+ Copyright : (C) 2007 by Tim Sutton
+ Email : tim at linfiniti.com
+ ***************************************************************************
+ * *
+ * 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. *
+ * *
+ ***************************************************************************/
+```
+
+Next we use start our includes needed for the tests we plan to run. There is
+one special include all tests should have:
+
+```
+#include <QtTest>
+```
+
+Beyond that you just continue implementing your class as per normal, pulling
+in whatever headers you may need:
+
+```
+//Qt includes...
+#include <QObject>
+#include <QString>
+#include <QObject>
+#include <QApplication>
+#include <QFileInfo>
+#include <QDir>
+
+//qgis includes...
+#include <qgsrasterlayer.h>
+#include <qgsrasterbandstats.h>
+#include <qgsapplication.h>
+```
+
+Since we are combining both class declaration and implementation in a single
+file the class declaration comes next. We start with our doxygen documentation.
+Every test case should be properly documented. We use the doxygen **ingroup**
+directive so that all the UnitTests appear as a module in the generated
+Doxygen documentation. After that comes a short description of the unit test:
+
+```
+/** \ingroup UnitTests
+ * This is a unit test for the QgsRasterLayer class.
+ */
+```
+
+The class **must** inherit from QObject and include the Q_OBJECT macro.
+
+```
+class TestQgsRasterLayer: public QObject
+{
+ Q_OBJECT;
+```
+
+All our test methods are implemented as **private slots**. The QtTest framework
+will sequentially call each private slot method in the test class. There are
+four 'special' methods which if implemented will be called at the start of
+the unit test (**initTestCase**), at the end of the unit test (**cleanupTestCase**).
+Before each test method is called, the **init()** method will be called and
+after each test method is called the **cleanup()** method is called. These
+methods are handy in that they allow you to allocate and cleanup resources
+prior to running each test, and the test unit as a whole.
+
+
+```
+private slots:
+ // will be called before the first testfunction is executed.
+ void initTestCase();
+ // will be called after the last testfunction was executed.
+ void cleanupTestCase(){};
+ // will be called before each testfunction is executed.
+ void init(){};
+ // will be called after every testfunction.
+ void cleanup();
+```
+
+Then come your test methods, all of which should take **no parameters** and
+should **return void**. The methods will be called in order of declaration.
+I am implementing two methods here which illustrates to types of testing. In
+the first case I want to generally test the various parts of the class are
+working, I can use a **functional testing** approach. Once again, extreme
+programmers would advocate writing these tests **before** implementing the
+class. Then as you work your way through your class implementation you
+iteratively run your unit tests. More and more test functions should complete
+sucessfully as your class implementation work progresses, and when the whole
+unit test passes, your new class is done and is now complete with a repeatable
+way to validate it.
+
+Typically your unit tests would only cover the **public** API of your
+class, and normally you do not need to write tests for accessors and mutators.
+If it should happen that an acccessor or mutator is not working as expected
+you would normally implement a **regression** test to check for this (see
+lower down).
+
+```
+ //
+ // Functional Testing
+ //
+
+ /** Check if a raster is valid. */
+ void isValid();
+
+ // more functional tests here ...
+```
+
+Next we implement our **regression tests**. Regression tests should be
+implemented to replicate the conditions of a particular bug. For example
+I recently received a report by email that the cell count by rasters was
+off by 1, throwing off all the statistics for the raster bands. I opened
+a bug (ticket #832) and then created a regression test that replicated
+the bug using a small test dataset (a 10x10 raster). Then I ran the test
+and ran it, verifying that it did indeed fail (the cell count was 99
+instead of 100). Then I went to fix the bug and reran the unit test and
+the regression test passed. I committed the regression test along with
+the bug fix. Now if anybody breakes this in the source code again in the
+future, we can immediatly identify that the code has regressed. Better
+yet before committing any changes in the future, running our tests will
+ensure our changes dont have unexpected side effects - like breaking
+existing functionality.
+
+There is one more benifit to regression tests - they can save you time.
+If you ever fixed a bug that involved making changes to the source,
+and then running the application and performing a series of convoluted
+steps to replicate the issue, it will be immediately apparent that
+simply implementing your regression test **before** fixing the bug
+will let you automate the testing for bug resolution in an efficient
+manner.
+
+To implement your regression test, you should follow the naming
+convention of regression<TicketID> for your test functions. If no
+trac ticket exists for the regression, you should create one first.
+Using this approach allows the person running a failed regression
+test easily go and find out more information.
+
+```
+ //
+ // Regression Testing
+ //
+
+ /** This is our second test case...to check if a raster
+ reports its dimensions properly. It is a regression test
+ for ticket #832 which was fixed with change r7650.
+ */
+ void regression832();
+
+ // more regression tests go here ...
+```
+
+Finally in our test class declaration you can declare privately
+any data members and helper methods your unit test may need. In our
+case I will declare a QgsRasterLayer * which can be used by any
+of our test methods. The raster layer will be created in the
+initTestCase() function which is run before any other tests, and then
+destroyed using cleanupTestCase() which is run after all tests. By
+declaring helper methods (which may be called by various test
+functions) privately, you can ensure that they wont be automatically
+run by the QTest executeable that is created when we compile our test.
+
+```
+ private:
+ // Here we have any data structures that may need to
+ // be used in many test cases.
+ QgsRasterLayer * mpLayer;
+};
+
+```
+
+That ends our class declaration. The implementation is simply
+inlined in the same file lower down. First our init and cleanup functions:
+
+```
+void TestQgsRasterLayer::initTestCase()
+{
+ // init QGIS's paths - true means that all path will be inited from prefix
+ QString qgisPath = QCoreApplication::applicationDirPath ();
+ QgsApplication::setPrefixPath(qgisPath, TRUE);
+#ifdef Q_OS_LINUX
+ QgsApplication::setPkgDataPath(qgisPath + "/../share/qgis");
+#endif
+ //create some objects that will be used in all tests...
+
+ std::cout << "Prefix PATH: " << QgsApplication::prefixPath().toLocal8Bit().data() << std::endl;
+ std::cout << "Plugin PATH: " << QgsApplication::pluginPath().toLocal8Bit().data() << std::endl;
+ std::cout << "PkgData PATH: " << QgsApplication::pkgDataPath().toLocal8Bit().data() << std::endl;
+ std::cout << "User DB PATH: " << QgsApplication::qgisUserDbFilePath().toLocal8Bit().data() << std::endl;
+
+ //create a raster layer that will be used in all tests...
+ QString myFileName (TEST_DATA_DIR); //defined in CmakeLists.txt
+ myFileName = myFileName + QDir::separator() + "tenbytenraster.asc";
+ QFileInfo myRasterFileInfo ( myFileName );
+ mpLayer = new QgsRasterLayer ( myRasterFileInfo.filePath(),
+ myRasterFileInfo.completeBaseName() );
+}
+
+void TestQgsRasterLayer::cleanupTestCase()
+{
+ delete mpLayer;
+}
+
+```
+
+The above init function illustrates a couple of interesting things.
+
+ 1. I needed to manually set the QGIS application data path so that
+ resources such as srs.db can be found properly.
+ 2. Secondly, this is a data driven test so we needed to provide a
+ way to generically locate the 'tenbytenraster.asc file. This was
+ achieved by using the compiler define **TEST_DATA_PATH**. The
+ define is created in the CMakeLists.txt configuration file under
+ <QGIS Source Root>/tests/CMakeLists.txt and is available to all
+ QGIS unit tests. If you need test data for your test, commit it
+ under <QGIS Source Root>/tests/testdata. You should only commit
+ very small datasets here. If your test needs to modify the test
+ data, it should make a copy of if first.
+
+Qt also provides some other interesting mechanisms for data driven
+testing, so if you are interested to know more on the topic, consult
+the Qt documentation.
+
+Next lets look at our functional test. The isValid() test simply
+checks the raster layer was correctly loaded in the initTestCase.
+QVERIFY is a Qt macro that you can use to evaluate a test condition.
+There are a few other use macros Qt provide for use in your tests
+including:
+
+```
+QCOMPARE ( actual, expected )
+QEXPECT_FAIL ( dataIndex, comment, mode )
+QFAIL ( message )
+QFETCH ( type, name )
+QSKIP ( description, mode )
+QTEST ( actual, testElement )
+QTEST_APPLESS_MAIN ( TestClass )
+QTEST_MAIN ( TestClass )
+QTEST_NOOP_MAIN ()
+QVERIFY2 ( condition, message )
+QVERIFY ( condition )
+QWARN ( message )
+```
+
+Some of these macros are useful only when using the Qt framework
+for data driven testing (see the Qt docs for more detail).
+
+```
+void TestQgsRasterLayer::isValid()
+{
+ QVERIFY ( mpLayer->isValid() );
+}
+```
+
+Normally your functional tests would cover all the range of
+functionality of your classes public API where feasible. With our
+functional tests out the way, we can look at our regression test example.
+
+Since the issue in bug #832 is a misreported cell count, writing
+our test if simply a matter of using QVERIFY to check that the
+cell count meets the expected value:
+
+```
+void TestQgsRasterLayer::regression832()
+{
+ QVERIFY ( mpLayer->getRasterXDim() == 10 );
+ QVERIFY ( mpLayer->getRasterYDim() == 10 );
+ // regression check for ticket #832
+ // note getRasterBandStats call is base 1
+ QVERIFY ( mpLayer->getRasterBandStats(1).elementCountInt == 100 );
+}
+```
+
+With all the unit test functions implemented, there one final thing we
+need to add to our test class:
+
+```
+QTEST_MAIN(TestQgsRasterLayer)
+#include "moc_testqgsrasterlayer.cxx"
+```
+
+The purpose of these two lines is to signal to Qt's moc that his is a
+QtTest (it will generate a main method that in turn calls each test funtion.
+The last line is the include for the MOC generated sources. You should
+replace 'testqgsrasterlayer' with the name of your class in lower case.
+
+== Adding your unit test to CMakeLists.txt ==
+
+Adding your unit test to the build system is simply a matter of editing
+the CMakeLists.txt in the test directory, cloning one of the existing
+test blocks, and then search and replacing your test class name into it.
+For example:
+
+```
+#
+# QgsRasterLayer test
+#
+SET(qgis_rasterlayertest_SRCS testqgsrasterlayer.cpp)
+SET(qgis_rasterlayertest_MOC_CPPS testqgsrasterlayer.cpp)
+QT4_WRAP_CPP(qgis_rasterlayertest_MOC_SRCS ${qgis_rasterlayertest_MOC_CPPS})
+ADD_CUSTOM_TARGET(qgis_rasterlayertestmoc ALL DEPENDS ${qgis_rasterlayertest_MOC_SRCS})
+ADD_EXECUTABLE(qgis_rasterlayertest ${qgis_rasterlayertest_SRCS})
+ADD_DEPENDENCIES(qgis_rasterlayertest qgis_rasterlayertestmoc)
+TARGET_LINK_LIBRARIES(qgis_rasterlayertest ${QT_LIBRARIES} qgis_core)
+INSTALL(TARGETS qgis_rasterlayertest RUNTIME DESTINATION ${QGIS_BIN_DIR})
+ADD_TEST(qgis_rasterlayertest ${QGIS_BIN_DIR}/qgis_rasterlayertest)
+```
+
+I'll run through these lines briefly to explain what they do, but if
+you are not interested, just clone the block, search and replace e.g.
+
+```
+:'<,'>s/rasterlayer/mynewtest/g
+```
+
+Lets look a little more in detail at the individual lines. First we
+define the list of sources for our test. Since we have only one source file
+(following the methodology I described above where class declaration and
+definition are in the same file) its a simple statement:
+
+```
+SET(qgis_rasterlayertest_SRCS testqgsrasterlayer.cpp)
+```
+
+Since our test class needs to be run through the Qt meta object compiler (moc)
+we need to provide a couple of lines to make that happen too:
+
+```
+SET(qgis_rasterlayertest_MOC_CPPS testqgsrasterlayer.cpp)
+QT4_WRAP_CPP(qgis_rasterlayertest_MOC_SRCS ${qgis_rasterlayertest_MOC_CPPS})
+ADD_CUSTOM_TARGET(qgis_rasterlayertestmoc ALL DEPENDS ${qgis_rasterlayertest_MOC_SRCS})
+```
+
+Next we tell cmake that it must make an executeable from the test class.
+Remember in the previous section on the last line of the class implementation
+I included the moc outputs directly into our test class, so that will
+give it (among other things) a main method so the class can be
+compiled as an executeable:
+
+```
+ADD_EXECUTABLE(qgis_rasterlayertest ${qgis_rasterlayertest_SRCS})
+ADD_DEPENDENCIES(qgis_rasterlayertest qgis_rasterlayertestmoc)
+```
+
+Next we need to specify any library dependencies. At the moment classes
+have been implemented with a catch-all QT_LIBRARIES dependency, but I will
+be working to replace that with the specific Qt libraries that each class
+needs only. Of course you also need to link to the relevant qgis
+libraries as required by your unit test.
+
+```
+TARGET_LINK_LIBRARIES(qgis_rasterlayertest ${QT_LIBRARIES} qgis_core)
+```
+
+Next I tell cmake to the same place as the qgis binaries itself. This
+is something I plan to remove in the future so that the tests can
+run directly from inside the source tree.
+
+```
+INSTALL(TARGETS qgis_rasterlayertest RUNTIME DESTINATION ${QGIS_BIN_DIR})
+```
+
+Finally here is where the best magic happens - we register the class with
+ctest. If you recall in the overview I gave in the beginning of this
+section we are using both QtTest and CTest together. To recap, **QtTest** adds a
+main method to your test unit and handles calling your test methods within
+the class. It also provides some macros like QVERIFY that you can use as
+to test for failure of the tests using conditions. The output from
+a QtTest unit test is an executeable which you can run from the command line.
+However when you have a suite of tests and you want to run each executeable
+in turn, and better yet integrate running tests into the build process,
+the **CTest** is what we use. The next line registers the unit test with
+CMake / CTest.
+
+```
+ADD_TEST(qgis_rasterlayertest ${QGIS_BIN_DIR}/qgis_rasterlayertest)
+```
+
+The last thing I should add is that if your test requires optional
+parts of the build process (e.g. Postgresql support, GSL libs, GRASS etc.),
+you should take care to enclose you test block inside a IF () block
+in the CMakeLists.txt file.
+
+
+== Building your unit test ==
+
+To build the unit test you need only to make sure that ENABLE_TESTS=true
+in the cmake configuration. There are two ways to do this:
+
+ 1. Run ccmake .. (cmakesetup .. under windows) and interactively set
+ the ENABLE_TESTS flag to ON.
+ 1. Add a command line flag to cmake e.g. cmake -DENABLE_TESTS=true ..
+
+Other than that, just build QGIS as per normal and the tests should build
+too.
+
+== Run your tests ==
+
+The simplest way to run the tests is as part of your normal build process:
+
+```
+make && make install && make test
+```
+
+The make test command will invoke CTest which will run each test that
+was registered using the ADD_TEST CMake directive described above. Typical
+output from make test will look like this:
+
+```
+Running tests...
+Start processing tests
+Test project /Users/tim/dev/cpp/qgis/build
+1/ 3 Testing qgis_applicationtest ***Exception: Other
+2/ 3 Testing qgis_filewritertest *** Passed
+3/ 3 Testing qgis_rasterlayertest *** Passed
+
+0% tests passed, 3 tests failed out of 3
+
+ The following tests FAILED:
+ 1 - qgis_applicationtest (OTHER_FAULT)
+ Errors while running CTest
+ make: *** [test] Error 8
+```
+
+If a test fails, you can use the ctest command to examine more
+closely why it failed. User the -R option to specify a regex for
+which tests you want to run and -V to get verbose output:
+
+```
+[build] ctest -R appl -V
+Start processing tests
+Test project /Users/tim/dev/cpp/qgis/build
+Constructing a list of tests
+Done constructing a list of tests
+Changing directory into /Users/tim/dev/cpp/qgis/build/tests/src/core
+1/ 3 Testing qgis_applicationtest
+Test command: /Users/tim/dev/cpp/qgis/build/tests/src/core/qgis_applicationtest
+********* Start testing of TestQgsApplication *********
+ Config: Using QTest library 4.3.0, Qt 4.3.0
+PASS : TestQgsApplication::initTestCase()
+ Prefix PATH: /Users/tim/dev/cpp/qgis/build/tests/src/core/../
+ Plugin PATH: /Users/tim/dev/cpp/qgis/build/tests/src/core/..//lib/qgis
+ PkgData PATH: /Users/tim/dev/cpp/qgis/build/tests/src/core/..//share/qgis
+ User DB PATH: /Users/tim/.qgis/qgis.db
+PASS : TestQgsApplication::getPaths()
+ Prefix PATH: /Users/tim/dev/cpp/qgis/build/tests/src/core/../
+ Plugin PATH: /Users/tim/dev/cpp/qgis/build/tests/src/core/..//lib/qgis
+ PkgData PATH: /Users/tim/dev/cpp/qgis/build/tests/src/core/..//share/qgis
+ User DB PATH: /Users/tim/.qgis/qgis.db
+ QDEBUG : TestQgsApplication::checkTheme() Checking if a theme icon exists:
+ QDEBUG : TestQgsApplication::checkTheme()
+ /Users/tim/dev/cpp/qgis/build/tests/src/core/..//share/qgis/themes/default//mIconProjectionDisabled.png
+ FAIL! : TestQgsApplication::checkTheme() '!myPixmap.isNull()' returned FALSE. ()
+ Loc: [/Users/tim/dev/cpp/qgis/tests/src/core/testqgsapplication.cpp(59)]
+PASS : TestQgsApplication::cleanupTestCase()
+ Totals: 3 passed, 1 failed, 0 skipped
+ ********* Finished testing of TestQgsApplication *********
+ -- Process completed
+ ***Failed
+
+ 0% tests passed, 1 tests failed out of 1
+
+ The following tests FAILED:
+1 - qgis_applicationtest (Failed)
+ Errors while running CTest
+
+```
+
+Well that concludes this section on writing unit tests in QGIS. We hope you
+will get into the habit of writing test to test new functionality and to
+check for regressions. Some aspects of the test system (in particular the
+CMakeLists.txt parts) are still being worked on so that the testing framework
+works in a truly platform way. I will update this document as things progress.
+
+= Authors =
+
+ * Tim Sutton (author and editor)
+ * Gary Sherman
+ * Marco Hugentobler
+
+Original pages from wiki to deprecate:
+
+ * http://wiki.qgis.org/qgiswiki/CodingGuidelines (./)
+ * http://wiki.qgis.org/qgiswiki/CodingStandards (./)
+ * http://wiki.qgis.org/qgiswiki/UsingSubversion (./)
+ * http://wiki.qgis.org/qgiswiki/DebuggingPlugins
+ * http://wiki.qgis.org/qgiswiki/DevelopmentInBranches (./)
+ * http://wiki.qgis.org/qgiswiki/SubmittingPatchesAndSvnAccess (./)
+
Modified: packages/qgis/branches/upstream/current/CONTRIBUTORS
===================================================================
--- packages/qgis/branches/upstream/current/CONTRIBUTORS 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/CONTRIBUTORS 2008-01-18 16:51:06 UTC (rev 1341)
@@ -7,6 +7,7 @@
Brent Wood
Brook Milligan
Carl Anderson
+Carlos Dávila
Christian Ferreira
Frank Warmerdam
Hyao (IRC nickname)
@@ -21,3 +22,4 @@
Tyler Mitchell
Yann Chemin
Faunalia (http://www.faunalia.it)
+Jürgen E. Fischer
Modified: packages/qgis/branches/upstream/current/ChangeLog
===================================================================
--- packages/qgis/branches/upstream/current/ChangeLog 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/ChangeLog 2008-01-18 16:51:06 UTC (rev 1341)
@@ -1,5 +1,14 @@
-/* ChangeLog,v 1.214 2004/11/12 00:42:21 gsherman Exp */
+/* Id */
------------------------------------------------------------------------------
+Version 0.9.1 'Ganymede'
+** This is a bug fix release
+** 70 Bugs closed
+** Added locale tab to options dialog so that locale can be overridden
+** Cleanups and additions to GRASS tools
+** Python Plugin Installer for installing plugins from the PyQGIS
+ repository
+** Documentation updates
+** Improvements for building under MSVC
Version 0.9 'Ganymede'
** Python bindings - This is the major focus of this release
it is now possible to create plugins using python. It is also
Modified: packages/qgis/branches/upstream/current/INSTALL
===================================================================
--- packages/qgis/branches/upstream/current/INSTALL 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/INSTALL 2008-01-18 16:51:06 UTC (rev 1341)
@@ -1,3 +1,5 @@
+Quantum GIS (QGIS)
+Building QGIS from source - step by step
------------------------------------------------------------------------
@@ -3,5 +5,6 @@
1. Introduction
- 2. General Build Note
+ 2. General Build Notes
+ 2.1. An overview of the dependencies required for building
3. Building under windows using msys
3.1. MSYS:
@@ -64,8 +67,35 @@
6.2.8. EXPAT
6.2.9. POSTGRES
6.3. Cleanup
- 7. Further help and information
- 8. Authors and Acknowledgments
+ 7. Building with MS Visual Studio
+ 7.1. Setup Visual Studio
+ 7.1.1. Express Edition
+ 7.1.2. All Editions
+ 7.2. Download/Install Dependencies
+ 7.2.1. Flex and Bison
+ 7.2.2. To include PostgreSQL support in Qt
+ 7.2.3. Qt
+ 7.2.4. Proj.4
+ 7.2.5. GSL
+ 7.2.6. GEOS
+ 7.2.7. GDAL
+ 7.2.8. PostGIS
+ 7.2.9. Expat
+ 7.2.10. CMake
+ 7.3. Building QGIS with CMAKE
+ 8. Building under Windows using MSVC Express
+ 8.1. System preparation
+ 8.2. Install the libraries archive
+ 8.3. Install Visual Studio Express 2005
+ 8.4. Install Microsoft Platform SDK2
+ 8.5. Edit your vsvars
+ 8.6. Environment Variables
+ 8.7. Building Qt4.3.2
+ 8.7.1. Compile Qt
+ 8.7.2. Configure Visual C++ to use Qt
+ 8.8. Install Python
+ 8.9. Install SIP
+ 8.10. Install PyQt4
------------------------------------------------------------------------
@@ -74,6 +104,32 @@
1. Introduction
===============
+This document is the original installation guide of the described software
+Quantum GIS. The software and hardware descriptions named in this
+document are in most cases registered trademarks and are therefore subject
+to the legal requirements. Quantum GIS is subject to the GNU General Public
+License. Find more information on the Quantum GIS Homepage:
+http://www.qgis.org
+
+The details, that are given in this document have been written and verified
+to the best of knowledge and responsibility of the editors. Nevertheless,
+mistakes concerning the content are possible. Therefore, all data are not
+liable to any duties or guarantees. The editors and publishers do not take
+any responsibility or liability for failures and their consequences. You are
+always welcome for indicating possible mistakes.
+
+You can download this document as part of the Quantum GIS 'User and
+Installation Guide' in HTML and PDF format via http://www.qgis.org. A current
+version is also available at the wiki, see:
+http://wiki.qgis.org/qgiswiki/BuildingFromSource
+
+Translations of this document can also be downloaded at the documentation area
+of the Quantum GIS project at http://www.qgis.org. More information is
+available via http://wiki.qgis.org/qgiswiki/DocumentationWritersCorner.
+
+Please visit http://qgis.org for information on joining our mailing lists
+and getting involved in the project further.
+
/!\ *Note to document writers:* Please use this document as the central
place for describing build procefures. Please do not remove this notice.
@@ -81,12 +137,12 @@
simply copy the commands listed in codeblocks that look like this:
- somecommand to be pasted ```
+ somecommand to be pasted
- 2. General Build Note
- =====================
+ 2. General Build Notes
+ ======================
At version 0.8.1 QGIS no longer uses the autotools for building. QGIS, like a
number of major projects (eg. KDE 4.0), now uses cmake for building from
@@ -97,6 +153,32 @@
http://wiki.qgis.org/qgiswiki/Building_with_CMake
+ 2.1. An overview of the dependencies required for building
+ ==========================================================
+
+'''Required build deps:'''
+ * CMake >= 2.4.3
+ * Flex, Bison
+
+'''Required runtime deps:'''
+ * Qt >= 4.2.0
+ * Proj >= ? (known to work with 4.4.x)
+ * GEOS >= 2.2 (3.0 is supported, maybe 2.1.x works too)
+ * Sqlite3 >= ? (probably 3.0.0)
+ * GDAL/OGR >= ? (1.2.x should work)
+
+'''Optional dependencies:'''
+ * for GRASS plugin - GRASS >= 6.0.0
+ * for georeferencer - GSL >= ? (works with 1.8)
+ * for postgis support and SPIT plugin - PostgreSQL >= ?
+ * for gps plugin - expat >= ? (1.95 is OK)
+ * for mapserver export and PyQGIS - Python >= ? (probably 2.3)
+ * for PyQGIS - SIP >= 4.5, PyQt >= 4.1
+
+'''Recommended runtime deps:'''
+ * for gps plugin - gpsbabel
+
+
3. Building under windows using msys
====================================
@@ -109,17 +191,12 @@
Get this:
-http://qgis.org/uploadfiles/msys/msys.tar.gz
+http://qgis.org/uploadfiles/msys/msys.zip
and unpack to c:\msys
-/!\ The file above is compressed as gzipped tarball - you can get a free
-windows application for creating and decompressing files here:
-
-http://www.7-zip.org/
-
If you wish to prepare your msys environment yourself rather than using
-our pre-made one, detailed instructions are provdided elsewhere in this
+our pre-made one, detailed instructions are provided elsewhere in this
document.
@@ -189,10 +266,11 @@
3.4.2. Download SIP and PyQt4 sources
=====================================
-http://www.riverbankcomputing.com/Downloads/sip4/sip-4.6.zip
-http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-win-gpl-4.2.zip
+http://www.riverbankcomputing.com/Downloads/sip4/
+http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/
-Extract each of the above zip files in a temporary directory.
+Extract each of the above zip files in a temporary directory. Make sure
+to get versions that match your current Qt installed version.
3.4.3. Compile SIP
@@ -369,14 +447,16 @@
4.2. Install Qt4 from .dmg
==========================
+You need a minimum of Qt4.2. I suggest getting the latest (at time of writing).
- ftp://ftp.trolltech.com/qt/source/qt-mac-opensource-4.2.3.dmg
+ ftp://ftp.trolltech.com/qt/source/qt-mac-opensource-4.3.2.dmg
+
If you want debug libs, Qt also provide a dmg with these:
- ftp://ftp.trolltech.com/qt/source/qt-mac-opensource-4.2.3-debug-libs.dmg
+ ftp://ftp.trolltech.com/qt/source/qt-mac-opensource-4.3.2-debug-libs.dmg
I am going to proceed using only release libs at this stage as the download for
@@ -396,7 +476,7 @@
Second change the default mkspec symlink so that it points to macx-g++:
- cd /usr/local/Qt4.2/mkspecs/ sudo rm default sudo ln -sf macx-g++ default
+ cd /usr/local/Qt4.3/mkspecs/ sudo rm default sudo ln -sf macx-g++ default
@@ -439,7 +519,8 @@
cd gsl-1.8
./configure --prefix=/usr/local
make
- sudo make install cd ..
+ sudo make install
+ cd ..
@@ -468,14 +549,14 @@
Retrieve the python bindings toolkit SIP from
- curl -O http://www.riverbankcomputing.com/Downloads/sip4/sip-4.5.2.tar.gz
+ http://www.riverbankcomputing.com/Downloads/sip4/
Then extract and build it to a prefix of /usr/local:
- tar xvfz sip-4.5.2.tar.gz
- cd sip-4.5.2
+ tar xvfz sip-<version number>.tar.gz
+ cd sip-<version number>
python configure.py
make
sudo make install
@@ -486,17 +567,31 @@
4.3.4. Additional Dependencies : PyQt
=====================================
+Make sure you have the latest python fom
+
+
+ http://www.python.org/download/mac/
+
+
+If you encounter problems compiling PyQt using the instructions
+below you can also try adding python from your frameworks dir
+explicitly to your path e.g.
+
+
+ export PATH=/Library/Frameworks/Python.framework/Versions/Current/bin:$PATH$
+
+
Retrieve the python bindings toolkit for Qt from
- curl -O http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-mac-gpl-4.1.1.tar.gz
+ http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/
Then extract and build it to a prefix of /usr/local:
- tar xvfz PyQt-mac-gpl-4.1.1.tar.gz
- cd PyQt-mac-gpl-4.1.1
+ tar xvfz PyQt-mac<version number here>
+ cd PyQt-mac<version number here>
python configure.py
yes
make
@@ -612,6 +707,12 @@
svn co https://svn.qgis.org/repos/qgis/branches/Release-0_8_0 qgis0.8
+For svn 0.9 branch
+
+
+ svn co https://svn.qgis.org/repos/qgis/branches/Release-0_9_0 qgis0.9
+
+
The first time you check out QGIS sources you will probably get a message like
this:
@@ -633,13 +734,17 @@
========================
CMake supports out of source build so we will create a 'build' dir for the
-build process
+build process . By convention I build my software into a dir called 'apps'
+in my home directory. If you have the correct permissions you may want to
+build straight into your /Applications folder (although personally I dont
+really recommend this). The instructions below assume you are building into
+a pre-existing ${HOME}/apps directory ...
cd qgis
mkdir build
cd build
- cmake -D CMAKE_INSTALL_PREFIX=$HOME/apps/ -D CMAKE_BUILD_TYPE=Release..
+ cmake -D CMAKE_INSTALL_PREFIX=$HOME/apps/ -D CMAKE_BUILD_TYPE=Release ..
To use a specific GRASS version, You can optionally use the following
@@ -647,7 +752,7 @@
Kyngesburye for this hint):
- cmake -D CMAKE_INSTALL_PREFIX=$HOME/apps/ \
+ cmake -D CMAKE_INSTALL_PREFIX=${HOME}/apps/ \
-D GRASS_INCLUDE_DIR=/Applications/GRASS-6.3.app/Contents/Resources/include \
-D GRASS_PREFIX=/Applications/GRASS-6.3.app/Contents/Resources \
-D CMAKE_BUILD_TYPE=Release \
@@ -688,8 +793,11 @@
5.1. Building QGIS with Qt4.x
=============================
-*Requires:* Ubuntu Edgy / Debian derived distro
+Requires: Ubuntu Edgy / Debian derived distro
+These notes are current for Ubuntu 7.10 - other versions and Debian derived
+distros may require slight variations in package names.
+
These notes are for if you want to build QGIS from source. One of the major
aims here is to show how this can be done using binary packages for *all*
dependencies - building only the core QGIS stuff from source. I prefer this
@@ -771,11 +879,11 @@
==============================================================
- sudo apt-get install gdal-bin libgdal1-dev libgeos-dev proj libtool \
+ sudo apt-get install gdal-bin libgdal1-dev libgeos-dev proj \
libgdal-doc libhdf4g-dev libhdf4g-run python-dev \
- swig libgsl0-dev g++ libjasper-1.701-dev libtiff4-dev subversion gsl-bin \
+ libgsl0-dev g++ libjasper-dev libtiff4-dev subversion \
libsqlite3-dev sqlite3 ccache make libpq-dev flex bison cmake txt2tags \
- python-qt4 python-qt4-dev python-sip4 sip4
+ python-qt4 python-qt4-dev python-sip4 sip4 python-sip4-dev
/!\ Debian users should use libgdal-dev above rather
@@ -794,7 +902,7 @@
Now you can install grass from dapper:
- sudo apt-get install grass libgrass-dev libgdal1-grass
+ sudo apt-get install grass libgrass-dev libgdal-1.4.0-grass
/!\ You may need to explicitly state your grass version e.g. libgdal1-1.3.2-grass
@@ -1219,32 +1327,850 @@
of space and it's not necessary at all.
- 7. Further help and information
- ===============================
+ 7. Building with MS Visual Studio
+ =================================
- Please visit http://qgis.org for information on joining our mailing lists
- and getting involved in the project further.
+/!\ This section describes a process where you build all dependencies yourself. See the section
+after this for a simpler procedure where we have all the dependencies you need pre-packaged
+and we focus just on getting Visual Studio Express set up and building QGIS.
+Note that this does not currently include GRASS or Python plugins.
- 8. Authors and Acknowledgments
- ==============================
-The follwing people have contributed to this document:
+ 7.1. Setup Visual Studio
+ ========================
-- Windows Section
- - Tim Sutton, Godofredo Contreras 2006
- - CMake additions Magnus Homann 2007
- - Python additions Martin Dobias 2007
- - With thanks to Tisham Dhar for preparing the initial msys environment
+This section describes the setup required to allow Visual Studio to be used to build QGIS.
-- OSX Section
- - Tim Sutton, 2007
- - With special thanks to Tom Elwertowski and William Kyngesburye
-- GNU/Linux Section
- - Tim Sutton 2006
+ 7.1.1. Express Edition
+ ======================
+The free Express Edition lacks the platform SDK which contains headers and so on that are needed when building QGIS. The platform SDK can be installed as described here:
+ http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/
+Once this is done, you will need to edit the <vsinstalldir>\Common7\Tools\vsvars file as follows:
+ Add %PlatformSDKDir%\Include\atl and %PlatformSDKDir%\Include\mfc to the @set INCLUDE entry.
+This will add more headers to the system INCLUDE path. Note that this will only work when you use the Visual Studio command prompt when building. Most of the dependencies will be built with this.
+You will also need to perform the edits described here to remove the need for a library that Visual Studio Express lacks:
+ http://www.codeproject.com/wtl/WTLExpress.asp
+
+ 7.1.2. All Editions
+ ===================
+
+You will need stdint.h and unistd.h. unistd.h comes with GnuWin32 version of flex & bison binaries (see later). stdint.h can be found here:
+
+ http://www.azillionmonkeys.com/qed/pstdint.h.
+Copy both of these to <vsinstalldir>\VC\include.
+
+
+ 7.2. Download/Install Dependencies
+ ==================================
+
+This section describes the downloading and installation of the various QGIS dependencies.
+
+
+ 7.2.1. Flex and Bison
+ =====================
+
+Flex and Bison are tools for generation of parsers, they're needed for GRASS and also QGIS compilation.
+
+Download the following packages and run the installers:
+
+ http://gnuwin32.sourceforge.net/downlinks/flex.php
+
+ http://gnuwin32.sourceforge.net/downlinks/bison.php
+
+
+ 7.2.2. To include PostgreSQL support in Qt
+ ===========================================
+
+If you want to build Qt with PostgreSQL support you need to download
+PostgreSQL, install it and create a library you can later link with Qt.
+
+Download from .../binary/v8.2.5/win32/postgresql-8.2.5-1.zip from an
+PostgreSQL.org Mirror and install.
+
+PostgreSQL is currently build with MinGW and comes with headers and libraries
+for MinGW. The headers can be used with Visual C++ out of the box, but the library
+is only shipped in DLL and archive (.a) form and therefore cannot be used with
+Visual C++ directly.
+
+To create a library copy following sed script to the file mkdef.sed in
+PostgreSQL lib directory:
+
+
+ /Dump of file / {
+ s/Dump of file \([^ ]*\)$/LIBRARY \1/p
+ a\
+ EXPORTS
+ }
+ /[ ]*ordinal hint/,/^[ ]*Summary/ {
+ /^[ ]\+[0-9]\+/ {
+ s/^[ ]\+[0-9]\+[ ]\+[0-9A-Fa-f]\+[ ]\+[0-9A-Fa-f]\+[ ]\+\([^ =]\+\).*$/ \1/p
+ }
+ }
+
+
+and process execute in the Visual Studio C++ command line (from Programs menu):
+
+
+ cd c:\Program Files\PostgreSQL\8.2\bin
+ dumpbin /exports ..\bin\libpq.dll | sed -nf ../lib/mkdef.sed >..\lib\libpq.def
+ cd ..\lib
+ lib /def:libpq.def /machine:x86
+
+
+You'll need an sed for that to work in your path (e.g. from cygwin or msys).
+
+That's almost it. You only need to the include and lib path to INCLUDE and LIB
+in vcvars.bat respectively.
+
+
+ 7.2.3. Qt
+ =========
+
+Build Qt following the instructions here:
+
+ http://wiki.qgis.org/qgiswiki/Building_QT_4_with_Visual_C%2B%2B_2005
+
+
+ 7.2.4. Proj.4
+ =============
+
+Get proj.4 source from here:
+
+ http://proj.maptools.org/
+Using the Visual Studio command prompt (ensures the environment is setup properly), run the following in the src directory:
+
+
+ nmake -f makefile.vc
+
+
+Install by running the following in the top level directory setting PROJ_DIR as appropriate:
+
+
+ set PROJ_DIR=c:\lib\proj
+
+ mkdir %PROJ_DIR%\bin
+ mkdir %PROJ_DIR%\include
+ mkdir %PROJ_DIR%\lib
+
+ copy src\*.dll %PROJ_DIR%\bin
+ copy src\*.exe %PROJ_DIR%\bin
+ copy src\*.h %PROJ_DIR%\include
+ copy src\*.lib %PROJ_DIR%\lib
+
+
+This can also be added to a batch file.
+
+
+ 7.2.5. GSL
+ ==========
+
+Get gsl source from here:
+
+ http://david.geldreich.free.fr/downloads/gsl-1.9-windows-sources.zip
+Build using the gsl.sln file
+
+
+ 7.2.6. GEOS
+ ===========
+
+Get geos from svn (svn checkout http://svn.refractions.net/geos/trunk geos).
+Edit geos\source\makefile.vc as follows:
+
+Uncomment lines 333 and 334 to allow the copying of version.h.vc to version.h.
+
+Uncomment lines 338 and 339.
+
+Rename geos_c.h.vc to geos_c.h.in on lines 338 and 339 to allow the copying of geos_c.h.in to geos_c.h.
+
+Using the Visual Studio command prompt (ensures the environment is setup properly), run the following in the top level directory:
+
+
+ nmake -f makefile.vc
+
+
+Run the following in top level directory, setting GEOS_DIR as appropriate:
+
+
+ set GEOS_DIR="c:\lib\geos"
+
+ mkdir %GEOS_DIR%\include
+ mkdir %GEOS_DIR%\lib
+ mkdir %GEOS_DIR%\bin
+
+ xcopy /S/Y source\headers\*.h %GEOS_DIR%\include
+ copy /Y capi\*.h %GEOS_DIR%\include
+ copy /Y source\*.lib %GEOS_DIR%\lib
+ copy /Y source\*.dll %GEOS_DIR%\bin
+
+
+This can also be added to a batch file.
+
+
+ 7.2.7. GDAL
+ ===========
+
+Get gdal from svn (svn checkout https://svn.osgeo.org/gdal/branches/1.4/gdal gdal).
+
+Edit nmake.opt to suit, it's pretty well commented.
+
+Using the Visual Studio command prompt (ensures the environment is setup properly), run the following in the top level directory:
+
+
+ nmake -f makefile.vc
+
+
+and
+
+
+ nmake -f makefile.vc devinstall
+
+
+
+ 7.2.8. PostGIS
+ ==============
+
+Get PostGIS and the Windows version of PostgreSQL from here:
+
+ http://postgis.refractions.net/download/
+Note the warning about not installing the version of PostGIS that comes with the PostgreSQL installer. Simply run the installers.
+
+
+ 7.2.9. Expat
+ ============
+
+Get expat from here:
+
+ http://sourceforge.net/project/showfiles.php?group_id=10127
+You'll need expat-win32bin-2.0.1.exe.
+
+Simply run the executable to install expat.
+
+
+ 7.2.10. CMake
+ =============
+
+Get CMake from here:
+
+ http://www.cmake.org/HTML/Download.html
+You'll need cmake-<version>-win32-x86.exe. Simply run this to install CMake.
+
+
+ 7.3. Building QGIS with CMAKE
+ =============================
+
+Get QGIS source from svn (svn co https://svn.qgis.org/repos/qgis/trunk/qgis qgis).
+
+Create a 'Build' directory in the top level QGIS directory. This will be where all the build output will be generated.
+
+Run Start-->All Programs-->CMake-->CMake.
+
+In the 'Where is the source code:' box, browse to the top level QGIS directory.
+
+In the 'Where to build the binaries:' box, browse to the 'Build' directory you created in the top level QGIS directory.
+
+Fill in the various *_INCLUDE_DIR and *_LIBRARY entries in the 'Cache Values' list.
+
+Click the Configure button. You will be prompted for the type of makefile that will be generated. Select Visual Studio 8 2005 and click OK.
+
+All being well, configuration should complete without errors. If there are errors, it is usually due to an incorrect path to a header or library directory. Failed items will be shown in red in the list.
+
+Once configuration completes without error, click OK to generate the solution and project files.
+
+With Visual Studio 2005, open the qgis.sln file that will have been created in the Build directory you created earlier.
+
+Build the ALL_BUILD project. This will build all the QGIS binaries along with all the plugins.
+
+ Install QGIS by building the INSTALL project. By default this will install to c:\Program Files\qgis<version> (this can be changed by changing the CMAKE_INSTALL_PREFIX variable in CMake).
+
+ You will also either need to add all the dependency dlls to the QGIS install directory or add their respective directories to your PATH.
+
+
+ 8. Building under Windows using MSVC Express
+ ============================================
+
+/!\ Note: Building under MSVC is still a work in progress. In particular the
+following dont work yet: python, grass, postgis connections.
+
+/!\ This section of the document is in draft form and is not ready to be used
+yet.
+
+Tim Sutton, 2007
+
+
+ 8.1. System preparation
+ =======================
+
+I started with a clean XP install with Service Pack 2 and all patches applied.
+I have already compiled all the dependencies you need for gdal, expat etc,
+so this tutorial wont cover compiling those from source too. Since compiling
+these dependencies was a somewhat painful task I hope my precompiled libs
+will be adequate. If not I suggest you consult the individual projects for
+specific build documentation and support. Lets go over the process in a nutshell
+before we begin:
+
+ * Install XP (I used a Parallels virtual machine)
+ * Install the premade libraries archive I have made for you
+ * Install Visual Studio Express 2005 sp1
+ * Install the Microsoft Platform SDK
+ * Install command line subversion client
+ * Install library dependencies bundle
+ * Install Qt 4.3.2
+ * Check out QGIS sources
+ * Compile QGIS
+ * Create setup.exe installer for QGIS
+
+
+ 8.2. Install the libraries archive
+ ==================================
+
+Half of the point of this section of the MSVC setup procedure is to make
+things as simple as possible for you. To that end I have prepared an
+archive that includes all dependencies needed to build QGIS except Qt
+(which we will build further down). Fetch the archive from:
+
+
+ http://qgis.org/uploadfiles/msvc/qgis_msvc_deps_except_qt4.zip
+
+
+Create the following directory structure:
+
+
+ c:\dev\cpp\
+
+
+And then extract the libraries archive into a subdirectory of the above
+directory so that you end up with:
+
+
+ c:\dev\cpp\qgislibs-release
+
+
+/!\ Note that you are not obliged to use this directory layout, but you
+should adjust any instructions that follow if you plan to do things
+differently.
+
+
+ 8.3. Install Visual Studio Express 2005
+ =======================================
+
+First thing we need to get is MSVC Express from here:
+
+http://msdn2.microsoft.com/en-us/express/aa975050.aspx
+
+The page is really confusing so dont feel bad if you cant actually find the
+download at first! There are six coloured blocks on the page for the various
+studio family members (vb / c# / j# etc). Simply choose your language under
+the 'select your language' combo under the yellow C++ block, and your download
+will begin. Under internet explorer I had to disable popup blocking for the
+download to be able to commence.
+
+Once the setup commences you will be prompted with various options. Here is what
+I chose :
+
+ * Send useage information to Microsoft (No)
+ * Install options:
+ * Graphical IDE (Yes)
+ * Microsoft MSDN Express Edition (No)
+ * Microsoft SQL Server Express Edition (No)
+ * Install to folder: C:\Program Files\Microsoft Visual Studio 8\ (default)
+
+It will need to download around 90mb of installation files and reports
+that the install will consume 554mb of disk space.
+
+
+ 8.4. Install Microsoft Platform SDK2
+ ====================================
+
+Go to this page:
+
+http://msdn2.microsoft.com/en-us/express/aa700755.aspx
+
+Start by using the link provided on the above page to download and install the
+platform SDK2.
+
+The actual SDK download page is once again a bit confusing since the links for
+downloading are hidden amongst a bunch of other links. Basically look for these
+three links with their associated 'Download' buttons and choose the correct
+link for your platform:
+
+
+ PSDK-amd64.exe 1.2 MB Download
+ PSDK-ia64.exe 1.3 MB Download
+ PSDK-x86.exe 1.2 MB Download
+
+
+When you install make sure to choose 'custom install'. These instructions
+assume you are installing into the default path of:
+
+
+ C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\
+
+
+We will go for the minimal install that will give us a working environment,
+so on the custom installation screen I made the following choices:
+
+
+ Configuration Options
+ + Register Environmental Variables (Yes)
+ Microsoft Windows Core SDK
+ + Tools (Yes)
+ + Tools (AMD 64 Bit) (No unless this applies)
+ + Tools (Intel 64 Bit) (No unless this applies)
+ + Build Environment
+ + Build Environment (AMD 64 Bit) (No unless this applies)
+ + Build Environment (Intel 64 Bit) (No unless this applies)
+ + Build Environment (x86 32 Bit) (Yes)
+ + Documentation (No)
+ + Redistributable Components (Yes)
+ + Sample Code (No)
+ + Source Code (No)
+ + AMD 64 Source (No)
+ + Intel 64 Source (No)
+ Microsoft Web Workshop (Yes) (needed for shlwapi.h)
+ + Build Environment (Yes)
+ + Documentation (No)
+ + Sample Code (No)
+ + Tools (No)
+ Microsoft Internet Information Server (IIS) SDK (No)
+ Microsoft Data Access Services (MDAC) SDK (Yes) (needed by GDAL for odbc)
+ + Tools
+ + Tools (AMD 64 Bit) (No)
+ + Tools (AMD 64 Bit) (No)
+ + Tools (x86 32 Bit) (Yes)
+ + Build Environment
+ + Tools (AMD 64 Bit) (No)
+ + Tools (AMD 64 Bit) (No)
+ + Tools (x86 32 Bit) (Yes)
+ + Documentation (No)
+ + Sample Code (No)
+ Microsodt Installer SDK (No)
+ Microsoft Table PC SDK (No)
+ Microsoft Windows Management Instrumentation (No)
+ Microsoft DirectShow SDK (No)
+ Microsoft Media Services SDK (No)
+ Debuggin Tools for Windows (Yes)
+
+
+/!\ Note that you can always come back later to add extra bits if you like.
+
+/!\ Note that installing the SDK requires validation with the
+Microsoft Genuine Advantage application. Some people have a philosophical
+objection to installing this software on their computers. If you are one
+of them you should probably consider using the MINGW build instructions
+described elsewhere in this document.
+
+The SDK installs a directory called
+
+
+ C:\Office10
+
+
+Which you can safely remove.
+
+After the SDK is installed, follow the remaining notes on the page link
+above to get your MSVC Express environment configured correctly. For your
+convenience, these are summarised again below, and I have added a couple
+more paths that I discovered were needed:
+
+1) open Visual Studio Express IDE
+
+2) Tools -> Options -> Projects and Solutions -> VC++ Directories
+
+3) Add:
+
+
+ Executable files:
+ C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Bin
+
+ Include files:
+ C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include
+ C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include\atl
+ C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include\mfc
+ Library files: C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib
+
+
+4) Close MSVC Express IDE
+
+5) Open the following file with notepad:
+
+
+ C:\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\corewin_express.vsprops
+
+
+and change the property:
+
+
+ AdditionalDependencies="kernel32.lib"
+
+
+To read:
+
+
+ AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
+
+
+The notes go on to show how to build a mswin32 application which you can try if you like -
+I'm not going to recover that here.
+
+
+ 8.5. Edit your vsvars
+ =====================
+
+Backup your vsvars32.bat file in
+
+
+ C:\Program Files\Microsoft Visual Studio 8\Common7\Tools
+
+
+and replace it with this one:
+
+
+ @SET VSINSTALLDIR=C:\Program Files\Microsoft Visual Studio 8
+ @SET VCINSTALLDIR=C:\Program Files\Microsoft Visual Studio 8\VC
+ @SET FrameworkDir=C:\WINDOWS\Microsoft.NET\Framework
+ @SET FrameworkVersion=v2.0.50727
+ @SET FrameworkSDKDir=C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0
+ @if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR
+ @if "%VCINSTALLDIR%"=="" goto error_no_VCINSTALLDIR
+
+ @echo Setting environment for using Microsoft Visual Studio 2005 x86 tools.
+
+ @rem
+ @rem Root of Visual Studio IDE installed files.
+ @rem
+ @set DevEnvDir=C:\Program Files\Microsoft Visual Studio 8\Common7\IDE
+
+ @set PATH=C:\Program Files\Microsoft Visual Studio 8\Common7\IDE;C:\Program Files\Microsoft Visual Studio 8\VC\BIN;C:\Program Files\Microsoft Visual Studio 8\Common7\Tools;C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\bin;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Program Files\Microsoft Visual Studio 8\VC\VCPackages;%PATH%
+ @rem added by Tim
+ @set PATH=C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Bin;%PATH%
+ @set INCLUDE=C:\Program Files\Microsoft Visual Studio 8\VC\INCLUDE;%INCLUDE%
+ @rem added by Tim
+ @set INCLUDE=C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include;%INCLUDE%
+ @set INCLUDE=C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include\mfc;%INCLUDE%
+ @set INCLUDE=%INCLUDE%;C:\dev\cpp\qgislibs-release\include\postgresql
+ @set LIB=C:\Program Files\Microsoft Visual Studio 8\VC\LIB;C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\lib;%LIB%
+ @rem added by Tim
+ @set LIB=C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib;%LIB%
+ @set LIB=%LIB%;C:\dev\cpp\qgislibs-release\lib
+ @set LIBPATH=C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727
+
+ @goto end
+
+ :error_no_VSINSTALLDIR
+ @echo ERROR: VSINSTALLDIR variable is not set.
+ @goto end
+
+ :error_no_VCINSTALLDIR
+ @echo ERROR: VCINSTALLDIR variable is not set.
+ @goto end
+
+ :end
+
+
+
+
+ 8.6. Environment Variables
+ ==========================
+
+Right click on 'My computer' then select the 'Advanced' tab. Click environment variables and
+create or augment the following '''System''' variables (if they dont already exist):
+
+
+ Variable Name: Value:
+ --------------------------------------------------------------------------
+ EDITOR vim
+ INCLUDE C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include\.
+ LIB C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib\.
+ LIB_DIR C:\dev\cpp\qgislibs-release
+ PATH C:\Program Files\CMake 2.4\bin;
+ %SystemRoot%\system32;
+ %SystemRoot%;
+ %SystemRoot%\System32\Wbem;
+ C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Bin\.;
+ C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Bin\WinNT\;
+ C:\Program Files\svn\bin;C:\Program Files\Microsoft Visual Studio 8\VC\bin;
+ C:\Program Files\Microsoft Visual Studio 8\Common7\IDE;
+ "c:\Program Files\Microsoft Visual Studio 8\Common7\Tools";
+ c:\Qt\4.3.2\bin;
+ "C:\Program Files\PuTTY"
+ QTDIR c:\Qt\4.3.2
+ SVN_SSH "C:\\Program Files\\PuTTY\\plink.exe"
+
+
+
+ 8.7. Building Qt4.3.2
+ =====================
+
+You need a minimum of Qt 4.3.2 here since this is the first version to officially
+support building the open source version of Qt for windows under MSVC.
+
+Download Qt 4.x.x source for windows from
+
+
+ http:\\www.trolltech.com
+
+
+Unpack the source to
+
+
+ c:\Qt\4.x.x\
+
+
+
+ 8.7.1. Compile Qt
+ =================
+
+Open the Visual Studio C++ command line and cd to c:\Qt\4.x.x where you
+extracted the source and enter:
+
+
+ configure -platform win32-msvc2005
+ nmake
+ nmake install
+
+
+Add -qt-sql-odbc -qt-sql-psql to the configure line if your want odbc and
+PostgreSQL support build into Qt.
+
+/!\ Note: For me in some cases I got a build error on qscreenshot.pro. If you
+are only interested in having the libraries needed for building Qt apps, you
+can probably ignore that. Just check in c:\Qt\4.3.2\bin to check all dlls and
+helper apps (assistant etc) have been made.
+
+
+ 8.7.2. Configure Visual C++ to use Qt
+ =====================================
+
+After building configure the Visual Studio Express IDE to use Qt:
+
+1) open Visual Studio Express IDE
+
+2) Tools -> Options -> Projects and Solutions -> VC++ Directories
+
+3) Add:
+
+
+ Executable files:
+ $(QTDIR)\bin
+
+ Include files:
+ $(QTDIR)\include
+ $(QTDIR)\include\Qt
+ $(QTDIR)\include\QtCore
+ $(QTDIR)\include\QtGui
+ $(QTDIR)\include\QtNetwork
+ $(QTDIR)\include\QtSvg
+ $(QTDIR)\include\QtXml
+ $(QTDIR)\include\Qt3Support
+ $(LIB_DIR)\include (needed during qgis compile to find stdint.h and unistd.h)
+
+ Library files:
+ $(QTDIR)\lib
+
+ Source Files:
+ $(QTDIR)\src
+
+
+Hint: You can also add
+
+
+ QString = t=<d->data, su>, size=<d->size, i>
+
+
+to AutoExp.DAT in C:\Program Files\Microsoft Visual Studio 8\Common7\Packages\Debugger before
+
+
+ [Visualizer]
+
+
+That way the Debugger will show the contents of QString when you point at or
+watch a variable in the debugger. There are probably much more additions -
+feel free to add some - I just needed QString and took the first hit in google
+I could find.
+
+
+ 8.8. Install Python
+ ===================
+
+Download http://python.org/ftp/python/2.5.1/python-2.5.1.msi and install it.
+
+
+ 8.9. Install SIP
+ ================
+
+Download http://www.riverbankcomputing.com/Downloads/sip4/sip-4.7.1.zip and extract it
+into your c:\dev\cpp directory.
+From a Visual C++ command line cd to the directory where you extract SIP and run:
+
+
+ c:\python25\python configure.py -p win32-msvc2005
+ nmake
+ nmake install
+
+
+
+ 8.10. Install PyQt4
+ ===================
+
+Download http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-win-gpl-4.3.1.zip and extract it
+into your c:\dev\cpp directory.
+From a Visual C++ command line cd to the directory where you extracted PyQt4 and run:
+
+
+ c:\python25\python configure.py -p win32-msvc2005
+ nmake
+ nmake install
+ ````
+
+ == Install CMake ==
+
+ Download and install cmake 2.4.7 or better, making sure to enable the
+ option
+
+
+Update path for all users
+
+
+
+ == Install Subversion ==
+
+ You '''must''' install the command line version if you want the CMake svn scripts to work.
+ Its a bit tricky to find the correct version on the subversion download site as they have
+ som misleadingly named similar downloads. Easiest is to just get this file:
+
+ http://subversion.tigris.org/downloads/1.4.5-win32/apache-2.2/svn-win32-1.4.5.zip
+
+ Extract the zip file to
+
+
+C:\Program Files\svn
+
+
+
+ And then add
+
+
+C:\Program Files\svn\bin
+
+
+
+ To your path.
+
+
+ == Initial SVN Check out ==
+
+ Open a cmd.exe window and do:
+
+
+
+cd \
+cd dev
+cd cpp
+svn co https://svn.qgis.org/repos/qgis/trunk/qgis
+
+
+
+ At this point you will probably get a message like this:
+
+
+C:\dev\cpp>svn co https://svn.qgis.org/repos/qgis/trunk/qgis
+Error validating server certificate for 'https://svn.qgis.org:443':
+
+ - The certificate is not issued by a trusted authority. Use the
+ fingerprint to validate the certificate manually!
+Certificate information:
+ - Hostname: svn.qgis.org
+ - Valid: from Sat, 01 Apr 2006 03:30:47 GMT until Fri, 21 Mar 2008 03:30:47 GMT
+ - Issuer: Developer Team, Quantum GIS, Anchorage, Alaska, US
+ - Fingerprint: 2f:cd:f1:5a:c7:64:da:2b:d1:34:a5:20:c6:15:67:28:33:ea:7a:9b
+(R)eject, accept (t)emporarily or accept (p)ermanently?
+
+
+ Press 'p' to accept and the svn checkout will commence.
+
+ == Create Makefiles using cmakesetup.exe ==
+
+ I wont be giving a detailed description of the build process, because
+ the process is explained in the first section (where you manually build
+ all dependencies) of the windows build notes in this document. Just skip
+ past the parts where you need to build GDAL etc, since this simplified
+ install process does all the dependency provisioning for you.
+
+
+cd qgis
+mkdir build
+cd build
+cmakesetup ..
+
+
+ Cmakesetup should find all dependencies for you automatically (it uses the
+ LIB_DIR environment to find them all in c:\dev\cpp\qgislibs-release).
+ Press configure again after the cmakesetup gui appears and when all the red
+ fields are gone, and you have made any personalisations to the setup, press
+ ok to close the cmake gui.
+
+ Now open Visual Studio Express and do:
+
+ File -> Open -> Project / Solution
+
+ Now open the cmake generated QGIS solution which should be in :
+
+
+c:\dev\cpp\qgis\build\qgisX.X.X.sln
+
+
+ Where X.X.X represents the current version number of QGIS. Currently I
+ have only made release built dependencies for QGIS (debug versions will follow
+ in future), so you need to be sure to select 'Release' from the solution
+ configurations toolbar.
+
+ Next right click on ALL_BUILD in the solution browser, and then choose build.
+
+ Once the build completes right click on INSTALL in the solution browser and
+ choose build. This will by default install qgis into c:\program files\qgisX.X.X.
+
+ == Running and packaging ==
+
+ To run QGIS you need to at the minimum copy the dlls from c:\dev\cpp\qgislibs-release\bin
+ into the c:\program files\qgisX.X.X directory.
+
+ = Authors and Acknowledgments =
+
+ The following people have contributed to this document:
+
+ - Windows MINGW Section
+ - Tim Sutton, Godofredo Contreras 2006
+ - CMake additions Magnus Homann 2007
+ - Python additions Martin Dobias 2007
+ - With thanks to Tisham Dhar for preparing the initial msys environment
+
+ - Windows MSVC Section (Detailed install)
+ - David Willis 2007
+ - MSVC install additions Tim Sutton 2007
+ - PostgreSQL, Qt compile, SIP, Python, AutoExp additions Juergen Fischer 2007
+
+
+ - Windows MSVC Section (Simplified install)
+ - Tim Sutton 2007
+ - Juergen Fischer 2007
+
+ - OSX Section
+ - Tim Sutton, 2007
+ - With special thanks to Tom Elwertowski and William Kyngesburye
+
+ - GNU/Linux Section
+ - Tim Sutton 2006
+
+
+
+
+
+
Modified: packages/qgis/branches/upstream/current/INSTALL.t2t
===================================================================
--- packages/qgis/branches/upstream/current/INSTALL.t2t 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/INSTALL.t2t 2008-01-18 16:51:06 UTC (rev 1341)
@@ -1,3 +1,6 @@
+Quantum GIS (QGIS)
+Building QGIS from source - step by step
+
%!encoding: iso-8859-1
@@ -23,16 +26,47 @@
= Introduction =
+This document is the original installation guide of the described software
+Quantum GIS. The software and hardware descriptions named in this
+document are in most cases registered trademarks and are therefore subject
+to the legal requirements. Quantum GIS is subject to the GNU General Public
+License. Find more information on the Quantum GIS Homepage:
+http://www.qgis.org
+
+The details, that are given in this document have been written and verified
+to the best of knowledge and responsibility of the editors. Nevertheless,
+mistakes concerning the content are possible. Therefore, all data are not
+liable to any duties or guarantees. The editors and publishers do not take
+any responsibility or liability for failures and their consequences. You are
+always welcome for indicating possible mistakes.
+
+You can download this document as part of the Quantum GIS 'User and
+Installation Guide' in HTML and PDF format via http://www.qgis.org. A current
+version is also available at the wiki, see:
+http://wiki.qgis.org/qgiswiki/BuildingFromSource
+
+Translations of this document can also be downloaded at the documentation area
+of the Quantum GIS project at http://www.qgis.org. More information is
+available via http://wiki.qgis.org/qgiswiki/DocumentationWritersCorner.
+
+Please visit http://qgis.org for information on joining our mailing lists
+and getting involved in the project further.
+
/!\ ***Note to document writers:*** Please use this document as the central
place for describing build procefures. Please do not remove this notice.
/!\ ***Note:*** This is a 'cut and paste' tutorial - in most cases you can
simply copy the commands listed in codeblocks that look like this:
-``` somecommand to be pasted ```
+```
+somecommand to be pasted
+```
+% -----------------------------------------------------------------------------
+% ----Please leave this break marker here for clarity - it wont be rendered ---
+% -----------------------------------------------------------------------------
-= General Build Note =
+= General Build Notes =
At version 0.8.1 QGIS no longer uses the autotools for building. QGIS, like a
number of major projects (eg. KDE 4.0), now uses cmake for building from
@@ -42,6 +76,36 @@
For complete information, see the wiki at:
http://wiki.qgis.org/qgiswiki/Building_with_CMake
+== An overview of the dependencies required for building ==
+
+'''Required build deps:'''
+ * CMake >= 2.4.3
+ * Flex, Bison
+
+'''Required runtime deps:'''
+ * Qt >= 4.2.0
+ * Proj >= ? (known to work with 4.4.x)
+ * GEOS >= 2.2 (3.0 is supported, maybe 2.1.x works too)
+ * Sqlite3 >= ? (probably 3.0.0)
+ * GDAL/OGR >= ? (1.2.x should work)
+
+'''Optional dependencies:'''
+ * for GRASS plugin - GRASS >= 6.0.0
+ * for georeferencer - GSL >= ? (works with 1.8)
+ * for postgis support and SPIT plugin - PostgreSQL >= ?
+ * for gps plugin - expat >= ? (1.95 is OK)
+ * for mapserver export and PyQGIS - Python >= ? (probably 2.3)
+ * for PyQGIS - SIP >= 4.5, PyQt >= 4.1
+
+'''Recommended runtime deps:'''
+ * for gps plugin - gpsbabel
+
+
+
+% -----------------------------------------------------------------------------
+% ----Please leave this break marker here for clarity - it wont be rendered ---
+% -----------------------------------------------------------------------------
+
= Building under windows using msys =
== MSYS: ==
@@ -51,18 +115,13 @@
Get this:
-http://qgis.org/uploadfiles/msys/msys.tar.gz
+http://qgis.org/uploadfiles/msys/msys.zip
and unpack to c:\msys
-/!\ The file above is compressed as gzipped tarball - you can get a free
-windows application for creating and decompressing files here:
-
-http://www.7-zip.org/
-
If you wish to prepare your msys environment yourself rather than using
-our pre-made one, detailed instructions are provdided elsewhere in this
+our pre-made one, detailed instructions are provided elsewhere in this
document.
== Qt4.3 ==
@@ -124,10 +183,11 @@
=== Download SIP and PyQt4 sources ===
-http://www.riverbankcomputing.com/Downloads/sip4/sip-4.6.zip
-http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-win-gpl-4.2.zip
+http://www.riverbankcomputing.com/Downloads/sip4/
+http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/
-Extract each of the above zip files in a temporary directory.
+Extract each of the above zip files in a temporary directory. Make sure
+to get versions that match your current Qt installed version.
=== Compile SIP ===
@@ -271,6 +331,9 @@
on qgis.nsi and choose the option 'Compile NSIS Script'.
+% -----------------------------------------------------------------------------
+% ----Please leave this break marker here for clarity - it wont be rendered ---
+% -----------------------------------------------------------------------------
= Building on Mac OSX using frameworks and cmake (QGIS > 0.8) =
@@ -285,14 +348,16 @@
== Install Qt4 from .dmg ==
+You need a minimum of Qt4.2. I suggest getting the latest (at time of writing).
+
```
-ftp://ftp.trolltech.com/qt/source/qt-mac-opensource-4.2.3.dmg
+ftp://ftp.trolltech.com/qt/source/qt-mac-opensource-4.3.2.dmg
```
If you want debug libs, Qt also provide a dmg with these:
```
-ftp://ftp.trolltech.com/qt/source/qt-mac-opensource-4.2.3-debug-libs.dmg
+ftp://ftp.trolltech.com/qt/source/qt-mac-opensource-4.3.2-debug-libs.dmg
```
I am going to proceed using only release libs at this stage as the download for
@@ -312,7 +377,7 @@
Second change the default mkspec symlink so that it points to macx-g++:
```
-cd /usr/local/Qt4.2/mkspecs/ sudo rm default sudo ln -sf macx-g++ default
+cd /usr/local/Qt4.3/mkspecs/ sudo rm default sudo ln -sf macx-g++ default
```
@@ -352,7 +417,8 @@
cd gsl-1.8
./configure --prefix=/usr/local
make
-sudo make install cd ..
+sudo make install
+cd ..
```
=== Additional Dependencies : Expat ===
@@ -377,14 +443,14 @@
Retrieve the python bindings toolkit SIP from
```
-curl -O http://www.riverbankcomputing.com/Downloads/sip4/sip-4.5.2.tar.gz
+http://www.riverbankcomputing.com/Downloads/sip4/
```
Then extract and build it to a prefix of /usr/local:
```
-tar xvfz sip-4.5.2.tar.gz
-cd sip-4.5.2
+tar xvfz sip-<version number>.tar.gz
+cd sip-<version number>
python configure.py
make
sudo make install
@@ -393,17 +459,31 @@
=== Additional Dependencies : PyQt ===
+Make sure you have the latest python fom
+
+```
+http://www.python.org/download/mac/
+```
+
+If you encounter problems compiling PyQt using the instructions
+below you can also try adding python from your frameworks dir
+explicitly to your path e.g.
+
+```
+export PATH=/Library/Frameworks/Python.framework/Versions/Current/bin:$PATH$
+```
+
Retrieve the python bindings toolkit for Qt from
```
-curl -O http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-mac-gpl-4.1.1.tar.gz
+http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/
```
Then extract and build it to a prefix of /usr/local:
```
-tar xvfz PyQt-mac-gpl-4.1.1.tar.gz
-cd PyQt-mac-gpl-4.1.1
+tar xvfz PyQt-mac<version number here>
+cd PyQt-mac<version number here>
python configure.py
yes
make
@@ -511,6 +591,10 @@
svn co https://svn.qgis.org/repos/qgis/branches/Release-0_8_0 qgis0.8
```
+For svn 0.9 branch
+```
+svn co https://svn.qgis.org/repos/qgis/branches/Release-0_9_0 qgis0.9
+```
The first time you check out QGIS sources you will probably get a message like
this:
@@ -531,13 +615,17 @@
== Configure the build ==
CMake supports out of source build so we will create a 'build' dir for the
-build process
+build process . By convention I build my software into a dir called 'apps'
+in my home directory. If you have the correct permissions you may want to
+build straight into your /Applications folder (although personally I dont
+really recommend this). The instructions below assume you are building into
+a pre-existing ${HOME}/apps directory ...
```
cd qgis
mkdir build
cd build
-cmake -D CMAKE_INSTALL_PREFIX=$HOME/apps/ -D CMAKE_BUILD_TYPE=Release..
+cmake -D CMAKE_INSTALL_PREFIX=$HOME/apps/ -D CMAKE_BUILD_TYPE=Release ..
```
To use a specific GRASS version, You can optionally use the following
@@ -545,7 +633,7 @@
Kyngesburye for this hint):
```
-cmake -D CMAKE_INSTALL_PREFIX=$HOME/apps/ \
+cmake -D CMAKE_INSTALL_PREFIX=${HOME}/apps/ \
-D GRASS_INCLUDE_DIR=/Applications/GRASS-6.3.app/Contents/Resources/include \
-D GRASS_PREFIX=/Applications/GRASS-6.3.app/Contents/Resources \
-D CMAKE_BUILD_TYPE=Release \
@@ -574,12 +662,19 @@
make install
```
+% -----------------------------------------------------------------------------
+% ----Please leave this break marker here for clarity - it wont be rendered ---
+% -----------------------------------------------------------------------------
+
= Building on GNU/Linux =
== Building QGIS with Qt4.x ==
-***Requires:*** Ubuntu Edgy / Debian derived distro
+**Requires:** Ubuntu Edgy / Debian derived distro
+These notes are current for Ubuntu 7.10 - other versions and Debian derived
+distros may require slight variations in package names.
+
These notes are for if you want to build QGIS from source. One of the major
aims here is to show how this can be done using binary packages for ***all***
dependencies - building only the core QGIS stuff from source. I prefer this
@@ -658,11 +753,11 @@
== Install additional software dependencies required by QGIS ==
```
-sudo apt-get install gdal-bin libgdal1-dev libgeos-dev proj libtool \
+sudo apt-get install gdal-bin libgdal1-dev libgeos-dev proj \
libgdal-doc libhdf4g-dev libhdf4g-run python-dev \
-swig libgsl0-dev g++ libjasper-1.701-dev libtiff4-dev subversion gsl-bin \
+libgsl0-dev g++ libjasper-dev libtiff4-dev subversion \
libsqlite3-dev sqlite3 ccache make libpq-dev flex bison cmake txt2tags \
-python-qt4 python-qt4-dev python-sip4 sip4
+python-qt4 python-qt4-dev python-sip4 sip4 python-sip4-dev
```
/!\ Debian users should use libgdal-dev above rather
@@ -680,7 +775,7 @@
Now you can install grass from dapper:
```
-sudo apt-get install grass libgrass-dev libgdal1-grass
+sudo apt-get install grass libgrass-dev libgdal-1.4.0-grass
```
/!\ You may need to explicitly state your grass version e.g. libgdal1-1.3.2-grass
@@ -797,6 +892,10 @@
If all has worked properly the QGIS application should start up and appear
on your screen.
+% -----------------------------------------------------------------------------
+% ----Please leave this break marker here for clarity - it wont be rendered ---
+% -----------------------------------------------------------------------------
+
= Creation of MSYS environment for compilation of Quantum GIS =
== Initial setup ==
@@ -1051,22 +1150,781 @@
We're done with preparation of MSYS environment. Now you can delete all stuff in ``c:\msys\local\src`` - it takes quite a lot
of space and it's not necessary at all.
-= Further help and information =
- Please visit http://qgis.org for information on joining our mailing lists
- and getting involved in the project further.
+% -----------------------------------------------------------------------------
+% ----Please leave this break marker here for clarity - it wont be rendered ---
+% -----------------------------------------------------------------------------
+
+= Building with MS Visual Studio =
+
+
+/!\ This section describes a process where you build all dependencies yourself. See the section
+after this for a simpler procedure where we have all the dependencies you need pre-packaged
+and we focus just on getting Visual Studio Express set up and building QGIS.
+
+Note that this does not currently include GRASS or Python plugins.
+
+== Setup Visual Studio ==
+
+This section describes the setup required to allow Visual Studio to be used to build QGIS.
+
+=== Express Edition ===
+The free Express Edition lacks the platform SDK which contains headers and so on that are needed when building QGIS. The platform SDK can be installed as described here:
+ http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/
+Once this is done, you will need to edit the <vsinstalldir>\Common7\Tools\vsvars file as follows:
+ Add ``%PlatformSDKDir%\Include\atl`` and ``%PlatformSDKDir%\Include\mfc`` to the ``@set INCLUDE`` entry.
+This will add more headers to the system INCLUDE path. Note that this will only work when you use the Visual Studio command prompt when building. Most of the dependencies will be built with this.
+You will also need to perform the edits described here to remove the need for a library that Visual Studio Express lacks:
+ http://www.codeproject.com/wtl/WTLExpress.asp
+
+=== All Editions ===
+
+You will need stdint.h and unistd.h. unistd.h comes with GnuWin32 version of flex & bison binaries (see later). stdint.h can be found here:
+ http://www.azillionmonkeys.com/qed/pstdint.h.
+Copy both of these to <vsinstalldir>\VC\include.
+
+== Download/Install Dependencies ==
+
+This section describes the downloading and installation of the various QGIS dependencies.
+
+=== Flex and Bison ===
+
+Flex and Bison are tools for generation of parsers, they're needed for GRASS and also QGIS compilation.
+
+Download the following packages and run the installers:
+ http://gnuwin32.sourceforge.net/downlinks/flex.php
+
+ http://gnuwin32.sourceforge.net/downlinks/bison.php
+
+=== To include PostgreSQL support in Qt ===
+
+If you want to build Qt with PostgreSQL support you need to download
+PostgreSQL, install it and create a library you can later link with Qt.
+
+Download from .../binary/v8.2.5/win32/postgresql-8.2.5-1.zip from an
+PostgreSQL.org Mirror and install.
+
+PostgreSQL is currently build with MinGW and comes with headers and libraries
+for MinGW. The headers can be used with Visual C++ out of the box, but the library
+is only shipped in DLL and archive (.a) form and therefore cannot be used with
+Visual C++ directly.
+
+To create a library copy following sed script to the file mkdef.sed in
+PostgreSQL lib directory:
+
+```
+/Dump of file / {
+ s/Dump of file \([^ ]*\)$/LIBRARY \1/p
+ a\
+EXPORTS
+}
+/[ ]*ordinal hint/,/^[ ]*Summary/ {
+ /^[ ]\+[0-9]\+/ {
+ s/^[ ]\+[0-9]\+[ ]\+[0-9A-Fa-f]\+[ ]\+[0-9A-Fa-f]\+[ ]\+\([^ =]\+\).*$/ \1/p
+ }
+}
+```
+
+and process execute in the Visual Studio C++ command line (from Programs menu):
+
+```
+cd c:\Program Files\PostgreSQL\8.2\bin
+dumpbin /exports ..\bin\libpq.dll | sed -nf ../lib/mkdef.sed >..\lib\libpq.def
+cd ..\lib
+lib /def:libpq.def /machine:x86
+```
+
+You'll need an sed for that to work in your path (e.g. from cygwin or msys).
+
+That's almost it. You only need to the include and lib path to INCLUDE and LIB
+in vcvars.bat respectively.
+
+=== Qt ===
+
+Build Qt following the instructions here:
+ http://wiki.qgis.org/qgiswiki/Building_QT_4_with_Visual_C%2B%2B_2005
+
+=== Proj.4 ===
+
+Get proj.4 source from here:
+ http://proj.maptools.org/
+Using the Visual Studio command prompt (ensures the environment is setup properly), run the following in the src directory:
+
+``` nmake -f makefile.vc
+
+Install by running the following in the top level directory setting PROJ_DIR as appropriate:
+
+```
+set PROJ_DIR=c:\lib\proj
+
+mkdir %PROJ_DIR%\bin
+mkdir %PROJ_DIR%\include
+mkdir %PROJ_DIR%\lib
+
+copy src\*.dll %PROJ_DIR%\bin
+copy src\*.exe %PROJ_DIR%\bin
+copy src\*.h %PROJ_DIR%\include
+copy src\*.lib %PROJ_DIR%\lib
+```
+
+This can also be added to a batch file.
+
+=== GSL ===
+
+Get gsl source from here:
+ http://david.geldreich.free.fr/downloads/gsl-1.9-windows-sources.zip
+Build using the gsl.sln file
+
+=== GEOS ===
+
+Get geos from svn (svn checkout http://svn.refractions.net/geos/trunk geos).
+Edit geos\source\makefile.vc as follows:
+
+Uncomment lines 333 and 334 to allow the copying of version.h.vc to version.h.
+
+Uncomment lines 338 and 339.
+
+Rename geos_c.h.vc to geos_c.h.in on lines 338 and 339 to allow the copying of geos_c.h.in to geos_c.h.
+
+Using the Visual Studio command prompt (ensures the environment is setup properly), run the following in the top level directory:
+
+``` nmake -f makefile.vc
+
+Run the following in top level directory, setting GEOS_DIR as appropriate:
+
+```
+set GEOS_DIR="c:\lib\geos"
+
+mkdir %GEOS_DIR%\include
+mkdir %GEOS_DIR%\lib
+mkdir %GEOS_DIR%\bin
+
+xcopy /S/Y source\headers\*.h %GEOS_DIR%\include
+copy /Y capi\*.h %GEOS_DIR%\include
+copy /Y source\*.lib %GEOS_DIR%\lib
+copy /Y source\*.dll %GEOS_DIR%\bin
+```
+
+This can also be added to a batch file.
+
+=== GDAL ===
+
+Get gdal from svn (svn checkout https://svn.osgeo.org/gdal/branches/1.4/gdal gdal).
+
+Edit nmake.opt to suit, it's pretty well commented.
+
+Using the Visual Studio command prompt (ensures the environment is setup properly), run the following in the top level directory:
+
+``` nmake -f makefile.vc
+
+and
+
+``` nmake -f makefile.vc devinstall
+
+=== PostGIS ===
+
+Get PostGIS and the Windows version of PostgreSQL from here:
+ http://postgis.refractions.net/download/
+Note the warning about not installing the version of PostGIS that comes with the PostgreSQL installer. Simply run the installers.
+
+=== Expat ===
+
+Get expat from here:
+ http://sourceforge.net/project/showfiles.php?group_id=10127
+You'll need expat-win32bin-2.0.1.exe.
+
+Simply run the executable to install expat.
+
+=== CMake ===
+
+Get CMake from here:
+ http://www.cmake.org/HTML/Download.html
+You'll need cmake-<version>-win32-x86.exe. Simply run this to install CMake.
+
+== Building QGIS with CMAKE ==
+
+Get QGIS source from svn (svn co https://svn.qgis.org/repos/qgis/trunk/qgis qgis).
+
+Create a 'Build' directory in the top level QGIS directory. This will be where all the build output will be generated.
+
+Run Start-->All Programs-->CMake-->CMake.
+
+In the 'Where is the source code:' box, browse to the top level QGIS directory.
+
+In the 'Where to build the binaries:' box, browse to the 'Build' directory you created in the top level QGIS directory.
+
+Fill in the various *_INCLUDE_DIR and *_LIBRARY entries in the 'Cache Values' list.
+
+Click the Configure button. You will be prompted for the type of makefile that will be generated. Select Visual Studio 8 2005 and click OK.
+
+All being well, configuration should complete without errors. If there are errors, it is usually due to an incorrect path to a header or library directory. Failed items will be shown in red in the list.
+
+Once configuration completes without error, click OK to generate the solution and project files.
+
+With Visual Studio 2005, open the qgis.sln file that will have been created in the Build directory you created earlier.
+
+Build the ALL_BUILD project. This will build all the QGIS binaries along with all the plugins.
+
+ Install QGIS by building the INSTALL project. By default this will install to c:\Program Files\qgis<version> (this can be changed by changing the CMAKE_INSTALL_PREFIX variable in CMake).
+
+ You will also either need to add all the dependency dlls to the QGIS install directory or add their respective directories to your PATH.
+
+
+
+% -----------------------------------------------------------------------------
+% ----Please leave this break marker here for clarity - it wont be rendered ---
+% -----------------------------------------------------------------------------
+
+
+= Building under Windows using MSVC Express =
+
+/!\ Note: Building under MSVC is still a work in progress. In particular the
+following dont work yet: python, grass, postgis connections.
+
+/!\ This section of the document is in draft form and is not ready to be used
+yet.
+
+Tim Sutton, 2007
+
+== System preparation ==
+
+I started with a clean XP install with Service Pack 2 and all patches applied.
+I have already compiled all the dependencies you need for gdal, expat etc,
+so this tutorial wont cover compiling those from source too. Since compiling
+these dependencies was a somewhat painful task I hope my precompiled libs
+will be adequate. If not I suggest you consult the individual projects for
+specific build documentation and support. Lets go over the process in a nutshell
+before we begin:
+
+ * Install XP (I used a Parallels virtual machine)
+ * Install the premade libraries archive I have made for you
+ * Install Visual Studio Express 2005 sp1
+ * Install the Microsoft Platform SDK
+ * Install command line subversion client
+ * Install library dependencies bundle
+ * Install Qt 4.3.2
+ * Check out QGIS sources
+ * Compile QGIS
+ * Create setup.exe installer for QGIS
+
+== Install the libraries archive ==
+
+Half of the point of this section of the MSVC setup procedure is to make
+things as simple as possible for you. To that end I have prepared an
+archive that includes all dependencies needed to build QGIS except Qt
+(which we will build further down). Fetch the archive from:
+
+```
+http://qgis.org/uploadfiles/msvc/qgis_msvc_deps_except_qt4.zip
+```
+
+Create the following directory structure:
+
+```
+c:\dev\cpp\
+```
+
+And then extract the libraries archive into a subdirectory of the above
+directory so that you end up with:
+
+```
+c:\dev\cpp\qgislibs-release
+```
+
+/!\ Note that you are not obliged to use this directory layout, but you
+should adjust any instructions that follow if you plan to do things
+differently.
+
+== Install Visual Studio Express 2005 ==
+
+First thing we need to get is MSVC Express from here:
+
+http://msdn2.microsoft.com/en-us/express/aa975050.aspx
+
+The page is really confusing so dont feel bad if you cant actually find the
+download at first! There are six coloured blocks on the page for the various
+studio family members (vb / c# / j# etc). Simply choose your language under
+the 'select your language' combo under the yellow C++ block, and your download
+will begin. Under internet explorer I had to disable popup blocking for the
+download to be able to commence.
+
+Once the setup commences you will be prompted with various options. Here is what
+I chose :
+
+ * Send useage information to Microsoft (No)
+ * Install options:
+ * Graphical IDE (Yes)
+ * Microsoft MSDN Express Edition (No)
+ * Microsoft SQL Server Express Edition (No)
+ * Install to folder: C:\Program Files\Microsoft Visual Studio 8\ (default)
+
+It will need to download around 90mb of installation files and reports
+that the install will consume 554mb of disk space.
+
+
+== Install Microsoft Platform SDK2 ==
+
+Go to this page:
+
+http://msdn2.microsoft.com/en-us/express/aa700755.aspx
+
+Start by using the link provided on the above page to download and install the
+platform SDK2.
+
+The actual SDK download page is once again a bit confusing since the links for
+downloading are hidden amongst a bunch of other links. Basically look for these
+three links with their associated 'Download' buttons and choose the correct
+link for your platform:
+
+```
+PSDK-amd64.exe 1.2 MB Download
+PSDK-ia64.exe 1.3 MB Download
+PSDK-x86.exe 1.2 MB Download
+```
+
+
+When you install make sure to choose 'custom install'. These instructions
+assume you are installing into the default path of:
+
+```
+C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\
+```
+
+We will go for the minimal install that will give us a working environment,
+so on the custom installation screen I made the following choices:
+
+
+```
+Configuration Options
+ + Register Environmental Variables (Yes)
+Microsoft Windows Core SDK
+ + Tools (Yes)
+ + Tools (AMD 64 Bit) (No unless this applies)
+ + Tools (Intel 64 Bit) (No unless this applies)
+ + Build Environment
+ + Build Environment (AMD 64 Bit) (No unless this applies)
+ + Build Environment (Intel 64 Bit) (No unless this applies)
+ + Build Environment (x86 32 Bit) (Yes)
+ + Documentation (No)
+ + Redistributable Components (Yes)
+ + Sample Code (No)
+ + Source Code (No)
+ + AMD 64 Source (No)
+ + Intel 64 Source (No)
+Microsoft Web Workshop (Yes) (needed for shlwapi.h)
+ + Build Environment (Yes)
+ + Documentation (No)
+ + Sample Code (No)
+ + Tools (No)
+Microsoft Internet Information Server (IIS) SDK (No)
+Microsoft Data Access Services (MDAC) SDK (Yes) (needed by GDAL for odbc)
+ + Tools
+ + Tools (AMD 64 Bit) (No)
+ + Tools (AMD 64 Bit) (No)
+ + Tools (x86 32 Bit) (Yes)
+ + Build Environment
+ + Tools (AMD 64 Bit) (No)
+ + Tools (AMD 64 Bit) (No)
+ + Tools (x86 32 Bit) (Yes)
+ + Documentation (No)
+ + Sample Code (No)
+Microsodt Installer SDK (No)
+Microsoft Table PC SDK (No)
+Microsoft Windows Management Instrumentation (No)
+Microsoft DirectShow SDK (No)
+Microsoft Media Services SDK (No)
+Debuggin Tools for Windows (Yes)
+```
+
+/!\ Note that you can always come back later to add extra bits if you like.
+
+/!\ Note that installing the SDK requires validation with the
+Microsoft Genuine Advantage application. Some people have a philosophical
+objection to installing this software on their computers. If you are one
+of them you should probably consider using the MINGW build instructions
+described elsewhere in this document.
+
+
+The SDK installs a directory called
+
+```
+C:\Office10
+```
+
+Which you can safely remove.
+
+After the SDK is installed, follow the remaining notes on the page link
+above to get your MSVC Express environment configured correctly. For your
+convenience, these are summarised again below, and I have added a couple
+more paths that I discovered were needed:
+
+1) open Visual Studio Express IDE
+
+2) Tools -> Options -> Projects and Solutions -> VC++ Directories
+
+3) Add:
+```
+Executable files:
+ C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Bin
+
+Include files:
+ C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include
+ C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include\atl
+ C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include\mfc
+Library files: C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib
+```
+
+4) Close MSVC Express IDE
+
+5) Open the following file with notepad:
+
+```
+C:\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\corewin_express.vsprops
+```
+
+and change the property:
+
+```
+AdditionalDependencies="kernel32.lib"
+```
+
+To read:
+
+```
+AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
+```
+
+The notes go on to show how to build a mswin32 application which you can try if you like -
+I'm not going to recover that here.
+
+== Edit your vsvars ==
+
+Backup your vsvars32.bat file in
+
+```
+C:\Program Files\Microsoft Visual Studio 8\Common7\Tools
+```
+
+and replace it with this one:
+
+```
+ at SET VSINSTALLDIR=C:\Program Files\Microsoft Visual Studio 8
+ at SET VCINSTALLDIR=C:\Program Files\Microsoft Visual Studio 8\VC
+ at SET FrameworkDir=C:\WINDOWS\Microsoft.NET\Framework
+ at SET FrameworkVersion=v2.0.50727
+ at SET FrameworkSDKDir=C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0
+ at if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR
+ at if "%VCINSTALLDIR%"=="" goto error_no_VCINSTALLDIR
+
+ at echo Setting environment for using Microsoft Visual Studio 2005 x86 tools.
+
+ at rem
+ at rem Root of Visual Studio IDE installed files.
+ at rem
+ at set DevEnvDir=C:\Program Files\Microsoft Visual Studio 8\Common7\IDE
+
+ at set PATH=C:\Program Files\Microsoft Visual Studio 8\Common7\IDE;C:\Program Files\Microsoft Visual Studio 8\VC\BIN;C:\Program Files\Microsoft Visual Studio 8\Common7\Tools;C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\bin;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Program Files\Microsoft Visual Studio 8\VC\VCPackages;%PATH%
+ at rem added by Tim
+ at set PATH=C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Bin;%PATH%
+ at set INCLUDE=C:\Program Files\Microsoft Visual Studio 8\VC\INCLUDE;%INCLUDE%
+ at rem added by Tim
+ at set INCLUDE=C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include;%INCLUDE%
+ at set INCLUDE=C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include\mfc;%INCLUDE%
+ at set INCLUDE=%INCLUDE%;C:\dev\cpp\qgislibs-release\include\postgresql
+ at set LIB=C:\Program Files\Microsoft Visual Studio 8\VC\LIB;C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\lib;%LIB%
+ at rem added by Tim
+ at set LIB=C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib;%LIB%
+ at set LIB=%LIB%;C:\dev\cpp\qgislibs-release\lib
+ at set LIBPATH=C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727
+
+ at goto end
+
+:error_no_VSINSTALLDIR
+ at echo ERROR: VSINSTALLDIR variable is not set.
+ at goto end
+
+:error_no_VCINSTALLDIR
+ at echo ERROR: VCINSTALLDIR variable is not set.
+ at goto end
+
+:end
+
+```
+
+== Environment Variables ==
+
+Right click on 'My computer' then select the 'Advanced' tab. Click environment variables and
+create or augment the following '''System''' variables (if they dont already exist):
+
+```
+Variable Name: Value:
+--------------------------------------------------------------------------
+EDITOR vim
+INCLUDE C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include\.
+LIB C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib\.
+LIB_DIR C:\dev\cpp\qgislibs-release
+PATH C:\Program Files\CMake 2.4\bin;
+ %SystemRoot%\system32;
+ %SystemRoot%;
+ %SystemRoot%\System32\Wbem;
+ C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Bin\.;
+ C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Bin\WinNT\;
+ C:\Program Files\svn\bin;C:\Program Files\Microsoft Visual Studio 8\VC\bin;
+ C:\Program Files\Microsoft Visual Studio 8\Common7\IDE;
+ "c:\Program Files\Microsoft Visual Studio 8\Common7\Tools";
+ c:\Qt\4.3.2\bin;
+ "C:\Program Files\PuTTY"
+QTDIR c:\Qt\4.3.2
+SVN_SSH "C:\\Program Files\\PuTTY\\plink.exe"
+```
+
+== Building Qt4.3.2 ==
+
+You need a minimum of Qt 4.3.2 here since this is the first version to officially
+support building the open source version of Qt for windows under MSVC.
+
+Download Qt 4.x.x source for windows from
+
+```
+http:\\www.trolltech.com
+```
+
+Unpack the source to
+
+```
+c:\Qt\4.x.x\
+```
+
+=== Compile Qt ===
+
+Open the Visual Studio C++ command line and cd to c:\Qt\4.x.x where you
+extracted the source and enter:
+
+```
+configure -platform win32-msvc2005
+nmake
+nmake install
+```
+
+Add -qt-sql-odbc -qt-sql-psql to the configure line if your want odbc and
+PostgreSQL support build into Qt.
+
+/!\ Note: For me in some cases I got a build error on qscreenshot.pro. If you
+are only interested in having the libraries needed for building Qt apps, you
+can probably ignore that. Just check in c:\Qt\4.3.2\bin to check all dlls and
+helper apps (assistant etc) have been made.
+
+=== Configure Visual C++ to use Qt ===
+
+After building configure the Visual Studio Express IDE to use Qt:
+
+1) open Visual Studio Express IDE
+
+2) Tools -> Options -> Projects and Solutions -> VC++ Directories
+
+3) Add:
+```
+Executable files:
+ $(QTDIR)\bin
+
+Include files:
+ $(QTDIR)\include
+ $(QTDIR)\include\Qt
+ $(QTDIR)\include\QtCore
+ $(QTDIR)\include\QtGui
+ $(QTDIR)\include\QtNetwork
+ $(QTDIR)\include\QtSvg
+ $(QTDIR)\include\QtXml
+ $(QTDIR)\include\Qt3Support
+ $(LIB_DIR)\include (needed during qgis compile to find stdint.h and unistd.h)
+
+Library files:
+ $(QTDIR)\lib
+
+Source Files:
+ $(QTDIR)\src
+```
+
+Hint: You can also add
+
+```
+QString = t=<d->data, su>, size=<d->size, i>
+```
+
+to AutoExp.DAT in C:\Program Files\Microsoft Visual Studio 8\Common7\Packages\Debugger before
+
+```
+[Visualizer]
+```
+
+That way the Debugger will show the contents of QString when you point at or
+watch a variable in the debugger. There are probably much more additions -
+feel free to add some - I just needed QString and took the first hit in google
+I could find.
+
+
+
+
+== Install Python ==
+
+Download http://python.org/ftp/python/2.5.1/python-2.5.1.msi and install it.
+
+
+
+== Install SIP ==
+
+Download http://www.riverbankcomputing.com/Downloads/sip4/sip-4.7.1.zip and extract it
+into your c:\dev\cpp directory.
+From a Visual C++ command line cd to the directory where you extract SIP and run:
+
+```
+c:\python25\python configure.py -p win32-msvc2005
+nmake
+nmake install
+```
+
+== Install PyQt4 ==
+
+Download http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-win-gpl-4.3.1.zip and extract it
+into your c:\dev\cpp directory.
+From a Visual C++ command line cd to the directory where you extracted PyQt4 and run:
+
+```
+c:\python25\python configure.py -p win32-msvc2005
+nmake
+nmake install
+````
+
+== Install CMake ==
+
+Download and install cmake 2.4.7 or better, making sure to enable the
+option
+
+```
+Update path for all users
+```
+
+== Install Subversion ==
+
+You '''must''' install the command line version if you want the CMake svn scripts to work.
+Its a bit tricky to find the correct version on the subversion download site as they have
+som misleadingly named similar downloads. Easiest is to just get this file:
+
+http://subversion.tigris.org/downloads/1.4.5-win32/apache-2.2/svn-win32-1.4.5.zip
+
+Extract the zip file to
+
+```
+C:\Program Files\svn
+```
+
+And then add
+
+```
+C:\Program Files\svn\bin
+```
+
+To your path.
+
+
+== Initial SVN Check out ==
+
+Open a cmd.exe window and do:
+
+
+```
+cd \
+cd dev
+cd cpp
+svn co https://svn.qgis.org/repos/qgis/trunk/qgis
+```
+
+At this point you will probably get a message like this:
+
+```
+C:\dev\cpp>svn co https://svn.qgis.org/repos/qgis/trunk/qgis
+Error validating server certificate for 'https://svn.qgis.org:443':
+ - The certificate is not issued by a trusted authority. Use the
+ fingerprint to validate the certificate manually!
+Certificate information:
+ - Hostname: svn.qgis.org
+ - Valid: from Sat, 01 Apr 2006 03:30:47 GMT until Fri, 21 Mar 2008 03:30:47 GMT
+ - Issuer: Developer Team, Quantum GIS, Anchorage, Alaska, US
+ - Fingerprint: 2f:cd:f1:5a:c7:64:da:2b:d1:34:a5:20:c6:15:67:28:33:ea:7a:9b
+(R)eject, accept (t)emporarily or accept (p)ermanently?
+```
+
+Press 'p' to accept and the svn checkout will commence.
+
+== Create Makefiles using cmakesetup.exe ==
+
+I wont be giving a detailed description of the build process, because
+the process is explained in the first section (where you manually build
+all dependencies) of the windows build notes in this document. Just skip
+past the parts where you need to build GDAL etc, since this simplified
+install process does all the dependency provisioning for you.
+
+```
+cd qgis
+mkdir build
+cd build
+cmakesetup ..
+```
+
+Cmakesetup should find all dependencies for you automatically (it uses the
+LIB_DIR environment to find them all in c:\dev\cpp\qgislibs-release).
+Press configure again after the cmakesetup gui appears and when all the red
+fields are gone, and you have made any personalisations to the setup, press
+ok to close the cmake gui.
+
+Now open Visual Studio Express and do:
+
+File -> Open -> Project / Solution
+
+Now open the cmake generated QGIS solution which should be in :
+
+```
+c:\dev\cpp\qgis\build\qgisX.X.X.sln
+```
+
+Where X.X.X represents the current version number of QGIS. Currently I
+have only made release built dependencies for QGIS (debug versions will follow
+in future), so you need to be sure to select 'Release' from the solution
+configurations toolbar.
+
+Next right click on ALL_BUILD in the solution browser, and then choose build.
+
+Once the build completes right click on INSTALL in the solution browser and
+choose build. This will by default install qgis into c:\program files\qgisX.X.X.
+
+== Running and packaging ==
+
+To run QGIS you need to at the minimum copy the dlls from c:\dev\cpp\qgislibs-release\bin
+into the c:\program files\qgisX.X.X directory.
+
= Authors and Acknowledgments =
-The follwing people have contributed to this document:
+The following people have contributed to this document:
-- Windows Section
+- Windows MINGW Section
- Tim Sutton, Godofredo Contreras 2006
- CMake additions Magnus Homann 2007
- Python additions Martin Dobias 2007
- With thanks to Tisham Dhar for preparing the initial msys environment
+- Windows MSVC Section (Detailed install)
+ - David Willis 2007
+ - MSVC install additions Tim Sutton 2007
+ - PostgreSQL, Qt compile, SIP, Python, AutoExp additions Juergen Fischer 2007
+
+
+- Windows MSVC Section (Simplified install)
+ - Tim Sutton 2007
+ - Juergen Fischer 2007
+
- OSX Section
- Tim Sutton, 2007
- With special thanks to Tom Elwertowski and William Kyngesburye
Modified: packages/qgis/branches/upstream/current/README
===================================================================
--- packages/qgis/branches/upstream/current/README 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/README 2008-01-18 16:51:06 UTC (rev 1341)
@@ -1,5 +1,6 @@
-README for QGIS version 0.8 'Titan'
+README for QGIS version 0.9.1 'Ganymede'
+
Quantum GIS (QGIS) is an Open Source Geographic Information System. The
project was born in May of 2002 and was established as a project on
SourceForge in June of the same year. We've worked hard to make GIS
@@ -23,9 +24,6 @@
always have access to a GIS program that is free of cost and can be
freely modified.
-This release adds:
- * ADD v8 STUFF IN HERE
-
Supported raster formats include:
Grass
USGS DEM
@@ -61,7 +59,5 @@
Please wait around for a response to your question as many
folks on the channel are doing other things and it may take a
while for them to notice your question.
-
-
Modified: packages/qgis/branches/upstream/current/cmake/Bison.cmake
===================================================================
--- packages/qgis/branches/upstream/current/cmake/Bison.cmake 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/cmake/Bison.cmake 2008-01-18 16:51:06 UTC (rev 1341)
@@ -1,54 +1,58 @@
-# use bison for .yy files
-
-# search for bison
-MACRO(FIND_BISON)
- IF(NOT BISON_EXECUTABLE)
- FIND_PROGRAM(BISON_EXECUTABLE bison)
- IF (NOT BISON_EXECUTABLE)
-
- MESSAGE(FATAL_ERROR "Bison not found - aborting")
-
- ELSE (NOT BISON_EXECUTABLE)
+# use bison for .yy files
- EXEC_PROGRAM(${BISON_EXECUTABLE} ARGS --version OUTPUT_VARIABLE BISON_VERSION_STR)
- # get first line in case it's multiline
- STRING(REGEX REPLACE "([^\n]+).*" "\\1" FIRST_LINE "${BISON_VERSION_STR}")
- # get version information
- STRING(REGEX REPLACE ".* ([0-9]+)\\.([0-9]+)" "\\1" BISON_VERSION_MAJOR "${FIRST_LINE}")
- STRING(REGEX REPLACE ".* ([0-9]+)\\.([0-9]+)" "\\2" BISON_VERSION_MINOR "${FIRST_LINE}")
- IF (BISON_VERSION_MAJOR LESS 2)
- MESSAGE (FATAL_ERROR "Bison version is too old (${BISON_VERSION_MAJOR}.${BISON_VERSION_MINOR}). Use 2.0 or higher.")
- ENDIF (BISON_VERSION_MAJOR LESS 2)
+# search for bison
+MACRO(FIND_BISON)
+ IF(NOT BISON_EXECUTABLE)
+ IF (MSVC)
+ FIND_PROGRAM(BISON_EXECUTABLE "$ENV{LIB_DIR}/bin/bison.exe")
+ ELSE (MSVC)
+ FIND_PROGRAM(BISON_EXECUTABLE bison)
+ ENDIF (MSVC)
+ IF (NOT BISON_EXECUTABLE)
- ENDIF (NOT BISON_EXECUTABLE)
- ENDIF(NOT BISON_EXECUTABLE)
+ MESSAGE(FATAL_ERROR "Bison not found - aborting")
-ENDMACRO(FIND_BISON)
-
-MACRO(ADD_BISON_FILES _sources )
- FIND_BISON()
-
- FOREACH (_current_FILE ${ARGN})
- GET_FILENAME_COMPONENT(_in ${_current_FILE} ABSOLUTE)
- GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME_WE)
-
- SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
-
-
- # bison options:
- # -t add debugging facilities
- # -d produce additional header file (used in parser.l)
- # -v produce additional *.output file with parser states
-
- ADD_CUSTOM_COMMAND(
- OUTPUT ${_out}
- COMMAND ${BISON_EXECUTABLE}
- ARGS
- -o${_out} -d -v -t
- ${_in}
- DEPENDS ${_in}
- )
-
- SET(${_sources} ${${_sources}} ${_out} )
- ENDFOREACH (_current_FILE)
-ENDMACRO(ADD_BISON_FILES)
+ ELSE (NOT BISON_EXECUTABLE)
+
+ EXEC_PROGRAM(${BISON_EXECUTABLE} ARGS --version OUTPUT_VARIABLE BISON_VERSION_STR)
+ # get first line in case it's multiline
+ STRING(REGEX REPLACE "([^\n]+).*" "\\1" FIRST_LINE "${BISON_VERSION_STR}")
+ # get version information
+ STRING(REGEX REPLACE ".* ([0-9]+)\\.([0-9]+)" "\\1" BISON_VERSION_MAJOR "${FIRST_LINE}")
+ STRING(REGEX REPLACE ".* ([0-9]+)\\.([0-9]+)" "\\2" BISON_VERSION_MINOR "${FIRST_LINE}")
+ IF (BISON_VERSION_MAJOR LESS 2)
+ MESSAGE (FATAL_ERROR "Bison version is too old (${BISON_VERSION_MAJOR}.${BISON_VERSION_MINOR}). Use 2.0 or higher.")
+ ENDIF (BISON_VERSION_MAJOR LESS 2)
+
+ ENDIF (NOT BISON_EXECUTABLE)
+ ENDIF(NOT BISON_EXECUTABLE)
+
+ENDMACRO(FIND_BISON)
+
+MACRO(ADD_BISON_FILES _sources )
+ FIND_BISON()
+
+ FOREACH (_current_FILE ${ARGN})
+ GET_FILENAME_COMPONENT(_in ${_current_FILE} ABSOLUTE)
+ GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME_WE)
+
+ SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
+
+
+ # bison options:
+ # -t add debugging facilities
+ # -d produce additional header file (used in parser.l)
+ # -v produce additional *.output file with parser states
+
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${_out}
+ COMMAND ${BISON_EXECUTABLE}
+ ARGS
+ -o${_out} -d -v -t
+ ${_in}
+ DEPENDS ${_in}
+ )
+
+ SET(${_sources} ${${_sources}} ${_out} )
+ ENDFOREACH (_current_FILE)
+ENDMACRO(ADD_BISON_FILES)
Modified: packages/qgis/branches/upstream/current/cmake/FindExpat.cmake
===================================================================
--- packages/qgis/branches/upstream/current/cmake/FindExpat.cmake 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/cmake/FindExpat.cmake 2008-01-18 16:51:06 UTC (rev 1341)
@@ -8,10 +8,20 @@
# EXPAT_LIBRARY
-FIND_PATH(EXPAT_INCLUDE_DIR expat.h /usr/local/include /usr/include c:/msys/local/include)
+FIND_PATH(EXPAT_INCLUDE_DIR expat.h
+ /usr/local/include
+ /usr/include
+ "$ENV{LIB_DIR}/include/expat"
+ c:/msys/local/include
+ )
+#libexpat needed for msvc version
+FIND_LIBRARY(EXPAT_LIBRARY NAMES expat libexpat PATHS
+ /usr/local/lib
+ /usr/lib
+ "$ENV{LIB_DIR}/lib"
+ c:/msys/local/lib
+ )
-FIND_LIBRARY(EXPAT_LIBRARY NAMES expat PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
-
IF (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)
SET(EXPAT_FOUND TRUE)
ENDIF (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)
Modified: packages/qgis/branches/upstream/current/cmake/FindGDAL.cmake
===================================================================
--- packages/qgis/branches/upstream/current/cmake/FindGDAL.cmake 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/cmake/FindGDAL.cmake 2008-01-18 16:51:06 UTC (rev 1341)
@@ -11,10 +11,24 @@
IF(WIN32)
- FIND_PATH(GDAL_INCLUDE_DIR gdal.h /usr/local/include /usr/include c:/msys/local/include)
- FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
+ IF (MINGW)
+ FIND_PATH(GDAL_INCLUDE_DIR gdal.h /usr/local/include /usr/include c:/msys/local/include)
+ FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
+ ENDIF (MINGW)
+ IF (MSVC)
+ SET (
+ GDAL_INCLUDE_DIR
+ "$ENV{LIB_DIR}/include/gdal"
+ CACHE STRING INTERNAL
+ )
+ SET (
+ GDAL_LIBRARY
+ "$ENV{LIB_DIR}/lib/gdal.lib";odbc32;odbccp32
+ CACHE STRING INTERNAL)
+ ENDIF (MSVC)
+
ELSE(WIN32)
IF(UNIX)
@@ -24,8 +38,10 @@
ENDIF (APPLE)
SET(GDAL_CONFIG_PREFER_PATH "$ENV{GDAL_HOME}/bin" CACHE STRING "preferred path to GDAL (gdal-config)")
+ SET(GDAL_CONFIG_PREFER_FWTOOLS_PATH "$ENV{FWTOOLS_HOME}/bin_safe" CACHE STRING "preferred path to GDAL (gdal-config) from FWTools")
FIND_PROGRAM(GDAL_CONFIG gdal-config
${GDAL_CONFIG_PREFER_PATH}
+ ${GDAL_CONFIG_PREFER_FWTOOLS_PATH}
${GDAL_MAC_PATH}
/usr/local/bin/
/usr/bin/
Modified: packages/qgis/branches/upstream/current/cmake/FindGEOS.cmake
===================================================================
--- packages/qgis/branches/upstream/current/cmake/FindGEOS.cmake 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/cmake/FindGEOS.cmake 2008-01-18 16:51:06 UTC (rev 1341)
@@ -7,9 +7,23 @@
# GEOS_LIBRARY
-FIND_PATH(GEOS_INCLUDE_DIR geos.h /usr/local/include /usr/include c:/msys/local/include)
+FIND_PATH(GEOS_INCLUDE_DIR geos.h
+ /usr/local/include
+ /usr/include
+ #MSVC
+ "$ENV{LIB_DIR}/include"
+ #mingw
+ c:/msys/local/include
+ )
-FIND_LIBRARY(GEOS_LIBRARY NAMES geos PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
+FIND_LIBRARY(GEOS_LIBRARY NAMES geos PATHS
+ /usr/local/lib
+ /usr/lib
+ #MSVC
+ "$ENV{LIB_DIR}/lib"
+ #mingw
+ c:/msys/local/lib
+ )
IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
SET(GEOS_FOUND TRUE)
Modified: packages/qgis/branches/upstream/current/cmake/FindGRASS.cmake
===================================================================
--- packages/qgis/branches/upstream/current/cmake/FindGRASS.cmake 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/cmake/FindGRASS.cmake 2008-01-18 16:51:06 UTC (rev 1341)
@@ -3,7 +3,7 @@
MACRO (CHECK_GRASS G_PREFIX)
- FIND_PATH (GRASS_INCLUDE_DIR grass/gis.h ${G_PREFIX}/include)
+ FIND_PATH (GRASS_INCLUDE_DIR grass/version.h ${G_PREFIX}/include)
SET (GRASS_LIB_NAMES gis vect dig2 dbmiclient dbmibase shape dgl rtree datetime linkm form gproj)
@@ -62,16 +62,9 @@
###################################
IF (GRASS_FOUND)
+ FILE(READ ${GRASS_INCLUDE_DIR}/grass/version.h VERSIONFILE)
+ STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[^ ]+" GRASS_VERSION ${VERSIONFILE})
- IF (NOT WIN32)
- # read grass version number and remove trailing newline
- FILE (READ ${GRASS_PREFIX}/etc/VERSIONNUMBER GRASS_VERSION)
- STRING(REPLACE "\n" "" GRASS_VERSION ${GRASS_VERSION})
- ELSE (NOT WIN32)
- # TODO: how to find out grass version on win?
- SET(GRASS_VERSION "?")
- ENDIF (NOT WIN32)
-
IF (NOT GRASS_FIND_QUIETLY)
MESSAGE(STATUS "Found GRASS: ${GRASS_PREFIX} (${GRASS_VERSION})")
ENDIF (NOT GRASS_FIND_QUIETLY)
Modified: packages/qgis/branches/upstream/current/cmake/FindGSL.cmake
===================================================================
--- packages/qgis/branches/upstream/current/cmake/FindGSL.cmake 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/cmake/FindGSL.cmake 2008-01-18 16:51:06 UTC (rev 1341)
@@ -25,13 +25,23 @@
IF(WIN32)
- SET(GSL_PREFIX "c:/msys/local" CACHE PATH "Path to GSL directory")
+ SET(GSL_MINGW_PREFIX "c:/msys/local" )
+ SET(GSL_MSVC_PREFIX "$ENV{LIB_DIR}")
+ FIND_LIBRARY(GSL_LIB gsl PATHS
+ ${GSL_MINGW_PREFIX}/lib
+ ${GSL_MSVC_PREFIX}/lib
+ )
+ #MSVC version of the lib is just called 'cblas'
+ FIND_LIBRARY(GSLCBLAS_LIB gslcblas cblas PATHS
+ ${GSL_MINGW_PREFIX}/lib
+ ${GSL_MSVC_PREFIX}/lib
+ )
- FIND_LIBRARY(GSL_LIB gsl PATHS ${GSL_PREFIX}/lib)
- FIND_LIBRARY(GSLCBLAS_LIB gslcblas PATHS ${GSL_PREFIX}/lib)
+ FIND_PATH(GSL_INCLUDE_DIR gsl/gsl_blas.h
+ ${GSL_MINGW_PREFIX}/include
+ ${GSL_MSVC_PREFIX}/include
+ )
- FIND_PATH(GSL_INCLUDE_DIR gsl/gsl_version.h ${GSL_PREFIX}/include)
-
IF (GSL_LIB AND GSLCBLAS_LIB)
SET (GSL_LIBRARIES ${GSL_LIB} ${GSLCBLAS_LIB})
ENDIF (GSL_LIB AND GSLCBLAS_LIB)
Modified: packages/qgis/branches/upstream/current/cmake/FindPostgres.cmake
===================================================================
--- packages/qgis/branches/upstream/current/cmake/FindPostgres.cmake 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/cmake/FindPostgres.cmake 2008-01-18 16:51:06 UTC (rev 1341)
@@ -11,11 +11,21 @@
IF(WIN32)
IF (NOT POSTGRES_INCLUDE_DIR)
- FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h /usr/local/include /usr/include c:/msys/local/include)
+ FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h
+ /usr/local/include
+ /usr/include
+ c:/msys/local/include
+ "$ENV{LIB_DIR}/include/postgresql"
+ )
ENDIF (NOT POSTGRES_INCLUDE_DIR)
IF (NOT POSTGRES_LIBRARY)
- FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
+ FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq PATHS
+ /usr/local/lib
+ /usr/lib
+ c:/msys/local/lib
+ "$ENV{LIB_DIR}/lib"
+ )
ENDIF (NOT POSTGRES_LIBRARY)
ELSE(WIN32)
Modified: packages/qgis/branches/upstream/current/cmake/FindProj.cmake
===================================================================
--- packages/qgis/branches/upstream/current/cmake/FindProj.cmake 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/cmake/FindProj.cmake 2008-01-18 16:51:06 UTC (rev 1341)
@@ -7,9 +7,21 @@
# PROJ_LIBRARY
-FIND_PATH(PROJ_INCLUDE_DIR proj_api.h /usr/local/include /usr/include c:/msys/local/include)
+FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
+ /usr/local/include
+ /usr/include
+ #msvc
+ "$ENV{LIB_DIR}/include/proj"
+ #mingw
+ c:/msys/local/include
+ )
-FIND_LIBRARY(PROJ_LIBRARY NAMES proj PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
+FIND_LIBRARY(PROJ_LIBRARY NAMES proj PATHS
+ /usr/local/lib
+ /usr/lib
+ "$ENV{LIB_DIR}/lib"
+ c:/msys/local/lib
+ )
IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
SET(PROJ_FOUND TRUE)
Modified: packages/qgis/branches/upstream/current/cmake/FindSqlite3.cmake
===================================================================
--- packages/qgis/branches/upstream/current/cmake/FindSqlite3.cmake 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/cmake/FindSqlite3.cmake 2008-01-18 16:51:06 UTC (rev 1341)
@@ -7,9 +7,22 @@
# SQLITE3_LIBRARY
-FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h /usr/local/include /usr/include c:/msys/local/include)
+FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
+ /usr/local/include
+ /usr/include
+ #msvc
+ "$ENV{LIB_DIR}/include/sqlite"
+ #mingw
+ c:/msys/local/include
+ )
-FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
+FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 PATHS
+ /usr/local/lib
+ /usr/lib
+ c:/msys/local/lib
+ #msvc
+ "$ENV{LIB_DIR}/lib"
+ )
IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
SET(SQLITE3_FOUND TRUE)
Modified: packages/qgis/branches/upstream/current/cmake/Flex.cmake
===================================================================
--- packages/qgis/branches/upstream/current/cmake/Flex.cmake 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/cmake/Flex.cmake 2008-01-18 16:51:06 UTC (rev 1341)
@@ -1,36 +1,42 @@
-# flex a .ll file
-
-# search flex
-MACRO(FIND_FLEX)
- IF(NOT FLEX_EXECUTABLE)
- FIND_PROGRAM(FLEX_EXECUTABLE flex)
- IF (NOT FLEX_EXECUTABLE)
- MESSAGE(FATAL_ERROR "flex not found - aborting")
- ENDIF (NOT FLEX_EXECUTABLE)
- ENDIF(NOT FLEX_EXECUTABLE)
-ENDMACRO(FIND_FLEX)
-
-MACRO(ADD_FLEX_FILES _sources )
- FIND_FLEX()
-
- FOREACH (_current_FILE ${ARGN})
- GET_FILENAME_COMPONENT(_in ${_current_FILE} ABSOLUTE)
- GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME_WE)
-
- SET(_out ${CMAKE_CURRENT_BINARY_DIR}/flex_${_basename}.cpp)
-
-
+# flex a .ll file
+
+# search flex
+MACRO(FIND_FLEX)
+ IF(NOT FLEX_EXECUTABLE)
+ IF (MSVC)
+ FIND_PROGRAM(FLEX_EXECUTABLE
+ "$ENV{LIB_DIR}/bin/flex.exe"
+ )
+ ELSE(MSVC)
+ FIND_PROGRAM(FLEX_EXECUTABLE flex)
+ ENDIF (MSVC)
+ IF (NOT FLEX_EXECUTABLE)
+ MESSAGE(FATAL_ERROR "flex not found - aborting")
+ ENDIF (NOT FLEX_EXECUTABLE)
+ ENDIF(NOT FLEX_EXECUTABLE)
+ENDMACRO(FIND_FLEX)
+
+MACRO(ADD_FLEX_FILES _sources )
+ FIND_FLEX()
+
+ FOREACH (_current_FILE ${ARGN})
+ GET_FILENAME_COMPONENT(_in ${_current_FILE} ABSOLUTE)
+ GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME_WE)
+
+ SET(_out ${CMAKE_CURRENT_BINARY_DIR}/flex_${_basename}.cpp)
+
+
# -d option for flex means that it will produce output to stderr while analyzing
-
- ADD_CUSTOM_COMMAND(
- OUTPUT ${_out}
- COMMAND ${FLEX_EXECUTABLE}
- ARGS
- -o${_out} -d
- ${_in}
- DEPENDS ${_in}
- )
-
- SET(${_sources} ${${_sources}} ${_out} )
- ENDFOREACH (_current_FILE)
-ENDMACRO(ADD_FLEX_FILES)
+
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${_out}
+ COMMAND ${FLEX_EXECUTABLE}
+ ARGS
+ -o${_out} -d
+ ${_in}
+ DEPENDS ${_in}
+ )
+
+ SET(${_sources} ${${_sources}} ${_out} )
+ ENDFOREACH (_current_FILE)
+ENDMACRO(ADD_FLEX_FILES)
Modified: packages/qgis/branches/upstream/current/cmake/Python.cmake
===================================================================
--- packages/qgis/branches/upstream/current/cmake/Python.cmake 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/cmake/Python.cmake 2008-01-18 16:51:06 UTC (rev 1341)
@@ -44,7 +44,8 @@
IF (WITH_BINDINGS)
- # check for SIP
+ # check for SIP (3 steps)
+ # 1. can import python module?
TRY_RUN_PYTHON (HAVE_SIP_MODULE "from sip import wrapinstance")
IF (APPLE)
@@ -54,9 +55,13 @@
/System/Library/Frameworks/Python.framework/Versions/2.3/bin)
ENDIF (APPLE)
+ # 2. is there sip binary? (for creating wrappers)
FIND_PROGRAM (SIP_BINARY_PATH sip PATHS ${SIP_MAC_PATH})
- IF (HAVE_SIP_MODULE AND SIP_BINARY_PATH)
+ # 3. is there sip include file? (necessary for compilation of bindings)
+ FIND_PATH (SIP_INCLUDE_DIR sip.h ${PYTHON_INCLUDE_PATH})
+
+ IF (HAVE_SIP_MODULE AND SIP_BINARY_PATH AND SIP_INCLUDE_DIR)
# check for SIP version
# minimal version is 4.5
SET (SIP_MIN_VERSION 040500)
@@ -68,14 +73,30 @@
IF (NOT SIP_IS_GOOD)
MESSAGE (STATUS "SIP is required in version 4.5 or later!")
ENDIF (NOT SIP_IS_GOOD)
- ELSE (HAVE_SIP_MODULE AND SIP_BINARY_PATH)
- MESSAGE (STATUS "SIP not found!")
- ENDIF (HAVE_SIP_MODULE AND SIP_BINARY_PATH)
+ ELSE (HAVE_SIP_MODULE AND SIP_BINARY_PATH AND SIP_INCLUDE_DIR)
+ IF (NOT HAVE_SIP_MODULE)
+ MESSAGE (STATUS "SIP python module is missing!")
+ ENDIF (NOT HAVE_SIP_MODULE)
+ IF (NOT SIP_BINARY_PATH)
+ MESSAGE (STATUS "SIP executable is missing!")
+ ENDIF (NOT SIP_BINARY_PATH)
+ IF (NOT SIP_INCLUDE_DIR)
+ MESSAGE (STATUS "SIP header file is missing!")
+ ENDIF (NOT SIP_INCLUDE_DIR)
+ ENDIF (HAVE_SIP_MODULE AND SIP_BINARY_PATH AND SIP_INCLUDE_DIR)
# check for PyQt4
TRY_RUN_PYTHON (HAVE_PYQT4 "from PyQt4 import QtCore, QtGui, QtNetwork, QtSvg, QtXml")
+ # check whether directory with PyQt4 sip files exists
IF (HAVE_PYQT4)
+ TRY_RUN_PYTHON (RES "import PyQt4.pyqtconfig\nprint PyQt4.pyqtconfig._pkg_config['pyqt_sip_dir']" PYQT_SIP_DIR)
+ IF (IS_DIRECTORY ${PYQT_SIP_DIR})
+ SET (HAVE_PYQT4_SIP_DIR TRUE)
+ ENDIF (IS_DIRECTORY ${PYQT_SIP_DIR})
+ ENDIF (HAVE_PYQT4)
+
+ IF (HAVE_PYQT4 AND HAVE_PYQT4_SIP_DIR)
# check for PyQt4 version
# minimal version is 4.1
SET (PYQT_MIN_VERSION 040100)
@@ -87,9 +108,13 @@
IF (NOT PYQT_IS_GOOD)
MESSAGE (STATUS "PyQt4 is needed in version 4.1 or later!")
ENDIF (NOT PYQT_IS_GOOD)
- ELSE (HAVE_PYQT4)
- MESSAGE (STATUS "PyQt4 not found!")
- ENDIF (HAVE_PYQT4)
+ ELSE (HAVE_PYQT4 AND HAVE_PYQT4_SIP_DIR)
+ IF (HAVE_PYQT4)
+ MESSAGE (STATUS "PyQt4 development files are missing!")
+ ELSE (HAVE_PYQT4)
+ MESSAGE (STATUS "PyQt4 not found!")
+ ENDIF (HAVE_PYQT4)
+ ENDIF (HAVE_PYQT4 AND HAVE_PYQT4_SIP_DIR)
# if SIP and PyQt4 are found, enable bindings
IF (SIP_IS_GOOD AND PYQT_IS_GOOD)
Modified: packages/qgis/branches/upstream/current/cmake_templates/qgsconfig.h.in
===================================================================
--- packages/qgis/branches/upstream/current/cmake_templates/qgsconfig.h.in 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/cmake_templates/qgsconfig.h.in 2008-01-18 16:51:06 UTC (rev 1341)
@@ -4,10 +4,13 @@
#ifndef QGSCONFIG_H
#define QGSCONFIG_H
-#define VERSION "0.9.0-Ganymede"
+#define VERSION "0.9.1-Ganymede"
#define PREFIX "${CMAKE_INSTALL_PREFIX}"
+#define QGIS_PLUGIN_SUBDIR "${QGIS_PLUGIN_SUBDIR}"
+#define QGIS_DATA_SUBDIR "${QGIS_DATA_SUBDIR}"
+
#cmakedefine HAVE_POSTGRESQL
#cmakedefine HAVE_PYTHON
Modified: packages/qgis/branches/upstream/current/cmake_templates/svnscript.cmake.in_cmake
===================================================================
--- packages/qgis/branches/upstream/current/cmake_templates/svnscript.cmake.in_cmake 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/cmake_templates/svnscript.cmake.in_cmake 2008-01-18 16:51:06 UTC (rev 1341)
@@ -7,11 +7,11 @@
# Read the version if installed, else set to "unknown"
IF (SVNVERSION)
- EXEC_PROGRAM(${SVNVERSION} ARGS @CMAKE_CURRENT_SOURCE_DIR@ OUTPUT_VARIABLE MYVERSION)
+ EXEC_PROGRAM(${SVNVERSION} ARGS "@CMAKE_CURRENT_SOURCE_DIR@" OUTPUT_VARIABLE MYVERSION)
ELSE (SVNVERSION)
SET(MYVERSION unknown)
ENDIF (SVNVERSION)
# Configure the qgssvnversion.h
-CONFIGURE_FILE(@CMAKE_CURRENT_SOURCE_DIR@/cmake_templates/qgssvnversion.h.in_cmake
- @CMAKE_CURRENT_BINARY_DIR@/qgssvnversion.h)
+CONFIGURE_FILE("@CMAKE_CURRENT_SOURCE_DIR@/cmake_templates/qgssvnversion.h.in_cmake"
+ "@CMAKE_CURRENT_BINARY_DIR@/qgssvnversion.h")
Modified: packages/qgis/branches/upstream/current/doc/CMakeLists.txt
===================================================================
--- packages/qgis/branches/upstream/current/doc/CMakeLists.txt 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/doc/CMakeLists.txt 2008-01-18 16:51:06 UTC (rev 1341)
@@ -2,7 +2,6 @@
SET (DOC_FILES
favicon.ico
index.html
-install.pdf
qgisdoc.css
userguide.pdf
)
Modified: packages/qgis/branches/upstream/current/doc/index.html
===================================================================
--- packages/qgis/branches/upstream/current/doc/index.html 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/doc/index.html 2008-01-18 16:51:06 UTC (rev 1341)
@@ -10,7 +10,7 @@
</td>
<td valign="center">
<span class="header">Quantum GIS Documentation</span><br>
- <span class="subheader">Version 0.9 <i>Ganymede</i></span><br>
+ <span class="subheader">Version 0.9.1 <i>Ganymede</i></span><br>
<span class="warning">Please read this entire document for important information about this release.</span>
</td>
</tr>
@@ -21,7 +21,10 @@
-->
<!-- This documentation describes the Quantum GIS (QGIS) application. More
information on QGIS is available on the web page at http://qgis.org. -->
-<h2>Whats new in Version 0.9?</h2>
+<h2>Whats new in Version 0.9?</h2>
+<p>
+Version 0.9.0 brought some very interesting new features and updates to you.
+</p>
<ul>
<li>
Python bindings - This is the major focus of this release
@@ -49,7 +52,28 @@
</li>
</ul>
+<p>
+Version 0.9.1 concentrates on stabilization and feature enhancement.
+</p>
+<ul>
+<li>
+70 bugfixes and feature improvements
+</li>
+<li>
+New window arrangement feature for the Georeferencer
+</li>
+<li>
+New locale tab in the options dialog
+</li>
+<li>
+Download progress information for WMS and WFS data
+</li>
+<li>
+More GRASS modules added to the GRASS toolbox
+</li>
+</ul>
+
<dl><dt><span class="subheader">Special Requirements
<ul class="normal">
<li><a href="http://www.trolltech.com/developer/downloads/qt/index">Qt 4.2.2</a> is required.
@@ -80,7 +104,7 @@
<dd>
Windows
<ul class="normal">
- <li>
+ <li> GRASS included with windows build is from : GRASS 6.3 rc3
</ul>
</dd>
</dt>
Deleted: packages/qgis/branches/upstream/current/doc/install.pdf
===================================================================
--- packages/qgis/branches/upstream/current/doc/install.pdf 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/doc/install.pdf 2008-01-18 16:51:06 UTC (rev 1341)
@@ -1,458 +0,0 @@
-%PDF-1.2
-9 0 obj
-<<
-/Type/Font
-/Subtype/Type1
-/Name/F1
-/FontDescriptor 8 0 R
-/BaseFont/XFUNYV+CMR12
-/FirstChar 0
-/LastChar 127
-/Widths[611.8 816 761.6 679.6 652.8 734 707.2 761.6 707.2 761.6 707.2 571.2 544 544
-816 816 272 299.2 489.6 489.6 489.6 489.6 489.6 734 435.2 489.6 707.2 761.6 489.6
-883.8 992.6 761.6 272 272 489.6 816 489.6 816 761.6 272 380.8 380.8 489.6 761.6 272
-326.4 272 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 272 272
-272 761.6 462.4 462.4 761.6 734 693.4 707.2 747.8 666.2 639 768.3 734 353.2 503 761.2
-611.8 897.2 734 761.6 666.2 761.6 720.6 544 707.2 734 734 1006 734 734 598.4 272
-489.6 272 489.6 272 272 489.6 544 435.2 544 435.2 299.2 489.6 544 272 299.2 516.8
-272 816 544 489.6 544 516.8 380.8 386.2 380.8 544 516.8 707.2 516.8 516.8 435.2 489.6
-979.2 489.6 489.6 489.6]
->>
-endobj
-12 0 obj
-<<
-/Type/Font
-/Subtype/Type1
-/Name/F2
-/FontDescriptor 11 0 R
-/BaseFont/PNOKDX+CMBX9
-/FirstChar 0
-/LastChar 127
-/Widths[710.8 986.1 920.4 827.2 788.9 924.4 854.6 920.4 854.6 920.4 854.6 690.3 657.4
-657.4 986.1 986.1 328.7 361.6 591.7 591.7 591.7 591.7 591.7 892.9 525.9 616.8 854.6
-920.4 591.7 1071 1202.5 920.4 328.7 360.2 617.6 986.1 591.7 986.1 920.4 328.7 460.2
-460.2 591.7 920.4 328.7 394.4 328.7 591.7 591.7 591.7 591.7 591.7 591.7 591.7 591.7
-591.7 591.7 591.7 328.7 328.7 360.2 920.4 558.8 558.8 920.4 892.9 840.9 854.6 906.6
-776.5 743.7 929.9 924.4 446.3 610.8 925.8 710.8 1121.6 924.4 888.9 808 888.9 886.7
-657.4 823.1 908.6 892.9 1221.6 892.9 892.9 723.1 328.7 617.6 328.7 591.7 328.7 328.7
-575.2 657.4 525.9 657.4 543 361.6 591.7 657.4 328.7 361.6 624.5 328.7 986.1 657.4
-591.7 657.4 624.5 488.1 466.8 460.2 657.4 624.5 854.6 624.5 624.5 525.9 591.7 1183.3
-591.7 591.7 591.7]
->>
-endobj
-15 0 obj
-<<
-/Type/Font
-/Subtype/Type1
-/Name/F3
-/FontDescriptor 14 0 R
-/BaseFont/SIYELP+CMBX12
-/FirstChar 0
-/LastChar 127
-/Widths[675.9 937.5 875 787 750 879.6 812.5 875 812.5 875 812.5 656.2 625 625 937.5
-937.5 312.5 343.7 562.5 562.5 562.5 562.5 562.5 849.5 500 574.1 812.5 875 562.5 1018.5
-1143.5 875 312.5 342.6 581 937.5 562.5 937.5 875 312.5 437.5 437.5 562.5 875 312.5
-375 312.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 312.5
-312.5 342.6 875 531.2 531.2 875 849.5 799.8 812.5 862.3 738.4 707.2 884.3 879.6 419
-581 880.8 675.9 1067.1 879.6 844.9 768.5 844.9 839.1 625 782.4 864.6 849.5 1162 849.5
-849.5 687.5 312.5 581 312.5 562.5 312.5 312.5 546.9 625 500 625 513.3 343.7 562.5
-625 312.5 343.7 593.7 312.5 937.5 625 562.5 625 593.7 459.5 443.8 437.5 625 593.7
-812.5 593.7 593.7 500 562.5 1125 562.5 562.5 562.5]
->>
-endobj
-18 0 obj
-<<
-/Type/Font
-/Subtype/Type1
-/Name/F4
-/FontDescriptor 17 0 R
-/BaseFont/TPVDST+CMR10
-/FirstChar 0
-/LastChar 127
-/Widths[625 833.3 777.8 694.4 666.7 750 722.2 777.8 722.2 777.8 722.2 583.3 555.6
-555.6 833.3 833.3 277.8 305.6 500 500 500 500 500 750 444.4 500 722.2 777.8 500 902.8
-1013.9 777.8 277.8 277.8 500 833.3 500 833.3 777.8 277.8 388.9 388.9 500 777.8 277.8
-333.3 277.8 500 500 500 500 500 500 500 500 500 500 500 277.8 277.8 277.8 777.8 472.2
-472.2 777.8 750 708.3 722.2 763.9 680.6 652.8 784.7 750 361.1 513.9 777.8 625 916.7
-750 777.8 680.6 777.8 736.1 555.6 722.2 750 750 1027.8 750 750 611.1 277.8 500 277.8
-500 277.8 277.8 500 555.6 444.4 555.6 444.4 305.6 500 555.6 277.8 305.6 527.8 277.8
-833.3 555.6 500 555.6 527.8 391.7 394.4 388.9 555.6 527.8 722.2 527.8 527.8 444.4
-500 1000 500 500 500]
->>
-endobj
-20 0 obj
-<<
-/Filter[/FlateDecode]
-/Length 289
->>
-stream
-xÚu1o„0 …÷þ
-Ajrq B[µWõf¶¶Cr‰ƒŠ :õß—¬ž£¼Ï~6H!%|Ã.oðÜ Žˆ¢.¡¹ ZÖGÒBh^>ØÉM…ªØê–ß‚“2 “*)MñÕœGVÔ&òJ
-MÀ©¶Üé§ó-,®
-ÉH€ZŽNŽ%ŠR×V”É‹GTš½OI–y›#Y·¶a˜§Ô@C'Ià
-…U;ÙôÃàŠ*–Ô2—ägtOe?_RÝm•eízõûr!Á—9ÿ‡>CŸõäÆ(·Ë„ ©ºcöŸ7©Xî4Lí¸v¾‹{Äðùä[ø{¿µãDCGYüèÝͧG\ˆH³«ë¼Øa4µ x8e„¡|¹øñÚ<ü»¼wÊ
-endstream
-endobj
-22 0 obj
-<<
-/F1 9 0 R
-/F2 12 0 R
-/F3 15 0 R
-/F4 18 0 R
->>
-endobj
-6 0 obj
-<<
-/ProcSet[/PDF/Text/ImageC]
-/Font 22 0 R
->>
-endobj
-8 0 obj
-<<
-/Type/FontDescriptor
-/CapHeight 850
-/Ascent 850
-/Descent -200
-/FontBBox[-34 -251 988 750]
-/FontName/XFUNYV+CMR12
-/ItalicAngle 0
-/StemV 65
-/FontFile 7 0 R
-/Flags 4
->>
-endobj
-7 0 obj
-<<
-/Filter[/FlateDecode]
-/Length1 918
-/Length2 2691
-/Length3 533
-/Length 3341
->>
-stream
-xÚíRy<Ôû¿Ö!ËX²díà‹ìÌû’cd¬Ù§™Á0‹Æ‰dÉRdK¨ÆvpÈš²Fä)KÈ–H ûžõNuÏéwûÝîëþw_÷ûùçû<ïçý|ž×ûý±´–×E.£
- x’< Õàæ¡Š ¬ ‡Ñ†€×GК TC
-èú{Š
- TUSI]SAà_2ãéE¤àÒ_Uj€.MÄ xÀ AòBã¨&H°& 1h ºX,pñk‹ pí‡& Q`
-P$ ¸ŒöÄàA¯™Œñ @í;ò÷ý»€&úQsRÔœÒ 5%Š€Ç’Ú± PoCS³ücý7©~67ôÇb-¸¯ö_çôoeƒ%ÿ§€€óõ'¡‰€9…&â–Ú£¿g3G£0þ¸Ÿ«Æ$ƒÔÅ{bÑ€Âw
-ãgˆ D£,1$¤àÀú¡¿ñh<êçÔ¹}‹ q0´µ¸d'û}¥ß‹– ždCöýÇö«ú†þÀÔñ1€“XAJRÏß.?]f€GP<õQ¨¨"AQ_© AP ƒG¡t 51Œ'¨- u(×ôuŸÊÊ IÀá_éïŒ: ¹†&~ „€GÿƒU éêº
-Õšöo¬FÅ&ÿ êÖ!?Ì¡Pj3þ_ UKüHûÿ€ŠP Bþÿ}Àzz„À y%e@^Q
-h¨«j*
-×ÿ«Î¹â6Ö§FVPPÓPþÆ"ý‰D4žôíESw÷7öÀP7F¢‘ ‡nÌ 79AÙ-÷Í–AQûg=C– Æü¥t•ílž×«ÌØ“àwÞÑ‘>–›Ã¬{YÆ¥íJ ëÄT„˜k%¶l»¶‘É%c<2 Ý
-NÓ[š¥wæäßpU;þi^FÇÕ¹9UÊf«¹ž<5¾ŽÊ&ù6µ‹ð?Ý |Ò4‚*q”mús¸ræöl=&rÐàªi²l†Ûöcz|/ åÈÅG~¬Èu ®yd»“·½Ñ_eäåð$¯:ûøÌæt^öœ‘Ñ9×.3Áí ÍÔàß‚\§˜j87¿ X½ó5¸tôÝ8Ÿ¥R-b)²5)ïð„°Z4 &éa‡Áæ'?ºæò´ÙÒ¢uÛÑWKÌ<ŠRZÁ× :É¿¬Úàóaú°=´Dš}Dë»Gö²ñ.VÏÚÓkSé™6yÊšÕ·ž— y °XW–Œ¼ñZÔ”LXy 9&¿sB›Á-âáI®’1¨wÉ…W-
-kŒ»{9^*ÊËêp ž.•¡8ßS¾Ç+#܈O> Ïç OÝö`±o†3U6‹Ó§·ã”<Vž›: ±ót 3ìN…òDòå\)6Ç‹ø.—0eÖ¬þ•¦nž³×VÉ¥UÃ×Ê.+Œ¾D²ŠY÷¨d ! "ux–R¦lysEsf©c.=Öó¡Ú¸L†vŒÝ0C®©UÍUšÙƽýæŒì–Áåóë=Ï·Pa‰BÊÎýÐÈÆî—íB_–&e)|”‹Ö»száC«ÖïÞD”ñ.ðºº6À„<ß
-d-pQê7ê¹ ^r8À+ `Šd‚ÒܬEߌiM^ëá-ϱ‹`ï×Ô¦m†™ö3—SžSüë æ¸Ýh»YŽäÊh%‹žÒJ™XKLø×vl=šh2Ydì2EáiJÞë;U»°w·Š ;dk<Œ8Ï´üéÄYE›è?Ò(Ňþ] y¡› cqšàŒZ "¹äU Fƒ)rX]êh¹uAê6:äùÓí6ŸŠÎtŠ•|¶ÇÐØUn£õQÀ¾_i§w×Y›Ä½ˆš{kÄب
-ᕧyÝ
-¹v»ÌÁ »¬ì½}â² NüU ˆ¤/„ßá
-„zÞ’uÄÇ}´oxàô‰Sš™ì²:Þ°°Êý jÎ —tpÅü©éÆ ¼ÎÀ Ù/GaKcAwoùôø`¦¡ôõ3¼@8"ÉþÏ,AG‚kiï öò öûܨGl€gý¶¯ØväóxK?-NŠrs 35ÁÏ\_®0%Z nÓ q‹ó¸ôçÝm= Ñ°k9å.G‡Ë ¦êNŠät-óZµÞ,¸Â"×f«d$ %
-ÁÛí2ݨW ã†> ½ý+¾¡çèé;jÊÝùÙÊ®¿{òåû»ñ¢.§
-ݶôy¼þaÚ¢ûLÊŒQN³7a¹¾Ÿ+¶â½…lŠÝGMjꜢ¿/m²&¯æ™m½Q–}1íMzŠÕ½h¬DŸbì Ò2
-& H¾Š‰Î¿ WåõZœ~ý…£ùWÁü»éz'S<¯ä¿Z)B¹Ú<ÁÜ¿ÿ–•.·¨ yyèæqïüä"¨„¤ÿKôÇl7_ËÕ;æÆ
-÷uÞ"›™äø¦¾€!=7SÕöÑÛžÇ=I&ÁÃusJv0/§ä«G&âé{™ˆQã#
-ÏSýwB§ïC‰lº·Ü|oÁT+Þ¦—ï²¨Ó ôÓ¡-غZMr¿Ùd›˜bƒg÷µßÍ„ÞïüvÉÅÿtAJݾˆŽ€ûýPÚQuƒú‚Ý"ó¤Ú—×jî]8{ NǶ9Áëâ l¹’\ñü£&«!Ó#mx™ÒxÂ=HuhqvÉ4[Íöˆæ+3ìÃí¹^ÎÓ-£2D© ÕË»œÁ&ÂÐ_Ï Þ¢KÜö†°„ñ¯š"³€O¯eKŠåæ# rDÜæMU$«¶v¤ó =˜ÍÌå`Ó¹ùˆ5_Á=.TPŸ.“ª>—ž»½#'ô‘á üv—¾4C´(¡šâ~7Èf0^n¡v€û0™òÑ@'a1c1—01Ò¡ld&ª#Äç ÀµÓ²•šãûš¸»*j=Pïβ½NÜŒ-Ê Î(Só›9gx¾ø¼IW[ÿžîÇJìØõ‚í{K_ò;¿ï¹þJÇàú& cœü>üáÁ8F™ý´ÎûyˆyJ”¨Bݘþ ý³‡Ñö/8o¬4œÛ(ØÑò;2/4ÆÄ&ßœ®Ø!h™µ,wÍÍ!•ê$QÚaúµQÉg„F‹y
-Eg1›Y=iÆÞâæê+ü%ý²³‚é¿ý:#áÑ´_PÏe߇SÌ9t8¿` œiµK÷0àafÈÈÝNáЬ%‡4ÝÉL åõÍ`átÎ]¹sl÷5 ß 5²gR½Ã5ÄôÇŠ¥ýªîà£d—Ça)IèÉ7C¯‹z QIÑIb¿!ùŽ|>]9³‰™ é*è–úg!#×¼ŒÎô‹÷3ÅÄ.yiŸÊüÓS·c¬¡"ûÕÔ ônÝž^Ç…HÛ• Y§ž¡î¹×—å” &f\Šè/ØØd] ¨Ûâ¤,% jÛ4çr×2‰jKhù©EbÍÏ<3ž€{CŽZ7R:Umú–]÷vP®Ât"š#OÙt¬ËÒœ~Ù…¢19n}æÞ(QóA¬ïZRç‰Óì `†‹Â °þh‚ñïÛ/Îɦî6Î
-ÍÇEIÄÏ» -7W<¤eð§ë²³EîÍä>õ6Ð'°Kú\¼0-Š¸}·Ä°‡Uäì’x¨?Î5êÎÔ[>°ì•6ôÒ±B›/™C¨{Uytý½&TéqXO7z‘çwï¾®1á£Ïm†H“"Sö÷—Íâ“`ï‹Øç÷‚áQ¥®©¿e eˆÞYÆONE¯éÜ/‰f_éÈJí¼L©.Ï´ OÛÚÄX\¹ù¤‚At\¾§Xr at nôò@â b]¯a9’MD™œt"hq‹eêËUsø=¿Ã‡jÌ, Ÿ}Ý8‰™QBtè©Å¨°Þ’”‰üë|Åþ«}SIVÆJ²õ6O :KT…u{g>$n"%u¥œ•8Õñâö‚.`Ö/à »|Hkðz\…”TéÎì{ÖuµJpÔ$½ÌŠDbTdç?4g ‡ù <]Uyo ñÔ` K©RëHvUÅ)Yf±Ï¿<mçœ ?T ýÊ]¤‰’ã«w¸"%œ–kO}ì„úËÄ›‘Ù>P¦_ZªYUž‡tÝðñgcHßà 6Jg˜z(»ÅÏt El†-]Å_Th˜\²4óÙ«›æ8«G"žÐú5´ßíÅ;ÊÒi?]™†“´î2tPõQŽM•Ž‘”¬žyåC5œÁĺÅQÓý‰„ãi:‰Ô¤v\‡£ú[H߶{LWz»ƒtÔd!4ºç®ÝRv±I-'jáƒKõcƒ/¼‘Ï}ƒŠš#&,èeödFêïÛqäLµ…²(Ï>œÍÜb[±@rø ØG²ÒÅMuÍÚ/adÔa;ðv¦f¾¾5INZš°íþ‚+œÓ ™Î*tF6vÇb n¾Ž}à ¶p2LŒ€å‡´ ‡˜…ÿåúƒÿH,A$p¢ô <ÎÏ„
-endstream
-endobj
-11 0 obj
-<<
-/Type/FontDescriptor
-/CapHeight 850
-/Ascent 850
-/Descent -200
-/FontBBox[-58 -250 1195 750]
-/FontName/PNOKDX+CMBX9
-/ItalicAngle 0
-/StemV 117
-/FontFile 10 0 R
-/Flags 4
->>
-endobj
-10 0 obj
-<<
-/Filter[/FlateDecode]
-/Length1 847
-/Length2 2095
-/Length3 533
-/Length 2708
->>
-stream
-xÚíRk8”ë¥1‰rø
- ˆ™Ñ‡!r6ч)ScæÃð™á›L¡Z‘¦ sj…è@,QJ94VʱrV’+ÇXE…2 ìQ»µÖní?ûÚÿöµ¿÷Ïw?ÏýÞÏ}ÝÏ«µ‘äªkAgù‚¶,&G«‡ÅV{,ݬ ©¥eƒTƒÅ´¦r@<€56Æ\@ `
-ð; ðú8$R °b…ð`† Øjµm‰eXƒ0ƒFe{¨œ 0X$B£B€+‹Æ 9<= °€ Àeé
-pÙ ÒõH, 3h Àôg0‘è%O¦ 0üV¦sC¾·Â@˜-òlù܈\ÒYLˆÐA?$šÈME^þc[ÿÆÕâ¶\"Rƒ—ä—rú[›Ì€xÿ$°‚C¸ ö°è Ìü‘ºüæÍ’ým
-C…4 ¦?˜o%Û–ÒI - ð£Blðk dÒ´ Jí«4‰èä`í®óm¡ßš$*ƒÉqã…ü!»ÄþŠ±bQ80#ðÀèa0XQt¾ÿyý0̆IcÑLÑ“À T¦ò¢·!B8à`0é` Fˆ £õ˜,Žè
- Š$
-ðcÁÈ¥mà ´ÅRé+-Mýhß?‘1€¦ý°ØŸ 4ü(Òaÿ hÎWø÷h,-Y‡tqF€®>NdkŒ q˜¨%’™ŒP.H°p ÆÐÀðk•Æ…aÉùúE±Ç~ Ñ’@0¤!³²×2–ùlWÕ™;0[ß½i_u[ Y“ÿê n>Oñáƒih…^o`\li¶o•pŠŸùa«ºù‰òè=&ÉõóÞ
-<Þú’Em¿–; /æðWÆu £®SÄÑu¯Áø[> :y¸CÞ+dŸ½¥çqBjßÜÛ¨|ãc÷ýèÚ~z E§¶©¯bääèm1<Û&Üá´NŽÏ|™$³ÝŠNA)ñÊôQQÁ?ïˆýB~·K—|¸³Ò>h<Yþñ\]©§º slÆ»¼£yjó/îåi.ò™k>µw ?lšT#!Ý»¶oñ‰j›Ã:âÁõ™×sÇCÆÂÅsr²4zÖ×Çhvût=»@x8s=(¿øòÑàFOñ|í û¡äÅ øjÏ zÐE¬Öî{'ÛAdF”É
-ìÍCÁ3Á”[}²Å/ÚKäPYTM{…g¹‚ôW–¯·É Fj‹±§€9• ‚TÉ}£?á«îÌLÄ!Wt¶@ŸkžØ« [bv%ìLÖ;«¿RZ{¾-uÝE¼å%£}w*fÄ<§Ó–½TwŽ¥z<x žÙÂ÷q×ÂǬ(œù‹ã‰kvß ¡’åß[]ïõFìÂÇHÈ•ÄÏøÈ î4#øš9 N׎Rmûåò2–H£ßG»¯áî
-» Ï;µ•H•s9šlØ Ðh0m‰3PB6?M··šží/Ô
-¸Œºñó=ΰ,Ï\
-?ÍõW¯å
-†QÇÓ7êæN êº~ijH*¶ü§Æ;kÏŸÕUHÒhÍfZ‚›ý¹
-è)kª¦‰
-¢ÊeO¦A¬ç±
-9öY_”j¡ŠE®VkœŸ×H Uõæ¡Ø[™Åè Èà )¨Òk˜»Î“ñ1‘\¾ÙK‘¯þÉÉo$vÆ4hâ‰NüÞtbØëG1¤a[VõœS¬¾ÒiyX«@WµÝõ±ãr; kRÉî˜ol’G5Ô:ò]ybò
-=cï¢7뿪ƒÅ{Ûên
-øM»>M›³Œ›Ê^OªRÐ8®4´jè‰Û/Õ¶•˜´ö)§® SF‚øÛç š¼L²Þ1éÇ/Ts“S²š`Ë Xž €¸-W
-¯X{Í”>dŽÇOÓ
-Iö¦S÷“*)~Dÿ]´¢…‡j«_ yñ:˜‡§Ž¶_—ºðN˜&•ý¾ùãm”ç±|×e£¥.E=kµOÆ\îøu¦*,ð]c4…ˆ?úˆé#Óèæ[ìþÔ’’_¶îX¤¡ƒþŽå½ »ó±‚Ž7ˆæº©aE
-ú <ìÍ›ÔUm‹ ÊÄ¢?ÆêFCåC”Zêm_Ôym©©Ï¸réU_“@¡,S_
-5 -€ÅëM›
-ÃUá*áã ruÍ™V?±rƒKc„%—*îòI]ŸSn ‘¼æv4Ôª_F%)æFF FyoØGVzºjL½‚Û;÷ ˆ sÇT]=N2¡ÎåK’§×,ÕIÁ¿æjªÒ×Þþ1¾D:)¬NÓHgåA{bã¦ìã'\æÚ+ÿwFºeU¶#ç‡2""mÎl³Ùjå4á+ïŸê擉Pii³Ä²·DÅõ
-Åá4åoŠ+ÉŽ<‰¬m›MÈç¶ùîñ}a„£Òølî+ Jï'JAÃzÖ¶'±ö»#ÃòeKbÑŸê¤Î—¢½u®Vc\1GÆv
-–/œ…»’[¨ø¡êm7Ôã ã¼É§>ömþ Ç=´.·Ó^’äÆ°üR
-î‡nÞõ0Çkä%|i•òö; ùi95¤¼ t ï vŸ÷BX¡°ÙP¾R(”NžiV%
-]1ˆøYsw£…¬¡ß’É‘@³Ã-,²ÜÀ¸ù£É‹ÜªInmv¬W5#@Û¯þÞá-É#R ;Jìè^…õZ]–Mnëö°CiŸ‘;Ë([®.¼‰ŸÿýÉä DÊ*ùzs*T¥zsà‚y(SfdzŽðŠV\¼5åÜQă·:O³ˆñ´ß¦?ŒÇMLE<Œâç«È° ]9tÙ~PÊî—åf¿"z›Ü›‡v¬5…O;·ÍÀ¥§%i«¬ãká{Ë")íA·zÉ]y+Þ<5Ÿ
-¬îtx¿Á®ýeSyøîF™87¾Fb6¨!Ãvþ¹Ã}›w·e¥¯e…V¬›h©š? ¨¬^s†ìënÂG± MËÒ+ËÅîNBwŸ Óާċ+•—¬÷Æwëö`oö©zC
-®ö,w
-¾·r<~”Ùk6gAY_ïb
-Y¼ñ”³=èîFQyfD ’Ÿ{8JŽ>ìãÖ&&±ììŽ/`{ ÷f\n¥š)lŸ%7
-%§’çÌ⣈_` tÌ9WõþötoTûv"m"v¬€/f…¹y®Æ9fVPí¾¸‰›·Å%çôìû•ájêìú:{ x‡¼µ[o³Ÿu0øþ¾
-+â
-S…gsž#¼Kí²Ô^ NÙnë·H Ü!åè¥R°Xhò”“Ù}6@5„"" ›[ouhä]ùÍldôŽBÎÁèjš®—o©ŸâU·R§Æ¡òŽO³jù¸õW‹ê;Y]«jZ©¯•¡‹Êgí.ÈïxcH^x´æ³cOöˆ >gZÍŸÌ|{£ ¡db·&»èœ®
-{ÉÒ7M¥ùÃÎò]Å1—?$N ÎUrÍèÉ»løËrÃ¥GCÏ
-×]µ8ñ^ë¼®¡ªùô@?ÕÜ)ù‹ÍopÆâÕ“¤m§Û^~F¼ |@æyTYÌ /nG%O g/;Qx¯¡-‘”½=æzÇù^íÆ|Õ'<)TGÙcl³- ]ðqÑ(u÷2{”oæ¿üÿøŸ A æ°‚©pù‘x†
-endstream
-endobj
-14 0 obj
-<<
-/Type/FontDescriptor
-/CapHeight 850
-/Ascent 850
-/Descent -200
-/FontBBox[-53 -251 1139 750]
-/FontName/SIYELP+CMBX12
-/ItalicAngle 0
-/StemV 109
-/FontFile 13 0 R
-/Flags 4
->>
-endobj
-13 0 obj
-<<
-/Filter[/FlateDecode]
-/Length1 898
-/Length2 2235
-/Length3 533
-/Length 2862
->>
-stream
-xÚí’y8”ýdzkÔ[–²LòX³ÏŒ1ëk„‰ŠÈ2Í<£©Y̘Á”I‘5ÛkK”-¤Í^9ˆ(e©0ÉÙ—r&½K§÷üs®óß¹Îóüó|îûû|ß뾊²'
-S<õhE¥04š}ÀÜÎÌ¡ 4áEEs:ˆe© ,Ôh40ezZp ¡£ÔÖGiC Š€9Õ‡E'z g Êæ*ßTº€)¤qX
-`‡e É –8QqDÁÒ S püö‹/àú‚t?¯ žˆc Ç@o"ûʆB ºßËx¦Ï -?îËÉ(srª œ”x*…Ä𠳧rN9YþãXÿ&ÕÏæVLÉ Kþf¿1¨¿õ±d"‰õ»‚Jöa2@:`GŃtÊÏRgð{83*éoÇØ0°$"ΔâMø÷Ñ׊ â1Dî8@À’|Á:HÁÿ 3¶ 0'›#–û1j¿¯ô{ƒ%RY>ú~“o0â/指N Üàšp8‚#ä¼|¹ÿtš%GÅ)œKÒ°t:–áÜ¡€ @¤àÁ àD†iR¨ Î/ g&Á J‡|Û§6€Q)à·âë"˜ÍŸ„ætq`ø Àˆ!‚Ó¥ü€Žó¨
-Àè? cü€º Œ¹Ÿ¥™5 H…4´PŽ‰tQðà ¢iLÐÆ@Ááp] ôFǤÓA
-cãòröôˆœ‚` ˆƒ¤¦í ryªK«Í{ÍÕuÊ9?|Ö…TçN^C-dîloš"ñivŸ;‰™ëÙº2Ž‰JZR–1‰(=mgS·àñ˜Å’*ìÝ©Jh©rœ×/º<¢ñB´Â•V;F=ðt+WËDyðmëûŒÏdøÔÌ4ÈJÞ]íl<]ó_èªVÓÜS> ɮܤë´ô·UK÷\¸ÍOi3Ç»ŠJ°nk‰“C‘a_Íþªq(äå ë“#1Â/æk‹Êì¥|˜ö(íx:®”ìRï(œT.²ÖöêBˆat5P÷Žžõ7ÒÏ,mÅí¥’*2F|>øs HOO•ï’ª;¯ÐyHA5*3ʦxvS¼{òƒä¼´kÞâ“_>ÈÏY!i0P>w¡M² 'X§(ª)÷Ħ֢áÃgØ’´‹Ï—¯„lõLð@¡}ÊcÛ Ç[ßæqW àŒšqtoU6ýÆ•ÕÀ1u·¼‡ì-AûsÞ [P*IÆlü;¹ŒÊƒ¾ó [K[¹œFó“óDzS‰/îÊ•N·¯¹¨ˆX3^ cZøˆlöéÍ`Œ²X(Ž]ikðsIN»4-ã…ÝáÅ‹>VGô€ÞÞü˶7`:è D„F‹?E²=i÷«üÐv,ïah·%$Ê(9¼“½ß©VR+Ì- ï{ÇY n´4ÜøáøúºâÊË×Å¢¶é|
-]-¡g‚àŽî„Ù™ª¥Ü&w¬Æ\‚zjàŠ~Žm¨c‘“ïz”
-\; —ÄÎ)ô\K‚4e
- 4 zýÛÙ†6ãÈQøR 'HhŽðò:þzT>q| Zþ°ä[3ÚüÊGª‘'Ë.¶òëžj†p9.ÿ
-24ŸÛõ±ŒìˆQƒÒàêe!Ÿkßë1r¼R„I%‘²zDBd´O=OŒ…½Yz(Hòö¸Bä’£LbDÜu ÉÖDx†™…è´–çÅÔè,11áTËe`Ñè±
-•<Ðg!‘%±›µÉU&4¦ë2âkÖC ¦ÂU××ÔV鬽•ÔÁ~?ðÊ笡ý 9í¬æjF8—¥ò½ÌÔái™óý±$B÷ÂzâõXdšœ&yßM6^Ô™%ý6b˜¸&=ѹÛͤèËncÌUkt?»³ã®É¹y zÈOƒ6ªp„ƒÖ`u
-3Zµ:»ŸÄÔÒ…4ßT›ÊP¦RH. Ö¹Ûb )è TÕ¿–
-ï[Lm.!•›ì9§]ïkêlá`躪±rödÒ=7†,¤·™û}ŽDÞSd÷¶÷íÓêý÷çO|¾íÇ;Ü6åKKö«´„èœÒ¶îS2‰¨æÂeY£B辶ù={.Ú¤Ý>óîsa×>xkàég³†þ
-‚[ÒæZ<p=²1“j§z1”‰°žéƨT ûL…÷¡fészÞ%TßçºîÚ`¶È÷›â~%=$MP–Ùsì뤀¼cY¨}vä=ûAôN=ªË£\Ñ+ó‚¡ò©OŠz‡?5ÞìðqU¼Ã>e¿ÂS¡õ%Œw<žÉö]¶ÜÃÍTÂ^Hx+½|´ÆR%ѯøéW]ô¾ XIN½<ÓaqÖ»^Œ‚…M~¾Ð×U4.©43Åö}%çh×À"´7ß‘¼·”rû£¥›m¡1oÎn%‰õöÐFͪÔßà%‰w[Úñ÷þ6‹ Ó/ì]´ÏNÜ«Â/N™Ÿ4Œl²d*åMi«»©q°;gg·¼Oj{NïvãT·`‘€´òûò‚ÇÖvŽöÞº&/g~ÚaÙM”€ ÈiÓÍ
-dDÇQ"N ¡(ïñÃNîÝV³—f+øe Ð*‰¯Á]¹3UmŸö²·Ê…Ï €£ ôP>šÉ‚˜VÞ”@Ö#8¯ =ÿȾÙ9 ±ÞXÊm÷ÆhS§K^NÜ@ìü3Iu¦€Ì±T?ð°êÉæ¯áÚÒk¾j‡Îdú%N«žOÒ¯6Ðošˆ]´
-£¯Ç—Ÿ“)ÿxÕÄ»ìÿùÖ4YÎX(o‰;陀G÷Û=ïÒ+Ž ?>/ ψå±Ð0‘± y[¥^B>$u9nðnÌ©¢$uÔÇeÕ¯/{”ê„ê#7-îÜ•üšýËÍ™£Ûú’Ú‘LñÃ54YÈrÊa¤ fCùס•M^'pNДçã^D¿«zÄ`£Ÿ'²ó‚d±—¥ÅyŽp ,ŒKÛe*údŸÒôRd!ÙêôêŠÿ—rè¢ ¬ÊA)&C¸Á˜Û<f?†×Ÿ#,˜y„êˆ7˜9ÐìϱgêI½RuÎZgÞÈ_C;êõ4gy>§ö°Â¢'¼¾BSŒ1Wfsi4ÿ^Z]Ö½î&ì=>¿Òð}U!UKexûÓ
-ݳ·°
-®ÛÞÈPã\†îå´—M…díÕÛ2È_Tз½¨<¤7rµjæ‚G¶X–&<)|1ã!ø¾$¥¿Öz x#½CèFF HW[˜§îšI©kÚÍÕᡆ—£V‡J…«~¯.ŠR(5MçÛðe¶Ü|Ì Ü/‚çw5V%7¹–xJarYT à
-عq_£i¾½´°.ån°´h»>ÔÔ)¥X±
-áÝJcµ5{ehùtýHÅÚ‡—Qü%¯Ï…óóô³çßo.¸=QïðIYÅùé ‰Ñˆ¦é«úaz®H »‚Tr‡LcÊå_j
-°µ4•H ˜x÷Ù˯#íyüqwwú \jªšJ»s°°“-&vý¨;˜°èš¯ŽÿåÜœ²Sc|þÓ4¬³Ã„ÊUI價gö¬¤ƒ
-\ÌŽçsæ[ì’âÌös×2 – V"ËŽT fÕÞü‹\_9Æ ý†ñžW¬h€«7¬¨ŸÐH¼½oû. Då‚oö
-=qÏál^ù’B©„Mù]×pÈp±.¾übzÂQýé³-ã/ÊáÓ;Öˇ=Wž¥nTHÜ«~úVÿ[ܲ°Uö¤pJKü¿| ÿ7øŸ0À‘@,A%cé'!ùøß
-endstream
-endobj
-17 0 obj
-<<
-/Type/FontDescriptor
-/CapHeight 850
-/Ascent 850
-/Descent -200
-/FontBBox[-251 -250 1009 969]
-/FontName/TPVDST+CMR10
-/ItalicAngle 0
-/StemV 69
-/FontFile 16 0 R
-/Flags 4
->>
-endobj
-16 0 obj
-<<
-/Filter[/FlateDecode]
-/Length1 1084
-/Length2 5894
-/Length3 533
-/Length 6627
->>
-stream
-xÚí–gT“[×®A0 H¯jè
-ºéUB MŠH@H€éM@)Ò{•&UŠt¤(Ò‹ ½ Ò«€ ݃{Ÿ÷Ýž÷;Î8ÿ¾ñ%ëšk®yßk®õŒñp±éÀÀò¬R‹Áƒ!üI "T"„ð
-* ¸¸‘p<
-‹Q‚ã‘’@ÈýûB@¤Õåàò')*")* p±ŽîΨ'¶x H‘÷w–8PÞ録†c€P8ÞépYĎ°Ö($Þ ”G£z¿—à€zH Òù)Á @ @Ê´B>Aa ¿]©cl°@ñ¿ÃÇM=E:ã.}A9å^úD`1hw iÐÂ^ê!/Ýü?û¿øúÏâ*.h´Üáwùß½ú/ÓpÚý'` ]ðHg ‹@:cþ3Õù·7(rqøÏYu< ²–Ç<A#‚‡P8”¡ƒÂ[Ûmàh ò¯8ƒøO—ûË‚€¾Ž¡LÿîßÇú÷¤ …Áë»;þ»ìïì¿ò_¶Çå4¼ì/ä2ñòû¯‘ùˆ)c¬±æ PHT wv†».oÐ%‰=!@t"Ý. ðc°øË%À˦xm°Î€ß'
-
-Ø ~ÇþB1 €ãåaÿ„î°ä¿YBär_ÿ¦ËC€ÿC@«èr¥õ¿ "(@ü òümä¼T±ýE¨?ðRý^
-9üƒ—½Àü—BØ?ðRÈñ¼rþ/…pàe?ðàån]þÀK]׿ð¿^ ¬›'XH¼üü½ûûÀûb÷½ÿÏL ÊÉ©®¿/üWÔÚÅÙ‰ÁÿõÔ]Þ®±
-êò."‘nHk€ L
-ÚMÑ Ò[sƒž
-Ÿåû?“6¿@ËLE,Õ%Î{•ó tÊNWÛ¼¸ÎD©«-V÷ßœþêóÕ ?Kî‹ ö–^WŸjê‰ ôønH.§õ“J¤|2Yä,\ËHU?PgøQ6>RÚD ùÆ‘±÷ #ü‹4!-ݳ
-Pp6'θÜíú¨‘ýü2kÝ$ö€ž–šOJÓ½“tÓ©¿‚µÜ4íJ$M*“S°¹ØâH”½|¬Z†Pû$M"WlfϤ {‡† ˜~¿p˜‘ûŒ‹žÓ.Ñ°dü²r7u—w×
-›Ùˆ 3ÚÝ#u¶'¢¾ºù«ší“ü”ÛPÿßÆð%0¿gµ“ÑýØã/!&ïfÃ5püó
-ÃÍKtFÑ7¨?…æx)§<¶÷ÕC D¹ç4«Èg1·…“[™pUF|ˆÐÌx컕hg¨3™þŒJ[)5-KS«ÛÈ‘=>'%v'ö1¹n¤<¦µe‰hyQìká »:D°X¦ë#¥ù³š´™£_Ð7'iúÍ£9E^¿å½Hh¶)Ö×4F×Ð3'™WÛß&ì±ÜFõÄ ˜‘=Û\柞'™ f—£$·)CFò-a>G†Ü4b$%HÅS Ðö ¾Kó©µ ±Û”ÑiX»ü²¼žúFöj¿-ØöI~¼»0ƒ}Å>NìÉm~%ëÐDz þB„dþc oÔºp» á×.:ŒÃj± T.ŸÆ3Ûe?>ä"{aú™aI ÑØq ‘Ÿx®Oäªý8ô±4]“F¿Ü° aë/ïÛÅåoŒª«³?tã=Ú`[µSKeçѹ±‘_³„ nB·9v· ùÖ™Ê9_ëA ®ÂÌ‚¾p¿¾}ý’Ú÷éPRÛÚu¥V«å÷’•V¹úÛ±³\ýúò7£>f¤»tQ,ØÊ=œœ•Ü¾!ÃÜþâ˜Ôèn€þëVúÇë>aws¿ û± ý´¬bŽ¢@ETáÂÖe ¥ ¯¿‡ÁK;;ÇLA!
-žÉ~¿¶M³Rº)û©=çgξ7¾~B®/• ”Ïú‚ûs IS=Cñ³§OèU@ÇDÇzœø趓ItäÓµ
-o?7W-U¯çq:ÇæÝêÍк–œ*ö¸§LîHBйR [ÖÅc:yzÉÊùG*„cÒ>I~·\UT]ûch‰÷ §£Ó®FϯF{Ô£¬“|0g`ÙäÃÍR»Q’ž¡oT_ÔâŽÖi0è™#Pßu0Tܬ@Úè®lâ=]ÿÁçŠý½ÄQéOð• º6Qïo¿šk¤ìÜJÜ|2á¶êêyÍ~Þ þÉVÇ|$^lX:â #¹n 9ªÂ˜â6f ZâU¥~ßÄ
-’"ã»5É5ž Ù›À kÇÝ:7Nß¹·5ÚËö¨ &üØkÛÂàN
-°}ŸMž,ó’ˆ&ɧގ¿è ÕÀ„Är‘ZA†ÃìþÉ|V¹[sâ Ú+Žv Î&/wKTNõbCp„ú¥ ”úš2ê»O%àUrj‰èª0ͺmÅë/^ gôßEðª3†ã2}nHØ줔&œÄ+I“†^ßâ~g»¦ùQºå0!ŒRÚ'RûC{ÏçŸ9B+Ç Î Xš'RÀƒwr±ô# âŠäÖ‚ýH'¼IÎýª¨ãÜyç×1Ûð=`2´Äá¦Į»æ^‘ž=›b' ùëÀìêÄÃ$N¢IA\/‰½aê›có̇
-Wš8¯¦„7
-o…®¦òï—»0xv*¶ðÝ&8ß9'¢ â÷Ÿ…(d‘|ØšoL7DÈ5n*Xòš}øyÁÂ>}â¤íŽ²T ŽÁu~ùM™xC8U3ËÖ˜-#Ýþèv8'¹×Ú[í²Qb6,÷Ï)%ÜX S¡ 6Ç4\ĺ9söati,"Õ2R 2ä,C“søK¹îðüz¾é+í®§y,¸·Éâ;> ûUV°àÙÞ\®Ñ0鮫.Œoü†5 qžtÖkÒ3» ¤îfBž ¾ŠûGÈ/«×ÒLÏωCÇú#wçí,-oRß+Ñ`ýÙ†)'ùy4áo&‘ v>ÛiÂ×Vl^ S´FÛð°eRIÝÝ€„‘ÜÝÎ6+4 •¨J‘}Ø+Ζ”•Ð½á°×»”ò((tšˆ5eü´¾uumyVùKÞ É}8HÀóA;iWeÙ cý“ˆª¬émç‘öœ9{¬¦Ëf’¾MÛÁÕ@_Z—îÛæyï]Ôħ® ¯Ún\ Ç´
-³†Ýž}Óƒ›ïM•i ÉÆ9ƒZI´"c$£…·»ÛïYaxmÓGµs…ë ¹ÅN'¼ÌýÛöÜè_è¤[(vz™%æ†3ÎbæG¼¼„×JØ}ƯìÅ!ÍyûWÍŸÊ©lÛ‘t‚È4pô¡õA³ùŸžz¹¢Wä–¿÷ÆŽHªE+]a›½ÁnŽ×úA[o)Å
-ã=8k^ã)âLâ¿y,’Š.YÉŒL³”3›KÝ…{Þãõ8°Š3æ°`yШި„¾ "§Z³±ìÏ0L ,Òÿq÷&¶ËË‹øjyo#g²Îp~+l,zÜ3Ò%×õC’â ŸöM“'zÆÊ+ïrßzh)1NÝÁ ´{®¶~^ñ*´1<:<Z~¹1EôpGÚ™ékⶫÏÚN
-ïϾOÎxe»Ô¶¬Ù@Š/Ìz¾"/'zn±S \¦ï¢<àj=E‚HH²v~±Óc–1ǾI3X„U“Ö Ì\Ü·€A=—@í€Þ°‚B˵&ž²Þ¦l)pÒÓ‚‰>Þä¨Q¶¯O^ŒÒ‘9‰£ÙtRã×éúΜ݂îÐÎÕòS1Æ~ nÜú¼w´þ Çý>±Õÿh3䈚5!÷±ÌÛÕp€Ãëƒå u‰ Ö\–hJ® ü·žµÝ¨ôf¶í‚<ušŠ•¯Tëæã%‘œB0£l1ÓÔ»4_l?/B“'Ð.äÛ3q~Z…‡—R?ÓU¨dwZÃÉ
-–jÁå%1%NùagÜ[E~´¤qC]9Äëó-{î÷¾j&fRßïÜ/Y+þb#´!'qÖóUùAPeóD눀/{ª‰bR0jn
-ÑÝZºhúˆ_ë- NAïøI^Xë±ï„Ïy’lŽx,©^a¤ö—‚hÉF 9nñÏ™è÷Åó- O^Ï8l™-¨]7v,Wûn0„ìrÀ
-‚6”`No¿«÷|XúR˜äêè¼%Ík š~“0}å“«–cåì§5ùŽ¥É¢¸S¢©wÂú¸±¨T½´ÌÂe›,tL ¶«‹‚–XŸÝ")Š –^´ˆú2à)ŠÙr½MÿeŽæc?.k²Ê=[Õ¥”¹[¸úXT”IEqêO‘âø&²,OT4¹
-
- (Ý\NÚ .Rdy)ÛLTR7®¡ùr Rci°äÀå%A’;C¸
-yTVæN: \GÔV›þRÞ¸¿‘s—PLÚ!ä…Úd*—¬Æ¦±ŽÍ·™¹,7ìŠw5FÅ€6+ž oýÆt áRõͶ…¥.NIÞ©eü>ÉÚП1»cÓÑÏM5‹Òü)µm< ·`JåþzìG’Q ˆàg¨zFOÆ„uóÊrÿ÷g=?k’€ ±n/d9Ý¥Fë·–m9A
-Vº *3ãüUú>¶ÓàY¢œÁ¥“Éæ¾Ê:ÃOÔ¡R ¢ W”Í[Ç÷Ù
-Äë ö8¯ÆžïþZÙÐg/Á!¤ÈCíŽoZóýØlš ÔÍ€
-Ns'Äìäæ
-Õ€7ª
-áæ[ÀR›/mv¹‘Š9U8Ê…2-o¢ÊŽ„¸×„s;"L“þ¼CLýž7R ¼*ßrxuÝjF§ÇΆ¯¸":a=:½.ÆÌ*I=ò¬jõ¢¿&#í
-í”çL‚5(R÷Ë y§.G<9k÷:÷JoÉÀÄUèISûFà>…Šj2{4¼ÏƒŒºs
-À¢ÝoËcç ,ïpPýš¯¥
-sqDWX˜³ ò|xÉ,„ðôUÆ4%]Í8[!Ö<fš*|GÝos,‘¢ ¼Ùe°Öí6!"^QGÅUQl÷¸½‘"¾:c ÕË`£aU:.1ê‚óÊã`ùV™ŒAl Ú×ÊXhv}!j¢z_M[~¨féíãÿvb #v4ÄÊ«Lá¢1+zõyð½žâÄ=õÐ&…ß°zæáïØ¡°¿›³vû‚%Ô®…©d/¿Ö ”
-H5äåš‘k³Lû Š {Î%#²Ì4/ÚªëêßyHk è<ä h¶{d=æi΋š Ü i5Ú>¬’V–1(õ„½ªõS„NÔFë6™fÛ‡¢õ-¾)RE’ìÅã.ßAñ4ÜqÙÆ¥‰iazF }Ý ¼µÁ¼˜ ?}ˆq/m²ùü~_E!+vçqšöByaô% ¹ä4Ni³
-TL$ÊXõU$§Ž áš
-Q8V#ŽwoÛãçŒ!”¦P
-ŸI< tåb³ÅÁ« Ž¦ŽŽ÷ÌB3Ó: !™”ãôˆ¼÷ó·æ}dÐÎ.‘Fq£e ïåfeCµB½uã+9uÛ{ Ïnƶ°Ìë±®Ë.ÊÅFò˜ê‚=¿”ÌpUîxQHÍ^+°Û }z n·ìZ 8°ÌþÜ°)Þí/Ò§“/Æy
-Ñ*iÔ[¿N/ 6¹œmþÑðøS*x‡µé>KyY{W›Û-§} ¡žÞZ. bÐ;jI@NɶSÐW¿æYñƽ””iM££Ó‘tä N,1ÉAÓ u“µ>ñÚ
-_Ö®¼ÍEÊ3Ó6½ñOš<
-ÙÈbüLÕz¸¤Ú¿Ûe[¹ß¥d Mü 7Dv¨Éõúy-,êçtMI©btLÌ0½¿)v6ÏŸéÍxÆ$êð$… µâ&(n¼m2-þQ;ܨzþyЩ¸»œ1Ú.?š¢ÆLoì'ÍÍCYYßÏEŸŒÅ Ïny;×6½#aDzUr±åPs|+íƒôÌc]/T2ó
-Õ…‡#]Ó
-+T`]‘Òè¯Si
--ò›×X c¥¾ëÀWlÖzŠhɶÙÕIèbü.8Jø^OŠ.f6¥’”žŠ¿$ãÀ¤w û%’²‰ì¬W®Q–ùFôuŠ3Í1hŠòùÍL gŠ…§f“rknM~dûÅ=|(¿;<Ñ„A»nº[ž¬;½Ë3¶Ÿý&wÌÁÒùË[ý
-¦ ÅuÛ9é°^‚ÃŒ6„YÅ>7h00fš%ì[´“Í{QâÍœð¹;ï >–õ§§Ï—›{fDvèسïÎáÂg¢Ñ)žaÀ Tß¿ñ%£âC4µ£½FÎU
-o^» ×aº l1×¾±¿¹Žâ‹c|¦×Z6]ú YW»ÏtPìÎ)¼V麶O°ÊýÑ·ù†cÚ }EÉ&ÐÔ6ˆÕæš•xEË£óS±„œÚ>{}¥Cip<@§m¬Dh„ž9YÔæ˜HÝ>4•jýø\¶àÇÒA°ìq¤271ÂzÏ¢,7ªfãà;[•ÇôÕ X¤®äÒ½˜'S-DØ'ÈþpìÙQ…²©KÕeò•]Eù(i5•§VN†‡×µ*P
-l}N× ^½º^}Èšõ
-
-VÑ
-s}ìkÂýý—IHªº/„hÊŠS¤ø®‹ÇòÙ£µ½:ÇïEnéú¢«zº5ßVL@š3AŒ©w¢hB>é~á×p”½9¯h— \ ý yõèj Á~àQÀ-¥{Á7ŦƒvŠ9 3¢ñÄ»Þ8«Ûxæwsfõmé×
- (£ååàkt«:íƪ¡ßÐ+`£iæÉíúdX…ß‡É d#±r»na³§ÊõðƒºL( z at kœI¯ÍhÆnL´î©[ ×ñJ·¾*9‹<x¸óc¥ÿð¬ŠøDwÚdD¬1Þª|0îiCövÊ¿=6ή³?ò©øÇ•[Úfrð€÷ŒydëuF¼Ý_cTk¸e••‡_`#Ý}VŽ¢N¢šprx„÷sfºóšŠÛ·’a-¡b.Ñ"
- ü|GþfÉäÐæÕ&u‰°Ý0lïÉbá" Ȫûżùj¶— _)ÿn·túÆî2eϽÈJäÐ7{ÒhÕ”ˆ: €$£ð]M ὞iON°MÞâW Q¾•ÖÖŠ盲|N&Xd¬F~Êi«¥è
- ú ³âSj.q3éÀÊ!v×òÙ ¿,¼Â·<®
-½=XLQ&Û½Ù '€ÇöS† AR+WÊzmi YȈŸÝâé¥óøÖþοz€ü!ÚcT¡ð8*—8zD*'ö ¯þf4þq®—°—[ ‰g
-ÎQ‰8äíOy’Ñ ¸z‰X¨YЯÄA/€gìYl¬ôéözTLßóŠãPÓ³Ž ±çInUó÷féO÷=ä·Kuz^r§úcÌ»Ã{R*¾w8²Xøâ¯H·Ÿ°…)ߨøpþ Oj;ïÉð Óϯ[ä÷f¿šÄ1Ïð*¯ )ÑB\)¤ý“+ä:O1¼4¶q1 ñzE]º‘–vâæ~³(±îEÀä]74c.*Uq4¥r¦ÛJ at eÔäæÇÁGwäRBü0Mª
-®Ä9^ ÷—?Q§Ž¥J>J´xàÚ…¢øV4ÍØ+¾?É`5yíeöô™z¹ÄL¨ll³šÑEgSwõm—ž3•ga´á«Ìœ§>HÍŠâ^û ð¼Ñî‹l÷‚¿q»ViT
-óLv7U
-këÕ 3ý6GqßE!톱ó_fåÝŠjcpQúm¡Eá‚à Ë Š»$¹é×W[1]ûáJÈÊj at Sa3gÅ•Ò¾6@ï¹_Ô¤±ä^/w0—Ä£~‰Š‘X¢FN¥‘ûØcÛJd\²÷¬)Ń¾¦¿fn|Îð2—~‹{®> ‡(5q©©{ÞC劰T¼µB©?ŽÓ³-àzZÖlæ+ÒÚè†F/Ã3Ò¯ ¨R!&õkŒæd óYi“›UY“ª RΖ8¸ Ñ~
-½ƒ¤|†›J®·Ü&‚Þˆ5}€æ”ë'i–¤’wµØí
-zM¸¢S˜< C¶IjKEüIä:MŸ#™jCï±×tÐðk9S ð¿û,7/¡H˜X#“ô}õ5² V«–Ŭ”9&.Þp1÷ÙLѲ}Ì)å;7
-¹ZÕ¸ŸÏþ†~{±^è·ž“Ü.ÿÔCÕ’î+àOÌÃDõ¤ä„S´ÿŽ„çYŽYO‡ `½KÏ<¥t at pÞõ
-%ÏF]óžÔ²«é±</ ¯y¸2? GsWJr‹–°*`‰n°øÎ6‡ŒÒ€™EÇ]‘/eæ d^„[o0-#O܆K¢=»I¬ïC‹¦Ý¡ÑÐ.oi…§ñ…ŠÆò¹ )_dO»òÂFˆœœ^]³ÖÚ8ZûY}ûx¯~¬wƒ¥ñTžt¡f±y/‡Ýylî)¹4ˆåtø‚â1 bˆ|¹yåʹeâ>ÕWŒu#²Z®?¸IæP5Šëå÷ê)Ë ¤ÂJx_éÝÜ6”m‰…HñÕÚžWÖí^õ0÷6SJ8‚Æqå·‰Éì¿ÓÒ£ã/Ë“zDÌ™ûõÉ«“Þ<G‘ÐótèʨPaáÂU—^ ˜K—–£éWɆãx´ŒÆ G„ñ ªøTäË<ðZ_!Š|K’ª
-^Í)º.™á*æ6cTÆÙ©B„*¬ß‚ÓÎ c‰,”ÒºaÒ<@i¿T 8 ²Ç 3iÈ&#£•¥˜`Rž%ñSnSÅ-6RVsŒ þ~ ÿSà¿Ek4îŒÇ:Àí€ÿøV)£
-endstream
-endobj
-1 0 obj
-<<
-/Creator( TeX output 2006.01.01:1306)
-/Producer(dvipdfm 0.13.2c, Copyright \251 1998, by Mark A. Wicks)
-/CreationDate(D:20060101130634-09'00')
->>
-endobj
-5 0 obj
-<<
-/Type/Page
-/Resources 6 0 R
-/Contents[19 0 R 4 0 R 20 0 R 21 0 R]
-/Parent 3 0 R
->>
-endobj
-3 0 obj
-<<
-/Type/Pages
-/Count 1
-/Kids[5 0 R]
-/MediaBox[0 0 595 842]
->>
-endobj
-19 0 obj
-<<
-/Length 1
->>
-stream
-
-endstream
-endobj
-21 0 obj
-<<
-/Length 1
->>
-stream
-
-endstream
-endobj
-4 0 obj
-<<
-/Length 33
->>
-stream
-1.00028 0 0 1.00028 72 769.82 cm
-endstream
-endobj
-23 0 obj
-<<
->>
-endobj
-24 0 obj
-null
-endobj
-25 0 obj
-<<
->>
-endobj
-2 0 obj
-<<
-/Type/Catalog
-/Pages 3 0 R
-/Outlines 23 0 R
-/Threads 24 0 R
-/Names 25 0 R
->>
-endobj
-xref
-0 26
-0000000000 65535 f
-0000020647 00000 n
-0000021237 00000 n
-0000020912 00000 n
-0000021090 00000 n
-0000020811 00000 n
-0000003843 00000 n
-0000004088 00000 n
-0000003904 00000 n
-0000000009 00000 n
-0000007730 00000 n
-0000007542 00000 n
-0000000831 00000 n
-0000010741 00000 n
-0000010552 00000 n
-0000001737 00000 n
-0000013905 00000 n
-0000013717 00000 n
-0000002590 00000 n
-0000020990 00000 n
-0000003416 00000 n
-0000021040 00000 n
-0000003778 00000 n
-0000021172 00000 n
-0000021194 00000 n
-0000021215 00000 n
-trailer
-<<
-/Size 26
-/Root 2 0 R
-/Info 1 0 R
->>
-startxref
-21332
-%%EOF
Modified: packages/qgis/branches/upstream/current/doc/userguide.pdf
===================================================================
--- packages/qgis/branches/upstream/current/doc/userguide.pdf 2008-01-14 23:23:42 UTC (rev 1340)
+++ packages/qgis/branches/upstream/current/doc/userguide.pdf 2008-01-18 16:51:06 UTC (rev 1341)
@@ -1,3986 +1,6721 @@
%PDF-1.3
%Çì¢
-176 0 obj
-<</Length 177 0 R/Filter /FlateDecode>>
+265 0 obj
+<</Length 266 0 R/Filter /FlateDecode>>
stream
-xœ…UËr1 ¼ÏWøÆÌa„%ùy$•TxS (T²T²Y’MðõÈó°½ÉRÔ Vc[R«»={«4 Òé™ÏÖÍóSôAýÜ6·
-š !(v €Ôº1 |\®ó‚çhÆ…9#¿_4_ÔMs«˜™ÆìS»uçžQ nšyF<
-Õ› ]%,ó‹žqªƒ!¥”jÀÆ‘~48'H & Ú©aÝ|mO:
-:ZŠÑ´ Cäè°ýž£› ÝwÑ…h«s뮧è %<®
-½JG½v¶ý(| ô¦ýÔ8ã£k·]<Ëþ*—ºK'=ØàwJ•^—]Ï Ixž§| ñÛðºÁ cT=F¡q8—ñ>wAäØm„Ò†¤{d®nÛM5|ocB«ó"d ²–š'Ò¹&ÝG0 ¼?"yVà2 Çš'¦ÆbC‡èÁxÛ¾&„Rã\û>sö,ã[š‰Â’kíجw¢,J·^ØŽ6Îã w½HÖñ,©'32 €IÂ߉t’ºØ u,Yö2 ìÐ6É·,^äôU]H('ÏÉrU}Õèf‰FqD[Ò,âX`§i8$(8kDL>¡±‰lÈ5€‡\ö>Q¡8dMˆ‹jOÚö^¬°Ûó4u1
-]°žçè)
-íAÆq·KòŸ.YÜy¬È¹š¼e\H0’:1Ò„$ËS¦«f*%~娰_³+wÏ ºØ¾,
-Ð)räìá{Dʇ┊Ô
-ÖFÚ9š]{¸Àmž·ËþÃŽ*"ú#.’ÿ# õÉ”KzF¾ë:’»EâŽw•í.óÑ
-ôY)5QEËÕÿ(Ú㙢ÿœ”ƒBÃê©ã*íÅZ„Š´xSM”J³Ù̹‘8+ŸMÓ-"^¸{»§kÁ¹MF!ˆèªƒ{¯S±Ù|¡5É÷è úhÿ–þÈÃÉendstream
+xœmSMsÔ0 ½çWø†sˆkI¶e]™v:À©èáÀt tÚìÎvËìdó19D~‘Þ{’•£ñŒ/Ïò¾›º‹÷˜Ø|?uÇBö.ˆ¡Dì"›© °EžV„IhFÎUò£»5ûîhˆ« qLæoöE;›ËCw£OõeÀ¼[£Çâi9øůy=–2öƒãÌ`Æo ,HÙå¤ .‹§î³½éíÖ3%û³/‘ÊGûµ†‘Äî×è¥fbö!,©ú9» Á^oTošÜý—ñíb
+‚£°šòŽDû ˆÔLP£;µó±z™s°§û"ó}.2ìDòì‚û5ÚÍ.(¨²ÖçÄâ¥ù~ziààiVSVâó!cÆ&e.Œ> ؇&ãð¯‹ÒfH¢@ «ã¹«ëB"%á<ºZØÒíVô¾¥[¦Nb¬W9DPf at q=ÍŸz§Óf-WRÂ:¿g¥Âuí©°’OÂgYIAÇu˜ÓÔF†£½Jß°¸Âº;håÿ0lðÙ4´¦9í²…Õì«Ö@
+Ò£}cß÷º*ì%Ú_›ó©&$Š þès×Ä-Þ
+cWcý“~ø{Îendstream
endobj
-177 0 obj
-705
+266 0 obj
+452
endobj
-188 0 obj
-<</Length 189 0 R/Filter /FlateDecode>>
+277 0 obj
+<</Length 278 0 R/Filter /FlateDecode>>
stream
-xœíœ[sÓFÇ;}ô§Ð£Ô‹½_ž:
-—6-)\x`ú Ü ¾}ÏÙ›¤µd9ÆÁnÑ08²%ï®´?ýÏmå©iAð_øûäíìÚ=jIñübæ>/hñGÚz=û0£á
- Ç üŠ¡ðQm‰¥ÅâÙŒ†/HJkË
-xM±x;{T^¯æ¢&„
-U¾ÃMk%eåY5—åÇŠÁ[cTy:¸ç¢’/~ŸÝ\ÌŽg
-a¨™ëlÎkUh®j¥á¯´ª6Oçàpvíð¨øxþétvíaAg×~׃»×áÏáâ‡ÙÍÃâxʼn±‚Šš ÅÚ'¦¡7mu¡™©y:3V+¡¥€#𩦰yÖl~¬æ´–†) çÇkË¢û/â~<×0ˆæê28In¡×Û³ÅOÊ^¡—‡xùþÃÕsIhƒWŸ‹§0¼—ñâ®yØ7g¢†PÈ¢Ò0_–ÙòÛ|\)˜)eXl•)ø’Âóƒ½Ïà½fn>ýa¦|ÿÍ»‹4Y›¥Á,
- êŽêv<¿ ß$t £”QüˆÛÏñ徜WÂ"u®lÓùgßàÀÜ‘n8Ák OµuÕ47i.Z£Pã£X
-ãáŠ0ÿUŠ_«¹Rº¶F–·ðý»xâÿTó0”ó
-P!”«òiß$ÐðáÒí;ÒÖ\ÚbNe§GÞtÍ€PMË£ÔÙ«ŠÅ1 (¯ÏŠ¹2N"aŽš«£8¯ cØ°$pöR7›
-7…E!É?½Ì;kl[ ›lÓ k‡;§ž[PfB#›7K”µ‰©ylyêiÒ½œ8bGšòE‡’ äÈB£¼üEæ´¢áfH½r÷ª 3¤$±Y8Âø¨œø¹r~2”^÷J›ðÃZšÄºšDM-ÍŒCâ(Há!@MºEP¢Q Vêi2O"h¨ìÑ‚1 퀜GSè¾åíž,E±Ã îÃؗ䔯!§p/$«Â†45Ü ¨–ÓòK¸˜qÈ_8äFº[åM…ölw ^³’ŽóN“;
-¸Sܵ‰w’(†3ÒàB»+,ÿã÷ƒQ#kjD?ù_©§"é)˜TJD¦§9C-˜ŒuŒÜÃi>ñv¶åž'ÄõF:"ø0 îJô¤›W®›« 3DIj at MWr¾8Æ Ë8yPiæïÔ‹£Ç¡ëÑéeX$!5v‚e簬͊ ¶±\Bš™Xž™XgO#Ñ€:Ãò<ØJáMdA
-+Øã$A½1‰Zψæƒ[6¢Éˆ²×2–¬!øeŒZàXJz
-ÍUkM€îÝœ|Ë«±¥WbJ#ZóÐG×K å‘Éý¤xoü÷ #t
-ÈÞipû쨰I+™ÚétŠº¢¨
-UVAÛH)’PÒË6 at m%hJ•IúÓ‘N@ã9C•õL8˜C«[ç8á´›tÉö’%"ÁÌ+–;m9QËÎ}“|uÚô61sRÅ,XY&”1¤1Y p´¼›!ùø¾jÇÎÑ:â;“ì©K×Qf¾zŽþ?p¬6hRȯ×&‡ð™à èºoÁ{û ¹9„a–-Ôäûì#K™ jkÊõÚ>¿©Úñ¡4#,-KÍQòúÏ°ÀAÅ,ZL— $ß웄î‰*»G¥3ú@V·} ˆŠmË 2†JžJXT”*o–Ü \«˜Ú?÷©}.tMX¿;3ñ²Kiñ
-1à ·¥…“TòÁ
-L¨Ø·T¦Ï;NÔ$7¹-0Ž÷Ñ3ñ ‹çië¬ò^ÃJT^è™øØ¥ž´÷ ´‹G8x Uîج@äZ ôScQC
-ð{4ÛæužhùÖg —5 ‘\ƒ—;øÙg\Ñ$»1¿mÑu6°GFšÂ€”Ñﳫ‰û>‰‰5ei–'¬$&|qŒ•ÓÍÕ¤µ*¥ O—qðÂéäéî9—©ƒ´Áa¹ÔÀŒæUÖÄM˜i»âjÇ+‘IQ0ÚÖ¤›áÃÊ*ˆÒЦ€{¿ØŠ¢Cì@
-b´ÙUpq
-Óß›3–q#» a16•¯RÞÎ Nƒy“½ žy¡ò+7»À†´Þ¶Òv±EW›ªïˆ'&.'k¶í]EDèdµÞ,‡Ø=«nÏcµ>Ö8;¥…§9j2½]¿(ײuÑÀåW9ñû‰'—âŒçÞ6†„çøþÂ¥I Q;íþK¿FtÁ*âr`Ñ“U²*NûÙx `<BËc’GÓ÷ÓD7ë8ØÒ:—‚9i-FdØ•ÝedÖ–¿`sOZT–´Q5[ò¥¿;lÓ³BãJUñŒa“Õ®vô>IHg%MnnÒ‚Ôä´˜U&èFÌå$½òkuÀ7þÒ¬z½‘dÍk‘6œöÔÑͦΎU5çW‰ƒ›b.j¥ä`›Ù–µq¶ÖRöø¦)Fn?òÑ<ÐsÕš
-%ü#,MÌCá–çk4Å<{ 3W󈡘§WfTÜ®7æ”ñö¢«É„[¼Ï“¥y4OÌ\M¦YäÀ.µÈa3¡¹1fò¨hMfbÒó‘ŽààÃzÚÀÝ0=ñ-³vð¬IŒOÛÑ¡Ig&ì.z)`~5$.zÇ%N”âSœÃöi2`{ƒÖ–
-˜¬–J ĦhL†Vg}UxNøNZ8œ/9÷¥M&¢ö”¨ñE›՗¶L÷S¬Õ ³B. ÚÔ¤šõ6¯«° 4–©b)w y2VÈ'Ž¶™tÏŒ²9R}yÁA7ÉÆÞUÃéñûá Þ»JøÔh°à(ÌX;˜oÅÔ¯«¹•¬ÞíBŒý‚dmŠ.»`x’‘ J1ŒÂßíüPJï/ÀÄ JQ¦fî÷+ð—RÒå´6Yûdcû9þø4„³¥èʧ„£a˜ôñ
-8ÿ ÉMy ÿH|´ýk#ø?]ãÙ¿³Gúendstream
+xœµ\Is ·®Ê‘¿â ç¥ÌÑ`tóªÈVâ®$åä ‰EI¤$rdóëÓe¦À<Ò‹JƒxX^¾îÆøýnÅnÂù¿Ï/ ü ]Øß ÅþØ}³´^ ½?ù)ß}v§ÈУÒVîN^ ‰<Á©ÑM“ß9éGà§Ë£Ÿ‡ïö°›’N…áš“¶Ê)3œa·ƒn1<]›—8ÂHgŒ ží—rxƒ½ÞMfý÷äëHÒ6†)$ĪQOÚíNž üõçád<J+ÕðÛ“™”Ñb¸ÀÖBŠáf,UƒÃ) ó6þ¡ƒTF Ï÷kû u‰H3YøáŒÎ¸¢£fØCß²ì œ°ËÎÖ
+3#ï,÷>S‘û¯÷ÇÂŒBËÖ9ï -þÀhxJ©{“vpÁäãäþrÎt #´S¸3ŽWõ:WdÌi¦Úeì&ËFÄÕSs®ÈÁ Êis;MfƒfºìÛŠ
+ÜY Ïiÿ²7|J-Ì®®üEê÷¶\N=ÞÃ:(…jR£u
+4àääý¬>0¡…›x“•Œ¬gd&“¥ÂY¯ÙŠY6”@íüë 42™–º¯£x†àág+—¾g—N'\‘öÌF]&iÕÖ ÿ¸—°’·z3›Œ/êf–EÝâ:ô,È°ã±c¤xÒ*1. Ím±LE{¶E Øáü% sUóQ‰q’›&fqU5‰i2\P:Ø{QÁl »ÍF(Ö{RñŽHEGÒW|ƒHE ‹{Õ¹ç8aÓn–#ÈZë|¥tPÙXzÎ9JikIWùª(ê mN;e»—Tët @ª®uUT£¢«tOJ$½¢²¥5Œvª4Õ¬nB6b²Ì='mÎKB°µP¹¸ Æ_ïÃh¡_22k³·ü@ÙPYèoÀ¤¿ÞO=NꜙšÔY…ÄÛŽf}:”uQ>[MÊšw–Çô|ã¦î?¼ØË0:äEí@éxe-Ø+Æj&’ÏèÜWı²½žsaA²}ÃüÛ~tµÆ”£îë¨Ì3/V;î¸jd~ óþ>>°ÃºÃ†:òù&ÚB 0ÿVH¸ËÅ©¤›(aþÀ7ÃÓ(˜>%ò ðZmTÒ‰MuQQŸÍªÏÏ讯ZæF©îÞ—ïÜ×â½Êu=úÂO ze‡ŸR·³~xÔãñ|E™P'Á½1#t) ˆëbh‚vvAŸQ“ "£˜+—×Iˆ–BÀç`œ‹÷ód &>ß2_ ?r#ä9ç$Þ¿Ò
+г ¾"hû‚ ºÆ=d¶5¾ ŒÆÜyøIl¢Ê¨ë6´‹HÁ óF½i¢²”H¥ØèÕ‚ÂH¦þj€Ëꬸ’jøÛ*mŒŠ| é}à÷õnËÛŸ72¹šo¢¼ A”Òf”Îz¹G;‘¢˜ÅbÌK绵óáÒù`í|°tþºvþÚë —Î÷kçùÒy±vÞ,ãÚùvé¼îLbu7ù¤°ÖÉ«£cmô8)¹;–Àž”‰ ›‘$Z¥G¡Cñ•ð‰•º7, ¥ò Ä'¨T `ƒå‹òpˆýU¦ lÛtŠ›~Ž†_óM:‘·ª:5 öM€ •"pÓR“wÑŽ Ëç[\úe/ éBcž"ï•mC\ÑÖ‘[íUTd÷G„ª‘ŒÉ‡ÐfkØ8 kŠ:Ø1c\×™µ,[:Žº”íE“)H§žç.M'\íuYž’ÛbÄj§¿´‰„‚AÓzÉßÆÝuãp+|™ùÂ}"gER£W¤d¼… ÉæHðEé÷ Ú^qYˆ^.˜ÌY-'Ç4–éÓÔóêºâ^F ŽMã î§ÀïZ©í¸:£M5t~ ˆ”ªà|»÷ ¦³I“F¶0WÅüI _vñèÜB€ÅÚ£] "æÌ$ ™ ±³èÿ·„®‹© „h×’Ø7‚Y ' †]}¤¼Ì4Ÿ ¯‚ðYÊ:ÉQE{–À‹ ™†Ü$¾9ËMö0ÁiÑÛ¢˜€¤ö ’¶(*Ï=/RjZü›îñ^äÌg›¿ìsò'qõ@´X@eÀ?È’ ¡éÙŽb´"Ÿ”5aeHŸ«0êx6"YpízûŠÊÍàÓb x ø, úÌŸ)8 (˜¬UD¼Ê\2,û4ó©MfÄ‚†˜ÚБ…ò:RtlÍʦቫª7r^E½Ží k4Œ*4̸M[zWBd†ÕÛ pŒBeBPÜdÀàD ÞLW<‡ãeÐð;s®¾Å2d D2£‘Ù¶IåôóLÕŽÛÈÄBëºòt)E‘â*á± ãÖÝSíÚrÚEæ´²²I• á¹ßºò"%„ÖÂñ”%…ç4ÈBà93ÍIV}ÄYYG×~7JžÓQò$[€n~¯Ó\ëh'¹íxÝ6 6k¾Í§TÐD·Ðvë~ZzowŸl¬tÎ¥MRn’°Ž¸#ÐI‹èÈJ›ÅºÉ4fc=Öé*( ûE2T¯Qm¡ÞûŽ[ÛR´4“ÚTwÅ$. Ù§;ÍØ3#‡Cçw ˜»Ù‡ì¥¬3·¬(\Ƕ‘yÊ¥
+gQQ"˜²¨í](‰C§˜ç8ÛXk“ !]‹ñËõpTKØÆ“Æ|‰ç•\¦ƒÌ¢le»zõÅNéô<gwdèaîø$-¯TC–Ü ¡“QA¤k*(O~ ]Ìfÿ›+ãÖŒFû[Ç=@N·Kr…ÊNÔÇn1Ç8ê°]œ‰[Û¸B#gf_æe¬ÈÙS–6sÓ,ˆgJ&YàYïä8ë]àO#Ÿ3^w3PXÍÚ ³Yùv´™â,¸H39ƒ †9%õ%ª!ƒc ¦~|ر!ÿJ'œTLب™áq98„ruõ¹¬tÎQPÝË°³A97½ÈúŠ ‘£Zm\±º›Ó=6ðï7sZx7§…pˆÓm…¾7©}®¸È ³l5oð&ƒ< û"Çm- èäƒÚxã&Ñ ˆ‘„5E¼'–à Ž6 uâòC†ŒbÁT‘ÔD¾XÓ3_%[ª>®Åç#À?ÿ²aæ)Úì¦Øƒ„ø^žb'‰õºÙ$ÙIj½n6iöºIræM¢=6›L{=-¥Ú.ø6׎Í{'Ûå$F#BN¶£{JJ)Àt`ø•1º::Ù¾7—°„k 6PÆe¢Mj¶±ú–3ïàÿÕ˜) 6C‡6éˆýAUEíêU˜2qïGLL#®÷ d†aŒ1ªIC#qnR5u%˜'®tÓÄг<íh~÷T¤Gwtnñ=q„Ô½r;NÕå½ Y¸Ú¢|‡Û>ØÎoQƒÖ{©³ä둃êàC¥ÿé:œ=÷*’Ô©U§³~¥D´^—ÓèéÜ b3 at KoLr_XxèñC´ŒÖpå»É5h#Jô =_…g»Öv©.[ËœÈý«Å 0_•‹IHaÀ{õÇÊÅZgw @Å6§îxZ…<Ôâý‰f!îàÌá€;׿ï{ДHw£2¦h\Ù ÌzóRéŽF‹6;êFÃíóL±â¯Á" ¾Ëa©º%:ºÛV…ŽÙ†¿QRÄ!C¶,òpß…Ç…¡ ez^°CÕ|·6Œðκ»aÄÅ:öu%üYˆ"6»ˆ‚RÖlH‹æ±Ù?Ùâ‹.eÏ÷+
+3XÐRXl¿\ZgëÀ+ì4Úu^~~º´Ö¾‹¥õvi]ËüsYæº3e&;—Ö:ŽðàóœXpX½^;窻âAP'=â3AA]þ:€J«ÄÈLï }Pnª2~?%Ùˆ‹9ÙóI—gÀù‡k„à9²?ˆôó§ùßlf®sLàEFæÕ³e3`Ù _‘Øå¦2‘‹«á¯òÞp´IœùÅÛ5ÄLŽÂŽÖ›áѲËÅ)ùƒÑþ0m‰éÑ>ª. åu Õu4¬hXç¶ø`Ê÷±˜ü0ü¸ö ¬xÅ’¢— 'Ù‰•â:ÛDLåÝÜ ÙŸÅdóÜKɲÕXe€¾D€1J pà2Ƀ4nølÝ–ÖÙ‰þ—Riñ›²||6À)!‡XŽ¸;Y<ÉZÅD Ë¡t<Ã)H©PðmäWZ„ÅÅ «Ú¼ ˜~ b½È™Ý¶QW Iž–Â7Vá e[òî86¹Æ
+VÚNž o »Ü¸”ûBΞ$ºmåãIïæ#=×Äèe ‚‘'[R!ÅdmËR…ŠGL ˜–ðhuó˜Mµ.",p4}™å0s³Ð– 3MôÐœ _Œ¢:î9ß6Œ^c²ý_/³w[É;u è;U¾ o7)ËoPthë QÜŒ¤Úʨ٬V ÔF[™úGD–ø9*.µÅ§¥Æ¡wÀ¼ÄÛ"e[°$o]8K¾Ž
+©ªk`ö‘ŠÿyoÔªš i.lëý1µv÷³6DD—Ú ¾M>6±Ç[¸%{¹rp>hãWøW9þHŸ$#¤:¾³=ÕönÅÃRY8øéSJ“=Tô]òZøf—~½TïÕ{7H¿»Mõ#SòÚzk. ö6•æMæyõz‹úĺ A”®óÃk¼X«*ùÚ"ó§h3žòSb4*ðï {ÃçO2ÖžˆŒ^¼´d)£å‘yÑ L ÕUà ?Žã¨òzNÜŸ-yÏÞšRn½fç_îŸê/gç9ª
+£¸cëûæe৆oöf‚ðœ]oý nÃ:PÍËQ¾5ܸeà‰ëÛÅüö¡Ôµ;I¨¨]]ÛåšÞ×»‚ôL¥œ¼©6Ú|ºÇÏÛ&
+>Oû{¸±o×äa,nÅO|D¸©Æå’¥~§› >œbB.Y"Ó’ ÏÎK-“¾ú,Aá§+‘õãô¨_ø}ƒ/êEhªmÞúŽ2]
+G.˜ETfSã·^ÞnÖàÖçÿcÉúÔqt"œ™Pƒ®ì*Þáj_Þß6ž-óæâ<__¥å¹$|O|¼ça£RÊçdÓó
+ý`’Ê2råˆTíŽù¼ÿÄÿ @ÆÑ=¦Ppºiy¨#)ùeØDÑElüp\¼˜¼ïdW É_ïd¦´Bšãø™˜ó¤ÿ²Ä÷‚ÉóÝ*‘×hàöý@¯*mZõ¡ºŒcüBNøú1üã«úþ2šjq
+ÐÂN'ðï<ˆ”?ä›7Ùí°îë×:&]gfQïÃÈ+zÖ´Hˆ3Ãø~ËóYŒÇý0¶ÏkóÐgžHø—'Gßÿÿ¶úÄendstream
endobj
-189 0 obj
-2193
+278 0 obj
+3961
endobj
-230 0 obj
-<</Length 231 0 R/Filter /FlateDecode>>
+290 0 obj
+<</Length 291 0 R/Filter /FlateDecode>>
stream
-xœíœ[sÓFÇ;}ô§ð£ôàeï—§N¡ M -´Ì´Ó‡ i`Z(Жoßsö&i%ù"ÛiH< Žlë¾?ÿ¹ßÏ)asŠÿâßofwžpÁçç3ÿùœÍ¿ÏKÌÞÏX|Cãúó»'° ³ >"Ž:6?ù}ÆâŠ1âøÜhAŒŸ¼™ýZÝ«’Pʤ®þÂEçãÕÛz¡ªËšÃ[kuu6úÍE~;ùnvÿdv<{?—–9ÂýÁ‚蹚h•ÓÄZ¼œ»G³;Gæ— >žÍî<›³Ùoñåîã{ðçè›ù³ûGóãM/Œ1Ç5ܯKày’ZT.-ð°°ÐÖ§Lõ¬°#«8^¸ª>Ô o5\ã µª^×ñZÏë7¸EõÜÿùe-ð–±êUúŽUwñK¿#|Á¯ð;zëÄ›uÚ G)¾¾¨ŽZÂà-œ›¢°®ÒÅ¢t8lf|…}»l[,†uÝø
-¬‹H cå†÷ä%Œç†»e‚*âdÅð–ëŒ/îx‘ö¼`’XãL8@ Q óKÝð+º˜HMœqˆ®Á âåGkKœV!YÀ‰¦ÕÖCv#Yià±±Š(©Vb³.+qwžKÙ+²`å é3üðO ä,ÍC,…çÃÒ©lp˧vOw#‰i¬ËjLÖ ÆtˆA‰âm‰ZHfB\™ÊÀhT j¤àH†©¤FÒ?ù@ŒèZóO°<Â#•5¨ú¹VpXC]àíE‚.É7ÔçÙ<ß!;ÍÈá5HíˆM·Æ_£í]#ë^£Dèâ)‘éá`éZ¹ÀK¬îã <Å—'ør„’âøÏ^áÚþôÞá‹¿–/ëÖƒ’i9ý_1¿•ÏŒ„wlOŒô˜ §…Q´±³{Z^†Ç¥¯ÇÑÀváŠv1#aí›qàc’
-ËÉ*\w·`j ŽÒ»?‚ϼ‡ö.X?4ƒš@œÃª¿K÷ ½3Øäq×~~HÆñ÷Z(ôäK
-Ý «”æ·
-X/jÏDôà¹â 7\w\û‰»í0ã
-fâAº^~ œÒËßЪ<*x× p” ò›EÀ µÆÇ1 xŽÃA× sÕ'\S¨ 'Àæ
-uÛ©ôÞ¶
-½É KbÃ%ZTúûPãÍDtÙ¾FMʆmF8UâI í^$
-÷þï’ »ó$kBfÄ
-%ØJµÃHli^<(¬/IÌÚ1P² E—·ÑÉE \ó Pa¸Q¯ž"Öûèmà Xß0ô‚%ÀAÛ—UÞäƒS¼'s‚Êv'`ƒ„yu‹ya“²)ºmJ@%ÅyËR‘Æ bôq⻳hͼ½’2 ®¯ó6YoÁòžðˆiU©4ap¡7„bDY·‰¿»3Lâ¡û¾1¯Kc4ÍŶ]aŒ 4îOV®36èßX) ëÙ[gTöçßðü›ŒLé?ÍϽªÎšdÔËüð£•9
-,1dB: P_ »‹Öƒ‡oŸ'ú¢õø¶
-9 9&•óìút-”?½ã,¦£‡
-‡Ä3 b¥§¯£a8GJJø6žö.‰ñHu¡MTföEÄij‰£21¥GÜ
-ÀSä,1ÏGÙ°"i9’›Lê“·h«Uß편±F^a1nß’t5ŠTŽ¼ÊĨ¥À 26×E›ö’±ñÈ‚ïU«O&«QŒ¦Nðý«(<†êçÚàÈrÙñD›â‡¯0 2Ñ;ö_4éßh›¤]6U ¸
-o ^×QËþŒ.nDÐ4zÈ¡¹Á([㈑fbð½ ”T’DëÑè<×oËØiMˆ¼l|êÖfŸ7üÕF#äb>Jjøþ‡ízó2uÝ¡ƒ˜R`ä%în/e$µ&/ø&çÀõl ú(:T\<íHÙY^wŽñCqj3ÙR;–²E$ËÖ ;Ù/ŽÚåS¾—±xßj:CMy^3 pŠAQˆ´Z¹âDX;·*â’X—Cpk7ÚhP’ Íd°L=Ù¼úí½Þ#¬i{@†’mžú »d-
- ±Û}á¦árÕVâ’5¬tŸûU‰HÊOˆÀÅ`pµÄÜ4dpŠÙ5´ÛC ŸLKÑR!]V]ÈÁy»e+'ŠËìÀt¯.D•‹áüìªuòµÂRSu#¡ÛV„ùT3ÁÔ˜|-G-äuESH© ¿Õ¿Ñ”]”ª–·Æžl³F]©«L^/XšrúÔˆ~,ñx«`)lóbçÁ;bÛh9v߮Ӈc`EfJ;˜”µDkR ¹‹Ìr-9F‰.D û!’JÃÈ=5ãhŸÐ:ôÝLæ³6/Û[H
-†€¶þ WW Æc„½» Þ“Uæžs³Eé<ë1Z‹®ñ¾ ¾¤l¾vÑÒ@tÊéÁ,_Tßvʇ‡§Ì Æ=ê™ R¼Ö"èG\©é{E+5”2%W¹.[Ä€vCww¢:Ý ~fÆ€qr¨Oy?‡Ó*gdh‰°7„’Õ1ùÆŒÌ *§å¸kwÓ‚üHžÆaÊIÅ€›rfù«Ó½«[cFPßçJý Î¥5ñ'uƒ$o>P«L™DOæ4_Å›eƒ‚ggÐ/|…™sð1™¼¦î3·±É³8ö ¶HǪì·mC_0b˜g>šOYô¸ÐƒáÉ&Óú=yký.½´ë}©€ÌZóÃs÷¤
-aF K0 9nLíˆ3`$#\m¬í׫¦P<Ò•²ïBñ Vñ„F°*Ö휜j§BvÃmŠøhlcŠ>_¨J¾àþ‡r…-sž2 Ï¢ëf¨ÊŠàj[µ^ÓJ·_Å•‰êgR Ä*×Õ0QýµÝ¨
-Fn¿íw¨p 2exuR3¦s³®L'T–o3(NÈu€pè‘2Ï(åÔǸQ->ˆÝª5£#*µ©á
-œ:@ ¶xÓÿã7Jìì¬Žç œÿv±ŠœrzÀ£LN¸ú¾´.Œ“~¾äÀʬŒüœÃF°”5ä>-åÔ€ÇI•š «>½Nø<oD ;0s³™)g|[Ǿë‹våyš!P\˜ÕÚŸZ— +(¡®Ì €¹FÀtç7®øeAËüÝã/ 8†p>¤£<ü¸àqÊÉ—Ó¶iÂ×6 ¹ÉªŒþ äôÿëvÕÑç[$ÊåŒ+~ ÿç{r<û€Ò9?endstream
+xœí\Ks ·®ÊqÅ ±©ZïÇ)UŽ •%Ž¬}På ‹4M‹"e‘´’ŸÆ Øi €áŠ’ì¥<âA½3ÀLøðõÀü¼f”¯YøKÿ¿|½úÓ7‹õÙõj¸¾æë¿ï¥W«ŸW<ý`©üú‹]¨bÃ%ê™çëÝ+ž*hΩ~m¤V©õîõê9ùËÞ&´†\m¶Œ2--çär•RsrsZ݉òÍõf_ê?»¿¾Úž®$efýÞz¾²ÒRÆÜÚj¯©ë×+
+ÿ¨7û+«g3Ík®¨TFàfXÐ~x¨pTBç¤f¬4Lpruy~rî½5ä4´Ð
++A÷| ZL®÷׃êéuc¯ C1n½{²Úýñ9Ù…šRh#$9 #SÊ‹Ô9Lj5<IYGV ëîdEÎ7»ŸVÛ|m+…æðpë9ùh ½W äÛðÅt Á$/ÒÏ¥&¯‡÷j=ù~ã©vNË–š:Á³Y…xqPAˤÂnc=5Ðæý‹†··.5OXK÷ ©~ˆ—•6 BJ0[”¸Œ²±J¡Ã„÷Ι²y—¨.t]5IPëܾI¹MñjÙOðPá…7 J[ÛkË Ðå3Ô€[t½;VµÒh ž“ÿŽ3'ÜŒˆ° ®=îÁz<bºK±ñÔjÝÐ8À(jŠ”}ÎñSéfkŒ†Rä¯HÏ«N¾+4}»á &säd,ßèL^vfEz[¥=ô‰_oB<“¾¥g¥µäÔyj PÂñÖTÌœx‹½„À¡E©Nº ,¹Lž¯¼Ö÷Õ"þFâ ?€%÷}ÝJÜiCÅÛT{‹¢ƒÅï»zÏ#?¶ C¤†ëH^)òÏ‘ŽOÃd‚iø.ÞuÊ=
+vRyËM _†‰IIXñv¨e`f?’XD„Da©±®
+Å„?Y³£(ÙQ)ਠ‰WŒ$þ¸g¤#W[f
+n?é˜Í—[¶Ìùª1`RS'û&ƒéLœsäÑãgƒ×䤶
+³ îgÄAf¡˜Š`!Œö–ü/Í<]L< ¡ÝÅD½@e.RoŠ©Ýz’9Û±G`êꉫ g|pÞŽýŸa:;PW.Öä£OF&‚k|§]˜µzb-$ 80bTÉ»1Z!ÖÛ yòÍh
+PÊSñtâÉdoòËNåø%!†äB ÉH,â ¶¤ödƒÙ9(UF AéÛ .;Ptá¿ÄHºªä¨p³@–£† M¯-bHfÓñ$xH'øI^A¶]‰G§=' p.‘Cp`r1äÙ˜.éºt 6y?ç0 XÚûyò "ºR çxrÆMårúD?A:=&ïöY•Š‚#0Žå_ 8Æ—üÐ s‚Òm®>Ê^„‰æU¯!Û(43 Ï7˜Ù/îN“#ªô,Í['©ÓnÁà
+2+ ¦:s¬ìBÁ›/Bzê$à«à»K\è,GC’<
+âh ¦ƒ\àö`Å„ÁÒ*›Aè¦x“ŠÊ‰.¤9¼õ¤é
+FÉ€ÊC]°á‹‰±-|‹¸ZÂc"?#´ ÝÌŸ› IVsee»a>§Wr¢úu˜BÐKr Å>:úx¹.ú7p–ìT‡ìGN ãäÑ¿Gô=%4§’¡Äë²FðyˆÉjúGBS,æ¦:ˆÄþê´$ 0 JBu›Ø‰|ÑqùÀÚ†…yîì±ôÚ"ÎbJ2àG8b,S.‘Ž»3¶ùþáXë%ƒv‡ð²´—…ÂQÂ÷øÆqxÑ_Z ¦mÇ GÓë‹8IÎà £8a„ä¸w at THLÕGb84X¯ Þ$®UŸàº5žÕw:^ç†Z¾Ð⑉-Ü 5ìÒý¹ˆAÍ»pï»oG#{^dL ËòZƒúF Kw.â½úpk«? l_ÿ²Š:a\Éc!!
+°Þ’_PºG—h—ˆƒPÔ,ËzG!ÎR[m‰Ú¸8 m¦ƒ¶n*®Üò†6&ÌD¢Yî̱ôé"Þ›ßt…¸!;7 ¹VŒ–2 h_BÃëJ;é:g ,q³srºŸm,s‚‰°GgÙnùÄL0j™zŸÍ4h£B*ø]Ôp1ëö•HíåX7¾DÖ´»v»_ óxu¬Àr±²vŠ2À¹0ܘ$w0C§×1žfØ°ý«Q>>è¤~õ¸ê&X𰧀+Ãüò,¸%¿û˜(`,BÌ|"èÎ;‘%t{)›ÞG œŽ¹ê¡Ësü;ø¦Mÿ5BèMž æW«õœ*¶8·Ÿ¹¦Nñ2Ÿw*4¹ÝTv½‰1ݸm¸~²'·r `’òÎEâÅ=8ñ#ºRK÷ा÷ÌÁ¸Å;ÖòBòÄ¡¨r”™ßÿvèÛ-‘×oŒØæVwdÇm;;®fýÕ=£ÿi Ù]Ài½b@çõf«¢\.x|ˆx”†r3ï„ÚŽ)Ÿžqnù–?õÇXማá–:{O‹½ï#ßç(åaTÙ8XY"Óu9Ùw“ç¼ «Øc ±Ùˆ›ÆsÔÂIj=Š.>01&=ÕÝÅ®Íj‡¾ƒC”S* ×Úëß8OBäŒòðméÇ+t`§»§%X_!f\ÙáÀðq Ùç,ŽÇ ;Û°ï3t‚.«¢ŸæaÃ9è °‹¶v
+ Pg“~gòH ` ¨šð>Qì4ºBž&†k
+ï:_ôj³õÚs ɨ âèlê•Îâ1W;œJ{ÁÏwጶçl²I->çÞ`¹;‘ÉÓ™êá¸x·óiìOƒÑ‚‚½€ŸÒ ÉP?1s©v ¿óh_·ÊŸ´rᘡàè“VùÊü'š_æÊŸ´2ŽJ®xü¤Ú%^ž£¤ãHŽ ÇôõoälZÇÆå¦øLûGc §‡ök]qŽYòè]Çåéÿ¡P<é¨Ïpâj y? OWÿ$,]®endstream
endobj
-231 0 obj
-2431
+291 0 obj
+2249
endobj
-273 0 obj
-<</Length 274 0 R/Filter /FlateDecode>>
+331 0 obj
+<</Length 332 0 R/Filter /FlateDecode>>
stream
-xœíœ[wÔ6Çû¼ŸÂöƒë.=6¶iá”@
-=} (—4 ”~úÎÈ’lËöz7Ù\H|8d½kY–ßÎüg4ÞÏYEhVá?ÿúúh±õ”i™½=]¸Ï3šý·>,>/¨SùöÙö> B
-…ˆ,Íöß,¨?@RJ,Ë´âD›lÿhñg¾S”‚T*?ÆMk%eù?E)ó³‚Á[cT~8ºç´íÿºx¸¿Ø[|΄¡–0w²’•i®ˆÒð*"Æàålï.¶v gg'燋]lý‚¶ŸìÀËîƒì‡ÅÃÝloÉ…±¡ Óp6mu¦™!Ü_™Â‘’¢TJkdþ¢0jM%^¨ÌO
-‘Àw¯¯êmQ2 m%Í¿%w;Îàÿßð¹¶ðyþ;~ü3üÁ;FñÞ1ì\æàå/ë[ãwâ;Ü2 oP–êþŒL`Cï)îïMY)$'\e%Äॹ#ý5ñœ†‹c ¯ .®d8PF#«pdï
-“T2ƒïôŠW€ŠQB…Å“‹ØhÜ”ÜC©’ÍÉë´Ýhg›:±I6ë¶v¼Á:m› n~€e•n)¯$±b¬2tç@2M at bC =Ž€<‹€ ¡È?MHÔ! åMŒ ÞŒ©5R=¸y ÌTÔlŠ*n$‘ÜNPÕ²SÆ6öçKÁôÅDÍÑ 0f>{¤ç‹ú_=€Ê›í7hŒaˆÖ"ª¸aÀH°Á#!±ÚÀ¸9nŠü ú±Û `¹H±QŠ°õ!½ãظyj£ØôjrŒ–ã&Ñqò1ž×Eí¥”è¹Ì9WK ¨ÍXÓÇN äQ“Š2ð;¼ñ¿)%ÆØlb†8 at 4Þ:9 È
-¬ð„ßó”‰á 0âÜÉ™ƒ¢”]R˜m£§0 ê£
-k©Í¿óa@¥Q*go´ºYI²(1 Ð*"AÅ÷1…ŠHPùÁi!û–DåïæÜËÿ]øèÀTË ïS¢èÇ~Þ„7ß°/8P°|¿ TÕP צ¬”à©Ùäü}çà8 h¡Õˆ»¹ pTŽ?ßH”Á‘ 8Ï /T4jÑEÈ…‘:‚;À\Ô“Þ!Á¡þUw r;Á¶. åK&mgÐ À÷Wu<Ò•€SŸdÊ⨜ „WN{Ÿ…o2]žŽco •¶†ÐZæÎÌ$̨
-3£{) ÖMñÀŠj˜ ""D: ³¹¼•·CLÖ1•ëç}Áƒš.ƒœæ]VäpæÊ®‘¹J¯ªŸ¹ÚLDÈ[û>‰úßwk˜Y/H”pMŒË»øíq_I!Ú±ëD{ýRv¾=6±¸~l1tŒD¥),LoÖ“æ¿ =y’>קY*ã>sG£ÔS ÒmF<'±®Rý<†]úK‘rêYªÑ$–CÇ™ˆhb¼ðÍ?L€†{éRðÑHÕæ¨c©¼åµWVóÙq·£}%œ8¥OûY+jÒ(!rÞþìDrêUnQ¶9AÛ³ÜWõE›µ
-ãÛ[0‰w 7›üºè}±ÉÙgE^ö9/öAùÿ< zšÌ“÷ι‚&3=ç ^êû¹ïu—1QÒ„61<îˆRç§C ¯Ó/E‡«UZV¥Y’ææ«I˜ €Õ5…}R)¶j.vvxÏáåuÍ*RIzS“øÓ3ÜÀYx‡²èr)ý!zBÏQÃGpR ú¼Ð¬¾n;Ò“PÜ ûU 怇ÅKݺIØ~D‡Ê^ÿÜßê|>'ºCÏU˜!’3óüž¦Á½
-(8²ÿR½ŽüÔzÝ˯ƒ¸"ð{9H{ÀF^»Çèr(áïÊp §„ÚË¹ï ¤&«°VéÁFù쀔® á*Œ0‰´OAꇀCóû*ú9°PF€–iuÎ \«#[ÙÓIm‡mÕ2lÂËíO¿˜a§ã¯½ÑiRÌ-j·t(´ód5iî¬ÆoÁÜÝ#hšUê‘¢¼1hdê´ê>¦ I š’•¡|¦K0i`q)£KEO3-·€–T+‹d£
-f b$þªã¡Ž#3ÁÀh–0#@2UšÍ \#(Óï(éR´ïcʬ¤5 y§:”×¹¥Ä J+R™›ê™›Q
-cV0 6 3ˆ’£&ÒâC¨§Ñ Å*®¤Ê¶Ré9UÀfk¹´5þ¹2ü¦s<•^é]Á é¢'±ç‘ˆ*Ä´k2R0Å‚Oc\œ’ù¿ t¨
-O ÌÝ€uj [¹H¡øEu¡ø˜qê?å}Z’ö;È„’ºTE Š?C–°Î Š&ÏÜ-¥ÍŽ>“> äÉÔ
-É4ZªíýaåZÖgSXüùúR¹ÿ˜“eÂìlqV¡•a¾Èq J·Z&y6#›9#Iåf QcFÅqä#¹Ç×ðGòƘ÷UrÜn´Š6£}òcÔJEÚF‹B°n‘êۺȬrÁ µt¥‚MX^!L«1ÛÅ '!ySy½êoá‹3C8p>g”,j5•ph\j•à>[œú©$E”©ñØ NÎ|TÅòr\«¢•HÊ=làÊ—{8åâpúœ k±v¨U”zZ”Ñõ BܨVz¼\¦2ÝìÓŠeOÊLw†ÞxP
-×Þ/kšáÞDpwùüŒü3y©;M©éër'²‚ß´–¾B²õ@^©®ôƦ}_ëš¾ºÍ0øÝd:-!¹ãxÔ“8½ {Q<Ì$ ©_ãàiÃd7u ÂÔKóQB5³Þ~¦ñ¯nµ„«.Pz2j#Pq³ ªZü…–£#]k÷£ˆaZ ŒT†»‡C†g]æ?¹td‰;/Úz*ˆj)Ö~Jwv4ëþPÀ…ò?ƒ¬øî¦,Iº¶†<wlwlCë ¿£„ ´ø ç_
-/k)ô%¼Lüþ”a^7óûSƒ?¬~
-CIÊËý U,ŠŽõÐþçª@¯i*¨£ÀŽFÎÀ=Цîà<¸ÅXÍèt œ¤R¸‡¸ÿKë÷¸öÿEb
-ðendstream
+xœíœIsÜ6Ç«rìOÑGö¡ìË)•d\g™‰leR5SsPlÅVE’ [ ¿} | À¥[¶BÛŒA«A4— þoÁÿØR¶Ôÿ‹ÿr½ùò‘bûìõ¦þû–m¿o[¿oþØ°øÆþÛoÎànüŸˆ£ŽmÏ~Û°x€bŒ8î¶F b¤Üž]oþS}»ƒ_ãJp]½Øí)¡Jƪ›º- ŠU·Ù7¡}ûz×öúïÙw›g›Ó ToßnŒ0„R»5Ê)"øöz£à?âtû—«ÍãC/1E˜R[Ã-Ž‡KጨP’UÄ%ŸÒïv{íŒ ´ú·ÿ»àJsÑ\wè“|¸ö ¸¢nÂ¥¿T#aº¹¡Ó³ÝžC¸¿ /|ÛÂ-ÕylrY}‡JJá²ãðñ¾ÆßbÒˆê÷îN&?{ŽxµÛÃ
+ Žjè¿WLÁêË’ÎÁ£•kó¨¦GWÂä FegO)øž
+SÃV OÑÓðGí›ÃöLWÂ…£Çˆ”Dþžˆ’SS]à.Wˆ»ä‹Ûq"=zö (äŽaìB å§Ñ¬¤œ(k¨ë 6½ˆr,¢{)%tàÛ=—D*ÁÂÈZ£ª_vxa–@¢V¾òmI™a Åå
+ê%QQ^½½¼9rÎZ]=_Hÿ_;E‰á)ÓO³SH0Û?‡zt-㤩×yáP*ù¢¾±ÚÁõµ3 ßBV¸…4½…
+4׉Þ|Oo!ëßPÁˆuºz '+œ“FW»æ£nÞ? “Õrƒ;<ÇÃã/ñ%'÷ñ 4äõno…#tµ ái at Uyž—›¥ÙßGw/¬"š BjÆm´L?äþQD+¡ñ)þ0í-il› w¶éyájÛT¢½þ¢†=4ëpé¼f N€À¯-äiÍ£lSFg3B SŠi:ù ±Ÿòwz… Ï‹ ü¥Ðú ’ÆIJA
+vŠ5ÌuNPka~Ûq0)T›tvx;~’ó•ûR×ÜÿÉ.áÛrp-9_Ècÿ(š -á$a”Oêi Sž‰h l¾ˆœ÷ ¢?@–çùš\íDíäÕCÆmÏͯÁÓz·c<a³iàÀ‡p…Ë@à£hvêæk¨(k¨; ΡØóÂÙýý¦!UU_wæ ë(ÀÈi 8Ø÷$sÕ©;÷\ Ü*ÅL&<C¿ý•ô°/„‘¿VDkçQßÕ)•yºÄ;»vÙÌÐÇð)â4CW' ›„ÈÉÃÇ Œ%LG ƒ°³¯c_â")€1ƒPP y8k)(7D›¼Ð ÇZAõ¨ÊGô´SÐo»( £t‘Bˆ3“úÉãŽ2íuš¹ç‰¦¿W ÚÓx°ÈsüñH,±‰[h'VåxÖºNþõÇ’†®×h«äŠ£üÑ Øf°ùú96݃?ÚENÉø ÉQ²!L—öp×ÓJC [ÊÓþˆ›AN-Ȉ(åEU&œ±ï|‡â"”è \z»h”L¥<&8Ü&òz‰AWH³^RJóÂÕ¯H
+ZßôÒÊþhæÀý ¼N«”3‰—›œ5J|þÓ¿&=å0ü(á ®âUIÌRȺ³:`ß狨.gFqB‡â¦áÜSÂ2< ˆ‘à¢1 ÌÄæ¶fß
+¯j4â*e…
+1¶ãí´úPŒZˈ«C<!¤²$¤‹Mßù ¨Zó ks¶ßy\ Ôäq»#¬Å´,™™…qûYMHXºMÖ2/¯Ñ/[¯12[FÑ}ƨ ·Àeë@¤ £q^ö~6ÇK³t½Øæ"Ìà4H¥ù2±Ñ¨;^„JNf“Ñ–¶VKä–žKsˆ¥?Ê°™+ i]O6Ÿë¡ òcß
+ÑüŠYHøÄKô/zúÛ}x10¥LH°™+Ai-„üËx¶Ÿ_³+%“¥d‹ÍaóY ŠíOMlk/é uÆ¥1ÿUàŒZÙ‚&Ò ×`ÖÊ‘Å6;G”5
+D_^ÈûΧo(¢ÇË¥=É,•rN!Ì ¡Ð˜ÒÁ‰šuÙqaÍFêD PH"TkØsêâ÷cáOÊÙ¬%ÌRj;³Ûøxˆ¹\ô¬/ ¤kè»ØæTñª7~Ýù…“B0pƒjé3¹p
+„¯‰—å6'è˪‹êbb;^]”é]^L<¸F3ºÆ(œª]Ú+Pwn.å9|~Ívø Íì|&3[ßñÉ#êÆSäEïy\œî^™±}EU·yÂ(¤¿QNú¦àH6uo!Ιhp¯\§… 2bœŠÔ•¸A£÷²”†Q¢ÄRxXnsvéÛ(Ÿié[Ùoœ¨*Š|ÞYGĆjÝ t¤þ?K¹7‹’™Ã€vð‘%Vé#j4µ"ÚÁÒ :MœO
+éTñDý¾*ŒþÑ¥¶/<HFUoCG+ÍáÈ@nu>€• Ú§*‡ù~ ¡ Óf”Ã,´‰®æé›±å Á)ÍÛì´ª7šFI}3$©Øò&™ ~U¦äŒ°i7u)è3iv×ä1åÕ|ÏÅŒk)ªC¾ç¡à Ta,ïT¤c´K¾”Çùé5;Òº4¤Mƒò,
+9¾-EnÈ<¹ž<Š6V›¦~‚óƒë'nc‰‰‘ˆ¥)É=yÔû¹²B U5œÛùfâò¹6”8ñ™®m—¤-äÀ ûð™ß~ïâ>|nn™ù½Ÿ}øhÿùyª{Ø— ò8›½øJ¼½øøæõkŸ§öâ7³vÂ4DŸæ²Î1cGö×ßÆ CEâ»´ÉZ÷Y%ú÷
+’‰€¿ñªnfu~í¬ý
+Œ…0ÄÈu±õ>ýš£6äñ»oÆMýš ³q ž¤£ ÕRѪ°¼(Õ[aÅð›^:³Â“$ERý2M¹u_ô˜/´Ò0—Ò}Ú£ý’ÖPò-ªÓÚé2ÒB ½n.ÁÖ§§±ÉjlŒÕ¡z¿÷¿³Äsà> ÖþÄ8€B3d!Oü#nv°Îß…aÍ“Áq°1X‡–Ñî"¬ï»ò´°ñ +Oáìˆ6kõ¤†ÒÔƒvB å.ä™ãº4µ¿3`Œêµ4umNêîPi*f±Pþ_*M cq-M]›£ ¦e2˜¾¼0ºXš:FßZšº6ÇÌn¡45§.)MCÝPiêOeû$Îç}Ä‚Y–<½dseëÚ1 …&J®ËšómïÌm!c •¨þ½‹uÒt&ÒÁž‹çCùPì} #lÎG0´ü>±ú} hNX^×c¯~{ó wË== ½Ç½ùËïq7‚?h½R²ð ÷Ó¸ºjˆŽ•Ú
+Ãé´Y÷zëŸ;¤1ÆÅ€Ýåï#ëe!ý˜¦}óJ½ ]ey\—Ëß—Ónx«Muòý ÷/ÕEøNõS4žJ[B‡C»Û‡xºù«ð$Iendstream
endobj
-274 0 obj
-2315
+332 0 obj
+2570
endobj
-315 0 obj
-<</Length 316 0 R/Filter /FlateDecode>>
+374 0 obj
+<</Length 375 0 R/Filter /FlateDecode>>
stream
-xœíœ[sܶ€;}Ü_ÁGòa!â<u*ÉNÔ:mä*Mg:}Pd9õø&Kršüûžspáu¹ÔŠŠeÇã/ Î
-üTÔŒ5þ‹/Þ¯^Jn‹ oVt¼àÅ_óÖÛÕ§;u,_ žÁ%Üq8Ä|íyqözÅãšsæEadÖgïWÿ.ªµbuÍ•)?â¦÷š‹òCµÖåm%`×9S^n<sSéÿœýeõìluºúT(Ç=ô°µd¦°Ò0cá¯ö†9‡Í9<Y œ|SÜ^¾\ |_ðÕÁ×øsøíü99.þ°zvRœN4LŒ5ÌÂÓ¬·…ŽÉØ2Ž5ñ‡Uk^æuù 4ê ÇÞT2´åÇj-´…“¼üϾƒŸã‰V1¼[ªŒgžyö
- aðŒÉ/ÏÞýZiɤ)Ö\1‡u¤+Û•“ajiàµZnÊ?cEà±Â8¨˜-OR-naãþÄWøCU½¨Â©7•§Òµ& ‡cÂÕ©õšÊåÆ[ϼR©ñ¢i<bádS^³šqªª®¡®Úô6•GÀìæUvª€ënb/I%˜}êÇMEÛ›á þ ÆËrYkè€1–Ö0ò™‘ Wó t†¸pô”çßØw¯:{‰y%Ëóˆ !f”GÞ°óyêw¢( ¡òˆ þO7Œ¤$š¤ÆbHÜ6¨ È1ÁÓ#Àe¼_ "©@êðqˆ¾.±B³x=^¾©ÖmÎ["°E2(¡f
- dµQßc• ËaÖ²Z¨ ÅÔ$*ñÎk®')‘=JŽ±ãÏ“*:O** 4“¬tåOQÑè¹ÄŸë$D £ã5ÿR=÷Ä‘‘K cÇ™©T43ƒi‚\v¹é’Ž±R°>#{\Â¥U€Èqši%¶’3—x»Y¸è .Ï‹Ÿ£UeÇš;Ô=¼¥ŸÞ¡Á!Æ9QHÖ€õÊÕžœÈ!F`ÔšŽBZÂŒq=râCfxL2Ü EÎf’¼¼ŒÔ{°x‚>ºª¢Q›4[8|¹1¸½ÄylÜø 7^‚S§&%N²z“§=îÝ„ ü·
-Æ ù5ºü
-dBì XÌÎ=Öf©³W]wîñ¤™à…îèhMƒd# ]TƒmºÑ8=!”eÏ÷ÀD &Ê@¤FD„òˆ†s:¥èÛŸªµ*¹Ü9däl6šìiÇÇÅÓ)éÂ"gèq¿Àý—aˆ†œmß:ÖQÜæU ³&4$/_§cÙåú5ž°$´b|æUÐ{—èI&Ú¯ì©CÒè%·œ^'á!³ é;Ü]YQ fÿû‡*¹Õhƒm\‹;{Ó{Ѳ¼h!¬<Hu³U_u á}c†n1‹™¾³ÓhÜ»6zÝ «àdÍóDA3h…¤‰8«3OØX-·rÌÝ”Í2A½QfrPo³ã”¡é»ÜÇ!B“¢wÿ«ÂTÐSZJꤥøyUÈŽyîst§¾@
-Z%˜0 Í$< Ôùš3íïdYŒŽøèmVmߣ&éj qràÎ$ÄÈÛ Øã £·t¾Sœ‰{ ¢G at GßçA d×¹¥pˆ—g¦ kÇ$Y"hN~`g?„>äe ±µc…e2~ãWU2|À¥’Ê2®ñ#Ť¶¿ 'äŠÛIP’ »cŒ¥Á)M1“-ƒ9t—æªÁY>«87!§EŒÃÍÂëßÆy(/ŸŒ¹òH³ˆ%]
-³„ŸÃÒ0Öò2Sò >'©sÝŽî†á±V¶ÔFc8 À C>v ÈÔÝníìÀN¼ó,vú—;
-¤^•Ãv{d–Aæ¾óׄÌ01Otó¸cZÉ W¦ºîR–6!mðë–J"¯:Â2LžÒ!LC¤\åŸä‚s´„¼Gȹ„®DŽ&r õ°²Ã4Â&¥çM/a+LŒ¥#1Á‹rv<4¸[/ÛŽnî#M÷ {ÃŒÙ`ð/§‡G([§GÈÒA¶XB CL¤‚ªµ×5(ÒÖ´úVf잯G%x7G2÷¨Ûf‡2]5 <¤{LñÕ÷³%IEF>E¸¯+¸K-À)$ÁvQ XB•oÑ€9×lmcu»¦{Ö¾k!(.™]n¦eŒ´ðˆ)ÎR¨¼ÃYŽkkÆ(
-gî…Ùo
-°ñA‚ÕÌð
-lan7Y
-'È(/
-·äs¬G…©÷Œí Œuƒl#ž
-ª6m{ž
-J …8Óóh"h1^¿)§ûyëŠ&dz±ûÑ5QÔ 9ÇÑýÐOlPãÈh.©†S-ÃiM©õhËþŽÐW9ÍïežˆxžÃ…ùar)Èý÷ÍäÅ ±'<Õ~AÃ.Š¿^0ùo±VòŸîÁ”\—eT WÒ# >”{Ѭµ{™GÃM/ÿ˜BÊJn‚gš S×ÉÝKáeˆ’ ¥¶Æ‹jþ!^$M-ÂÃ{R˜ðú ü®›"Jòëœ`çŠS —^4“œ”é ºKOiw\ÖÎ^ªS…Q„е8•8ÅêSU›àÖmZ‹€kœî¡™Hi"ñRšz½ù˜8%w 媴pÐb: ¾!W‹„aç‡ /0<W&ÄS„¿‰ ¹‡Ž ùj`æáÇ!Çk à×Þ…* õàÏ •oZæDˆš¾K;·‘üÔóC¬ý¸M4õQ…Ñ}Gl°¦æ¶WP'¡>ºŽµYÁÚǪ<€kâ Ų†bqPÿŒÃ"ŒáV¸ ãýoºƒ»3r—åo¿1ÊSÆ‹ @¼åýÙìX·®Ú%IÜ›¤ìþÑ Êx <+Q; ò¬p6RY’«s‚Ö±ÚOØ¢O¥¾lÔžYµkâð*4Å’¼7KÍ”4?I^NN²²å¿¨øl’Œ÷
-ÓßH}¦ÀÆÜŬ|b-¦@R=špyšéÛøÁ‡×íOˆä,ËècÓÁÏ—dlEãMbÐÊÞ‡“ß S£æÜö©í%˜`ÆÌ9"J²ãdÁ#q͉”PÉzËX™"~Ú
-µDÏ@Ûv³ÂCýOæ WF” —E(R™Fý¼ŠnÊF+Ë_¢qÂó*Ÿ¿ ÷„¢±Íg.RF¡…ŠÄÅž_ اFÿ6O~ÃÊ«éïzò[>N凿Ë|œjô«[éãT$×1l€_§Êã¥ãDÃ@ÊéK®‰Iå„¥ Šrðl\ ”å~þÒ:6Òçq÷SëC]§«ÿ¹Pendstream
+xœíœ[wܶÇß÷Sì#÷aQÜ/‰ê¸MOâDM zúà‹¬È–VŽ´¶›~úr9 .w%Ë”Íø!Ð’o?Ìüg0à KJØ’úÍÿ_]-þò‹0zy~»¨_²åßww‹?¬ùƒ6û/¿?…C¸ñ?G [ž¾Y°æ ÅqÜ-ÄH¹<½Zü»z²‚³q%¸®®WkJ¨†±jS·¥ãB±j{–m íííj·×Nÿ¶øátñ|!ÕËO # ¡Ô.rŠ¾¼Z(ø8½ûårñëÀ-ð¾[0påu§Üáx¸ ®ˆ
+%YEVk1ªú×JS"™åáÆWš‹êÆ·%e†‰ê ¾É‹
+Úë|µæÆEyõébë7pç¬ÕÕïaƒ„þ:yþ°ÚVOëÇ(95Õ |9øØètþiIíà:ÜØék¸
+… ,MvÍÞéZ*O@,×LÂÂ…>âGÁÒ#±NÓ‹uŽëï§Û%½rn,¼BQ]ø·l¤3LW·ážáÊF> øK3KÕþ¤sp¬œ›“jÖ4z , CãºÝw>¾ ¾ÔƒCQ
+Ãï×fÄ9Þ˜¤¥KD^ PX¦ê ÜM‚¢zÝ-ª}Í©¼‡o¯Y“Ç ÁZòŠG1A ;Œ¦p’Pç4¥Øff%ñf¶úéãŠKb9·3¼ x×dœ©>®ÿ@¨ž˜7íÕ§ 5Ö®qo#
+°çÃ[ëÂp°à¾4½Ã¢à4«û÷¡G&hÚ͆k´.V8b•²~dXþSˆ‰¼ûGÑ €2xµ:
+Åö°ñV2³™
+Š áœ4:Fñ2bmx…ÀÜb2#[yÞ¸x)Ã0²¾íp ~8øCáY¤{ÀåS6ÝËea“µy¿YóH9QÖõÌ>4Y†fÓÃx4EÍ ñï×øµG2ð5þcHC8ë“ )?Æ'µÖ²úÓÛ^Ë… „,¢ y©_G³3•j©äý¦R À£,ðøÏN<Þ¼s¯
+½‚¡³Î8>{<jŸô¬7l±@}óg@Ùãvºb€$w2 ØM_‚Yö™}ó—!R9FGª‘¿uÎ;a¼FdµJÜ!»S!«Ÿ»þnPvãÉÁ³\J·“š:šÄS` }€gfï F 0z\¨“!Úv6Þhf™²ÑÏ “×á° 9m|ô:/&s‹³f1´×%Kìý;µpÝf"¯þ±5™:3¡Üm‡ùÌdež%úkÈËj#ùŽH+îL¤þPRrÎM¶y×,Q†fœ%ƒf)Kô¹âŸ.•=cA**w¡XƒC!#…Ô'òz¿Žæx±™â˜MwþãËO. h1º3_f¢+œ@܃Nõ6ÂëUiþëâÑ»AíÛÎwï™sG΋™á±Ü8ûËøZi‹ßaý v{@b‹¡ 6‘÷™<öª´ßfLPkw£I”¾×sõÙ‰”öus qL³]šv;‰0ÚFÉŠ
+`—68í Ëð !Õ®6`çæ”Q€9RÞ³‚šl³¶¶0¬™–{\V†bðtÃvvÜ<¢ì}’€Kì^$Ÿvy¶’|Ba]õsgqv8qo³$I0ázpÞ¯× ;É5ó\Ç¡¦¶ÎlðÑZ_ÎuÔƒ $µ†¢ óÞåḀ¹
+|qð™÷íèÃ^Ñá›ø¢ÖŒRMfƒûPbŸCÕ!Š` °=Ñ 7„j¢Í›hÀöG'¿tÌ~×5‘•mG^=Û Ü
+–êg‰õL£ŠÚh ÝZ¡_w»éŽî÷øAˆ#Å}ü Jâ~”˜Ù«Š”¨žŸ<Û=AYJÞoo`í©k,¿«¯Â
+e°4‡þ´µÄç>§÷WÝìa¨{sb·<¦ ®›ÍCÄ•$÷ý§†¼„qÙß
+ël„ƒºzÚ±gÒá/Ã5Hõ¹.óá=‡ÏŒ›=¹ulóéɦ‡!.Gˆš›’Íï›uª rAX°ǚ&v C4"s®òq‰šžùôÐoœ»ˆÍj:`[Yï*ALcÂX„ß4"|¸,½-ïÀSžQ7‘eN
+ï |Õ1ÎZûËÂêC»ãâÄ|º²élȤf5
+¡OûUàyɵG0Ò°6$7LõC§Š#Ê\lPæ⼯£Š—º^üÔ»4Dè¹´.Fõa²Çp“e#Ú‡‘£/¥ìZ(Dì¬#B.Q(õ²(~ÁR[žõ/טʜ›ýö—ƒ“u}±¼Ík½ëxöJµðOJ =ÏY$Æ*šÌÓÆχI9…€Ž„ïK¿˜HíøD úÜLácÐÇÕgŒ_©Þ½´c;$uHµë'•È kvèœeàéçgbÍ$q$$Ê´üå3dÍöñ&¯TÓŽ˜ÃÓ]¸dòeÑÞ]–BëHœ¶¦P Á—šBɱôÛ, ˜B³+0ê›Åö¯0[›Î
+±Xªf/-_ÿ"KפÕ9¡¡ãÖ”±š³¢9,úrìz׉ÇØe5éMH’Üee‡çkÒrð.›‘ÁÊZ1^ ½¹ xZÍ.;)ïšì±¡ß!}˜U_¶•Uã¦c AÁï9_ו½
+ ý/hDÁçõb“kŽžÝ1Ç|åx½öbX:î)imÜõ¸ÜvTÛR\T~Û.iÔå4e¾æ2püŸû¬Ëe6k.“
+R& ýCƇ0ÂëüÏ溈i(²£“çƒÄ¶'¶”ß9hvûûR‰\†±¶-Ϩ§¿1šéz
+·èæ,Ï—kvõ„ÖyI߈ÐzO_žM _à—,T<fGôY>ˆ”xÔ?že‰,臒=Lò6ùÍ"û{ÖtjZhFÔdpy iÑÌ £6±±ìùÚW›é7Šb|³ê¾‡)Þˆv8ÛõhY˨j¶ w£™Á°,ͯÉ-/KÓV:WK ª7kœîŒi_ùe_ j³*Í ”øÌêPåÉ8K€|MG×À¥‹ÑâeèÑÑïÃþÍjàþ\ü/"Е>Æ<Ǹq?'+äàÉê:碕——©™ \R⊟±êyÆcJ\ãg\*qý<¶¡ç³(µ£º¿òööó &~ÊÈx$.NQ7<kû#ü—÷[„ÐgIRÊ×í‰c‡C]ª¢}X¨÷™¿,n$¤B"?8¦ñþ¿ºfçùz¯m¿CF¸T]Ûeø’ä
+(ö~ €³òר†õËÑÚ«â4L‚¨šØùS|JëQ¥µ˜Ö´¸¡þèvûµm˽µdèkÛí/Ã_Ûîý`xûµmm‰`’…¯m·Ë_ ÑM¨ ™H µˆ¶ôM¶\Žy©¥ÇÕ7>Ûd£ lèÏfÆáHZï]H~òýŽ÷O3›íNõ)w6ôí€Ý{{¾ø?-.endstream
endobj
-316 0 obj
-2438
+375 0 obj
+2560
endobj
-358 0 obj
-<</Length 359 0 R/Filter /FlateDecode>>
+417 0 obj
+<</Length 418 0 R/Filter /FlateDecode>>
stream
-xœíšYsÜDÇ) õ)ô¸ó ñÜÇ#>b ¡ˆŠŠÊv $v|øöt÷ÌH»Ú]¯Öq‘5Q¹¬•49¤ŸþÝÓš›ZpY üË¿§—ÕÖ‘v¢¾¸«è|-ëïÛ½wÕM%óÈöõö \"ƒ„S<Š(ë“·•ÌX)yTµwšûPŸ\V¿LvXc¸Ò¸ÉÜÑJ5¹bÜ3‡!¸ÉùÒ’;f=ù®Ú;©«›Ú¹¢ÆÍ]íµãÎ€ÃÙ>¨¶~¨ïo ΫŸkYm}‹›í7;ðs°[Uí Ô‡ L-˜‡Ö|ôµWë<²=èô„Cw纺‹ÇçØýkÜÐ ælöð70NÝÁGh\äÚ:9ƒª#–Øö¦`ùÜ=oŒÕ\»º‘†ì]™;¥'«ÀÞIÍ£—“7Xp °àO¦ÈÊ°&hAvn¹õËwMÄgVٺζv ƒÏVÙs5 z»É6.7XǶ3 t€
-'}gHµR Ë£YZSª#°‚=°T¬}ÖèTú#î C‰&ýJRFª6–ªÅÄšòÜY7ÅÚ2ª\ª|áªôœ\Y:/bÒ+pàôä‚9p&^’2Ðc¬âÑ{
-›á*5’µQd8p$b\)RôªOV®¹‘¶•*†(rrÀ’€gFªõØzf_Öò…¶X«E §×Œ"=E”‘X¡ÌÅ@¶#\_ \q-¸ [hí2
- .Ø8ù툰-0¦Ø«²#8¯e‰ÂF¢6‘¨¾ƒ„©Ôa1\ƒ‰Ju,™úED a)Átœ7^øQ¡^4O}´ Úƒœ´O Ñ%b`׉ÜCª VR ¿áæ=¸¿&Y X3Tx], p碸Í+–$ተò%2„Q{Ç3ëx®uÐ\ÉPi>F=|h&wŸ‚wú©©Ê3ªÔKP©ÎëÙ•^oa26—¹mŒ¶Üz[7Êpí„J
-¼b9 4p/!ÛãËiÙ÷ðV®² )Lò”ðp6ÎÊF“2¸š»Ö÷;ª¦:ÚËãÏÕÔ«ñŠIƒS„8™Îãz¥(ËL x(
-yÊài¾ƒî¹H#!ɽÊ
-¬ TcS^oQIytÆÑ öÞ`Á¥ß‹ÿô½ =
-½‹=òs(oÁ)-ÍzïYÆJJ·0†ßlRŠ„PúšeŸLØE IºóÑåqfÉ ¢| ׸Kçgé›Hb4”ZmLµRsdsn@ÑLæ#ó ¸Â¯-V!¾0P®„ürØ"tàŽ)ÖAç™ÙÒ-[FsúÓÂV˜fkJÈB˜sôÑëÑc~eúôÊÒlCsÓÍ6–ÒSì+SžV¢2=k&C Šê4‚³Ià”œø¡)9[);å’¹ˆ©ÇŒî1óÔoJÕ'ßõ‘§Ot4\8ùäiBç²rEƒDÇ°¢3ŸÃpJp1ÝëÑWm 6køª¥“63ë«Â0ll›ë©˜5IE¶%ÀÖ‡©{5F=KRù’mg<Ö êHÊW"©|*$QÖìo–S«—(Gmêô¼KRü„fèÞðœ‡ÉÊDÛ[<Fo{s< ”‚ž›éå
-«ÑŽKgGVfÝ’÷ üV²Rª 4¿ò=VºÜq‚SkdenâîÕ¢ÔMßT#¦t¦ÍîOW˜9ºÈÜi‹Q”Êk9÷»Ý¶^pŸÁJ.ùßC`À˜lX½Úå™gæ–-ˆbHŠHÙPÓÊ4XµIKX×H„ÒzR´˜þd£ÛO6vuF´t¶Éf³]ÛIYKÝ8ËP™Ô³™²[f÷¥Gxæ|P?Ü£ý8(ƒÊ«xa® RµÏV+–/%á÷y–//\—]–/SêSá¸~¹ÍÔõ“t¢HJ(Bàg\
-å KRn& Ý.u¦{ÍÂë^nÎ_ŒlÚûqXý ÐÓýendstream
+xœíK“Û¸€«ö¨_¡#uB¼ÓVœõº&ÙdãõlåÊaÖ3vRëy8–ãl~}!v“„HJ› És0H H|ht7àûeÉø² õÿ¯o¿ûIq¿|ûaQ_ò埶©_ï¼>(ëüËg—p‰°áó¥çËË7 ^_ 9g^ø¥5’Y¥–—·‹¿XÁÝ„–Â÷«uÉJ--çÅ]•V^HÍ‹ÍMç—˜Þ|Xmsýãò‹ç—‹— ÉJ³ü´°Ò²²tK«½fR,oþ1o¶gÞ-^íxÑ÷j^* “^ÄGà±F¥ÔŠe}à¹Ô[yé™ñ¾øs8/4Pí+üp«µ°–)«ëw¡Diã»B!‹Û*¡@ r‡óÆ*Aò|Àu¸Áÿª,á¡Ã+RÆ3«5<Íå5ÔÝ¢·éQµBÖNC®•–ðØr¹æ
+NJ ËØñü ?)¼
+«™SZ?7OŠš°øWH[å-7©c©oÃKr¬:½ÈÒè¾ y”í¼ÈTLõ&…ò€[|“é‡{\®Qý*¹²2¼IëãÒ„GQÞÍêœ<4YQY
+&@ÐÔTN,‹ËÚÛí„y-¡“qa‡ÙM´òž£:c¸§âÌA‡ü=À"½WÖ×8 9ÃõUJª Ä#€µ¨Ðß7÷‰vQlþ‰kz“~P]ÙZg‰Ý@ çj’~Û
+× ÞÿL šC2A¬3 B´. ªäDBÅcJDi
+ q Õ€flñ|•†žâ]uSúÒÜ·ˆõü<w(ŒóU™^Û/L>ŒÁLº¯œü ›tšî¦HÜÄ°C ó6éÜ=ŬÌ@üc/o[
+'jPªø~%Bû´25aó‘¶(ðà½s”JàMkË 5;éd%[Aáž'\w"˜òî‰ Ê ˆ”Ê lúHÛ-TÃ@nŠ 1Ž"“>’ÂVko¨în&rzɉ vŒÈue{)½\ ÅÀ”â=`¦ƒ¶ùH &<nß!#°ÆJ•mýw i–mš\‹Kí±ñƒÊc؉ôAsv"Ò]îÒèîŠ Ò™6Uo”%EƒŽãDÃùˆ^¯Ðõ¸› g{K]k 6)u[TÊE×xÎ ®FB9]µJ>„EÀ[|e¶Hh-çAœè •¡ìž&ãx
+§MûZÈ=cîi†ä÷¸gVíO(Zí>AgkäÆU‹gRTTì·ý©GûÝ
+3‹Ó]L·,Çþc°u{`'ðÜ°’‹™ø¨„Ç ˜>ëx· Öç.¬sÖgÖ]Gˆ½já; rQòãŠU# wŸ•¬£Ãìã% „y «ua{Šàœ‘ù]£d 7Wg)VØ
+¸_AU¬ÿ“ñg_·\½6( h´feTþfÐt'’ܺï\F¡èÃRõúïÜNó.,GžD=mY¡•4”‚¨þH Ö䀈mÄ¡ÕDëY ž4˜:æó†´ÿb¥±ã ÍŠ¾!«YFÿ.ßMïıÜ:ËÅÞ™ëz÷°>Y5LˆÕÐ/e‹k<qñ€èÄ(uÞ´ð4ÒC½øLZó)'÷’¢¦ëW¶ÌX?Þ«%2^¢ :Ó I/Eº+Á{ºZÚƒgÚ+.[ºn7¬âº-\+ƒG5¾¼žjíL¨ùÒÔfÍQ]ZÛŽ Öœ³sþ®Ïð ònåt؇0agŒÕÅo¨'€ÎÀ5 ÞNA„4雚Gë‹ p}pôÄ/]¬} L³<T{&HÍ,Ùø´†õ…#Á\ßmO˜s>¿ä
+2Ò©åtÍOb`“ë>ðpÓO‘ÅRȃYmJŸýsÒxÝÁŽ,
+hΑõª!îõª#
+cöwH°nõ_<k.½j± ²°Œ4
+î`NsÿUÜ3îGL $µWF Wí}Œ»Wñ´p
+jd¥?‹ÎG$Tñ’ÙRï~æ¬eG Vág*ÂÊÅ°@¥°æÔ׿t½çÖQ½“šN5–¥$L§ØEÑkZÔ¶’ѵý6Äö¨sDíL’
+h©R1h¯Dj‡¸ôûè!\ö è]â~ÀçIT anR@€€óÁ(0áY¯{îCÒ®šIü7Tem2ÝÆòe 8Hýß !ß
+ÿ5:ÄYÂŽ•<¼:$*GIÂtÙž\æTK:àn“ϪˆÓó—Ö¸õϵ¾†r.ïúœ $±
+~L bú21¸ã=ù¾ÜLèEÓ½×µYÙá2¬“ɆRmcpý^2ÑÐjù\ZçI'ûÆãíÂ….yõï{ʽÜ\çwØçE»ÆÀOÍÉ;*Û:>ôžIÏ¡±›Æй=‡î¸^lâÐÝ
+V©|´FõÄ¶Ä ;@ÈCwcÆ>ÉU’uF[×;e*lO\ssžÈÖ~8>™Ô>?M¼ ëh:)™>Íàèö =bU"&Tt*^•8P;,O‰Zø
+š¯¼›„¡pôüÍŠ‡åÖ&ŸºSö@ª"²¶ØàɪZ$:øÖ jfËó ^˜V›Isžã¨ Lv¼×Rl¿Ìd=–ÎøXíÅçiHIŠè|¹â ¿ð*1îZ!Z!«aR Ž¯•fZã*Íb
+{„Èü½Xï„÷I%!/¢)ë9§çOJßã«?æd4^•E0í®øî[žR-ùÖЇÝ9~ï‹«CaS;éœ |JéÌ9H C. ( k çÒzO9¹™xÓÉ}šùÈ3›!@Ïp¨ãŽ =¬ŸIÜ™Ýkоµ|Po*ŸiÐ*™zHA õãCºŠ´Ìš§n 51}Gˆx¯ tã ê:ŒV†Íç(mÞúuˆ7•Vëèî^gd_ºØ°Â2FÄVÉζ5†0
+¼íφÁ“P‰»UuuF‹vû‰GShØ‘@ó÷îD ÞC@›pù ÙkÇ'ÝKfåHKKëˆiÜÚ©Qý°_8+…:gç¡i\"M7ØD ‰ÚñС ;Ï"ý(ðe½Àuv¬×lÈ/-µÅÁàÎ3Áã+NöGLFtrÔEtò.¿Ž–ÉÁsûx¦_ÜàÅÔ>“JÁ¾É}Ÿ+ó.wƒÿuƒxë%
+ÁÅ…hÇ×Xã¡WÍ…GQ6Ž²3Æ ß²WOØ%ƒò‹ªÉ¹Ú>äVo©‹ÕÞÖŒEs–WqPŠÎþ‰™%É+§HÞ6™©ˆ=%ïçÝõ.o ¢Íµ.@[.<ÌLZêô’1êK2Í
+¸éRµ¬¯ÛÈ\ ÎgòP_ at i˜àg€®Œ\á2(FÛÔN^‘E©ÍÅã\`çNã¦5ö×{ «1»¸¯6’ˆC-*ŒÂ»Qû1‡€"éøy±Ö¡‡Cëz¡ûj¥¹£í Þ¿-3ÆîšRŠ°½ó:à 8»o
+WÞÚy´ï“K UÊúãJY7ìÉ"jø ®ðDÖªâ·ÕÚ€:-ù“Œa}rÉFKåƒZj‹Äê‹AéSANÕ’£O¥3»?Ôûµ£ô© ã€#Å㧂^¾¸x‡u³ýRN„Ø“#ÞÄ4f& ˆm¿]œmÆ©
+tåž
+_{f‘»ûÕ¡¼Xãmm7è´Å ¬.ãü¹M«µ
+Ze¹š ÑÜ6âËÅÿsó3õendstream
endobj
-359 0 obj
-1466
+418 0 obj
+2718
endobj
-387 0 obj
-<</Length 388 0 R/Filter /FlateDecode>>
+463 0 obj
+<</Length 464 0 R/Filter /FlateDecode>>
stream
-xœíœ[WÉÇsò¨O¡Ç™sVMß/ñ% ‰½k »›œl °ÁvÀ6˜½äÓ§ªú6Ó!0lÂñ±I=Ý=Ý¿©úwu>Î9sŽÿÒß×dz—ʇùÛ³}>ó¿–£ÿÌ>ÎDzÃSùù£=8Ex ±Àƒ˜ï½™‰t‚öŽq?wV1çç{dztÏú…éþÕËî¬7ݧ~!½dÁ›î=~þÞ;É8Ý s¹·ýB³ŒÝ9~vÚà Á{Û Öo ²îýeöto¶3ûÍŠÀ$õa¡˜;e™uð×˼ǫ|´=ÛÚ~>ÿtz~8Ûúq.f[Æ—G/ ßí'óßÍžnÏw.¸^9š)måðz ´æ‚›;é™*ÌáØ £ár 6(ýU,¨ | ÂÆ!(%i 3 ¢=ßØ”ÏÎéÐ*®`d`<„RVÀÐ`ýÞÙÜ’8>Ëe™Ö\Ρ5L€. @—Ž3ëB›À‚ëž÷ Õíç 9¾YÅ»_ Áü‘éðå}o— ú
-_JcátYË}êU÷/-àéHÀ<é_°~œy¢ðHt¿ïóGX6Ÿ© ½¥ Ãg ‡µ‚#hë0uSËØ3*þ)× ï`ò˜ t¡†C%Æ6‡:ÀpK·ºÀUÊ^TÀ7‡±lXY §RÁµI‡àÑ”]â¬õ¦Ë
-oÏÎCly‘›^—S¼”I¥ÉJ·®*Ó¢,Ñð>B/GdàKb#ƒæy¬ãu?˜<ü’Îpû3aÄÎ×WÊÚ²DR ëÌõUHZŠâ
-™]Œsd&5Œ€æ"¶¥p¾CpªI@ &¿ù¼D^¢)À›[uOи䛒qÚÅω’ó Ë‚<
-,Ä“l¡ö3ŠïëIàT é ÈYiŽÀ‰0ÁÍ ¢Ï&'ŒÉÉ5ÉÑ
-9;c>¶…]œ^7òScÿósOþ#¹6ÂŽg$Täç]ã™*›àšFnÆ% \X±†M
-Ù°!×:Ôb j¹Ãô í¡ ØË-û£‹L623Å5
-a1
-,?ôEƒÔq”“o‰ópŠCɸ(U÷{”FA‰î7<âR$ NI«v/p’OóÙ•cPrì·£G„sùZ«ã9\ÍÿÍ)YÛÙ Œ „
-zêŒý<ŒÊ,¿í“‚ÆRø÷¿½©òùmV·¶ûžQ¨)P§Ãµg¿êA½SóçýPÚÂ<´ïB÷¸8ÈB.¥³0+çfu¶N ›IÞÎü
-ÁEh÷¶^ëb6éÚ® —š²Qé:Š|v
-W³I©:SH!÷åHäoñŒÃ^8ZuÁœO£çx%Ÿ«&ÚPØWžè{a’¦Ë°hE8Mã&¨Q
-5©½±góS2è|è„$J §À{4ñÎ~„~žNøÁØmi\¢vÓM Þ÷©K1§gV„«XÀRÍš,W7F*4H½,îã,9¸*!´.y9žKHßýš|X
-Þ — À ƈ„‘ÐÓ°ŒKë÷‚nrm&¯¹6#‚ÜÔÚL6‰äô# Àè8q ŒÖÉm•eógKn×ië †”¤Ð÷‘"ò\p_;½ÂŠÜŠ òkK š (G¢3EÓSGŠ(-Ûßô
-‹ èp'ëê:¾\ ¥~„¾b@ÖæÏkly·Æ›Îú±su nYÅ:¡ÙoÒþ†±9€"äÜJׄÏsW`èÒ!œ•<øÞý¢økƒ%,”GÖŽZh㱄¤5„„û‹`àœ)SDu¾ÕJÓp71íÝf ¸¢(d¢ÒU‰M ɦ± ùw¶y 7Œ2_¼(ò÷S×S *“ó-žñ=v†TÛn+î³
-"n™x›4ºÍŸz´B:Ëî{ìÖªAòwcL?±BK /ÿ‰!Õ0ô¸hé³áò ·¥¬% ®B®ÿA*sP9xˆ¬E˜¾[6U ©þ†õ K†+&ÕmAqWºènâG&ù©•ñ£±GÓ
-@³Žâˆ¢>»é…¶Nž§ø¾ø¬,§Wi‚œw— ?hëÍhkqMmm&|X®y‚!s5†–÷Y_ÅwÒ£N@—&Ž{á ý[Eij¡¿~Á6A’pg©¶ rD;ƒD÷D ™œóÌËa•ÉÄλ³EïBÕ˜õQƒ•eûŠ$«rö]?T˜íþ,Õþ®¶Vvφ¢´ê÷K¤Ð¹iÚÉ↋|á@Ñ?«§/é&ùr5Ü;Òß$Jä”fJ˜ëo½ßˆg³Sž-õx¬¬s{ÄQÞrHûñ¤”²8J3Ko‡ *íãC¡ò`‡îʵŽN&Ôú¨Á Õ¢XÇ„%Êìk$uXÊ9+!nü‹aÖظ
-AI1h”×Ú¿ô7Òx 弋s”u|±‡É˜œëùMÚbQš:ø:§¬•S_eãV’SÐê‡
-íS{P;9ØëËËù_é”Ææ€GÜ73Ì„bdr¬?§N Ä}fÍ/Àæ¶N»œOW0±
-7´ÚÂ>/“3ÌY—RÉ:)Î¥:5 ;¡àƒ
-ºcY}MQmûëÆþä<’G{IˆD,rî¬æÎj°"”^’‘¥wL<Úë…°K9Ž¥ºQ*®ÑÌ
-ª+k¾U1€”¹¶œƒ›ÊÄL\TÌÄuLø»ùk`ïºÖËõËòq̪6@Ôµáí’ô>ŒÜW ÜÑÚðˆ§it†Ð¤ ¹Ñ5HžÒðWêg¬¯I¶ ™÷^\¨{~®É9H·ÀÂÉ”‘_Uä"¥a.¨næß _²ñŽ©óãtì6Ø=2hIPÕŒ}ädÄLÞ7‘hìÌR$aá”a"n•=xů$ØD µÊœO›d?ñÞ€ÂÊ}mÖµÔŒûö Ž.7á5KiEÎÜ&lQ›8™Ú›à¨
-|Ó䧖܋*ù‘5ÿ9î¼E)µ¼ÞIÙ%kQŠ é¿€Éý©"”œeÖÞXú刪Fµç¦Çë?¢ª
-…¯RP»#ÚF*“æœY{zXÞ³Û„«»ì°
-†”
-6¤—r"‘O¨ÐyQ"ÔU¨ $9 3Rêþïq|°³¬
-WpZ5¬(¯—'w/(ª{¼ö÷x‰£6k)õb,»ÛHøvg”ù3x$r,Ò î\`J÷r P‡îïñ»iTË£³‹,“)Ü“âèfR¸'‰™Lá–ýDø{³âè2 zb¶Kš\û$ZÚ“.ê1cn§FyOÛ¹ÜÖ(&º7HU#nÛ Ž\ó{^
-ø»™ß;˜ü}‡ü{4\Æ <(b–§0SædŠ±*¤=7ÌŒïß ÿs>VP R((2 Zñ·
-ÒÐç ø_Ædgö?>RT2endstream
+xœí]Is ·®Êq~ÅÜÒsûâCª¬% cÅÚèŠRqÊåp³J)‰ddÿû<,=ýÐ
+ÌôCfLŽuð›n4€>¼ý5?O)aSêÿ¥ÿ ~œüéÔjzz9 קlúÝ‚ú0ù<aéMí§Oànü%â¨cÓƒ“ K(ƈãnj´ FÊéÁÇÉ¿š§3+Áus1›SB•0Œ5ç–Ž Åš«ãÁH_]Îþ}ð·ÉóƒÉë‰ TO¿NŒ0„R;5Ê)"øôãDÁÄéÅ•³ÉÛ%¯ÀK¯``æ¡Sn‰p<¾‹3¢BIÖðôÃ1¡2›3êˆv.½§äÔ4_|I)<Ð ãgÆ?®üºy ^Zp¥¹hNgsn4Ñš7ßv~B-äÍÙûC¼”õ!.ÐCx¸Kô„_c »§ƒå88ê^>lÃ#Ñî†l€Š¹”Æ0Ó9“pQ¸¬¿ÒbfÝÃÒE¬TªyÖB¶œ ‰~ïi#¬œâ~Îñ±•t†éüFXsK¨°ÍÕ/øÆqº!e³÷C7}˜ 7€ò0Qé _îÈ;'@d†ª c:°šÃ¾»Ñ`ž·cŒÆ.¯`·ÏÒi,°…–®Ä¨t%ŒÂyó÷0„¢ZõzÅÇ#c½ÿðósŽ[os„\Ì`IŒƒ÷ù:›+ϧ€‡l8~¤‡—p f„XÁ7Ä5ëẠ9âZŠ•¸\ÿI*pð
+̬Y‹'Ã?drQ
+°C¨SEr[vü!“ SN8³7DóJë>kNÃfͲá7 ¨®ñÓ„7§>x]N8'Žú[Û$ûq†FÀ£ vzpQ\hêèBÁfÒ??m(±Êm T~dàÎV.õí¹ó-P>0P öŒh°Læ\©+À^TL“¿Vôç³OBôì†sÄÜ¢r¡(oÞv¾FÆDÍ2¹@×A÷á0 á$6JÖ17ÜÌ|jæÆ(%ªvPûlaõÑF&®·wçÖi°+VJ· »O]í Tµ À“ª6 Î5 d ɹ§³¹SŒ88Áãáµ¹-;·#‘~&4aC¸„Å >s8u1Œ5³áIO„9åÁŒ1GHœ/3G”µJäòép÷-ç¦ù)л2ÉâÆXM3;ìny7öÂrìföBÑäͱ[³vÏ&p›Ÿz[®Ñ´w öAÑõèë”Õ
+‚4u<šÁª
+H+þ¼™«<0G¾Cè#Ý @{ŽÃ‚=*QŠG{Tód¢€ÂÆÆ
+Ç\Ú µ3 )ªÂ~N.™ž‡ÇÚ žrªù®+8t®í3øWp——Ýõ&m¶Æüf&-r$‘ŒCÀŠ+Έ°CS½èlú”ûõsýI€^¥”]ÄfÑRGÖ˽7Ñ5`µ…•ä ±Y–KC¿y
+~Ñ´Œ™Q–Ñ[¼Êëv,äž8DÐåõ:æ@¨ó¶‹:.y—{Ïf ,z9jý¢•Å>Ùì ãèAB$Â<Ìì ì1(¬XŠAM5‘Ø\Ø–-{Èd€#7D›ŠÄZ‰L±RLI YOL=)Š©ýs$.3/{¸Aˆ„Ü%xv6:á"ˆ(«š½k :;B?0§]GŽ¨›É‘'3/Y¤
+ĈdpÀ›½Œ÷Ÿã1{æ¶#š:ãòC{åµ²j÷cG(6ª’œ±J6ßw{• ìœ
+Àvù„ µ#÷¦hn$ c+Y·1q‹dËy'[Bæ‚¥p4ÿ;ãžbÏA‚ Œ
+´è»ý#F½¿É(ŸûTŸÐ-êâ$^wŽWs4Ž
+Ç(ˆ¡OÃy2´*<^hu8˜ŒöÏL˜,ÈÎ/‘Áq8hy›ÏøÇ5÷ZÈliç^šrXXZC9 jˆÐB‚j🴴×ËC.qÄ£a£x/‚wÆ8NÔ’•àágÀ •Ùh¼ï®ÈuÐP
+!@ÿr½8âÓ¢@Db2ZgGH´
+sa?Û}L—ÏQûšÄ‹XÐÄ8^ïkO„C샑_/csam;”TTb[l1µp£š³™M—ÉùßÐÃøÆ:Ò¸É #Ÿúb¥,Hcé1.ÏîBÞ?;]ýL8 ì8ÚÑÛ’[s 3٩ͦµ’K rjRoUHöm É×W2»#Bv–ò||‡ºGAvX °T’h½€årÐ¥¶y`NT@‡ÝvØh8öjidókäõŒëBb Jkù…›'µœÅ‹^?FYPyÊñÅÙœÇAvæˆÜ¨9bŠæˆ¬sIYì«^¿álŸÌBè,bSåùA™ñ|r„¼ sÃ4?6H ÏúÊ|¾Yzy¦ŠŸ#Ý'÷q õúÇŒh9¼Ý’Íd_ »ÙšE`Kd~Žæ‹H30¡³âœÎÀþÚ]<Ï=B}ð•J ZÆ,L~ #™–5ó/rïèá- º5*£!xö§4}
+§4 “tŠ^ªfÞÚ±¹ùŠÏn›
+¬Ä0H;œ|¡æÂZ™6TÓµÖ»ºíT¼`ŽI©o'Ø‚y
+ ŠÙͦÓnꤩ<oÓ½ · ,÷_ÅË ®:D¥=7O?ÍÀ=ØÁs˜c:wÁR˜3Û¦úVHì³Y'Ì6Ô7bUy`{áùtVv Çpè(‚ç:BÍ)ßr0î°£ÁƒÒ1ëËŠ¶dùwä€!F—#Ê”m3;pĶ#9c_ñ½KèU”é×W ™RCŒÙÁp»Èˆ=Ac+§C ÆçFâPUp8ªZ±»d¡âл´]m¼åj¡ÞÙ ¸<ë
+ÇI|þ¶DÐQuŸÂY#œÈ,æÀ dö±Ø:j©Y1þÌrIxeœu3Zô%o×7p<¯×‰lËž=d²3ýo‚\ »i¸*vu»HžW«äbI†Ð=ôþ,•Dܾòh[6îQ“·A
+E=ŽA¬ S‹AííGžj…2 g¡OxzÈäøÔ rYªÀíj>x;»f\é0`š[˜ª¸aÍÆÖlÕ&ïAŒ÷+„WŠq·&|Ïñh@*f†ÆÌà *4 5ý‚‹eJ©æÉJþ¼-;ûHÈ»Š¢P»*ŠšEšha
+ì• ¹9\ÿöV9 +W%xÏ»,ñõ›…dV}ì¥s9x_{ôÇ'Dœ´%|ßl¸ø³Ò÷~g;µ ~&†Jn~Vÿ’µIŸ‡ºDñ›\á š†¤Ô§›_C¢®äj‘²Üœ`ÏCÿ¸ù&¹^˜}÷¨ªG f
+§F8Ât5H†Å×ÌúTÍ6ÅEû“(F°‘X“…N¯þ8“ŽÀ²Ú[µÁ—|7ÁÕ«P)q#å^£¯¥bûÛ.÷]G>ïÈŸÐÌö¿§@@WvQf ÈÜcl¿¯ÀR¢|°›^àé½@xþ ѯºNÞt3}Þõ’ !mwÿ]×Úçîs±7y˜ÒŽ“$¼|˜Öÿ@c QÿcUÏ’yzç¾€ŠtI* €ÓY ®sKŸÍ`© ¼ô9±SÔ<l›iû“6›D6òÒ¹.Yšiä?(lͶåÅdN,[«êe[dO¡@9¼Ç%+xÖ _·*»nW €ë¹ÏÛω±ºñ°=G²y‰¼åïÚ䇵óýO`qmw6*.
+8 7Æp-Þ+Ü¥}‹Ð7îäC ÈáFeX!?£«f+Ð ÖFÇgöÃ@ªz‰œ ÁäÿŠÓ‰;h¶ÓÞÁ“ µö3§,âbnq£Ö!’¦ã(£°ÃĬ…¼ BÀRƒÆÞãâÏfÀa|Dlyæ#/–§rÍu9kLš‚Y¾ë…dÀK”Ìó<~ŒM¢/(>zýz{É®¶}U\/Ãgÿ ¹mU8²À6ÇER–O ¥q“£¡å¹é©ÿ|ƒ$ÊîR!¶€ ÿÑ…eÀ ú ý›ÖWÀr†þæA{eùß<(þÙ†öo ø &Yü›A¨¨éž&w*²Öæ´ø#ͽ¼×Ü€ó_kp# 3nv¨úî“d¦-ùTn4ÆL*Î/”¸ÖªvÃæ˜]eà°v8vèņ¾žüïqÒ¿endstream
endobj
-388 0 obj
-2525
+464 0 obj
+3044
endobj
-421 0 obj
-<</Length 422 0 R/Filter /FlateDecode>>
+509 0 obj
+<</Length 510 0 R/Filter /FlateDecode>>
stream
-xœå—Ko1€9ûWøè=¬ãñÛGúZ©iƒz@ /!(¥/„øõÌØÞM²M[iEQ¼öîØã™ù4cŸs%+úÕçÁ)íZmøÉ%Ëï9ð×}ï;gPªÊóµ)NøJ&•€OÔ 6i©-ÞÈùô”½[MëÄÇF‹ËƉ«¦ÕQË8£÷Ç8Z*bÚ xìiñž¾|h àÈŠÏ8õˆÞàüwÓWlsÊ&ìœÛIꬶ5Òó`¼ôŸ.y#¶6f£ñ6¿º¸>b£}lô’šµu|Œ7ø3¶9æ“;LÔ ¬4Öëyj )ð £4½
-ûœEKA&ŸLÄý™L‚X¬v2Y²º—̶é"Ù TÚž'y@D|pä¼dD7ÐÇ|·¶òÈÍhxiÒ ×—É%Üä!nȉ²iÁº$S;Ã)A¥Š #^4èO ˆ1Žöh“·nÄzÓÚ"ú¥or`êL
-r÷];Tí *1¤ mÌQ½hÀ–Þ)ÊÈ”bôyÒ
--St é:ºlZŸ’T8
-p
-g:?èÚ„^Òáv‡’½K ºE6Ý.0ëRdM@¨}@îrW±ì¼,ET
-MÎÆÆb@ hÒÜvª[pE¹ à³Û=,Š'Üþ2'&*©¬^eÿEz–Ëf¦æfåæ˜úCz,…À è©JLÆ
-Š.3 at h“HùŽTt‘6â+õjÊ× ñÈŠ]ÏŸ²qt at b¸˜Ž= .3"ßлÔlÍBV0GJñ¢÷t°Y.@¶Xu<ž ~!A-`c±é–[ÄÆ°¡
-UÂùœš½ÚhçsÚ 1±qÒ<º¤ó£)㜒N¨²¥ X>z””tÖñ‡x„$€{ÔØ= hf¹Æ®.×8
-_–kì 7€fBÐÜ<Û K–’œzˆ d)§ Âáº"3PWlB|ü¨ÿ Ý—w~'íx
-]\ èžEÔ€ÏÕÜ(–^šº–;íñØž¯=¯Ãc¸*`2"WHJ£|=•K‚™¸î°=ìŽbÙ…X6ïÕ‡ßjn¬ÿÞ/ö(ÍÕEendstream
+xœí]KsÜ6®Êq~Å 9[5Þ½7²Ê'¶#%›Í ¼‘e«l˶4^Çÿ~ !ÎȲCÉ´n’ ‚ ¾nt78ï–”°%õéÿß_/¾ýI1¶|~¹ç—lùýVz¹x·`逦òË{Çp 7þqÔ±åñé‚¥ &â¸[-ˆ‘ryüzñïæï+h+Áuófµ¦„*ak΃, Š5›g½+QÞ\®¶¥þsüÅÁñâÉBª— FB©]å|ùz¡à qz{æÕâhßGpÐœöÀ-ŽÇGøne(lCDì J²†¬ÖJhÂ,o œã ¨×Íæ)¾òÊ_1Ò¦A^scˆƒç<Áež¸#ZÕüoÅ%±”ùs•JÞà oñ ¾ö\QŠÛó¡`Ú5§+hFž7O*âÖ:¨ˆ9b¸Ñ͇óEdêA*{±Z3æ%„Kߊ&ÜÉæÔ?¡œ÷nôý0–O ù#K$”:Á¥Òs0iDþ°ÏðÁ9*5pû@©ßQ_ÏÂèjê¨Îo€‡P
+0gÛ—ÎØåõEg¡`,œßñ í&ª æð€®ah¢ ü è‚ïäZI´sË5“0a„‹Î
+VÌM9á‚5ƒÎI O†÷ìà a{„U[òÈß]¼¥˜`qRQ Ü2Oö ߢ?€ˆtp²S©«ï¾L]âªùëj-¤ Ίæð( ‡Ê4¡„ƒÓü !`Zb˜VÍô>aƼ„qjcGóÆ;Àø JKJAã6¬ÊÎ¥ƒ§¨Ð7
+4„17C¢”µ%ZŠOçôýžZŽ áj€—¶Ì ð!€ u ðÉrbÍDà6ó4 WÎ0ÞÆ;D•<>¶Þ•øŠlÈæF,lv²š¼ïu@Æ7â%wùÈÊ0âÔ$í/kpÈà°h1BÕ^ró
+¹K¢OIrjš —M”ï;ñ õ%´®Ær¯ÉÖõÐ<Bk²_Wkg‘€³i¼ê»,z4Inˆ6nÆ{C³j —l{CÐÄ7¼Ç üoôœQWóê]$;gmÎf˜Ù3ÜžÇV¹;8Õ
+h+®àF;‘×+Ä@µðþ<ªuªÕ<#®|‹<ËÕ1€Órªš— Ê*ÇZåä3zÝúja²Qæ=È †ß Uþ:–FÆë©_:ñG`[¦`VLåmße1°£ÊÉU ª’WÓ}U šq –,Öµö
+â½çUü” Ê : ƹi6%¾½Ú÷ŠH½*U2`0c.?ñäü¬§ò¶î²è—9Ì^“SG‰T— NÍUl+ ><èlÊGm€J4°®®jÿLÓû@UÄhäUƒâTÞÓ,^A¢|”D{L÷USWÁག#dÿYô{2Ö¦ÕFì†ã¨8•—󕈃Œ‚å/oÔ‘er¼úl Ž³%ÂêŠj½\ƒ¦”Š›Ø6"HY¥-z¯Sü³‚+ÍEsöê$ iKó³stéyZ¶˜d„¦Óçñ´CóðǮҟ;ñÛ‡y•Ž(GMÞî Y†O ¢ÂCBó!‘`ßrSÌi<$e\\qFÄçœÔÑþYB…l>tã•9
+_¤‚WX"ãÀ9éˆwÒ…6]q ;Ý ª˜ÒNÇp,ãÛ- weðr.³`ÞöýÈWØæÌä¾æ,8ìšÁµYÍLUüBjfݶQÇl/ý.aövï¼InAAÌ†Ï d½Ñ¬1dGiKD¦*êˆìE8n‘Y™LáEý† Ŷ޶¨ê´Ó͇•|¥Å Õs0&¶T/&–°ˆ¶ìkWæ >xZÀµèÁ¶¯á©)ßú˜>¦|Z0Ç’Ù¥,±B_¿Ð#èò^”{£âÞ³¥íp}¶ô‚.i¶ þÔ¥(Šw„EW †ÎfvHf¡€d³$ÚÈ߬p™ˆ‘eùl‚Þ „pÐщ°Ü]£ÑƒíÆÃ-£Hu=K#V\_¬õÂ) ©|Þ6ÙÒímZK ™1åÓ ZS¡ÆŠLó[ƒXèQ†ü
+&+ w9ÇuÌßÝñÛÊ[?°’Ÿ‚7„Ûàc®„²?w{hNÍ43>À»½ Ìç\ë}ŒÁD S=„xq-¨¾ÖÞ—Ô¦¡½/iËJφÀqLM„Te!¯Ë¥1Љa3› VûöÂhxTé&‚à1‹„O×")gFÛáºEÒ‹ö¤™ñyÃæ¡J Ã,¶>!£$6Sñ´ÅZ)ŽÞ¼áL=«4Q|Ú œ‚¸ÍU²•}[C(•xàiÉß©¶:J{ñ ¾5²)© Uë©m3ê"V¢ ;ǘz3 at n!ñ.S}·õvifœ%FÏFÆ—²ž½;M}ªËîjè¦6vŒzÐ Ç~_¡€–Ñê/3£ÏûJs dÙ…Ó`}D2µÂB#ÝsÎN»ÉŠÓN8í2LÛU¢•Š ¤Ì£•÷Wа¯Â7b˜×¢«ý YAý®r4[¹mþ=ëE+5ز< bžF|r›e.# ÿWáó™ËÅþm v®¹7Oñ”¸ðÖˆ0]ƒuqv$9p6 ™P.ócá2ÁJQ„R}…
+¥¡y…ñÁLPëB;¤ØklHÂb$)‡6&û*ÓRdFŸƒ¯ Ÿ>Ma“û=ªöi'º‡Ù6ð> ˆP¿eM Æ(W„í…±üû°ŒÐœ<xŤ×¦ ü5 †ÐªÂO\õçîÕ ]æ& ÚÌô|ë4ÄÁc“;ß×ø§ö¥G° %¡½ÝüU¨ö€ë8;n7úRètÎr»Åâ0¼¢¦VDË¡ä·:‹—w„Y™0³ªÑwøOè(µÁ“3ìv‰£üÅÚ¶(z¸8þË8*3Z ÝG6ö!F‡£4Ò'†µ‘»LÛž>“°¼ ã ¥máöUµC=»Xþ\½Ê<‰ì³À(7¨Ç5Š®{=24övM
+èäñd?SºÓ{ ò¡`iÖ¡ø}Vl¯ ¼±Œð»ù±Ï‰R¿uœË½¾³pL[XŠ¬7UÆó«8¯YŠ‡y tÜ )M=5ùžÕïófû¦ZÌâÓðÑuîˆ2Û/\M´©ìŽ ¬Ù‡ßy‰aYnÉÃl6£Øh(gêÈ`&P;ùÛFSÀ…›gU?1¢Nÿ¡Ë4ê å'<ÚûvD`ÍúÜ)¿IËâsó
+æVˆ£zUË– 8eé禮Mü|'×a‘"µÏÊx~Õâîʲ·©p?eY¦bnWls…¥1¡³ ï‹£üTìø’¨Ê¼È6H•=yˆË<8FšƒÕZYIöÌ(ºâ(O™†¸åœ£L¹yˆ87 ‘™~n›8
+ ;œ2K¯ÒU¿vâããP\€Í0º„WþH3”n¯8d éA㨷‘+•ÝÑe[æÛµx{œÙF[«8¼Ô;ÈÖwŽA Ødswæ§ KÀ#Ôõ¾ ƒ°Ôó$÷?J.Ê×m5ÿ¦ÿ‚U~EWî.ñßÐÖf”ÌfÅ9Y±Ëñøô"í=üJJûó(–{Ð1ôó(í™kü<ŠÄøJµ%‚I }®HðÌi”µ±S‹¿ÙQÍ`J[D¸Û1 {ýàZŒ\e_©¿bCUÜñišÃÚnÑÚØø¹xãzû±«Úþ’Š¼}¹OÿáÓš9endstream
endobj
-422 0 obj
-818
+510 0 obj
+2792
endobj
-432 0 obj
-<</Length 433 0 R/Filter /FlateDecode>>
+554 0 obj
+<</Length 555 0 R/Filter /FlateDecode>>
stream
-xœ[Ys ·N%oü›§ì$ÞáàüfùŠ Û‘lºœ” +ÒER<$ûߧ@7³³4ãJ¹LíΣûÃ×_7°oWÓ¨VþWÿ=}spø5vu~w¯¯ÔêõÁÛ•*:_ؘѯ‚ñ£ð¯K~Œß{öüàðùW«ûÛ‡íÁá÷+upøwüóìÅÇðÏóOV8øôùê%·úƒ·ª~™jß«gGнŠz¥ìh¬×«£Wª¾ ßÂ*è8š¸:zsðÃZ
-fL&¿ ‡›â¨Z6Lð@Pή¯ÛÇÛacGe¬õë÷puJ^¹É¬¹…ÛAéÑO.Ïøÿ }‘¤`Œcš’ÂáԧɮŽ¾<8úëëï÷¢‹ë-Œa}9èõéà køòfؼl éäÔú~0xÃhèÔ»üõŸÛÖk.ÀàBy÷
-ÿœÕ»†gÖ¯àÿ‡ÒÉF' Ï·Ça~‡sÂ!œÕNƒ.·_áw½Úõçðò˜RŒ¾´Œ÷ÇiRѬÏ?NZ%ƒÖ°ð1°<sƒ.Úƒ?ÕY w£ ëç`NxB•ÑÃx¡Ëè
-QERHhCnâžÞÆŀ®tNq É ŽÎÀëß‚+׿BïwƒxsK/_ïФ0(«×?®êìórß C¥‹ßâÅ”|Jë ¾úçj1 ÄËöÖÂ(/uøUû~ϯ>Ô¡è”`úû;Õˆ
-'Ç'znêÞ²8?@q*šhC6Ú€ß"®“l*4'YBG 2퟈ÏÆޙ܉ÅÆÙk„>ô7Õš<«
-)*‚¹v:0^èñÿGL ¡~N€8l„lãúˆFÚ–l,ÿ¥—ó¨~† ·ÇÓŒQ3¥1G½¯èfq‰æ!£#TYù'Õn„ š(øýŠVnžMÇëõW
-ǃˆØÓcçÎ×¹ÆïSëcÂﺶnÃ~‰2œ—Cv]4»Œ®8©2Ém}$Y~þdPÆèS&¡‚¾fÓÌgvš2-±IÒgöj¾ Éæ½¹3 Ñ®IðÚ5˜fÎaÏUô:@`1Äêçäø3WWëÓ˜¾@“7ÖqUŸ¦Ù°ñqpQÀí¢{0e{ ?46¨Â"\©›mp„QL}Çeȼ b@ð]\VÃP¨³ü Ä0h\.Þ
-ÚÃgëyÑ.Æ×¢oé+[&q,áJC?£¡Kþ»ný¼‘ å÷±§ÜIWc®Ì/ÀèWíCæ«;
-¬ t0
-h=˜H–É”¤Ñ>°€Xñ‘M lLô¨ |3>·8c¯3zñ¾á0¨q9RcÛ¼F£Óë_ד,½ Ó¤ø.›*B"O!ôR‚ÌÛÈkÛ<èµw»aÙ«L7w%ŒF¡±D†,MñüŠI½lRÑ htÊÎ8®f„öß
-¥oÉ6„§B‹Zb¤¢áN؇®ÕµžûäÂ0!¼(£´ùŽ·ÄbxWrÛúaz¨-âH¬Ï1ç}‹¢Åµ4¨ ~¼ÄÔj°rÅd'ì컬½1²`e G1ÕÜ
-…áò‘ÕŸuDx°,²)_ Ú”šÖc¨K€AûL 3×50Üp´îc]¥ ]4ra‹—
-MΨï¡81%Ìãd : ôˆp.ÝâR¯K¡LÜT„:—Œ Ï»f9šg‘%攩`\×»L&ÀõwÍ‘ÂÓè—_j\tÕ.—»Z(Ž4Å%ÅAó¹Àî8Éõè¿ ¾Ãq”h1݆RȺ(Ö7Œl–"peÄ:õž³Z#׸õ¿c5„ ÔŽ¤5Á;•:ɤq¶€¸šXdaTå ¦þËÊq‚¶Îª{L•·´ ®Šø+Pdq%!wß}ß)«kêüõ@¬Ë¾F2Ï–¤Ì/“2Ó8EÂÊ[á¾ï•W
-]ü/ ¶‹‡|ñ½üD·ÛÅq©õ[þtÝn_òÅË¥w¶íâé1¤ÙlAº8Îîkgºæ[tXLYØ0²u2‰µÅ‘:SLÅîߟ4~`Ud‚ Ì{ÖÍrýݵõ'Ö‘ øyϬ4=rô ùœ(Wé_†¿òœ54lMSÙñ}Â÷Ä_oÊ ”‡“w9–ãcš™[Ç© ]Ržá1“ÚI %ÆËý)3™–¶ô`SÝÊrÈ9Ü Šôk SæP¹ör4 at gáVXÊÊt²ò‘ ŸœD’ÂÚ®}‘ÅÇè6Æ´Û%ýØè—Ãç–ƒùØe¸4æ
-Ð-ãfÿÏ]L²+[5wÖÌ㤢£˜‰½Y¿î±ø~P¤âå¸Zø_džçÉ¥¯Ê‹ô«OÂëqYx-g ðe‘×¢ïéðh
-M’ÑhP@Æv8a ‡¢û›6#Sí©ˆÜ.A¡ÄE•r2C¡uÎ(ÛÖ[£Wn?õñ MöÃy
-, ñàý sƒ»¹n3«>rt^¸Vf§Ù_Q÷þ"¡Êr¯â«C©ó¹¥3Ai† vÍÿ[4NJºäk;j.‡Æ'©¹Ü#’ž”lÈLÔ :^‡‚
-HäyÍ“[æd›š}®%rY –g ß!ã_–R_uà2
-Q§Ž"Ÿz×k|äЇžjй<f»ê( øIè‰ø@Æ3^€µµ%ú-žÇAìár.\r§Q1»ZÊ+6èKy-š‘P-ÊweäbÚÛ*1€^']ž#sÉR‹ »,š|‘ ?—àEÉΊ½T©/sÕ
-Lñ„T$-[ûAÄin›ìa1WT"Uï+ŸTuƒ·
-míîDb½HLý˜øn©œ§Z¥'ØÏ+å%CYŒyõ•]íCÚÚ¦¹?íZ»^l\¶ËºÇÝÝz!ÍYl¤&. êfá¸X¨WjŒŠ
-JŠ†*d!íC-KÌ=ÚûÒXÖz:α€3äV°iÛ&$Èö¥-%¬,¤-¤™X¦= òˆb¬q³b ñg_:êŠÆ}Ö\ƒó¼j¹…›4Ú…9"êtÇGèùÙJ¾Ùˆ²Ö/HOit0ƒÊdà…¥rK2dc<¯úÈ~9´mWû½¯ïº¶r²ú‰N–¨µE‰pE]0AV{ôÐ{šD,+òn—ðpÂØ.ßæSL{{…„ÊdJÓ%¹~B<Æših©–e¬™Eâ}ÉÏ •B\Sug³}[íÍ.Àó<‹0¡~ÐùoMy}¾Àï¹uªë£› =NãÔ´ÜÓqë/ \\»šëc¯öìʽh{q¹±!7V$o>i¹é–·B–k¢!HèÚy³áÓ7Þ*ù•ù÷ì Ñ\‹˜¦ÅiÒh®Ð¶J–Í• ÊðV²"œ4‹`–!Ïê¡'¸N|ÕÈŽ™Q–d—(«À*h1‘úŠÀz=ƒ%öÀés÷~úiÈdG•\W
-ì‹’§2ù2-?:ë“ M‹Z°æçµí.](1^Yµófê;5Hû
-9¸ˆó,VsƼë)zhw«-8=‘ÖØXeó
-iXØjؼÇÛIØî]Žá•Ö-
+xœí\KwÛ6>g–úZRsŽP¼ Ë6íx<I;q㶋ž. Ûq<±´–›ôßÏŃäAŠ’+'rÂxˆ@øðáýü}N ›Sÿ—þ?½ž}õ£Rz~q; ×çlþ´I½™ý>céMùçß Cnü%â¨cóãW3–
+(ƈãnn´ FÊùñõì×êɞƕàºz»XRB•0ŒU7!- ŠU«óâNL¯nM®ßŽÿ3ûîxv4„êùû™†PjçF9EŸ_Ïü#N7W®f/Ö¼ï{-•rK„ãñÈb)¥ –«ê›ð:’SSÝù†
+®4ÕåÕYü¥äÕå
+ºu±Xrcˆ4ªz¹ò7¸sÖêêu{ãûpYQ
+ñ"^VVT?ÃÄsÒèêòwØ zØIì/&¨®bYg TC‰¤º¢
+”C»ë’RQY¡ôåÛö‡ïi c¨ƒN9>ƒ.`hP$n‰koøb6 ã TkæK&á¢p±¾’j¤BIVù¦ÚÍC»Ó;Ÿã,«;üëQK¨Y'y´a€- 'åΊžà W± Ã~pzVzÅ3\ >B:Þ´Ä:^ÀÁ ð)ùðÉ€Oæƒ šð9XÊjãå6ðR8 ì¸ v&”WßµúÐò–Çj›ûD ç¸ ˆé §±’¸Î3œ C}hêhC²€†ÕJïÉÈ}yɈUæ9aukTÖUD\JÑKÞ˯[ ]!ØÔ‹%ÊzØnÕ¡¾6×MŽã¥Q jÛ“˜’ý˜ä‚€^ë[ß NÚ",xšŠ‚ è¥åüÛV/½]@KøÞ·oòÕx a'ƒëñW‡Y
+xÕ_e¥z‘oRû‚<Íèø ¢ÑìÆMOSFr"jÇT}ŽJô~Ú±' ù¤è„a"\šÑÕ}›d ç®…ºÐ
+¥F > þ…v zç F‚D dpñdMÏ’Îå&ì<†tnÊý¶Amà焨}H¶œË·çÜTn=ÿã©Ìðèð€ãÙªž±'&*ÌÅÙþ)“¡çõ>ÌTÏŠúT†Ÿ«‹…#V)g¢N{ÒŒ9ѾõèYª]‰¬š»!¢~‡od€Ç x4¬\~7 Èße\|S¿ˆ¨Ž ‡°°)´Ÿ»† Të÷;TÞk#µž>SÅ]ÉšãTô£ÖQŒ(<j‹ä¾tñ”¼”X¥†öžÍŽÿYBHöCèy»^âMw¦+ÿ‡HÎ×ã!çWì \6Ù®°ü
+Ê«où«lº½~•Uý`;@ÖCXµ”…:ô(Ž&H=Šä(_ñ J}$¥pƒ,/ÿ}á/ Ø6£LhylÉ] Å åÛ¨Xà 6éÝhK‰ÖzBÍãMŽ¢FŒ£Æ ¡°1Ë•Of(;8ôÔ£-á´Ÿzö¦›¦äƒ ÇÝß¡•Ya×f©&VÚ‰‹ orc -ï%¡3‹)Í‘g Þ]ù¤õà؈ loÌ+t°B9omÖ [r kbk5Qš—
+ƒRrD!óyfÎÄÆPl¨ ô¶ßàÉl(EuVQÿK«!WæD}]›4ŽŒÂÿº5€>
+m¶B ⥂®“'ÿ’rš0mF õÙâÚeX¶”ŠÅÝ|É%´‰Uÿ»…b¬¿\†KÜ ügèzQõ‡/«a©êÿ`瘱yõø¹Á}«(¤ÞßÆ’ÂÚ,žì™âëjº•Îv"ݤÿÜ"ýI
+É¢1ø%eøPØüS³‚m/eêÔ?BÓF¢Û²ÑUåèn݆G·ðjVyœÛ_YèRSÙp]Ç~;cEmŒ\[×I^Äeùåµ Œzï½Þ“Ùú9'cȬnTmã ¥ª˜—õ3òc·p)&ìöÄ\ÔíDWâµ5ºÝ|Tïkœ©v!J™åÇKîËܕ爆×à]L/™"Œ9-¸çyK£Ëv”$vFb èëRDo០îCYD`Ti€€¬ÝôìC2ø½9Áˆ†pìøuÓðï!íBDîøŸ4T¹ždÙ¢ÚÝÔ÷LˆM¢Ty#8È Úcˆ•/¯f…ÿQÐë.èS{†•JáGÝ
+è±âÃÄD;è ÅS#»ñ*…q at EÈÑ‹7pø\Äê•»2œ–a!\Á/ªy%Ö¥(<ði{à®Èú)Èõ“ëðN†wá¹MðÞ(ö9ÁÙ:ëÞêÄ…Íñx×…`I¥Ð!Ï”?*¿áꪘf"~ iXÛ9“Uë#aÚ ØG\ž?‰O Vå…+¹ò©á°2cüaD2nFö×!—t^mŸæª©Xùk †gr#qžåyÚìm
+WÃ1ÒÒù×™v¡÷#Ê}L1¢1È»±6u{†Ùºð€ïFŒlíW %A¤šÂwö6Ù gëQœN†Tñ0N ŸûnpŠvxw%I³kc…Q ˆ~îïò=7œ= ø˜ÒbüäêßgÝ.šë'£¹ˆèEóà©ÀÒ^h棙@~ˆ*Y[…i¹kl_ç4*oØ«½©-ùnîïø¼Åövj_†þ³KîÐL=ÂÁcfêu ,E†°A‡I ÊÒ mqJ…¶¢,º_ þÊ]RA5‹|ïX’vs@¥wíuæ¹åºhfÌ [)5 ¶åa™½ÂóèÝBH¢œ.ŒG×ôà‡`M‘<xÜ´0°‘}Œ’¼5So…à‡¢ë~3u÷üá ðY?ðìø”{Ò{v£†°›X ŽÃTÞ^Ͳ\ –ó Íd¤"Ô}ñ†¸q ìeúÁvÂ;F»ž` ʈ¦6KwHü‡Vü7…ªƒ Z8ÿ Ô*[ ”Ɖˆ‡Æ†Û§Uˆàç å ^z—¹®.Okˆ+ |݆iœâwÅŒš„‚$ÊL#a Y?š² 7 K8lÃ¥P9烣”©ŽzÜN}Ô„ç:…uðª
+}b2œÝ ýCY:î¬m @zZ¬<}N¨uŸ5 YáYÑ®O9/íú¾ešö¼
+-yæE!µDLÎÚûÍë R%‰6ÍfÛà~ç£Ü0ÿѦ8Á5O ‰³Ëô±**eG¥ïbQSGkdŠ·¡ÉM <±Ëø¡XÓÈ|Ì^»a½¬Ëå1_‡˜—ê¨,ª=GÁ45αå´}:š9|&þ>,³Ð¹ } ¾²þûh½Ÿx«¿ÒD0Éâ÷ÑêÈGCtG~çûIVó¦înF¼”¡¹…»
+?p?“KK1™ÃpŒ{ áX'ãüÝòÅ £ÒŒ(.†²Ä£Ùÿï.Ú8endstream
+endobj
+555 0 obj
+2505
+endobj
+592 0 obj
+<</Length 593 0 R/Filter /FlateDecode>>
+stream
+xœí[wÛ6ÇÏé£>… ©sj–¸Û¦Íé¶ÛK’½í>¸±ãvËnb·Ýýô‹+9ƒ %[r¬Än
+K’? þ˜€¿.‡ž,÷/þÿåùâ“gÂðåÙÛ…ÿ|I–_¥_¿.HücˆÇ/?}aB•û¨7ƒ!˯$þ€kÕz©$ëçËç‹u_¯Ž†~LÒý¼²E%3Èî+sC™ ÝÕêˆ*ÕÓ]€£_Ÿ~á>eT*NQ gàèkP~ãÊÔewê?''ý÷‹?/>±ø~ÁúA._(fÛî/Œ°çZž/„ý¯7rüäõâùÌ
+¡KÂ{Æ%…7DÙá+¥ºg†Æ;â/AK&÷-"Š*ÝÅ«TÖÝápû”º³ë7þlY{eî§Lh
+jq—U> Ù3IÉòÈ6c ®‰'¶ $ܱ Nº~uD¸”ý@º¿ø»'ioØ1¼{áÖ3-¨ìÖ±Bt¿»“SNàFÄTý üãbeo•2ŠÛŸúG¬¹nÕrõS:QÖ˜× 1ÇgÜýÊÇ©"†A¿=—Nµ6Ýey¶@Ýih4¥"^ªI®Xw•ÎÆe÷Cçñ ¨½¼îé7þ:…¥¹ûëTüäëòF‡³W¦×Œ ‡ü;‡ ñÎùjàáûÊ~Î-XFtO¦£?Ÿ>ýaµ:’œõÄRfQàÆô†Þ´èØcJöJ
+K¿gìÖu5Š„
+¶ù:±ë{û î‹kÂQjƒ%ÚvfBS踟VžgøDæ~‘ÙO†mÔÕ& üñàý6>FÎó¾ã c¸/¡Ñ„û6ÜþÚpÓ+!÷~ÿ rѱÅUUv¼¸Þ5dUŽlª#ËÈ~{ ¿8Íž} Guß>}Í«Ô±Û{󊈚 ïžOö ñt
+ Ä Òx:÷IÝ 57:— Ò™±£¦ç0žú{\ôÀ2Ù©°‰G
+x¤ñg˜GÞàñû§_>¨Iû׆‘\«@3†+ÙýëDh¢ø~óѪNÒé4Ä#¨F%I»?MŒ¿.à ˆ{S Š5ý`5èëÂò†Ãâ'•æû£ìJ½¤æ@8¹/3ªocF!¶¬nFslEÛ¿´ƒÁ>ÐÓbMæqô& @ušÕ$j©é¥T¢ûïŠXµF™Æ5¾ üY•ûÝ>´¤%÷ȸ¶—Ùê¹ÉÿlŠÛÙk¢¬!¦ÂͽkoPO¹Ú«¬m
+-O ˆæ,œ_6ˆv%gÉz6 ·óÉWŽh5Ìî"r®®³®áæ8ÄÍ^Gœiuf ½9¥
+5â'x ´òRyðŒìµ²ÐaÜ: Ú>,¶`›Ï³¬µÚ¿µ~RW$g° $Uà ÿ 5ýgIþ
+¯0b ¼º²m ¢'d<s@ðG7N(NðœþªjÈ™ì>› 9Büz Z*}ìzçSn ˜8v·ƒ[ZÔù#6 _ÌóRs0òºüg·¥K³j“7ÊM²ˆî›©úS¤€¹¼¿ÕÌj½¿‘ÝA3ÂÝÊÃÀèp‹^J´§ô–|'f9`–¢:œ#kZSAä ;Íù°g’Z ½—ݧ“µ¼n™cHJmV5ŠlN‰µµ@°ŠjñP ßÃ+†¹Ÿé‰!‰±Yú)beX £ÈÆÿ0„yÌà Tݳ†Gì-ÀAP@#˜ËIôk71‚v”:›“â
+¥ïÙ{ý9Üõ
+®Mï ‡ñ ?äâ䛸‘b¨¡*꾉|èG¨’;@õÆžŠQfDJ(½Û¢âïz×n #n1(ö1ÅÝ6[Õ[k„ËzÜÌN„7fhˆvèÄ@äM!ŒÉqq‘a p¨F$&PˆzóDOa{‡þîšo Q:…}9:ÅéÎ …(²Ýä·•]éÉç2 ì „¨îã1 Ö–9L\d]Ñ
+
+¯³¾’&(p<öEg0¼`j\3# t§ÇƒÂd—]¢&û¥ 2BÊ>H{'G£ÃÉÕmƒ
+#½<ÄCê9bÎo®m¦ç°FÏ’ímq¶ò¸Ž3L½I8k†úbý‘aÆ5c½T1½ƒ—0ÓF”ZÌ©mÞÀtñŸ¼Ô?·†õdš÷5œ„ÔØÖý¥îLe—wc$é¹|ðóÓ»vEK at v™2TuE#²Eƒlà¤C $ΑF=â\lÜw·¸½²ÆÝ"¾ß‚Ðÿ?pF™ØÚ[tˆ£ò»'Û'µðÝÉ®á\¸ìÒÙfp–›q¾ ŸóS0—Òå9,ÚCMOY;Ïâ唡’.n±›ú€¹Niv!…EQÙKúà#Þ3Ê‚ÚŽ®î暥$Ö0ƒ¦j y#v>oèbçKo³»bЬ7ä9 ¡¸£Ö…œÞFëê}pºe¢ðø(7ãbÖäý±:bRõÚ€AöÁ+É+ŽvS5Þj6Òk˜±›¦Á#ÌpGÃ"2Œ×-ô¢§†ƒ3&ò¼ãü›Ñ÷fY%.ë' £ƒNÒš
+âóD‘ï`Tš•¤äI›Ž* -{໤¡RÀnîÖìm:þ,Ý5ïtÅ@ûÂþ5¨æœ¶Ìa ýb\Èžï²cO’U˜^ióR'6ô…Ò][6³À£õ² ÎÃ/±yÅ úèŸä‚ ºðàY{½ª´•š—¢âs `*fá8/NÀºL݇¡C f>ivž"ƒ:€>+”]Œe§µB‡[œDÅЯ۳à¶b€s”ÑÜ
+ ‰À7væ_#½²Ä)ÐÍ丞èQd @ñ6ézÎ
+VO§@|¶"x÷˧îIºÍ*Ò-lèo
+I0eÉYóÇ„µ† Ç5-„çƒ8Ôv¯[æ9FúH\Ù[K½«øìÊSÿXê U”DgÚ"CrLi±÷·šÒ¢q-'+Œ!=«iböMu/ï·{Õ:J¡ÆSËg y+`\¾päéÙjð.
+Ä͇¤8ÒÜmùîTÓ½¯&þ ¹Kµ$7ZµÜ"é>b†ÜV ¯e¾/AVBÊ¥¾F¶“îÑâ¿dD”Ù¹({S{˜K:Þ=µ!Ú°‡Ü£Àe
+}<Û ÀPÝ7
+€ã OZ“7*;±¾;è0À:¿•… 0s~Wz¹&¶¹æ÷}µ¹ú6·ŽnƒRþµœu!æRë3Ú}øÙÐÝí,ušá1êñ@[¬<ÅÐVç‚@Ý ï´¥BR†‡xèùJ;¸S—.Š6Ξ@Ÿl9µÕ;£†u•ØIÅ©21ªÛ# g ˜…Ôy‡“Å22
+³$Â,r›L8AʶE²X>F¢ïª˜º€™s‡ôjȳ‚PhÅ ¿ ] ̒Ŷ:nVõdÎÙº3`sâW¹nŸK°c’5¥…§<ù©+A÷SÔš{mÕÜïr``—8œN•õû#9ˆ^ª÷¦ë„P q‹çßm¨eCo(} ±‘3½¡œÂâdQÙ"NÞŽš}=j-9)¹®˜š´ )NìöÁ§ªÝƒ’¹}þ¤µ±L¾Ü
+í¨ÕŠ‚\ æ.ЀB2ò:ŸÖPôÝ! ˜àN•Z¶VnŸ—ÔØL‹²^ǵƒû1Ó>Kx¿› Ô`.’æÒ‰±G0·â†7"»í “çt(ÍzMØtÉîå(Nf÷FùÈ[‘šê1»b‹Ô¦ F¥qÑšó¿YÉh”҅ߣšôSZé°¹ë«fFþy8Èö“Ñ”óM¦|\JÅÅÀ‘Î$>W¼·ªø@X9„⸾UÜY2RíúúV‘go ¶[A¿ÝÌêæ {ž¦\PW§¼´è7ɼ†ëöƒèþ9úYZÀÂ3t„äý‘ ëÙ@t¸Å½íâ2 ouÄîa¿-W„Œ›Á‚… gn1œt»„P¡µÈö6F”CüçSƒlÙ¼„ûŒd½y´±;Øc …»-±àmÄüèœþmÅüöµ%bn;Ó²éÖD°’x‘å ÒHy-O¨²ó!̇FPON¹œõúñkp°žÊ #î oüg{Ôw¿¤¼Ö÷Ï@”·Â„ÍPµµ„ƒK«kýyRPÒ—ÞrÝ$»ö‚¾á›!.¨®¶yËA35ÿ×Êõú3á’„¾nûô)‚Í\¼uØíb0=3ìy„b½¸‡ vïYýÿr«ÛjV?¿pœÙ#EÃÛþµÀúsJþ›R;W6ã/\$YæªÐÍÐÈqÉî8ˆUØ{+‰í=7Ú[@KjŸ‰i¾m$yÝÀû‘ ÂÍEƒ§M@³½•³1_–m‰ÛTéˆîìí
+Y§‘= ؼ! {.oa—c0Ƕ¦½ÂÅ¥
+R²Í^@µY+m¯kæ#Û›ñª§Ç =°7·:;. [eµWs÷& jR`ŒTr
+‰/cµè© ßHR[š_þÔ‚`Œì}y7]qcO_ÄëpY3Š¿lK¼Öh‚YîÉï6ãUùÚE¿5³½3(£OØŽM+ëRÝñ
+ÎoÂýKU¦KÛ¸ÿÕºäuÄn©+‹î9;þý-NÛ4TþFFUÆhªmæ%)[,CÜŽÑ
+k]wˆ§i)ªµöŽ3°çèÈs0ˆVšoÎð@ÌÆ>£Tê3ƒUȱÏl0Cbè6½F¸õîâCßJlr
+ÞÖÇrSœýËÓ[5u£:oALŸÌ¿±úZÈôDiÑ!œ„· ‚w½ÄcØã¥IbZÇM·ü<r~-˜Kn•›¼ÝáÝ_® “žàlæEµ^ Tnýëdë̃ÛôÃã[¯ ò 89Æ ¼4>·ïÿ‰ 6gendstream
+endobj
+593 0 obj
+3628
+endobj
+638 0 obj
+<</Length 639 0 R/Filter /FlateDecode>>
+stream
+xœÕ–Ér1 †ïý}ô Æx—u$EH…N‡e Èd²t*áí‘»ÝÓò,T
+’Ì!¶[–Ôö'õQ+©k•~ùÿá¬zñ)8UO¯ªv½ÖõÛÅèguQé<QÙ¾ÞšÐiI¢B]ON*7¸RÅ‚•à\=™U_Ä»ÑXIå-h-~ŒhA¡
+â* ëµhFc ÅœYŸ,V_§Uk8Sø˜2ëk6¾LcƒcÇízÄ‚~¼©¶'Õ^e¥
+õM–rOÉ{ô«žUžþ$†ÅÊiµßA
+ Ö`¢´hºq]¦Êz§…ÎÔÖ 9“‰ Ä6ej qÆí›c>»LG% “xE´qFØ ö~è :Nƒ Ï|ÅHÅ!»‘9?µ"<Ñly¶|{ÃoiÙW
+gtͼKNÑ~ y%Áè¥È$;»ûiJCÉ q³–SÃ'ßVÖx¦×ðQÓÔ¦pH7`Üs&Ž2ÒKÈMŽ°{úŠÁÐ]ab[AŠŸU ¤hã>ÜX;"ÞbµÀÚlÀú}[™^…îØ×ß p¯S¾ã8ÓcØ€Ÿ'ʃsâ6w/n†Êè°t:ˆæ{v@¾>ÒºSŠ
+]œ2r¯JElŽ÷ÙGÛw¬2móÛ]ó<Zs5ƒ§R4ተõïI¶ÑSyÃI~ ߸ÄwŸÄ ø¶øf·)ú
+¡aQFë|ß )Šé›{6šöDÚ–Î!\Ï:q}V®kêé."AÞâ qع@xÆŠožû°ñe_<göç›Håø ®kׇW?Ýz¨Ó·Ö<îþåHɺÇS¾mÍo
+–ÑΑ;´]ƒ¶Û€öËí‚°bÂìÙRën îxë†.CÕ™ ´Û#ˆ_‰êhl«b§U*‹£PO}KBC=G¡q7²!Hú¯öïGðÞ
+ü^ÙG“t€fʾ_y€²ª£ä4°×NwÊ~/KT!a2¢‹™î+ ŠÏƒ8Y’¤Å·£UùJ9T|;ŽzŸ v‹Ê+4t±ŸW gü®,·UD‰ïpÄí7•c«YÁÑ`OÊ-Ë’¹X\â^õ(Êú:endstream
+endobj
+639 0 obj
+823
+endobj
+648 0 obj
+<</Length 649 0 R/Filter /FlateDecode>>
+stream
+xœí—KO1€ïû+öè=Äõø=Ç>¢¥R!©z¨zH! ªI(TÔ_ßñÚ›…,ªR90¶Ç³¶çóÌø¼Vj•~åÿѪzvèªO/ª¶¿†úÍFúZWPªè×/f4E‡Ô%Q!Ô³“
+Ê‹Zjëëà ÖÖ³UõQì7%•3@|iH ^¡òâ"É4Ã8—ÍD‡ ÅÓ>É½àƒ˜5 (5j1g
+Ÿê 6±d†Lƒ}äÓìuµ3«*#•¯TÁ©T¬ƒC'®W•£?‰~Ó³¬¦wœ€®ÁJc½æ'hãQ ¥A]N ÝvôÆ;Û®‚¦ì:Ò"œ8;éäH{Š>oÒ^7º´U²a@çF‡–6ºî¦mÞv—Æk¨'´,¥Ó’i]JgAÈfÖ{©@¼kœ’Aw¾ÈãíIùrwoš×kµ/Ó·µÕ* g¬ÛFñðš,xãˆÎ€X à‹±~~{>.-Ï Ä±°P4¾7(]t†Ý«ÔÐNGÒ_ðËÅp65ŒÒ´Úê$o-ù‚NÅ"}zŸÄ-b¢ÍÒ%´ÄKÕè,0Š@‰B³û阒IgŒ`$z
+f›z„Ô =DQ¼Í~Vžœ9ÍÃQ¸¸_8{c-œÿ œ&Féèâ= …˜9¥¨¦Âo9Ý‚¬cÈÂmd³Ý!²fÙ ‚È ÚàÅ5Ë€s®ž±°è(|ãKFà¢@gA·±yÅÕs~$ú3Æ&:í‰ïœxͶ»ÔbÙz0â}{—hQ^ öâ>'•è´”l(c? ¿?6ñ rªÿŒS;Âéîa 9Ÿ÷|M¹HdPQF¾êuy<å¶ùÀ ”þd×€÷¢òiG»ÛÔ‚vX!”ˆ 6˜A9˜²9Õ¥Ñ<Ìû!Õÿ
+©ž‘·“êoêFH=(ÕhžZc ¿Í¡1Æ>t:ÇCç’ÅÅ+NÖ(ÆBSb¦w/ÄCO"#ÕxzGrR;ã Õhû\ìÞ‰Q'°€½»ž»ß‰[_ÊÝ;ÑÓ3,äw"Y¨ì8hAÁWÇ’’[Úù{úfõ˜Ô5úa•±æJÇÍ ön`ͪÒùX1ÂîœâKþâçz7š¾{Åú¹þ1_à¢Wj €
+jì z}+‡dLÞ8ô úvi—endstream
+endobj
+649 0 obj
+866
+endobj
+659 0 obj
+<</Length 660 0 R/Filter /FlateDecode>>
+stream
+xœ½\Kw Å>'Kmò”UF‰=ž~w³KHð1q0q’ ȶ$%#]ίOU?fªúquq ð‚™QO?ªë«úªºæþp¼ÌâxÁùÿ/^ =øÂZqüòöHÍ‹=þé(þùX ÿíÈ)7/‹?v&˜YÉã×Gþ›ƒ]Ÿ\ }¹¶ÿþè‡#‘o–ÜùñŸO¡éä±Ð³ÒV Ÿ^ ‰ü‚S³‹ÝK?« ŽO_ }=‰˜š“N‰i>¹¯C˜½ Ó'×7ð|Ñ&h/¦Ÿð:H§˜žmíoN$\K靈“Ÿ~ƹÌa Vv6Þ˜ãÓÇG§øzúlj s‹šÎOîCfQF‹é{wZ )¦qÔà‚¶Ó5môo¤Y¬ø¶a–ÁO»k¼ö³¶aÚ½¢/¬4L_`¯Òó.¯âRAŸgÕ»ÛÍM 9ïítñ–O<!œ-Cè<Bî^$$B^¤]Âbq¬85¯xó‹ü\Ëéaž‚ЮjôòvÈ(x|WÆ;{B¼!o¾¢ø–L!Ë9>go_&y*å§GW|r°yN8ß,Q¸[ Û¢gd»4°òFZþòUÙ<;} mô²€šOïÈÜnÉõŽÊ„vµOi
+¢ é§g ×ßLdß >JýƒÈåôÍ þE-ZY9ý®ÈÜLOßÒ¹å('Š¦¤ë kõ:À:Lj}ºùèO;ç?á¼ï—‰ßȆE…4ÿo *n¡c©à2«Uñ±ò¦Õ_"d)ASd²
+A»
+\oGú Õ„
+FÃ~È ²W=áú½Ô3ÎYƒX -ŒÒÿ“¢õtaVBN§QÁ@§×˜š¾©¦
+)…¬ ÈwD&t\
+ß]ž¾2h…@…¼Ñ\äY}@÷žg¤€QR¶ ¥+I0–E.ŽmÍUYƒšþÎD
+cÁ ¾Ë[ÊRl.ò ŒŸ$y¼Ð±òYtÛw¸Ùì4Ávå©5Ù·Œ´´pŽ4¦Ìl« Ú‚ á>?l;¶*;¬à„¨VÝ´Ô¾h»YƒŠÁ<<Gómzî]| ›H71\Sh2 GfÄ£ Þ¥^ƒ° L£ªÿL+ÞÝkìCnCõóÔeÔʵêùKú0¥]‹36aú¥ï%Ùß+Ž®²ŽÚ¦u¯a5¾ Ûv†Œpé}ØÚƒ’—Ù0SûŒ‰)BM‰ÙHQ 6ôr*2$M\ÔØßãu€(3ýx"5 â]YE4Ò[™gˆ`§ï«™¥g[¯Èãg͉^±´·‘`E鹞e½¤!•StÈ„·¼zŽ·è(¥~êVÁ·„ïb—0½AºÅÀyêgeù*è˜\ Çá·&Tu_mýÐ&·é1Þ :3 +“|2gK¦`GÕ¸ö6}…¡ ñ Ž¬f P¦hX-¬êg2ã7• ¯½°î©VÓ %ÍZŒIT`9 Èõ
+ïRÝCy&¼TØãÀ-*`UWU£ a³ nQË[üêàžm‹üq ªÏÉÐkPÎKî~Q¼”Å&èÕ&¹v=ÝÍŠ*7 '©l&9 ŒT h*(p/AD›QºfçƒÇAbP„¶L;b †³,†µJ"}NQÀÜ$4å°H错ࢪãMˆSÞÜ$öc½IÁŸ‚i¹¸±{ˆV??1Ë ÌqÅ
+ª5ÔÃQÍ~¼ n¶ãÌaí*ÔÀT0茰³†°úiŠ$`8e8‚ÞŽ@Pž5ØUEçÁµï1ô·¹¹ïpç(vÎ…¯Ù«œ«â†éé«MŠ4ºú6á×HàѾ?— gÀ»lÐ[ÆÈð±®AY×±#Â' -½ÃhÎ×€o†¿/B [ÓêQ×ëkìÃyÏ@•:ö°9±c´(û©,G]’ wœO¢Z@´ ›öÏ-”›ÓSôvEu°¬}>mª#ºWèÆ"*ìQ²Ë tϪ^˜\´TL¡Fîˆ*Ú˼pû
+Y‹ `?Ýåk 3;¦Žìæ’øãïOÖ˜›ÆŽh…Ë"á)'³¼ É,
+ÞsE+_¬ˆÛu/ßl— m—º—?Ýu9w‡¸9!¾g½¼ì^¦×œÕÈ Ï—¯êÑŠIf#¤\ Í_4Y?{¯Üê}1ß¡¤@@íåPeÀûúGl"‰¾$^/ÁkpŒÑZš1¾Î±¶uZ2nK¬(¿Õ C©pgfM iÁJUA“ç ™CDÇî 8©O¼³KÉe4€; éðmîH†¤ ¡¤]oèÈÒߥ~„Lì^:¯ïêynSgr(lÏriyR‡ÜÛ2nLc¥æš›ºÜNdõËìÈÖè^ néöÚº©,¡ RÙ$$’PÌY4– .=[r6!¬>ñ2͈Y‰ÍÖYÓsœ! vèÑjf²Eƒ9éV¡„³5ô€. Y3-8Ýû˜*²2£$»§€¢²\W©¯âþ9¶×€—H÷ðñ¼BL|î+ýGr kÆq„
+•é]îˆ å÷î:¶˜ÇÏB¼ŽÊ_Õv_’/Ê |Ù( F– î/ó
+í{„o
+‹"”匣g]X¼rG„»ñF˜ ña¿ícÓȧµÍe\ªïœ÷Fœ9á N" Ë¢bêeѳ‘nè2γ4 ‚„…Jm IQ`EÊ•4Wá‰í©¹lBO^¹rŽSW9±Ó.ói˜]f†kOâp¬{ õY˜2¾¤%cï À È0,H‘·ç›õ,µrr¬éç1Ü6[f«! á¢Ï÷˜h²ÅŽX$a¯ÃI’ ãŒÁ³‘~×䓺º´$W1T¾ò<¶QÜ
+ÐȨU²êeßdÞQüŠ¿¹+Ë®°yà9›¿î+صˆ'g± šu@½6.bŒ½8Îmjò…Ó+6»@m¯^æÅN® ¢ÒÚ8SËÙO*–HB²]²¶6W)´Ë¾!·ÞˆÛu2<þ3[èÒKÿS ݤ>Õ>QÛOc±2ŸÅg0Âöž;v ö,5‡@±›j\öÞ¯N1Cvvgõ£ ;ãÒ±†ÛºÀx–†¹$Ê :ØÚÜB*¦?"$Ê*å‰ð28˜v¡jõ‘îê#‡*[vÎb²-âȻҫ߹ÈÃXÝðÀV‰wÔÙ-RwDKQöºÚÛÄb•‰ó6†e0£Íq”×ÆTP`Ä<K衪œDåí·1ë"½ŒjD²ö$ˆ¥ØÄzž KÚª=¾ -Ä ìÝZÓ‰Œã ¶q[žÙAAEJˇ~]…OgܧŒmZœ…ÞCD÷Ä@éÝN.%ITŽÃ/6‹¦ªáROÕ‘3õ·C¯Ê¼[õ‹„©”7ç4Lž§ýWšeq:ŽbErš´þÓh^Ç%ñ†7 Âpý]ËÏ©¸þã¥qzOV ¦nÒ9wÙ® êï.™b%eš=æþ–‰Ø¥à¹Ð‹ ¤eùr\Ó¬RYâ F6ôúœ6bmü•žÉÁ‡Àh“wÄxSÈ»()Z(»Ç÷2ÅÌ—Ò%”z¢¨sèÎ`?U«;Ó@ÍtC‰PÂŒ‰iuöt·ý©ÍŽ a„aNltnÒÛX—Õ&a±[ØćŸm$á«ôx« â£5(ÊgãV0è) QùÔ!xéÏ7„²•$ '—0‹,e©¦Ç¤¶'N™×1?*DO¼ÀŒLó1툛•äH^8ÇÝ_6÷WÎ|Å Iùx°6NÊïM`1èI9˜ˆêÀ/ľžÇuÛ7…wÄ öìVc¬÷ hŸ§yãáp'©ßí¤+׎â¬msÌÐq8„hW7óU&1<ê¾Êm|7÷¶á˜2Ú®k¾°K){kÜâÔU>åTÍÉ˾ÚÓ,:Ç‹w©Z^»¦Jâš:‡©©EÏYG¤ßª—6{E'Fw Ôv Zþ°ž£ášy&å%ÕSæãªRdîõSæá8m©ïK¬ìÄÌe÷t eÅV*´ç÷t~$“mP ½§ÑMêSaî
+ÜNélÀê”ù†W±
+a_Þsí¦ eÂ(h¬Ù ö¾®¶”w¦,—‹„²T¾ðZÌÔ‡tuâ§Tm0›…ëí8Ï3t·AE>ÐàdTÃÒ?ÚÑTð…uºc‡TŠÄ¥âA|/R|ƒ¨Xžºoe5
+VÖv·ü¢S#°²ah#YqÄôª³CpÖL3ëñáàL²ÓOvŽ‹Åíìc+÷FJ¸˜åë±ã²jZ
+½:áÇÉqæühhú›´.,ß %´Dã¦r/³U²Ao¬ƒ7’É”é7M ¾mÁC¾, -þ p¤¶jLB‡àèT“©6ß“úö³ u1œûeÚG³ˆñYF>ÄŒåÙiß:Åž±—`êš*Ã<foÇh“‘½'ë‚öVÅ&Æ*µjŽë“VáW mT
+á(£|ðŒ#Pž{™„fIpôu=]„ßzÂëö8*<“$çü-Ü*¶z4 HµÉ('«,' 7ç ñÐÞJQ},Ž‡”=¾ßÆEu\ï°Œ Læõ‹'Ik ,–+báŽ2‡ñˆRýl£öQbBXˆJv vbY ŸÍG›ëW @šU‹OIŸuâ9îDt8¡îœðPR¶P! Ì( U Æé(Ý`6d…ÙÚ•å3y¶AÔ.kåFB}êë*»Wìn-Ä/e0q%%¿L²r¹†¢Ÿ+êEò…%'äqf¼‹:Šuľ:“ónÇèàG ü@ï_‰ñ-)%nóaeþ:;×ñ4T™ ÜACïòm«Oi—ªÈ"Ñ¢³f’8ãjJ / ç&‚ñ¾° pmÀ¼–Xóæ“€Ee±(´Oïdõ8~oi{|ÔÃÔr4Éžs½Ž\ rŸSÁ¹yâ<‹Á¤ }õ6]{çu߈HP5©ÊÇ™%[%Dvã9Çï{|';¶ê&;5K_ÝU »é‘’oÝp;m…Õ×$Y©h¾^á–/öoï(rÊ D}à væbíæÞOÈÒ×|£ääw£AoÒ»^·…{ÄÖ)´ !@%¶a]†Þ»UO ”¼®¾`‰ën|(wÉŽ*â3¼”Š•9
+b–î Gæ}Ïs6¯‰gòÇ ròÜÁõæL>®Âèk—è>eþ¾ÊWQG¯N†ÛÇ–j”¢¼¶tª%a²dc#³ºã°èŽ‡\˜ã¦‘RÀN-<ÊÖ©–Of;qYzY–dûÙÉÖ47éHhK½¬²}Ûv*œP¬Ö·K‰°e•¯&- ûÓÙüv‹hûõ²xéÖ£ã/¶¥Vü¶!m$߃Å}þ°= ä”Ù§‚Í7¡ Ym>è¡|!}9“oX]js\K0õôäá©•·nhDž3{Ï?Ü"K
+sð"PjÖÝÔûe°–ÑÛ÷ÛTòå5K²wÂÎkù‰W>–axàô{ίp»xn–uÎq at iÑÕVI“jéqÅ:ÊE7ÆtŽµH1RØP¾ß© æ˜kHŸ™£7æ.È·¬O g¡øw‰á/IŒ&–
+$š½×|fô‡,ªüL Îù UOó>ªø(I/aÚ!:t÷ßù.å0m(Õ.ÛWÿ\Ç:Ÿ‘°^ïe`Uoä-Æ£_Lv<Ð0‚ïmŽ¶ÔC
+‘V 4.oWÚ×è¦vÞÅì°M–¥ºän•¼ý5, 9¾¤[ÇŽZX
+‡Þü§™yGåò†á'kê0Ö·¿™ÑqŠ>:–5o÷€ØŽñéàð¤Žf³fåÿ·üGøt“¾»!ÛL…è.Çåûƒp–¶ú?¬ïÉà ðwÒ‘_Rí…ƒÿõôèéú+L>K
+ò+Lå þ
+Óø·—øì«ß^²Àk…é·—È÷@åÇ/ò‘A`wbÓÓ¯¶»ûc{!|t5ÚÞÝ0‘Û~~É~f…U—T[ÉQ=¤ùð£‡
+-Ú =« {Å{zô_×@ÌÍendstream
+endobj
+660 0 obj
+4491
+endobj
+668 0 obj
+<</Length 669 0 R/Filter /FlateDecode>>
+stream
+xœ½YKs E ®‚Û\ø sìÂí~?Ž‚Ë`H /p œø‘ÛëÄ›‡ÿ=šî™]i¦{±ZLJÌN¿¤OÒ'©ç}+¸lE÷×ÿÿú²Ù}á¼hÏošô¾•í¯«§wÍûFö?D?¿ýaK”ï^ñ(¢lçgì˜àx²õNsoL;¿lþfr¶#¸°ÚKÉ8üˆ1ò¨ØÏ3¹ö1²S4á8=›¨´•lù|èžUŒ!8²âf¶ZðÏü—æé¼9l4®ýÜxí¹¡õ6Z®U{ÙXøÇ£[½¹hŽê:WÒ1ÂqNÅÖ«ÀuTYÇï²>× 1¨{ô6˜ŸÀôgŸfÊð \TÚš¤#€Ûxöi{Û={Ø^vªËȽeŸaª÷<˜À®ñÀ+<BNºXoÙ LµÝ$ÞQš²Ü÷Tó¦ëw%û K¬Ý1•T ²¯ðëÖpGÞ!Ì.“»XáìÀXZ.…ôd~r£¼Ïö Ù?©äŠ8>Æä쉹‹0=ÅK²Au°j4ð^f§‰!²³.ü¼#1Jñ·ŽR;¬‘Æë ¹îq{À=]kM Ä8-wÿ\Ïš†Œt‚ˆO%ü dÐÖS¼ŽG¹" ä›ìšÁÇ‘3/{÷R2ö28…îd€Ò%9yÄdÿƒ¤÷B2Ónx°Ù;ÿQ;µ¨}5uñ‚‹bû–:G+¶çOÏ®²…6lùf$q0†}‹ ~ÛG̸®9ᢉ¢×3Qæ¾E … “ƒ*kXÎM=3$,”¡&&\u2Lò¥Ü`ZÔð¼K|Ɖ‘åÝ7ªô×Ôt:Ñc1
++ !}—YÈDÚNv?Í~«e°ë´¥Z
+ jQ:Ã;î¬+dËŒäõ Žcß ƒ.³>Š§þ¸fn®õrç¼Õ*ÖÀ a9¶Tç–ƺ»FAä6«©p$N‹2 §}lŸW…ú' […hpŽ&Ý>n¶þ2ÕšÀ‡½˜äôœ&ú´ õÊõLޚƞó±–TÈþC0öÎy¼QÆ{Y¯¹JÙT/—"Ç+b lèblw´åFšÞÏ×ð^¤Íµ²Né¬eÿüö
+ý¸Aª. ×NÉ|DÙƒ¬þ¤R£ µ’fuQ £ôê$ŸóFAJ`ƒf4¸Áœƒà¶óƒ ô´_Ì´=o¾ƒ^?Ù©Öe‘Š‡3)aO'œ 5Ê|& 5ìŸ0 £ÐÊS¥E¡ô #8õÇí!Xƒsî¨*
+…ZKoh åÒŠLúZͲ— 2Ê!dñuIä8ê#5 I+o±& ß>(ôi¡îjmü}¿SPì÷$²…8)VÎøT¾fSÉU
+êó1ÑÐJî#챺AðÅ,š^¥5—jÅ~oLoÇS-VuAZ:ÎX,ØËÙ½\ñíÏ qÀ1¦£þ¶ H²‹ZUÉgC+±z|îÚC¹â(ÜdÍ&‹*Ø! åndïÅ:<Ÿ`©G]ǾE):êqÒ(¿z°MIQ*R £BÄSuÚ×z¤íÆó™ÐÿQÀeÙò ÖÆ
+J c é1l
+º»5z… ]=‘Êf˜Í·„ªØ©Êª»Ä[-¦K&g?J¯Ž‚zÞé9¤J4¡Ð"rÝ$õ#ÓþnâǸ;ûË ÝÈ_
+E/Î)‡$iîæí¶urÀÞþQV^™ÀöqME´Ä-RŸ7uwíÓgYçW|hŠwËãÞj{&FvÅ•½ ×=)È €ZusUÃÌYü>|ÿ@ÂYÜÍ-Ie‡¯Dˆ©ê÷êX±š’c†M߆GAu¸Jôñhx³ñãQù™×Üw›ºÀµ42<:ì ÙsÇ‹GòKÅX`¬=½ Â×
+Ôºã½Åþ´# ðx3¢™ qaWàÍ<p5Üñy¶÷½ÇóO
+Î0\Xoy+'Ry´û¸2Üaó SÊNendstream
+endobj
+669 0 obj
+1498
+endobj
+674 0 obj
+<</Length 675 0 R/Filter /FlateDecode>>
+stream
+xœÝZYoG–xÜ—ü…}œ´¾Ç$$ˆ (€ P ÖƳK¼’_Ÿš>fªzzÖŽ
+H ò ÕWÕW_ ã·KÎÄ’÷?ù÷Éåâ«'ÖÙåùÕ">_ŠåÃÕ«ÅÛ…È7<Ë/¿9‚!ÒõXàA,^,D µfÒø¥³Š9—G—‹çX9ãF9!:&WëãÁvÏVœI.´°ÝK$²‰×:HeD·¿Z¥óÌÙÐ=y!’¶;[‰ 8×½ïß;Æ¥ê.à=w–n»7iW¦ãxù€&ÿýè‡ÅwG‹Ç Ÿ]¾_8ópؼ †)¹¼\øÇ‚ ž¼^<= ¹‚cˆF ("N*=SA!(d0 ëµ „w²“äñZƒž¬ðݳ¨ é•7.id<7ݾ j¬ô¾»JjPÒE5q#¹Ó¦×“fN†ôä™°"êI
+©¼ Ô¤“–ò¼lãã^]Ã+ɸPp¬ŸG_>ï~[yÎ4×VŽZhÑýgá‚ÃäW«h ´ÍÓZHÑmñ€²/c‹ùÒól¿rdz˜ôÝñd=8µ÷–Îûcë ¿y‰oöI›@—·lñè˸†á®Ï’¼$ÿ¹’šy.DÖ@–† ÉÀ‚¡û+ ƒ+Àöë íT·?C7ø,dJ¼³ýtªñÅÈó¦½XÁ& —’®´Á{{wpoéyF£à¾Ûo Ä$œ Öô€+ªI<#[e˜yKøÅ2e¥X®•aZj¹<:7úb„RœñÒyðÃ(þ ˆ«´³°¤;bú CïÀ¾{ ØxSÉŒ7çs¥7›©X¾éÁ$ìTP_ É"§x‘9 S¨Ä% ð@´G\N‚åBK
+Ä–̸/›<ïðŒI ÀH0¶áT×lî*éÕÊ gÃZ>¨h*
+lNÒ0UË ‹©ªøW=ÍóX±NÐs€Þ Rtâas >M7Z;УPi`m.
+èÞ4 )Nsœ P©¬Ë¤ƒ3$q:®ƒ;ìÐ <Ö+> 9ª•9HìøI€-"ý©×åØk8«p—ºðÚWRÄ
+AE½,r"ò«CT5Sy¡u÷8¦2às
+<&”ן|†â,û~¿˜š3ƒ¾\6)n]Øj-óÖߊâžDÖüi NÁJ‡~ßÛ˜xØt «F~‰ÑŒWJ'~¾Ÿ
+†dÌ«Hù:Ø!Ffà:Ýâl†Ó1zàx‡ÁDâ Vøe+UèÖiq U±¸‡8"©wFÅxnU ‰ œº
+šãì$BJ.Ñ\ûÛ‘ažª(Γ4¤ÒŒ)›Ñ(o+”¥cPÖÚ"wÅ–ØM5 ù
+k˜¦Û”"ŸÈU”¡|6øýÆÊöÞ«îã©®b*Ø ³¨7Ô·#«ú0¦5ÀÒÈ-¾ é)¾á P‘D[=êÐÞˆ…g- ÈJ˧sÓÖ˜J™É¡hDT–±–éÁtñ9’Üs[yïvî4ÇT
+0i{ ~±w*sîãb`WÎì²{E»’ ‚én7j0qL’õÞÍ ?!Ñe×0b+8ͥ韎÷¿OeÔ‚ŠPé‡ì%ýgJ•JIÕçPZ|w?óaU(n¦šãíxsEèŽótöpJ•Íò1?ìX#//¥>†eð ¹óÌäŽ5uè‹i(Ð5ÕZ´°
+JNÐܖǹñÉœ ‡4ñé ñÓÔCó™+FNªpô÷Ü€=–j¶¤"Ø& ¿›ÅvíK
+b¹ñ%?
+¡·ioë-¦ÍŠ#H’£Ã4 ¤.ŽËØrÛòiκ=PŸW<-©ùœ–fÒ†P•éc’}¸›#ÆnÎ4»¡˜M#N机^LÙ…³ªIÓC0H±ZÈxXšhý8‰S(Ìpøù§íŒž)YÜ ®pófïØÊI@óó„Ñàþ9ZiY¨êžµÁ¹¿I7HèÛ±ŽÅV ÜÆTåI«¯s êCT³öUP2?×jU Á™LC¡A(iÆ^>YÇÒC6¼››«Aáæ:—x–yÒÚ–ý—·ÉLC©æs;+¾½¦w6wöà4ž…Ø kª§T]7è´•÷Lßp—}JT¬ ɯ/$ç Šÿ`rËZã0®^Ï¥Óô¤]–üž çxTu×$ 9$ÖØaHàä¿8iaàpfrÝ8P#*‹ßÈíõìs ×y% GîN\|Ö\u
+žÔìåþ$ômíšMâiA9äªEFÑXÙ[ÄÔ5
+ÜqÓêª]oå’"^ïùý÷W)ªó¥ØŽ$?4Do”g Irª
+׸×@FŽ±ù—à¹s ¡Åbñ£äÀ˜î®Í¢VwàÝ <[ßÌþçÍ¢øÁ½|i÷²ß…@_ÚË“Ã_Ú›{P¾´[Ï”Ð"}i¿Eíñëhÿà "$Ðü8Íï †j
+pÌÕoaÈSß @ŒS,ß@ÐàÚæÅà8*½-Þh¸Ç‹ P$(endstream
+endobj
+675 0 obj
+1892
+endobj
+680 0 obj
+<</Length 681 0 R/Filter /FlateDecode>>
+stream
+xœÍ<Ër ¹‘w~E߶èK…70·]‡×!¯76Æ–ÃÛØ¢´¢šœaÓZþýfâQ•‰G³g$Ë ¦º$‰|g¢~Ü-³Ø-ø/ÿÿí§‹—°^în .Ô¼ØÝç‹øçØý×…Sn^¿s&˜YÉݧ ÿÍÁ®on/þ¸Žÿxñã…È?– |÷ ¯¾tr'ô¬´•»×ï.DžàÔì"xégÔîõ§‹¿LòPsÒ)1Í—W:„Ù»0½‚·‹·Ê= Ž—W0F!ÍôÓ¥„g%Ãtwýøv›[Æg§q² zº;\^IçfïÃôúÒ/°%§;|ég
+~‹CƒðÁʲ¦ K˜þxWq*üíõïâŽp“3üIàŽ”7f÷ú÷¯õ—éß/¯”Ó0 î‘Å,Êh+m?n.aoF9›0 ž§7tÀ}ü¡ƒTFLïé_⎜NØ 7]±é·ˆ…š-PéÕþáÝ¥ 3Lu ŸŸ€ f^”WÓ'|/ÍbW˜y#]™Í>¤Õœ‘‘XzY€E¦'‚Üy>f²íâjH.ð½Z¤@»WÒ_/#N!xoó0½£í$(‚iX° •›ƒ[D<*)ülŒÝ)`ãEØÝëk`:ëH`SÙ=Þ€RüîŠMJ¤°KX,ì-n°y“ž ?˜;Šã-™˜ž•7ÒN{:ˆÎÎTO£¨C^-Hþþ]~rñ0BãÝñó%H%аðr"²ÁJç}>T7 ß“!œ%òRB10í&Óó ®é¼×Óg”)i”ÜÈK>]
+ ©|a¯í1#¢Ât¼Ë zF£
+í
+×ô \‡‹§§—xÒWpæpTfw…„XTH'û÷×m‹¨i!WŽï 3ó¡L-wÛ *.qv ñ Ë Ø…Ú?R(”ÆûZNà @LŸ`®v³TŽcp s¯qí&N êm "=à}‚jD =Öbåšq|ßY:Î8R™¢¸MË)‹ÛÌ¥?Àtü 媿 ¥${ŒñWœÂi¤ðˆ”R‰C³jÛGöSL‘BsÙ.éåô2Ót
+Š6hl’ à,ž©¢aøÑ%™0TôYR>0‘4N^•NøŽ©$wƒšYD—é“ýó†¿îüÚd=Jq¡#—âh_µÙ¼‚Ø÷Ìk–àæ5ɘ0L.˜íkMðYæùBKþ ·ö³XT#q¼\ †Ë Ÿ.£ó–(JƒkàÁëAf’Ú,ºì92jmÌpËÀo•ÁØ7œ ¨‚Næü
+Üj¿”¨ãD×ú%yJC$8x rA µýûJ»$iªôc£™ -[cŸF¾Mˆ›3uWâ$i=°R”[*i]‘[vä=§-2-¥ÑÛ¬:‚èx i8C « À-e