summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-21 01:06:33 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-21 01:06:33 -0500
commit62164e82581ee31097d33bbe9a6da16039b7204f (patch)
tree11f4ece18e554910d2c3295d5fd30ed4a8f3f885
parentc534f1d3fa732ca205250b1fc947f15ee0596df0 (diff)
downloadtde-packaging-62164e82581ee31097d33bbe9a6da16039b7204f.tar.gz
tde-packaging-62164e82581ee31097d33bbe9a6da16039b7204f.zip
Fix HTML doc install directories on Debian and Ubuntu
-rw-r--r--debian/lenny/applications/kdirstat/debian/changelog2
-rw-r--r--debian/lenny/applications/knutclient/debian/changelog2
-rw-r--r--debian/lenny/applications/knutclient/debian/preinst4
-rwxr-xr-xdebian/lenny/applications/kpicosim/debian/rules4
-rwxr-xr-xdebian/lenny/applications/kstreamripper/debian/rules4
-rwxr-xr-xdebian/lenny/applications/potracegui/debian/rules2
-rw-r--r--debian/squeeze/applications/kdirstat/debian/changelog2
-rw-r--r--debian/squeeze/applications/knutclient/debian/changelog2
-rw-r--r--debian/squeeze/applications/knutclient/debian/preinst4
-rwxr-xr-xdebian/squeeze/applications/kpicosim/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/kstreamripper/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/potracegui/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kdirstat/debian/changelog2
-rw-r--r--ubuntu/maverick/applications/knutclient/debian/changelog2
-rw-r--r--ubuntu/maverick/applications/knutclient/debian/preinst4
-rwxr-xr-xubuntu/maverick/applications/kpicosim/debian/rules4
-rwxr-xr-xubuntu/maverick/applications/kstreamripper/debian/rules4
-rwxr-xr-xubuntu/maverick/applications/potracegui/debian/rules2
18 files changed, 27 insertions, 27 deletions
diff --git a/debian/lenny/applications/kdirstat/debian/changelog b/debian/lenny/applications/kdirstat/debian/changelog
index e039356ea..25fba9c5f 100644
--- a/debian/lenny/applications/kdirstat/debian/changelog
+++ b/debian/lenny/applications/kdirstat/debian/changelog
@@ -112,7 +112,7 @@ kdirstat (2.0.1-1) unstable; urgency=low
* Added check for noopt in DEBIAN_BUILD_OPTIONS in rules.
* Changed doc/en/Makefile.in:95 to set kde_htmldir to
/share/doc/tde/HTML explicity. configure seems to pick up
- /share/doc/HTML instead.
+ /share/doc/tde/HTML instead.
-- Mike Schacht <mschacht@alumni.washington.edu> Sat, 16 Nov 2002 17:56:14 -0600
diff --git a/debian/lenny/applications/knutclient/debian/changelog b/debian/lenny/applications/knutclient/debian/changelog
index 5788cd153..e63f05435 100644
--- a/debian/lenny/applications/knutclient/debian/changelog
+++ b/debian/lenny/applications/knutclient/debian/changelog
@@ -214,7 +214,7 @@ knutclient (0.7.2-pre2-1) unstable; urgency=low
* New upstream release
* admin/debianrules has been updated to fix KDE doc path
problems (thanks to Ben Burton) (closes: Bug#210962)
- * debian/preinst: add script for cleaning /usr/share/doc/HTML/*/knutclient/
+ * debian/preinst: add script for cleaning /usr/share/doc/tde/HTML/*/knutclient/
on upgrading from previous release
* debian/control: add Homepage to Description
* debian/control: change maintainer address to the good debian's one
diff --git a/debian/lenny/applications/knutclient/debian/preinst b/debian/lenny/applications/knutclient/debian/preinst
index 7cf5218d6..17d2ead82 100644
--- a/debian/lenny/applications/knutclient/debian/preinst
+++ b/debian/lenny/applications/knutclient/debian/preinst
@@ -20,13 +20,13 @@ case "$1" in
# cleanup remaining doc from release prior to 0.7.2
if dpkg --compare-versions "$2" lt "0.7.2" ; then
# first pass for files
- for i in `find /usr/share/doc/HTML/*/knutclient/ -type f`
+ for i in `find /usr/share/doc/tde/HTML/*/knutclient/ -type f`
do
rm -f $i
done
# second pass for directories and empty parents
- for i in `find /usr/share/doc/HTML/*/knutclient/ -type d`
+ for i in `find /usr/share/doc/tde/HTML/*/knutclient/ -type d`
do
rmdir --ignore-fail-on-non-empty --parents $i
done
diff --git a/debian/lenny/applications/kpicosim/debian/rules b/debian/lenny/applications/kpicosim/debian/rules
index a0d00721c..b838687dc 100755
--- a/debian/lenny/applications/kpicosim/debian/rules
+++ b/debian/lenny/applications/kpicosim/debian/rules
@@ -88,11 +88,11 @@ 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/tde/HTML; then \
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/tde/; \
+ mv debian/$$pkg/opt/trinity/share/doc/tde/HTML debian/$$pkg/opt/trinity/share/doc/tde/; \
fi; \
if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
diff --git a/debian/lenny/applications/kstreamripper/debian/rules b/debian/lenny/applications/kstreamripper/debian/rules
index 27cc7e874..691c859fb 100755
--- a/debian/lenny/applications/kstreamripper/debian/rules
+++ b/debian/lenny/applications/kstreamripper/debian/rules
@@ -8,10 +8,10 @@ build/kstreamripper::
install/kstreamripper::
env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install
mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/
- mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/
+ mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/
install -m 644 ./src/hi32-app-kstreamripper.png \
$(DEB_DESTDIR)/opt/trinity/share/pixmaps/kstreamripper.png
- rm -rf $(DEB_DESTDIR)/opt/trinity/share/doc/HTML
+ rm -rf $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML
rm -rf $(DEB_DESTDIR)/usr
clean::
diff --git a/debian/lenny/applications/potracegui/debian/rules b/debian/lenny/applications/potracegui/debian/rules
index c8896ca9b..8d1d2ee74 100755
--- a/debian/lenny/applications/potracegui/debian/rules
+++ b/debian/lenny/applications/potracegui/debian/rules
@@ -78,7 +78,7 @@ install: build
$(MAKE) install DESTDIR=$(CURDIR)/debian/potracegui-trinity
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
+ mv $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/tde/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/
rmdir $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Utilities
diff --git a/debian/squeeze/applications/kdirstat/debian/changelog b/debian/squeeze/applications/kdirstat/debian/changelog
index e039356ea..25fba9c5f 100644
--- a/debian/squeeze/applications/kdirstat/debian/changelog
+++ b/debian/squeeze/applications/kdirstat/debian/changelog
@@ -112,7 +112,7 @@ kdirstat (2.0.1-1) unstable; urgency=low
* Added check for noopt in DEBIAN_BUILD_OPTIONS in rules.
* Changed doc/en/Makefile.in:95 to set kde_htmldir to
/share/doc/tde/HTML explicity. configure seems to pick up
- /share/doc/HTML instead.
+ /share/doc/tde/HTML instead.
-- Mike Schacht <mschacht@alumni.washington.edu> Sat, 16 Nov 2002 17:56:14 -0600
diff --git a/debian/squeeze/applications/knutclient/debian/changelog b/debian/squeeze/applications/knutclient/debian/changelog
index 5788cd153..e63f05435 100644
--- a/debian/squeeze/applications/knutclient/debian/changelog
+++ b/debian/squeeze/applications/knutclient/debian/changelog
@@ -214,7 +214,7 @@ knutclient (0.7.2-pre2-1) unstable; urgency=low
* New upstream release
* admin/debianrules has been updated to fix KDE doc path
problems (thanks to Ben Burton) (closes: Bug#210962)
- * debian/preinst: add script for cleaning /usr/share/doc/HTML/*/knutclient/
+ * debian/preinst: add script for cleaning /usr/share/doc/tde/HTML/*/knutclient/
on upgrading from previous release
* debian/control: add Homepage to Description
* debian/control: change maintainer address to the good debian's one
diff --git a/debian/squeeze/applications/knutclient/debian/preinst b/debian/squeeze/applications/knutclient/debian/preinst
index 7cf5218d6..17d2ead82 100644
--- a/debian/squeeze/applications/knutclient/debian/preinst
+++ b/debian/squeeze/applications/knutclient/debian/preinst
@@ -20,13 +20,13 @@ case "$1" in
# cleanup remaining doc from release prior to 0.7.2
if dpkg --compare-versions "$2" lt "0.7.2" ; then
# first pass for files
- for i in `find /usr/share/doc/HTML/*/knutclient/ -type f`
+ for i in `find /usr/share/doc/tde/HTML/*/knutclient/ -type f`
do
rm -f $i
done
# second pass for directories and empty parents
- for i in `find /usr/share/doc/HTML/*/knutclient/ -type d`
+ for i in `find /usr/share/doc/tde/HTML/*/knutclient/ -type d`
do
rmdir --ignore-fail-on-non-empty --parents $i
done
diff --git a/debian/squeeze/applications/kpicosim/debian/rules b/debian/squeeze/applications/kpicosim/debian/rules
index a0d00721c..b838687dc 100755
--- a/debian/squeeze/applications/kpicosim/debian/rules
+++ b/debian/squeeze/applications/kpicosim/debian/rules
@@ -88,11 +88,11 @@ 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/tde/HTML; then \
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/tde/; \
+ mv debian/$$pkg/opt/trinity/share/doc/tde/HTML debian/$$pkg/opt/trinity/share/doc/tde/; \
fi; \
if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
diff --git a/debian/squeeze/applications/kstreamripper/debian/rules b/debian/squeeze/applications/kstreamripper/debian/rules
index 27cc7e874..691c859fb 100755
--- a/debian/squeeze/applications/kstreamripper/debian/rules
+++ b/debian/squeeze/applications/kstreamripper/debian/rules
@@ -8,10 +8,10 @@ build/kstreamripper::
install/kstreamripper::
env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install
mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/
- mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/
+ mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/
install -m 644 ./src/hi32-app-kstreamripper.png \
$(DEB_DESTDIR)/opt/trinity/share/pixmaps/kstreamripper.png
- rm -rf $(DEB_DESTDIR)/opt/trinity/share/doc/HTML
+ rm -rf $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML
rm -rf $(DEB_DESTDIR)/usr
clean::
diff --git a/debian/squeeze/applications/potracegui/debian/rules b/debian/squeeze/applications/potracegui/debian/rules
index c8896ca9b..8d1d2ee74 100755
--- a/debian/squeeze/applications/potracegui/debian/rules
+++ b/debian/squeeze/applications/potracegui/debian/rules
@@ -78,7 +78,7 @@ install: build
$(MAKE) install DESTDIR=$(CURDIR)/debian/potracegui-trinity
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
+ mv $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/tde/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/
rmdir $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Utilities
diff --git a/ubuntu/maverick/applications/kdirstat/debian/changelog b/ubuntu/maverick/applications/kdirstat/debian/changelog
index e039356ea..25fba9c5f 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/changelog
+++ b/ubuntu/maverick/applications/kdirstat/debian/changelog
@@ -112,7 +112,7 @@ kdirstat (2.0.1-1) unstable; urgency=low
* Added check for noopt in DEBIAN_BUILD_OPTIONS in rules.
* Changed doc/en/Makefile.in:95 to set kde_htmldir to
/share/doc/tde/HTML explicity. configure seems to pick up
- /share/doc/HTML instead.
+ /share/doc/tde/HTML instead.
-- Mike Schacht <mschacht@alumni.washington.edu> Sat, 16 Nov 2002 17:56:14 -0600
diff --git a/ubuntu/maverick/applications/knutclient/debian/changelog b/ubuntu/maverick/applications/knutclient/debian/changelog
index 5788cd153..e63f05435 100644
--- a/ubuntu/maverick/applications/knutclient/debian/changelog
+++ b/ubuntu/maverick/applications/knutclient/debian/changelog
@@ -214,7 +214,7 @@ knutclient (0.7.2-pre2-1) unstable; urgency=low
* New upstream release
* admin/debianrules has been updated to fix KDE doc path
problems (thanks to Ben Burton) (closes: Bug#210962)
- * debian/preinst: add script for cleaning /usr/share/doc/HTML/*/knutclient/
+ * debian/preinst: add script for cleaning /usr/share/doc/tde/HTML/*/knutclient/
on upgrading from previous release
* debian/control: add Homepage to Description
* debian/control: change maintainer address to the good debian's one
diff --git a/ubuntu/maverick/applications/knutclient/debian/preinst b/ubuntu/maverick/applications/knutclient/debian/preinst
index 7cf5218d6..17d2ead82 100644
--- a/ubuntu/maverick/applications/knutclient/debian/preinst
+++ b/ubuntu/maverick/applications/knutclient/debian/preinst
@@ -20,13 +20,13 @@ case "$1" in
# cleanup remaining doc from release prior to 0.7.2
if dpkg --compare-versions "$2" lt "0.7.2" ; then
# first pass for files
- for i in `find /usr/share/doc/HTML/*/knutclient/ -type f`
+ for i in `find /usr/share/doc/tde/HTML/*/knutclient/ -type f`
do
rm -f $i
done
# second pass for directories and empty parents
- for i in `find /usr/share/doc/HTML/*/knutclient/ -type d`
+ for i in `find /usr/share/doc/tde/HTML/*/knutclient/ -type d`
do
rmdir --ignore-fail-on-non-empty --parents $i
done
diff --git a/ubuntu/maverick/applications/kpicosim/debian/rules b/ubuntu/maverick/applications/kpicosim/debian/rules
index a0d00721c..b838687dc 100755
--- a/ubuntu/maverick/applications/kpicosim/debian/rules
+++ b/ubuntu/maverick/applications/kpicosim/debian/rules
@@ -88,11 +88,11 @@ 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/tde/HTML; then \
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/tde/; \
+ mv debian/$$pkg/opt/trinity/share/doc/tde/HTML debian/$$pkg/opt/trinity/share/doc/tde/; \
fi; \
if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/rules b/ubuntu/maverick/applications/kstreamripper/debian/rules
index 27cc7e874..691c859fb 100755
--- a/ubuntu/maverick/applications/kstreamripper/debian/rules
+++ b/ubuntu/maverick/applications/kstreamripper/debian/rules
@@ -8,10 +8,10 @@ build/kstreamripper::
install/kstreamripper::
env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install
mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/
- mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/
+ mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/
install -m 644 ./src/hi32-app-kstreamripper.png \
$(DEB_DESTDIR)/opt/trinity/share/pixmaps/kstreamripper.png
- rm -rf $(DEB_DESTDIR)/opt/trinity/share/doc/HTML
+ rm -rf $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML
rm -rf $(DEB_DESTDIR)/usr
clean::
diff --git a/ubuntu/maverick/applications/potracegui/debian/rules b/ubuntu/maverick/applications/potracegui/debian/rules
index c8896ca9b..8d1d2ee74 100755
--- a/ubuntu/maverick/applications/potracegui/debian/rules
+++ b/ubuntu/maverick/applications/potracegui/debian/rules
@@ -78,7 +78,7 @@ install: build
$(MAKE) install DESTDIR=$(CURDIR)/debian/potracegui-trinity
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
+ mv $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/tde/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/
rmdir $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Utilities