diff options
author | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-07 20:37:58 +0100 |
---|---|---|
committer | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-07 20:37:58 +0100 |
commit | 413e1748b4f6634573311f24e9cce4ad099d9f15 (patch) | |
tree | 453a30388e10d148aa1f05c9dc1f89d6283e8dda /ubuntu/maverick_automake/applications/k3b | |
parent | 79b18e9f0f943ca0c3a60e5c6a24a3a0d0afad5d (diff) | |
parent | 784405e8180ea3d82b9c983dc6980b395a10099b (diff) | |
download | tde-packaging-413e1748b4f6634573311f24e9cce4ad099d9f15.tar.gz tde-packaging-413e1748b4f6634573311f24e9cce4ad099d9f15.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick_automake/applications/k3b')
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 |