Timo Jyrinki has proposed merging lp:~timo-jyrinki/u1db-qt/fix_copyright_again_plus_rules_and_changelog into lp:u1db-qt.
Commit message: Fix license (non-"later"), remove redundant debian/* section, remove non-needed rules lines, add blank lines to the changelog. Requested reviews: Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot): continuous-integration U1DB Qt developers (uonedb-qt) For more details, see: https://code.launchpad.net/~timo-jyrinki/u1db-qt/fix_copyright_again_plus_rules_and_changelog/+merge/177754 Fix license (non-"later"), remove redundant debian/* section, remove non-needed rules lines, add blank lines to the changelog. -- https://code.launchpad.net/~timo-jyrinki/u1db-qt/fix_copyright_again_plus_rules_and_changelog/+merge/177754 Your team U1DB Qt developers is requested to review the proposed merge of lp:~timo-jyrinki/u1db-qt/fix_copyright_again_plus_rules_and_changelog into lp:u1db-qt.
=== modified file 'debian/changelog' --- debian/changelog 2013-07-30 08:53:00 +0000 +++ debian/changelog 2013-07-31 08:34:25 +0000 @@ -10,26 +10,31 @@ -- Christian Dywan <[email protected]> Mon, 01 Jul 2013 14:37:36 +0200 u1db-qt (0.1.5) quantal; urgency=low + * Add .index file for cross-linking to -doc package and set URL -- Christian Dywan <[email protected]> Mon, 13 May 2013 10:58:01 +0200 u1db-qt (0.1.4) quantal; urgency=low + * Add qch file for QtCreator to -dev package -- Christian Dywan <[email protected]> Wed, 02 May 2013 14:21:33 -0700 u1db-qt (0.1.3) quantal; urgency=low + * Add QtCreator Application templates and plugins.qmltypes to -dev package -- Christian Dywan <[email protected]> Wed, 01 May 2013 10:40:08 -0700 u1db-qt (0.1.2) quantal; urgency=low + * Documentation packages -doc and -examples -- Christian Dywan <[email protected]> Tue, 23 Apr 2013 12:58:11 +0100 u1db-qt (0.1.1-0ubuntu1) quantal; urgency=low + * Added .install files * Corrected dependencies * Drop obsolete -DWITHQT5=1 flag === modified file 'debian/copyright' --- debian/copyright 2013-07-30 08:53:00 +0000 +++ debian/copyright 2013-07-31 08:34:25 +0000 @@ -7,12 +7,11 @@ License: LGPL-3 License: LGPL-3 - This library 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, either version 3 of the License, or - (at your option) any later version. + 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 package is distributed in the hope that it will be useful, + 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. @@ -23,10 +22,6 @@ On Debian systems, the complete text of the GNU Lesser General Public License can be found in "/usr/share/common-licenses/LGPL-3". -Files: debian/* -Copyright: 2013 Canonical Ltd. -License: LGPL-3 - Files: documentation/style/reset.css Copyright: 2010, Yahoo! Inc. License: BSD-3-clause === modified file 'debian/rules' --- debian/rules 2013-07-01 12:49:49 +0000 +++ debian/rules 2013-07-31 08:34:25 +0000 @@ -7,25 +7,8 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4 %: - dh $@ --parallel + dh $@ --fail-missing --parallel override_dh_auto_configure: dh_auto_configure -- -DBUILD_DOCS=ON -override_dh_auto_build: - dh_auto_build - -override_dh_auto_clean: - dh_auto_clean - -override_dh_auto_test: - dh_auto_test - -override_dh_auto_install: - dh_auto_install - -override_dh_install: - dh_install --fail-missing - -override_dh_makeshlibs: - dh_makeshlibs -V
-- Mailing list: https://launchpad.net/~uonedb-qt Post to : [email protected] Unsubscribe : https://launchpad.net/~uonedb-qt More help : https://help.launchpad.net/ListHelp
