ubiquity

Merge lp:~lool/ubiquity/dh-installdirs-fix-for-ports into lp:ubiquity

  1. dh-installdirs-fix-for-ports
  2. Merge into trunk
Proposed by Loïc Minier
Status: Merged
Merged at revision: not available
Proposed branch: lp:~lool/ubiquity/dh-installdirs-fix-for-ports
Merge into: lp:ubiquity
Diff against target: None lines
To merge this branch: bzr merge lp:~lool/ubiquity/dh-installdirs-fix-for-ports
Reviewer Review Type Date Requested Status
Ubuntu Installer Team Pending
Review via email: mp+10511@code.launchpad.net
To post a comment you must log in.

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 2009-08-14 10:23:22 +0000
3+++ debian/rules 2009-08-21 08:13:21 +0000
4@@ -84,7 +84,7 @@
5
6 $(MAKE) -C d-i clean
7 dh_auto_clean
8- dh_clean
9+ dh_clean debian/ubiquity.install debian/ubiquity.dirs
10
11 $(MAKE) -C d-i check
12
13@@ -100,6 +100,10 @@
14 dh_testdir
15 dh_testroot
16 dh_prep
17+ cp debian/ubiquity.dirs-any debian/ubiquity.dirs
18+ifneq (,$(wildcard debian/ubiquity.dirs-$(DEB_HOST_ARCH)))
19+ cat debian/ubiquity.dirs-$(DEB_HOST_ARCH) >> debian/ubiquity.dirs
20+endif
21 dh_installdirs
22
23 # For the meantime, nearly everything automake wants to install is
24
25=== renamed file 'debian/ubiquity.dirs' => 'debian/ubiquity.dirs-any'

Subscribers

People subscribed via source and target branches

to status/vote changes: