diff options
Diffstat (limited to 'debian/squeeze/applications')
5 files changed, 30 insertions, 5 deletions
diff --git a/debian/squeeze/applications/k3b/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/k3b/debian/cdbs/debian-qt-kde.mk index 9920696ce..32ba4acfb 100644 --- a/debian/squeeze/applications/k3b/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/applications/k3b/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/k3b/debian/cdbs/kde.mk b/debian/squeeze/applications/k3b/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/debian/squeeze/applications/k3b/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/k3b/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/k3b/debian/control b/debian/squeeze/applications/k3b/debian/control index 147f05010..d7175902b 100644 --- a/debian/squeeze/applications/k3b/debian/control +++ b/debian/squeeze/applications/k3b/debian/control @@ -4,7 +4,12 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: libdvdread4, libdvdread-dev, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: + debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), cmake, chrpath, + tdelibs14-trinity-dev (>= 3.5.0), libdbus-tqt-1-dev, + libdvdread4, libdvdread-dev, libasound2-dev, lame, libmp3lame-dev, + libflac++-dev (>= 1.1.2), flac, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, + libavformat-dev, libavcodec-dev, libvorbis-dev, libsamplerate0-dev, libsndfile1-dev Standards-Version: 3.8.4 Homepage: http://www.k3b.org diff --git a/debian/squeeze/applications/k3b/debian/libk3b3-trinity.install b/debian/squeeze/applications/k3b/debian/libk3b3-trinity.install index b316f577e..9918b6192 100644 --- a/debian/squeeze/applications/k3b/debian/libk3b3-trinity.install +++ b/debian/squeeze/applications/k3b/debian/libk3b3-trinity.install @@ -9,8 +9,8 @@ debian/tmp/opt/trinity/lib/trinity/libk3bexternalencoder.la debian/tmp/opt/trinity/lib/trinity/libk3bexternalencoder.so debian/tmp/opt/trinity/lib/trinity/libk3bflacdecoder.la debian/tmp/opt/trinity/lib/trinity/libk3bflacdecoder.so - - +debian/tmp/opt/trinity/lib/trinity/libk3blibsndfiledecoder.la +debian/tmp/opt/trinity/lib/trinity/libk3blibsndfiledecoder.so debian/tmp/opt/trinity/lib/trinity/libk3boggvorbisdecoder.la debian/tmp/opt/trinity/lib/trinity/libk3boggvorbisdecoder.so debian/tmp/opt/trinity/lib/trinity/libk3boggvorbisencoder.la diff --git a/debian/squeeze/applications/k3b/debian/rules b/debian/squeeze/applications/k3b/debian/rules index a0571a2de..8dbc7d2d9 100755 --- a/debian/squeeze/applications/k3b/debian/rules +++ b/debian/squeeze/applications/k3b/debian/rules @@ -1,6 +1,7 @@ #!/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 @@ -13,6 +14,17 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" +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" + DEB_INSTALL_MANPAGES_k3b = debian/k3b.1 DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/ @@ -23,6 +35,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: +ifndef _cdbs_class_cmake ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh endif @@ -35,4 +48,5 @@ endif cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs +endif touch debian/stamp-bootstrap |