[SCM] milou packaging branch, kubuntu_wily_archive, updated. debian/5.2.2-1-20-ga6396cc

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/milou.git;a=commitdiff;h=a6396cc

The following commit has been merged in the kubuntu_wily_archive branch:
commit a6396cc048ad10686c5393791e41621d6b75af5c
Merge: 90cf6c1562b9de78a51bc4f0ef56846eb2e60e81 590bdf33eb946b2c48c4abb2d58877d9e670de85
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:32:53 2015 +0200

    merge master

 debian/.gitattributes           |  1 +
 debian/changelog                | 43 ++++++++++++++++++------
 debian/control                  | 25 ++++++++------
 debian/copyright                | 74 ++++++++++++++++++++++++++++++++++-------
 debian/milou.install            | 11 +++++-
 debian/source/lintian-overrides |  1 -
 debian/watch                    |  5 ++-
 7 files changed, 122 insertions(+), 38 deletions(-)

diff --cc debian/changelog
index 73a85b0,0adb23f..d4dbcbb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,19 +1,39 @@@
 +milou (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:30:59 +0200
 +
 +milou (4:5.3.1-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * Plasma 5.3 beta
 +  * new upstream release
 +
 +  [ Scarlett Clark ]
 +  * Vivid backport
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:36:55 +0200
 +
+ milou (4:5.3.1-1~) UNRELEASED; urgency=medium
+ 
+   * New upstream release (5.3.0).
+   * New upstream release (5.3.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:57:19 +0200
+ 
+ milou (4:5.2.2-1) experimental; urgency=medium
+ 
+   * New upstream release (5.2.1).
+   * New patch: missing_package
+   * New upstream release (5.2.2).
+   * Remove patch: missing_package
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:17:56 +0100
+ 
  milou (4:5.2.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/copyright
index 5d4d0e8,62c56f6..f4c71fc
--- a/debian/copyright
+++ b/debian/copyright
@@@ -45,25 -79,28 +79,41 @@@ License: GPL-3 or LGPL-2.1-QTexception-
   packaging of this file.  Please review the following information to
   ensure the GNU General Public License version 3.0 requirements will be
   met: http://www.gnu.org/copyleft/gpl.html
+  .
+  On Debian systems, the complete text of the GNU Lesser General Public License
+  version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1", likewise, the
+  complete text of the GNU General Public License version 3 can be found in
+  "/usr/share/common-licenses/GPL-3".
  
++<<<<<<< HEAD
 +Files: lib/previews/videos/*
 +       plasmoid/*
 +       debian/*
 +Copyright: 2013-2014 Vishesh Handa <me at vhanda.in>
 +           2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
 +License: GPL-2.0+
 + This package 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.
++=======
+ Files: debian/*
+ Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
+ License: LGPL-2.1+
+  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 2.1 of the License, or (at your option) any later version.
++>>>>>>> master
   .
-  This package is distributed in the hope that it will be useful,
+  This library 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.
+  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 General Public License
-  along with this program. If not, see <http://www.gnu.org/licenses/>
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
   .
-  On Debian systems, the complete text of the GNU General
-  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+  On Debian systems, the complete text of the GNU Lesser General Public License
+  version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".

-- 
milou packaging