kFreeBSD architecture. Strip archlist

CMakeLists.txt

@@ -53,8 +53,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 # On 32-bit systems, support files larger than 2GB
 # (see man page for feature_test_macros).
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64")
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
-	 or ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "^k?FreeBSD$")
     set(TARGET_OS_FREEBSD 1)
 else()
     message (FATAL_ERROR "Unsupported platform -- ${CMAKE_SYSTEM_NAME}")

debian/changelog

+tarantool (1.4.4+20111228-2) unstable; urgency=low
+
+  * Specify architectures.
+
+ -- Dmitry E. Oboukhov <unera@debian.org>  Wed, 28 Dec 2011 22:40:28 +0400
+
 tarantool (1.4.4+20111228-1) unstable; urgency=low
 
   * Fix build system for kFreeBSD.

debian/control

@@ -32,7 +32,7 @@ Description: high performance key/value storage server
  This package provides configs and logs infrastructure for tarantool.
 
 Package: tarantool
-Architecture: any
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}, tarantool-common
 Description: high performance key/value storage server
@@ -50,7 +50,7 @@ Description: high performance key/value storage server
  This package provides tarantool server.
 
 Package: tarantool-dbg
-Architecture: any
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Priority: extra
 Section: debug
 Depends: ${shlibs:Depends}, ${misc:Depends},
@@ -70,7 +70,7 @@ Description: high performance key/value storage server
  This package provides debug symbols for all tarantool packages.
 
 Package: tarantool-client
-Architecture: any
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: high performance key/value storage server
@@ -88,7 +88,7 @@ Description: high performance key/value storage server
  This package provides readline client for tarantool.
 
 Package: tarantool-client-dbg
-Architecture: any
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Priority: extra
 Section: debug
 Depends: ${shlibs:Depends}, ${misc:Depends},

debian/patches/kfreebsd-architecture

+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ tarantool (1.4.4+20111228-2) unstable; urgency=low
+ .
+   * Specify architectures.
+Author: Dmitry E. Oboukhov <unera@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- tarantool-1.4.4+20111228.orig/CMakeLists.txt
++++ tarantool-1.4.4+20111228/CMakeLists.txt
+@@ -53,8 +53,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux
+ # On 32-bit systems, support files larger than 2GB
+ # (see man page for feature_test_macros).
+     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64")
+-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
+-	 or ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD")
++elseif (${CMAKE_SYSTEM_NAME} MATCHES "^k?FreeBSD$")
+     set(TARGET_OS_FREEBSD 1)
+ else()
+     message (FATAL_ERROR "Unsupported platform -- ${CMAKE_SYSTEM_NAME}")

debian/patches/series

+kfreebsd-architecture

debian/rules

@@ -16,7 +16,7 @@ DEB_CMAKE_NORMAL_ARGS := -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_INSTALL_PREFIX)" \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DCMAKE_SYSCONF_DIR=/etc/tarantool \
-    -DCMAKE_LOCALSTATE_DIR=/var/lib/tarantool
+    -DCMAKE_LOCALSTATE_DIR=/var
 #     -DENABLE_STATIC=ON
 #    -DCMAKE_C_COMPILER:FILEPATH="$(CC)" \
 #    -DCMAKE_CXX_COMPILER:FILEPATH="$(CXX)" \