summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/lenny/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk6
-rw-r--r--debian/lenny/applications/tdeio-umountwrapper/debian/cdbs/kde.mk4
-rw-r--r--debian/lenny/applications/tdeio-umountwrapper/debian/control2
-rw-r--r--debian/lenny/applications/tdeio-umountwrapper/debian/docs2
-rw-r--r--debian/lenny/applications/tdeio-umountwrapper/debian/install3
-rwxr-xr-xdebian/lenny/applications/tdeio-umountwrapper/debian/rules58
-rw-r--r--debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk6
-rw-r--r--debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/kde.mk4
-rw-r--r--debian/squeeze/applications/tdeio-umountwrapper/debian/control2
-rw-r--r--debian/squeeze/applications/tdeio-umountwrapper/debian/docs2
-rw-r--r--debian/squeeze/applications/tdeio-umountwrapper/debian/install3
-rwxr-xr-xdebian/squeeze/applications/tdeio-umountwrapper/debian/rules58
-rw-r--r--ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk6
-rw-r--r--ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/kde.mk4
-rw-r--r--ubuntu/maverick/applications/tdeio-umountwrapper/debian/control2
-rw-r--r--ubuntu/maverick/applications/tdeio-umountwrapper/debian/docs2
-rw-r--r--ubuntu/maverick/applications/tdeio-umountwrapper/debian/install3
-rwxr-xr-xubuntu/maverick/applications/tdeio-umountwrapper/debian/rules58
18 files changed, 78 insertions, 147 deletions
diff --git a/debian/lenny/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
index 9920696ce..32ba4acfb 100644
--- a/debian/lenny/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/tdeio-umountwrapper/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/tdeio-umountwrapper/debian/cdbs/kde.mk b/debian/lenny/applications/tdeio-umountwrapper/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/debian/lenny/applications/tdeio-umountwrapper/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/tdeio-umountwrapper/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/tdeio-umountwrapper/debian/control b/debian/lenny/applications/tdeio-umountwrapper/debian/control
index edd8a196f..9ce811b65 100644
--- a/debian/lenny/applications/tdeio-umountwrapper/debian/control
+++ b/debian/lenny/applications/tdeio-umountwrapper/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-umountwrapper-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tdeio-umountwrapper-trinity
diff --git a/debian/lenny/applications/tdeio-umountwrapper/debian/docs b/debian/lenny/applications/tdeio-umountwrapper/debian/docs
new file mode 100644
index 000000000..6f12db508
--- /dev/null
+++ b/debian/lenny/applications/tdeio-umountwrapper/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/debian/lenny/applications/tdeio-umountwrapper/debian/install b/debian/lenny/applications/tdeio-umountwrapper/debian/install
new file mode 100644
index 000000000..e9c5b29fb
--- /dev/null
+++ b/debian/lenny/applications/tdeio-umountwrapper/debian/install
@@ -0,0 +1,3 @@
+debian/media_safelyremove.desktop /opt/trinity/share/apps/konqueror/servicemenus
+debian/media_safelyremove.desktop /opt/trinity/share/apps/dolphin/servicemenus
+debian/media_safelyremove.desktop /opt/trinity/share/apps/d3lphin/servicemenus
diff --git a/debian/lenny/applications/tdeio-umountwrapper/debian/rules b/debian/lenny/applications/tdeio-umountwrapper/debian/rules
index 363059df0..d8d772064 100755
--- a/debian/lenny/applications/tdeio-umountwrapper/debian/rules
+++ b/debian/lenny/applications/tdeio-umountwrapper/debian/rules
@@ -1,54 +1,20 @@
#!/usr/bin/make -f
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/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)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
+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:
-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 debian/stamp-bootstrap
-
-common-post-build-arch::
- XGETTEXT=/usr/bin/kde-xgettext sh admin/cvs.sh extract-messages
-
-install/tdeio-umountwrapper-trinity::
- mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/konqueror/servicemenus/
- cp $(CURDIR)/debian/media_safelyremove.desktop \
- $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/konqueror/servicemenus/
-
- mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/dolphin/servicemenus/
- cp $(CURDIR)/debian/media_safelyremove.desktop \
- $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/dolphin/servicemenus/
-
- mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/d3lphin/servicemenus/
- cp $(CURDIR)/debian/media_safelyremove.desktop \
- $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/d3lphin/servicemenus/
-clean::
- rm -rf $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/
- rm -f po/*.pot
-
+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/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
index 9920696ce..32ba4acfb 100644
--- a/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tdeio-umountwrapper/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/tdeio-umountwrapper/debian/cdbs/kde.mk b/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/tdeio-umountwrapper/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/tdeio-umountwrapper/debian/control b/debian/squeeze/applications/tdeio-umountwrapper/debian/control
index edd8a196f..9ce811b65 100644
--- a/debian/squeeze/applications/tdeio-umountwrapper/debian/control
+++ b/debian/squeeze/applications/tdeio-umountwrapper/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-umountwrapper-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tdeio-umountwrapper-trinity
diff --git a/debian/squeeze/applications/tdeio-umountwrapper/debian/docs b/debian/squeeze/applications/tdeio-umountwrapper/debian/docs
new file mode 100644
index 000000000..6f12db508
--- /dev/null
+++ b/debian/squeeze/applications/tdeio-umountwrapper/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/debian/squeeze/applications/tdeio-umountwrapper/debian/install b/debian/squeeze/applications/tdeio-umountwrapper/debian/install
new file mode 100644
index 000000000..e9c5b29fb
--- /dev/null
+++ b/debian/squeeze/applications/tdeio-umountwrapper/debian/install
@@ -0,0 +1,3 @@
+debian/media_safelyremove.desktop /opt/trinity/share/apps/konqueror/servicemenus
+debian/media_safelyremove.desktop /opt/trinity/share/apps/dolphin/servicemenus
+debian/media_safelyremove.desktop /opt/trinity/share/apps/d3lphin/servicemenus
diff --git a/debian/squeeze/applications/tdeio-umountwrapper/debian/rules b/debian/squeeze/applications/tdeio-umountwrapper/debian/rules
index 025e100b3..18b1c07e2 100755
--- a/debian/squeeze/applications/tdeio-umountwrapper/debian/rules
+++ b/debian/squeeze/applications/tdeio-umountwrapper/debian/rules
@@ -1,54 +1,20 @@
#!/usr/bin/make -f
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/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)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
+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:
-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 debian/stamp-bootstrap
-
-common-post-build-arch::
- XGETTEXT=/usr/bin/kde-xgettext sh admin/cvs.sh extract-messages
-
-install/tdeio-umountwrapper-trinity::
- mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/konqueror/servicemenus/
- cp $(CURDIR)/debian/media_safelyremove.desktop \
- $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/konqueror/servicemenus/
-
- mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/dolphin/servicemenus/
- cp $(CURDIR)/debian/media_safelyremove.desktop \
- $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/dolphin/servicemenus/
-
- mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/d3lphin/servicemenus/
- cp $(CURDIR)/debian/media_safelyremove.desktop \
- $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/d3lphin/servicemenus/
-clean::
- rm -rf $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/
- rm -f po/*.pot
-
+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/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
index 9920696ce..32ba4acfb 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdeio-umountwrapper/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/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdeio-umountwrapper/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/tdeio-umountwrapper/debian/control b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/control
index 9f237fbcc..ed8a42aae 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/control
+++ b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-umountwrapper-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tdeio-umountwrapper-trinity
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/docs b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/docs
new file mode 100644
index 000000000..6f12db508
--- /dev/null
+++ b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/install b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/install
new file mode 100644
index 000000000..e9c5b29fb
--- /dev/null
+++ b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/install
@@ -0,0 +1,3 @@
+debian/media_safelyremove.desktop /opt/trinity/share/apps/konqueror/servicemenus
+debian/media_safelyremove.desktop /opt/trinity/share/apps/dolphin/servicemenus
+debian/media_safelyremove.desktop /opt/trinity/share/apps/d3lphin/servicemenus
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/rules b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/rules
index 025e100b3..18b1c07e2 100755
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/rules
+++ b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/rules
@@ -1,54 +1,20 @@
#!/usr/bin/make -f
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/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)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
+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:
-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 debian/stamp-bootstrap
-
-common-post-build-arch::
- XGETTEXT=/usr/bin/kde-xgettext sh admin/cvs.sh extract-messages
-
-install/tdeio-umountwrapper-trinity::
- mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/konqueror/servicemenus/
- cp $(CURDIR)/debian/media_safelyremove.desktop \
- $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/konqueror/servicemenus/
-
- mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/dolphin/servicemenus/
- cp $(CURDIR)/debian/media_safelyremove.desktop \
- $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/dolphin/servicemenus/
-
- mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/d3lphin/servicemenus/
- cp $(CURDIR)/debian/media_safelyremove.desktop \
- $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/d3lphin/servicemenus/
-clean::
- rm -rf $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/
- rm -f po/*.pot
-
+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"