Ubuntu SDK IDE

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

  1. ubuntu-sdk
  2. Merge into trunk
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
1=== modified file 'debian/rules'
2--- debian/rules 2015-12-01 00:37:30 +0000
3+++ debian/rules 2015-12-03 09:30:42 +0000
4@@ -22,6 +22,8 @@
5 override_dh_auto_install:
6 mkdir -p $(CURDIR)/debian/tmp/usr/
7 mkdir -p $(CURDIR)/debian/tmp/usr/ubuntu-sdk-dev
8+ mkdir -p $(CURDIR)/debian/tmp/usr/bin
9+ ln -s /usr/bin/ubuntu-sdk-ide debian/tmp/usr/bin/ubuntu-sdk
10 cp -a $(CURDIR)/*/ubuntu-sdk-ide $(CURDIR)/debian/tmp/usr
11 cp -a $(CURDIR)/*/qt-api-build/qt/usr $(CURDIR)/debian/tmp
12 dh_auto_install --destdir=../../debian/tmp/usr
13
14=== modified file 'debian/ubuntu-sdk-ide.install'
15--- debian/ubuntu-sdk-ide.install 2015-11-03 18:57:04 +0000
16+++ debian/ubuntu-sdk-ide.install 2015-12-03 09:30:42 +0000
17@@ -3,6 +3,7 @@
18 ubuntu-sdk-ide.png usr/share/icons
19 ubuntu-sdk-ide usr/bin/
20 qtcreator usr/bin
21+usr/bin/ubuntu-sdk
22 usr/ubuntu-sdk-ide/bin
23 usr/ubuntu-sdk-ide/lib
24 usr/ubuntu-sdk-ide/share/icons

Subscribers

People subscribed via source and target branches

to all changes: