Merge lp:~bdfhjk/clicompanion/copyright-fix into lp:~clicompanion-devs/clicompanion/debian

[Marek Bardoński]

[Jonathan Marsden (jmarsden)]

Something seems odd here:

+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .

See what? :)

Jonathan

review: Needs Fixing

[lp:~bdfhjk/clicompanion/copyright-fix]

21. By Marek Bardoński on 2012-01-13

copyright updated (new upstream authors) and small fix for licence statement

[Marek Bardoński (bdfhjk)]

Thanks Jonathan for pointing this. I modified text to be more clear. Also updated was list of authors to be compatible with headers.

[David Caro (dcaro)]

We could also remove most from the dependencies (is not used anymore).

[David Caro (dcaro)]

Everything else seems fine to me, opening another bug for the most dependency.

review: Approve

=== modified file 'control'
--- control	2011-11-10 11:21:56 +0000
+++ control	2012-01-13 21:42:23 +0000
@@ -14,7 +14,7 @@
 
 Package: clicompanion
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, most, python-vte, python-gtk2
+Depends: ${misc:Depends}, ${python:Depends}, most, python-vte, python-gtk2, sudo
 Description: run terminal commands from a GUI storing commands for later use
  CLI Companion is an application that is used as a complement to the Terminal.
  .

=== modified file 'copyright'
--- copyright	2011-11-04 15:10:04 +0000
+++ copyright	2012-01-13 21:42:23 +0000
@@ -3,7 +3,7 @@
 Source: https://code.launchpad.net/~clicompanion-devs/clicompanion/trunk
 
 Files: *
-Copyright: Copyright (C) 2010 Duane Hinnen, Kenny Meyer
+Copyright: Copyright (C) 2010 Duane Hinnen, Kenny Meyer, David Caro, Marek Bardoński
 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
@@ -15,9 +15,6 @@
  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, see .
- .
  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'
@@ -35,8 +32,22 @@
  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, see .
+ 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'
+
+Files: images/*
+Copyright: Copyright (C) 2011 Sean Kelly
+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, either version 3 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.
  .
  On Debian systems, the full text of the GNU General Public
  License version 3 can be found in the file