summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-03-03 10:57:11 +0100
committerSlávek Banko <slavek.banko@axis.cz>2019-03-03 10:58:04 +0100
commit6804945f8a947bd35d7c7346844bd8a20481fc5a (patch)
tree081cb816be5f7c8085262dcbaa46c346936547f1 /ubuntu
parentcb3a777f3ef0a6d7ebadffb8ab9c18f416fdd4f7 (diff)
downloadtde-packaging-6804945f8a947bd35d7c7346844bd8a20481fc5a.tar.gz
tde-packaging-6804945f8a947bd35d7c7346844bd8a20481fc5a.zip
DEB mplayerthumbs: Switch to cmake.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 75c851fb864c4eacac9b6f27b77186a5d7f4f48b)
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/kde.mk4
-rw-r--r--ubuntu/maverick/applications/mplayerthumbs/debian/control2
-rw-r--r--ubuntu/maverick/applications/mplayerthumbs/debian/docs1
-rwxr-xr-xubuntu/maverick/applications/mplayerthumbs/debian/rules45
5 files changed, 23 insertions, 33 deletions
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..60310a01a 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/mplayerthumbs/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/mplayerthumbs/debian/cdbs/kde.mk b/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/kde.mk
index 1ac26c4b7..80176d63e 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/mplayerthumbs/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/mplayerthumbs/debian/control b/ubuntu/maverick/applications/mplayerthumbs/debian/control
index 3e105aa52..e737eace5 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/control
+++ b/ubuntu/maverick/applications/mplayerthumbs/debian/control
@@ -2,7 +2,7 @@ Source: mplayerthumbs-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), automake, libtool, autotools-dev, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev
Standards-Version: 3.8.2
Package: mplayerthumbs-trinity
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/docs b/ubuntu/maverick/applications/mplayerthumbs/debian/docs
index 5502ed8f4..c17f03764 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/docs
+++ b/ubuntu/maverick/applications/mplayerthumbs/debian/docs
@@ -1,3 +1,4 @@
+AUTHORS
NEWS
README
TODO
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/rules b/ubuntu/maverick/applications/mplayerthumbs/debian/rules
index b76dff481..e5c16cf8a 100755
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/rules
+++ b/ubuntu/maverick/applications/mplayerthumbs/debian/rules
@@ -1,37 +1,20 @@
#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/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
+include /usr/share/cdbs/1/rules/debhelper.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_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" \
+ -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"