Merge ~sylvain-pineau/checkbox-ng/+git/packaging:urwid into checkbox-ng:master

[Sylvain Pineau]

New dep on python3-urwird for the new UI screens (test/test plan selections)

Unmerged commits

5cb873c... by Sylvain Pineau on 2017-03-10

debian:control: Add a new dependency on python3-urwid

Required to get rid of textland to run the UI screens.

6ab0977... by Pierre Equoy on 2017-03-06

change version to 0.32.0~rc2-1
[ Pierre Equoy ]
"new upstream version"

b5c8cbc... by Pierre Equoy on 2017-03-06

record new upstream branch created by importing checkbox-ng_0.32.0~rc2.orig.tar.gz

21d7073... by Zygmunt Krynicki on 2015-10-08

Revert the documentation theme back to default

 CheckboxNG uses a customized sphinx theme that is not included in the release
 tarball. The theme is customized for "ubuntu" colors and this is not required
 in Debian.
Origin: upstream
Forwarded: not-needed
Last-Update: 2015-07-21

Patch-Name: documentation-theme

c277778... by Pierre Equoy on 2017-03-06

Import checkbox-ng_0.32.0~rc2.orig.tar.gz

887f47f... by Sylvain Pineau on 2017-02-24

change version to 0.32.0~rc1-1
new upstream version

a035209... by Sylvain Pineau on 2017-02-24

merge patched into master

b6633c7... by Zygmunt Krynicki on 2015-10-08

Revert the documentation theme back to default

 CheckboxNG uses a customized sphinx theme that is not included in the release
 tarball. The theme is customized for "ubuntu" colors and this is not required
 in Debian.
Origin: upstream
Forwarded: not-needed
Last-Update: 2015-07-21

Patch-Name: documentation-theme

983d0a6... by Sylvain Pineau on 2017-02-24

Import checkbox-ng_0.32.0~rc1.orig.tar.gz

0dfbb15... by Sylvain Pineau on 2017-02-24

record new upstream branch created by importing checkbox-ng_0.32.0~rc1.orig.tar.gz

diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..65b215a
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,24 @@
+Metadata-Version: 1.0
+Name: checkbox-ng
+Version: 0.32.0rc2
+Summary: Checkbox - Command Line Test Runner
+Home-page: https://launchpad.net/checkbox-ng/
+Author: Zygmunt Krynicki
+Author-email: [e-mail]
+License: GPLv3
+Description: CheckBoxNG
+        ==========
+        
+        :term:`CheckBoxNG` is a hardware testing tool useful for certifying laptops,
+        desktops and servers with Ubuntu. It is a new version of :term:`CheckBox` that
+        is built directly on top of :term:`PlainBox`
+        
+        CheckBoxNG *replaces* CheckBox, where applicable. 
+        
+        Installation
+        ============
+        
+        CheckBoxNG is pre-installed on Ubuntu 14.04. It is also available in Debian (as
+        checkbox-ng) Testing.
+        
+Platform: UNKNOWN
diff --git a/checkbox_ng/__init__.py b/checkbox_ng/__init__.py
index 2c403fb..d4ee2df 100644
--- a/checkbox_ng/__init__.py
+++ b/checkbox_ng/__init__.py
@@ -24,4 +24,8 @@
 CheckBoxNG is a new version of CheckBox built on top of PlainBox
 """
 
+<<<<<<< checkbox_ng/__init__.py
 __version__ = '0.32.0.dev0'
+=======
+__version__ = '0.32.0rc2'
+>>>>>>> checkbox_ng/__init__.py
diff --git a/checkbox_ng/certification.py b/checkbox_ng/certification.py
index def7e35..40601fb 100644
--- a/checkbox_ng/certification.py
+++ b/checkbox_ng/certification.py
@@ -46,12 +46,18 @@ class CertificationTransport(TransportBase):
     Transport for sending data to certification database.
      - POSTs data to a http(s) endpoint
      - Adds a header with a hardware identifier
+<<<<<<< checkbox_ng/certification.py
      - Payload can be in:
         * checkbox xml-compatible format.
           This means it will work best with a stream produced by the xml
           exporter.
         * LZMA compressed tarball that includes a submission.json and results
           from checkbox.
+=======
+     - Data is expected to be in checkbox xml-compatible format.
+       This means it will work best with a stream produced by the
+       xml exporter.
+>>>>>>> checkbox_ng/certification.py
    """
 
     def __init__(self, where, options):
diff --git a/checkbox_ng/launcher/subcommands.py b/checkbox_ng/launcher/subcommands.py
index d560484..86a3db7 100644
--- a/checkbox_ng/launcher/subcommands.py
+++ b/checkbox_ng/launcher/subcommands.py
@@ -527,6 +527,7 @@ class Launcher(Command, MainLoopStage):
             else:
                 options = ""
             self.transports[transport] = cls(url, options)
+<<<<<<< checkbox_ng/launcher/subcommands.py
         elif tr_type == 'submission-service':
             secure_id = self.launcher.transports[transport].get(
                 'secure_id', None)
@@ -543,6 +544,8 @@ class Launcher(Command, MainLoopStage):
                 url = ('https://submission.canonical.com/'
                        '1.0/submission/hardware/{}'.format(secure_id))
             self.transports[transport] = cls(url, options)
+=======
+>>>>>>> checkbox_ng/launcher/subcommands.py
 
     def _export_results(self):
         for report in self.launcher.stock_reports:
diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 0000000..9ed1c3d
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
+# see git-dpm(1) from git-dpm package
+21d70739ec20ed824d2e1cb877f372133d851de0
+21d70739ec20ed824d2e1cb877f372133d851de0
+c27777850b796ae4f81a4f0fa6c2162d8b45189b
+c27777850b796ae4f81a4f0fa6c2162d8b45189b
+checkbox-ng_0.32.0~rc2.orig.tar.gz
+aecafc5307366055fe7c373c031bcdafbffabce2
+96012
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..439898f
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,146 @@
+checkbox-ng (0.32.0~rc2-1) UNRELEASED; urgency=medium
+
+  [ Pierre Equoy ]
+  * Open for development (remove this message before releasing)
+
+  [ Sylvain Pineau ]
+  * "new upstream version"
+  * new upstream version
+
+  [ Pierre Equoy ]
+  * "new upstream version"
+
+ -- Pierre Equoy <[e-mail]>  Mon, 06 Mar 2017 16:21:12 +0800
+
+checkbox-ng (0.29-1) UNRELEASED; urgency=medium
+
+  [ Ondřej Nový ]
+  * Fixed homepage (https)
+  * Fixed VCS URL (https)
+
+  [ Sylvain Pineau ]
+  * new upstream version
+
+ -- Sylvain Pineau <[e-mail]>  Wed, 05 Oct 2016 13:43:10 +0200
+
+checkbox-ng (0.23-2) unstable; urgency=medium
+
+  * debian/control: Add Breaks/Replaces rules after scripts ownership changes.
+    Closes: #810353.
+
+ -- Sylvain Pineau <[e-mail]>  Mon, 11 Jan 2016 15:12:03 +0100
+
+checkbox-ng (0.23-1) unstable; urgency=medium
+
+  * New upstream release. Closes: #740215.
+  * Remove the checkbox-ng-service binary package.
+  * debian/control: require plainbox 0.24 or more recent (new APIs and fixes)
+  * debian/rules: Ensure scripts in /usr/bin are well provided by checkbox-ng
+
+ -- Sylvain Pineau <[e-mail]>  Wed, 06 Jan 2016 11:36:34 +0100
+
+checkbox-ng (0.22-1) unstable; urgency=medium
+
+  * New upstream maintenance release
+  * debian/control: require plainbox 0.24 or more recent (new APIs and fixes)
+    and checkbox-support 0.22
+
+ -- Sylvain Pineau <[e-mail]>  Mon, 07 Dec 2015 14:17:56 +0100
+
+checkbox-ng (0.20.1-1) unstable; urgency=medium
+
+  * New upstream maintenance release 
+
+ -- Zygmunt Krynicki <[e-mail]>  Tue, 28 Jul 2015 18:48:23 +0200
+
+checkbox-ng (0.20-1) unstable; urgency=medium
+
+  * New upstream release 
+  * debian/control: Use the new email address for the team
+    ([e-mail]). 
+  * debian/patches/documentation-theme: refresh
+  * debian/patches/fix-tests-on-python35: drop (applied upstream)
+  * debian/control: require plainbox 0.22 or more recent (new APIs and fixes) 
+
+ -- Zygmunt Krynicki <[e-mail]>  Tue, 21 Jul 2015 13:21:12 +0200
+
+checkbox-ng (0.18-2) unstable; urgency=medium
+
+  * Add fix-tests-on-python35 patch to use inspect.Signature.from_callable
+    instead of deprecated from_function in Python >= 3.5 (LP: #1473093)
+
+ -- Zygmunt Krynicki <[e-mail]>  Thu, 09 Jul 2015 19:58:33 +0200
+
+checkbox-ng (0.18-1) unstable; urgency=medium
+
+  * New upstream release 
+  * debian/rules: prune empty directories in python3-checkbox-ng
+  * debian/control: update Standards-Version to 3.9.6 (no change required)
+  * debian/watch: use the new pypi redirector 
+  * debian/upstream/signing-key.asc: add key 7ED72CD1
+    of Sylvain Pineau <[e-mail]>
+  * debian/patches/documentation-theme: patch away the custom theme 
+  * debian/rules: remove stale rules for no-longer-present canonical-*
+    executables
+  * debian/rules: ship checkbox-cli launcher in the checkbox-ng binary package 
+  * debian/control: checkbox-ng-service depends on python3  
+  * debian/checkbox-ng.manpages: remove stale links for no-longer-present
+    canonical-* executables
+  * debian/checkbox-ng.lintian-overrides: add lintian override for
+    checkbox-launcher script interpreter 
+  * debian/control: wrap-and-sort 
+
+ -- Zygmunt Krynicki <[e-mail]>  Thu, 05 Mar 2015 14:40:11 +0100
+
+checkbox-ng (0.3.1-1) unstable; urgency=medium
+
+  * New upstream release: https://launchpad.net/checkbox-ng/14.04/0.3.1 
+  * debian/control: reformat some dependencies
+
+ -- Zygmunt Krynicki <[e-mail]>  Mon, 28 Apr 2014 11:35:20 +0200
+
+checkbox-ng (0.3-2) unstable; urgency=medium
+
+  * Add build dependency on python3-requests
+
+ -- Zygmunt Krynicki <[e-mail]>  Wed, 09 Apr 2014 18:34:16 +0200
+
+checkbox-ng (0.3-1) unstable; urgency=medium
+
+  [ Zygmunt Krynicki ]
+  * New upstream release: https://launchpad.net/checkbox-ng/14.04/0.3 
+  * debian/control: make python3-checkbox-ng, checkbox-ng and checkbox-service
+    all depend on one version of themselves. LP: #1298284
+  * debian/control: depend on latest plainbox 
+  * debian/upstream/signing-key.asc: Use armoured gpg keys to avoid having to
+    keep binary files in Debian packaging. Also, replace that with my key
+    since I made the 0.3 release upstream.
+  * debian/source/include-binaries: no longer needed 
+
+  [ Piotr Ożarowski ]
+  * debian/watch: add support for dev releases
+
+ -- Zygmunt Krynicki <[e-mail]>  Thu, 27 Mar 2014 11:18:14 +0100
+
+checkbox-ng (0.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sylvain Pineau <[e-mail]>  Mon, 24 Mar 2014 14:27:40 +0100
+
+checkbox-ng (0.1-2) unstable; urgency=low
+
+  [ Daniel Manrique ]
+  * checkbox-ng Replaces: and Breaks: old, pre-transitional versions of
+    checkbox, to avoid conflict with some files.
+
+  [ Matthias Klose ]
+  * Don't used a python3.x shebang. Closes: #739883.
+
+ -- Sylvain Pineau <[e-mail]>  Tue, 25 Feb 2014 15:57:58 +0100
+
+checkbox-ng (0.1-1) unstable; urgency=low
+
+  * Initial release (Closes: #736284)
+
+ -- Sylvain Pineau <[e-mail]>  Tue, 21 Jan 2014 21:18:23 +0100
diff --git a/debian/checkbox-cli.1 b/debian/checkbox-cli.1
new file mode 100644
index 0000000..cf2f4b3
--- /dev/null
+++ b/debian/checkbox-cli.1
@@ -0,0 +1 @@
+.so man1/checkbox_ng.1
diff --git a/debian/checkbox-ng.lintian-overrides b/debian/checkbox-ng.lintian-overrides
new file mode 100644
index 0000000..9f8422a
--- /dev/null
+++ b/debian/checkbox-ng.lintian-overrides
@@ -0,0 +1,2 @@
+# checkbox-launcher is a correct interpreter for checkbox launchers 
+checkbox-ng: unusual-interpreter usr/bin/checkbox-cli #!checkbox-launcher
diff --git a/debian/checkbox-ng.manpages b/debian/checkbox-ng.manpages
new file mode 100644
index 0000000..6222d65
--- /dev/null
+++ b/debian/checkbox-ng.manpages
@@ -0,0 +1,3 @@
+build/sphinx/man/checkbox_ng.1
+debian/checkbox.1
+debian/checkbox-cli.1
diff --git a/debian/checkbox.1 b/debian/checkbox.1
new file mode 100644
index 0000000..cf2f4b3
--- /dev/null
+++ b/debian/checkbox.1
@@ -0,0 +1 @@
+.so man1/checkbox_ng.1
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..7c71ab5
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,64 @@
+Source: checkbox-ng
+Section: utils
+Priority: optional
+Maintainer: Checkbox Developers <[e-mail]>
+Uploaders: Sylvain Pineau <[e-mail]>,
+           Zygmunt Krynicki <[e-mail]>,
+           Debian Python Modules Team <[e-mail]>
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               python3-all,
+               python3-docutils,
+               python3-guacamole (>= 0.9),
+               python3-plainbox (>= 0.27),
+               python3-requests (>= 1.0),
+               python3-setuptools,
+               python3-sphinx,
+               python3-xlsxwriter
+Standards-Version: 3.9.6
+X-Python3-Version: >= 3.2
+Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/checkbox-ng.git
+Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/checkbox-ng.git
+Homepage: https://launchpad.net/checkbox-ng
+
+Package: checkbox-ng
+Architecture: all
+Depends: python3-checkbox-ng (= ${binary:Version}),
+         ${misc:Depends},
+         ${python3:Depends}
+Replaces: checkbox (<< 0.17.6-0ubuntu1), python3-checkbox-ng (<< 0.23-1)
+Breaks: checkbox (<< 0.17.6-0ubuntu1), python3-checkbox-ng (<< 0.23-1)
+Description: PlainBox based test runner
+ 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.
+ .
+ This package contains the CheckBox command line tool
+
+Package: python3-checkbox-ng
+Architecture: all
+Depends: python3-guacamole (>= 0.9),
+         python3-plainbox (>= 0.27),
+         python3-requests (>= 1.0),
+         python3-urwid,
+         python3-xlsxwriter,
+         ${misc:Depends},
+         ${python3:Depends}
+Description: PlainBox based test runner (Python 3 library)
+ 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.
+ .
+ This package contains the checkbox-ng Python 3 library
+
+Package: python3-checkbox-ng-doc
+Architecture: all
+Section: doc
+Priority: extra
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: PlainBox based test runner (documentation)
+ 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.
+ .
+ This package contains the documentation for the checkbox-ng Python 3 library
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..09bfd2b
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,21 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: checkbox-ng
+Source: https://launchpad.net/checkbox
+
+Files: *
+Copyright: Copyright 2012-2014 Canonical Ltd.
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3,
+ as published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian-based systems the full text of the GPL, version 3, can be found at
+ /usr/share/common-licenses/GPL-3.
diff --git a/debian/patches/documentation-theme b/debian/patches/documentation-theme
new file mode 100644
index 0000000..c8c67a3
--- /dev/null
+++ b/debian/patches/documentation-theme
@@ -0,0 +1,59 @@
+From 21d70739ec20ed824d2e1cb877f372133d851de0 Mon Sep 17 00:00:00 2001
+From: Zygmunt Krynicki <[e-mail]>
+Date: Thu, 8 Oct 2015 08:38:22 -0700
+Subject: Revert the documentation theme back to default
+
+ CheckboxNG uses a customized sphinx theme that is not included in the release
+ tarball. The theme is customized for "ubuntu" colors and this is not required
+ in Debian.
+Origin: upstream
+Forwarded: not-needed
+Last-Update: 2015-07-21
+
+Patch-Name: documentation-theme
+---
+ docs/conf.py | 24 ++----------------------
+ 1 file changed, 2 insertions(+), 22 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index a39b82c..00ef86f 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -133,20 +133,7 @@ pygments_style = 'sphinx'
+ # -- Options for HTML output -------------------------------------------------
+ 
+ # html_theme_path = ['_templates']
+-html_theme = 'alabaster'
+-html_theme_options = {
+-	'github_button': 'false',
+-    'page_width': '1040px',
+-    'sidebar_width': '320px',
+-    'sidebar_link': '#E95420',
+-    'sidebar_link_underscore': '#E95420',
+-    'link': '#E95420',
+-    'link_hover': '#E95420',
+-    'font_family': "'Ubuntu', sans-serif",
+-    'head_font_family': "'Ubuntu', sans-serif",
+-    'code_font_family': "'Ubuntu Mono', monospace",
+-    'code_font_size': '1em'
+-    }
++html_theme = 'default'
+ 
+ # The theme to use for HTML and HTML Help pages.  See the documentation for
+ # a list of builtin themes.
+@@ -189,14 +176,7 @@ html_theme_options = {
+ # html_use_smartypants = True
+ 
+ # Custom sidebar templates, maps document names to template names.
+-html_sidebars = {
+-    '**': [
+-        'about.html',
+-        'navigation.html',
+-        'relations.html',
+-        'searchbox.html'
+-    ]
+-}
++# html_sidebars = {}
+ 
+ # Additional templates that should be rendered to pages, maps page names to
+ # template names.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cd15187
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+documentation-theme
diff --git a/debian/python3-checkbox-ng-doc.doc-base b/debian/python3-checkbox-ng-doc.doc-base
new file mode 100644
index 0000000..107494a
--- /dev/null
+++ b/debian/python3-checkbox-ng-doc.doc-base
@@ -0,0 +1,9 @@
+Document: checkbox-ng
+Title: CheckBox NG Manual
+Author: Canonical Ltd.
+Abstract: This manual describes what CheckBox NG is, and how it can be used.
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python3-checkbox-ng-doc/html/index.html
+Files: /usr/share/doc/python3-checkbox-ng-doc/html/*.html
diff --git a/debian/python3-checkbox-ng-doc.docs b/debian/python3-checkbox-ng-doc.docs
new file mode 100644
index 0000000..6f7511e
--- /dev/null
+++ b/debian/python3-checkbox-ng-doc.docs
@@ -0,0 +1 @@
+build/sphinx/html
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..05dcbeb
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,26 @@
+#!/usr/bin/make -f
+export PYBUILD_NAME=checkbox-ng
+
+%:
+	dh $@ --with=python3,sphinxdoc --buildsystem=pybuild
+
+# Build sphinx html documentation. Generate manual pages for checkbox-ng
+# console_scripts
+override_dh_auto_build:
+	dh_auto_build --buildsystem=pybuild
+	python3 setup.py build_sphinx
+	python3 setup.py build_sphinx -b man
+
+# Override dh_install to ensure that console_scripts are in the
+# checkbox-ng package and not in the python3-checkbox-ng package.
+override_dh_install:
+	dh_install
+	mkdir -p debian/checkbox-ng/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-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:
+	dh_python3 --shebang=/usr/bin/python3
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..50dc44b
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,72 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+xxGS57/Nmfbij8UuxgkLtw==
+=4Jty
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQENBEvipr4BCADJdK7pAu7fEFyNCLdMULze97sVWWJ1bWkA/lMot14911EbyFr7
+pvi5uril4QT55d1AKfMXJ6HNtHtIHe/CF1ehEc5c7oA2c0IdeSR4F6JEbFSneORT
+OZtYAK3VdG53ywpyCqP2tzB/YrRhVO9qsc5fYEr0EpeqRkvB5ower2MUFvvM5PBZ
+a+0owzW9OnlSOqbrVPj9Wp1bn857j/WpJCrMbcJlPPWGyo4ambAQI4Rky+apeQM0
+L4QTjPMXIoHDQao/2XsSL75OBx5Bi81j1KoU56PvM9b4oWMOqDDolPHwZGJtCewl
+LJqfy1Oa68vN4MxDXFmGp7bFTCt8ZOup1AjlABEBAAG0LVN5bHZhaW4gUGluZWF1
+IDxzeWx2YWluLnBpbmVhdUBjYW5vbmljYWwuY29tPokBOAQTAQIAIgUCS+KmvgIb
+AwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQdNV1zH7XLNGSgAgApgU9VUlp
+Rblw7WH7q8BueI4G5CRiIDt6PA866IhbtuKPHMhv8LUQCVavAtKWVlwx/wGS/+2y
+CKqTCRXFu52MomE+kSfEFnELMW8vwz3KG6NgUVIv8dFesf1Finc8Y9YQkUX/xWYV
+MYREz3rgDgGMgpWlMVq5/olqYMg1jc4yIKrbQGoFDvlgijzGwibh/V5NVPcuYrMK
+DvhnWGIEX4whP/hW/o7vPKC5qYznrGqRroLqsq1viGgeS7nK37vcgX+vYv5pzIDM
+73CqpAnISAyBpU5n/YHG4AmundrVHwdscY7u8l9Fn5XFEGhu6FxWQL2mAY/gvGPS
+fgxeZUWpB21WNrkBDQRL4qa+AQgAtAiq2zDF0hl2KnB/a16O5SyjDR5XJUcWJ9F/
+tFw0i3EXEYeYdCFHaTdFfDmdX+SyBPh4lJIJZCpFZZ7Akeb3qLDS/4oAAo4EcoeS
+pp47Mr1/eCahI9Pkwg073jqHSUAKQp6oPP/bvBzAqhl4ZkUyZQpjdy0/d5FO4OEa
+R91SCxNqBQOA+Z2rKL6gBwJYpMGMKC1bhfOCvD8eH7dN3PDMNnHoYSjJSy5di/Zu
+snrVR4MO63FpmSZ4r5eGjIaiBFxYXsitn2ilPOt2e0/Vo8QOJsOl+6bOkdn5jiNL
+n1fCvzadUXuEDTjj9+6UkCCLYRODeTrMM9XpNeAZZBSGVzuCgQARAQABiQEfBBgB
+AgAJBQJL4qa+AhsMAAoJEHTVdcx+1yzRcpEH/iZMQPFnnCj3LthOvCAVM/raO17h
+KshdrOMS53uI5NzeBnr+/0zGMehnYcpzLmrvHXM86lsUVSzfr/px/Ve3+8SR6qxy
+p5+PFsxbqh+DSkxnTfbIqHVBY4f7/nOQavI1rhj4JQzKiYLCvIhDMVQm/2ZKnsNB
+043MaDPi0SBLJmqZqFyH3CUE3B8JNi4i+nv7Vj37V4sL1yHwN+rmyDhZUUelO5Iw
+vrysE7eNqmhTtuV+tl5Oq2EEzYau+7u+/Kuo1JpFsamJ8xVIR2j9i/3m3LqOaVPo
+ExFTDCQAPTaRyLAvTFylsIUffsdIAsM8wJQnuO5EzlxbkId3aVOrJ/cb5to=
+=cQg/
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..7ff882f
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=uversionmangle=s/(rc|a|b|c)/~$1/,pgpsigurlmangle=s/$/.asc/ \
+http://pypi.debian.net/checkbox-ng/checkbox-ng-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
diff --git a/docs/conf.py b/docs/conf.py
index a39b82c..1e668ed 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -133,6 +133,7 @@ pygments_style = 'sphinx'
 # -- Options for HTML output -------------------------------------------------
 
 # html_theme_path = ['_templates']
+<<<<<<< docs/conf.py
 html_theme = 'alabaster'
 html_theme_options = {
 	'github_button': 'false',
@@ -147,6 +148,9 @@ html_theme_options = {
     'code_font_family': "'Ubuntu Mono', monospace",
     'code_font_size': '1em'
     }
+=======
+html_theme = 'default'
+>>>>>>> docs/conf.py
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
@@ -189,6 +193,7 @@ html_theme_options = {
 # html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
+<<<<<<< docs/conf.py
 html_sidebars = {
     '**': [
         'about.html',
@@ -197,6 +202,9 @@ html_sidebars = {
         'searchbox.html'
     ]
 }
+=======
+# html_sidebars = {}
+>>>>>>> docs/conf.py
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
diff --git a/setup.cfg b/setup.cfg
index 4bec740..5269d09 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,18 @@
 [upload]
+<<<<<<< setup.cfg
 sign=True
 
 [upload_docs]
 upload-dir=build/sphinx/html
+=======
+sign = True
+
+[upload_docs]
+upload-dir = build/sphinx/html
+
+[egg_info]
+tag_date = 0
+tag_build = 
+tag_svn_revision = 0
+
+>>>>>>> setup.cfg
diff --git a/setup.py b/setup.py
index 84a0285..2872c0d 100755
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,11 @@ else:
 
 setup(
     name="checkbox-ng",
+<<<<<<< setup.py
     version="0.32.0.dev0",
+=======
+    version="0.32.0rc2",
+>>>>>>> setup.py
     url="https://launchpad.net/checkbox-ng/",
     packages=find_packages(),
     author="Zygmunt Krynicki",
@@ -74,8 +78,11 @@ setup(
         'plainbox.transport': [
             'certification='
             'checkbox_ng.certification:CertificationTransport',
+<<<<<<< setup.py
             'submission-service='
             'checkbox_ng.certification:CertificationTransport',
+=======
+>>>>>>> setup.py
         ],
     },
     include_package_data=True)