Merge lp:~mitya57/compiz/selected-debian-changes into lp:compiz/0.9.13

[Dmitry Shachnev]

Selected packaging changes from Debian.

At first I wanted to import their changelog entries and describe the delta, but as we are upstream, it would be better if Debian merged from us and described *their* delta.

So I am picking only selected changes that do not hurt us.

[lp:~mitya57/compiz/selected-debian-changes]

4148. By Dmitry Shachnev on 2018-07-06

Add a changelog entry for the cherry-picked changes

[Sebastien Bacher (seb128)]

the changes look fine to me, thanks

review: Approve

[Simon Quigley (tsimonq2)]

Aren't the Breaks+Replaces unnecessary past Wheezy? What benefit do we have in still including them?

review: Needs Information

[Dmitry Shachnev (mitya57)]

> Aren't the Breaks+Replaces unnecessary past Wheezy? What benefit do we have in
> still including them?

I just tried to reduce our delta with Debian. It is definitely not needed in Ubuntu, but does not hurt either and I want to keep the changes minimal.

Note that this Breaks+Replaces already exists in the current version in Cosmic archive.

[Dmitry Shachnev (mitya57)]

Can someone top-approve this please?

=== modified file 'debian/changelog'
--- debian/changelog	2018-03-02 17:02:45 +0000
+++ debian/changelog	2018-07-06 11:56:43 +0000
@@ -1,3 +1,25 @@
+compiz (1:0.9.13.1+18.04.20180302-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Samuel Thibault ]
+  * Update lintian override for compiz-core: bumped ABI.
+  * rules: Include architecture.mk instead of defining DEB_* variables.
+
+  [ Cyril Brulebois ]
+  * Fix missing attributions in debian/copyright (Closes: #848545):
+     - List copyright holders for all po/* files.
+     - List copyright holders for some cmake files.
+     - List copyright holders for some gtk window decorator files.
+     - List copyright holder for some animationplus files.
+     - List copyright holders for borrowed files in libdecoration.
+     - List copyright holders for all plugins.
+
+  [ Andreas Beckmann ]
+  * compiz-plugins-default: Fix upgrading from the squeeze packages by adding
+    Breaks+Replaces: compiz-core (<< 1:0.9.4+bzr20110606-0ubuntu3).
+    (Closes: #860780)
+
+ -- Dmitry Shachnev <[e-mail]>  Fri, 06 Jul 2018 14:34:54 +0300
+
 compiz (1:0.9.13.1+18.04.20180302-0ubuntu1) bionic; urgency=medium
 
   [ Alberts Muktupāvels ]

=== modified file 'debian/compiz-core.lintian-overrides'
--- debian/compiz-core.lintian-overrides	2014-10-31 02:33:26 +0000
+++ debian/compiz-core.lintian-overrides	2018-07-06 11:56:43 +0000
@@ -1,2 +1,2 @@
-compiz-core: package-name-doesnt-match-sonames libcompiz-coreABI-20140123
+compiz-core: package-name-doesnt-match-sonames libcompiz-coreABI-20180221
 compiz-core: binary-without-manpage usr/bin/compiz-decorator

=== modified file 'debian/control'
--- debian/control	2017-04-11 14:01:44 +0000
+++ debian/control	2018-07-06 11:56:43 +0000
@@ -194,8 +194,10 @@
          ${misc:Depends},
 Replaces: compiz-plugins-main-default (<< 1:0.9.8),
           compiz-plugins (<< 1:0.9.12.1+15.10.20150724),
+          compiz-core (<< 1:0.9.4+bzr20110606-0ubuntu3),
 Breaks: compiz-plugins-main-default (<< 1:0.9.8),
         compiz-plugins (<< 1:0.9.12.1+15.10.20150724),
+        compiz-core (<< 1:0.9.4+bzr20110606-0ubuntu3),
 Description: OpenGL window and compositing manager - default plugins
  Compiz brings to life a variety of visual effects that make the Linux desktop
  easier to use, more powerful and intuitive, and more accessible for users

=== modified file 'debian/copyright'
--- debian/copyright	2015-02-13 17:23:42 +0000
+++ debian/copyright	2018-07-06 11:56:43 +0000
@@ -20,6 +20,19 @@
            1999-2000, Daniel M. Duley <[e-mail]> 
 License: GPL-2+
 
+Files: po/*
+Copyright: 1999-2001 SuSE GmbH
+           2002-2004 SuSE Linux AG
+           2005-2008 SUSE Linux Products GmbH
+           2007-2009 The Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: cmake/EnableCoverageReport.cmake
+       cmake/FindLcov.cmake
+       cmake/Findgcovr.cmake
+Copyright: 2010-2011, Johannes Wienke
+License: GPL-2+
+
 Files: compizconfig/libcompizconfig/* compizconfig/compizconfig-python/*
 Copyright: 2010, Sam Spilsbury
            2007, Dennis Kasprzyk <[e-mail]>
@@ -40,6 +53,15 @@
            2005-2007, Novell, Inc.
 License: LGPL-2+
 
+Files: gtk/window-decorator/gwd-theme-cairo.*
+       gtk/window-decorator/gwd-theme-metacity.*
+       gtk/window-decorator/gwd-theme.*
+Copyright: 2006, Novell, Inc.
+           2010, Sam Spilsbury
+           2011, Canonical Ltd.
+           2016, Alberts Muktupāvels
+License: GPL-2+
+
 Files: include/*
        kde/window-decorator-kde4/kdecorationbridge.h
        kde/window-decorator-kde4/kdecoration_plugins.*
@@ -52,6 +74,11 @@
            1999-2000, Daniel M. Duley <[e-mail]> 
 License: MIT/X11
 
+Files: libdecoration/decoration.c
+Copyright: 1999, Matthias Clasen
+           1999-2007, Dominik Vogt
+License: GPL-2+
+
 Files: plugins/* plugins/decor/src/clip-groups/include/clip-groups.*
 Copyright: 2011, Daniel van Vugt <[e-mail]>
            2010, Jay Catherwood <[e-mail]>
@@ -86,6 +113,12 @@
            2003, Rob Adams
            2002-2003 Red Hat, Inc
            2001, Havoc Pennington
+           2011-2012, Linaro Limited
+           2007, CyberOrg
+           2007, Rodolfo Granata
+           2006, Rivo Laks
+           2008, Lucas Murray
+           2016, Hypra
 License: GPL-2+
 
 Files: plugins/annotate/*
@@ -114,6 +147,7 @@
        plugins/screenshot/*
        plugins/switcher/*
        plugins/water/*
+       plugins/window/*
        plugins/wobbly/*
        plugins/place/src/*/tests/*
        plugins/wall/src/*/tests/*
@@ -126,12 +160,48 @@
            2007 Diogo "playerX" Ferreira
            2005-2007, Novell, Inc
            1999-2005, Brian Paul
+           2013, Sami Jaktholm
+           2011, Collabora, Ltd.
+           1993, Robert Nation
+           2011, NVIDIA Corporation
 License: MIT/X11
 
 Files: plugins/ccp/*
 Copyright: 2007, Dennis Kasprzyk <[e-mail]>
 License: LGPL-2.1+
 
+Files: plugins/animationplus/src/blinds.cpp
+       plugins/animationplus/src/bonanza.cpp
+       plugins/animationplus/src/helix.cpp
+       plugins/animationplus/src/shatter.cpp
+Copyright: 2008, Kevin DuBois
+License: GPL-2+
+
+Files: compizconfig/libcompizconfig/src/iniparser.h
+Copyright: 2000 Nicolas Devillard <[e-mail]>
+License: custom-license
+ Written by Nicolas Devillard. Not derived from licensed software.
+ .
+ Permission is granted to anyone to use this software for any
+ purpose on any computer system, and to redistribute it freely,
+ subject to the following restrictions:
+ .
+ 1. The author is not responsible for the consequences of use of
+ this software, no matter how awful, even if they arise
+ from defects in it.
+ .
+ 2. The origin of this software must not be misrepresented, either
+ by explicit claim or by omission.
+ .
+ 3. Altered versions must be plainly marked as such, and must not
+ be misrepresented as being the original software.
+ .
+ 4. This notice may not be removed or altered.
+
+Files: debian/00_remove_obsolete_plugins_in_unity_session_v3.py
+Copyright: 2016 Canonical
+License: GPL-3
+
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -213,3 +283,19 @@
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
+License: GPL-3
+ 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; version 3.
+ .
+ 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.
+ .
+ You should have received a copy of the GNU 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 General Public License
+ version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.

=== modified file 'debian/rules'
--- debian/rules	2016-05-12 10:14:55 +0000
+++ debian/rules	2018-07-06 11:56:43 +0000
@@ -3,8 +3,8 @@
 
 export COMPIZ_DEB_BUILD=1
 
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
+
 python2_version := $(shell pyversions --requested --version debian/control)
 gles2_architectures := armel armhf