Merge pull request #3 from qgis/master

Merge pull request #2 from qgis/master for Korean trans

INSTALL

@@ -1,10 +1,10 @@
 QGIS
 Building QGIS from source - step by step
-Thursday March 06, 2014
+Wednesday June 18, 2014
 
 
-Last Updated: Thursday March 06, 2014
-Last Change : Thursday March 06, 2014
+Last Updated: Wednesday June 18, 2014
+Last Change : Wednesday June 18, 2014
 
 
   1. Introduction
@@ -559,16 +559,17 @@ build QGIS.
 
 The free (as in free beer) Express Edition installer is available under:
 
+Currently we use Visual C++ 2008 Express for 32bit builds:
+
   http://download.microsoft.com/download/d/c/3/dc3439e7-5533-4f4c-9ba0-8577685b6e7e/vcsetup.exe
 
-The optional products are not necessary.  In the process the Windows SDKs for
-Visual Studio 2008 will also be downloaded and installed.
+And Visual C++ 2010 Express for 64bit builds:
 
-You also need the Microsoft Windows Server(R) 2003 R2 Platform SDK (for setupapi):
+  http://download.microsoft.com/download/c/d/7/cd7d4dfb-5290-4cc7-9f85-ab9e3c9af796/vc_web.exe
 
-  http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe
+You also need the Windows SDK for Windows 7 and .NET Framework 4:
 
-You only need Microsoft Windows Core SDK / Build Environment (x86 32-Bit).
+  http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe
 
 
     4.1.2. Other tools and dependencies
@@ -577,15 +578,18 @@ You only need Microsoft Windows Core SDK / Build Environment (x86 32-Bit).
 Download and install following packages:
 
   || Tool | Website |
-  | CMake | http://www.cmake.org/files/v2.8/cmake-2.8.4-win32-x86.exe |
+  | CMake | http://www.cmake.org/files/v2.8/cmake-2.8.12.2-win32-x86.exe |
   | Flex | http://gnuwin32.sourceforge.net/downlinks/flex.php |
   | Bison | http://gnuwin32.sourceforge.net/downlinks/bison.php |
-  | SVN | http://sourceforge.net/projects/win32svn/files/1.6.13/Setup-Subversion-1.6.13.msi/download |
-  | or GIT | http://msysgit.googlecode.com/files/Git-1.7.4-preview20110204.exe | 
-  | OSGeo4W | http://download.osgeo.org/osgeo4w/osgeo4w-setup.exe |
+  | GIT | https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe | 
+  | OSGeo4W | http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86.exe (32bit) or http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe (64bit) |
+
+You can also use flex, bison & git from
+
+  http://cygwin.com
 
 OSGeo4W does not only provide ready packages for the current QGIS release and
-nightly builds of the trunk, but also offers most of the dependencies needs to
+nightly builds of master, but also offers most of the dependencies needs to
 build it.
 
 For the QGIS build you need to install following packages from OSGeo4W (select
@@ -607,11 +611,6 @@ Advanced Installation):
 
 This will also select packages the above packages depend on.
 
-Additionally QGIS also needs the include file unistd.h, which normally
-doesn't exist on Windows.  It's shipped with Flex/Bison in GnuWin32\include
-and needs to be copied into the VC\include directory of your Visual C++
-installation.
-
 Earlier versions of this document also covered how to build all above
 dependencies.  If you're interested in that, check the history of this page in the Wiki
 or the SVN repository.

cmake/QsciAPI.cmake

@@ -27,6 +27,7 @@ FOREACH(apiFile qgis.core.api qgis.gui.api qgis.analysis.api qgis.networkanalysi
   IF(EXISTS "${api}")
     FILE(READ "${api}" FILE_CONTENT)
     STRING(REGEX REPLACE "([^\n]+)" "qgis.\\1" MODIFIED_CONTENT "${FILE_CONTENT}")
-    FILE(APPEND "${QGIS_PYTHON_API_FILE}" "${MODIFIED_CONTENT}")
+    STRING(REPLACE "qgis._" "qgis." REPLACE_CONTENT "${MODIFIED_CONTENT}")
+    FILE(APPEND "${QGIS_PYTHON_API_FILE}" "${REPLACE_CONTENT}")
   ENDIF(EXISTS "${api}")
 ENDFOREACH(apiFile)

debian/rules

@@ -73,6 +73,10 @@ ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie sid precise quantal raring s
 	CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
 endif
 
+ifneq (,$(findstring $(DISTRIBUTION),"sid sid-oracle"))
+	CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
+endif
+
 ifneq (,$(findstring $(DISTRIBUTION),"jessie raring saucy trusty sid sid-oracle"))
 	CMAKE_OPTS += -DPYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
 endif

doc/CONTRIBUTORS

@@ -20,6 +20,7 @@ Denis Rouzaud
 Diego Moreira
 Duarte Carreira
 Etienne Tourigny
+Even Rouault
 Faunalia (http://www.faunalia.it)
 Fernando Pacheco
 Florian El Ahdab
@@ -41,6 +42,7 @@ Marco Pasetti
 Mark Baas
 Markus Neteler
 Mathias Walker
+Mathieu Pellerin
 Matt Amos
 Matthias Kuhn
 Maurizio Napolitano

doc/INSTALL.html

@@ -77,13 +77,13 @@
 <DIV CLASS="header" ID="header">
 <H1>QGIS</H1>
 <H2>Building QGIS from source - step by step</H2>
-<H3>Thursday March 06, 2014</H3>
+<H3>Wednesday June 18, 2014</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Thursday March 06, 2014
-Last Change : Thursday March 06, 2014
+Last Updated: Wednesday June 18, 2014
+Last Change : Wednesday June 18, 2014
 </P>
 <DIV CLASS="toc">
 
@@ -880,23 +880,25 @@ <H3>4.1.1. Visual C++ Express Edition</H3>
 
 <P>
 The free (as in free beer) Express Edition installer is available under:
+</P>
+<P>
+Currently we use Visual C++ 2008 Express for 32bit builds:
 </P>
 	<BLOCKQUOTE>
 	<A HREF="http://download.microsoft.com/download/d/c/3/dc3439e7-5533-4f4c-9ba0-8577685b6e7e/vcsetup.exe">http://download.microsoft.com/download/d/c/3/dc3439e7-5533-4f4c-9ba0-8577685b6e7e/vcsetup.exe</A>
 	</BLOCKQUOTE>
 <P>
-The optional products are not necessary.  In the process the Windows SDKs for
-Visual Studio 2008 will also be downloaded and installed.
-</P>
-<P>
-You also need the Microsoft Windows Server&reg; 2003 R2 Platform SDK (for setupapi):
+And Visual C++ 2010 Express for 64bit builds:
 </P>
 	<BLOCKQUOTE>
-	<A HREF="http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe">http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe</A>
+	<A HREF="http://download.microsoft.com/download/c/d/7/cd7d4dfb-5290-4cc7-9f85-ab9e3c9af796/vc_web.exe">http://download.microsoft.com/download/c/d/7/cd7d4dfb-5290-4cc7-9f85-ab9e3c9af796/vc_web.exe</A>
 	</BLOCKQUOTE>
 <P>
-You only need Microsoft Windows Core SDK / Build Environment (x86 32-Bit).
+You also need the Windows SDK for Windows 7 and .NET Framework 4:
 </P>
+	<BLOCKQUOTE>
+	<A HREF="http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe">http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe</A>
+	</BLOCKQUOTE>
 
 <H3>4.1.2. Other tools and dependencies</H3>
 
@@ -911,7 +913,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
 </TR>
 <TR>
 <TD>CMake</TD>
-<TD><A HREF="http://www.cmake.org/files/v2.8/cmake-2.8.4-win32-x86.exe">http://www.cmake.org/files/v2.8/cmake-2.8.4-win32-x86.exe</A></TD>
+<TD><A HREF="http://www.cmake.org/files/v2.8/cmake-2.8.12.2-win32-x86.exe">http://www.cmake.org/files/v2.8/cmake-2.8.12.2-win32-x86.exe</A></TD>
 </TR>
 <TR>
 <TD>Flex</TD>
@@ -922,22 +924,24 @@ <H3>4.1.2. Other tools and dependencies</H3>
 <TD><A HREF="http://gnuwin32.sourceforge.net/downlinks/bison.php">http://gnuwin32.sourceforge.net/downlinks/bison.php</A></TD>
 </TR>
 <TR>
-<TD>SVN</TD>
-<TD><A HREF="http://sourceforge.net/projects/win32svn/files/1.6.13/Setup-Subversion-1.6.13.msi/download">http://sourceforge.net/projects/win32svn/files/1.6.13/Setup-Subversion-1.6.13.msi/download</A></TD>
-</TR>
-<TR>
-<TD>or GIT</TD>
-<TD><A HREF="http://msysgit.googlecode.com/files/Git-1.7.4-preview20110204.exe">http://msysgit.googlecode.com/files/Git-1.7.4-preview20110204.exe</A></TD>
+<TD>GIT</TD>
+<TD><A HREF="https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe">https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe</A></TD>
 </TR>
 <TR>
 <TD>OSGeo4W</TD>
-<TD><A HREF="http://download.osgeo.org/osgeo4w/osgeo4w-setup.exe">http://download.osgeo.org/osgeo4w/osgeo4w-setup.exe</A></TD>
+<TD><A HREF="http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86.exe">http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86.exe</A> (32bit) or <A HREF="http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe">http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe</A> (64bit)</TD>
 </TR>
 </TABLE>
 
+<P>
+You can also use flex, bison &amp; git from
+</P>
+	<BLOCKQUOTE>
+	<A HREF="http://cygwin.com">http://cygwin.com</A>
+	</BLOCKQUOTE>
 <P>
 OSGeo4W does not only provide ready packages for the current QGIS release and
-nightly builds of the trunk, but also offers most of the dependencies needs to
+nightly builds of master, but also offers most of the dependencies needs to
 build it.
 </P>
 <P>
@@ -959,22 +963,13 @@ <H3>4.1.2. Other tools and dependencies</H3>
 <LI>spatialite
 <LI>libspatialindex-devel
 <LI>python-qscintilla
-</UL>
-
-<P>
+<P></P>
 This will also select packages the above packages depend on.
-</P>
-<P>
-Additionally QGIS also needs the include file <CODE>unistd.h</CODE>, which normally
-doesn't exist on Windows.  It's shipped with Flex/Bison in <CODE>GnuWin32\include</CODE>
-and needs to be copied into the <CODE>VC\include</CODE> directory of your Visual C++
-installation.
-</P>
-<P>
+<P></P>
 Earlier versions of this document also covered how to build all above
 dependencies.  If you're interested in that, check the history of this page in the Wiki
 or the SVN repository.
-</P>
+</UL>
 
 <H3>4.1.3. Setting up the Visual Studio project with CMake</H3>