Fix HTML doc install directories on Debian and Ubuntu

pull/3/head
Timothy Pearson 13 years ago
parent c534f1d3fa
commit 62164e8258

@ -112,7 +112,7 @@ kdirstat (2.0.1-1) unstable; urgency=low
* Added check for noopt in DEBIAN_BUILD_OPTIONS in rules. * Added check for noopt in DEBIAN_BUILD_OPTIONS in rules.
* Changed doc/en/Makefile.in:95 to set kde_htmldir to * Changed doc/en/Makefile.in:95 to set kde_htmldir to
/share/doc/tde/HTML explicity. configure seems to pick up /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 -- Mike Schacht <mschacht@alumni.washington.edu> Sat, 16 Nov 2002 17:56:14 -0600

@ -214,7 +214,7 @@ knutclient (0.7.2-pre2-1) unstable; urgency=low
* New upstream release * New upstream release
* admin/debianrules has been updated to fix KDE doc path * admin/debianrules has been updated to fix KDE doc path
problems (thanks to Ben Burton) (closes: Bug#210962) 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 on upgrading from previous release
* debian/control: add Homepage to Description * debian/control: add Homepage to Description
* debian/control: change maintainer address to the good debian's one * debian/control: change maintainer address to the good debian's one

@ -20,13 +20,13 @@ case "$1" in
# cleanup remaining doc from release prior to 0.7.2 # cleanup remaining doc from release prior to 0.7.2
if dpkg --compare-versions "$2" lt "0.7.2" ; then if dpkg --compare-versions "$2" lt "0.7.2" ; then
# first pass for files # 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 do
rm -f $i rm -f $i
done done
# second pass for directories and empty parents # 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 do
rmdir --ignore-fail-on-non-empty --parents $i rmdir --ignore-fail-on-non-empty --parents $i
done done

@ -88,11 +88,11 @@ install: build
# Install standard documentation links. # Install standard documentation links.
for pkg in `dh_listpackages`; do \ 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 \ if test ! -d debian/$$pkg/opt/trinity/share/doc/tde; then \
mkdir debian/$$pkg/opt/trinity/share/doc/tde; \ mkdir debian/$$pkg/opt/trinity/share/doc/tde; \
fi; \ 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; \ fi; \
if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \ 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 \ dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \

@ -8,10 +8,10 @@ build/kstreamripper::
install/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 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/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 \ install -m 644 ./src/hi32-app-kstreamripper.png \
$(DEB_DESTDIR)/opt/trinity/share/pixmaps/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 rm -rf $(DEB_DESTDIR)/usr
clean:: clean::

@ -78,7 +78,7 @@ install: build
$(MAKE) install DESTDIR=$(CURDIR)/debian/potracegui-trinity $(MAKE) install DESTDIR=$(CURDIR)/debian/potracegui-trinity
mkdir -p $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/tde 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 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/ 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 rmdir $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Utilities

@ -112,7 +112,7 @@ kdirstat (2.0.1-1) unstable; urgency=low
* Added check for noopt in DEBIAN_BUILD_OPTIONS in rules. * Added check for noopt in DEBIAN_BUILD_OPTIONS in rules.
* Changed doc/en/Makefile.in:95 to set kde_htmldir to * Changed doc/en/Makefile.in:95 to set kde_htmldir to
/share/doc/tde/HTML explicity. configure seems to pick up /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 -- Mike Schacht <mschacht@alumni.washington.edu> Sat, 16 Nov 2002 17:56:14 -0600

@ -214,7 +214,7 @@ knutclient (0.7.2-pre2-1) unstable; urgency=low
* New upstream release * New upstream release
* admin/debianrules has been updated to fix KDE doc path * admin/debianrules has been updated to fix KDE doc path
problems (thanks to Ben Burton) (closes: Bug#210962) 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 on upgrading from previous release
* debian/control: add Homepage to Description * debian/control: add Homepage to Description
* debian/control: change maintainer address to the good debian's one * debian/control: change maintainer address to the good debian's one

@ -20,13 +20,13 @@ case "$1" in
# cleanup remaining doc from release prior to 0.7.2 # cleanup remaining doc from release prior to 0.7.2
if dpkg --compare-versions "$2" lt "0.7.2" ; then if dpkg --compare-versions "$2" lt "0.7.2" ; then
# first pass for files # 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 do
rm -f $i rm -f $i
done done
# second pass for directories and empty parents # 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 do
rmdir --ignore-fail-on-non-empty --parents $i rmdir --ignore-fail-on-non-empty --parents $i
done done

@ -88,11 +88,11 @@ install: build
# Install standard documentation links. # Install standard documentation links.
for pkg in `dh_listpackages`; do \ 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 \ if test ! -d debian/$$pkg/opt/trinity/share/doc/tde; then \
mkdir debian/$$pkg/opt/trinity/share/doc/tde; \ mkdir debian/$$pkg/opt/trinity/share/doc/tde; \
fi; \ 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; \ fi; \
if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \ 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 \ dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \

@ -8,10 +8,10 @@ build/kstreamripper::
install/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 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/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 \ install -m 644 ./src/hi32-app-kstreamripper.png \
$(DEB_DESTDIR)/opt/trinity/share/pixmaps/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 rm -rf $(DEB_DESTDIR)/usr
clean:: clean::

@ -78,7 +78,7 @@ install: build
$(MAKE) install DESTDIR=$(CURDIR)/debian/potracegui-trinity $(MAKE) install DESTDIR=$(CURDIR)/debian/potracegui-trinity
mkdir -p $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/tde 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 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/ 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 rmdir $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Utilities

@ -112,7 +112,7 @@ kdirstat (2.0.1-1) unstable; urgency=low
* Added check for noopt in DEBIAN_BUILD_OPTIONS in rules. * Added check for noopt in DEBIAN_BUILD_OPTIONS in rules.
* Changed doc/en/Makefile.in:95 to set kde_htmldir to * Changed doc/en/Makefile.in:95 to set kde_htmldir to
/share/doc/tde/HTML explicity. configure seems to pick up /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 -- Mike Schacht <mschacht@alumni.washington.edu> Sat, 16 Nov 2002 17:56:14 -0600

@ -214,7 +214,7 @@ knutclient (0.7.2-pre2-1) unstable; urgency=low
* New upstream release * New upstream release
* admin/debianrules has been updated to fix KDE doc path * admin/debianrules has been updated to fix KDE doc path
problems (thanks to Ben Burton) (closes: Bug#210962) 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 on upgrading from previous release
* debian/control: add Homepage to Description * debian/control: add Homepage to Description
* debian/control: change maintainer address to the good debian's one * debian/control: change maintainer address to the good debian's one

@ -20,13 +20,13 @@ case "$1" in
# cleanup remaining doc from release prior to 0.7.2 # cleanup remaining doc from release prior to 0.7.2
if dpkg --compare-versions "$2" lt "0.7.2" ; then if dpkg --compare-versions "$2" lt "0.7.2" ; then
# first pass for files # 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 do
rm -f $i rm -f $i
done done
# second pass for directories and empty parents # 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 do
rmdir --ignore-fail-on-non-empty --parents $i rmdir --ignore-fail-on-non-empty --parents $i
done done

@ -88,11 +88,11 @@ install: build
# Install standard documentation links. # Install standard documentation links.
for pkg in `dh_listpackages`; do \ 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 \ if test ! -d debian/$$pkg/opt/trinity/share/doc/tde; then \
mkdir debian/$$pkg/opt/trinity/share/doc/tde; \ mkdir debian/$$pkg/opt/trinity/share/doc/tde; \
fi; \ 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; \ fi; \
if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \ 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 \ dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \

@ -8,10 +8,10 @@ build/kstreamripper::
install/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 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/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 \ install -m 644 ./src/hi32-app-kstreamripper.png \
$(DEB_DESTDIR)/opt/trinity/share/pixmaps/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 rm -rf $(DEB_DESTDIR)/usr
clean:: clean::

@ -78,7 +78,7 @@ install: build
$(MAKE) install DESTDIR=$(CURDIR)/debian/potracegui-trinity $(MAKE) install DESTDIR=$(CURDIR)/debian/potracegui-trinity
mkdir -p $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/tde 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 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/ 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 rmdir $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Utilities

Loading…
Cancel
Save