[Python-modules-commits] [checkbox-ng] 07/09: Remove the checkbox-ng-service binary package

[Sylvain Pineau]

This is an automated email from the git hooks/post-receive script.

spineau-guest pushed a commit to branch master
in repository checkbox-ng.

commit 7343677220598f3effa4abba6231e070220743e6
Author: Sylvain Pineau <sylvain.pineau at canonical.com>
Date:   Wed Jan 6 14:45:58 2016 +0100

    Remove the checkbox-ng-service binary package
    
    Upstream stopped shipping the dbus service of checkbox-ng
---
 debian/checkbox-ng-service.install |  1 -
 debian/control                     | 16 ----------------
 debian/copyright                   | 25 -------------------------
 debian/rules                       |  5 +++--
 4 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/debian/checkbox-ng-service.install b/debian/checkbox-ng-service.install
deleted file mode 100644
index 37e3057..0000000
--- a/debian/checkbox-ng-service.install
+++ /dev/null
@@ -1 +0,0 @@
-contrib/com.canonical.certification.PlainBox1.service usr/share/dbus-1/services/
diff --git a/debian/control b/debian/control
index abe768e..09ac51c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,7 @@ Build-Depends: debhelper (>= 9),
                dh-python,
                python3-all,
                python3-checkbox-support (>= 0.22),
-               python3-dbus,
                python3-docutils,
-               python3-gi,
                python3-plainbox (>= 0.24),
                python3-requests (>= 1.0),
                python3-setuptools,
@@ -36,20 +34,6 @@ Description: PlainBox based test runner
  .
  This package contains the CheckBox command line tool
 
-Package: checkbox-ng-service
-Architecture: all
-Depends: checkbox-ng (= ${binary:Version}),
-         python3,
-         python3-dbus,
-         python3-gi,
-         ${misc:Depends}
-Description: CheckBox D-Bus service
- CheckBoxNG is a hardware testing tool useful for certifying laptops,
- desktops and servers. It is a new version of CheckBox that is built
- directly on top of PlainBox. CheckBoxNG replaces CheckBox, where applicable.
- .
- File(s) needed for auto-starting CheckBox D-Bus service on demand.
-
 Package: python3-checkbox-ng
 Architecture: all
 Depends: python3-checkbox-support (>= 0.22),
diff --git a/debian/copyright b/debian/copyright
index d03c831..09bfd2b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,28 +19,3 @@ License: GPL-3
  .
  On Debian-based systems the full text of the GPL, version 3, can be found at
  /usr/share/common-licenses/GPL-3.
-
-Files: checkbox_ng/dbus_ex/decorators.py
-Copyright:
- Copyright (C) 2003, 2004, 2005, 2006 Red Hat Inc. <http://www.redhat.com/>
- Copyright (C) 2003 David Zeuthen
- Copyright (C) 2004 Rob Taylor
- Copyright (C) 2005, 2006 Collabora Ltd. <http://www.collabora.co.uk/>
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
diff --git a/debian/rules b/debian/rules
index 4f70db4..05dcbeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,9 +16,10 @@ override_dh_auto_build:
 override_dh_install:
 	dh_install
 	mkdir -p debian/checkbox-ng/usr/bin
-	mkdir -p debian/checkbox-ng-service/usr/bin
+	mv debian/python3-checkbox-ng/usr/bin/checkbox debian/checkbox-ng/usr/bin
 	mv debian/python3-checkbox-ng/usr/bin/checkbox-cli debian/checkbox-ng/usr/bin
-	mv debian/python3-checkbox-ng/usr/bin/checkbox-gui-service debian/checkbox-ng-service/usr/bin
+	mv debian/python3-checkbox-ng/usr/bin/checkbox-launcher debian/checkbox-ng/usr/bin
+	mv debian/python3-checkbox-ng/usr/bin/checkbox-submit debian/checkbox-ng/usr/bin
 	find debian/python3-checkbox-ng -type d -empty -delete
 
 override_dh_python3:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/checkbox-ng.git