Merge lp:~zyga/checkbox/checkbox-packaging into lp:~checkbox-dev/checkbox/checkbox-packaging

[Zygmunt Krynicki]

This is the packaging change corresponding to https://code.launchpad.net/~zkrynicki/checkbox/focus-on-checkbox-ng/+merge/194163

[Daniel Manrique (roadmr)]

This looks OK, just some renaming and moving files and a few transitional packages.

Do you want to remove the plainbox-autostart-* transitional packages now? I think they're only used in checkbox-
satellite deployments so as long as we push the corresponding changes today and alert everybody to upgrade, we should be OK. Or we can do it in a more staggered fashion.

+1 but I won't pull the approval trigger until I hear about this.

review: Approve

[Daniel Manrique (roadmr)]

ok, I'll approve this now, we can remove those packages later it's no rush :)

[lp:~zyga/checkbox/checkbox-packaging]

35. By Zygmunt Krynicki on 2013-11-06

"automatic merge by tarmac [r=roadmr][bug=][author=zkrynicki]"

[Zygmunt Krynicki (zyga)]

On śro, lis 6, 2013 o 9:29 , Daniel Manrique
<email address hidden> wrote:
> Review: Approve
>
> This looks OK, just some renaming and moving files and a few
> transitional packages.
>
> Do you want to remove the plainbox-autostart-* transitional packages
> now? I think they're only used in checkbox-
> satellite deployments so as long as we push the corresponding changes
> today and alert everybody to upgrade, we should be OK. Or we can do
> it in a more staggered fashion.
>

Not yet. We can look at removing them afterr a few weeks. I wonder what
the policy says on transitional packages like that.

Thanks
ZK
>
>

=== renamed file 'debian/plainbox-autostart-desktop.install' => 'debian/checkbox-autostart-desktop.install'
--- debian/plainbox-autostart-desktop.install	2013-10-23 07:01:08 +0000
+++ debian/checkbox-autostart-desktop.install	2013-11-06 19:06:37 +0000
@@ -1,1 +1,1 @@
-plainbox/plainbox/data/plainbox.desktop etc/xdg/autostart
+checkbox-ng/contrib/checkbox-sru.desktop etc/xdg/autostart

=== renamed file 'debian/plainbox-autostart-server.install' => 'debian/checkbox-autostart-server.install'
--- debian/plainbox-autostart-server.install	2013-10-23 07:01:08 +0000
+++ debian/checkbox-autostart-server.install	2013-11-06 19:06:37 +0000
@@ -1,1 +1,1 @@
-plainbox/plainbox/data/plainbox.conf etc/init
+checkbox-ng/contrib/checkbox-sru.conf etc/init

=== renamed file 'debian/plainbox-ci-mailer.install' => 'debian/checkbox-ci-mailer.install'
--- debian/plainbox-ci-mailer.install	2013-10-23 07:01:08 +0000
+++ debian/checkbox-ci-mailer.install	2013-11-06 19:06:37 +0000
@@ -1,1 +1,1 @@
-plainbox/plainbox/data/plainbox-ci-mailer.conf etc/init
+checkbox-ng/contrib/checkbox-ci-mailer.conf etc/init

=== modified file 'debian/control'
--- debian/control	2013-11-06 14:35:09 +0000
+++ debian/control	2013-11-06 19:06:37 +0000
@@ -254,6 +254,7 @@
 Package: python3-checkbox-ng
 Architecture: all
 Depends: python3-plainbox (>= 0.3+bzr2359),
+         python3-requests ( >= 1.0),
          ${misc:Depends},
          ${python3:Depends}
 Description: Simple replacement for CheckBox
@@ -283,17 +284,35 @@
 
 Package: plainbox-autostart-desktop
 Architecture: all
-Depends: plainbox, plainbox-insecure-policy
+Priority: extra
+Section: oldlibs
+Depends: checkbox-autostart-destkop 
 Description: PlainBox autostart for desktop install
- File(s) needed for starting PlainBox automatically after login on a desktop
- install.
+ Transitional package that can be safely removed
 
 Package: plainbox-autostart-server
 Architecture: all
-Depends: plainbox, plainbox-insecure-policy
+Priority: extra
+Section: oldlibs
+Depends: checkbox-autostart-server 
 Description: PlainBox autostart for server install
- File(s) needed for starting PlainBox automatically after boot on a server
- install.
+ Transitional package that can be safely removed
+
+Package: checkbox-autostart-desktop
+Architecture: all
+Depends: checkbox, plainbox-insecure-policy
+Description: CheckBox autostart for desktop install
+ Installing this package will automatically invoke 'checkbox sru' after the
+ desktop session is started. This package should be only installed in automated
+ testing environment.
+
+Package: checkbox-autostart-server
+Architecture: all
+Depends: checkbox, plainbox-insecure-policy
+Description: CheckBox autostart for server install
+ Installing this package will automatically invoke 'checkbox sru' after a
+ server installation finishes booting. This package should be only installed in
+ automated testing environment.
 
 Package: plainbox-secure-policy
 Architecture: all
@@ -312,9 +331,17 @@
 
 Package: plainbox-ci-mailer
 Architecture: all
-Depends: curl, plainbox-autostart-server | plainbox-autostart-desktop
+Priority: extra
+Section: oldlibs
+Depends: checkbox-ci-mailer 
 Description: PlainBox CI mailer
- Helper that e-mails PlainBox output from autostart packages when run is
+ Transitional package that can be safely removed
+
+Package: checkbox-ci-mailer
+Architecture: all
+Depends: curl, checkbox-autostart-server | checkbox-autostart-desktop
+Description: CheckBox CI mailer
+ Helper that e-mails CheckBox output from autostart packages when run is
  finished.
 
 Package: plainbox-ihv-demo-config