Merge lp:~bzoltan/ubuntu-qtcreator-plugins/fix_packaging into lp:ubuntu-qtcreator-plugins

Proposed by Zoltan Balogh
Status: Merged
Merged at revision: 204
Proposed branch: lp:~bzoltan/ubuntu-qtcreator-plugins/fix_packaging
Merge into: lp:ubuntu-qtcreator-plugins
Diff against target: 24 lines (+5/-6)
1 file modified
ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_project_packaging (+5/-6)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-qtcreator-plugins/fix_packaging
Reviewer Review Type Date Requested Status
Juhapekka Piiroinen Pending
Review via email: mp+170314@code.launchpad.net

Description of the change

package creation from the backend project failed because of a typo (PROJECTYPE) and a wrong comparison syntax

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 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_project_packaging'
2--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_project_packaging 2013-06-11 12:05:21 +0000
3+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_project_packaging 2013-06-19 12:42:30 +0000
4@@ -103,15 +103,14 @@
5 fi
6
7 # check if we have .pro files or cpp/h files, if not then change architecture to any
8-if [[ ${PROJECTYPE}=="QML" ]]; then
9+if [[ "$PROJECTTYPE" == QML ]]; then
10 echo "Detected: QML project"
11 sed -i "s/^Architecture: any$/Architecture: all/g" debian/control
12+ # update package dependencies
13+ $SCRIPTPATH=`dirname $0`
14+ QMLDEPS=`${SCRIPTPATH}/qtc_project_detect_qmldeps`
15+ sed -i "s/^Depends:.*/${QMLDEPS}qmlscene/g" debian/control
16 else
17 echo "Detected: CPP project"
18 fi
19
20-# update package dependencies
21-SCRIPTPATH=`dirname $0`
22-QMLDEPS=`${SCRIPTPATH}/qtc_project_detect_qmldeps`
23-sed -i "s/^Depends:.*/${QMLDEPS}qmlscene/g" debian/control
24-

Subscribers

People subscribed via source and target branches

to all changes: