diff options
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rwxr-xr-x | debian/rules | 6 | ||||
| -rw-r--r-- | lumina-fm/lumina-fm.pro | 6 |
4 files changed, 22 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index f9ab5fb1..febfa196 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +lumina-desktop (0.8.0.244-nano) unstable; urgency=low + + * new GIT snapshot + * switch to qt5 + * add dependecy on libxcb1-dev, libx11-xcb-dev, libxcb-ewmh-dev, + libxcb-icccm4-dev, libxcb-damage0-dev, libxcb-util0-dev + * drop dependency on libphonon-dev + + -- Christopher Roy Bratusek <nano@jpberlin.de> Wed, 07 Jan 2015 17:06:35 +0100 + lumina-desktop (0.7.1.158-1nano) unstable; urgency=low * new GIT snapshot diff --git a/debian/control b/debian/control index dd6270a0..b3219a4b 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,10 @@ Source: lumina-desktop Section: x11 Priority: optional Maintainer: Christopher Roy Bratusek <nano@jpberlin.de> -Build-Depends: debhelper (>= 9), qt4-qmake, libqt4-dev, make, g++, libphonon-dev, libx11-dev, - libxrender-dev, libxcomposite-dev, libxdamage-dev +Build-Depends: debhelper (>= 9), qt5-qmake, qtbase5-dev, qtmultimedia5-dev, + libxcb1-dev, libx11-xcb-dev, libxcb-ewmh-dev, make, g++, + libx11-dev, libxrender-dev, libxcomposite-dev, libxdamage-dev, + libxcb-icccm4-dev, libxcb-damage0-dev, libxcb-util0-dev Standards-Version: 3.9.5 Homepage: https://github.com/pcbsd/lumina diff --git a/debian/rules b/debian/rules index 661b461f..9804eda6 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed DEB_PREF = $(shell gcc -print-multiarch) -USER_QMAKE_FLAGS = PREFIX=/usr LIBPREFIX=/usr/lib/$(DEB_PREF) +USER_QMAKE_FLAGS = PREFIX=/usr LIBPREFIX=/usr/lib/$(DEB_PREF) QT5LIBDIR=/usr/lib/$(DEB_PREF)/qt5 QMAKE_EXTRA_DIRS = libLumina \ lumina-config \ lumina-desktop \ @@ -22,8 +22,8 @@ QMAKE_EXTRA_DIRS = libLumina \ dh $@ override_dh_auto_configure: - qmake-qt4 $(USER_QMAKE_FLAGS) - for d in $(QMAKE_EXTRA_DIRS) ; do (cd $$d && qmake-qt4 $(USER_QMAKE_FLAGS)); done + /usr/lib/$(DEB_PREF)/qt5/bin/qmake $(USER_QMAKE_FLAGS) + for d in $(QMAKE_EXTRA_DIRS) ; do (cd $$d && /usr/lib/$(DEB_PREF)/qt5/bin/qmake $(USER_QMAKE_FLAGS)); done override_dh_auto_clean: -$(MAKE) distclean diff --git a/lumina-fm/lumina-fm.pro b/lumina-fm/lumina-fm.pro index 5845bb88..ad6b9a2f 100644 --- a/lumina-fm/lumina-fm.pro +++ b/lumina-fm/lumina-fm.pro @@ -12,6 +12,10 @@ isEmpty(LIBPREFIX) { LIBPREFIX = $$PREFIX/lib } +isEmpty(QT5LIBDIR) { + QT5LIBDIR = $$PREFIX/lib/qt5 +} + TEMPLATE = app SOURCES += main.cpp \ @@ -39,7 +43,7 @@ LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils openbsd-g++4 { LRELEASE = lrelease4 } else { - LRELEASE = $$PREFIX/lib/qt5/bin/lrelease + LRELEASE = $$QT5LIBDIR/bin/lrelease } QMAKE_LIBDIR = ../libLumina |