Merge lp:~dobey/u1db/pkg-fixings into lp:u1db

[dobey]

Fix license header in c_backend_wrapper.pyx
Set default CFLAGS so we get a debug build, and fail on compiler warnings
Only install the u1db.h file as a public include file
Fix some compiler warnings

[Eric Casteleijn (thisfred)]

yay!

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-07-11 17:11:07 +0000
+++ src/CMakeLists.txt	2012-08-14 21:13:23 +0000
@@ -1,6 +1,9 @@
 cmake_minimum_required (VERSION 2.6)
 project (u1db)
 
+# Some default CFLAGS
+SET (CMAKE_C_FLAGS "-O2 -g -Wall -Werror")
+
 # Allow specifying the libdir to use for the C library
 SET (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name.")
 SET (LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
@@ -34,5 +37,5 @@
 )
 
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/u1db DESTINATION include
-    FILES_MATCHING PATTERN "*.h"
+    FILES_MATCHING PATTERN "u1db.h"
 )

=== modified file 'src/u1db.c'
--- src/u1db.c	2012-08-10 20:08:47 +0000
+++ src/u1db.c	2012-08-14 21:13:23 +0000
@@ -195,7 +195,7 @@
 u1db_set_document_size_limit(u1database *db, int limit)
 {
     sqlite3_stmt *statement;
-    int status, final_status;
+    int status;
 
     status = sqlite3_prepare_v2(db->sql_handle,
         "INSERT OR REPLACE INTO u1db_config VALUES ('document_size_limit', ?)",

=== modified file 'src/u1db_query.c'
--- src/u1db_query.c	2012-08-09 20:46:13 +0000
+++ src/u1db_query.c	2012-08-14 21:13:23 +0000
@@ -245,11 +245,12 @@
     int arity;
     const int *value_types;
 } OPERATIONS[] = {
-    op_lower, "lower", json_type_string, 1, JUST_EXPRESSION,
-    op_number, "number", json_type_int, 2, EXPRESSION_INTEGER,
-    op_split_words, "split_words", json_type_string, 1, JUST_EXPRESSION,
-    op_bool, "bool", json_type_boolean, 1, JUST_EXPRESSION,
-    op_combine, "combine", json_type_string, -1, JUST_EXPRESSION};
+    { op_lower, "lower", json_type_string, 1, JUST_EXPRESSION },
+    { op_number, "number", json_type_int, 2, EXPRESSION_INTEGER },
+    { op_split_words, "split_words", json_type_string, 1, JUST_EXPRESSION },
+    { op_bool, "bool", json_type_boolean, 1, JUST_EXPRESSION },
+    { op_combine, "combine", json_type_string, -1, JUST_EXPRESSION },
+};
 
 static int
 extract_value(json_object *val, int value_type, string_list *values)

=== modified file 'u1db/tests/c_backend_wrapper.pyx'
--- u1db/tests/c_backend_wrapper.pyx	2012-07-26 16:24:39 +0000
+++ u1db/tests/c_backend_wrapper.pyx	2012-08-14 21:13:23 +0000
@@ -1,17 +1,19 @@
 # Copyright 2011-2012 Canonical Ltd.
 #
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+# This file is part of u1db.
+#
+# u1db is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# as published by the Free Software Foundation.
+#
+# u1db is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with u1db.  If not, see <http://www.gnu.org/licenses/>.
+#
 """A Cython wrapper around the C implementation of U1DB Database backend."""
 
 cdef extern from "Python.h":