Merge lp:~bregma/nux/lp-753361 into lp:nux

[Stephen M. Webb]

debian/copyright: updated and corrected (lp: #753361)

= Problem description =

The debian/copyright file was incomplete and in an incorrect format.

= The fix =

Reviewed all nux source code and updated the debian/copyright file appropriately. Updated to current DEP-5 format.

= Test coverage =

Change is a packaging-only change.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:785
http://jenkins.qa.ubuntu.com/job/nux-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-raring-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-raring-armhf-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-raring-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/34/rebuild

review: Approve (continuous-integration)

=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2013-03-21 00:10:42 +0000
+++ Nux/TextEntry.cpp	2013-05-06 19:56:26 +0000
@@ -1,19 +1,35 @@
 /*
-  Copyright 2008 Google Inc.
-
-  Licensed under the Apache License, Version 2.0(the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/
-
+ * Copyright 2011-2013 Canonical Ltd.
+ * Copyright 2010 Inalogic Inc.
+ *
+ * This program 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 or 3.0
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the applicable version of the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of both the GNU Lesser General Public
+ * License along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0(the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #include "Nux.h"
 #include "Layout.h"

=== modified file 'Nux/TextEntry.h'
--- Nux/TextEntry.h	2013-03-21 00:10:42 +0000
+++ Nux/TextEntry.h	2013-05-06 19:56:26 +0000
@@ -1,25 +1,39 @@
 #ifndef TEXTENTRY_H
 #define TEXTENTRY_H
 
-
-
 // Heavily inspired from google gadget code
 /*
-  Copyright 2008 Google Inc.
-
-  Licensed under the Apache License, Version 2.0(the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/
-
+ * Copyright 2011-2013 Canonical Ltd.
+ * Copyright 2010 Inalogic Inc.
+ *
+ * This program 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 or 3.0
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the applicable version of the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of both the GNU Lesser General Public
+ * License along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0(the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #include "cairo/cairo.h"
 #include "pango/pango.h"

=== modified file 'debian/copyright'
--- debian/copyright	2011-04-07 11:26:06 +0000
+++ debian/copyright	2013-05-06 19:56:26 +0000
@@ -1,18 +1,27 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: nux
-Maintainer: Jay Taoko <jay.taoko_AT_gmail_DOT_com>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: nux
+Upstream-Contact: Nux Developer Team <[e-mail]>
 Source: http://launchpad.net/nux
 
 Files: *
-Copyright: 2010, Inalogic Inc
+Copyright: 2010-2013 Canonical, Ltd.
+           2010 Inalogic Inc
 License: LGPL-2.1+
 
+Files: Nux/TextEntry.cpp
+Copyright: 2011-2013 Canonical Ltd.
+           2010 Inalogic Inc.
+           2008 Google Inc.
+License: LGPL-2.1+ and Apache-2.0
+
 Files: examples/*
-Copyright: 2010, Inalogic Inc
+Copyright: 2012 Canonical. Ltd.
+           2010 Inalogic Inc
 License: GPL-3
 
 Files: debian/*
-Copyright: 2010, Didier Roche <[e-mail]>
+Copyright: 2013 Canonical Ltd.
+           2010 Didier Roche <[e-mail]>
 License: LGPL-2.1+
 
 License: GPL-3
@@ -42,3 +51,20 @@
  .
  On Debian systems, the complete text of the GNU Lesser General Public
  License can be found in `/usr/share/common-licenses/LGPL-2.1'
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0(the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+  http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache 2.0 License can be found
+ in `/usr/share/common-licenses/Apache-2.0'
+