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/kdetoys | |
| 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/kdetoys')
5 files changed, 6 insertions, 6 deletions
diff --git a/ubuntu/maverick_automake/kdetoys/debian/amor-kde3.install b/ubuntu/maverick_automake/kdetoys/debian/amor-kde3.install index dc961325b..ee7df97a4 100644 --- a/ubuntu/maverick_automake/kdetoys/debian/amor-kde3.install +++ b/ubuntu/maverick_automake/kdetoys/debian/amor-kde3.install @@ -1,5 +1,5 @@ debian/tmp/opt/kde3/bin/amor -debian/tmp/opt/kde3/include/kde/AmorIface.h +debian/tmp/opt/kde3/include/tde/AmorIface.h debian/tmp/opt/kde3/share/apps/amor debian/tmp/opt/kde3/share/applications/kde/amor.desktop debian/tmp/opt/kde3/share/doc/kde/HTML/en/amor/*.bz2 diff --git a/ubuntu/maverick_automake/kdetoys/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdetoys/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdetoys/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdetoys/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/kdetoys/debian/changelog b/ubuntu/maverick_automake/kdetoys/debian/changelog index 26a0781c5..4c9c290ab 100644 --- a/ubuntu/maverick_automake/kdetoys/debian/changelog +++ b/ubuntu/maverick_automake/kdetoys/debian/changelog @@ -609,7 +609,7 @@ kdetoys (4:2.2.2-3) unstable; urgency=low kdetoys (4:2.2.2-2) unstable; urgency=low - * Moved AmorIface.h to /usr/include/kde (closes: Bug#122447). + * Moved AmorIface.h to /usr/include/tde (closes: Bug#122447). -- Ben Burton <benb@acm.org> Sun, 9 Dec 2001 09:07:02 -0600 diff --git a/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" diff --git a/ubuntu/maverick_automake/kdetoys/debian/rules b/ubuntu/maverick_automake/kdetoys/debian/rules index 77c4dbffe..16a0537bc 100755 --- a/ubuntu/maverick_automake/kdetoys/debian/rules +++ b/ubuntu/maverick_automake/kdetoys/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/kde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/tde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" DEB_DH_STRIP_ARGS := --dbg-package=kdetoys-kde3-dbg |