uonedb-qt team mailing list archive

[Timo Jyrinki <timo.jyrinki@xxxxxxxxxxxxx>]

Timo Jyrinki has proposed merging lp:~timo-jyrinki/u1db-qt/fix_copyright_add_bootstrap_wrapandsort into lp:u1db-qt.

Commit message:
Bootstrap, fix debian/copyright, run wrap-and-sort -a -t

Requested reviews:
  U1DB Qt developers (uonedb-qt)

For more details, see:
https://code.launchpad.net/~timo-jyrinki/u1db-qt/fix_copyright_add_bootstrap_wrapandsort/+merge/177533

Bootstrap, fix debian/copyright, run wrap-and-sort -a -t

Adds Yahoo copyright, puts debian/copyright into machine readable form, adds a required bootstrap changelog entry and run wrap-and-sort command to cleanup.
-- 
https://code.launchpad.net/~timo-jyrinki/u1db-qt/fix_copyright_add_bootstrap_wrapandsort/+merge/177533
Your team U1DB Qt developers is requested to review the proposed merge of lp:~timo-jyrinki/u1db-qt/fix_copyright_add_bootstrap_wrapandsort into lp:u1db-qt.

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-29 10:52:07 +0000
+++ debian/changelog	2013-07-30 08:56:27 +0000
@@ -1,8 +1,12 @@
 u1db-qt (0.1.5-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Christian Dywan ]
   * Debian packaging tweaks according to
     https://wiki.ubuntu.com/DailyRelease/InlinePackaging
 
+  [ Timo Jyrinki ]
+  * Automatic snapshot from revision 94 (bootstrap)
+
  -- Christian Dywan <christian.dywan@xxxxxxxxxxxxx>  Mon, 01 Jul 2013 14:37:36 +0200
 
 u1db-qt (0.1.5) quantal; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-07-29 13:48:38 +0000
+++ debian/control	2013-07-30 08:56:27 +0000
@@ -2,40 +2,41 @@
 Section: libs
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@xxxxxxxxxxxxxxxx>
-Build-Depends: debhelper (>= 9),
+Build-Depends: cmake (>= 2.8.6),
+               dbus-test-runner,
+               debhelper (>= 9),
                devscripts,
-               cmake (>= 2.8.6),
+               libqt5sql5-sqlite,
+               qt5-default,
+               qtbase5-dev,
                qtdeclarative5-dev,
-               qtbase5-dev,
-               dbus-test-runner,
-               qt5-default,
+               qtdeclarative5-dev-tools,
+               qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,
-               qtdeclarative5-qtquick2-plugin,
-               libqt5sql5-sqlite,
                qttools5-dev-tools,
                ubuntu-ui-toolkit-doc,
-               qtdeclarative5-dev-tools
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/u1db-qt
 Vcs-Bzr: https://code.launchpad.net/u1db-qt/trunk
 
 Package: libu1db-qt5-3
 Architecture: any
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
+Depends: libqt5sql5-sqlite,
          qtdeclarative5-qtquick2-plugin,
-         libqt5sql5-sqlite
+         ${misc:Depends},
+         ${shlibs:Depends},
 Description: Qt5 binding and QtQuick2 plugin for U1DB - shared library
  Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
 
 Package: libu1db-qt5-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends},
-         libu1db-qt5-3 (= ${binary:Version}),
+Depends: libu1db-qt5-3 (= ${binary:Version}),
+         qtbase5-dev,
          qtdeclarative5-dev,
-         qtbase5-dev
+         ${misc:Depends},
 Description: Qt5 binding and QtQuick2 plugin for U1DB - development files
  Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
  .
@@ -44,8 +45,8 @@
 Package: libu1db-qt5-examples
 Section: doc
 Architecture: all
-Depends: ${misc:Depends},
-         libu1db-qt5-3 (>= ${source:Version})
+Depends: libu1db-qt5-3 (>= ${source:Version}),
+         ${misc:Depends},
 Description: Qt5 binding and QtQuick2 plugin for U1DB - examples
  Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
  .
@@ -54,11 +55,10 @@
 Package: libu1db-qt5-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends},
-         libu1db-qt5-3 (>= ${source:Version}),
-         qttools5-dev-tools
+Depends: libu1db-qt5-3 (>= ${source:Version}),
+         qttools5-dev-tools,
+         ${misc:Depends},
 Description: Qt5 binding and QtQuick2 plugin for U1DB - offline documentation
  Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
  .
  This package contains the offline documentation for the Qt binding for U1DB
-

=== modified file 'debian/copyright'
--- debian/copyright	2013-07-29 10:13:41 +0000
+++ debian/copyright	2013-07-30 08:56:27 +0000
@@ -1,27 +1,60 @@
-Copyright:
-
-    Copyright (C) 2013 Canonical Ltd.
-
-License:
-
-    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 package 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/>.
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Canonical Ltd.
-
-and is licensed under the GPL version 3, see above.
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: u1db-qt
+Source: https://code.launchpad.net/~uonedb-qt/u1db-qt/trunk
+
+Files: *
+Copyright: (C) 2011-2013 Canonical Ltd.
+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 package 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/>.
+ .
+ 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
+
+License: BSD-3-clause
+ Redistribution and use of this software in source and binary forms,
+ with or without modification, are permitted provided that the following
+ conditions are met:
+ .
+ Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ Neither the name of Yahoo! Inc. nor the names of YUI's contributors may
+ be used to endorse or promote products derived from this software
+ without specific prior written permission of Yahoo! Inc.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

=== modified file 'debian/libu1db-qt5-3.install'
--- debian/libu1db-qt5-3.install	2013-07-29 10:12:58 +0000
+++ debian/libu1db-qt5-3.install	2013-07-30 08:56:27 +0000
@@ -1,3 +1,3 @@
-usr/lib/lib*.so.*
 usr/lib/*/qt5/qml/*/lib*Plugin.so
 usr/lib/*/qt5/qml/*/qmldir
+usr/lib/lib*.so.*

=== modified file 'debian/libu1db-qt5-dev.install'
--- debian/libu1db-qt5-dev.install	2013-05-02 21:49:51 +0000
+++ debian/libu1db-qt5-dev.install	2013-07-30 08:56:27 +0000
@@ -1,6 +1,6 @@
+usr/include/lib*/*.h
+usr/lib/*/qt5/qml/*/plugins.qmltypes
 usr/lib/lib*.so
-usr/include/lib*/*.h
 usr/lib/pkgconfig/lib*.pc
-usr/lib/*/qt5/qml/*/plugins.qmltypes
+usr/share/qt5/doc/qch/*
 usr/share/qtcreator/templates/qml/*
-usr/share/qt5/doc/qch/*

=== modified file 'debian/libu1db-qt5-doc.install'
--- debian/libu1db-qt5-doc.install	2013-05-02 00:06:25 +0000
+++ debian/libu1db-qt5-doc.install	2013-07-30 08:56:27 +0000
@@ -1,4 +1,4 @@
 usr/share/qt5/phrasebooks/*
+usr/share/u1db-qt/doc/html/*.html
 usr/share/u1db-qt/doc/html/*.index
-usr/share/u1db-qt/doc/html/*.html
 usr/share/u1db-qt/doc/html/style/*.css

=== modified file 'debian/libu1db-qt5-examples.install'
--- debian/libu1db-qt5-examples.install	2013-04-18 15:09:26 +0000
+++ debian/libu1db-qt5-examples.install	2013-07-30 08:56:27 +0000
@@ -1,3 +1,3 @@
+usr/share/applications/u1db-qt-gallery.desktop
 usr/share/u1db-qt/examples/*.qml
 usr/share/u1db-qt/gallery/*.qml
-usr/share/applications/u1db-qt-gallery.desktop