ubuntukylin-members team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Aron Xu (happyaron)
------------------------------------------------------------
revno: 47 [merge]
committer: Shine Huang <shenghuang@xxxxxxxxxxxxxxx>
branch nick: chinese-calendar
timestamp: Wed 2014-10-15 14:59:04 +0800
message:
  modify changelog
modified:
  debian/changelog
  debian/control
  debian/copyright


--
lp:chinese-calendar
https://code.launchpad.net/~ubuntukylin-members/ubuntukylin/trunk

Your team Ubuntu Kylin Members is subscribed to branch lp:chinese-calendar.
To unsubscribe from this branch go to https://code.launchpad.net/~ubuntukylin-members/ubuntukylin/trunk/+edit-subscription

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-15 06:54:41 +0000
+++ debian/changelog	2014-10-15 06:59:04 +0000
@@ -1,10 +1,18 @@
-chinese-calendar (1.0.0-2ubuntu1) utopic; urgency=medium
+chinese-calendar (1.0.0-0ubuntu1) utopic; urgency=medium
 
+  [ Shine Huang ]
   * New upstream release:
     - pick category from 'Graphic' to 'Utility'
     - adapt UI according to UKSC 1.0
 
- -- Shine <shenghuang@xxxxxxxxxxxxxxx>  Thu, 09 Oct 2014 16:53:15 +0800
+  [ Aron Xu ]
+  * debian/control:
+    - std-ver: 3.9.5 -> 3.9.6, no change
+    - Priority: extra -> optional
+  * debian/copyright:
+    - update for QtSingleApplication
+
+ -- Aron Xu <happyaron@xxxxxxxxxx>  Thu, 09 Oct 2014 16:53:15 +0800
 
 chinese-calendar (0.8.2-0ubuntu1) trusty; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2014-03-24 15:38:45 +0000
+++ debian/control	2014-10-15 01:09:00 +0000
@@ -1,6 +1,6 @@
 Source: chinese-calendar
 Section: utils
-Priority: extra
+Priority: optional
 Maintainer: Ubuntu Kylin Members <ubuntukylin-members@xxxxxxxxxxxxxxxxxxx>
 Uploaders: Abel Liu <guiltyritter@xxxxxxxxx>,
            Shine Huang <shenghuang@xxxxxxxxxxxxxxx>
@@ -8,7 +8,7 @@
                libqt4-dev (>= 4.8.1),
                libqt4-sql-sqlite,
                ttf-wqy-microhei
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://launchpad.net/chinese-calendar
 
 Package: chinese-calendar

=== modified file 'debian/copyright'
--- debian/copyright	2014-02-12 02:43:59 +0000
+++ debian/copyright	2014-10-15 01:15:52 +0000
@@ -7,6 +7,10 @@
 Copyright: Copyright (C) 2013 National University of Defense Technology(NUDT) & Kylin Lt
 License: GPL-3
 
+Files: qtsingleapplication/*
+Copyright: 2013, Digia Plc and/or its subsidiary(-ies)
+License: BSD-3-clause
+
 Files: debian/*
 Copyright: 2013, Zhengpeng Hou <zhengpeng-hou@xxxxxxxxxx>
            2013, Aron Xu <happyaron@xxxxxxxxxx>
@@ -24,3 +28,29 @@
  .
  On Debian/Ubuntu systems, the full text of the GPL v3 can be found in
  `/usr/share/common-licenses/GPL-3'
+
+License: BSD-3-clause
+ Redistribution and use 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 Digia Plc and its Subsidiary(-ies) nor the names
+     of its contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+ .
+ 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.