From 1baeea5cc38b9f5010949cd655b3d9746f4dff00 Mon Sep 17 00:00:00 2001 From: Frederik Heber Date: Sat, 15 Aug 2015 09:06:22 +0200 Subject: [PATCH] Modified debian files to create working debian packages. - basically, I needed to rework the installs in debian/rules and modify the dependencies in debian/control. --- debian/control | 4 ++-- debian/rules | 47 ++++++++++++++++++++++++++++++++++++----------- 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/debian/control b/debian/control index 6fae1a5..a3d8c27 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,12 @@ Source: libqt4-3d Section: libdevel Priority: extra Maintainer: Sarah Smith -Build-Depends: debhelper (>= 7), libqtcore4 (>= 4.7.3), libqtgui4 (>= 4.7.3), libqt4-opengl (>= 4.7.3), libqt4-declarative-dev (>= 4.7.3), cdbs (>= 0.4.87+maemo2+0m6) +Build-Depends: debhelper (>= 7), libqtcore4 (>= 4.7.3), libqtgui4 (>= 4.7.3), libqt4-opengl (>= 4.7.3), cdbs (>= 0.4.87+maemo2+0m6) Standards-Version: 3.8.4 Package: libqt4-3d Architecture: any -Depends: libqtcore4 (>= 4.7.3), libqtgui4 (>= 4.7.3), libqt4-opengl (>= 4.7.3), libqt4-declarative (>= 4.7.3) +Depends: libqtcore4 (>= 4.7.3), libqtgui4 (>= 4.7.3), libqt4-opengl (>= 4.7.3) Description: Qt4 3D module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. diff --git a/debian/rules b/debian/rules index bfd3e9b..e9b5279 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,6 @@ #!/usr/bin/make -f # -*- makefile -*- -# This rules file is for new Nokia devices using maemo6/meego. -# For fremantle / N900 see the file devices/maemo5/debian/rules. -# For ubuntu desktop see the file devices/ubuntu/debian/rules. - # To build using this rules file: # # # ### install debian packaging stuff if not already present: @@ -15,15 +11,11 @@ # # ### copy all the stuff across - cannot shadow build (probably don't want git) # (cd ~/depot/qt/quick3d && tar cf - --exclude-vcs .)|(cd quick3d-tp1 && tar xf -) -# -# ### if the qmake in the $PATH is not the Qt you want to use -# ### you can use a binary package or a Qt built from source (even if its installed with -# ### "make install") as long as it has declarative & opengl -# # export PATH=/usr/local/qt/%VERSION%/bin:$PATH +# cp -f ~/depot/qt/quick3d/devices/ubuntu/debian/* quick3d-tp1/debian/. # # cd quick3d-tp1 # export DEB_BUILD_OPTIONS="parallel=4" -# dpkg-buildpackage -b +# fakeroot dpkg-buildpackage -b # Uncomment this to turn on verbose mode. export DH_OPTIONS=-v @@ -39,9 +31,42 @@ ifneq (,$(filter parallel=%,$(TMP_BUILD_OPTS))) PARALLEL_MAKEFLAGS += -j$(NUMJOBS) endif +ifeq (arm,$(findstring arm,$(shell g++ -v 2>&1 | sed -n '/Target: arm/p'))) + QMAKE_CONF_MKSPEC = -spec linux-g++-maemo + QMAKE_CONF_OPTS = CONFIG+=maemo +endif + DEB_MAKE_INVOKE := $(MAKE) $(PARALLEL_MAKEFLAGS) DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install DEB_DH_INSTALL_SOURCEDIR := debian/tmp common-configure-arch:: - qmake -spec linux-g++-maemo qt3d.pro CONFIG+=maemo CONFIG+=package + qmake $(QMAKE_CONF_MKSPEC) qt3d.pro $(QMAKE_CONF_OPTS) CONFIG+=package + +common-install-arch:: install-desktops + +install-desktops: + mkdir -p $(DEB_DESTDIR)/usr/share/applications + find . -name *.desktop -exec cp {} $(DEB_DESTDIR)/usr/share/applications \; + mkdir -p $(DEB_DESTDIR)/usr/share/pixmaps + find . -name icon-*.png -exec cp {} $(DEB_DESTDIR)/usr/share/pixmaps \; + mkdir -p $(DEB_DESTDIR)/usr/lib/ + find . -name libQt3D.so.* -exec cp {} $(DEB_DESTDIR)/usr/lib \; + find . -name libQt3DQuick.so.* -exec cp {} $(DEB_DESTDIR)/usr/lib \; + mkdir -p $(DEB_DESTDIR)/usr/lib/qt4/plugins + find src/plugins/ -name '*.so' -exec cp {} $(DEB_DESTDIR)/usr/lib/qt4/plugins \; + mkdir -p $(DEB_DESTDIR)/usr/lib/qt4/imports + find src/imports -name '*.so' -exec cp {} $(DEB_DESTDIR)/usr/lib/qt4/imports \; + mkdir -p $(DEB_DESTDIR)/usr/lib/pkgconfig + find src/pkgconfig -name '*.pc' -exec cp {} $(DEB_DESTDIR)/usr/lib/pkgconfig \; + mkdir -p $(DEB_DESTDIR)/usr/share/qt4/mkspecs/features/ + find ./features -exec cp {} $(DEB_DESTDIR)/usr/share/qt4/mkspecs/features/ \; + mkdir -p $(DEB_DESTDIR)/usr/include/qt4/Qt3D/ + find src/threed -name '*.h' -P -exec cp {} $(DEB_DESTDIR)/usr/include/qt4/Qt3D/ \; + mkdir -p $(DEB_DESTDIR)/usr/include/qt4/Qt3DQuick/ + find src/quick3d -name '*.h' -P -exec cp {} $(DEB_DESTDIR)/usr/include/qt4/Qt3DQuick/ \; + mkdir -p $(DEB_DESTDIR)/usr/bin + find bin -perm /+x -type f -exec cp {} $(DEB_DESTDIR)/usr/bin \; + mkdir -p $(DEB_DESTDIR)/usr/share/qt4/quick3d + mkdir -p $(DEB_DESTDIR)/usr/share/icons/hicolor/80x80/apps + -- 1.7.9.5