diff --git a/INSTALL b/INSTALL index 6fb9e28895c..ce717c162a7 100644 --- a/INSTALL +++ b/INSTALL @@ -1,10 +1,10 @@ QGIS Building QGIS from source - step by step -Tuesday September 10, 2013 +Sunday September 22, 2013 -Last Updated: Tuesday September 10, 2013 -Last Change : Tuesday September 10, 2013 +Last Updated: Sunday September 22, 2013 +Last Change : Sunday September 22, 2013 1. Introduction @@ -249,12 +249,12 @@ if you do not have edit privileges for the QGIS source repository, or use 1. Anonymous Checkout cd ${HOME}/dev/cpp - git clone git://github.com/qgis/Quantum-GIS.git + git clone git://github.com/qgis/QGIS.git 2. Developer Checkout cd ${HOME}/dev/cpp - git clone git@github.com:qgis/Quantum-GIS.git + git clone git@github.com:qgis/QGIS.git 3.7. Starting the compile @@ -269,7 +269,7 @@ development version. I suggest you do something similar: Now we create a build directory and run ccmake: - cd Quantum-GIS + cd QGIS mkdir build-master cd build-master ccmake .. @@ -326,6 +326,11 @@ you can install them using apt-get and re-run the command. using dpkg -r libqgis1-dev. Otherwise dpkg-buildpackage will complain about a build conflict. +/!\ Note: By default tests are run in the process of building and their +results are uploaded to http://dash.orfeo-toolbox.org/index.php?project=QGIS. +You can turn the tests off using DEB_BUILD_OPTIONS=nocheck in front of the +build command. The upload of results can be avoided with DEB_TEST_TARGET=test. + The packages are created in the parent directory (ie. one level up). Install them using dpkg. E.g.: @@ -504,7 +509,7 @@ may want to give it a try As for GRASS you can obtain the QGIS source code from different sources as described in section 2 above. Once you have the sources, create a build directory in them: - cd Quantum-GIS + cd QGIS mkdir build cd build @@ -637,9 +642,9 @@ installed in the default locations): @cmd Start the batch file and on the command prompt checkout the QGIS source from -git to the source directory Quantum-GIS: +git to the source directory QGIS: - git clone git://github.com/qgis/Quantum-GIS.git + git clone git://github.com/qgis/QGIS.git Create a 'build' directory somewhere. This will be where all the build output will be generated. @@ -881,7 +886,7 @@ directory and move into it Check out sources from GIT: - git clone git://github.com/qgis/Quantum-GIS.git + git clone git://github.com/qgis/QGIS.git 4.2.8. Compiling @@ -1868,18 +1873,18 @@ this. If you want to experiment with the latest development sources, go to the github QGIS project page: -http://github.com/qgis/Quantum-GIS +http://github.com/qgis/QGIS It should default to the master branch. Click the Downloads button and select Download .tar.gz. Double-click the tarball to unzip it. Alternatively, install git from http://git-scm.com and do the following. -Make a specific repository directory somewhere, e.g. ~/QGIS/Quantum-GIS, and cd +Make a specific repository directory somewhere, e.g. ~/QGIS/QGIS, and cd into it. The following will read-only clone the master branch to the directory: git init - git remote add -f -t master -m master qgisupstream git://github.com/qgis/Quantum-GIS.git + git remote add -f -t master -m master qgisupstream git://github.com/qgis/QGIS.git git merge qgisupstream @@ -2071,7 +2076,7 @@ Then do: chmod +x cgi-bin/wcstest-1.9.0 mkdir -p /var/www/wcs/testdata/qgis-1.9.0/raster/ cd /var/www/wcs/testdata/qgis-1.9.0/raster/ - cp -r /home/timlinux/Quantum-GIS/tests/testdata/raster/* . + cp -r /home/timlinux/QGIS/tests/testdata/raster/* . Edit wcs.map and set the shapepath to this: @@ -2179,9 +2184,9 @@ procedure is: - Tick enable project based security (you need to elsewhere configure your Jenkins security to per project settings) - Allow Anonymous user Read and Discover access - - Set the github project to https://github.com/qgis/Quantum-GIS/ + - Set the github project to https://github.com/qgis/QGIS/ - Set source code management to Git - - Set repository url to git://github.com/qgis/Quantum-GIS.git + - Set repository url to git://github.com/qgis/QGIS.git - In advanced repository url settings set refspec to : +refs/heads/master:refs/remotes/origin/master diff --git a/debian/compat.jessie b/debian/compat.jessie new file mode 100644 index 00000000000..45a4fb75db8 --- /dev/null +++ b/debian/compat.jessie @@ -0,0 +1 @@ +8 diff --git a/debian/compat.saucy b/debian/compat.saucy new file mode 100644 index 00000000000..7f8f011eb73 --- /dev/null +++ b/debian/compat.saucy @@ -0,0 +1 @@ +7 diff --git a/debian/control.jessie b/debian/control.jessie new file mode 100644 index 00000000000..8206b255285 --- /dev/null +++ b/debian/control.jessie @@ -0,0 +1,227 @@ +Source: qgis +Section: science +Priority: extra +Maintainer: QGIS developers +Build-Depends: + bison, + cmake (>= 2.8), + debhelper (>= 9), + flex, + grass-dev, + libexpat1-dev, + libfcgi-dev, + libgdal1-dev, + libgeos-dev (>= 3.0.0), + libgsl0-dev, + libpq-dev, + libproj-dev, + libqt4-dev (>=4.6.0), + libqt4-opengl-dev, + libqtwebkit-dev, + libqwt-dev, + libspatialite-dev, + libsqlite3-dev, + libspatialindex-dev, + pkg-config, + pyqt4-dev-tools, + python, + python-dev (>= 2.6.6-3~), + python-qt4 (>=4.1.0), + python-qt4-dev (>=4.1.0), + python-sip (>= 4.5.0), + python-sip-dev (>= 4.5.0), + libosgearth-dev, + libopenscenegraph-dev, + git, + doxygen, + graphviz, + txt2tags, + xvfb, xauth, + xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable +Build-Conflicts: libqgis-dev, qgis-dev +Standards-Version: 3.9.3 +XS-Python-Version: current +Homepage: http://qgis.org/ + +Package: qgis +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version}) +Recommends: qgis-plugin-grass, python-qgis +#, qgis-plugin-globe +Suggests: gpsbabel +Conflicts: uim-qt3 +Description: Geographic Information System (GIS) + A Geographic Information System (GIS) manages, analyzes, and displays + databases of geographic information. QGIS supports shape file viewing and + editing, spatial data storage with PostgreSQL/PostGIS, projection on-the-fly, + map composition, and a number of other features via a plugin interface. QGIS + also supports display of various georeferenced raster and Digital Elevation + Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid, and USGS ASCII + DEM. + +Package: qgis-common +Architecture: all +Depends: ${misc:Depends} +Description: QGIS - architecture-independent data + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains architecture-independent supporting data files for use + with QGIS. + +Package: libqgis{QGIS_ABI} +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1 +Description: QGIS - shared libraries + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the shared core and gui library that provide an + interface for plugins and stand-alone applications. + +Package: libqgis-dev +Architecture: any +Section: libdevel +Depends: + grass-dev, + libexpat1-dev, + libgdal1-dev, + libgeos-dev (>= 3.0.0), + libgsl0-dev, + libpq-dev, + libproj-dev, + libqgis{QGIS_ABI} (= ${binary:Version}), + libqt4-dev (>=4.6.0), + libsqlite3-dev, + python-qt4 (>=4.1.0), + python-qt4-dev (>=4.1.0), + qt4-designer (>=4.4.0), + ${misc:Depends} +Provides: qgis-dev +Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev +Description: QGIS - development files + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the headers and libraries needed to develop plugins for + QGIS. + +Package: qgis-plugin-grass +Architecture: any +Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass{GRASS_ABI} +Description: GRASS plugin for QGIS + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This plugin enables GRASS data access in the QGIS geographic data viewer. + +Package: qgis-plugin-grass-common +Architecture: all +Depends: python, ${python:Depends}, ${misc:Depends} +Replaces: qgis-common (<< 1.5) +Breaks: qgis-common (<< 1.5) +Description: GRASS plugin for QGIS - architecture-independent data + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains architecture-independent supporting data files for use + with the QGIS GRASS plugin. + +Package: python-qgis +Section: python +Architecture: any +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), + python-psycopg2, python-qscintilla2, + python-pyspatialite, + ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends} +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Python bindings to QGIS + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the files for the Python support. + +Package: python-qgis-common +Section: python +Architecture: all +Provides: ${python:Provides} +Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends} +XB-Python-Version: ${python:Versions} +Description: Python bindings to QGIS - architecture-independent files + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains architecture-independent files for the QGIS Python + bindings. + +Package: qgis-providers +Architecture: any +Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: qgis (<= 1.6) +Breaks: qgis (<= 1.6) +Description: collection of data providers to QGIS + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the provider plugins for QGIS. + +Package: qgis-providers-common +Architecture: all +Replaces: qgis-common (<= 1.6) +Breaks: qgis-common (<= 1.6) +Depends: ${misc:Depends} +Description: collection of data providers to QGIS - architecture-independent files + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains architecture-independent files for the QGIS providers. + +Package: qgis-mapserver +Architecture: any +Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: QGIS mapserver + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the QGIS mapserver. + +Package: qgis-sqlanywhere +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0 +Description: QGIS sql anywhere plugin and provider + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the QGIS sqlanywhere plugin and provider. + +Package: qgis-api-doc +Architecture: all +Section: doc +Depends: libjs-jquery +Description: QGIS API documentation + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the QGIS API documentation. + +#Package: qgis-plugin-globe +#Architecture: any +#Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +#Description: OSG globe plugin for QGIS +# QGIS is a Geographic Information System (GIS) which manages, analyzes and +# display databases of geographic information. +# . +# This plugin enables 3D viewing using OSG globe in the QGIS. + +#Package: qgis-plugin-globe-common +#Architecture: all +#Description: OSG GLOBE plugin for QGIS - architecture-independent data +# QGIS is a Geographic Information System (GIS) which manages, analyzes and +# display databases of geographic information. +# . +# This package contains architecture-independent supporting data files for use +# with the QGIS GLOBE plugin. + diff --git a/debian/control.saucy b/debian/control.saucy new file mode 100644 index 00000000000..abab52f3151 --- /dev/null +++ b/debian/control.saucy @@ -0,0 +1,227 @@ +Source: qgis +Section: science +Priority: extra +Maintainer: QGIS developers +Build-Depends: + bison, + cmake (>= 2.8), + debhelper (>= 7), + flex, + grass-dev, + libexpat1-dev, + libfcgi-dev, + libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0), + libgeos-dev (>= 3.0.0), + libgsl0-dev, + libpq-dev, + libproj-dev, + libqt4-dev (>=4.6.0), + libqt4-opengl-dev, + libqtwebkit-dev, + libqwt5-qt4-dev, + libspatialite-dev, + libsqlite3-dev, + libspatialindex-dev, + pkg-config, + pyqt4-dev-tools, + python, + python-central (>=0.5), + python-dev, + libpython2.7-dev, + python-qt4 (>=4.1.0), + python-qt4-dev (>=4.1.0), + python-sip (>= 4.5.0), + python-sip-dev (>= 4.5.0), + libosgearth-dev, + libopenscenegraph-dev, + git, + doxygen, + graphviz, + txt2tags, + xvfb, xauth, + xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable +Build-Conflicts: libqgis-dev, qgis-dev +Standards-Version: 3.8.4 +XS-Python-Version: current +Homepage: http://qgis.org/ + +Package: qgis +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version}) +Recommends: qgis-plugin-grass, python-qgis, qgis-plugin-globe +Suggests: gpsbabel +Conflicts: uim-qt3 +Description: Geographic Information System (GIS) + A Geographic Information System (GIS) manages, analyzes, and displays + databases of geographic information. QGIS supports shape file viewing and + editing, spatial data storage with PostgreSQL/PostGIS, projection on-the-fly, + map composition, and a number of other features via a plugin interface. QGIS + also supports display of various georeferenced raster and Digital Elevation + Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid, and USGS ASCII + DEM. + +Package: qgis-common +Architecture: all +Depends: ${misc:Depends} +Description: QGIS - architecture-independent data + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains architecture-independent supporting data files for use + with QGIS. + +Package: libqgis{QGIS_ABI} +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1 +Description: QGIS - shared libraries + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the shared core and gui library that provide an + interface for plugins and stand-alone applications. + +Package: libqgis-dev +Architecture: any +Section: libdevel +Depends: + grass-dev, + libexpat1-dev, + libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0), + libgeos-dev (>= 3.0.0), + libgsl0-dev, + libpq-dev, + libproj-dev, + libqgis{QGIS_ABI} (= ${binary:Version}), + libqt4-dev (>=4.6.0), + libsqlite3-dev, + python-qt4 (>=4.1.0), + python-qt4-dev (>=4.1.0), + qt4-designer (>=4.6.0), + ${misc:Depends} +Provides: qgis-dev +Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev +Description: QGIS - development files + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the headers and libraries needed to develop plugins for + QGIS. + +Package: qgis-plugin-grass +Architecture: any +Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass{GRASS_ABI} +Description: GRASS plugin for QGIS + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This plugin enables GRASS data access in the QGIS geographic data viewer. + +Package: qgis-plugin-grass-common +Architecture: all +Depends: ${python:Depends}, ${misc:Depends} +Replaces: qgis-common (<< 1.5) +Breaks: qgis-common (<< 1.5) +Description: GRASS plugin for QGIS - architecture-independent data + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains architecture-independent supporting data files for use + with the QGIS GRASS plugin. + +Package: python-qgis +Section: python +Architecture: any +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), + python-psycopg2, python-qscintilla2, + ${python:Depends}, ${misc:Depends}, ${sip:Depends} +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Python bindings to QGIS + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the files for the Python support. + +Package: python-qgis-common +Section: python +Architecture: all +Provides: ${python:Provides} +Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends} +XB-Python-Version: ${python:Versions} +Description: Python bindings to QGIS - architecture-independent files + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains architecture-independent files for the QGIS Python + bindings. + +Package: qgis-providers +Architecture: any +Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: qgis (<= 1.6) +Breaks: qgis (<= 1.6) +Description: collection of data providers to QGIS + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the provider plugins for QGIS. + +Package: qgis-providers-common +Architecture: all +Replaces: qgis-common (<= 1.6) +Breaks: qgis-common (<= 1.6) +Depends: ${misc:Depends} +Description: collection of data providers to QGIS - architecture-independent files + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains architecture-independent files for the QGIS providers. + +Package: qgis-mapserver +Architecture: any +Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: QGIS mapserver + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the QGIS mapserver. + +Package: qgis-sqlanywhere +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0 +Description: QGIS sql anywhere plugin and provider + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the QGIS sqlanywhere plugin and provider. + +Package: qgis-api-doc +Architecture: all +Section: doc +Depends: libjs-jquery +Description: QGIS API documentation + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the QGIS API documentation. + +Package: qgis-plugin-globe +Architecture: any +Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: OSG globe plugin for QGIS + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This plugin enables 3D viewing using OSG globe in the QGIS. + +Package: qgis-plugin-globe-common +Architecture: all +Description: OSG GLOBE plugin for QGIS - architecture-independent data + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains architecture-independent supporting data files for use + with the QGIS GLOBE plugin. + diff --git a/debian/python-qgis.install.jessie b/debian/python-qgis.install.jessie new file mode 100644 index 00000000000..4d8b1c90fed --- /dev/null +++ b/debian/python-qgis.install.jessie @@ -0,0 +1,3 @@ +usr/lib/python*/*-packages/qgis/*.py +usr/lib/python*/*-packages/qgis/*.so +usr/lib/libqgispython.so.{QGIS_ABI} diff --git a/debian/python-qgis.install.saucy b/debian/python-qgis.install.saucy new file mode 100644 index 00000000000..5d0c905c7b8 --- /dev/null +++ b/debian/python-qgis.install.saucy @@ -0,0 +1,5 @@ +usr/lib/python*/*-packages/qgis/*.py +usr/lib/python*/*-packages/qgis/*.so +usr/lib/python*/*-packages/pyspatialite/*.py +usr/lib/python*/*-packages/pyspatialite/*.so +usr/lib/libqgispython.so.{QGIS_ABI} diff --git a/debian/rules b/debian/rules index 70c3abd35ba..87ffcf92d3f 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ ifeq (,$(DISTRIBUTION)) DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p") endif -ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick natty oneiric precise quantal raring sid-oracle")) +ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"squeeze wheezy jessie lucid maverick natty oneiric precise quantal raring saucy sid-oracle")) DISTRIBUTION := sid endif @@ -70,7 +70,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) endif -ifneq (,$(findstring $(DISTRIBUTION),"squeeze wheezy sid lucid maverick natty oneiric precise raring")) +ifneq (,$(findstring $(DISTRIBUTION),"squeeze wheezy jessie sid lucid maverick natty oneiric precise raring saucy")) CMAKE_OPTS += -D WITH_PYSPATIALITE=TRUE endif @@ -84,7 +84,7 @@ else CMAKE_OPTS += -D WITH_GLOBE=TRUE endif -ifneq (,$(findstring $(DISTRIBUTION),"raring sid sid-oracle")) +ifneq (,$(findstring $(DISTRIBUTION),"raring saucy sid sid-oracle")) CMAKE_OPTS += -D PYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so endif @@ -92,7 +92,7 @@ ifneq (,$(findstring -oracle,$(DISTRIBUTION))) CMAKE_OPTS += -D WITH_ORACLE=TRUE endif -ifneq (,$(findstring $(DISTRIBUTION),"wheezy sid")) +ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie saucy sid")) CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) @@ -233,7 +233,7 @@ binary-arch: build install ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"natty oneiric")) dh_sip endif -ifneq (,$(findstring $(DISTRIBUTION),"wheezy sid quantal raring")) +ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie sid quantal raring saucy")) dh_python2 --no-guessing-versions else dh_pycentral diff --git a/doc/INSTALL.html b/doc/INSTALL.html index be4e73a4708..09b249b9354 100644 --- a/doc/INSTALL.html +++ b/doc/INSTALL.html @@ -77,13 +77,13 @@ label{ background-color: #FFFFCC;

-Last Updated: Saturday July 27, 2013 -Last Change : Saturday July 27, 2013 +Last Updated: Sunday September 22, 2013 +Last Change : Sunday September 22, 2013

@@ -423,7 +423,7 @@ if you do not have edit privileges for the QGIS source repository, or use
 cd ${HOME}/dev/cpp 
-git clone git://github.com/qgis/Quantum-GIS.git
+git clone git://github.com/qgis/QGIS.git
 

@@ -432,7 +432,7 @@ git clone git://github.com/qgis/Quantum-GIS.git

 cd ${HOME}/dev/cpp 
-git clone git@github.com:qgis/Quantum-GIS.git
+git clone git@github.com:qgis/QGIS.git
 
@@ -454,7 +454,7 @@ Now we create a build directory and run ccmake:

-cd Quantum-GIS
+cd QGIS
 mkdir build-master
 cd build-master
 ccmake ..
@@ -539,6 +539,12 @@ using dpkg -r libqgis1-dev.  Otherwise dpkg-buildpackage
 

+/!\ Note: By default tests are run in the process of building and their +results are uploaded to http://dash.orfeo-toolbox.org/index.php?project=QGIS. +You can turn the tests off using DEB_BUILD_OPTIONS=nocheck in front of the +build command. The upload of results can be avoided with DEB_TEST_TARGET=test. +

+

The packages are created in the parent directory (ie. one level up). Install them using dpkg. E.g.:

@@ -808,7 +814,7 @@ in section 2 above. Once you have the sources, create a build directory in them:

-cd Quantum-GIS
+cd QGIS
 mkdir build
 cd build
 
@@ -1001,11 +1007,11 @@ call "%OSGEO4W_ROOT%\bin\o4w_env.bat"

Start the batch file and on the command prompt checkout the QGIS source from -git to the source directory Quantum-GIS: +git to the source directory QGIS:

-git clone git://github.com/qgis/Quantum-GIS.git
+git clone git://github.com/qgis/QGIS.git
 

@@ -1305,7 +1311,7 @@ Check out sources from GIT:

-git clone git://github.com/qgis/Quantum-GIS.git
+git clone git://github.com/qgis/QGIS.git
 

4.2.8. Compiling

@@ -2625,7 +2631,7 @@ If you want to experiment with the latest development sources, go to the github QGIS project page:

-http://github.com/qgis/Quantum-GIS +http://github.com/qgis/QGIS

It should default to the master branch. Click the Downloads button and @@ -2635,13 +2641,13 @@ select Download .tar.gz. Double-click the tarball to unzip it. Alternatively, install git from http://git-scm.com and do the following.

-Make a specific repository directory somewhere, e.g. ~/QGIS/Quantum-GIS, and cd +Make a specific repository directory somewhere, e.g. ~/QGIS/QGIS, and cd into it. The following will read-only clone the master branch to the directory:

 git init
-git remote add -f -t master -m master qgisupstream git://github.com/qgis/Quantum-GIS.git
+git remote add -f -t master -m master qgisupstream git://github.com/qgis/QGIS.git
 git merge qgisupstream
 
 
@@ -2907,7 +2913,7 @@ Then do: chmod +x cgi-bin/wcstest-1.9.0 mkdir -p /var/www/wcs/testdata/qgis-1.9.0/raster/ cd /var/www/wcs/testdata/qgis-1.9.0/raster/ - cp -r /home/timlinux/Quantum-GIS/tests/testdata/raster/* . + cp -r /home/timlinux/QGIS/tests/testdata/raster/* .

@@ -3037,9 +3043,9 @@ procedure is:

  • Tick enable project based security (you need to elsewhere configure your Jenkins security to per project settings)
  • Allow Anonymous user Read and Discover access -
  • Set the github project to https://github.com/qgis/Quantum-GIS/ +
  • Set the github project to https://github.com/qgis/QGIS/
  • Set source code management to Git -
  • Set repository url to git://github.com/qgis/Quantum-GIS.git +
  • Set repository url to git://github.com/qgis/QGIS.git
  • In advanced repository url settings set refspec to :

    diff --git a/doc/linux.t2t b/doc/linux.t2t index 611f1160c8f..ecb92b81eba 100644 --- a/doc/linux.t2t +++ b/doc/linux.t2t @@ -222,6 +222,11 @@ you can install them using ``apt-get`` and re-run the command. using ``dpkg -r libqgis1-dev``. Otherwise ``dpkg-buildpackage`` will complain about a build conflict. +/!\ **Note:** By default tests are run in the process of building and their +results are uploaded to http://dash.orfeo-toolbox.org/index.php?project=QGIS. +You can turn the tests off using DEB_BUILD_OPTIONS=nocheck in front of the +build command. The upload of results can be avoided with DEB_TEST_TARGET=test. + The packages are created in the parent directory (ie. one level up). Install them using dpkg. E.g.: