Resolve conflicts upon pull.

diff --cc CMakeLists.txt
index faefdd2,93d3a73..6ed3161
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -373,25 -373,22 +373,26 @@@ if (BUILD_PACKAGING
      else ()
        set (CPACK_SYSTEM_NAME "win32")
      endif ()
+     set (CPACK_PACKAGE_ARCHITECTURE)
    else ()
      string (TOLOWER "${CMAKE_SYSTEM_NAME}" CPACK_SYSTEM_NAME)
 -    execute_process (
 -      COMMAND         dpkg --print-architecture
 -      RESULT_VARIABLE RV
 -      OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE
 -    )
 -    if (RV EQUAL 0)
 -          string (STRIP "${CPACK_PACKAGE_ARCHITECTURE}" CPACK_PACKAGE_ARCHITECTURE)
 +    if (CMAKE_CXX_FLAGS MATCHES "-m32")
 +      set (CPACK_PACKAGE_ARCHITECTURE i386)
      else ()
 -      execute_process (COMMAND uname -m OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE)
 -      if (CPACK_PACKAGE_ARCHITECTURE MATCHES "x86_64")
 -            set (CPACK_PACKAGE_ARCHITECTURE amd64)
 +      execute_process (
 +        COMMAND         dpkg --print-architecture
 +        RESULT_VARIABLE RV
 +        OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE
 +      )
 +      if (RV EQUAL 0)
 +            string (STRIP "${CPACK_PACKAGE_ARCHITECTURE}" CPACK_PACKAGE_ARCHITECTURE)
        else ()
 -        set (CPACK_PACKAGE_ARCHITECTURE i386)
 +        execute_process (COMMAND uname -m OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE)
 +        if (CPACK_PACKAGE_ARCHITECTURE MATCHES "x86_64")
 +              set (CPACK_PACKAGE_ARCHITECTURE amd64)
 +        else ()
 +          set (CPACK_PACKAGE_ARCHITECTURE i386)
 +        endif ()
        endif ()
      endif ()
    endif ()