Merge lp:~zeller-benjamin/ubuntu-sdk-ide/fixpackaging into lp:ubuntu-sdk-ide

Proposed by Benjamin Zeller
Status: Merged
Merged at revision: 88
Proposed branch: lp:~zeller-benjamin/ubuntu-sdk-ide/fixpackaging
Merge into: lp:ubuntu-sdk-ide
Diff against target: 14 lines (+2/-2)
1 file modified
debian/rules (+2/-2)
To merge this branch: bzr merge lp:~zeller-benjamin/ubuntu-sdk-ide/fixpackaging
Reviewer Review Type Date Requested Status
Zoltan Balogh Pending
Review via email: mp+275714@code.launchpad.net

Commit message

Fix package build

Description of the change

Fix package build

To post a comment you must log in.
89. By Benjamin Zeller

Revert changelog

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 2015-10-24 19:59:06 +0000
3+++ debian/rules 2015-10-26 14:45:35 +0000
4@@ -23,8 +23,8 @@
5 mkdir -p $(CURDIR)/debian/tmp/usr/
6 mkdir -p $(CURDIR)/debian/tmp/usr/ubuntu-sdk-dev
7 cp -a $(CURDIR)/*/ubuntu-sdk-ide $(CURDIR)/debian/tmp/usr
8- cp -a $(CURDIR)/*/qt-api-build/qt $(CURDIR)/debian/tmp/usr/ubuntu-sdk-dev
9+ cp -a $(CURDIR)/*/qt-api-build/qt/usr $(CURDIR)/debian/tmp
10 dh_auto_install --destdir=../../debian/tmp/usr
11
12 override_dh_shlibdeps:
13- dh_shlibdeps -l/usr/ubuntu-sdk-ide/lib/qtcreator:/usr/ubuntu-sdk-ide/lib:usr/ubuntu-sdk-dev/lib
14+ dh_shlibdeps -l/usr/ubuntu-sdk-ide/lib/qtcreator:/usr/ubuntu-sdk-ide/lib/qtcreator/plugins:/usr/ubuntu-sdk-ide/lib:/usr/ubuntu-sdk-dev/lib

Subscribers

People subscribed via source and target branches