diff options
Diffstat (limited to 'debian')
14 files changed, 56 insertions, 174 deletions
diff --git a/debian/lenny/applications/yakuake/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/yakuake/debian/cdbs/debian-qt-kde.mk index 9920696ce..32ba4acfb 100644 --- a/debian/lenny/applications/yakuake/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/yakuake/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/debian/lenny/applications/yakuake/debian/cdbs/kde.mk b/debian/lenny/applications/yakuake/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/debian/lenny/applications/yakuake/debian/cdbs/kde.mk +++ b/debian/lenny/applications/yakuake/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/debian/lenny/applications/yakuake/debian/control b/debian/lenny/applications/yakuake/debian/control index 4b93b6687..669abdf4e 100644 --- a/debian/lenny/applications/yakuake/debian/control +++ b/debian/lenny/applications/yakuake/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org> -Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libltdl-dev Standards-Version: 3.8.4 Homepage: http://extragear.kde.org/apps/yakuake/ diff --git a/debian/lenny/applications/yakuake/debian/docs b/debian/lenny/applications/yakuake/debian/docs new file mode 100644 index 000000000..ca0272abf --- /dev/null +++ b/debian/lenny/applications/yakuake/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +TODO diff --git a/debian/lenny/applications/yakuake/debian/rules b/debian/lenny/applications/yakuake/debian/rules index 714a3bb7f..30b49e897 100755 --- a/debian/lenny/applications/yakuake/debian/rules +++ b/debian/lenny/applications/yakuake/debian/rules @@ -1,41 +1,24 @@ #!/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 +include debian/cdbs/debian-qt-kde.mk -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) - -#There is not any interesting doc to install. -INSTALL_DOCS_ALL := - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +# 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) -### Libtool and Automake updates -post-patches:: debian/stamp-autothings-update -debian/stamp-autothings-update: -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 - - make -f admin/Makefile.common cvs - - touch $@ - -clean:: - rm -f debian/stamp-autothings-update - +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/debian/lenny/applications/yakuake/debian/yakuake-trinity.1 b/debian/lenny/applications/yakuake/debian/yakuake-trinity.1 deleted file mode 100644 index fd9f23eb8..000000000 --- a/debian/lenny/applications/yakuake/debian/yakuake-trinity.1 +++ /dev/null @@ -1,50 +0,0 @@ -.TH YaKuake 1 "Oct 2005" "" "" -.SH NAME -YaKuake \- a Quake-style terminal emulator based on TDE Konsole technology. -.SH SYNOPSIS -.B YaKuake -[Qt\-options] [TDE\-options] -.SH DESCRIPTION -YaKuake is inspired from the terminal in the Quake game: when you press a key -(by default F12, but that can be changed) a terminal window slides down from -the top of the screen. Press the key again, and the terminal slides back. - -It is faster than a keyboard shortcut because it is already loaded into memory -and as such is very useful to anyone who frequently finds themselves switching -in and out of terminal sessions. -.SH OPTIONS -YaKuake has no application-specific options. - -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 -.SH SEE ALSO -YaKuake Homepage: http://extragear.kde.org/apps/yakuake/ -.SH AUTHOR -YaKuake was written by Francois Chazal <neptune3k@free.fr>. -YaKuake is currently maintained by Eike Hein <sho@eikehein.com>. -.SH OTHER -This manual page was written by Ana Beatriz Guerrero Lopez <ana@ekaia.org>, -for the Debian project (but may be used by others). diff --git a/debian/lenny/applications/yakuake/debian/yakuake-trinity.manpages b/debian/lenny/applications/yakuake/debian/yakuake-trinity.manpages deleted file mode 100644 index f9a1365b5..000000000 --- a/debian/lenny/applications/yakuake/debian/yakuake-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/yakuake-trinity.1 diff --git a/debian/squeeze/applications/yakuake/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/yakuake/debian/cdbs/debian-qt-kde.mk index 9920696ce..32ba4acfb 100644 --- a/debian/squeeze/applications/yakuake/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/applications/yakuake/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/debian/squeeze/applications/yakuake/debian/cdbs/kde.mk b/debian/squeeze/applications/yakuake/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/debian/squeeze/applications/yakuake/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/yakuake/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/debian/squeeze/applications/yakuake/debian/control b/debian/squeeze/applications/yakuake/debian/control index 4b93b6687..669abdf4e 100644 --- a/debian/squeeze/applications/yakuake/debian/control +++ b/debian/squeeze/applications/yakuake/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org> -Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libltdl-dev Standards-Version: 3.8.4 Homepage: http://extragear.kde.org/apps/yakuake/ diff --git a/debian/squeeze/applications/yakuake/debian/docs b/debian/squeeze/applications/yakuake/debian/docs new file mode 100644 index 000000000..ca0272abf --- /dev/null +++ b/debian/squeeze/applications/yakuake/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +TODO diff --git a/debian/squeeze/applications/yakuake/debian/rules b/debian/squeeze/applications/yakuake/debian/rules index 714a3bb7f..4c83c4c6d 100755 --- a/debian/squeeze/applications/yakuake/debian/rules +++ b/debian/squeeze/applications/yakuake/debian/rules @@ -1,41 +1,24 @@ #!/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 +include debian/cdbs/debian-qt-kde.mk -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) - -#There is not any interesting doc to install. -INSTALL_DOCS_ALL := - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +# 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) -### Libtool and Automake updates -post-patches:: debian/stamp-autothings-update -debian/stamp-autothings-update: -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 - - make -f admin/Makefile.common cvs - - touch $@ - -clean:: - rm -f debian/stamp-autothings-update - +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/debian/squeeze/applications/yakuake/debian/yakuake-trinity.1 b/debian/squeeze/applications/yakuake/debian/yakuake-trinity.1 deleted file mode 100644 index fd9f23eb8..000000000 --- a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.1 +++ /dev/null @@ -1,50 +0,0 @@ -.TH YaKuake 1 "Oct 2005" "" "" -.SH NAME -YaKuake \- a Quake-style terminal emulator based on TDE Konsole technology. -.SH SYNOPSIS -.B YaKuake -[Qt\-options] [TDE\-options] -.SH DESCRIPTION -YaKuake is inspired from the terminal in the Quake game: when you press a key -(by default F12, but that can be changed) a terminal window slides down from -the top of the screen. Press the key again, and the terminal slides back. - -It is faster than a keyboard shortcut because it is already loaded into memory -and as such is very useful to anyone who frequently finds themselves switching -in and out of terminal sessions. -.SH OPTIONS -YaKuake has no application-specific options. - -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 -.SH SEE ALSO -YaKuake Homepage: http://extragear.kde.org/apps/yakuake/ -.SH AUTHOR -YaKuake was written by Francois Chazal <neptune3k@free.fr>. -YaKuake is currently maintained by Eike Hein <sho@eikehein.com>. -.SH OTHER -This manual page was written by Ana Beatriz Guerrero Lopez <ana@ekaia.org>, -for the Debian project (but may be used by others). diff --git a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.manpages b/debian/squeeze/applications/yakuake/debian/yakuake-trinity.manpages deleted file mode 100644 index f9a1365b5..000000000 --- a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/yakuake-trinity.1 |