From 3c19a9ebc3392847a7bc39d5a3831c9d16baa307 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 20 Jul 2011 17:41:02 -0500 Subject: Use Autotools to build kpowersave under ubuntu --- .../kpowersave/debian/cdbs/debian-qt-kde.mk | 11 +++++ .../applications/kpowersave/debian/cdbs/kde.mk | 8 ++-- .../applications/kpowersave/debian/control | 7 ++-- .../applications/kpowersave/debian/control.in | 41 ------------------- .../maverick/applications/kpowersave/debian/rules | 47 ++++++++++++++++------ 5 files changed, 53 insertions(+), 61 deletions(-) delete mode 100644 ubuntu/maverick/applications/kpowersave/debian/control.in (limited to 'ubuntu/maverick/applications/kpowersave') diff --git a/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk index 888f4be38..47e83ef4a 100644 --- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,9 @@ _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: + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -93,6 +96,14 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk index 9dbcfbafd..5b6508f8c 100644 --- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk @@ -35,7 +35,7 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif -# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +59,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/" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: @@ -70,7 +70,7 @@ cleanbuilddir:: common-build-arch common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) touch $@ common-install-prehook-impl:: @@ -82,7 +82,7 @@ common-install-prehook-impl:: common-install-arch common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) clean:: rm -f debian/stamp-kde-apidox diff --git a/ubuntu/maverick/applications/kpowersave/debian/control b/ubuntu/maverick/applications/kpowersave/debian/control index 430ad6cb1..87738b5f0 100644 --- a/ubuntu/maverick/applications/kpowersave/debian/control +++ b/ubuntu/maverick/applications/kpowersave/debian/control @@ -3,15 +3,16 @@ Section: kde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Michael Biebl -Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, libtool, libltdl-dev, cmake +Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev +Build-Conflicts: autoconf2.13 Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ Package: kpowersave-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1) -Description: HAL based power management applet for Trinity - KPowersave is a TDE systray applet which allows to control the power +Description: HAL based power management applet for KDE3 + KPowersave is a KDE systray applet which allows to control the power management settings and policies of your computer. It relies on HAL to do the heavy lifting. . diff --git a/ubuntu/maverick/applications/kpowersave/debian/control.in b/ubuntu/maverick/applications/kpowersave/debian/control.in deleted file mode 100644 index 8fb5ca51f..000000000 --- a/ubuntu/maverick/applications/kpowersave/debian/control.in +++ /dev/null @@ -1,41 +0,0 @@ -Source: kpowersave-trinity -Section: kde -Priority: optional -Maintainer: Timothy Pearson -XSBC-Original-Maintainer: @@@MAINTAINER@@@ -Uploaders: @@@UPLOADERS@@@ -Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake -Standards-Version: 3.8.4 -Homepage: http://sourceforge.net/projects/powersave/ - -Package: kpowersave-trinity -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1) -Description: HAL based power management applet for Trinity - KPowersave is a TDE systray applet which allows to control the power - management settings and policies of your computer. - It relies on HAL to do the heavy lifting. - . - Current feature list: - * support for ACPI, APM and PMU - * trigger suspend to disk/ram and standby - * switch cpu frequency policy (between: performance, dynamic and powersave) - * applet icon with information about AC state, battery fill and battery - (warning) states - * applet tooltip with information about battery fill and remaining battery - time/percentage - * autosuspend (to suspend the machine if the user has been inactive for a - defined time) - * a global configurable blacklist with programs which prevent autosuspend - (e.g. videoplayer and cd burning tools) - * trigger lock screen and select the lock method - * KNotify support - * online help - * localisations for many languages - KPowersave supports schemes with following configurable specific - settings for: - * screensaver - * DPMS - * autosuspend - * scheme specific blacklist for autosuspend - * notification settings diff --git a/ubuntu/maverick/applications/kpowersave/debian/rules b/ubuntu/maverick/applications/kpowersave/debian/rules index 7f153b395..2c4fb87d0 100755 --- a/ubuntu/maverick/applications/kpowersave/debian/rules +++ b/ubuntu/maverick/applications/kpowersave/debian/rules @@ -1,24 +1,45 @@ #!/usr/bin/make -f -# 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 - +include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/rules/utils.mk -include debian/cdbs/debian-qt-kde.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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) DEB_INSTALL_DOCS_ALL := AUTHORS NEWS +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde -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" +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap install/kpowersave:: install -p -D -m644 debian/kpowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave install -p -D -m644 debian/kpowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave + +clean:: + find . -name Makefile.in | xargs rm -f + rm -f acinclude.m4 + rm -f aclocal.m4 + rm -f configure + rm -f configure.files + rm -f configure.in + rm -f config.h.in + rm -f stamp-h.in + rm -f subdirs + rm -f admin/ltmain.sh + rm -f admin/libtool.m4.in + rm -f debian/stamp-bootstrap -- cgit v1.2.3