From 7423beba73a11e271fa4a4f655e3a24ef4d89cfa Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 6 Sep 2011 13:47:36 -0500 Subject: Fix up kdelibs/kdebase/kdepim API documentation install files for Debian/Ubuntu --- ubuntu/maverick/kdepim/debian/kdepim-trinity-doc.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubuntu/maverick/kdepim/debian') diff --git a/ubuntu/maverick/kdepim/debian/kdepim-trinity-doc.install b/ubuntu/maverick/kdepim/debian/kdepim-trinity-doc.install index c0d624018..8f7319f16 100644 --- a/ubuntu/maverick/kdepim/debian/kdepim-trinity-doc.install +++ b/ubuntu/maverick/kdepim/debian/kdepim-trinity-doc.install @@ -1 +1 @@ -/opt/trinity/share/doc/kde/HTML/en/kdepim-apidocs/* +# /opt/trinity/share/doc/kde/HTML/en/kdepim-apidocs/* -- cgit v1.2.1 From 7a9f7fe5fbcac170d7ab2bae81fb1e6130588470 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 6 Sep 2011 17:26:35 -0500 Subject: Enable apidox builds under Ubuntu and Debian for kdelibs, kdebase, and kdepim --- ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk | 12 ++++++++++++ ubuntu/maverick/kdepim/debian/kdepim-trinity-doc.install | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'ubuntu/maverick/kdepim/debian') diff --git a/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk index 888f4be38..f5b1caa12 100644 --- a/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk @@ -96,3 +96,15 @@ clean:: rm -f debian/stamp-cvs-make endif + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox diff --git a/ubuntu/maverick/kdepim/debian/kdepim-trinity-doc.install b/ubuntu/maverick/kdepim/debian/kdepim-trinity-doc.install index 8f7319f16..c0d624018 100644 --- a/ubuntu/maverick/kdepim/debian/kdepim-trinity-doc.install +++ b/ubuntu/maverick/kdepim/debian/kdepim-trinity-doc.install @@ -1 +1 @@ -# /opt/trinity/share/doc/kde/HTML/en/kdepim-apidocs/* +/opt/trinity/share/doc/kde/HTML/en/kdepim-apidocs/* -- cgit v1.2.1 From ef427f8b14da1a4ee0e46d50a6696bf151239320 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 6 Sep 2011 23:07:00 -0500 Subject: Only build kdepim apidox on arch-independent package builds --- ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ubuntu/maverick/kdepim/debian') diff --git a/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk index f5b1caa12..271a018a9 100644 --- a/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk @@ -97,12 +97,12 @@ clean:: endif -common-build-arch common-build-indep:: debian/stamp-kde-apidox +common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) touch $@ -common-install-arch common-install-indep:: common-install-kde-apidox +common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) -- cgit v1.2.1 From 688262143652290b8fa3693b592359a0f0b54c55 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Sep 2011 10:49:57 -0500 Subject: Enable kdepim apidox build --- ubuntu/maverick/kdepim/debian/rules | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ubuntu/maverick/kdepim/debian') diff --git a/ubuntu/maverick/kdepim/debian/rules b/ubuntu/maverick/kdepim/debian/rules index 6d8c87f14..07237352d 100755 --- a/ubuntu/maverick/kdepim/debian/rules +++ b/ubuntu/maverick/kdepim/debian/rules @@ -15,6 +15,8 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk +DEB_KDE_APIDOX := yes + DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" -DBUILD_KITCHENSYNC="ON" \ -DWITH_ARTS="ON" -DWITH_SASL="ON" -DWITH_NEWDISTRLISTS="ON" -DWITH_GNOKII="OFF" -DWITH_EXCHANGE="ON" -DWITH_EGROUPWARE="ON" -DWITH_KOLAB="ON" -DWITH_SLOX="ON" -DWITH_GROUPWISE="ON" -DWITH_FEATUREPLAN="ON" -DWITH_GROUPDAV="ON" -DWITH_BIRTHDAYS="ON" -DWITH_NEWEXCHANGE="ON" -DWITH_SCALIX="ON" -DWITH_CALDAV="ON" -DWITH_CARDDAV="ON" -DWITH_INDEXLIB="ON" -- cgit v1.2.1