zbenjamin has proposed merging lp:~zeller-benjamin/kubuntu-packaging/repackage
into lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.
Commit message:
Fix packaging to not include files shipped by plugin packages
(remotelinux,cmake)
Requested reviews:
Timo Jyrinki (timo-jyrinki)
For more details, see:
https://code.launchpad.net/~zeller-benjamin/kubuntu-packaging/repackage/+merge/223361
Fix packaging to not include files shipped by plugin packages
(remotelinux,cmake)
--
https://code.launchpad.net/~zeller-benjamin/kubuntu-packaging/repackage/+merge/223361
Your team Kubuntu Packagers is subscribed to branch
lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.
=== 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 @@
usr/share/qtcreator/templates/shared/qtquickapplicationviewer/qtquick1applicationviewer/qtquick1applicationviewer.h
usr/share/qtcreator/templates/shared/qtquickapplicationviewer/qtquick1applicationviewer/qtquick1applicationviewer.pri
usr/share/qtcreator/templates/wizards/README.txt
-usr/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml
-usr/share/qtcreator/templates/wizards/bb-bardescriptor/wizard.xml
-usr/share/qtcreator/templates/wizards/bb-cascades-app/assets/main.qml
-usr/share/qtcreator/templates/wizards/bb-cascades-app/bar-descriptor.xml
-usr/share/qtcreator/templates/wizards/bb-cascades-app/icon.png
-usr/share/qtcreator/templates/wizards/bb-cascades-app/project.pro
-usr/share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.cpp
-usr/share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.h
-usr/share/qtcreator/templates/wizards/bb-cascades-app/src/main.cpp
-usr/share/qtcreator/templates/wizards/bb-cascades-app/wizard.xml
-usr/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml
-usr/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/wizard.xml
usr/share/qtcreator/templates/wizards/codesnippet/main.cpp
usr/share/qtcreator/templates/wizards/codesnippet/project.pro
usr/share/qtcreator/templates/wizards/codesnippet/wizard.xml
@@ -813,16 +801,12 @@
usr/share/qtcreator/templates/wizards/listmodel/listmodel.cpp
usr/share/qtcreator/templates/wizards/listmodel/listmodel.h
usr/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml
-usr/share/qtcreator/templates/wizards/plaincapp/cmake/CMakeLists.txt
-usr/share/qtcreator/templates/wizards/plaincapp/cmake/wizard.xml
usr/share/qtcreator/templates/wizards/plaincapp/common/console.png
usr/share/qtcreator/templates/wizards/plaincapp/common/main.c
usr/share/qtcreator/templates/wizards/plaincapp/qbs/project.qbs
usr/share/qtcreator/templates/wizards/plaincapp/qbs/wizard.xml
usr/share/qtcreator/templates/wizards/plaincapp/qmake/project.pro
usr/share/qtcreator/templates/wizards/plaincapp/qmake/wizard.xml
-usr/share/qtcreator/templates/wizards/plaincppapp/cmake/CMakeLists.txt
-usr/share/qtcreator/templates/wizards/plaincppapp/cmake/wizard.xml
usr/share/qtcreator/templates/wizards/plaincppapp/common/console.png
usr/share/qtcreator/templates/wizards/plaincppapp/common/main.cpp
usr/share/qtcreator/templates/wizards/plaincppapp/qbs/project.qbs
=== 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 @@
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
cd debian/tmp/usr/src/qtcreator; cp -r builddir/* .; rm -R builddir
rm -rfv debian/tmp/usr/usr/tests/
+ rm -rfv debian/tmp/usr/share/qtcreator/templates/wizards/bb-*
+ rm -rfv debian/tmp/usr/share/qtcreator/templates/wizards/plaincppapp/cmake
+ rm -rfv debian/tmp/usr/share/qtcreator/templates/wizards/plaincapp/cmake
override_dh_auto_clean:
dh_auto_clean
--
kubuntu-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
