From b1f54dfce7f74f47020f77cfb5ad7b56be5bbb87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 12 Apr 2019 12:58:24 +0200 Subject: [PATCH] DEB kasablanca: Switch to cmake. The man page has been moved to the main tree. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 96097b13a4075e119a869bdb08ad0f8588261110) --- .../kasablanca/debian/cdbs/debian-qt-kde.mk | 4 + .../kasablanca/debian/cdbs/kde.mk | 4 +- .../applications/kasablanca/debian/control | 2 +- .../_base/applications/kasablanca/debian/docs | 3 + .../kasablanca/debian/kasablanca.xml | 149 ------------------ .../applications/kasablanca/debian/manpages | 1 - .../applications/kasablanca/debian/rules | 49 ++---- .../debian/source.lintian-overrides | 2 - .../kasablanca/debian/cdbs/debian-qt-kde.mk | 4 + .../kasablanca/debian/cdbs/kde.mk | 4 +- .../applications/kasablanca/debian/control | 2 +- .../lenny/applications/kasablanca/debian/docs | 3 + .../kasablanca/debian/kasablanca.xml | 149 ------------------ .../applications/kasablanca/debian/manpages | 1 - .../applications/kasablanca/debian/rules | 49 ++---- .../debian/source.lintian-overrides | 2 - .../kasablanca/debian/cdbs/debian-qt-kde.mk | 4 + .../kasablanca/debian/cdbs/kde.mk | 4 +- .../applications/kasablanca/debian/control | 2 +- .../_base/applications/kasablanca/debian/docs | 3 + .../kasablanca/debian/kasablanca.xml | 149 ------------------ .../applications/kasablanca/debian/manpages | 1 - .../applications/kasablanca/debian/rules | 49 ++---- .../debian/source.lintian-overrides | 2 - 24 files changed, 69 insertions(+), 573 deletions(-) delete mode 100644 debian/_base/applications/kasablanca/debian/kasablanca.xml delete mode 100644 debian/_base/applications/kasablanca/debian/manpages delete mode 100644 debian/_base/applications/kasablanca/debian/source.lintian-overrides delete mode 100644 debian/lenny/applications/kasablanca/debian/kasablanca.xml delete mode 100644 debian/lenny/applications/kasablanca/debian/manpages delete mode 100644 debian/lenny/applications/kasablanca/debian/source.lintian-overrides delete mode 100644 ubuntu/_base/applications/kasablanca/debian/kasablanca.xml delete mode 100644 ubuntu/_base/applications/kasablanca/debian/manpages delete mode 100644 ubuntu/_base/applications/kasablanca/debian/source.lintian-overrides diff --git a/debian/_base/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kasablanca/debian/cdbs/debian-qt-kde.mk index 9f8f97776..60310a01a 100644 --- a/debian/_base/applications/kasablanca/debian/cdbs/debian-qt-kde.mk +++ b/debian/_base/applications/kasablanca/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/debian/_base/applications/kasablanca/debian/cdbs/kde.mk b/debian/_base/applications/kasablanca/debian/cdbs/kde.mk index 1ac26c4b7..80176d63e 100644 --- a/debian/_base/applications/kasablanca/debian/cdbs/kde.mk +++ b/debian/_base/applications/kasablanca/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/_base/applications/kasablanca/debian/control b/debian/_base/applications/kasablanca/debian/control index 2ae39fb54..0b67cb4fd 100644 --- a/debian/_base/applications/kasablanca/debian/control +++ b/debian/_base/applications/kasablanca/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Debian TDE Extras Team Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libssl-dev Standards-Version: 3.8.3 Package: kasablanca-trinity diff --git a/debian/_base/applications/kasablanca/debian/docs b/debian/_base/applications/kasablanca/debian/docs index 1333ed77b..c17f03764 100644 --- a/debian/_base/applications/kasablanca/debian/docs +++ b/debian/_base/applications/kasablanca/debian/docs @@ -1 +1,4 @@ +AUTHORS +NEWS +README TODO diff --git a/debian/_base/applications/kasablanca/debian/kasablanca.xml b/debian/_base/applications/kasablanca/debian/kasablanca.xml deleted file mode 100644 index 5f142fd2b..000000000 --- a/debian/_base/applications/kasablanca/debian/kasablanca.xml +++ /dev/null @@ -1,149 +0,0 @@ - -Fathi"> - Boudra"> - mars 22, 2006"> - 1"> - fboudra@free.fr"> - - kasablanca"> - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2006 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - fast and free ftp client for TDE - - - - &dhpackage; - - - - - - - DESCRIPTION - - &dhpackage; is an ftp client, written in c++, using the tde libraries. - - Features: - - * ftps encryption via AUTH TLS - * fxp (direct server to server transfer), supporting alternative mode - * advanced bookmarking system - * fast responsive multithreaded engine - * concurrent connections to multiple hosts - * interactive transfer queue, movable by drag and drop - * small nifty features, like a skiplist - - - - - - OPTIONS - - All TDE and Qt programs accept some common command-line options. - &dhpackage; has no application-specific options. - - - - - - - - Show help about options - - - - - - - - Show Qt specific options - - - - - - - - Show TDE specific options - - - - - - - - Show all options - - - - - - - - Show author information - - - - - - - - Show version information - - - - - - - - Show license information - - - - - - AUTHOR - - This manual page was written by &dhusername; <&dhemail;> for - the &debian; system (but may be used by others). 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. - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - - - diff --git a/debian/_base/applications/kasablanca/debian/manpages b/debian/_base/applications/kasablanca/debian/manpages deleted file mode 100644 index 8ae2d25f3..000000000 --- a/debian/_base/applications/kasablanca/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -kasablanca.1 diff --git a/debian/_base/applications/kasablanca/debian/rules b/debian/_base/applications/kasablanca/debian/rules index da587ae58..e5c16cf8a 100755 --- a/debian/_base/applications/kasablanca/debian/rules +++ b/debian/_base/applications/kasablanca/debian/rules @@ -1,45 +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 - -build/kasablanca-trinity:: - /usr/bin/docbook2x-man debian/kasablanca.xml - -binary-install/kasablanca-trinity:: - mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ - -clean:: - dh_testdir - rm -f kasablanca.1 - rm -f debian/stamp-bootstrap +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc" \ + -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/_base/applications/kasablanca/debian/source.lintian-overrides b/debian/_base/applications/kasablanca/debian/source.lintian-overrides deleted file mode 100644 index 7349addb4..000000000 --- a/debian/_base/applications/kasablanca/debian/source.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# Upstream distributes it like this ATM but cleans it in next release -kasablanca-trinity source: source-contains-CVS-dir admin/CVS diff --git a/debian/lenny/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kasablanca/debian/cdbs/debian-qt-kde.mk index 9f8f97776..60310a01a 100644 --- a/debian/lenny/applications/kasablanca/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kasablanca/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/debian/lenny/applications/kasablanca/debian/cdbs/kde.mk b/debian/lenny/applications/kasablanca/debian/cdbs/kde.mk index 1ac26c4b7..80176d63e 100644 --- a/debian/lenny/applications/kasablanca/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kasablanca/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/kasablanca/debian/control b/debian/lenny/applications/kasablanca/debian/control index 2ae39fb54..0b67cb4fd 100644 --- a/debian/lenny/applications/kasablanca/debian/control +++ b/debian/lenny/applications/kasablanca/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Debian TDE Extras Team Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libssl-dev Standards-Version: 3.8.3 Package: kasablanca-trinity diff --git a/debian/lenny/applications/kasablanca/debian/docs b/debian/lenny/applications/kasablanca/debian/docs index 1333ed77b..c17f03764 100644 --- a/debian/lenny/applications/kasablanca/debian/docs +++ b/debian/lenny/applications/kasablanca/debian/docs @@ -1 +1,4 @@ +AUTHORS +NEWS +README TODO diff --git a/debian/lenny/applications/kasablanca/debian/kasablanca.xml b/debian/lenny/applications/kasablanca/debian/kasablanca.xml deleted file mode 100644 index 5f142fd2b..000000000 --- a/debian/lenny/applications/kasablanca/debian/kasablanca.xml +++ /dev/null @@ -1,149 +0,0 @@ - -Fathi"> - Boudra"> - mars 22, 2006"> - 1"> - fboudra@free.fr"> - - kasablanca"> - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2006 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - fast and free ftp client for TDE - - - - &dhpackage; - - - - - - - DESCRIPTION - - &dhpackage; is an ftp client, written in c++, using the tde libraries. - - Features: - - * ftps encryption via AUTH TLS - * fxp (direct server to server transfer), supporting alternative mode - * advanced bookmarking system - * fast responsive multithreaded engine - * concurrent connections to multiple hosts - * interactive transfer queue, movable by drag and drop - * small nifty features, like a skiplist - - - - - - OPTIONS - - All TDE and Qt programs accept some common command-line options. - &dhpackage; has no application-specific options. - - - - - - - - Show help about options - - - - - - - - Show Qt specific options - - - - - - - - Show TDE specific options - - - - - - - - Show all options - - - - - - - - Show author information - - - - - - - - Show version information - - - - - - - - Show license information - - - - - - AUTHOR - - This manual page was written by &dhusername; <&dhemail;> for - the &debian; system (but may be used by others). 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. - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - - - diff --git a/debian/lenny/applications/kasablanca/debian/manpages b/debian/lenny/applications/kasablanca/debian/manpages deleted file mode 100644 index 8ae2d25f3..000000000 --- a/debian/lenny/applications/kasablanca/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -kasablanca.1 diff --git a/debian/lenny/applications/kasablanca/debian/rules b/debian/lenny/applications/kasablanca/debian/rules index db4c7b6c0..4a317e325 100755 --- a/debian/lenny/applications/kasablanca/debian/rules +++ b/debian/lenny/applications/kasablanca/debian/rules @@ -1,45 +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 - -build/kasablanca-trinity:: - /usr/bin/docbook2x-man debian/kasablanca.xml - -binary-install/kasablanca-trinity:: - mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ - -clean:: - dh_testdir - rm -f kasablanca.1 - rm -f debian/stamp-bootstrap +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc" \ + -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/kasablanca/debian/source.lintian-overrides b/debian/lenny/applications/kasablanca/debian/source.lintian-overrides deleted file mode 100644 index 7349addb4..000000000 --- a/debian/lenny/applications/kasablanca/debian/source.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# Upstream distributes it like this ATM but cleans it in next release -kasablanca-trinity source: source-contains-CVS-dir admin/CVS diff --git a/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-qt-kde.mk index 9f8f97776..60310a01a 100644 --- a/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/_base/applications/kasablanca/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/_base/applications/kasablanca/debian/cdbs/kde.mk b/ubuntu/_base/applications/kasablanca/debian/cdbs/kde.mk index 1ac26c4b7..80176d63e 100644 --- a/ubuntu/_base/applications/kasablanca/debian/cdbs/kde.mk +++ b/ubuntu/_base/applications/kasablanca/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/_base/applications/kasablanca/debian/control b/ubuntu/_base/applications/kasablanca/debian/control index 2ae39fb54..0b67cb4fd 100644 --- a/ubuntu/_base/applications/kasablanca/debian/control +++ b/ubuntu/_base/applications/kasablanca/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Debian TDE Extras Team Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libssl-dev Standards-Version: 3.8.3 Package: kasablanca-trinity diff --git a/ubuntu/_base/applications/kasablanca/debian/docs b/ubuntu/_base/applications/kasablanca/debian/docs index 1333ed77b..c17f03764 100644 --- a/ubuntu/_base/applications/kasablanca/debian/docs +++ b/ubuntu/_base/applications/kasablanca/debian/docs @@ -1 +1,4 @@ +AUTHORS +NEWS +README TODO diff --git a/ubuntu/_base/applications/kasablanca/debian/kasablanca.xml b/ubuntu/_base/applications/kasablanca/debian/kasablanca.xml deleted file mode 100644 index 5f142fd2b..000000000 --- a/ubuntu/_base/applications/kasablanca/debian/kasablanca.xml +++ /dev/null @@ -1,149 +0,0 @@ - -Fathi"> - Boudra"> - mars 22, 2006"> - 1"> - fboudra@free.fr"> - - kasablanca"> - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2006 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - fast and free ftp client for TDE - - - - &dhpackage; - - - - - - - DESCRIPTION - - &dhpackage; is an ftp client, written in c++, using the tde libraries. - - Features: - - * ftps encryption via AUTH TLS - * fxp (direct server to server transfer), supporting alternative mode - * advanced bookmarking system - * fast responsive multithreaded engine - * concurrent connections to multiple hosts - * interactive transfer queue, movable by drag and drop - * small nifty features, like a skiplist - - - - - - OPTIONS - - All TDE and Qt programs accept some common command-line options. - &dhpackage; has no application-specific options. - - - - - - - - Show help about options - - - - - - - - Show Qt specific options - - - - - - - - Show TDE specific options - - - - - - - - Show all options - - - - - - - - Show author information - - - - - - - - Show version information - - - - - - - - Show license information - - - - - - AUTHOR - - This manual page was written by &dhusername; <&dhemail;> for - the &debian; system (but may be used by others). 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. - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - - - diff --git a/ubuntu/_base/applications/kasablanca/debian/manpages b/ubuntu/_base/applications/kasablanca/debian/manpages deleted file mode 100644 index 8ae2d25f3..000000000 --- a/ubuntu/_base/applications/kasablanca/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -kasablanca.1 diff --git a/ubuntu/_base/applications/kasablanca/debian/rules b/ubuntu/_base/applications/kasablanca/debian/rules index da587ae58..e5c16cf8a 100755 --- a/ubuntu/_base/applications/kasablanca/debian/rules +++ b/ubuntu/_base/applications/kasablanca/debian/rules @@ -1,45 +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 - -build/kasablanca-trinity:: - /usr/bin/docbook2x-man debian/kasablanca.xml - -binary-install/kasablanca-trinity:: - mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ - -clean:: - dh_testdir - rm -f kasablanca.1 - rm -f debian/stamp-bootstrap +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc" \ + -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/_base/applications/kasablanca/debian/source.lintian-overrides b/ubuntu/_base/applications/kasablanca/debian/source.lintian-overrides deleted file mode 100644 index 7349addb4..000000000 --- a/ubuntu/_base/applications/kasablanca/debian/source.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# Upstream distributes it like this ATM but cleans it in next release -kasablanca-trinity source: source-contains-CVS-dir admin/CVS