Merge lp:~sergiusens/phablet-tools/split into lp:phablet-tools

[Sergio Schvezov]

Split packages and add warning of phablet-flash deprecation

[lp:~sergiusens/phablet-tools/split]

243. By Sergio Schvezov on 2014-03-10

fixing typo

244. By Sergio Schvezov on 2014-03-10

Adding cmake dependency to click-buddy (LP: #1289558)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:244
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/292/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/64

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/292/rebuild

review: Approve (continuous-integration)

Unmerged revisions

244. By Sergio Schvezov on 2014-03-10

Adding cmake dependency to click-buddy (LP: #1289558)

243. By Sergio Schvezov on 2014-03-10

fixing typo

242. By Sergio Schvezov on 2014-03-10

Splitting up package into smaller ones (to make it easier to get rid of phablet-flash).
Adding deprecation warning to phablet-flash.

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-27 15:28:28 +0000
+++ debian/changelog	2014-03-10 13:00:25 +0000
@@ -1,3 +1,10 @@
+phablet-tools (1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Splitting up package into smaller ones.
+  * Adding cmake dependency to click-buddy (LP: #1289558)
+
+ -- Sergio Schvezov <[e-mail]>  Sun, 09 Mar 2014 02:13:24 -0300
+
 phablet-tools (1.0+14.04.20140227.1-0ubuntu1) trusty; urgency=low
 
   [ Sergio Schvezov ]

=== added file 'debian/click-buddy.install'
--- debian/click-buddy.install	1970-01-01 00:00:00 +0000
+++ debian/click-buddy.install	2014-03-10 13:00:25 +0000
@@ -0,0 +1,1 @@
+usr/bin/click-buddy

=== modified file 'debian/control'
--- debian/control	2014-02-24 15:20:31 +0000
+++ debian/control	2014-03-10 13:00:25 +0000
@@ -14,7 +14,7 @@
                python-testscenarios,
                python-testtools,
                python-xdg,
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Section: admin
 # If you aren't a member of ~phablet-team but need to upload
 # packaging changes, just go ahead. ~phablet-team will notice
@@ -22,34 +22,99 @@
 Vcs-Bzr: https://code.launchpad.net/~phablet-team/phablet-tools/trunk
 Vcs-Browser: https://bazaar.launchpad.net/~phablet-team/phablet-tools/trunk/files
 
+Package: ubuntu-touch-tools
+Replaces: phablet-tools ( << 1.1 )
+Breaks: phablet-tools ( << 1.1 )
+Section: admin
+Architecture: all
+Depends:
+ ${misc:Depends}, 
+ click-buddy (= ${binary:Version}),
+ phablet-flash (= ${binary:Version}),
+ ubuntu-touch-dev-tools (= ${binary:Version}),
+ ubuntu-touch-demo-tools (= ${binary:Version}),
+ ubuntu-device-flash,
+Recommends:
+ ubuntu-emulator,
+Description: Tool bundle to work with Ubuntu Touch.
+ Install this metapackage to get a complete set of tools to work with Ubuntu
+ Touch.
+
 Package: phablet-tools
-Section: admin
+Section: oldlibs
 Architecture: all
 Depends:
+ ubuntu-touch-tools,
+ ${misc:Depends}, 
+Description: transitional dummy package.
+ This is a transitional dummy package. It can safely be removed.
+
+Package: click-buddy
+Section: devel
+Architecture: all
+Depends: 
+ ${misc:Depends}, 
+ android-tools-adb (>= 4.2.2),
+ click,
+ cmake,
+ ubuntu-touch-dev-tools (= ${binary:Version}),
+Description: Tool to build and provision click packages.
+ This tool is intended to build click packages by wrapping through cmake and
+ also provinding mechanisms to provision the build package onto a target
+ device and install it's tests.
+
+Package: python-phabletutils
+Section: python
+Architecture: all
+Depends: 
+ ${misc:Depends}, 
+ ${python:Depends},
  android-tools-adb (>= 4.2.2),
  android-tools-fastboot (>= 4.2.2),
- bzr,
- click,
- curl,
- dpkg-dev,
  python-configobj,
  python-lzma,
  python-launchpadlib,
  python-requests,
  python-xdg,
+Description: Tool to work with Ubuntu Touch (python module).
+ This module provides wrappers and helpers to provision and interface with
+ an Ubuntu Touch device.
+
+Package: ubuntu-touch-dev-tools
+Section: devel
+Architecture: all
+Depends:
+ ${misc:Depends}, 
+ ${python:Depends},
+ bzr,
+ imagemagick,
+ python-phabletutils (= ${binary:Version}),
+Suggests: click-buddy
+Description: Tool to work develop for Ubuntu Touch.
+ Tools to develop easily setup the network, provision and run tests, 
+ bootstrap the android repo.
+
+Package: ubuntu-touch-demo-tools
+Section: devel
+Architecture: all
+Depends:
+ ${misc:Depends}, 
+ ${python:Depends},
+ python-phabletutils (= ${binary:Version}),
+Description: Tool to setup an Ubuntu Touch device with demo content.
+ Use this tool to provision a target device with a variety of demo content.
+
+Package: phablet-flash
+Section: admin
+Architecture: all
+Depends:
+ ${misc:Depends}, 
+ ${python:Depends},
+ curl,
+ python-phabletutils (= ${binary:Version}),
  rsync,
  wget,
- ${misc:Depends},
- ${python:Depends},
-Recommends:
- imagemagick,
- ubuntu-dev-tools,
- ubuntu-device-flash,
-Description: Scripts to work with Phablet.
- Installs Touch Developer Preview on Nexus devices, specifically the following:
-  - Galaxy Nexus
-  - Nexus 4
-  - Nexus 7
-  - Nexus 10
- .
- Additional tools included to bootstrap from source and setup networking
+Recommends: ubuntu-device-flash
+Description: Tool to provision Ubuntu Touch devices (deprecated).
+ This is the legacy tool used to flash devices with Ubuntu Touch, 
+ ubuntu-device-flash is the new recommendation.

=== added file 'debian/phablet-flash.install'
--- debian/phablet-flash.install	1970-01-01 00:00:00 +0000
+++ debian/phablet-flash.install	2014-03-10 13:00:25 +0000
@@ -0,0 +1,1 @@
+usr/bin/phablet-flash

=== renamed file 'debian/phablet-tools.lintian-overrides' => 'debian/phablet-flash.lintian-overrides'
--- debian/phablet-tools.lintian-overrides	2013-02-13 23:28:56 +0000
+++ debian/phablet-flash.lintian-overrides	2014-03-10 13:00:25 +0000
@@ -1,1 +1,1 @@
-phablet-tools: binary-without-manpage
+phablet-flash: binary-without-manpage

=== added file 'debian/python-phabletutils.install'
--- debian/python-phabletutils.install	1970-01-01 00:00:00 +0000
+++ debian/python-phabletutils.install	2014-03-10 13:00:25 +0000
@@ -0,0 +1,1 @@
+usr/lib/python2.7

=== added file 'debian/ubuntu-touch-demo-tools.install'
--- debian/ubuntu-touch-demo-tools.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-touch-demo-tools.install	2014-03-10 13:00:25 +0000
@@ -0,0 +1,1 @@
+usr/bin/phablet-demo-setup

=== added file 'debian/ubuntu-touch-dev-tools.install'
--- debian/ubuntu-touch-dev-tools.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-touch-dev-tools.install	2014-03-10 13:00:25 +0000
@@ -0,0 +1,7 @@
+usr/bin/repo
+usr/bin/phablet-dev-bootstrap
+usr/bin/phablet-network
+usr/bin/phablet-config
+usr/bin/phablet-test-run
+usr/bin/phablet-screenshot
+usr/bin/phablet-click-test-setup

=== added file 'debian/ubuntu-touch-dev-tools.lintian-overrides'
--- debian/ubuntu-touch-dev-tools.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-touch-dev-tools.lintian-overrides	2014-03-10 13:00:25 +0000
@@ -0,0 +1,1 @@
+ubuntu-touch-dev-tools: binary-without-manpage

=== modified file 'phablet-flash'
--- phablet-flash	2013-08-09 01:07:55 +0000
+++ phablet-flash	2014-03-10 13:00:25 +0000
@@ -17,6 +17,7 @@
 import logging
 import os
 import sys
+import time
 
 from phabletutils.device import (AndroidBridge, Fastboot)
 from phabletutils import arguments
@@ -40,6 +41,10 @@
     if not license.has_accepted(accepted_pathname()) and \
        not license.query(settings.legal_notice, accepted_pathname()):
         exit(1)
+    print('\nphablet-flash is deprecated; use ubuntu-device-flash instead\n'
+          'provided by the ubuntu-device-flash package or\n'
+          'go get launchpad.net/goget-ubuntu-touch/ubuntu-device-flash\n')
+    time.sleep(2)
     try:
         project = args.func(args)
         if project: