DEB kpilot: Switch to cmake.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/14/head
Slávek Banko 6 years ago
parent 611c4063a9
commit 67af8bb6b9
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1
# Note: This _must_ be included before autotools.mk, or it won't work. # Note: This _must_ be included before autotools.mk, or it won't work.
common-configure-arch common-configure-indep:: debian/stamp-cvs-make common-configure-arch common-configure-indep:: debian/stamp-cvs-make
debian/stamp-cvs-make: debian/stamp-cvs-make:
ifndef _cdbs_class_cmake
cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
cp -Rp /usr/share/libtool/config/ltmain.sh admin/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 cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
endif endif
$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
endif
touch debian/stamp-cvs-make touch debian/stamp-cvs-make
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@ -102,6 +104,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
done done
clean:: clean::
ifndef _cdbs_class_cmake
if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
cd $(DEB_SRCDIR); \ cd $(DEB_SRCDIR); \
find . -name Makefile.in -print | \ find . -name Makefile.in -print | \
@ -110,6 +113,7 @@ clean::
configure configure.files configure.in stamp-h.in \ configure configure.files configure.in stamp-h.in \
subdirs; \ subdirs; \
fi fi
endif
rm -f debian/stamp-cvs-make rm -f debian/stamp-cvs-make
endif endif

@ -35,7 +35,9 @@ else
DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
endif endif
ifndef _cdbs_class_cmake
include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
endif
export kde_cgidir = \$${libdir}/cgi-bin export kde_cgidir = \$${libdir}/cgi-bin
export kde_confdir = \$${sysconfdir}/trinity 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) 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_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 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

@ -2,10 +2,8 @@ Source: kpilot-trinity
Section: tde Section: tde
Priority: optional Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), tdelibs14-trinity-dev, tdepim-trinity-dev, Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake,
libpisock-dev, bison, byacc, bzip2, flex, libfl-dev | flex (<< 2.5.39), groff-base, tdelibs14-trinity-dev, tdepim-trinity-dev, libpisock-dev
libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~),
automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Package: kpilot-trinity Package: kpilot-trinity

@ -1,33 +1,20 @@
#!/usr/bin/make -f #!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk 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/tde include debian/cdbs/debian-qt-kde.mk
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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
post-patches:: debian/stamp-bootstrap DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \
debian/stamp-bootstrap: -DCONFIG_INSTALL_DIR="/etc/trinity" \
ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" -DSYSCONF_INSTALL_DIR="/etc/trinity" \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
endif -DCMAKE_BUILD_TYPE=RelWithDebInfo \
ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" -DCMAKE_VERBOSE_MAKEFILE="ON" \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -DCMAKE_SKIP_RPATH="OFF" \
endif -DBUILD_ALL="ON" \
ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" -DWITH_ALL_OPTIONS="ON"
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 debian/stamp-bootstrap

@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1
# Note: This _must_ be included before autotools.mk, or it won't work. # Note: This _must_ be included before autotools.mk, or it won't work.
common-configure-arch common-configure-indep:: debian/stamp-cvs-make common-configure-arch common-configure-indep:: debian/stamp-cvs-make
debian/stamp-cvs-make: debian/stamp-cvs-make:
ifndef _cdbs_class_cmake
cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
cp -Rp /usr/share/libtool/config/ltmain.sh admin/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 cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
endif endif
$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
endif
touch debian/stamp-cvs-make touch debian/stamp-cvs-make
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@ -102,6 +104,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
done done
clean:: clean::
ifndef _cdbs_class_cmake
if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
cd $(DEB_SRCDIR); \ cd $(DEB_SRCDIR); \
find . -name Makefile.in -print | \ find . -name Makefile.in -print | \
@ -110,6 +113,7 @@ clean::
configure configure.files configure.in stamp-h.in \ configure configure.files configure.in stamp-h.in \
subdirs; \ subdirs; \
fi fi
endif
rm -f debian/stamp-cvs-make rm -f debian/stamp-cvs-make
endif endif

@ -35,7 +35,9 @@ else
DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
endif endif
ifndef _cdbs_class_cmake
include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
endif
export kde_cgidir = \$${libdir}/cgi-bin export kde_cgidir = \$${libdir}/cgi-bin
export kde_confdir = \$${sysconfdir}/trinity 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) 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_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 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

@ -2,10 +2,8 @@ Source: kpilot-trinity
Section: tde Section: tde
Priority: optional Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), tdelibs14-trinity-dev, tdepim-trinity-dev, Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake,
libpisock-dev, bison, byacc, bzip2, flex, libfl-dev | flex (<< 2.5.39), groff-base, tdelibs14-trinity-dev, tdepim-trinity-dev, libpisock-dev
libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~),
automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Package: kpilot-trinity Package: kpilot-trinity

@ -1,33 +1,20 @@
#!/usr/bin/make -f #!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk 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/tde include debian/cdbs/debian-qt-kde.mk
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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
post-patches:: debian/stamp-bootstrap DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \
debian/stamp-bootstrap: -DCONFIG_INSTALL_DIR="/etc/trinity" \
ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" -DSYSCONF_INSTALL_DIR="/etc/trinity" \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
endif -DCMAKE_BUILD_TYPE=RelWithDebInfo \
ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" -DCMAKE_VERBOSE_MAKEFILE="ON" \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -DCMAKE_SKIP_RPATH="OFF" \
endif -DBUILD_ALL="ON" \
ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" -DWITH_ALL_OPTIONS="ON"
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 debian/stamp-bootstrap

@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1
# Note: This _must_ be included before autotools.mk, or it won't work. # Note: This _must_ be included before autotools.mk, or it won't work.
common-configure-arch common-configure-indep:: debian/stamp-cvs-make common-configure-arch common-configure-indep:: debian/stamp-cvs-make
debian/stamp-cvs-make: debian/stamp-cvs-make:
ifndef _cdbs_class_cmake
cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
cp -Rp /usr/share/libtool/config/ltmain.sh admin/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 cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
endif endif
$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
endif
touch debian/stamp-cvs-make touch debian/stamp-cvs-make
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@ -102,6 +104,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
done done
clean:: clean::
ifndef _cdbs_class_cmake
if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
cd $(DEB_SRCDIR); \ cd $(DEB_SRCDIR); \
find . -name Makefile.in -print | \ find . -name Makefile.in -print | \
@ -110,6 +113,7 @@ clean::
configure configure.files configure.in stamp-h.in \ configure configure.files configure.in stamp-h.in \
subdirs; \ subdirs; \
fi fi
endif
rm -f debian/stamp-cvs-make rm -f debian/stamp-cvs-make
endif endif

@ -35,7 +35,9 @@ else
DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
endif endif
ifndef _cdbs_class_cmake
include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
endif
export kde_cgidir = \$${libdir}/cgi-bin export kde_cgidir = \$${libdir}/cgi-bin
export kde_confdir = \$${sysconfdir}/trinity 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) 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_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 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

@ -2,10 +2,8 @@ Source: kpilot-trinity
Section: tde Section: tde
Priority: optional Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), tdelibs14-trinity-dev, tdepim-trinity-dev, Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake,
libpisock-dev, bison, byacc, bzip2, flex, libfl-dev | flex (<< 2.5.39), groff-base, tdelibs14-trinity-dev, tdepim-trinity-dev, libpisock-dev
libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~),
automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Package: kpilot-trinity Package: kpilot-trinity

@ -1,33 +1,20 @@
#!/usr/bin/make -f #!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk 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/tde include debian/cdbs/debian-qt-kde.mk
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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
post-patches:: debian/stamp-bootstrap DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \
debian/stamp-bootstrap: -DCONFIG_INSTALL_DIR="/etc/trinity" \
ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" -DSYSCONF_INSTALL_DIR="/etc/trinity" \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
endif -DCMAKE_BUILD_TYPE=RelWithDebInfo \
ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" -DCMAKE_VERBOSE_MAKEFILE="ON" \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -DCMAKE_SKIP_RPATH="OFF" \
endif -DBUILD_ALL="ON" \
ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" -DWITH_ALL_OPTIONS="ON"
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 debian/stamp-bootstrap

Loading…
Cancel
Save