TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix kdiff3 FTBFS on Debian and Ubuntu

Browse Source
pull/3/head
Slávek Banko 11 years ago
parent e6d7e8e693
commit 260bfe4337
30 changed files with 126 additions and 126 deletions
Show Stats Download Patch File Download Diff File

2
debian/lenny/applications/kdiff3/debian/compat vendored
Unescape View File

@ -1 +1 @@
4
5

6
debian/lenny/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base vendored
Unescape View File

@ -1,4 +1,4 @@
Document: kdiff3
Document: kdiff3-trinity
Title: KDiff3 Handbook
Author: Joachim Eibl <joachim.eibl@gmx.de>
Abstract: The manual for KDiff3. KDiff3 compares two or three input files
@ -9,5 +9,5 @@ Abstract: The manual for KDiff3. KDiff3 compares two or three input files
Section: Apps/Programming
Format: HTML
Index: /usr/share/doc/kdiff3-doc/html/index.html
Files: /usr/share/doc/kdiff3-doc/html/*.html
Index: /opt/trinity/share/doc/kdiff3/html/index.html
Files: /opt/trinity/share/doc/kdiff3/html/*.html

2
debian/lenny/applications/kdiff3/debian/kdiff3-trinity-doc.install vendored
Unescape View File

@ -1,2 +1,2 @@
/opt/trinity/share/doc/tde
/opt/trinity/share/doc/kdiff3-doc/html
/opt/trinity/share/doc/kdiff3/html

24
debian/lenny/applications/kdiff3/debian/kdiff3-trinity-doc.links vendored
Unescape View File

@ -83,15 +83,15 @@
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/white_space.png
/opt/trinity/share/doc/tde/HTML/en/common /opt/trinity/share/doc/kdiff3-doc/html/common
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/kdiff3-doc/html/dirbrowser.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/kdiff3-doc/html/dirmergebig.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/kdiff3-doc/html/iteminfo.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/kdiff3-doc/html/letter_by_letter.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/kdiff3-doc/html/merge_current.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/kdiff3-doc/html/new.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/kdiff3-doc/html/open_dialog.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/kdiff3-doc/html/screenshot_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/kdiff3-doc/html/screenshot_merge.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/kdiff3-doc/html/triple_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/kdiff3-doc/html/white_space.png
/opt/trinity/share/doc/tde/HTML/en/common /opt/trinity/share/doc/kdiff3/html/common
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/kdiff3/html/dirbrowser.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/kdiff3/html/dirmergebig.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/kdiff3/html/iteminfo.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/kdiff3/html/letter_by_letter.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/kdiff3/html/merge_current.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/kdiff3/html/new.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/kdiff3/html/open_dialog.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/kdiff3/html/screenshot_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/kdiff3/html/screenshot_merge.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/kdiff3/html/triple_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/kdiff3/html/white_space.png

8
debian/lenny/applications/kdiff3/debian/rules vendored
Unescape View File

@ -74,14 +74,14 @@ install: build
dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
kde_htmldir=/opt/trinity/share/doc/tde/HTML
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/kdiff3
# that's not where we want to have a man page
rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/kdiff3.1
# move HTML help /opt/trinity/share/doc/kdiff3/html/
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
mv $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
mv $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
rmdir $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc
# move kdiff3.desktop to freedesktop.org conforming place
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/
mv $(CURDIR)/debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/

2
debian/squeeze/applications/kdiff3/debian/compat vendored
Unescape View File

@ -1 +1 @@
4
5

6
debian/squeeze/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base vendored
Unescape View File

@ -1,4 +1,4 @@
Document: kdiff3
Document: kdiff3-trinity
Title: KDiff3 Handbook
Author: Joachim Eibl <joachim.eibl@gmx.de>
Abstract: The manual for KDiff3. KDiff3 compares two or three input files
@ -9,5 +9,5 @@ Abstract: The manual for KDiff3. KDiff3 compares two or three input files
Section: Apps/Programming
Format: HTML
Index: /usr/share/doc/kdiff3-doc/html/index.html
Files: /usr/share/doc/kdiff3-doc/html/*.html
Index: /opt/trinity/share/doc/kdiff3/html/index.html
Files: /opt/trinity/share/doc/kdiff3/html/*.html

2
debian/squeeze/applications/kdiff3/debian/kdiff3-trinity-doc.install vendored
Unescape View File

@ -1,2 +1,2 @@
/opt/trinity/share/doc/tde
/opt/trinity/share/doc/kdiff3-doc/html
/opt/trinity/share/doc/kdiff3/html

24
debian/squeeze/applications/kdiff3/debian/kdiff3-trinity-doc.links vendored
Unescape View File

@ -83,15 +83,15 @@
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/white_space.png
/opt/trinity/share/doc/tde/HTML/en/common /opt/trinity/share/doc/kdiff3-doc/html/common
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/kdiff3-doc/html/dirbrowser.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/kdiff3-doc/html/dirmergebig.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/kdiff3-doc/html/iteminfo.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/kdiff3-doc/html/letter_by_letter.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/kdiff3-doc/html/merge_current.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/kdiff3-doc/html/new.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/kdiff3-doc/html/open_dialog.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/kdiff3-doc/html/screenshot_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/kdiff3-doc/html/screenshot_merge.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/kdiff3-doc/html/triple_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/kdiff3-doc/html/white_space.png
/opt/trinity/share/doc/tde/HTML/en/common /opt/trinity/share/doc/kdiff3/html/common
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/kdiff3/html/dirbrowser.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/kdiff3/html/dirmergebig.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/kdiff3/html/iteminfo.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/kdiff3/html/letter_by_letter.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/kdiff3/html/merge_current.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/kdiff3/html/new.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/kdiff3/html/open_dialog.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/kdiff3/html/screenshot_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/kdiff3/html/screenshot_merge.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/kdiff3/html/triple_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/kdiff3/html/white_space.png

8
debian/squeeze/applications/kdiff3/debian/rules vendored
Unescape View File

@ -74,14 +74,14 @@ install: build
dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
kde_htmldir=/opt/trinity/share/doc/tde/HTML
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/kdiff3
# that's not where we want to have a man page
rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/kdiff3.1
# move HTML help /opt/trinity/share/doc/kdiff3/html/
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
mv $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
mv $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
rmdir $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc
# move kdiff3.desktop to freedesktop.org conforming place
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/
mv $(CURDIR)/debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/

2
debian/wheezy/applications/kdiff3/debian/compat vendored
Unescape View File

@ -1 +1 @@
4
5

6
debian/wheezy/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base vendored
Unescape View File

@ -1,4 +1,4 @@
Document: kdiff3
Document: kdiff3-trinity
Title: KDiff3 Handbook
Author: Joachim Eibl <joachim.eibl@gmx.de>
Abstract: The manual for KDiff3. KDiff3 compares two or three input files
@ -9,5 +9,5 @@ Abstract: The manual for KDiff3. KDiff3 compares two or three input files
Section: Apps/Programming
Format: HTML
Index: /usr/share/doc/kdiff3-doc/html/index.html
Files: /usr/share/doc/kdiff3-doc/html/*.html
Index: /opt/trinity/share/doc/kdiff3/html/index.html
Files: /opt/trinity/share/doc/kdiff3/html/*.html

2
debian/wheezy/applications/kdiff3/debian/kdiff3-trinity-doc.install vendored
Unescape View File

@ -1,2 +1,2 @@
/opt/trinity/share/doc/tde
/opt/trinity/share/doc/kdiff3-doc/html
/opt/trinity/share/doc/kdiff3/html

24
debian/wheezy/applications/kdiff3/debian/kdiff3-trinity-doc.links vendored
Unescape View File

@ -83,15 +83,15 @@
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/white_space.png
/opt/trinity/share/doc/tde/HTML/en/common /opt/trinity/share/doc/kdiff3-doc/html/common
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/kdiff3-doc/html/dirbrowser.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/kdiff3-doc/html/dirmergebig.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/kdiff3-doc/html/iteminfo.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/kdiff3-doc/html/letter_by_letter.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/kdiff3-doc/html/merge_current.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/kdiff3-doc/html/new.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/kdiff3-doc/html/open_dialog.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/kdiff3-doc/html/screenshot_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/kdiff3-doc/html/screenshot_merge.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/kdiff3-doc/html/triple_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/kdiff3-doc/html/white_space.png
/opt/trinity/share/doc/tde/HTML/en/common /opt/trinity/share/doc/kdiff3/html/common
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/kdiff3/html/dirbrowser.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/kdiff3/html/dirmergebig.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/kdiff3/html/iteminfo.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/kdiff3/html/letter_by_letter.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/kdiff3/html/merge_current.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/kdiff3/html/new.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/kdiff3/html/open_dialog.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/kdiff3/html/screenshot_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/kdiff3/html/screenshot_merge.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/kdiff3/html/triple_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/kdiff3/html/white_space.png

8
debian/wheezy/applications/kdiff3/debian/rules vendored
Unescape View File

@ -74,14 +74,14 @@ install: build
dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
kde_htmldir=/opt/trinity/share/doc/tde/HTML
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/kdiff3
# that's not where we want to have a man page
rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/kdiff3.1
# move HTML help /opt/trinity/share/doc/kdiff3/html/
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
mv $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
mv $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
rmdir $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc
# move kdiff3.desktop to freedesktop.org conforming place
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/
mv $(CURDIR)/debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/

2
ubuntu/maverick/applications/kdiff3/debian/compat
Unescape View File

@ -1 +1 @@
4
5

6
ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
Unescape View File

@ -1,4 +1,4 @@
Document: kdiff3
Document: kdiff3-trinity
Title: KDiff3 Handbook
Author: Joachim Eibl <joachim.eibl@gmx.de>
Abstract: The manual for KDiff3. KDiff3 compares two or three input files
@ -9,5 +9,5 @@ Abstract: The manual for KDiff3. KDiff3 compares two or three input files
Section: Apps/Programming
Format: HTML
Index: /usr/share/doc/kdiff3-doc/html/index.html
Files: /usr/share/doc/kdiff3-doc/html/*.html
Index: /opt/trinity/share/doc/kdiff3/html/index.html
Files: /opt/trinity/share/doc/kdiff3/html/*.html

2
ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.install
Unescape View File

@ -1,2 +1,2 @@
/opt/trinity/share/doc/tde
/opt/trinity/share/doc/kdiff3-doc/html
/opt/trinity/share/doc/kdiff3/html

24
ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.links
Unescape View File

@ -83,15 +83,15 @@
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/white_space.png
/opt/trinity/share/doc/tde/HTML/en/common /opt/trinity/share/doc/kdiff3-doc/html/common
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/kdiff3-doc/html/dirbrowser.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/kdiff3-doc/html/dirmergebig.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/kdiff3-doc/html/iteminfo.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/kdiff3-doc/html/letter_by_letter.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/kdiff3-doc/html/merge_current.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/kdiff3-doc/html/new.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/kdiff3-doc/html/open_dialog.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/kdiff3-doc/html/screenshot_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/kdiff3-doc/html/screenshot_merge.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/kdiff3-doc/html/triple_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/kdiff3-doc/html/white_space.png
/opt/trinity/share/doc/tde/HTML/en/common /opt/trinity/share/doc/kdiff3/html/common
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/kdiff3/html/dirbrowser.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/kdiff3/html/dirmergebig.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/kdiff3/html/iteminfo.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/kdiff3/html/letter_by_letter.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/kdiff3/html/merge_current.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/kdiff3/html/new.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/kdiff3/html/open_dialog.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/kdiff3/html/screenshot_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/kdiff3/html/screenshot_merge.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/kdiff3/html/triple_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/kdiff3/html/white_space.png

8
ubuntu/maverick/applications/kdiff3/debian/rules
Unescape View File

@ -74,14 +74,14 @@ install: build
dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
kde_htmldir=/opt/trinity/share/doc/tde/HTML
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/kdiff3
# that's not where we want to have a man page
rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/kdiff3.1
# move HTML help /opt/trinity/share/doc/kdiff3/html/
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
mv $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
mv $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
rmdir $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc
# move kdiff3.desktop to freedesktop.org conforming place
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/
mv $(CURDIR)/debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/

2
ubuntu/precise/applications/kdiff3/debian/compat
Unescape View File

@ -1 +1 @@
4
5

6
ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
Unescape View File

@ -1,4 +1,4 @@
Document: kdiff3
Document: kdiff3-trinity
Title: KDiff3 Handbook
Author: Joachim Eibl <joachim.eibl@gmx.de>
Abstract: The manual for KDiff3. KDiff3 compares two or three input files
@ -9,5 +9,5 @@ Abstract: The manual for KDiff3. KDiff3 compares two or three input files
Section: Apps/Programming
Format: HTML
Index: /usr/share/doc/kdiff3-doc/html/index.html
Files: /usr/share/doc/kdiff3-doc/html/*.html
Index: /opt/trinity/share/doc/kdiff3/html/index.html
Files: /opt/trinity/share/doc/kdiff3/html/*.html

2
ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.install
Unescape View File

@ -1,2 +1,2 @@
/opt/trinity/share/doc/tde
/opt/trinity/share/doc/kdiff3-doc/html
/opt/trinity/share/doc/kdiff3/html

24
ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.links
Unescape View File

@ -83,15 +83,15 @@
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/white_space.png
/opt/trinity/share/doc/tde/HTML/en/common /opt/trinity/share/doc/kdiff3-doc/html/common
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/kdiff3-doc/html/dirbrowser.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/kdiff3-doc/html/dirmergebig.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/kdiff3-doc/html/iteminfo.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/kdiff3-doc/html/letter_by_letter.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/kdiff3-doc/html/merge_current.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/kdiff3-doc/html/new.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/kdiff3-doc/html/open_dialog.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/kdiff3-doc/html/screenshot_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/kdiff3-doc/html/screenshot_merge.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/kdiff3-doc/html/triple_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/kdiff3-doc/html/white_space.png
/opt/trinity/share/doc/tde/HTML/en/common /opt/trinity/share/doc/kdiff3/html/common
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/kdiff3/html/dirbrowser.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/kdiff3/html/dirmergebig.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/kdiff3/html/iteminfo.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/kdiff3/html/letter_by_letter.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/kdiff3/html/merge_current.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/kdiff3/html/new.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/kdiff3/html/open_dialog.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/kdiff3/html/screenshot_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/kdiff3/html/screenshot_merge.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/kdiff3/html/triple_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/kdiff3/html/white_space.png

8
ubuntu/precise/applications/kdiff3/debian/rules
Unescape View File

@ -74,14 +74,14 @@ install: build
dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
kde_htmldir=/opt/trinity/share/doc/tde/HTML
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/kdiff3
# that's not where we want to have a man page
rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/kdiff3.1
# move HTML help /opt/trinity/share/doc/kdiff3/html/
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
mv $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
mv $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
rmdir $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc
# move kdiff3.desktop to freedesktop.org conforming place
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/
mv $(CURDIR)/debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/

2
ubuntu/raring/applications/kdiff3/debian/compat
Unescape View File

@ -1 +1 @@
4
5

6
ubuntu/raring/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
Unescape View File

@ -1,4 +1,4 @@
Document: kdiff3
Document: kdiff3-trinity
Title: KDiff3 Handbook
Author: Joachim Eibl <joachim.eibl@gmx.de>
Abstract: The manual for KDiff3. KDiff3 compares two or three input files
@ -9,5 +9,5 @@ Abstract: The manual for KDiff3. KDiff3 compares two or three input files
Section: Apps/Programming
Format: HTML
Index: /usr/share/doc/kdiff3-doc/html/index.html
Files: /usr/share/doc/kdiff3-doc/html/*.html
Index: /opt/trinity/share/doc/kdiff3/html/index.html
Files: /opt/trinity/share/doc/kdiff3/html/*.html

2
ubuntu/raring/applications/kdiff3/debian/kdiff3-trinity-doc.install
Unescape View File

@ -1,2 +1,2 @@
/opt/trinity/share/doc/tde
/opt/trinity/share/doc/kdiff3-doc/html
/opt/trinity/share/doc/kdiff3/html

24
ubuntu/raring/applications/kdiff3/debian/kdiff3-trinity-doc.links
Unescape View File

@ -83,15 +83,15 @@
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/white_space.png
/opt/trinity/share/doc/tde/HTML/en/common /opt/trinity/share/doc/kdiff3-doc/html/common
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/kdiff3-doc/html/dirbrowser.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/kdiff3-doc/html/dirmergebig.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/kdiff3-doc/html/iteminfo.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/kdiff3-doc/html/letter_by_letter.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/kdiff3-doc/html/merge_current.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/kdiff3-doc/html/new.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/kdiff3-doc/html/open_dialog.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/kdiff3-doc/html/screenshot_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/kdiff3-doc/html/screenshot_merge.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/kdiff3-doc/html/triple_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/kdiff3-doc/html/white_space.png
/opt/trinity/share/doc/tde/HTML/en/common /opt/trinity/share/doc/kdiff3/html/common
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/kdiff3/html/dirbrowser.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/kdiff3/html/dirmergebig.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/kdiff3/html/iteminfo.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/kdiff3/html/letter_by_letter.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/kdiff3/html/merge_current.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/kdiff3/html/new.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/kdiff3/html/open_dialog.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/kdiff3/html/screenshot_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/kdiff3/html/screenshot_merge.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/kdiff3/html/triple_diff.png
/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/kdiff3/html/white_space.png

8
ubuntu/raring/applications/kdiff3/debian/rules
Unescape View File

@ -74,14 +74,14 @@ install: build
dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
kde_htmldir=/opt/trinity/share/doc/tde/HTML
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/kdiff3
# that's not where we want to have a man page
rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/kdiff3.1
# move HTML help /opt/trinity/share/doc/kdiff3/html/
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
mv $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
mv $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
rmdir $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc
# move kdiff3.desktop to freedesktop.org conforming place
mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/
mv $(CURDIR)/debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/

Write Preview
Loading…
Cancel
Save