diff options
Diffstat (limited to 'ubuntu/maverick/applications/kcpuload/debian')
| -rw-r--r-- | ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk | 6 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk | 4 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/kcpuload/debian/control | 2 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/kcpuload/debian/doc-base | 6 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/kcpuload/debian/kcpuload-trinity.1 (renamed from ubuntu/maverick/applications/kcpuload/debian/kcpuload.1) | 0 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/kcpuload/debian/kcpuload-trinity.install (renamed from ubuntu/maverick/applications/kcpuload/debian/kcpuload.install) | 0 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/kcpuload/debian/kcpuload-trinity.lintian (renamed from ubuntu/maverick/applications/kcpuload/debian/override) | 2 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/kcpuload/debian/manpages | 1 | ||||
| -rwxr-xr-x | ubuntu/maverick/applications/kcpuload/debian/rules | 198 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/kcpuload/debian/source.lintian-overrides | 3 |
10 files changed, 34 insertions, 188 deletions
diff --git a/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk index 9920696ce..32ba4acfb 100644 --- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh @@ -18,10 +19,11 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh endif $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif 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 @@ -103,6 +105,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -111,6 +114,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kcpuload/debian/control b/ubuntu/maverick/applications/kcpuload/debian/control index e3f67cf3a..035564cda 100644 --- a/ubuntu/maverick/applications/kcpuload/debian/control +++ b/ubuntu/maverick/applications/kcpuload/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org> -Build-Depends: debhelper (>= 7.0.50~), tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kcpuload-trinity diff --git a/ubuntu/maverick/applications/kcpuload/debian/doc-base b/ubuntu/maverick/applications/kcpuload/debian/doc-base index 59af0de31..ad25937a7 100644 --- a/ubuntu/maverick/applications/kcpuload/debian/doc-base +++ b/ubuntu/maverick/applications/kcpuload/debian/doc-base @@ -1,4 +1,4 @@ -Document: kcpuload +Document: kcpuload-trinity Title: KCPULoad Handbook Author: Markus Gustavsson <mighty@fragzone.se> and Ben Burton <bab@debian.org> Abstract: KCPULoad is a simple CPU meter which graphs a recent history @@ -7,5 +7,5 @@ Abstract: KCPULoad is a simple CPU meter which graphs a recent history Section: Applications/System/Monitoring Format: HTML -Index: /usr/share/doc/kcpuload/html/index.html -Files: /usr/share/doc/kcpuload/html/*.html
\ No newline at end of file +Index: /opt/trinity/share/doc/kcpuload/html/index.html +Files: /opt/trinity/share/doc/kcpuload/html/*.html diff --git a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1 b/ubuntu/maverick/applications/kcpuload/debian/kcpuload-trinity.1 index 513cd2a70..513cd2a70 100644 --- a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1 +++ b/ubuntu/maverick/applications/kcpuload/debian/kcpuload-trinity.1 diff --git a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.install b/ubuntu/maverick/applications/kcpuload/debian/kcpuload-trinity.install index d3c2fb81c..d3c2fb81c 100644 --- a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.install +++ b/ubuntu/maverick/applications/kcpuload/debian/kcpuload-trinity.install diff --git a/ubuntu/maverick/applications/kcpuload/debian/override b/ubuntu/maverick/applications/kcpuload/debian/kcpuload-trinity.lintian index 636623749..d53421bab 100644 --- a/ubuntu/maverick/applications/kcpuload/debian/override +++ b/ubuntu/maverick/applications/kcpuload/debian/kcpuload-trinity.lintian @@ -1,2 +1,2 @@ # This tag is required for apps already in the TDE menu. -kcpuload-trinity: menu-item-contains-unknown-tag kderemove /usr/share/menu/kcpuload:7 +kcpuload-trinity: menu-item-contains-unknown-tag kderemove /usr/share/menu/kcpuload-trinity:7 diff --git a/ubuntu/maverick/applications/kcpuload/debian/manpages b/ubuntu/maverick/applications/kcpuload/debian/manpages new file mode 100644 index 000000000..a5305e731 --- /dev/null +++ b/ubuntu/maverick/applications/kcpuload/debian/manpages @@ -0,0 +1 @@ +debian/kcpuload-trinity.1 diff --git a/ubuntu/maverick/applications/kcpuload/debian/rules b/ubuntu/maverick/applications/kcpuload/debian/rules index 183ac6b78..f403b6ec3 100755 --- a/ubuntu/maverick/applications/kcpuload/debian/rules +++ b/ubuntu/maverick/applications/kcpuload/debian/rules @@ -2,184 +2,26 @@ # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -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 - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +#include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk +include debian/cdbs/debian-qt-kde.mk + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" + +# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to +# never build in parallel, regardless of DEB_BUILD_OPTIONS. +DEB_BUILD_PARALLEL = true DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) - -# This has to be exported to make some magic below work. -export DH_OPTIONS - -# 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 ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -INSTALL_DIR = install -p -d -o root -g root -m 755 -INSTALL_FILE = install -p -o root -g root -m 644 - -objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE) - -tmp = debian/kcpuload-trinity -overrides = $(tmp)/usr/share/lintian/overrides - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -ifeq ($(DEB_BUILD_GNU_TYPE),i386-linux) - # Uncomment the following 2 lines to enable i686 optimziation - # You may want to tweak the settings to your likings - #export CFLAGS=-O3 -march=i686 -ffast-math -finline-functions - #export CXXFLAGS=-O3 -march=i686 -ffast-math -finline-functions -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - cp -p /usr/share/misc/config.sub admin/config.sub - cp -p /usr/share/misc/config.guess admin/config.guess - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap - - if test ! -f configure; then \ - $(MAKE) -f admin/Makefile.common ;\ - fi - - # make build directory - mkdir $(objdir) - - # run configure with build tree $(objdir) - cd $(objdir) && \ - ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - - touch configure-stamp - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - - cd $(objdir) && \ - $(MAKE) - - touch build-stamp - -debian-clean: - dh_testdir - dh_testroot - - dh_clean - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Remove build tree - rm -rf $(objdir) - - # if Makefile exists run distclean - if test -f Makefile; then \ - $(MAKE) distclean; \ - fi - - if test -d CVS; then \ - $(MAKE) -f admin/Makefile.common cvs-clean ;\ - fi - - dh_clean - -install: DH_OPTIONS= -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - cd $(objdir) && \ - $(MAKE) install DESTDIR=$(CURDIR)/debian/kcpuload-trinity - - # Install additional files beyond the standard install. - dh_install - - # Generate HTML docs. - for i in `find $(tmp) -name "index.docbook"`; do \ - ( cd `dirname $$i`; /opt/trinity/bin/meinproc `basename $$i` ); \ - done - - # Install standard documentation links. - for pkg in `dh_listpackages`; do \ - if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \ - dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \ - opt/trinity/share/doc/$$pkg/html; \ - fi; \ - done - - # Install lintian overrides. - $(INSTALL_DIR) $(overrides) - $(INSTALL_FILE) debian/override $(overrides)/kcpuload-trinity - -# This single target is used to build all the packages, all at once, or -# one at a time. So keep in mind: any options passed to commands here will -# affect _all_ packages. Anything you want to only affect one package -# should be put in another target, such as the install target. -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs kcpuload/ChangeLog - dh_installdocs - rm -fr debian/kcpuload-trinity/usr/share/doc-base - dh_installexamples - dh_installmanpages - mv debian/kcpuload-trinity/usr/share/man debian/kcpuload-trinity/opt/trinity/share/ - dh_installmenu - dh_installmime - dh_strip - dh_link - dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2 - dh_fixperms - dh_makeshlibs -V - dh_installdeb - dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb $(DEB_DH_BUILDDEB_ARGS) - -# Build architecture independant packages using the common target. -binary-indep: build install - # We have nothing to do by default. - -# Build architecture dependant packages using the common target. -binary-arch: build install - $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common - -# Any other binary targets build just one binary package at a time. -binary-%: build install - $(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$* - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/ubuntu/maverick/applications/kcpuload/debian/source.lintian-overrides b/ubuntu/maverick/applications/kcpuload/debian/source.lintian-overrides deleted file mode 100644 index 417f308dc..000000000 --- a/ubuntu/maverick/applications/kcpuload/debian/source.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# These are shipped with the upstream tarball. -kcpuload source: cvsignore-file-in-source -kcpuload source: source-contains-CVS-dir |