ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/packaging-fixes into lp:ubuntu-keyboard

  1. packaging-fixes
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Approved
Approved by: Michael Sheldon
Approved revision: 509
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/packaging-fixes
Merge into: lp:ubuntu-keyboard
Diff against target: 123 lines (+15/-10)
2 files modified
debian/control (+13/-10)
debian/rules (+2/-0)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/packaging-fixes
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Ken VanDine packaging Approve
Review via email: mp+303419@code.launchpad.net

Commit message

* Disable tests if 'nocheck' is set in DEB_BUILD_OPTIONS
* Fix missing long package descriptions
* Use python3:Depends for autopilot package
* Fix missing commas in debian control.

Description of the change

Disable tests if 'nocheck' is set in DEB_BUILD_OPTIONS, fix missing long package descriptions, use python3:Depends for autopilot package and fix missing commas in debian control.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks fine

review: Approve (packaging)
Reply
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:508
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/37/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1258/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1258
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1127
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1127
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1127
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1114
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1114/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1114
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1114/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1114/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1114
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1114/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1114
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1114/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1114/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1114
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1114/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1114
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1114/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1114/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/37/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp:~michael-sheldon/ubuntu-keyboard/packaging-fixes updated
509. By Michael Sheldon

Merge from trunk

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:509
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/40/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1363/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1363
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1222
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1222
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1222
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1214/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1214/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1214/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1214/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1214/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1214/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1214/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1214/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1214/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/40/rebuild

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

509. By Michael Sheldon

Merge from trunk

508. By Michael Sheldon

Disable tests if 'nocheck' is set in DEB_BUILD_OPTIONS

507. By Michael Sheldon

Fix missing long package descriptions

506. By Michael Sheldon

Use python3:Depends for autopilot package

505. By Michael Sheldon

Fix missing commas in debian control

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-08-18 13:53:03 +0000
3+++ debian/control 2016-08-30 13:17:07 +0000
4@@ -79,6 +79,10 @@
5 Architecture: all
6 Depends: ${misc:Depends},
7 Description: Ubuntu on-screen keyboard - development files
8+ The Ubuntu Keyboard is a Maliit based on-screen keyboard.
9+ .
10+ This package provides the development files required to compile language
11+ plugins against the Ubuntu Keyboard.
12
13 Package: ubuntu-keyboard-tests
14 Architecture: any
15@@ -92,7 +96,7 @@
16 Architecture: all
17 Depends: libautopilot-qt (>= 1.4),
18 ${misc:Depends},
19- ${python:Depends},
20+ ${python3:Depends},
21 python3-evdev,
22 ubuntu-keyboard (>= ${source:Version}),
23 ubuntu-keyboard-arabic (>= ${source:Version}),
24@@ -133,8 +137,6 @@
25 Description: Tests and emulators package for ubuntu-keyboard
26 Autopilot tests for the ubuntu-keyboard package
27
28-
29-
30 Package: ubuntu-keyboard-arabic
31 Architecture: any
32 Depends: ubuntu-keyboard (= ${binary:Version}),
33@@ -175,6 +177,7 @@
34 ${misc:Depends},
35 ${shlibs:Depends},
36 Description: Ubuntu on-screen keyboard data files - Chinese Chewing
37+ Data files for the Ubuntu virtual keyboard - Chinese Chewing
38
39 Package: ubuntu-keyboard-chinese-pinyin
40 Architecture: any
41@@ -187,7 +190,7 @@
42 Package: ubuntu-keyboard-croatian
43 Architecture: any
44 Depends: ubuntu-keyboard (= ${binary:Version}),
45- myspell-hr
46+ myspell-hr,
47 ${misc:Depends},
48 ${shlibs:Depends},
49 Description: Ubuntu on-screen keyboard data files - Croatian
50@@ -196,7 +199,7 @@
51 Package: ubuntu-keyboard-czech
52 Architecture: any
53 Depends: ubuntu-keyboard (= ${binary:Version}),
54- myspell-cs
55+ myspell-cs,
56 ${misc:Depends},
57 ${shlibs:Depends},
58 Description: Ubuntu on-screen keyboard data files - Czech
59@@ -275,7 +278,7 @@
60 Package: ubuntu-keyboard-hebrew
61 Architecture: any
62 Depends: ubuntu-keyboard (= ${binary:Version}),
63- myspell-he
64+ myspell-he,
65 ${misc:Depends},
66 ${shlibs:Depends},
67 Description: Ubuntu on-screen keyboard data files - Hebrew
68@@ -301,7 +304,7 @@
69 Package: ubuntu-keyboard-italian
70 Architecture: any
71 Depends: ubuntu-keyboard (= ${binary:Version}),
72- myspell-it
73+ myspell-it,
74 ${misc:Depends},
75 ${shlibs:Depends},
76 Description: Ubuntu on-screen keyboard data files - Italian
77@@ -337,7 +340,7 @@
78 Package: ubuntu-keyboard-norwegian-bokmal
79 Architecture: any
80 Depends: ubuntu-keyboard (= ${binary:Version}),
81- myspell-nb
82+ myspell-nb,
83 ${misc:Depends},
84 ${shlibs:Depends},
85 Description: Ubuntu on-screen keyboard data files - Norwegian Bokmål
86@@ -355,7 +358,7 @@
87 Package: ubuntu-keyboard-portuguese
88 Architecture: any
89 Depends: ubuntu-keyboard (= ${binary:Version}),
90- myspell-pt
91+ myspell-pt,
92 ${misc:Depends},
93 ${shlibs:Depends},
94 Description: Ubuntu on-screen keyboard data files - Portuguese
95@@ -409,7 +412,7 @@
96 Package: ubuntu-keyboard-spanish
97 Architecture: any
98 Depends: ubuntu-keyboard (= ${binary:Version}),
99- myspell-es
100+ myspell-es,
101 ${misc:Depends},
102 ${shlibs:Depends},
103 Description: Ubuntu on-screen keyboard data files - Spanish
104
105=== modified file 'debian/rules'
106--- debian/rules 2016-08-17 16:14:20 +0000
107+++ debian/rules 2016-08-30 13:17:07 +0000
108@@ -20,6 +20,7 @@
109 CONFIG+=enable-pinyin
110
111 override_dh_auto_test:
112+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
113 python3 -m flake8 .
114 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
115 # Tests write $HOME/.presage/lm.db, make sure $HOME is
116@@ -28,6 +29,7 @@
117 mkdir -p $(CURDIR)/debian/test-home
118 HOME=$(CURDIR)/debian/test-home xvfb-run -a make check
119 endif
120+endif
121
122 override_dh_clean:
123 rm -rf $(CURDIR)/debian/test-home

Subscribers

People subscribed via source and target branches