summaryrefslogtreecommitdiffstats
path: root/ubuntu/lucid_automake/applications/kdesvn
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2012-02-21 19:27:13 -0500
committerRobert Xu <robxu9@gmail.com>2012-02-21 19:27:13 -0500
commit5d7b5e6defb05f81691d286d40f67260c4733d00 (patch)
treeb2bfcca86b05179cad334dc61c5609e54ac7674d /ubuntu/lucid_automake/applications/kdesvn
parent580ce2082fe5054c9ad0e4f666cee9b4bfb2d0b6 (diff)
parenta14ac9de2f5843036c9f452f1188979fef17ae6d (diff)
downloadtde-packaging-5d7b5e6defb05f81691d286d40f67260c4733d00.tar.gz
tde-packaging-5d7b5e6defb05f81691d286d40f67260c4733d00.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/lucid_automake/applications/kdesvn')
-rw-r--r--ubuntu/lucid_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install2
-rwxr-xr-xubuntu/lucid_automake/applications/kdesvn/debian/rules8
2 files changed, 5 insertions, 5 deletions
diff --git a/ubuntu/lucid_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install b/ubuntu/lucid_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install
index a0adce2e6..15c878d0f 100644
--- a/ubuntu/lucid_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install
+++ b/ubuntu/lucid_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install
@@ -1,2 +1,2 @@
debian/tmp/opt/kde3/lib*/*.so
-debian/tmp/opt/kde3/include/kde/svnqt/
+debian/tmp/opt/kde3/include/tde/svnqt/
diff --git a/ubuntu/lucid_automake/applications/kdesvn/debian/rules b/ubuntu/lucid_automake/applications/kdesvn/debian/rules
index f7ce7d21e..3ca36df63 100755
--- a/ubuntu/lucid_automake/applications/kdesvn/debian/rules
+++ b/ubuntu/lucid_automake/applications/kdesvn/debian/rules
@@ -7,14 +7,14 @@ include /usr/share/cdbs/1/class/cmake.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
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_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/kde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib"
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/tde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib"
DEB_COMPRESS_EXCLUDE := .dcl .docbook -license .tag .sty .el
@@ -25,7 +25,7 @@ DEB_SHLIBDEPS_INCLUDE := debian/tmp/opt/kde3/lib
common-install-impl::
mkdir -p debian/tmp/opt/kde3
- mkdir -p debian/tmp/opt/kde3/include/kde
+ mkdir -p debian/tmp/opt/kde3/include/tde
mkdir -p debian/tmp/usr/lib
mkdir -p debian/tmp/opt/kde3/lib
mkdir -p debian/tmp/usr/lib/kde3
@@ -40,7 +40,7 @@ common-install-impl::
cp -Rp debian/tmp/usr/lib/* debian/tmp/opt/kde3/lib/
cp -Rp debian/tmp/usr/lib64/* debian/tmp/opt/kde3/lib/
cp -Rp debian/tmp/usr/share debian/tmp/opt/kde3/
- cp -Rp debian/tmp/usr/include/* debian/tmp/opt/kde3/include/kde/
+ cp -Rp debian/tmp/usr/include/* debian/tmp/opt/kde3/include/tde/
rm -rf debian/tmp/usr/bin
rm -rf debian/tmp/usr/lib/kde3
rm -rf debian/tmp/usr/lib64/kde3