Merge lp:~sylvain-pineau/checkbox/mv-cert-whitelists-packaging into lp:~checkbox-dev/checkbox/checkbox-packaging

Proposed by Sylvain Pineau
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 31
Merged at revision: 31
Proposed branch: lp:~sylvain-pineau/checkbox/mv-cert-whitelists-packaging
Merge into: lp:~checkbox-dev/checkbox/checkbox-packaging
Diff against target: 15 lines (+3/-2)
1 file modified
debian/rules (+3/-2)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/mv-cert-whitelists-packaging
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+193799@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

+1

review: Approve

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-10-30 14:21:19 +0000
3+++ debian/rules 2013-11-04 15:31:03 +0000
4@@ -49,8 +49,9 @@
5 mkdir -p $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/
6 # Certification providers
7 mkdir -p $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/certification/whitelists
8- mv $(CURDIR)/debian/tmp/usr/share/checkbox/data/whitelists/certification/* $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/certification/whitelists
9- rm -rf $(CURDIR)/debian/tmp/usr/share/checkbox/data/whitelists/certification
10+ mv $(CURDIR)/debian/tmp/usr/share/checkbox/data/whitelists/*-cert.* $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/certification/whitelists
11+ mv $(CURDIR)/debian/tmp/usr/share/checkbox/data/whitelists/*-selftest.* $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/certification/whitelists
12+ mv $(CURDIR)/debian/tmp/usr/share/checkbox/data/whitelists/virt.* $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/certification/whitelists
13 # Resources provider files
14 mkdir -p $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/plainbox-resources
15 mkdir -p $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/plainbox-resources/bin/

Subscribers

People subscribed via source and target branches