Merge lp:~timo-jyrinki/ubuntu-qtcreator-plugins/packaging_rename_fixes_add_copyright-unstablebranch into lp:ubuntu-qtcreator-plugins

[Timo Jyrinki]

Rename source to qtcreator-plugin-ubuntu and 'data' to 'common'. Add copyright file, tweak control/rules, add .bzr-builddeb and set executable bits for run files (lintian warning).

Rename source to qtcreator-plugin-ubuntu and 'data' to 'common'. Add copyright file, tweak control/rules, add .bzr-builddeb and set executable bits for run files (lintian warning).

Unmerged revisions

265. By Timo Jyrinki on 2013-08-06

Rename source to qtcreator-plugin-ubuntu and 'data' to 'common'. Add copyright file, tweak control/rules, add .bzr-builddeb and set executable bits for run files (lintian warning).

=== added directory 'ubuntu-qtcreator-plugins-data/.bzr-builddeb'
=== added file 'ubuntu-qtcreator-plugins-data/.bzr-builddeb/default.conf'
--- ubuntu-qtcreator-plugins-data/.bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins-data/.bzr-builddeb/default.conf	2013-08-06 11:22:27 +0000
@@ -0,0 +1,3 @@
+[BUILDDEB]
+split = true
+

=== modified file 'ubuntu-qtcreator-plugins-data/debian/changelog'
--- ubuntu-qtcreator-plugins-data/debian/changelog	2013-07-29 11:44:12 +0000
+++ ubuntu-qtcreator-plugins-data/debian/changelog	2013-08-06 11:22:27 +0000
@@ -1,5 +1,6 @@
-qtcreator-plugin-ubuntu-data (0.1-0ubuntu1) precise; urgency=low
+qtcreator-plugin-ubuntu (0.1-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Juhapekka Piiroinen ]
   * Initial release
 
- -- Juhapekka Piiroinen <[e-mail]>  Fri, 26 Jul 2013 13:51:40 +0300
+ -- Timo Jyrinki <[e-mail]>  Tue, 06 Aug 2013 07:30:43 +0000

=== modified file 'ubuntu-qtcreator-plugins-data/debian/control'
--- ubuntu-qtcreator-plugins-data/debian/control	2013-07-26 11:17:07 +0000
+++ ubuntu-qtcreator-plugins-data/debian/control	2013-08-06 11:22:27 +0000
@@ -1,25 +1,32 @@
-Source: qtcreator-plugin-ubuntu-data
+Source: qtcreator-plugin-ubuntu
 Section: devel
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
-Standards-Version: 3.9.3
-
-Package: qtcreator-plugin-ubuntu-data
-Architecture: all
-Description: a data package for the Ubuntu plugin for Qt Creator IDE
- Qt Creator is a new, lightweight, cross-platform integrated development
- environment (IDE) designed to make development with the Qt application
- framework even faster and easier.
- .
- This package contains the runtime data files for the Ubuntu plugin for Qt Creator IDE
-
-Package: qtcreator-plugin-ubuntu-cordova-data
-Architecture: all
-Description: a data package for Cordova Ubuntu plugin for Qt Creator IDE
- Qt Creator is a new, lightweight, cross-platform integrated development
- environment (IDE) designed to make development with the Qt application
- framework even faster and easier.
- .
- This package contains a data package for the Cordova Ubuntu plugin for Qt Creator.
-
+Standards-Version: 3.9.4
+# Note: currently the qtcreator-plugin-ubuntu binary package still comes 
+# from qtcreator source package. The end goal is to have the plugin 
+# compilable separately from qtcreator sources, thus merging the plugin 
+# code also into this source package.
+
+Package: qtcreator-plugin-ubuntu-common
+Architecture: all
+Depends: ${misc:Depends}
+Description: Common data files for the Ubuntu plugin for Qt Creator IDE
+ Qt Creator is a new, lightweight, cross-platform integrated development
+ environment (IDE) designed to make development with the Qt application
+ framework even faster and easier.
+ .
+ This package contains the runtime data files for the Ubuntu plugin for 
+ Qt Creator IDE.
+
+Package: qtcreator-plugin-ubuntu-cordova-common
+Architecture: all
+Depends: ${misc:Depends}
+Description: Common data files for Cordova Ubuntu plugin for Qt Creator IDE
+ Qt Creator is a new, lightweight, cross-platform integrated development
+ environment (IDE) designed to make development with the Qt application
+ framework even faster and easier.
+ .
+ This package contains a data package for the Cordova Ubuntu plugin 
+ for Qt Creator IDE.

=== added file 'ubuntu-qtcreator-plugins-data/debian/copyright'
--- ubuntu-qtcreator-plugins-data/debian/copyright	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins-data/debian/copyright	2013-08-06 11:22:27 +0000
@@ -0,0 +1,24 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ubuntu-qtcreator-plugins-data
+Source: http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-qtcreator-plugins/trunk/files/head:/ubuntu-qtcreator-plugins-data/
+
+Files: *
+Copyright: 2013 Canonical Ltd.
+License: LGPL-2.1
+
+License: LGPL-2.1
+ 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; version 2.1.
+ .
+ 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 Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ 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'.
+

=== added file 'ubuntu-qtcreator-plugins-data/debian/qtcreator-plugin-ubuntu-common.install'
--- ubuntu-qtcreator-plugins-data/debian/qtcreator-plugin-ubuntu-common.install	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins-data/debian/qtcreator-plugin-ubuntu-common.install	2013-08-06 11:22:27 +0000
@@ -0,0 +1,8 @@
+usr/share/qtcreator/templates/wizards/ubuntu/backend
+usr/share/qtcreator/templates/wizards/ubuntu/backendplustabs
+usr/share/qtcreator/templates/wizards/ubuntu/html5
+usr/share/qtcreator/templates/wizards/ubuntu/projectypes.json
+usr/share/qtcreator/templates/wizards/ubuntu/scope
+usr/share/qtcreator/templates/wizards/ubuntu/simple
+usr/share/qtcreator/templates/wizards/ubuntu/tabs
+usr/share/qtcreator/ubuntu

=== added file 'ubuntu-qtcreator-plugins-data/debian/qtcreator-plugin-ubuntu-cordova-common.install'
--- ubuntu-qtcreator-plugins-data/debian/qtcreator-plugin-ubuntu-cordova-common.install	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins-data/debian/qtcreator-plugin-ubuntu-cordova-common.install	2013-08-06 11:22:27 +0000
@@ -0,0 +1,1 @@
+usr/share/qtcreator/templates/wizards/ubuntu/cordovaubuntu

=== removed file 'ubuntu-qtcreator-plugins-data/debian/qtcreator-plugin-ubuntu-cordova-data.install'
--- ubuntu-qtcreator-plugins-data/debian/qtcreator-plugin-ubuntu-cordova-data.install	2013-07-26 11:17:07 +0000
+++ ubuntu-qtcreator-plugins-data/debian/qtcreator-plugin-ubuntu-cordova-data.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/qtcreator/templates/wizards/ubuntu/cordovaubuntu
\ No newline at end of file

=== removed file 'ubuntu-qtcreator-plugins-data/debian/qtcreator-plugin-ubuntu-data.install'
--- ubuntu-qtcreator-plugins-data/debian/qtcreator-plugin-ubuntu-data.install	2013-07-26 11:17:07 +0000
+++ ubuntu-qtcreator-plugins-data/debian/qtcreator-plugin-ubuntu-data.install	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-usr/share/qtcreator/templates/wizards/ubuntu/projectypes.json
-usr/share/qtcreator/templates/wizards/ubuntu/simple
-usr/share/qtcreator/templates/wizards/ubuntu/tabs
-usr/share/qtcreator/templates/wizards/ubuntu/html5
-usr/share/qtcreator/templates/wizards/ubuntu/backend
-usr/share/qtcreator/templates/wizards/ubuntu/backendplustabs
-usr/share/qtcreator/templates/wizards/ubuntu/scope
-usr/share/qtcreator/ubuntu

=== modified file 'ubuntu-qtcreator-plugins-data/debian/rules'
--- ubuntu-qtcreator-plugins-data/debian/rules	2013-07-26 11:17:07 +0000
+++ ubuntu-qtcreator-plugins-data/debian/rules	2013-08-06 11:22:27 +0000
@@ -4,7 +4,7 @@
 export DH_VERBOSE=1
 
 %:
-	dh $@
+	dh $@ --fail-missing
 
 override_dh_auto_install:
 	mkdir -p $(CURDIR)/debian/tmp/usr

=== removed directory 'ubuntu-qtcreator-plugins-data/debian/source'
=== removed file 'ubuntu-qtcreator-plugins-data/debian/source/format'
--- ubuntu-qtcreator-plugins-data/debian/source/format	2013-07-26 11:17:07 +0000
+++ ubuntu-qtcreator-plugins-data/debian/source/format	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-3.0 (native)

=== modified file 'ubuntu-qtcreator-plugins-data/share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/tests/autopilot/run' (properties changed: -x to +x)
=== modified file 'ubuntu-qtcreator-plugins-data/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/run' (properties changed: -x to +x)
=== modified file 'ubuntu-qtcreator-plugins-data/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/run' (properties changed: -x to +x)