Git commit 84ae6970e89f051c1b80fd32d4d1fe7c56b232be by Thomas Friedrichsmei= er. Committed on 31/03/2016 at 20:41. Pushed by tfry into branch 'releases/0.6.5'. Fix PPA builds M +2 -0 debian-official/changelog M +1 -1 debian-official/rkward-data.manpages M +12 -89 debian-official/rules M +1 -1 debian/rules http://commits.kde.org/rkward/84ae6970e89f051c1b80fd32d4d1fe7c56b232be diff --git a/debian-official/changelog b/debian-official/changelog index 672994d..0786399 100644 --- a/debian-official/changelog +++ b/debian-official/changelog @@ -2,6 +2,8 @@ rkward (0.6.5-1) UNRELEASED; urgency=3Dlow * new upstream release (unchanged with respect to ~rc1) * fix debian/watch file + * switch to dh-based rules file + !!!TODO!!!: Does this fix the rkward-data build for binary-arch proble= m? * !!!TODO!!!: Make build really reproducible (fix for earlier attempt up= stream) closes: #783290 = diff --git a/debian-official/rkward-data.manpages b/debian-official/rkward-= data.manpages index 56c56af..f46a858 100644 --- a/debian-official/rkward-data.manpages +++ b/debian-official/rkward-data.manpages @@ -1 +1 @@ -build/doc/rkward/rkward.1 +debian/build/doc/rkward/rkward.1 diff --git a/debian-official/rules b/debian-official/rules index 491ab34..07d47f4 100755 --- a/debian-official/rules +++ b/debian-official/rules @@ -1,25 +1,4 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Based on the sample debian/rules of dh_make - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=3D1 - -# For CXXFLAGS and CFLAGS. -# See http://lists.debian.org/debian-devel-announce/2011/09/msg00001.html = -DPKG_EXPORT_BUILDFLAGS =3D 1 --include /usr/share/dpkg/buildflags.mk - -CFLAGS +=3D -Wall - -# Workaround for cmake not handling CPPFLAGS (https://wiki.debian.org/Hard= eningWalkthrough): -CFLAGS +=3D $(CPPFLAGS) -CXXFLAGS +=3D $(CPPFLAGS) - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?=3D $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?=3D $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) = #we need to know the R version RVERS =3D $(shell dpkg-query -W --showformat=3D'$${Version}' r-base-core) @@ -31,29 +10,20 @@ builttime =3D $(shell dpkg-parsechangelog -l$(CURDIR)/d= ebian/changelog | awk -F': = # easier typing DESTDIR =3D $(CURDIR)/debian/tmp +BUILDDIR =3D $(CURDIR)/debian/build = -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS +=3D -O0 -else - CFLAGS +=3D -O2 -endif - -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp - -build-stamp: - dh_testdir - - mkdir -p $(CURDIR)/build +%: + dh $@ --buildsystem=3Dcmake --builddirectory=3D$(BUILDDIR) = +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 $(CURDIR)/build && \ + cd $(BUILDDIR) && \ CC=3D"`/usr/bin/R CMD config CC`" \ CXX=3D"`/usr/bin/R CMD config CXX`" \ F77=3D"`/usr/bin/R CMD config F77`" \ - cmake .. \ + cmake ../.. \ -DCMAKE_INSTALL_PREFIX=3D`kde4-config --prefix` \ -DDATA_INSTALL_DIR=3D`kde4-config --install data` \ -DHTML_INSTALL_DIR=3D`kde4-config --install html` \ @@ -74,62 +44,21 @@ build-stamp: -DR_LIBDIR=3D/usr/lib/R/site-library/ \ -DBUILD_TIMESTAMP=3D"$(builttime)" = - # Add here commands to compile the package. - cd $(CURDIR)/build && $(MAKE) - - touch build-stamp +override_dh_auto_install: + dh_auto_install = -clean: - dh_testdir - dh_testroot - rm -f build-stamp - # remove any .svn subdir included by accident - rm -rf $(CURDIR)/debian/.svn - - # Add here commands to clean up after the build process. - rm -rf $(CURDIR)/build/ - - dh_clean = - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Install into debian/tmp, first - cd $(CURDIR)/build && $(MAKE) install DESTDIR=3D$(DESTDIR) # dirty hack to get rid of conflicting r.xml file without adjusting all m= akefiles rm -vf $(DESTDIR)/`kde4-config --install data`/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 rm -rvf $(DESTDIR)/usr/share/kde4/apps/rkward/po/x-test $(DESTDIR)/usr/sh= are/locale/x-test = - # Sort the remaining bits into rkward and rkward-data subpackages - dh_install - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_installmenu - dh_installman - dh_link - dh_strip +override_dh_compress: # do not compress KDE HTML help dh_compress -Xusr/share/doc/kde/HTML - dh_fixperms - dh_installdeb + +override_dh_shlibdeps: dh_shlibdeps # unfortunately, the r-base-core dependency can not be found by dh_shlibd= eps, so we need to get at the version manually # NOTE: This "if" is currently always true (see build-deps), but left her= e, for convenience, in case we get into trouble @@ -137,9 +66,3 @@ binary-arch: build install @if [ "$(RMAJOR)" -eq "3" ] && [ "$(RMINOR)" -ge "0" ] ; then \ echo "rvers=3Dr-base-core (>=3D 3.0.0)" >> $(CURDIR)/debian/rkward.subst= vars ; \ fi - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/rules b/debian/rules index f798733..4f904a7 100755 --- a/debian/rules +++ b/debian/rules @@ -109,7 +109,7 @@ install: build rm -rvf $(DESTDIR)/usr/share/kde4/apps/rkward/po/x-test $(DESTDIR)/usr/sh= are/locale/x-test = # Sort the remaining bits into rkward and rkward-data subpackages - dh_install + dh_install --sourcedir=3D$(DESTDIR) = # Build architecture-independent files here. binary-indep: build install