From b010943f8d22c32aa0e9983941af7f5ac8ed2cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 23 Mar 2014 16:33:37 +0100 Subject: Cleanup rosegarden build rules on Debian and Ubuntu --- .../rosegarden/debian/cdbs/debian-qt-kde.mk | 2 +- .../rosegarden/debian/lintianoverrides | 2 - .../rosegarden/debian/rosegarden-trinity.lintian | 2 + .../rosegarden/debian/rosegarden-trinity.manpages | 4 ++ .../rosegarden/debian/rosegarden-trinity.menu | 2 +- ubuntu/raring/applications/rosegarden/debian/rules | 65 ++++++++-------------- 6 files changed, 32 insertions(+), 45 deletions(-) delete mode 100644 ubuntu/raring/applications/rosegarden/debian/lintianoverrides create mode 100644 ubuntu/raring/applications/rosegarden/debian/rosegarden-trinity.lintian create mode 100644 ubuntu/raring/applications/rosegarden/debian/rosegarden-trinity.manpages (limited to 'ubuntu/raring/applications/rosegarden/debian') diff --git a/ubuntu/raring/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/rosegarden/debian/cdbs/debian-qt-kde.mk index c5d8ecfd3..c7c382548 100644 --- a/ubuntu/raring/applications/rosegarden/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/raring/applications/rosegarden/debian/cdbs/debian-qt-kde.mk @@ -13,7 +13,7 @@ debian/stamp-cvs-make: touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches diff --git a/ubuntu/raring/applications/rosegarden/debian/lintianoverrides b/ubuntu/raring/applications/rosegarden/debian/lintianoverrides deleted file mode 100644 index 135ea69e9..000000000 --- a/ubuntu/raring/applications/rosegarden/debian/lintianoverrides +++ /dev/null @@ -1,2 +0,0 @@ -rosegarden-trinity: menu-icon-missing /opt/trinity/share/icons/locolor/32x32/apps/rosegarden.xpm -rosegarden-trinity: menu-icon-missing /opt/trinity/share/icons/locolor/16x16/apps/rosegarden.xpm diff --git a/ubuntu/raring/applications/rosegarden/debian/rosegarden-trinity.lintian b/ubuntu/raring/applications/rosegarden/debian/rosegarden-trinity.lintian new file mode 100644 index 000000000..135ea69e9 --- /dev/null +++ b/ubuntu/raring/applications/rosegarden/debian/rosegarden-trinity.lintian @@ -0,0 +1,2 @@ +rosegarden-trinity: menu-icon-missing /opt/trinity/share/icons/locolor/32x32/apps/rosegarden.xpm +rosegarden-trinity: menu-icon-missing /opt/trinity/share/icons/locolor/16x16/apps/rosegarden.xpm diff --git a/ubuntu/raring/applications/rosegarden/debian/rosegarden-trinity.manpages b/ubuntu/raring/applications/rosegarden/debian/rosegarden-trinity.manpages new file mode 100644 index 000000000..6e3b96ee0 --- /dev/null +++ b/ubuntu/raring/applications/rosegarden/debian/rosegarden-trinity.manpages @@ -0,0 +1,4 @@ +debian/rosegarden.1 +debian/rosegarden-lilypondview.1 +debian/rosegarden-project-package.1 +debian/rosegarden-audiofile-importer.1 diff --git a/ubuntu/raring/applications/rosegarden/debian/rosegarden-trinity.menu b/ubuntu/raring/applications/rosegarden/debian/rosegarden-trinity.menu index ca56a8f26..c97a7ce33 100644 --- a/ubuntu/raring/applications/rosegarden/debian/rosegarden-trinity.menu +++ b/ubuntu/raring/applications/rosegarden/debian/rosegarden-trinity.menu @@ -1,4 +1,4 @@ -?package(rosegarden):\ +?package(rosegarden-trinity):\ needs="X11"\ section="Applications/Sound"\ title="Rosegarden"\ diff --git a/ubuntu/raring/applications/rosegarden/debian/rules b/ubuntu/raring/applications/rosegarden/debian/rules index 8ec1b462e..4e364d16b 100755 --- a/ubuntu/raring/applications/rosegarden/debian/rules +++ b/ubuntu/raring/applications/rosegarden/debian/rules @@ -1,13 +1,8 @@ #!/usr/bin/make -f +# -*- makefile -*- -# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function -# Also include the main Trinity path -ifeq ("$(LD_LIBRARY_PATH)", "") -LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib -else -LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib -endif -export LD_LIBRARY_PATH +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk @@ -15,12 +10,26 @@ include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -DEB_KDE_APIDOX := yes +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +DEB_CMAKE_EXTRA_FLAGS := \ + -DLIB_SUFFIX="" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo -CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) +DEB_KDE_APIDOX := yes -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ --DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_COMPRESS_EXCLUDE += .rg .wav .docbook DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) @@ -29,37 +38,11 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true -# Build architecture-dependent files here. -binary-arch: build install - mkdir -p debian/rosegarden-trinity/opt/trinity/share/ +binary-install/rosegarden-trinity:: dh_testdir - dh_testroot - dh_installexamples find debian/rosegarden-trinity/usr/share/doc/rosegarden-trinity/examples -type f -exec chmod 664 {} \; - dh_installdirs - dh_installdocs - dh_installmenu - dh_installmime - dh_installcron - dh_installman debian/rosegarden.1 debian/rosegarden-lilypondview.1 debian/rosegarden-project-package.1 debian/rosegarden-audiofile-importer.1 - mkdir -p debian/rosegarden-trinity/opt/trinity/share/man/ cp -Rp debian/rosegarden-trinity/usr/share/man/* debian/rosegarden-trinity/opt/trinity/share/man/ rm -rf debian/rosegarden-trinity/usr/share/man - dh_desktop - cp debian/lintianoverrides debian/rosegarden-trinity/usr/share/lintian/overrides/rosegarden-trinity - dh_installinfo - dh_installchangelogs - dh_install - dh_link - dh_strip - dh_compress -X.rg -X.wav -X.docbook - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb $(DEB_DH_BUILDDEB_ARGS) -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +clean:: + dh_testdir -- cgit v1.2.1