Skip to content

Commit 953eb3a

Browse files
author
timlinux
committed
UMinor updates to install process and generated INSTALL doc using txt2tags
git-svn-id: http://svn.osgeo.org/qgis/trunk@7163 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent bc6107b commit 953eb3a

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

INSTALL

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
%!encoding: iso-8859-1
21

32

43
------------------------------------------------------------------------
@@ -773,16 +772,17 @@ above commands to select the Qt4 version of the relevant applications.
773772

774773

775774
sudo apt-get install gdal-bin libgdal1-dev libgeos-dev proj libtool \
776-
libgdal-doc libhdf4g-dev libhdf4g-run python-dev python-qt4-dev sip4 \
775+
libgdal-doc libhdf4g-dev libhdf4g-run python-dev \
777776
swig libgsl0-dev g++ libjasper-1.701-dev libtiff4-dev subversion gsl-bin \
778-
libsqlite3-dev sqlite3 ccache make libpq-dev flex bison cmake
777+
libsqlite3-dev sqlite3 ccache make libpq-dev flex bison cmake txt2tags \
778+
python-qt4 python-qt4-dev python-sip4 sip4
779779

780780

781781
/!\ Debian users should use libgdal-dev above rather
782782

783783
/!\ *Note:* For python language bindings SIP >= 4.5 and PyQt4 >= 4.1 is required! Some stable GNU/Linux
784784
distributions (e.g. Debian or SuSE) only provide SIP < 4.5 and PyQt4 < 4.1. To include support for python
785-
language bindings you need to build and install those packages from source.
785+
language bindings you may need to build and install those packages from source.
786786

787787

788788
5.5. GRASS Specific Steps

INSTALL.t2t

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -659,21 +659,17 @@ above commands to select the Qt4 version of the relevant applications.
659659

660660
```
661661
sudo apt-get install gdal-bin libgdal1-dev libgeos-dev proj libtool \
662-
libgdal-doc libhdf4g-dev libhdf4g-run python-dev python-qt4-dev sip4 \
662+
libgdal-doc libhdf4g-dev libhdf4g-run python-dev \
663663
swig libgsl0-dev g++ libjasper-1.701-dev libtiff4-dev subversion gsl-bin \
664-
libsqlite3-dev sqlite3 ccache make libpq-dev flex bison cmake txt2tags
664+
libsqlite3-dev sqlite3 ccache make libpq-dev flex bison cmake txt2tags \
665+
python-qt4 python-qt4-dev python-sip4 sip4
665666
```
666667

667668
/!\ Debian users should use libgdal-dev above rather
668669

669670
/!\ ***Note:*** For python language bindings SIP >= 4.5 and PyQt4 >= 4.1 is required! Some stable GNU/Linux
670671
distributions (e.g. Debian or SuSE) only provide SIP < 4.5 and PyQt4 < 4.1. To include support for python
671-
language bindings you need to build and install those packages from source. You can try to install them
672-
using:
673-
674-
```
675-
sudo apt-get install python-qt4 python-qt4-dev python-sip4
676-
```
672+
language bindings you may need to build and install those packages from source.
677673

678674

679675
== GRASS Specific Steps ==

0 commit comments

Comments
 (0)