debian/lenny/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk

diff --git a/debian/lenny/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk

index b4b889c..32ba4ac 100644

--- a/debian/lenny/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk

+++ b/debian/lenny/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk

@@ -10,6 +10,7 @@

 # 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 @@

 	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)

@@ -103,6 +105,7 @@

 	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 @@

 			configure configure.files configure.in stamp-h.in \

 			subdirs; \

 	fi

+endif

 	rm -f debian/stamp-cvs-make

 endif

debian/lenny/applications/tdeio-ftps/debian/cdbs/kde.mk

diff --git a/debian/lenny/applications/tdeio-ftps/debian/cdbs/kde.mk b/debian/lenny/applications/tdeio-ftps/debian/cdbs/kde.mk

index 765560c..023886f 100644

--- a/debian/lenny/applications/tdeio-ftps/debian/cdbs/kde.mk

+++ b/debian/lenny/applications/tdeio-ftps/debian/cdbs/kde.mk

@@ -35,7 +35,9 @@

 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 @@

 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/%:

debian/lenny/applications/tdeio-ftps/debian/control

diff --git a/debian/lenny/applications/tdeio-ftps/debian/control b/debian/lenny/applications/tdeio-ftps/debian/control

index 4a68281..ded3d50 100644

--- a/debian/lenny/applications/tdeio-ftps/debian/control

+++ b/debian/lenny/applications/tdeio-ftps/debian/control

@@ -2,7 +2,7 @@

 Section: tde

 Priority: optional

 Maintainer: Timothy Pearson <kb9vqf@...>

-Build-Depends: debhelper (>= 7.0.50~), cdbs, autotools-dev, automake, libtool, tdelibs14-trinity-dev

+Build-Depends: debhelper (>= 7.0.50~), cdbs, cmake, tdelibs14-trinity-dev

 Standards-Version: 3.8.3

 Package: tdeio-ftps-trinity

debian/lenny/applications/tdeio-ftps/debian/docs

diff --git a/debian/lenny/applications/tdeio-ftps/debian/docs b/debian/lenny/applications/tdeio-ftps/debian/docs

index e845566..6f12db5 100644

--- a/debian/lenny/applications/tdeio-ftps/debian/docs

+++ b/debian/lenny/applications/tdeio-ftps/debian/docs

@@ -1 +1,2 @@

+AUTHORS

 README

debian/lenny/applications/tdeio-ftps/debian/rules

diff --git a/debian/lenny/applications/tdeio-ftps/debian/rules b/debian/lenny/applications/tdeio-ftps/debian/rules

index 14f8d04..30b49e8 100755

--- a/debian/lenny/applications/tdeio-ftps/debian/rules

+++ b/debian/lenny/applications/tdeio-ftps/debian/rules

@@ -1,37 +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

-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man

-DEB_CONFIGURE_PREFIX := /opt/trinity

-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info

+# 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)

-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

-

-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"

debian/squeeze/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk

diff --git a/debian/squeeze/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk

index b4b889c..32ba4ac 100644

--- a/debian/squeeze/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk

+++ b/debian/squeeze/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk

@@ -10,6 +10,7 @@

 # 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 @@

 	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)

@@ -103,6 +105,7 @@

 	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 @@

 			configure configure.files configure.in stamp-h.in \

 			subdirs; \

 	fi

+endif

 	rm -f debian/stamp-cvs-make

 endif

debian/squeeze/applications/tdeio-ftps/debian/cdbs/kde.mk

diff --git a/debian/squeeze/applications/tdeio-ftps/debian/cdbs/kde.mk b/debian/squeeze/applications/tdeio-ftps/debian/cdbs/kde.mk

index 765560c..023886f 100644

--- a/debian/squeeze/applications/tdeio-ftps/debian/cdbs/kde.mk

+++ b/debian/squeeze/applications/tdeio-ftps/debian/cdbs/kde.mk

@@ -35,7 +35,9 @@

 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 @@

 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/%:

debian/squeeze/applications/tdeio-ftps/debian/control

diff --git a/debian/squeeze/applications/tdeio-ftps/debian/control b/debian/squeeze/applications/tdeio-ftps/debian/control

index 4a68281..ded3d50 100644

--- a/debian/squeeze/applications/tdeio-ftps/debian/control

+++ b/debian/squeeze/applications/tdeio-ftps/debian/control

@@ -2,7 +2,7 @@

 Section: tde

 Priority: optional

 Maintainer: Timothy Pearson <kb9vqf@...>

-Build-Depends: debhelper (>= 7.0.50~), cdbs, autotools-dev, automake, libtool, tdelibs14-trinity-dev

+Build-Depends: debhelper (>= 7.0.50~), cdbs, cmake, tdelibs14-trinity-dev

 Standards-Version: 3.8.3

 Package: tdeio-ftps-trinity

debian/squeeze/applications/tdeio-ftps/debian/docs

diff --git a/debian/squeeze/applications/tdeio-ftps/debian/docs b/debian/squeeze/applications/tdeio-ftps/debian/docs

index e845566..6f12db5 100644

--- a/debian/squeeze/applications/tdeio-ftps/debian/docs

+++ b/debian/squeeze/applications/tdeio-ftps/debian/docs

@@ -1 +1,2 @@

+AUTHORS

 README

debian/squeeze/applications/tdeio-ftps/debian/rules

diff --git a/debian/squeeze/applications/tdeio-ftps/debian/rules b/debian/squeeze/applications/tdeio-ftps/debian/rules

index 14f8d04..4c83c4c 100755

--- a/debian/squeeze/applications/tdeio-ftps/debian/rules

+++ b/debian/squeeze/applications/tdeio-ftps/debian/rules

@@ -1,37 +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

-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man

-DEB_CONFIGURE_PREFIX := /opt/trinity

-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info

+# 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)

-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)" ""

** Diff limit reached (max: 250 lines) **