diff options
Diffstat (limited to 'ubuntu/maverick')
9 files changed, 21 insertions, 165 deletions
diff --git a/ubuntu/maverick/applications/kshutdown/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kshutdown/debian/cdbs/debian-qt-kde.mk index 9f8f97776..60310a01a 100644 --- a/ubuntu/maverick/applications/kshutdown/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/kshutdown/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,6 +19,7 @@ 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) @@ -102,6 +104,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 | \ @@ -110,6 +113,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/kshutdown/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kshutdown/debian/cdbs/kde.mk index 1ac26c4b7..80176d63e 100644 --- a/ubuntu/maverick/applications/kshutdown/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kshutdown/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/kshutdown/debian/control b/ubuntu/maverick/applications/kshutdown/debian/control index 713dbecff..5b7da3693 100644 --- a/ubuntu/maverick/applications/kshutdown/debian/control +++ b/ubuntu/maverick/applications/kshutdown/debian/control @@ -2,7 +2,7 @@ Source: kshutdown-trinity Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 7.0.50~), automake, libtool, tdelibs14-trinity-dev +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev Standards-Version: 3.8.1 Package: kshutdown-trinity diff --git a/ubuntu/maverick/applications/kshutdown/debian/dirs b/ubuntu/maverick/applications/kshutdown/debian/dirs index dee03de4a..f583045fe 100644 --- a/ubuntu/maverick/applications/kshutdown/debian/dirs +++ b/ubuntu/maverick/applications/kshutdown/debian/dirs @@ -1,2 +1 @@ opt/trinity/bin -opt/trinity/share/apps/kconf_update diff --git a/ubuntu/maverick/applications/kshutdown/debian/docs b/ubuntu/maverick/applications/kshutdown/debian/docs index d40f58a45..9341bcf45 100644 --- a/ubuntu/maverick/applications/kshutdown/debian/docs +++ b/ubuntu/maverick/applications/kshutdown/debian/docs @@ -1,4 +1,4 @@ -README AUTHORS +README TODO VERSION diff --git a/ubuntu/maverick/applications/kshutdown/debian/kshutdown.1 b/ubuntu/maverick/applications/kshutdown/debian/kshutdown.1 deleted file mode 100644 index 46ff37717..000000000 --- a/ubuntu/maverick/applications/kshutdown/debian/kshutdown.1 +++ /dev/null @@ -1,115 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KSHUTDOWN 1 "avril 14, 2005" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kshutdown \- A Shut Down Utility for TDE -.SH SYNOPSIS -.B kshutdown -.RI [ Qt-options ] -.RI [ TDE-options ] -.RI [ options ] -.RI time -.SH DESCRIPTION -This manual page was written for the Debian distribution -because the original program does not have a manual page. -.PP -This manual page documents briefly the -.B kshutdown -utility. -.PP -.\" TeX users may be more comfortable with the \fB<whatever>\fP and -.\" \fI<whatever>\fP escape sequences to invode bold face and italics, -.\" respectively. -.SH OPTIONS -A summary of options is included below. - -.TP -Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options - -.TP -Options: -.TP -.B \-s, \-\-shutdown - Turn off computer -.TP -.B \-h, \-\-halt -Turn off computer -.TP -.B \-r, \-\-reboot -Restart computer -.TP -.B \-k, \-\-lock -Lock session -.TP -.B \-l, \-\-logout -End current session -.TP -.B \-w, \-\-wizard -Wizard -.TP -.B \-\-standard -Show standard logout dialog -.TP -.B \-c, \-\-cancel -Cancel an active action -.TP -.B \-\-init -Don't show window at startup -.TP -.B \-\-test -Enable test mode -.TP -.B \-\-default -Disable test mode - -.TP -Arguments: -.TP -.B time -Time; Examples: 01:30 - absolute time (HH:MM); 10 - number of minutes to wait from now -.SH AUTHOR -kshutdown was written by Konrad Twardowski <kdtonline@poczta.onet.pl>. -.PP -This manual page was written by Romain Beauxis <toots@rastageeks.org>, -for the Debian project Permission is granted to copy, distribute and/or -modify this document under the terms of the GNU General Public -License, Version 2 any later version published by the Free Software Foundation. - diff --git a/ubuntu/maverick/applications/kshutdown/debian/manpages b/ubuntu/maverick/applications/kshutdown/debian/manpages deleted file mode 100644 index f7176be3d..000000000 --- a/ubuntu/maverick/applications/kshutdown/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -debian/kshutdown.1 diff --git a/ubuntu/maverick/applications/kshutdown/debian/rules b/ubuntu/maverick/applications/kshutdown/debian/rules index a9c195576..18b1c07e2 100755 --- a/ubuntu/maverick/applications/kshutdown/debian/rules +++ b/ubuntu/maverick/applications/kshutdown/debian/rules @@ -1,42 +1,20 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include debian/cdbs/kde.mk +include /usr/share/cdbs/1/class/cmake.mk #include /usr/share/cdbs/1/rules/patchsys-quilt.mk - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +include debian/cdbs/debian-qt-kde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - dh_testdir - - # Regenerate build system -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 - - autoreconf --install && automake -f && \ - $(MAKE) -f admin/Makefile.common && \ - touch debian/stamp-bootstrap - -binary-install/kshutdown-trinity:: - dh_testdir - mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ - -clean:: - dh_testdir - rm -f debian/stamp-bootstrap +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" diff --git a/ubuntu/maverick/applications/kshutdown/debian/watch b/ubuntu/maverick/applications/kshutdown/debian/watch deleted file mode 100644 index 740658699..000000000 --- a/ubuntu/maverick/applications/kshutdown/debian/watch +++ /dev/null @@ -1,11 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -# Uncomment to examine a Webserver directory -http://sf.net/kshutdown/kshutdown-(.*(?<!beta))\.tar\.bz2 - |