Merge ~sylvain-pineau/plainbox/+git/packaging:fix-transition into ~checkbox-dev/plainbox/+git/packaging:master

[Sylvain Pineau]

fix transition to checkbox-ng

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

diff --git a/debian/control b/debian/control
index bb27b73..7f675ae 100644
--- a/debian/control
+++ b/debian/control
@@ -29,10 +29,7 @@ Homepage: https://launchpad.net/plainbox
 
 Package: plainbox
 Architecture: all
-Depends: python3-pkg-resources,
-         python3-plainbox (= ${binary:Version}),
-         ${misc:Depends},
-         ${python3:Depends}
+Depends: checkbox-ng (>=1)
 Description: toolkit for software and hardware integration testing
  PlainBox is a toolkit consisting of python3 library, development tools,
  documentation and examples. It is targeted at developers working on testing or
@@ -58,19 +55,7 @@ Description: toolkit for software and hardware integration testing
 Package: python3-plainbox
 Architecture: all
 Section: python
-Depends: plainbox-secure-policy (= ${binary:Version}) | plainbox-insecure-policy (= ${binary:Version}),
-         policykit-1,
-         python3-crypto,
-         python3-guacamole,
-         python3-jinja2,
-         python3-padme,
-         python3-pkg-resources,
-         python3-requests,
-         python3-requests-oauthlib,
-         python3-xlsxwriter,
-         ${misc:Depends},
-         ${python3:Depends}
-Breaks: python3-checkbox-ng (<< 0.18)
+Depends: python3-checkbox-ng (>=1)
 Description: toolkit for software and hardware testing (python3 module)
  PlainBox is a toolkit consisting of python3 library, development tools,
  documentation and examples. It is targeted at developers working on testing or
@@ -119,65 +104,3 @@ Description: toolkit for software and hardware testing (documentation)
  testing "cloud" installations.
  .
  This package contains the documentation for the plainbox python3 library
-
-Package: plainbox-secure-policy
-Architecture: all
-Depends: ${misc:Depends}
-Conflicts: plainbox-insecure-policy
-Replaces: plainbox-insecure-policy
-Description: policykit policy required to use plainbox (secure version)
- PlainBox is a toolkit consisting of python3 library, development tools,
- documentation and examples. It is targeted at developers working on testing or
- certification applications and authors creating tests for such applications.
- .
- PlainBox can be used to both create simple and comprehensive test tools as
- well as to develop and execute test jobs and test scenarios. It was created as
- a refined and rewritten core of the Checkbox project. It has a well tested and
- documented core, small but active development community and a collection of
- associated projects that use it as a lower-level engine/back-end library.
- .
- PlainBox has a novel approach to discovering (and probing) hardware and
- software that is extensible and not hardwired into the system. It allows test
- developers to express association between a particular test and the hardware,
- software and configuration constraints that must be met for the test to
- execute meaningfully. This feature, along with pluggable test definitions,
- makes plainbox flexible and applicable to many diverse testing situations,
- ranging from mobile phones, traditional desktop computers, servers and up to
- testing "cloud" installations.
- .
- This package contains a PolicyKit .policy file that allows PlainBox to run
- plainbox-trusted-launcher-1 as root and ask for the user password only once
- per session.
-
-Package: plainbox-insecure-policy
-Architecture: all
-Priority: extra
-Depends: ${misc:Depends}
-Conflicts: plainbox-secure-policy
-Replaces: plainbox-secure-policy
-Description: policykit policy required to use plainbox (insecure version)
- PlainBox is a toolkit consisting of python3 library, development tools,
- documentation and examples. It is targeted at developers working on testing or
- certification applications and authors creating tests for such applications.
- .
- PlainBox can be used to both create simple and comprehensive test tools as
- well as to develop and execute test jobs and test scenarios. It was created as
- a refined and rewritten core of the Checkbox project. It has a well tested and
- documented core, small but active development community and a collection of
- associated projects that use it as a lower-level engine/back-end library.
- .
- PlainBox has a novel approach to discovering (and probing) hardware and
- software that is extensible and not hardwired into the system. It allows test
- developers to express association between a particular test and the hardware,
- software and configuration constraints that must be met for the test to
- execute meaningfully. This feature, along with pluggable test definitions,
- makes plainbox flexible and applicable to many diverse testing situations,
- ranging from mobile phones, traditional desktop computers, servers and up to
- testing "cloud" installations.
- .
- Note that installing this package will allow *any* local user to execute any
- of the plainbox jobs (test definitions), also installed on the same machine
- (in system-wide locations), without any confirmation. You should only install
- this package on machines where that is not a security problem. Typically this
- package is installed on test machines inside automatically deployed test
- farms.
diff --git a/debian/plainbox-insecure-policy.install b/debian/plainbox-insecure-policy.install
deleted file mode 100644
index c95d24a..0000000
--- a/debian/plainbox-insecure-policy.install
+++ /dev/null
@@ -1 +0,0 @@
-contrib/policykit_yes/org.freedesktop.policykit.pkexec.run-plainbox-job.policy usr/share/polkit-1/actions/
diff --git a/debian/plainbox-secure-policy.install b/debian/plainbox-secure-policy.install
deleted file mode 100644
index 86326f9..0000000
--- a/debian/plainbox-secure-policy.install
+++ /dev/null
@@ -1 +0,0 @@
-contrib/policykit_auth_admin_keep/org.freedesktop.policykit.pkexec.run-plainbox-job.policy usr/share/polkit-1/actions/