summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-02-17 05:33:23 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-02-17 05:33:23 +0100
commite06097dff72beaf58ce3ff2e2debf4d4a3303a5d (patch)
tree59a623e0e9a4eaa440a679621b282b833f1ebb14 /ubuntu
parent4f1d2555a7756ef6bf87baafe1e44f9c8f56a7f7 (diff)
downloadtde-packaging-e06097dff72beaf58ce3ff2e2debf4d4a3303a5d.tar.gz
tde-packaging-e06097dff72beaf58ce3ff2e2debf4d4a3303a5d.zip
Add new handbooks to tdebase on Debian and Ubuntu
Refresh patches in tdebase on Ubuntu
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff10
-rw-r--r--ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff10
-rw-r--r--ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install3
-rw-r--r--ubuntu/precise/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff10
-rw-r--r--ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff10
-rw-r--r--ubuntu/precise/tdebase/debian/tdebase-data-trinity.install3
-rw-r--r--ubuntu/raring/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff10
-rw-r--r--ubuntu/raring/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff10
-rw-r--r--ubuntu/raring/tdebase/debian/tdebase-data-trinity.install3
9 files changed, 45 insertions, 24 deletions
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
index bd56fd131..e12245486 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
@@ -1,7 +1,9 @@
---- tdebase/konqueror/konquerorsu.desktop
-+++ tdebase/konqueror/konquerorsu.desktop
-@@ -82,3 +82,4 @@
+Index: b/konqueror/konquerorsu.desktop
+===================================================================
+--- a/konqueror/konquerorsu.desktop
++++ b/konqueror/konquerorsu.desktop
+@@ -88,3 +88,4 @@
Categories=Qt;TDE;X-TDE-System-su;
- NotShowIn=GNOME;
+ OnlyShowIn=TDE;
+NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
index a9123cf3b..e6228a283 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
@@ -1,7 +1,9 @@
---- tdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop
-+++ tdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop
-@@ -71,3 +71,4 @@
- Terminal=false
+Index: b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+===================================================================
+--- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop
++++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+@@ -99,3 +99,4 @@
InitialPreference=1
Categories=Qt;TDE;Graphics;
+ DocPath=tdefontview/index.html
+NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
index 7dbe02895..d2f6bd2bf 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
@@ -370,6 +370,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.doc
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefontview/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefontview/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefontview/index.docbook
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/access.png
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/acroread.png
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/applixware.png
diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
index bd56fd131..e12245486 100644
--- a/ubuntu/precise/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
@@ -1,7 +1,9 @@
---- tdebase/konqueror/konquerorsu.desktop
-+++ tdebase/konqueror/konquerorsu.desktop
-@@ -82,3 +82,4 @@
+Index: b/konqueror/konquerorsu.desktop
+===================================================================
+--- a/konqueror/konquerorsu.desktop
++++ b/konqueror/konquerorsu.desktop
+@@ -88,3 +88,4 @@
Categories=Qt;TDE;X-TDE-System-su;
- NotShowIn=GNOME;
+ OnlyShowIn=TDE;
+NoDisplay=true
diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
index a9123cf3b..e6228a283 100644
--- a/ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
@@ -1,7 +1,9 @@
---- tdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop
-+++ tdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop
-@@ -71,3 +71,4 @@
- Terminal=false
+Index: b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+===================================================================
+--- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop
++++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+@@ -99,3 +99,4 @@
InitialPreference=1
Categories=Qt;TDE;Graphics;
+ DocPath=tdefontview/index.html
+NoDisplay=true
diff --git a/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install b/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install
index 7dbe02895..d2f6bd2bf 100644
--- a/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install
@@ -370,6 +370,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.doc
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefontview/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefontview/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefontview/index.docbook
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/access.png
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/acroread.png
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/applixware.png
diff --git a/ubuntu/raring/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff b/ubuntu/raring/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
index bd56fd131..e12245486 100644
--- a/ubuntu/raring/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
+++ b/ubuntu/raring/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
@@ -1,7 +1,9 @@
---- tdebase/konqueror/konquerorsu.desktop
-+++ tdebase/konqueror/konquerorsu.desktop
-@@ -82,3 +82,4 @@
+Index: b/konqueror/konquerorsu.desktop
+===================================================================
+--- a/konqueror/konquerorsu.desktop
++++ b/konqueror/konquerorsu.desktop
+@@ -88,3 +88,4 @@
Categories=Qt;TDE;X-TDE-System-su;
- NotShowIn=GNOME;
+ OnlyShowIn=TDE;
+NoDisplay=true
diff --git a/ubuntu/raring/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/raring/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
index a9123cf3b..e6228a283 100644
--- a/ubuntu/raring/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
+++ b/ubuntu/raring/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
@@ -1,7 +1,9 @@
---- tdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop
-+++ tdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop
-@@ -71,3 +71,4 @@
- Terminal=false
+Index: b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+===================================================================
+--- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop
++++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+@@ -99,3 +99,4 @@
InitialPreference=1
Categories=Qt;TDE;Graphics;
+ DocPath=tdefontview/index.html
+NoDisplay=true
diff --git a/ubuntu/raring/tdebase/debian/tdebase-data-trinity.install b/ubuntu/raring/tdebase/debian/tdebase-data-trinity.install
index 7dbe02895..d2f6bd2bf 100644
--- a/ubuntu/raring/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/raring/tdebase/debian/tdebase-data-trinity.install
@@ -370,6 +370,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.doc
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefontview/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefontview/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefontview/index.docbook
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/access.png
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/acroread.png
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/applixware.png