Merge branch 'master' of github.com:pcbsd/lumina

10 files changed, 26 insertions, 243 deletions

diff --git a/debian/libluminautils-dev.install b/debian/libluminautils-dev.install
index b205e6c3..d3a27604 100644
--- a/debian/libluminautils-dev.install
+++ b/debian/libluminautils-dev.install
@@ -1,2 +1,2 @@
-usr/lib/libLuminaUtils.so
-usr/include/*.h
+usr/local/lib/libLuminaUtils.so
+usr/local/include/*.h
diff --git a/debian/libluminautils1.install b/debian/libluminautils1.install
index e6d42ae9..49146ecf 100644
--- a/debian/libluminautils1.install
+++ b/debian/libluminautils1.install
@@ -1 +1,3 @@
-usr/lib/libLuminaUtils.so.*
+usr/local/lib/libLuminaUtils.so.1
+usr/local/lib/libLuminaUtils.so.1.0
+usr/local/lib/libLuminaUtils.so.1.0.0
diff --git a/debian/lumina-config.install b/debian/lumina-config.install
index 4ed57486..f56549f5 100644
--- a/debian/lumina-config.install
+++ b/debian/lumina-config.install
@@ -1 +1 @@
-usr/bin/lumina-config
+usr/local/bin/lumina-config
diff --git a/debian/lumina-core.install b/debian/lumina-core.install
index 093cee7f..5ccc752e 100644
--- a/debian/lumina-core.install
+++ b/debian/lumina-core.install
@@ -1,5 +1,5 @@
-usr/bin/Lumina-DE
-usr/share/pixmaps/Lumina-DE.png
-usr/share/Lumina-DE/
-usr/share/wallpapers/Lumina-DE/
+usr/local/bin/Lumina-DE
+usr/local/share/pixmaps/Lumina-DE.png
+usr/local/share/Lumina-DE/
+usr/local/share/wallpapers/Lumina-DE/
 usr/share/xsessions/Lumina-DE.desktop 
diff --git a/debian/lumina-fm.install b/debian/lumina-fm.install
index b0e21dbd..1dc751d3 100644
--- a/debian/lumina-fm.install
+++ b/debian/lumina-fm.install
@@ -1,3 +1,3 @@
-usr/bin/lumina-fm
-usr/share/pixmaps/Insight-FileManager.png
-usr/share/applications/lumina-fm.desktop
+usr/local/bin/lumina-fm
+usr/local/share/pixmaps/Insight-FileManager.png
+usr/local/share/applications/lumina-fm.desktop
diff --git a/debian/lumina-open.install b/debian/lumina-open.install
index 401cd57a..a4a8e633 100644
--- a/debian/lumina-open.install
+++ b/debian/lumina-open.install
@@ -1 +1 @@
-usr/bin/lumina-open
+usr/local/bin/lumina-open
diff --git a/debian/lumina-screenshot.install b/debian/lumina-screenshot.install
index 2b426b55..41ade964 100644
--- a/debian/lumina-screenshot.install
+++ b/debian/lumina-screenshot.install
@@ -1,2 +1,2 @@
-usr/bin/lumina-screenshot
-usr/share/applications/lumina-screenshot.desktop
+usr/local/bin/lumina-screenshot
+usr/local/share/applications/lumina-screenshot.desktop
diff --git a/debian/patches/01-change-prefix.diff b/debian/patches/01-change-prefix.diff
deleted file mode 100644
index 8a610ab0..00000000
--- a/debian/patches/01-change-prefix.diff
+++ /dev/null
@@ -1,227 +0,0 @@
-Description: Change the prefix from /usr/local to /usr
- Change installation prefix to /usr
- .
- lumina-desktop (0.6.2.14-1nano) unstable; urgency=low
- .
-   * Initial release
-Author: Christopher Roy Bratusek <nano@jpberlin.de>
-
---- lumina-desktop-0.6.2.14.orig/libLumina/libLumina.pro
-+++ lumina-desktop-0.6.2.14/libLumina/libLumina.pro
-@@ -2,7 +2,7 @@
- QT       += core
- 
- TARGET=LuminaUtils
--target.path = /usr/local/lib
-+target.path = /usr/lib
- 
- DESTDIR= $$_PRO_FILE_PWD_/
- 
-@@ -21,11 +21,11 @@ SOURCES	+= LuminaXDG.cpp \
- 	LuminaOS-FreeBSD.cpp \
- 	LuminaOS-Linux.cpp
- 
--INCLUDEPATH += /usr/local/include
-+INCLUDEPATH += /usr/include
- 
- LIBS	+= -lX11 -lXrender -lXcomposite
- 
--include.path=/usr/local/include/
-+include.path=/usr/include/
- include.files=LuminaXDG.h \
- 	LuminaUtils.h \
- 	LuminaX11.h \
-@@ -33,4 +33,4 @@ include.files=LuminaXDG.h \
- 
- INSTALLS += target include 
- 
--QMAKE_LIBDIR = /usr/local/lib/qt4 /usr/local/lib
-+QMAKE_LIBDIR = /usr/lib/qt4 /usr/lib
---- lumina-desktop-0.6.2.14.orig/lumina-config/lumina-config.pro
-+++ lumina-desktop-0.6.2.14/lumina-config/lumina-config.pro
-@@ -2,7 +2,7 @@
- QT       += core gui
- 
- TARGET = lumina-config
--target.path = /usr/local/bin
-+target.path = /usr/bin
- 
- TEMPLATE = app
- 
-@@ -20,7 +20,7 @@ FORMS    += mainUI.ui \
- 
- # RESOURCES+= lumina-config.qrc
- 
--INCLUDEPATH += ../libLumina /usr/local/include
-+INCLUDEPATH += ../libLumina /usr/include
- 
- linux-g++-64 {
-   LIBS     += -L../libLumina -lLuminaUtils 
-@@ -93,7 +93,7 @@ TRANSLATIONS =  i18n/lumina-config_af.ts
-                 i18n/lumina-config_zh_TW.ts \
-                 i18n/lumina-config_zu.ts
- 
--dotrans.path=/usr/local/share/Lumina-DE/i18n/
--dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/Lumina-DE/i18n/
-+dotrans.path=/usr/share/Lumina-DE/i18n/
-+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/share/Lumina-DE/i18n/
- 
- INSTALLS += target dotrans
---- lumina-desktop-0.6.2.14.orig/lumina-desktop/lumina-desktop.pro
-+++ lumina-desktop-0.6.2.14/lumina-desktop/lumina-desktop.pro
-@@ -2,7 +2,7 @@
- QT       += core gui network phonon
- 
- TARGET = Lumina-DE
--target.path = /usr/local/bin
-+target.path = /usr/bin
- 
- LIBS     += -L../libLumina -lLuminaUtils -lXdamage -lX11
- QMAKE_LIBDIR	= ../libLumina
-@@ -78,25 +78,25 @@ FORMS    += SystemWindow.ui \
- 
- RESOURCES+= Lumina-DE.qrc
- 
--INCLUDEPATH += ../libLumina /usr/local/include
-+INCLUDEPATH += ../libLumina /usr/include
- 
- desktop.files = Lumina-DE.desktop
- linux-g++-64 {
- desktop.path = /usr/share/xsessions
- } else {
--desktop.path = /usr/local/share/xsessions
-+desktop.path = /usr/share/xsessions
- }
- 
- icons.files = Lumina-DE.png \
- 		Insight-FileManager.png
- 
--icons.path = /usr/local/share/pixmaps
-+icons.path = /usr/share/pixmaps
- 
- wallpapers.files = wallpapers/Lumina_Wispy_gold_1920x1080.jpg \
- 			wallpapers/Lumina_Wispy_green_1920x1080.jpg \
- 			wallpapers/Lumina_Wispy_purple_1920x1080.jpg \
- 			wallpapers/Lumina_Wispy_red_1920x1080.jpg
--wallpapers.path = /usr/local/share/wallpapers/Lumina-DE
-+wallpapers.path = /usr/share/wallpapers/Lumina-DE
- 
- defaults.files = defaults/desktop-background.jpg \
- 		defaults/defaultapps.conf \
-@@ -104,7 +104,7 @@ defaults.files = defaults/desktop-backgr
- 		defaults/stylesheet.qss \
- 		audiofiles/Logout.ogg \
- 		audiofiles/Login.ogg
--defaults.path = /usr/local/share/Lumina-DE/
-+defaults.path = /usr/share/Lumina-DE/
- 
- TRANSLATIONS =  i18n/lumina-desktop_af.ts \
-                 i18n/lumina-desktop_ar.ts \
-@@ -169,7 +169,7 @@ TRANSLATIONS =  i18n/lumina-desktop_af.t
-                 i18n/lumina-desktop_zh_TW.ts \
-                 i18n/lumina-desktop_zu.ts
- 
--dotrans.path=/usr/local/share/Lumina-DE/i18n/
--dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/Lumina-DE/i18n/
-+dotrans.path=/usr/share/Lumina-DE/i18n/
-+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/share/Lumina-DE/i18n/
- 
- INSTALLS += target desktop icons wallpapers defaults dotrans
---- lumina-desktop-0.6.2.14.orig/lumina-fm/lumina-fm.pro
-+++ lumina-desktop-0.6.2.14/lumina-fm/lumina-fm.pro
-@@ -2,7 +2,7 @@
- QT       += core gui phonon
- 
- TARGET = lumina-fm
--target.path = /usr/local/bin
-+target.path = /usr/bin
- 
- TEMPLATE = app
- 
-@@ -22,7 +22,7 @@ FORMS    += MainUI.ui \
- 
- # RESOURCES+= lumina-fm.qrc
- 
--INCLUDEPATH += ../libLumina /usr/local/include
-+INCLUDEPATH += ../libLumina /usr/include
- 
- linux-g++-64 {
-   LIBS     += -L../libLumina -lLuminaUtils 
-@@ -95,10 +95,10 @@ TRANSLATIONS =  i18n/lumina-fm_af.ts \
-                 i18n/lumina-fm_zh_TW.ts \
-                 i18n/lumina-fm_zu.ts
- 
--dotrans.path=/usr/local/share/Lumina-DE/i18n/
--dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/Lumina-DE/i18n/
-+dotrans.path=/usr/share/Lumina-DE/i18n/
-+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/share/Lumina-DE/i18n/
- 
- desktop.files=lumina-fm.desktop
--desktop.path=/usr/local/share/applications/
-+desktop.path=/usr/share/applications/
- 
- INSTALLS += target dotrans desktop
---- lumina-desktop-0.6.2.14.orig/lumina-open/lumina-open.pro
-+++ lumina-desktop-0.6.2.14/lumina-open/lumina-open.pro
-@@ -2,7 +2,7 @@
- QT       += core gui
- 
- TARGET = lumina-open
--target.path = /usr/local/bin
-+target.path = /usr/bin
- 
- TEMPLATE = app
- 
-@@ -15,7 +15,7 @@ FORMS    += LFileDialog.ui
- 
- RESOURCES+= lumina-open.qrc
- 
--INCLUDEPATH += ../libLumina /usr/local/include
-+INCLUDEPATH += ../libLumina /usr/include
- LIBS     += -L../libLumina -lLuminaUtils
- QMAKE_LIBDIR	= ../libLumina
- DEPENDPATH	+= ../libLumina
-@@ -83,7 +83,7 @@ TRANSLATIONS =  i18n/lumina-open_af.ts \
-                 i18n/lumina-open_zh_TW.ts \
-                 i18n/lumina-open_zu.ts
- 
--dotrans.path=/usr/local/share/Lumina-DE/i18n/
--dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/Lumina-DE/i18n/
-+dotrans.path=/usr/share/Lumina-DE/i18n/
-+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/share/Lumina-DE/i18n/
- 
- INSTALLS += target dotrans
---- lumina-desktop-0.6.2.14.orig/lumina-screenshot/lumina-screenshot.pro
-+++ lumina-desktop-0.6.2.14/lumina-screenshot/lumina-screenshot.pro
-@@ -2,7 +2,7 @@
- QT       += core gui
- 
- TARGET = lumina-screenshot
--target.path = /usr/local/bin
-+target.path = /usr/bin
- 
- TEMPLATE = app
- 
-@@ -13,7 +13,7 @@ HEADERS  += MainUI.h
- 
- FORMS    += MainUI.ui
- 
--INCLUDEPATH += ../libLumina /usr/local/include
-+INCLUDEPATH += ../libLumina /usr/include
- 
- linux-g++-64 {
-   LIBS     += -L../libLumina -lLuminaUtils 
-@@ -86,10 +86,10 @@ TRANSLATIONS =  i18n/lumina-screenshot_a
-                 i18n/lumina-screenshot_zh_TW.ts \
-                 i18n/lumina-screenshot_zu.ts
- 
--dotrans.path=/usr/local/share/Lumina-DE/i18n/
--dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/Lumina-DE/i18n/
-+dotrans.path=/usr/share/Lumina-DE/i18n/
-+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/share/Lumina-DE/i18n/
- 
- desktop.files=lumina-screenshot.desktop
--desktop.path=/usr/local/share/applications/
-+desktop.path=/usr/share/applications/
- 
- INSTALLS += target dotrans desktop
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3e4f0969..00000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-change-prefix.diff
diff --git a/debian/rules b/debian/rules
index 8d0192e4..af0d1ff9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,16 @@ export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 %:
-	dh $@ 
+	dh $@
+
+build:
+	qmake-qt4
+	(cd libLumina && qmake-qt4)
+	(cd lumina-config && qmake-qt4)
+	(cd lumina-desktop && qmake-qt4)
+	(cd lumina-fm && qmake-qt4)
+	(cd lumina-open && qmake-qt4)
+	(cd lumina-screenshot && qmake-qt4)
 
 override_dh_auto_clean:
 	-$(MAKE) distclean