summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdebase/debian
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-02-20 01:21:16 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-02-20 01:21:16 +0100
commitafb6a6ccadadd2f40f9b1bdd876babeb8bbbfa33 (patch)
tree9088f7e0e93356a444a5c7f10e4367e134f30290 /ubuntu/maverick/tdebase/debian
parente06097dff72beaf58ce3ff2e2debf4d4a3303a5d (diff)
downloadtde-packaging-afb6a6ccadadd2f40f9b1bdd876babeb8bbbfa33.tar.gz
tde-packaging-afb6a6ccadadd2f40f9b1bdd876babeb8bbbfa33.zip
Remove merged handbooks in tdebase on Debian and Ubuntu
Refresh patches in tdebase on Ubuntu
Diffstat (limited to 'ubuntu/maverick/tdebase/debian')
-rw-r--r--ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff10
-rw-r--r--ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install9
2 files changed, 6 insertions, 13 deletions
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
index 4928bbed6..1ecc9f46f 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
@@ -1,7 +1,9 @@
---- tdebase/kicker/kicker/kcmkicker.desktop 2005-03-17 01:03:22.645846992 +0000
-+++ tdebase/kicker/kicker/kcmkicker.desktop 2005-03-17 01:03:30.907591016 +0000
-@@ -67,3 +67,4 @@
- DocPath=kicker/index.html
+Index: b/kicker/kicker/kcmkicker.desktop
+===================================================================
+--- a/kicker/kicker/kcmkicker.desktop
++++ b/kicker/kicker/kcmkicker.desktop
+@@ -79,3 +79,4 @@
+ DocPath=kicker/configuring.html
OnlyShowIn=TDE;
Categories=Qt;TDE;Settings;
+NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
index d2f6bd2bf..5953d9305 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
@@ -251,9 +251,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmsmserver/index.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmstyle/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmstyle/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmstyle/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/index.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.docbook
@@ -287,12 +284,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.docbook