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/tdegames/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/tdegames/debian')
6 files changed, 8 insertions, 8 deletions
diff --git a/ubuntu/maverick/tdegames/debian/atlantik-trinity-dev.install b/ubuntu/maverick/tdegames/debian/atlantik-trinity-dev.install index b9052ce9a..b7dea632a 100644 --- a/ubuntu/maverick/tdegames/debian/atlantik-trinity-dev.install +++ b/ubuntu/maverick/tdegames/debian/atlantik-trinity-dev.install @@ -1,5 +1,5 @@ -/opt/trinity/include/kde/atlantik -/opt/trinity/include/kde/atlantic +/opt/trinity/include/tde/atlantik +/opt/trinity/include/tde/atlantic /opt/trinity/lib/libatlantic.so /opt/trinity/lib/libatlantikclient.so /opt/trinity/lib/libatlantikui.so diff --git a/ubuntu/maverick/tdegames/debian/cdbs/kde.mk b/ubuntu/maverick/tdegames/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdegames/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdegames/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/tdegames/debian/kolf-trinity-dev.install b/ubuntu/maverick/tdegames/debian/kolf-trinity-dev.install index 4da86d1b2..ff0a2b177 100644 --- a/ubuntu/maverick/tdegames/debian/kolf-trinity-dev.install +++ b/ubuntu/maverick/tdegames/debian/kolf-trinity-dev.install @@ -1,2 +1,2 @@ -/opt/trinity/include/kde/kolf +/opt/trinity/include/tde/kolf /opt/trinity/lib/libkolf.so diff --git a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install index 354fa3840..eca00d487 100644 --- a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install +++ b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install @@ -1,4 +1,4 @@ -/opt/trinity/include/kde/*.h -/opt/trinity/include/kde/kgame +/opt/trinity/include/tde/*.h +/opt/trinity/include/tde/kgame /opt/trinity/lib/libtdegames.so /opt/trinity/lib/libtdegames.la diff --git a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..e154eb334 100644 --- a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" diff --git a/ubuntu/maverick/tdegames/debian/rules b/ubuntu/maverick/tdegames/debian/rules index 0ba5f21cb..5a24cd5ae 100755 --- a/ubuntu/maverick/tdegames/debian/rules +++ b/ubuntu/maverick/tdegames/debian/rules @@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/utils.mk export kde_bindir = /opt/trinity/games -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info |