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
=== modified file 'debian/qtcreator.install'
--- debian/qtcreator.install 2014-05-30 13:46:30 +0000
+++ debian/qtcreator.install 2014-06-17 09:00:05 +0000
@@ -791,18 +791,6 @@
791usr/share/qtcreator/templates/shared/qtquickapplicationviewer/qtquick1applicationviewer/qtquick1applicationviewer.h791usr/share/qtcreator/templates/shared/qtquickapplicationviewer/qtquick1applicationviewer/qtquick1applicationviewer.h
792usr/share/qtcreator/templates/shared/qtquickapplicationviewer/qtquick1applicationviewer/qtquick1applicationviewer.pri792usr/share/qtcreator/templates/shared/qtquickapplicationviewer/qtquick1applicationviewer/qtquick1applicationviewer.pri
793usr/share/qtcreator/templates/wizards/README.txt793usr/share/qtcreator/templates/wizards/README.txt
794usr/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml
795usr/share/qtcreator/templates/wizards/bb-bardescriptor/wizard.xml
796usr/share/qtcreator/templates/wizards/bb-cascades-app/assets/main.qml
797usr/share/qtcreator/templates/wizards/bb-cascades-app/bar-descriptor.xml
798usr/share/qtcreator/templates/wizards/bb-cascades-app/icon.png
799usr/share/qtcreator/templates/wizards/bb-cascades-app/project.pro
800usr/share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.cpp
801usr/share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.h
802usr/share/qtcreator/templates/wizards/bb-cascades-app/src/main.cpp
803usr/share/qtcreator/templates/wizards/bb-cascades-app/wizard.xml
804usr/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml
805usr/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/wizard.xml
806usr/share/qtcreator/templates/wizards/codesnippet/main.cpp794usr/share/qtcreator/templates/wizards/codesnippet/main.cpp
807usr/share/qtcreator/templates/wizards/codesnippet/project.pro795usr/share/qtcreator/templates/wizards/codesnippet/project.pro
808usr/share/qtcreator/templates/wizards/codesnippet/wizard.xml796usr/share/qtcreator/templates/wizards/codesnippet/wizard.xml
@@ -813,16 +801,12 @@
813usr/share/qtcreator/templates/wizards/listmodel/listmodel.cpp801usr/share/qtcreator/templates/wizards/listmodel/listmodel.cpp
814usr/share/qtcreator/templates/wizards/listmodel/listmodel.h802usr/share/qtcreator/templates/wizards/listmodel/listmodel.h
815usr/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml803usr/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml
816usr/share/qtcreator/templates/wizards/plaincapp/cmake/CMakeLists.txt
817usr/share/qtcreator/templates/wizards/plaincapp/cmake/wizard.xml
818usr/share/qtcreator/templates/wizards/plaincapp/common/console.png804usr/share/qtcreator/templates/wizards/plaincapp/common/console.png
819usr/share/qtcreator/templates/wizards/plaincapp/common/main.c805usr/share/qtcreator/templates/wizards/plaincapp/common/main.c
820usr/share/qtcreator/templates/wizards/plaincapp/qbs/project.qbs806usr/share/qtcreator/templates/wizards/plaincapp/qbs/project.qbs
821usr/share/qtcreator/templates/wizards/plaincapp/qbs/wizard.xml807usr/share/qtcreator/templates/wizards/plaincapp/qbs/wizard.xml
822usr/share/qtcreator/templates/wizards/plaincapp/qmake/project.pro808usr/share/qtcreator/templates/wizards/plaincapp/qmake/project.pro
823usr/share/qtcreator/templates/wizards/plaincapp/qmake/wizard.xml809usr/share/qtcreator/templates/wizards/plaincapp/qmake/wizard.xml
824usr/share/qtcreator/templates/wizards/plaincppapp/cmake/CMakeLists.txt
825usr/share/qtcreator/templates/wizards/plaincppapp/cmake/wizard.xml
826usr/share/qtcreator/templates/wizards/plaincppapp/common/console.png810usr/share/qtcreator/templates/wizards/plaincppapp/common/console.png
827usr/share/qtcreator/templates/wizards/plaincppapp/common/main.cpp811usr/share/qtcreator/templates/wizards/plaincppapp/common/main.cpp
828usr/share/qtcreator/templates/wizards/plaincppapp/qbs/project.qbs812usr/share/qtcreator/templates/wizards/plaincppapp/qbs/project.qbs
829813
=== modified file 'debian/rules'
--- debian/rules 2014-06-02 07:06:01 +0000
+++ debian/rules 2014-06-17 09:00:05 +0000
@@ -56,6 +56,9 @@
56 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/qtcreator56 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
57 cd debian/tmp/usr/src/qtcreator; cp -r builddir/* .; rm -R builddir57 cd debian/tmp/usr/src/qtcreator; cp -r builddir/* .; rm -R builddir
58 rm -rfv debian/tmp/usr/usr/tests/58 rm -rfv debian/tmp/usr/usr/tests/
59 rm -rfv debian/tmp/usr/share/qtcreator/templates/wizards/bb-*
60 rm -rfv debian/tmp/usr/share/qtcreator/templates/wizards/plaincppapp/cmake
61 rm -rfv debian/tmp/usr/share/qtcreator/templates/wizards/plaincapp/cmake
5962
60override_dh_auto_clean:63override_dh_auto_clean:
61 dh_auto_clean64 dh_auto_clean

Subscribers

People subscribed via source and target branches