Merge lp:~kalikiana/u1db-qt/pkglicense into lp:u1db-qt

[Cris Dywan]

Resolve missing copyright and license details

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:104
http://91.189.93.70:8080/job/u1db-qt-ci/10/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/u1db-qt-precise-amd64-ci/9
    SUCCESS: http://91.189.93.70:8080/job/u1db-qt-quantal-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/u1db-qt-raring-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/u1db-qt-saucy-amd64-ci/10

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/u1db-qt-ci/10/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Looks good, builds / runs tests fine.

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-07-29 10:12:58 +0000
+++ debian/control	2013-07-29 15:07:26 +0000
@@ -3,6 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
+               devscripts,
                cmake (>= 2.8.6),
                qtdeclarative5-dev,
                qtbase5-dev,

=== modified file 'documentation/style/css.css'
--- documentation/style/css.css	2013-04-08 10:32:14 +0000
+++ documentation/style/css.css	2013-07-29 15:07:26 +0000
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 @font-face {
   font-family: 'Ubuntu';
   font-style: normal;

=== modified file 'documentation/style/css_002.css'
--- documentation/style/css_002.css	2013-04-08 10:32:14 +0000
+++ documentation/style/css_002.css	2013-07-29 15:07:26 +0000
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 @font-face {
   font-family: 'Ubuntu Mono';
   font-style: normal;

=== modified file 'documentation/style/qtquick.css'
--- documentation/style/qtquick.css	2013-04-08 10:32:14 +0000
+++ documentation/style/qtquick.css	2013-07-29 15:07:26 +0000
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 @media screen
 {
 

=== modified file 'documentation/style/scratch.css'
--- documentation/style/scratch.css	2013-04-08 10:32:14 +0000
+++ documentation/style/scratch.css	2013-07-29 15:07:26 +0000
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 body {
 	margin: 0;
 }

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-04-30 00:23:18 +0000
+++ tests/CMakeLists.txt	2013-07-29 15:07:26 +0000
@@ -2,7 +2,7 @@
 
 find_package(Qt5Test REQUIRED)
 
-add_test(NAME plugintest COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/strict-qmltestrunner" "-platform" "minimal" "-import" "../modules" "-xunitxml" "-o" "plugintest-xunit.xml" "-input" "${CMAKE_CURRENT_SOURCE_DIR}")
+add_test(NAME plugintest COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/strict-qmltestrunner.sh" "-platform" "minimal" "-import" "../modules" "-xunitxml" "-o" "plugintest-xunit.xml" "-input" "${CMAKE_CURRENT_SOURCE_DIR}")
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
@@ -46,3 +46,5 @@
     endif ()
 endif ()
 
+add_test(NAME licensetest COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/checklicense.sh" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
+

=== added file 'tests/checklicense.sh'
--- tests/checklicense.sh	1970-01-01 00:00:00 +0000
+++ tests/checklicense.sh	2013-07-29 15:07:26 +0000
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+#
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+PATTERN='\.(c(c|pp|xx)?|h(h|pp|xx)?|p(l|m)|php|py(|x)|java|js|css|vala|qml|sh)$'
+SKIP='(_build|CMakeFiles|Canonical|GENERATED FILE|Yahoo! Inc. All rights reserved)'
+COMMAND="licensecheck --noconf -r * --copyright -c $PATTERN"
+echo Executing $COMMAND
+RESULTS=$($COMMAND)
+test $? = 0 || exit 1
+ERRORS=$(echo "$RESULTS" | egrep -v "$SKIP" | grep '*No copyright*')
+COUNT=$(echo "$ERRORS" | sed 's/^ *//g' | wc -l)
+if [ "$ERRORS" = "" ]; then
+    echo No license problems found.
+    exit 0
+else
+    echo Found $COUNT license problems:
+    echo "$ERRORS"
+    exit 1
+fi

=== modified file 'tests/qt-backend-wrapper.cpp'
--- tests/qt-backend-wrapper.cpp	2013-03-27 16:51:12 +0000
+++ tests/qt-backend-wrapper.cpp	2013-07-29 15:07:26 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * Authors:
+ *  Christian Dywan <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include <Python.h>
 #include "database.h"
 #include <QDebug>

=== renamed file 'tests/strict-qmltestrunner' => 'tests/strict-qmltestrunner.sh'
--- tests/strict-qmltestrunner	2013-04-30 00:23:18 +0000
+++ tests/strict-qmltestrunner.sh	2013-07-29 15:07:26 +0000
@@ -1,3 +1,20 @@
 #!/usr/bin/env sh
+#!/usr/bin/env sh
+#
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
 qmltestrunner $* || exit 1
 test 0 -eq $(grep -c qwarn plugintest-xunit.xml) || exit 1