[rkward/frameworks] /: Stop using kde4-config for building frameworks .deb.

[Thomas Friedrichsmeier]

Git commit 21f653aa8cfce0c094f52aa491d592fe0cea4a84 by Thomas Friedrichsmeier.
Committed on 06/07/2016 at 07:32.
Pushed by tfry into branch 'frameworks'.

Stop using kde4-config for building frameworks .deb.

I wonder why it used to work, before...

M  +7    -12   debian-official/rules
M  +5    -10   debian/rules

http://commits.kde.org/rkward/21f653aa8cfce0c094f52aa491d592fe0cea4a84

diff --git a/debian-official/rules b/debian-official/rules
index 18c3f2e..b044e6f 100755
--- a/debian-official/rules
+++ b/debian-official/rules
@@ -24,27 +24,22 @@ override_dh_auto_configure:
 	mkdir -p $(BUILDDIR)
 	# Some installations of R need a specific version of the compiler(s)
 	# R CMD config provides info on which compiler to use
-	cd $(BUILDDIR) && \
+	cd $(CURDIR)/build && \
 	CC="`/usr/bin/R CMD config CC`" \
 	CXX="`/usr/bin/R CMD config CXX`" \
 	F77="`/usr/bin/R CMD config F77`" \
-	cmake ../.. \
-		-DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
-		-DDATA_INSTALL_DIR=`kde4-config --install data` \
-		-DHTML_INSTALL_DIR=`kde4-config --install html` \
-		-DKCFG_INSTALL_DIR=`kde4-config --install kcfg` \
-		-DINFO_INSTALL_DIR=/usr/share/info \
+	cmake .. \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DDATA_INSTALL_DIR=/usr/share \
+		-DHTML_INSTALL_DIR=/usr/share/doc/HTML \
 		-DMAN_INSTALL_DIR=/usr/share/man \
-		-DKDE_DEFAULT_HOME=`kde4-config --localprefix` \
 		-DCMAKE_SKIP_RPATH=true \
-		-DKDE4_USE_ALWAYS_FULL_RPATH=false \
 		-DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
 		-DCMAKE_C_FLAGS="$(CFLAGS)" \
 		-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
 		-DCMAKE_MODULE_LINKER_FLAGS="$(LDFLAGS)" \
 		-DCMAKE_SHARED_LINKER_FLAGS="$(LDFLAGS)" \
 		-DCMAKE_VERBOSE_MAKEFILE=ON \
-		-DKDE4_DISABLE_MULTIMEDIA=ON \
 		-DR_EXECUTABLE=/usr/bin/R/ \
 		-DR_LIBDIR=/usr/lib/R/site-library/ \
 		-DBUILD_TIMESTAMP="$(builttime)"
@@ -53,10 +48,10 @@ override_dh_auto_install:
 	dh_auto_install
 
 	# dirty hack to get rid of conflicting r.xml file without adjusting all makefiles
-	rm -vf $(DESTDIR)/`kde4-config --install data`/katepart/syntax/r.xml
+	rm -vf $(DESTDIR)/usr/share/katepart/syntax/r.xml
 	# remove unneeded R package files
 	rm -vf $(DESTDIR)/usr/lib/R/site-library/R.css $(DESTDIR)/usr/lib/R/site-library/rkward/COPYING
-	# remove x-test locale
+	# remove x-test locale KF5 TODO FIXME
 	rm -rvf $(DESTDIR)/usr/share/kde4/apps/rkward/po/x-test $(DESTDIR)/usr/share/locale/x-test
 
 override_dh_compress:
diff --git a/debian/rules b/debian/rules
index 6bbe222..46fe8f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,22 +54,17 @@ build-stamp:
 	CXX="`/usr/bin/R CMD config CXX`" \
 	F77="`/usr/bin/R CMD config F77`" \
 	cmake .. \
-		-DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
-		-DDATA_INSTALL_DIR=`kde4-config --install data` \
-		-DHTML_INSTALL_DIR=`kde4-config --install html` \
-		-DKCFG_INSTALL_DIR=`kde4-config --install kcfg` \
-		-DINFO_INSTALL_DIR=/usr/share/info \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DDATA_INSTALL_DIR=/usr/share \
+		-DHTML_INSTALL_DIR=/usr/share/doc/HTML \
 		-DMAN_INSTALL_DIR=/usr/share/man \
-		-DKDE_DEFAULT_HOME=`kde4-config --localprefix` \
 		-DCMAKE_SKIP_RPATH=true \
-		-DKDE4_USE_ALWAYS_FULL_RPATH=false \
 		-DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
 		-DCMAKE_C_FLAGS="$(CFLAGS)" \
 		-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
 		-DCMAKE_MODULE_LINKER_FLAGS="$(LDFLAGS)" \
 		-DCMAKE_SHARED_LINKER_FLAGS="$(LDFLAGS)" \
 		-DCMAKE_VERBOSE_MAKEFILE=ON \
-		-DKDE4_DISABLE_MULTIMEDIA=ON \
 		-DR_EXECUTABLE=/usr/bin/R/ \
 		-DR_LIBDIR=/usr/lib/R/site-library/ \
 		-DBUILD_TIMESTAMP="$(builttime)"
@@ -100,12 +95,12 @@ install: build
 	# Install into debian/tmp, first
 	cd $(CURDIR)/build && $(MAKE) install DESTDIR=$(DESTDIR)
 	# dirty hack to get rid of conflicting r.xml file without adjusting all makefiles
-	rm -vf $(DESTDIR)/`kde4-config --install data`/katepart/syntax/r.xml
+	rm -vf $(DESTDIR)/usr/share/katepart/syntax/r.xml
 	
 	# remove unneeded R package files
 	rm -vf $(DESTDIR)/usr/lib/R/site-library/R.css $(DESTDIR)/usr/lib/R/site-library/rkward/COPYING
 
-	# remove x-test locale
+	# remove x-test locale KF5 TODO FIXME
 	rm -rvf $(DESTDIR)/usr/share/kde4/apps/rkward/po/x-test $(DESTDIR)/usr/share/locale/x-test
 
 	# Sort the remaining bits into rkward and rkward-data subpackages