From 9925507a54bd1ba53dc1522e353ad68de538c6c4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 20 Apr 2012 00:49:18 -0500 Subject: Fix doc installation directory on Debian and Ubuntu (cherry picked from commit 5aa4434047563e3a2efd1ba314eb334f1e839f84) --- debian/lenny/applications/digikam/debian/changelog | 2 +- debian/lenny/applications/digikam/debian/rules | 2 +- debian/lenny/applications/kdiff3/debian/kdiff3-trinity-doc.install | 2 +- debian/lenny/applications/kpicosim/debian/rules | 4 ++-- debian/lenny/applications/potracegui/debian/dirs | 2 +- debian/lenny/applications/potracegui/debian/rules | 2 +- debian/lenny/applications/tellico/debian/tellico-data-trinity.install | 2 +- debian/squeeze/applications/digikam/debian/changelog | 2 +- debian/squeeze/applications/digikam/debian/rules | 2 +- debian/squeeze/applications/kdiff3/debian/kdiff3-trinity-doc.install | 2 +- debian/squeeze/applications/kpicosim/debian/rules | 4 ++-- debian/squeeze/applications/potracegui/debian/dirs | 2 +- debian/squeeze/applications/potracegui/debian/rules | 2 +- .../squeeze/applications/tellico/debian/tellico-data-trinity.install | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) (limited to 'debian') diff --git a/debian/lenny/applications/digikam/debian/changelog b/debian/lenny/applications/digikam/debian/changelog index 89c1b4e52..926c247f2 100644 --- a/debian/lenny/applications/digikam/debian/changelog +++ b/debian/lenny/applications/digikam/debian/changelog @@ -721,7 +721,7 @@ digikam (0.8.0-0rc-1) experimental; urgency=low * mention new 0.8 features tagging and searching in long description * remove 01_fix_keyboardfocus_in_albumview.diff, fixed upstream * remove build-dep on libgdbm-dev: No longer needed in 0.8 - * remove the empty apidocs dirtree from /usr/share/doc/kde + * remove the empty apidocs dirtree from /usr/share/doc/tde -- Debian KDE Extras Team Fri, 4 Nov 2005 14:50:31 +0100 diff --git a/debian/lenny/applications/digikam/debian/rules b/debian/lenny/applications/digikam/debian/rules index d4b31de95..1e3338086 100755 --- a/debian/lenny/applications/digikam/debian/rules +++ b/debian/lenny/applications/digikam/debian/rules @@ -38,4 +38,4 @@ endif install/digikam-trinity:: # remove empty API-docs dirs tree - rm -rf $(CURDIR)/debian/digikam-trinity/opt/trinity/share/doc/kde + rm -rf $(CURDIR)/debian/digikam-trinity/opt/trinity/share/doc/tde diff --git a/debian/lenny/applications/kdiff3/debian/kdiff3-trinity-doc.install b/debian/lenny/applications/kdiff3/debian/kdiff3-trinity-doc.install index 6cd3d1717..6d9c9dd9a 100644 --- a/debian/lenny/applications/kdiff3/debian/kdiff3-trinity-doc.install +++ b/debian/lenny/applications/kdiff3/debian/kdiff3-trinity-doc.install @@ -1,2 +1,2 @@ -/opt/trinity/share/doc/kde +/opt/trinity/share/doc/tde /opt/trinity/share/doc/kdiff3-doc/html diff --git a/debian/lenny/applications/kpicosim/debian/rules b/debian/lenny/applications/kpicosim/debian/rules index 0311252aa..130208334 100755 --- a/debian/lenny/applications/kpicosim/debian/rules +++ b/debian/lenny/applications/kpicosim/debian/rules @@ -89,8 +89,8 @@ install: build # Install standard documentation links. for pkg in `dh_listpackages`; do \ if test -d debian/$$pkg/opt/trinity/share/doc/HTML; then \ - if test ! -d debian/$$pkg/opt/trinity/share/doc/kde; then \ - mkdir debian/$$pkg/opt/trinity/share/doc/kde; \ + if test ! -d debian/$$pkg/opt/trinity/share/doc/tde; then \ + mkdir debian/$$pkg/opt/trinity/share/doc/tde; \ fi; \ mv debian/$$pkg/opt/trinity/share/doc/HTML debian/$$pkg/opt/trinity/share/doc/kde/; \ fi; \ diff --git a/debian/lenny/applications/potracegui/debian/dirs b/debian/lenny/applications/potracegui/debian/dirs index 2041e4556..0306bbebb 100644 --- a/debian/lenny/applications/potracegui/debian/dirs +++ b/debian/lenny/applications/potracegui/debian/dirs @@ -1,4 +1,4 @@ usr/bin usr/share/applnk/Graphics -usr/share/doc/kde +usr/share/doc/tde diff --git a/debian/lenny/applications/potracegui/debian/rules b/debian/lenny/applications/potracegui/debian/rules index 422c29027..626d2a2bc 100755 --- a/debian/lenny/applications/potracegui/debian/rules +++ b/debian/lenny/applications/potracegui/debian/rules @@ -77,7 +77,7 @@ install: build dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/potracegui-trinity - mkdir -p $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/kde + mkdir -p $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/tde mv $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/HTML $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/tde/HTML mkdir -p $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Graphics mv $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Utilities/potracegui.desktop $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Graphics/ diff --git a/debian/lenny/applications/tellico/debian/tellico-data-trinity.install b/debian/lenny/applications/tellico/debian/tellico-data-trinity.install index 4bceccc98..152ef011b 100644 --- a/debian/lenny/applications/tellico/debian/tellico-data-trinity.install +++ b/debian/lenny/applications/tellico/debian/tellico-data-trinity.install @@ -11,7 +11,7 @@ debian/tmp/opt/trinity/share/apps/tellico/tellico2html.js debian/tmp/opt/trinity/share/apps/tellico/tellicoui.rc debian/tmp/opt/trinity/share/apps/tellico/welcome.html debian/tmp/opt/trinity/share/config.kcfg -debian/tmp/opt/trinity/share/doc/kde +debian/tmp/opt/trinity/share/doc/tde debian/tmp/opt/trinity/share/icons debian/tmp/opt/trinity/share/locale debian/tmp/opt/trinity/share/apps/mime diff --git a/debian/squeeze/applications/digikam/debian/changelog b/debian/squeeze/applications/digikam/debian/changelog index 89c1b4e52..926c247f2 100644 --- a/debian/squeeze/applications/digikam/debian/changelog +++ b/debian/squeeze/applications/digikam/debian/changelog @@ -721,7 +721,7 @@ digikam (0.8.0-0rc-1) experimental; urgency=low * mention new 0.8 features tagging and searching in long description * remove 01_fix_keyboardfocus_in_albumview.diff, fixed upstream * remove build-dep on libgdbm-dev: No longer needed in 0.8 - * remove the empty apidocs dirtree from /usr/share/doc/kde + * remove the empty apidocs dirtree from /usr/share/doc/tde -- Debian KDE Extras Team Fri, 4 Nov 2005 14:50:31 +0100 diff --git a/debian/squeeze/applications/digikam/debian/rules b/debian/squeeze/applications/digikam/debian/rules index b53701e81..87584a07b 100755 --- a/debian/squeeze/applications/digikam/debian/rules +++ b/debian/squeeze/applications/digikam/debian/rules @@ -38,4 +38,4 @@ endif install/digikam-trinity:: # remove empty API-docs dirs tree - rm -rf $(CURDIR)/debian/digikam-trinity/opt/trinity/share/doc/kde + rm -rf $(CURDIR)/debian/digikam-trinity/opt/trinity/share/doc/tde diff --git a/debian/squeeze/applications/kdiff3/debian/kdiff3-trinity-doc.install b/debian/squeeze/applications/kdiff3/debian/kdiff3-trinity-doc.install index 6cd3d1717..6d9c9dd9a 100644 --- a/debian/squeeze/applications/kdiff3/debian/kdiff3-trinity-doc.install +++ b/debian/squeeze/applications/kdiff3/debian/kdiff3-trinity-doc.install @@ -1,2 +1,2 @@ -/opt/trinity/share/doc/kde +/opt/trinity/share/doc/tde /opt/trinity/share/doc/kdiff3-doc/html diff --git a/debian/squeeze/applications/kpicosim/debian/rules b/debian/squeeze/applications/kpicosim/debian/rules index 0311252aa..130208334 100755 --- a/debian/squeeze/applications/kpicosim/debian/rules +++ b/debian/squeeze/applications/kpicosim/debian/rules @@ -89,8 +89,8 @@ install: build # Install standard documentation links. for pkg in `dh_listpackages`; do \ if test -d debian/$$pkg/opt/trinity/share/doc/HTML; then \ - if test ! -d debian/$$pkg/opt/trinity/share/doc/kde; then \ - mkdir debian/$$pkg/opt/trinity/share/doc/kde; \ + if test ! -d debian/$$pkg/opt/trinity/share/doc/tde; then \ + mkdir debian/$$pkg/opt/trinity/share/doc/tde; \ fi; \ mv debian/$$pkg/opt/trinity/share/doc/HTML debian/$$pkg/opt/trinity/share/doc/kde/; \ fi; \ diff --git a/debian/squeeze/applications/potracegui/debian/dirs b/debian/squeeze/applications/potracegui/debian/dirs index 2041e4556..0306bbebb 100644 --- a/debian/squeeze/applications/potracegui/debian/dirs +++ b/debian/squeeze/applications/potracegui/debian/dirs @@ -1,4 +1,4 @@ usr/bin usr/share/applnk/Graphics -usr/share/doc/kde +usr/share/doc/tde diff --git a/debian/squeeze/applications/potracegui/debian/rules b/debian/squeeze/applications/potracegui/debian/rules index 422c29027..626d2a2bc 100755 --- a/debian/squeeze/applications/potracegui/debian/rules +++ b/debian/squeeze/applications/potracegui/debian/rules @@ -77,7 +77,7 @@ install: build dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/potracegui-trinity - mkdir -p $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/kde + mkdir -p $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/tde mv $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/HTML $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/tde/HTML mkdir -p $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Graphics mv $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Utilities/potracegui.desktop $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Graphics/ diff --git a/debian/squeeze/applications/tellico/debian/tellico-data-trinity.install b/debian/squeeze/applications/tellico/debian/tellico-data-trinity.install index 4bceccc98..152ef011b 100644 --- a/debian/squeeze/applications/tellico/debian/tellico-data-trinity.install +++ b/debian/squeeze/applications/tellico/debian/tellico-data-trinity.install @@ -11,7 +11,7 @@ debian/tmp/opt/trinity/share/apps/tellico/tellico2html.js debian/tmp/opt/trinity/share/apps/tellico/tellicoui.rc debian/tmp/opt/trinity/share/apps/tellico/welcome.html debian/tmp/opt/trinity/share/config.kcfg -debian/tmp/opt/trinity/share/doc/kde +debian/tmp/opt/trinity/share/doc/tde debian/tmp/opt/trinity/share/icons debian/tmp/opt/trinity/share/locale debian/tmp/opt/trinity/share/apps/mime -- cgit v1.2.3