kubuntu-packaging

Merge lp:~zeller-benjamin/kubuntu-packaging/repackage into lp:~kubuntu-packagers/kubuntu-packaging/qtcreator

  1. repackage
  2. Merge into qtcreator
Proposed by Benjamin Zeller
Status: Merged
Merged at revision: 138
Proposed branch: lp:~zeller-benjamin/kubuntu-packaging/repackage
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qtcreator
Diff against target: 53 lines (+3/-16)
2 files modified
debian/qtcreator.install (+0/-16)
debian/rules (+3/-0)
To merge this branch: bzr merge lp:~zeller-benjamin/kubuntu-packaging/repackage
Reviewer Review Type Date Requested Status
Timo Jyrinki Pending
Review via email: mp+223361@code.launchpad.net

Commit message

Fix packaging to not include files shipped by plugin packages (remotelinux,cmake)

Description of the change

Fix packaging to not include files shipped by plugin packages (remotelinux,cmake)

To post a comment you must log in.
lp:~zeller-benjamin/kubuntu-packaging/repackage updated
138. By Timo Jyrinki

Merge.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/qtcreator.install'
2--- debian/qtcreator.install 2014-05-30 13:46:30 +0000
3+++ debian/qtcreator.install 2014-06-17 09:00:05 +0000
4@@ -791,18 +791,6 @@
5 usr/share/qtcreator/templates/shared/qtquickapplicationviewer/qtquick1applicationviewer/qtquick1applicationviewer.h
6 usr/share/qtcreator/templates/shared/qtquickapplicationviewer/qtquick1applicationviewer/qtquick1applicationviewer.pri
7 usr/share/qtcreator/templates/wizards/README.txt
8-usr/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml
9-usr/share/qtcreator/templates/wizards/bb-bardescriptor/wizard.xml
10-usr/share/qtcreator/templates/wizards/bb-cascades-app/assets/main.qml
11-usr/share/qtcreator/templates/wizards/bb-cascades-app/bar-descriptor.xml
12-usr/share/qtcreator/templates/wizards/bb-cascades-app/icon.png
13-usr/share/qtcreator/templates/wizards/bb-cascades-app/project.pro
14-usr/share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.cpp
15-usr/share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.h
16-usr/share/qtcreator/templates/wizards/bb-cascades-app/src/main.cpp
17-usr/share/qtcreator/templates/wizards/bb-cascades-app/wizard.xml
18-usr/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml
19-usr/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/wizard.xml
20 usr/share/qtcreator/templates/wizards/codesnippet/main.cpp
21 usr/share/qtcreator/templates/wizards/codesnippet/project.pro
22 usr/share/qtcreator/templates/wizards/codesnippet/wizard.xml
23@@ -813,16 +801,12 @@
24 usr/share/qtcreator/templates/wizards/listmodel/listmodel.cpp
25 usr/share/qtcreator/templates/wizards/listmodel/listmodel.h
26 usr/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml
27-usr/share/qtcreator/templates/wizards/plaincapp/cmake/CMakeLists.txt
28-usr/share/qtcreator/templates/wizards/plaincapp/cmake/wizard.xml
29 usr/share/qtcreator/templates/wizards/plaincapp/common/console.png
30 usr/share/qtcreator/templates/wizards/plaincapp/common/main.c
31 usr/share/qtcreator/templates/wizards/plaincapp/qbs/project.qbs
32 usr/share/qtcreator/templates/wizards/plaincapp/qbs/wizard.xml
33 usr/share/qtcreator/templates/wizards/plaincapp/qmake/project.pro
34 usr/share/qtcreator/templates/wizards/plaincapp/qmake/wizard.xml
35-usr/share/qtcreator/templates/wizards/plaincppapp/cmake/CMakeLists.txt
36-usr/share/qtcreator/templates/wizards/plaincppapp/cmake/wizard.xml
37 usr/share/qtcreator/templates/wizards/plaincppapp/common/console.png
38 usr/share/qtcreator/templates/wizards/plaincppapp/common/main.cpp
39 usr/share/qtcreator/templates/wizards/plaincppapp/qbs/project.qbs
40
41=== modified file 'debian/rules'
42--- debian/rules 2014-06-02 07:06:01 +0000
43+++ debian/rules 2014-06-17 09:00:05 +0000
44@@ -56,6 +56,9 @@
45 find | egrep -v '^\.\/doc|^\.\/share|^\.\/\.pc|^\.\/debian|^\.\/tests|^\.\/share|cmakeprojectmanager|valgrind|qnx|remotelinux|Qnx' | grep "\.pri\$$\|\.h\$$\|\.xsl\$$" | xargs -I{} cp --parents -r "{}" debian/tmp/usr/src/qtcreator
46 cd debian/tmp/usr/src/qtcreator; cp -r builddir/* .; rm -R builddir
47 rm -rfv debian/tmp/usr/usr/tests/
48+ rm -rfv debian/tmp/usr/share/qtcreator/templates/wizards/bb-*
49+ rm -rfv debian/tmp/usr/share/qtcreator/templates/wizards/plaincppapp/cmake
50+ rm -rfv debian/tmp/usr/share/qtcreator/templates/wizards/plaincapp/cmake
51
52 override_dh_auto_clean:
53 dh_auto_clean

Subscribers

People subscribed via source and target branches