summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-11-08 03:09:02 +0100
committerSlávek Banko <slavek.banko@axis.cz>2012-11-08 03:50:50 +0100
commitd2a2dd9e1d3fc429ff480c5740d169a3be688d26 (patch)
tree1c8ae49710be9fbdf76db705415f22f42846c034 /ubuntu/maverick
parenta80a4af1d2bd8d3d986597cf1ecc21e806131bec (diff)
downloadtde-packaging-d2a2dd9e1d3fc429ff480c5740d169a3be688d26.tar.gz
tde-packaging-d2a2dd9e1d3fc429ff480c5740d169a3be688d26.zip
Fix tdesdk build issues on Debian and Ubuntu
Cdbs files modified to support both automake and cmake Removed unnecessary file installed into doc Include files moved to default location
Diffstat (limited to 'ubuntu/maverick')
-rw-r--r--ubuntu/maverick/tdesdk/debian/cdbs/debian-qt-kde.mk8
-rw-r--r--ubuntu/maverick/tdesdk/debian/cdbs/kde.mk4
-rw-r--r--ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.install42
-rw-r--r--ubuntu/maverick/tdesdk/debian/kbabel-trinity.install2
-rw-r--r--ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install2
-rw-r--r--ubuntu/maverick/tdesdk/debian/kspy-trinity.install2
-rw-r--r--ubuntu/maverick/tdesdk/debian/kunittest-trinity.install2
-rw-r--r--ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install6
-rwxr-xr-xubuntu/maverick/tdesdk/debian/rules2
-rw-r--r--ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install2
10 files changed, 39 insertions, 33 deletions
diff --git a/ubuntu/maverick/tdesdk/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdesdk/debian/cdbs/debian-qt-kde.mk
index d135c4257..f8b76cb04 100644
--- a/ubuntu/maverick/tdesdk/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdesdk/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/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk b/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdesdk/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/tdesdk/debian/kbabel-trinity-dev.install b/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.install
index ace31ea6a..4c2720936 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.install
+++ b/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.install
@@ -1,24 +1,24 @@
-debian/tmp/opt/trinity/include/tde/kbabel/catalog.h
-debian/tmp/opt/trinity/include/tde/kbabel/catalogfileplugin.h
-debian/tmp/opt/trinity/include/tde/kbabel/catalogitem.h
-debian/tmp/opt/trinity/include/tde/kbabel/catalogsettings.h
-debian/tmp/opt/trinity/include/tde/kbabel/catalogview.h
-debian/tmp/opt/trinity/include/tde/kbabel/dictchooser.h
-debian/tmp/opt/trinity/include/tde/kbabel/dictionarymenu.h
-debian/tmp/opt/trinity/include/tde/kbabel/editcmd.h
-debian/tmp/opt/trinity/include/tde/kbabel/findoptions.h
-debian/tmp/opt/trinity/include/tde/kbabel/itempart.h
-debian/tmp/opt/trinity/include/tde/kbabel/kbabeldatatool.h
-debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictbox.h
-debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictiface.h
-debian/tmp/opt/trinity/include/tde/kbabel/kbproject.h
-debian/tmp/opt/trinity/include/tde/kbabel/kbprojectmanager.h
-debian/tmp/opt/trinity/include/tde/kbabel/msgfmt.h
-debian/tmp/opt/trinity/include/tde/kbabel/poinfo.h
-debian/tmp/opt/trinity/include/tde/kbabel/projectsettings.h
-debian/tmp/opt/trinity/include/tde/kbabel/regexpextractor.h
-debian/tmp/opt/trinity/include/tde/kbabel/searchengine.h
-debian/tmp/opt/trinity/include/tde/kbabel/tagextractor.h
+debian/tmp/opt/trinity/include/kbabel/catalog.h
+debian/tmp/opt/trinity/include/kbabel/catalogfileplugin.h
+debian/tmp/opt/trinity/include/kbabel/catalogitem.h
+debian/tmp/opt/trinity/include/kbabel/catalogsettings.h
+debian/tmp/opt/trinity/include/kbabel/catalogview.h
+debian/tmp/opt/trinity/include/kbabel/dictchooser.h
+debian/tmp/opt/trinity/include/kbabel/dictionarymenu.h
+debian/tmp/opt/trinity/include/kbabel/editcmd.h
+debian/tmp/opt/trinity/include/kbabel/findoptions.h
+debian/tmp/opt/trinity/include/kbabel/itempart.h
+debian/tmp/opt/trinity/include/kbabel/kbabeldatatool.h
+debian/tmp/opt/trinity/include/kbabel/kbabeldictbox.h
+debian/tmp/opt/trinity/include/kbabel/kbabeldictiface.h
+debian/tmp/opt/trinity/include/kbabel/kbproject.h
+debian/tmp/opt/trinity/include/kbabel/kbprojectmanager.h
+debian/tmp/opt/trinity/include/kbabel/msgfmt.h
+debian/tmp/opt/trinity/include/kbabel/poinfo.h
+debian/tmp/opt/trinity/include/kbabel/projectsettings.h
+debian/tmp/opt/trinity/include/kbabel/regexpextractor.h
+debian/tmp/opt/trinity/include/kbabel/searchengine.h
+debian/tmp/opt/trinity/include/kbabel/tagextractor.h
debian/tmp/opt/trinity/lib/libkbabelcommon.la
debian/tmp/opt/trinity/lib/libkbabelcommon.so
debian/tmp/opt/trinity/lib/libkbabeldictplugin.la
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.install b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.install
index 4bafa51f0..bfe62dc3a 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.install
@@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/TODO
+#debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/TODO
debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/catalogmanager.png
debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kbabel.png
debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kbabeldict.png
diff --git a/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install b/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install
index 35b5af1a5..a163246b9 100644
--- a/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/demangle
debian/tmp/opt/trinity/bin/kminspector
debian/tmp/opt/trinity/bin/kmmatch
debian/tmp/opt/trinity/bin/kmtrace
-debian/tmp/opt/trinity/include/tde/ktrace.h
+debian/tmp/opt/trinity/include/ktrace.h
debian/tmp/opt/trinity/lib/kmtrace/libktrace.la
debian/tmp/opt/trinity/lib/kmtrace/libktrace.so
debian/tmp/opt/trinity/lib/kmtrace/libktrace_s.a
diff --git a/ubuntu/maverick/tdesdk/debian/kspy-trinity.install b/ubuntu/maverick/tdesdk/debian/kspy-trinity.install
index fc17ede2c..12523ee90 100644
--- a/ubuntu/maverick/tdesdk/debian/kspy-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/kspy-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/tde/kspy.h
+debian/tmp/opt/trinity/include/kspy.h
debian/tmp/opt/trinity/lib/libkspy.la
debian/tmp/opt/trinity/lib/libkspy.so
debian/tmp/opt/trinity/lib/libkspy.so.1
diff --git a/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install b/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install
index e183f0e74..bf4cf0b5a 100644
--- a/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install
@@ -4,4 +4,4 @@ debian/tmp/opt/trinity/lib/libkunittestgui.la
debian/tmp/opt/trinity/lib/libkunittestgui.so
debian/tmp/opt/trinity/lib/libkunittestgui.so.0
debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0
-debian/tmp/opt/trinity/include/tde/kunittest/runnergui.h
+debian/tmp/opt/trinity/include/kunittest/runnergui.h
diff --git a/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install b/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install
index 566e0b7a1..f946c882f 100644
--- a/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install
+++ b/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/include/tde/cvsjob_stub.h
-debian/tmp/opt/trinity/include/tde/cvsservice_stub.h
-debian/tmp/opt/trinity/include/tde/repository_stub.h
+debian/tmp/opt/trinity/include/cvsjob_stub.h
+debian/tmp/opt/trinity/include/cvsservice_stub.h
+debian/tmp/opt/trinity/include/repository_stub.h
debian/tmp/opt/trinity/lib/libcvsservice.la
debian/tmp/opt/trinity/lib/libcvsservice.so
debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.la
diff --git a/ubuntu/maverick/tdesdk/debian/rules b/ubuntu/maverick/tdesdk/debian/rules
index c80f0a85d..3675e531a 100755
--- a/ubuntu/maverick/tdesdk/debian/rules
+++ b/ubuntu/maverick/tdesdk/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
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
index c479e9735..9fbde2ecd 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/tde/kprofilemethod.h
+debian/tmp/opt/trinity/include/kprofilemethod.h
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so