Checkbox

Merge lp:~zyga/checkbox/checkbox-packaging into lp:~checkbox-dev/checkbox/checkbox-packaging

  1. checkbox-packaging
  2. Merge into checkbox-packaging
Proposed by Zygmunt Krynicki
Status: Merged
Approved by: Sylvain Pineau
Approved revision: no longer in the source branch.
Merged at revision: 40
Proposed branch: lp:~zyga/checkbox/checkbox-packaging
Merge into: lp:~checkbox-dev/checkbox/checkbox-packaging
Diff against target: 38 lines (+4/-4)
1 file modified
debian/rules (+4/-4)
To merge this branch: bzr merge lp:~zyga/checkbox/checkbox-packaging
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+195018@code.launchpad.net

Description of the change

This branch tries to address current build failures. See the commit messages for details

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

Thanks for the fix. Approved

review: Approve
lp:~zyga/checkbox/checkbox-packaging updated
40. By Zygmunt Krynicki

"automatic merge by tarmac [r=sylvain-pineau][bug=][author=zkrynicki]"

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2013-11-07 11:03:59 +0000
3+++ debian/rules 2013-11-13 09:52:17 +0000
4@@ -1,5 +1,7 @@
5 #!/usr/bin/make -f
6
7+export DH_VERBOSE=1
8+
9 # Prevent setuptools/distribute from accessing the internet.
10 export http_proxy=http://127.0.9.1:9
11
12@@ -8,8 +10,7 @@
13 %:
14 dh "$@" --with python3,sphinxdoc,translations
15
16-override_dh_clean:
17- dh_auto_clean
18+override_dh_auto_clean:
19 rm -rf $(CURDIR)/plainbox/build
20 rm -rf $(CURDIR)/plainbox/*.egg-info
21 rm -rf $(CURDIR)/checkbox/build
22@@ -35,7 +36,6 @@
23 cd $(CURDIR)/plainbox && ./setup.py build
24 cd $(CURDIR)/checkbox-old && ./setup.py build
25 cd $(CURDIR)/checkbox-ng && ./setup.py build
26- dh_auto_build
27
28 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
29 override_dh_auto_test:
30@@ -78,7 +78,7 @@
31 find $(CURDIR)/debian/tmp/usr/share/checkbox/jobs -type f -not -iname "resource.txt*" -execdir cp {} $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/checkbox/jobs/ \;
32 cp -R $(CURDIR)/debian/tmp/usr/share/checkbox/data $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/checkbox/
33 mv $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/checkbox/data/whitelists $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/checkbox
34- dh_auto_install
35+ dh_install
36
37 override_dh_installdocs:
38 # This is tricky, dh_installdirs installs stuff to the first package in

Subscribers

People subscribed via source and target branches