Merge lp:~bzoltan/ubuntu-sdk-ide/ubuntu-sdk into lp:ubuntu-sdk-ide

Proposed by Zoltan Balogh
Status: Merged
Merged at revision: 102
Proposed branch: lp:~bzoltan/ubuntu-sdk-ide/ubuntu-sdk
Merge into: lp:ubuntu-sdk-ide
Diff against target: 24 lines (+3/-0)
2 files modified
debian/rules (+2/-0)
debian/ubuntu-sdk-ide.install (+1/-0)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-sdk-ide/ubuntu-sdk
Reviewer Review Type Date Requested Status
Benjamin Zeller Approve
Review via email: mp+279406@code.launchpad.net

Commit message

Avoid CLI regression

Description of the change

Avoid CLI regression

To post a comment you must log in.
Revision history for this message
Benjamin Zeller (zeller-benjamin) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/rules'
--- debian/rules 2015-12-01 00:37:30 +0000
+++ debian/rules 2015-12-03 09:30:42 +0000
@@ -22,6 +22,8 @@
22override_dh_auto_install:22override_dh_auto_install:
23 mkdir -p $(CURDIR)/debian/tmp/usr/23 mkdir -p $(CURDIR)/debian/tmp/usr/
24 mkdir -p $(CURDIR)/debian/tmp/usr/ubuntu-sdk-dev24 mkdir -p $(CURDIR)/debian/tmp/usr/ubuntu-sdk-dev
25 mkdir -p $(CURDIR)/debian/tmp/usr/bin
26 ln -s /usr/bin/ubuntu-sdk-ide debian/tmp/usr/bin/ubuntu-sdk
25 cp -a $(CURDIR)/*/ubuntu-sdk-ide $(CURDIR)/debian/tmp/usr27 cp -a $(CURDIR)/*/ubuntu-sdk-ide $(CURDIR)/debian/tmp/usr
26 cp -a $(CURDIR)/*/qt-api-build/qt/usr $(CURDIR)/debian/tmp28 cp -a $(CURDIR)/*/qt-api-build/qt/usr $(CURDIR)/debian/tmp
27 dh_auto_install --destdir=../../debian/tmp/usr29 dh_auto_install --destdir=../../debian/tmp/usr
2830
=== modified file 'debian/ubuntu-sdk-ide.install'
--- debian/ubuntu-sdk-ide.install 2015-11-03 18:57:04 +0000
+++ debian/ubuntu-sdk-ide.install 2015-12-03 09:30:42 +0000
@@ -3,6 +3,7 @@
3ubuntu-sdk-ide.png usr/share/icons3ubuntu-sdk-ide.png usr/share/icons
4ubuntu-sdk-ide usr/bin/4ubuntu-sdk-ide usr/bin/
5qtcreator usr/bin5qtcreator usr/bin
6usr/bin/ubuntu-sdk
6usr/ubuntu-sdk-ide/bin7usr/ubuntu-sdk-ide/bin
7usr/ubuntu-sdk-ide/lib8usr/ubuntu-sdk-ide/lib
8usr/ubuntu-sdk-ide/share/icons9usr/ubuntu-sdk-ide/share/icons

Subscribers

People subscribed via source and target branches

to all changes: