Merge remote-tracking branch 'debian/master' into kubuntu_zesty_archivekubuntu_zesty_archive

7 files changed, 84 insertions, 47 deletions

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 7a71057..6d45fc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kirigami (1.1.0-1) unstable; urgency=medium
+
+  * Initial Debian release.
+
+ -- Maximiliano Curia <maxy@debian.org>  Mon, 03 Oct 2016 18:48:42 +0200
+
 kirigami (1.1.0-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Rik Mills ]
@@ -13,6 +19,24 @@ kirigami (1.1.0-0ubuntu1) UNRELEASED; urgency=medium
 
  -- Rik Mills <rik.mills88@gmail.com>  Mon, 22 Aug 2016 11:40:58 +0100
 
+kirigami (1.1.0-0neon) xenial; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon@kde.org>  Mon, 26 Sep 2016 11:53:18 +0000
+
+kirigami (1.0.2-0neon) xenial; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon@kde.org>  Tue, 20 Sep 2016 13:39:43 +0000
+
+kirigami (1.0.1-0neon) xenial; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon@kde.org>  Wed, 10 Aug 2016 15:20:12 +0000
+
 kirigami (1.0.0-0) xenial; urgency=medium
 
   * Initial release.
diff --git a/debian/control b/debian/control
index eae39c3..7eff73d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,25 +2,25 @@ Source: kirigami
 Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Maximiliano Curia <maxy@debian.org>
 XSBC-Original-Maintainer: Bhushan Shah <bhush94@gmail.com>
-Build-Depends: cmake,
-               debhelper (>= 9.0.0~),
-               extra-cmake-modules,
+Build-Depends: cmake (>= 2.8.12~),
+               debhelper (>= 9~),
+               extra-cmake-modules (>= 0.0.8~),
                kdoctools-dev,
                libkf5declarative-dev,
-               libqt5svg5-dev,
-               pkg-config,
+               libqt5svg5-dev (>= 5.5.0~),
                pkg-kde-tools,
-               plasma-framework-dev,
-               qtbase5-dev,
-               qtdeclarative5-dev,
+               plasma-framework-dev (>= 5.18.0~),
+               qtbase5-dev (>= 5.5.0~),
+               qtdeclarative5-dev (>= 5.5.0~),
                qttools5-dev-tools
 Standards-Version: 3.9.8
 Homepage: https://projects.kde.org/kirigami
-Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kirigami
-Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kirigami
+Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/kde-extras/kirigami.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-extras/kirigami.git
 
-Package: kirigami
+Package: qml-module-org-kde-kirigami
 Architecture: any
 Depends: plasma-framework,
          qml-module-org-kde-kquickcontrolsaddons,
@@ -39,22 +39,3 @@ Description: set of QtQuick components targeted for mobile use
  targeting a mobile platform, without adding many dependencies. They
  work on a variety of platforms, such as Plasma Mobile, Desktop Linux,
  Android and Windows.
-
-Package: kirigami-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: kirigami (= ${binary:Version}), ${misc:Depends}
-Description: set of QtQuick components targeted for mobile use
- Kirigami is a set of QtQuick components at the moment targeted for
- mobile use (in the future desktop as well) targeting both Plasma
- Mobile and Android. A set of high level components to make the
- creation of applications that look and feel great on mobile as well
- as desktop devices and follow the Kirigami Human Interface
- Guidelines. The target of these components is anybody that wants to
- do an application using QtQuick as its main UI, especially if
- targeting a mobile platform, without adding many dependencies. They
- work on a variety of platforms, such as Plasma Mobile, Desktop Linux,
- Android and Windows.
- .
- This package contains the debugging symbols.
diff --git a/debian/copyright b/debian/copyright
index bb72533..8335540 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,13 +3,51 @@ Upstream-Name: kirigami
 Source: https://quickgit.kde.org/?p=kirigami.git
 
 Files: *
-       debian/*
-Copyright: 2009 Alan Alpert <alan.alpert@nokia.com>
- 2010 Marco Martin <mart@kde.org>
- 2010 Ménard Alexis <menard@kde.org>
- 2012 Sebastian Kügler <sebas@kde.org>
- 2011 Nokia Corporation and/or its subsidiary(-ies)
- 2016 Bhushan Shah <bhush94@gmail.com>
+Copyright: 2009, Alan Alpert <alan.alpert@nokia.com>
+           2014, Aleix Pol Gonzalez <aleixpol@blue-systems.com>
+           2016, Aleix Pol Gonzalez <aleixpol@kde.org>
+           1991, Free Software Foundation, Inc
+           2010-2016, Marco Martin <mart@kde.org>
+           2010-2016, Marco Martin <notmart@gmail.com>
+           2010, Ménard Alexis <menard@kde.org>
+           2012, Sebastian Kügler <sebas@kde.org>
+License: LGPL-2+
+
+Files: po/ca/libkirigamiplugin_qt.po
+       po/ca@valencia/libkirigamiplugin_qt.po
+       po/uk/libkirigamiplugin_qt.po
+Copyright: 2016, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
+ This file is distributed under the license LGPL version 2.1 or
+ version 3 or later versions approved by the membership of KDE e.V.
+ .
+ The full text of the GNU Lesser General Public License version 2.1 can be
+ found in the file `/usr/share/common-licenses/LGPL-2.1', likewise, the full
+ text of the GNU Lesser General Public License version 3 can be found in the
+ file `/usr/share/common-licenses/LGPL-3'.
+
+Files: src/desktopicon.h
+Copyright: 2011, Marco Martin <mart@kde.org>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2016, Bhushan Shah <bhush94@gmail.com>
+License: LGPL-2+
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ 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 General Public License for more details.
+ .
+ The full text of the GNU General Public License version 2 can be found in the
+ file `/usr/share/common-licenses/GPL-2'.
+
 License: LGPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Library General Public License as
@@ -21,10 +59,5 @@ License: LGPL-2+
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU Library General Public License for more details
  .
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the
- Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- .
- On Debian systems, the full text of the GNU Library General Public License
- version 2 can be found in the file /usr/share/common-licenses/LGPL-2.
+ The full text of the GNU Library General Public License version 2 can be
+ found in the file `/usr/share/common-licenses/LGPL-2'.
diff --git a/debian/kirigami.install b/debian/kirigami.install
deleted file mode 100644
index 1b91047..0000000
--- a/debian/kirigami.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/
diff --git a/debian/rules b/debian/rules
index 84e66ef..00b3bab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,4 +5,4 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 override_dh_auto_configure:
 	$(overridden_command) -- -DBUILD_EXAMPLES=ON
 override_dh_strip:
-	$(overridden_command) --dbg-package=kirigami-dbg
+	$(overridden_command) --dbgsym-migration='kirigami-dbg (<< 1.1.0-1~)'
diff --git a/debian/watch b/debian/watch
index 964de8f..2e87f45 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=4
 opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/kirigami/kirigami-([\d.]+)\.tar\.xz
-