diff options
| author | Robert Xu <robxu9@gmail.com> | 2012-02-21 19:27:13 -0500 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2012-02-21 19:27:13 -0500 |
| commit | 5d7b5e6defb05f81691d286d40f67260c4733d00 (patch) | |
| tree | b2bfcca86b05179cad334dc61c5609e54ac7674d /ubuntu/maverick_automake/applications/k3b/debian | |
| parent | 580ce2082fe5054c9ad0e4f666cee9b4bfb2d0b6 (diff) | |
| parent | a14ac9de2f5843036c9f452f1188979fef17ae6d (diff) | |
| download | tde-packaging-5d7b5e6defb05f81691d286d40f67260c4733d00.tar.gz tde-packaging-5d7b5e6defb05f81691d286d40f67260c4733d00.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick_automake/applications/k3b/debian')
3 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu/maverick_automake/applications/k3b/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/k3b/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/k3b/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/k3b/debian/cdbs/kde.mk @@ -59,7 +59,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/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/k3b/debian/kde3.mk b/ubuntu/maverick_automake/applications/k3b/debian/kde3.mk index e0bcb2308..0d41a4441 100644 --- a/ubuntu/maverick_automake/applications/k3b/debian/kde3.mk +++ b/ubuntu/maverick_automake/applications/k3b/debian/kde3.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama --without-arts $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "/opt/kde3/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "/opt/kde3/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/k3b/debian/rules b/ubuntu/maverick_automake/applications/k3b/debian/rules index 4a0edb003..fe5e3c0ab 100755 --- a/ubuntu/maverick_automake/applications/k3b/debian/rules +++ b/ubuntu/maverick_automake/applications/k3b/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde5 +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde5 DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/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 = --with-k3bsetup=no --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/kde" +DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/tde" DEB_INSTALL_MANPAGES_k3b = debian/k3b.1 |