summaryrefslogtreecommitdiffstats
path: root/debian/lenny/tdeartwork/debian
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-11-17 02:33:32 +0100
committerSlávek Banko <slavek.banko@axis.cz>2012-11-17 02:33:32 +0100
commit7c5d232eb26d4a925503f551a46965de870eefe7 (patch)
tree7c374e156bc228cc6d9c191ea48a294c7732b805 /debian/lenny/tdeartwork/debian
parente747ba9c24732028ce543f6885900dbe513a4ffd (diff)
downloadtde-packaging-7c5d232eb26d4a925503f551a46965de870eefe7.tar.gz
tde-packaging-7c5d232eb26d4a925503f551a46965de870eefe7.zip
Fix tdeartwork build issues on Debian and Ubuntu
Cdbs files modified to support both automake and cmake Include files moved to default location Removed now unnecessary patches
Diffstat (limited to 'debian/lenny/tdeartwork/debian')
-rw-r--r--debian/lenny/tdeartwork/debian/cdbs/debian-qt-kde.mk8
-rw-r--r--debian/lenny/tdeartwork/debian/cdbs/kde.mk4
-rw-r--r--debian/lenny/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff11
-rwxr-xr-xdebian/lenny/tdeartwork/debian/rules2
4 files changed, 10 insertions, 15 deletions
diff --git a/debian/lenny/tdeartwork/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdeartwork/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..497be9751 100644
--- a/debian/lenny/tdeartwork/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/tdeartwork/debian/cdbs/debian-qt-kde.mk
@@ -10,9 +10,11 @@ _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
cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
touch debian/stamp-cvs-make
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@@ -75,11 +77,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
if test -e debian/$(cdbs_curpkg).lintian; then \
install -p -D -m644 debian/$(cdbs_curpkg).lintian \
- debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
fi
if test -e debian/$(cdbs_curpkg).presubj; then \
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
- debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
@@ -96,6 +98,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 | \
@@ -104,6 +107,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/tdeartwork/debian/cdbs/kde.mk b/debian/lenny/tdeartwork/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/debian/lenny/tdeartwork/debian/cdbs/kde.mk
+++ b/debian/lenny/tdeartwork/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/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff b/debian/lenny/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
deleted file mode 100644
index f93aa0706..000000000
--- a/debian/lenny/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am
---- a/kscreensaver/krootbacking/Makefile.am
-+++ b/kscreensaver/krootbacking/Makefile.am
-@@ -1,6 +1,6 @@
- INCLUDES = $(all_includes)
-
--hackdir = /usr/local/bin/
-+hackdir = /opt/trinity/bin/
- hack_DATA = xscreensaver-getimage xscreensaver-getimage-file
-
- install-data-hook:
diff --git a/debian/lenny/tdeartwork/debian/rules b/debian/lenny/tdeartwork/debian/rules
index 82a71627a..be9adbbcd 100755
--- a/debian/lenny/tdeartwork/debian/rules
+++ b/debian/lenny/tdeartwork/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+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