diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-07-21 12:42:38 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-07-21 12:42:38 +0200 |
| commit | d2a5ae6eee8f77ba301f22a990fd68944c94d4ad (patch) | |
| tree | 0bdfdcb57898584e87d89ab3a0172d5b6ce28ce6 /ubuntu/maverick/tdeaccessibility | |
| parent | 65166dbf185e59a4f874392b40c7f974e7ae5fb8 (diff) | |
| parent | 0657be6a3626991da456db3946ed1ec316ce6fb7 (diff) | |
| download | tde-packaging-d2a5ae6eee8f77ba301f22a990fd68944c94d4ad.tar.gz tde-packaging-d2a5ae6eee8f77ba301f22a990fd68944c94d4ad.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdeaccessibility')
| -rw-r--r-- | ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk | 4 | ||||
| -rw-r--r-- | ubuntu/maverick/tdeaccessibility/debian/control | 4 | ||||
| -rw-r--r-- | ubuntu/maverick/tdeaccessibility/debian/tde-icons-mono-trinity.install (renamed from ubuntu/maverick/tdeaccessibility/debian/kde-icons-mono-trinity.install) | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk index d135c4257..4a11bc028 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk @@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: diff --git a/ubuntu/maverick/tdeaccessibility/debian/control b/ubuntu/maverick/tdeaccessibility/debian/control index 3d7149dd4..efaba8305 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/control +++ b/ubuntu/maverick/tdeaccessibility/debian/control @@ -13,7 +13,7 @@ Architecture: all Replaces: kdeaccessibility-kde3 (<< 4:14.0.0), kdeaccessibility-trinity (<< 4:14.0.0) Breaks: kdeaccessibility-kde3 (<< 4:14.0.0), kdeaccessibility-trinity (<< 4:14.0.0) Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version}) -Recommends: kde-icons-mono-trinity (>= ${Source-Version}) +Recommends: tde-icons-mono-trinity (>= ${Source-Version}) Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version}) Description: accessibility packages from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format This package is part of Trinity, and a component of the KDE accessibility module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information. -Package: kde-icons-mono-trinity +Package: tde-icons-mono-trinity Section: tde Architecture: all Replaces: kde-icons-mono-kde3 (<< 4:14.0.0), kde-icons-mono-trinity (<< 4:14.0.0) diff --git a/ubuntu/maverick/tdeaccessibility/debian/kde-icons-mono-trinity.install b/ubuntu/maverick/tdeaccessibility/debian/tde-icons-mono-trinity.install index 8c4265ceb..8c4265ceb 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/kde-icons-mono-trinity.install +++ b/ubuntu/maverick/tdeaccessibility/debian/tde-icons-mono-trinity.install |