Merge lp:~roadmr/checkbox/packaging-c-c-s-retry into lp:~checkbox-dev/checkbox/checkbox-packaging

[Daniel Manrique]

Another try at making canonical-certification-server usable by installing only *one* seed package.

plainbox-provider-certification-server depends on
checkbox-ng which contains the appropriate binary to run its tests.
Installing it will also remove the old canonical-certification-server
package.

c-c-s was turned into a dummy, empty package. It will be removed by
plainbox-provider-certification-server but this may be
useful for upgrades and whatnot so I left it there.

[Jeff Lane  (bladernr)]

I'm OK with this... awaiting further approval from zyga or spineau

[Daniel Manrique (roadmr)]

I found out what happened with the example xdg/canonical-certification.conf file; it was part of canonical-certification-server, so when we started deprecating that package, the file disappeared.

I've modified this to add that file to the provider package, and also to properly Conflict and Replace that package so the config file, if existing, gets taken over by the provider package.

[Zygmunt Krynicki (zyga)]

This is good except for one line, I think:

25 Package: canonical-certification-server
26 Architecture: all
27 -Depends: plainbox-provider-certification-server,
28 - python3-checkbox-ng,
29 - ${misc:Depends},
30 - ${python3:Depends}
31 Provides: checkbox-certification-server
32 Conflicts: checkbox-certification-server
33 Replaces: checkbox-certification-server
34 Description: Canonical Certification Server.
35 - checkbox-certification-server
36 + checkbox-certification-server. A dummy transitional package.
37

On line 27 there you drop the only way for people who used to have this package, to get the new desired package.

I would also add 'Priority: extra' which is the practice for transitional packages.

review: Needs Fixing

[Daniel Manrique (roadmr)]

I'll push an update adding the depends and the priority.

A question though: if c-c-s depends: p-p-c-s (pardon the abbreviations), and p-p-c-s conflicts: and replaces: c-c-s, *and* I install the new version of c-c-s, what will happen? if a dependency breaks the package I'm trying to install, won't the universe collapse?

Versioning restrictions would work here, but I'm not entirely sure of which versions to use. c-c-s should depends: p-p-c-s >= 0.17.9 and p-p-c-s should conflicts: and replaces: c-c-s << 0.17.9, assuming 0.17.9 is the next stable release. Versioning is in a state of flux so again, I'm unsure.

[Daniel Manrique (roadmr)]

resubmitted with above changes, still needs work.

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

Hey.

Let's start over with two assumptions:

1) people used ppa-purge to clean up after whatever they had installed
2) we use one of the new packaging branches lp:~checkbox-dev/checkbox/ppa-packaging-*

I think this way we'll end up with a correct solution and we already need to use ppa-purge to fix the version problem we introduced long long ago, before plainbox and providers were in trusty.

review: Disapprove

[Daniel Manrique (roadmr)]

I'll kill this MR and replace with merges on the new packaging branches.

Unmerged revisions

72. By Daniel Manrique on 2014-03-27

Fixes to deprecate canonical-certification-server.

plainbox-provider-certification-server depends on checkbox-ng which contains
the appropriate binary to run its tests. Installing it will also remove the
old canonical-certification-server package. It Conflicts: and Replaces: c-c-s
to take over the configuration files, in case they exist.

c-c-s is GONE now.

The example canonical-certification.conf file, as well as the
canonical-certification-server upstart job, were relocated to the
plainbox-provider-certification-server package.

Finally, plainbox-provider-certification-server depends on proper versions of
checkbox-ng and plainbox-provider-checkbox from the ppa.

71. By Daniel Manrique on 2014-03-27

Fixed syntax error in c-c-s config file

=== removed file 'debian/canonical-certification-server.install'
--- debian/canonical-certification-server.install	2013-12-11 17:28:11 +0000
+++ debian/canonical-certification-server.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-checkbox-ng/contrib/canonical-certification-server.conf etc/init
-debian/extras/canonical-certification-config/canonical-certification.conf /etc/xdg
-usr/bin/canonical-certification-server

=== modified file 'debian/control'
--- debian/control	2014-03-25 16:08:58 +0000
+++ debian/control	2014-03-27 15:34:16 +0000
@@ -118,7 +118,9 @@
 
 Package: plainbox-provider-certification-server
 Architecture: all
-Depends: plainbox-provider-checkbox
+Depends: checkbox-ng (>=0.3~dev), plainbox-provider-checkbox (>=0.4~dev)
+Conflicts: canonical-certification-server
+Replaces: canonical-certification-server
 Recommends: apache2,
             bind9,
             bonnie++,
@@ -304,18 +306,6 @@
  environment. Normally the configuration file shipped by this package should
  not be packaged
 
-Package: canonical-certification-server
-Architecture: all
-Depends: plainbox-provider-certification-server,
-         python3-checkbox-ng,
-         ${misc:Depends},
-         ${python3:Depends}
-Provides: checkbox-certification-server
-Conflicts: checkbox-certification-server
-Replaces: checkbox-certification-server
-Description: Canonical Certification Server.
- checkbox-certification-server
-
 Package: checkbox-gui
 Architecture: any
 Depends: checkbox-ng-service,

=== modified file 'debian/extras/canonical-certification-config/canonical-certification.conf'
--- debian/extras/canonical-certification-config/canonical-certification.conf	2014-02-25 16:20:21 +0000
+++ debian/extras/canonical-certification-config/canonical-certification.conf	2014-03-27 15:34:16 +0000
@@ -10,11 +10,11 @@
 [environment]
 # For virtualization testing.
 # Uncomment the following 2 lines and set the proper parameters:
-#kvm_timeout:
-#kvm_image:
+#kvm_timeout =
+#kvm_image =
 # For network testing.
 # Uncomment the following 4 lines and set the proper parameters:
-#test_target_ftp: your-ftp-server.example.com
-#test_user: anonymous
-#test_pass:
-#test_target_iperf: your-iperf-server.example.com
+#test_target_ftp = your-ftp-server.example.com
+#test_user = anonymous
+#test_pass =
+#test_target_iperf = your-iperf-server.example.com

=== modified file 'debian/plainbox-provider-certification-server.install'
--- debian/plainbox-provider-certification-server.install	2013-12-02 09:04:30 +0000
+++ debian/plainbox-provider-certification-server.install	2014-03-27 15:34:16 +0000
@@ -1,2 +1,4 @@
 usr/lib/plainbox-providers-1/certification-server
 usr/share/plainbox-providers-1/certification-server.provider
+checkbox-ng/contrib/canonical-certification-server.conf etc/init
+debian/extras/canonical-certification-config/canonical-certification.conf /etc/xdg