Merge lp:~themuso/ubuntu-terminal-app/yakkety-packaging-updates into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Luke Yelavich]

Packaging fixes in preparation for yakkety:
* Added copyright headers to src/app/qml files that didn't have it.
* Added a manpage to satisfy lintian.
* Updated debian/copyright.

Packaging fixes in preparation for yakkety:
* Added copyright headers to src/app/qml files that didn't have it.
* Added a manpage to satisfy lintian.
* Updated debian/copyright.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Many thanks Luke!

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-02-03 10:24:54 +0000
+++ CMakeLists.txt	2016-09-19 00:47:22 +0000
@@ -72,6 +72,7 @@
     set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
     set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
     set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/terminal.1 DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man1)
 endif(CLICK_MODE)
 
 file(GLOB_RECURSE I18N_SRC_FILES
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-07-04 08:41:27 +0000
+++ debian/changelog	2016-09-19 00:47:22 +0000
@@ -1,3 +1,14 @@
+ubuntu-terminal-app (0.7ubuntu1) UNRELEASED; urgency=medium
+
+  * Get packaging ready for inclusion in yakkety (LP: #1623845)
+  * Update standards version
+  * Fix up build dependency formatting
+  * Added manpage
+  * Update copyright
+  * Update Vcs-bzr field
+
+ -- Luke Yelavich <[e-mail]>  Fri, 16 Sep 2016 09:04:28 +1000
+
 ubuntu-terminal-app (0.7) wily; urgency=medium
 
   * Bumped changelog version (LP: #1468385)
 
=== modified file 'debian/control'
--- debian/control	2016-03-15 14:20:16 +0000
+++ debian/control	2016-09-19 00:47:22 +0000
@@ -9,11 +9,11 @@
                libpam0g-dev,
                qtbase5-dev,
                qtdeclarative5-dev,
-               qt5-default,
-Standards-Version: 3.9.6
+               qt5-default
+Standards-Version: 3.9.8
 Section: misc
 Homepage: https://launchpad.net/ubuntu-terminal-app
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-terminal-dev/ubuntu-terminal-app/trunk
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
 
 Package: ubuntu-terminal-app
 Section: misc
 
=== modified file 'debian/copyright'
--- debian/copyright	2014-10-25 04:42:31 +0000
+++ debian/copyright	2016-09-19 00:47:22 +0000
@@ -11,6 +11,49 @@
            2013 Sam Hewitt <[e-mail]>
 License: GPL-3
 
+Files: src/app/*
+Copyright: 2013-2014 Canonical Ltd.
+License: GPL-3+
+
+Files: src/app/qml/*
+Copyright: 2013-2014 Canonical Ltd.
+           2014 Canonical Ltd.
+           2013, 2014, 2016 Canonical Ltd.
+           2013, 2014 Canonical Ltd.
+License: GPL-3
+
+Files: src/app/plugin/konsole/*
+       src/plugin/qmltermwidget/lib/*
+Copyright: 2000 Stephan Kulow <[e-mail]>
+           2008 e_k <[e-mail]>
+           2007-2008 Robert Knight <[e-mail]>
+           1997-1998 Lars Doelle <[e-mail]>
+           1996 Matthias Ettrich <[e-mail]>
+           2007 Oswald Buddenhagen <[e-mail]>
+           2002 Waldo Bastian <[e-mail]>
+           2002-2003, 2007 Oswald Buddenhagen <[e-mail]>
+           2010 KDE e.V. <[e-mail]>
+           2013 Dmitry Zagnoyko <[e-mail]>
+           2007 Robert Knight <[e-mail]>
+           2006-2007 Robert Knight <[e-mail]>
+           2006-2008 Robert Knight <[e-mail]>
+License: GPL-2+
+
+Files: src/app/plugin/konsole/konsole_wcwidth.*
+       src/plugin/qmltermwidget/lib/konsole_wcwidth.*
+Copyright: no copyright claimed
+License: public-domain
+ No copyright claimed by author.
+
+Files: src/plugin/pamauthentication/*
+Copyright: 2014 Canonical Ltd.
+License: GPL-3
+
+Files: tests/autopilot/ubuntu_terminal_app/*
+       tests/autopilot/ubuntu_terminal_app/tests/*
+Copyright: 2013 Canonical Ltd.
+License: GPL-3
+
 Files: debian/*
 Copyright: 2013 Canonical Ltd.
 License: LGPL-3
@@ -18,8 +61,24 @@
 License: GPL-3
  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 3 of the License.
+ License version 3 as published by the Free Software Foundation.
+ .
+ This package 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, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in "/usr/share/common-licenses/GPL-3".
+
+License: GPL-3+
+ 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
+ 3 of the License, or (at your option) any later version.
  .
  This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,8 +94,7 @@
 License: LGPL-3
  This package 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 3 of the License.
+ License version 3 as published by the Free Software Foundation.
  .
  This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -48,3 +106,37 @@
  .
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in "/usr/share/common-licenses/LGPL-3".
+
+License: GPL-2
+ 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.
+ .
+ This package 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, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GPL-2+
+ 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.
+ .
+ This package 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, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in "/usr/share/common-licenses/GPL-2".
 
=== modified file 'src/app/fileio.cpp'
--- src/app/fileio.cpp	2015-04-01 22:01:44 +0000
+++ src/app/fileio.cpp	2016-09-19 00:47:22 +0000
@@ -1,3 +1,24 @@
+/*
+ * Copyright: 2015 Canonical Ltd.
+ *
+ * This file is part of ubuntu-terminal-app
+ *
+ * ubuntu-terminal-app 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.
+ *
+ * ubuntu-terminal-app 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Filippo Scognamiglio <[e-mail]>
+ */
+
 #include "fileio.h"
 
 FileIO::FileIO()
 
=== modified file 'src/app/fileio.h'
--- src/app/fileio.h	2015-02-03 21:43:38 +0000
+++ src/app/fileio.h	2016-09-19 00:47:22 +0000
@@ -1,3 +1,24 @@
+/*
+ * Copyright: 2015 Canonical Ltd.
+ *
+ * This file is part of ubuntu-terminal-app
+ *
+ * ubuntu-terminal-app 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.
+ *
+ * ubuntu-terminal-app 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Filippo Scognamiglio <[e-mail]>
+ */
+
 #ifndef FILEIO_H
 #define FILEIO_H
 
 
=== modified file 'src/app/qml/AlternateActionPopover.qml'
--- src/app/qml/AlternateActionPopover.qml	2016-02-08 22:27:08 +0000
+++ src/app/qml/AlternateActionPopover.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 
=== modified file 'src/app/qml/CircularTransparentButton.qml'
--- src/app/qml/CircularTransparentButton.qml	2016-03-15 14:39:25 +0000
+++ src/app/qml/CircularTransparentButton.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 
=== modified file 'src/app/qml/ExpandableButton.qml'
--- src/app/qml/ExpandableButton.qml	2016-03-15 14:39:25 +0000
+++ src/app/qml/ExpandableButton.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 
=== modified file 'src/app/qml/KeyboardBar.qml'
--- src/app/qml/KeyboardBar.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/KeyboardBar.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import "KeyboardRows"
 
=== modified file 'src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml'
--- src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml	2016-03-15 14:39:25 +0000
+++ src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 
=== modified file 'src/app/qml/KeyboardRows/JsonTranslator.qml'
--- src/app/qml/KeyboardRows/JsonTranslator.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/KeyboardRows/JsonTranslator.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Niklas Wenzel <[e-mail]>
+ */
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 
=== modified file 'src/app/qml/KeyboardRows/KeyModel.qml'
--- src/app/qml/KeyboardRows/KeyModel.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/KeyboardRows/KeyModel.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 
=== modified file 'src/app/qml/KeyboardRows/KeyboardButton.qml'
--- src/app/qml/KeyboardRows/KeyboardButton.qml	2016-03-15 14:39:25 +0000
+++ src/app/qml/KeyboardRows/KeyboardButton.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 
=== modified file 'src/app/qml/KeyboardRows/KeyboardLayout.qml'
--- src/app/qml/KeyboardRows/KeyboardLayout.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/KeyboardRows/KeyboardLayout.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 
=== modified file 'src/app/qml/KeyboardRows/KeyboardRow.qml'
--- src/app/qml/KeyboardRows/KeyboardRow.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/KeyboardRows/KeyboardRow.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 
=== modified file 'src/app/qml/PressFeedback.qml'
--- src/app/qml/PressFeedback.qml	2015-07-13 20:25:21 +0000
+++ src/app/qml/PressFeedback.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import QtFeedback 5.0
 
 
=== modified file 'src/app/qml/TabsModel.qml'
--- src/app/qml/TabsModel.qml	2015-07-13 20:25:21 +0000
+++ src/app/qml/TabsModel.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 
 ListModel {
 
=== modified file 'src/app/qml/TabsPage.qml'
--- src/app/qml/TabsPage.qml	2016-05-16 21:17:25 +0000
+++ src/app/qml/TabsPage.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 
=== modified file 'src/app/qml/TerminalComponent.qml'
--- src/app/qml/TerminalComponent.qml	2016-03-24 12:23:19 +0000
+++ src/app/qml/TerminalComponent.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import QMLTermWidget 1.0
 
=== modified file 'src/app/qml/TerminalInputArea.qml'
--- src/app/qml/TerminalInputArea.qml	2015-07-13 20:25:21 +0000
+++ src/app/qml/TerminalInputArea.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 
 Item{
 
=== modified file 'src/app/qml/TerminalKeyboardShortcutHandler.qml'
--- src/app/qml/TerminalKeyboardShortcutHandler.qml	2015-07-13 20:25:21 +0000
+++ src/app/qml/TerminalKeyboardShortcutHandler.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Niklas Wenzel <[e-mail]>
+ */
 import QtQuick 2.4
 
 Item {
 
=== modified file 'src/app/qml/TerminalPage.qml'
--- src/app/qml/TerminalPage.qml	2016-04-23 12:26:21 +0000
+++ src/app/qml/TerminalPage.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 
=== modified file 'src/app/qml/TerminalSettings.qml'
--- src/app/qml/TerminalSettings.qml	2016-04-05 13:26:03 +0000
+++ src/app/qml/TerminalSettings.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import Qt.labs.settings 1.0
 
 
=== modified file 'src/app/qml/ubuntu-terminal-app.qml'
--- src/app/qml/ubuntu-terminal-app.qml	2016-03-15 14:18:34 +0000
+++ src/app/qml/ubuntu-terminal-app.qml	2016-09-19 00:47:22 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Filippo Scognamiglio <[e-mail]>
+ */
 import QtQuick 2.4
 import QtGraphicalEffects 1.0
 import Ubuntu.Components 1.3
 
=== added file 'terminal.1'
--- terminal.1	1970-01-01 00:00:00 +0000
+++ terminal.1	2016-09-19 00:47:22 +0000
@@ -0,0 +1,56 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH TERMINAL 1 "September 16, 2016"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+terminal \- is a terminal emulation application.
+.SH SYNOPSIS
+.sp
+.nf
+\fIterminal\fR [\-p|\-\-phone] [\-\-workdir <dir>]
+    [\-\-forceAuth <true/false>] [\-t|\-\-tablet] [\-h|\-\-help] [\-I <path>]
+.nf
+.sp
+.SH DESCRIPTION
+.B terminal
+is a terminal emulation application that you can use to access a unix shell.
+.SH OPTIONS
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-p, \-\-phone
+If running on Desktop, start in a phone sized window.
+.TP
+.B \-t, \-\-tablet
+If running on Desktop, start in a tablet sized window.
+.TP
+.B \-\-forceAuth <true/false>
+Force authentication on or off.
+.TP
+.B \-I <path>
+Give a path for an additional QML import directory. May be used multiple times.
+.TP
+.B \-q <qmlfile>
+Give an alternative location for the main qml file.
+.TP
+.B \-\-workdir <dir>
+Change working directory to 'dir'
+.SH AUTHOR
+Terminal was written by Filippo Scognamiglio <[e-mail]>. The webpage for this package can be found at
+http://launchpad.net/ubuntu-terminal-app
+.PP
+This manual page was written by Luke Yelavich <[e-mail]>, for the Ubuntu project (but may be used by others).