fix more line endings

git-svn-id: http://svn.osgeo.org/qgis/trunk@11650 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 13, 2009 · 44b7fd3 · 44b7fd3
1 parent e6a8c7c
commit 44b7fd3
Show file tree

Hide file tree

Showing 8 changed files with 299 additions and 299 deletions.
diff --git a/cmake/FindPostgres.cmake b/cmake/FindPostgres.cmake
@@ -1,90 +1,90 @@
-
-# CMake module to search for PostgreSQL library
-#
-# pg_config is searched for in POSTGRES_CONFIG dir,
-# default /usr/bin
-#
-# If it's found it sets POSTGRES_FOUND to TRUE
-# and following variables are set:
-#    POSTGRES_INCLUDE_DIR
-#    POSTGRES_LIBRARY
-
-IF(WIN32)
-  IF (NOT POSTGRES_INCLUDE_DIR)
-    FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h 
-      /usr/local/include 
-      /usr/include 
-      c:/msys/local/include
-      "$ENV{LIB_DIR}/include/postgresql"
-      "$ENV{LIB_DIR}/include"
-      )
-  ENDIF (NOT POSTGRES_INCLUDE_DIR)
-
-  IF (NOT POSTGRES_LIBRARY)
-    FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq libpqdll PATHS 
-      /usr/local/lib 
-      /usr/lib 
-      c:/msys/local/lib
-      "$ENV{LIB_DIR}/lib"
-      )
-  ENDIF (NOT POSTGRES_LIBRARY)
-
-ELSE(WIN32)
-  IF(UNIX) 
-
-    SET(POSTGRES_CONFIG_PREFER_PATH "$ENV{POSTGRES_HOME}/bin" CACHE STRING "preferred path to PG (pg_config)")
-    FIND_PROGRAM(POSTGRES_CONFIG pg_config
-      ${POSTGRES_CONFIG_PREFER_PATH}
-      /usr/bin/
-      )
-    # MESSAGE("DBG POSTGRES_CONFIG ${POSTGRES_CONFIG}")
-
-    IF (POSTGRES_CONFIG) 
-      # set INCLUDE_DIR
-      EXEC_PROGRAM(${POSTGRES_CONFIG}
-        ARGS --includedir
-        OUTPUT_VARIABLE PG_TMP)
-      SET(POSTGRES_INCLUDE_DIR ${PG_TMP} CACHE STRING INTERNAL)
-
-      # set LIBRARY_DIR
-      EXEC_PROGRAM(${POSTGRES_CONFIG}
-        ARGS --libdir
-        OUTPUT_VARIABLE PG_TMP)
-      IF (APPLE)
-        SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
-      ELSE (APPLE)
-        SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
-      ENDIF (APPLE)
-    ENDIF(POSTGRES_CONFIG)
-
-  ENDIF(UNIX)
-ENDIF(WIN32)
-
-IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
-   SET(POSTGRES_FOUND TRUE)
-   IF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
-     SET(HAVE_PGCONFIG TRUE)
-   ELSE(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
-     SET(HAVE_PGCONFIG FALSE)
-   ENDIF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
-ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
-
-
-IF (POSTGRES_FOUND)
-
-   IF (NOT POSTGRES_FIND_QUIETLY)
-      MESSAGE(STATUS "Found PostgreSQL: ${POSTGRES_LIBRARY}")
-   ENDIF (NOT POSTGRES_FIND_QUIETLY)
-
-ELSE (POSTGRES_FOUND)
-
-   #SET (POSTGRES_INCLUDE_DIR "")
-   #SET (POSTGRES_LIBRARY "")
-
-   IF (POSTGRES_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find PostgreSQL")
-   ELSE (POSTGRES_FIND_REQUIRED)
-      MESSAGE(STATUS "Could not find PostgreSQL")
-   ENDIF (POSTGRES_FIND_REQUIRED)
-
-ENDIF (POSTGRES_FOUND)
+
+# CMake module to search for PostgreSQL library
+#
+# pg_config is searched for in POSTGRES_CONFIG dir,
+# default /usr/bin
+#
+# If it's found it sets POSTGRES_FOUND to TRUE
+# and following variables are set:
+#    POSTGRES_INCLUDE_DIR
+#    POSTGRES_LIBRARY
+
+IF(WIN32)
+  IF (NOT POSTGRES_INCLUDE_DIR)
+    FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h 
+      /usr/local/include 
+      /usr/include 
+      c:/msys/local/include
+      "$ENV{LIB_DIR}/include/postgresql"
+      "$ENV{LIB_DIR}/include"
+      )
+  ENDIF (NOT POSTGRES_INCLUDE_DIR)
+
+  IF (NOT POSTGRES_LIBRARY)
+    FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq libpqdll PATHS 
+      /usr/local/lib 
+      /usr/lib 
+      c:/msys/local/lib
+      "$ENV{LIB_DIR}/lib"
+      )
+  ENDIF (NOT POSTGRES_LIBRARY)
+
+ELSE(WIN32)
+  IF(UNIX) 
+
+    SET(POSTGRES_CONFIG_PREFER_PATH "$ENV{POSTGRES_HOME}/bin" CACHE STRING "preferred path to PG (pg_config)")
+    FIND_PROGRAM(POSTGRES_CONFIG pg_config
+      ${POSTGRES_CONFIG_PREFER_PATH}
+      /usr/bin/
+      )
+    # MESSAGE("DBG POSTGRES_CONFIG ${POSTGRES_CONFIG}")
+
+    IF (POSTGRES_CONFIG) 
+      # set INCLUDE_DIR
+      EXEC_PROGRAM(${POSTGRES_CONFIG}
+        ARGS --includedir
+        OUTPUT_VARIABLE PG_TMP)
+      SET(POSTGRES_INCLUDE_DIR ${PG_TMP} CACHE STRING INTERNAL)
+
+      # set LIBRARY_DIR
+      EXEC_PROGRAM(${POSTGRES_CONFIG}
+        ARGS --libdir
+        OUTPUT_VARIABLE PG_TMP)
+      IF (APPLE)
+        SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
+      ELSE (APPLE)
+        SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
+      ENDIF (APPLE)
+    ENDIF(POSTGRES_CONFIG)
+
+  ENDIF(UNIX)
+ENDIF(WIN32)
+
+IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
+   SET(POSTGRES_FOUND TRUE)
+   IF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
+     SET(HAVE_PGCONFIG TRUE)
+   ELSE(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
+     SET(HAVE_PGCONFIG FALSE)
+   ENDIF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
+ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
+
+
+IF (POSTGRES_FOUND)
+
+   IF (NOT POSTGRES_FIND_QUIETLY)
+      MESSAGE(STATUS "Found PostgreSQL: ${POSTGRES_LIBRARY}")
+   ENDIF (NOT POSTGRES_FIND_QUIETLY)
+
+ELSE (POSTGRES_FOUND)
+
+   #SET (POSTGRES_INCLUDE_DIR "")
+   #SET (POSTGRES_LIBRARY "")
+
+   IF (POSTGRES_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find PostgreSQL")
+   ELSE (POSTGRES_FIND_REQUIRED)
+      MESSAGE(STATUS "Could not find PostgreSQL")
+   ENDIF (POSTGRES_FIND_REQUIRED)
+
+ENDIF (POSTGRES_FOUND)
diff --git a/cmake/FindSqlite3.cmake b/cmake/FindSqlite3.cmake
@@ -1,50 +1,50 @@
-
-# CMake module to search for Sqlite3 library
-#
-# If it's found it sets SQLITE3_FOUND to TRUE
-# and following variables are set:
-#    SQLITE3_INCLUDE_DIR
-#    SQLITE3_LIBRARY
-
-
-# FIND_PATH and FIND_LIBRARY normally search standard locations
-# before the specified paths. To search non-standard paths first,
-# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
-# and then again with no specified paths to search the default
-# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
-# searching for the same item do nothing. 
-FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
-  "$ENV{LIB_DIR}/include"
-  "$ENV{LIB_DIR}/include/sqlite"
-  #mingw
-  c:/msys/local/include
-  NO_DEFAULT_PATH
-  )
-FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h)
-
-FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_i PATHS
-  "$ENV{LIB_DIR}/lib"
-  #mingw
-  c:/msys/local/lib
-  NO_DEFAULT_PATH
-  )
-FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3)
-
-IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
-   SET(SQLITE3_FOUND TRUE)
-ENDIF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
-
-
-IF (SQLITE3_FOUND)
-
-   IF (NOT SQLITE3_FIND_QUIETLY)
-      MESSAGE(STATUS "Found Sqlite3: ${SQLITE3_LIBRARY}")
-   ENDIF (NOT SQLITE3_FIND_QUIETLY)
-
-ELSE (SQLITE3_FOUND)
-
-   IF (SQLITE3_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find Sqlite3")
-   ENDIF (SQLITE3_FIND_REQUIRED)
-
-ENDIF (SQLITE3_FOUND)
+
+# CMake module to search for Sqlite3 library
+#
+# If it's found it sets SQLITE3_FOUND to TRUE
+# and following variables are set:
+#    SQLITE3_INCLUDE_DIR
+#    SQLITE3_LIBRARY
+
+
+# FIND_PATH and FIND_LIBRARY normally search standard locations
+# before the specified paths. To search non-standard paths first,
+# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
+# and then again with no specified paths to search the default
+# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
+# searching for the same item do nothing. 
+FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
+  "$ENV{LIB_DIR}/include"
+  "$ENV{LIB_DIR}/include/sqlite"
+  #mingw
+  c:/msys/local/include
+  NO_DEFAULT_PATH
+  )
+FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h)
+
+FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_i PATHS
+  "$ENV{LIB_DIR}/lib"
+  #mingw
+  c:/msys/local/lib
+  NO_DEFAULT_PATH
+  )
+FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3)
+
+IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
+   SET(SQLITE3_FOUND TRUE)
+ENDIF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
+
+
+IF (SQLITE3_FOUND)
+
+   IF (NOT SQLITE3_FIND_QUIETLY)
+      MESSAGE(STATUS "Found Sqlite3: ${SQLITE3_LIBRARY}")
+   ENDIF (NOT SQLITE3_FIND_QUIETLY)
+
+ELSE (SQLITE3_FOUND)
+
+   IF (SQLITE3_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find Sqlite3")
+   ENDIF (SQLITE3_FIND_REQUIRED)
+
+ENDIF (SQLITE3_FOUND)
diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,6 @@
 qgis (1.3.0) UNRELEASED; urgency=low
 
-  * new development version after 1.2 branch
+  * new upstream release
   * add analysis library and raster terrain analysis plugin
   * alternativly depend on libgdal1-1.6.0-grass
   * include CONTRIBUTORS, TRANSLATORS and DONORS

diff --git a/images/svg/CMakeLists.txt b/images/svg/CMakeLists.txt
@@ -1,24 +1,24 @@
-
-SET (SVG_DIRS 
-  biology  
-  emergency  
-  entertainment  
-  geometric  
-  gpsicons    
-  icon  
-  landmark  
-  north_arrows  
-  services  
-  sport  
-  symbol  
-  transport)
-
-
-FOREACH (SVG_DIR ${SVG_DIRS})
-
-  FILE (GLOB IMAGES ${SVG_DIR}/*.svg)
-
-  INSTALL (FILES ${IMAGES}
-           DESTINATION ${QGIS_DATA_DIR}/svg/${SVG_DIR})
-
-ENDFOREACH (SVG_DIR)
+
+SET (SVG_DIRS 
+  biology  
+  emergency  
+  entertainment  
+  geometric  
+  gpsicons    
+  icon  
+  landmark  
+  north_arrows  
+  services  
+  sport  
+  symbol  
+  transport)
+
+
+FOREACH (SVG_DIR ${SVG_DIRS})
+
+  FILE (GLOB IMAGES ${SVG_DIR}/*.svg)
+
+  INSTALL (FILES ${IMAGES}
+           DESTINATION ${QGIS_DATA_DIR}/svg/${SVG_DIR})
+
+ENDFOREACH (SVG_DIR)
diff --git a/images/themes/default/CMakeLists.txt b/images/themes/default/CMakeLists.txt
@@ -1,9 +1,9 @@
-
-FILE (GLOB IMAGES *.png)
-
-INSTALL (FILES ${IMAGES}
-         DESTINATION ${QGIS_DATA_DIR}/themes/default)
-
-FILE (GLOB PLUG_IMAGES  plugins/*.png)
-
-INSTALL (FILES ${PLUG_IMAGES} DESTINATION ${QGIS_DATA_DIR}/themes/default/plugins)
+
+FILE (GLOB IMAGES *.png)
+
+INSTALL (FILES ${IMAGES}
+         DESTINATION ${QGIS_DATA_DIR}/themes/default)
+
+FILE (GLOB PLUG_IMAGES  plugins/*.png)
+
+INSTALL (FILES ${PLUG_IMAGES} DESTINATION ${QGIS_DATA_DIR}/themes/default/plugins)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,10 +1,10 @@
-
-SUBDIRS(core analysis ui gui app providers plugins helpviewer)
-
-IF (HAVE_PYTHON AND WITH_BINDINGS)
-  SUBDIRS(python)
-ENDIF (HAVE_PYTHON AND WITH_BINDINGS)
-
-IF (APPLE)
-  SUBDIRS(mac)
-ENDIF(APPLE)
+
+SUBDIRS(core analysis ui gui app providers plugins helpviewer)
+
+IF (HAVE_PYTHON AND WITH_BINDINGS)
+  SUBDIRS(python)
+ENDIF (HAVE_PYTHON AND WITH_BINDINGS)
+
+IF (APPLE)
+  SUBDIRS(mac)
+ENDIF(APPLE)