summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-03-25 10:12:02 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-03-25 18:06:38 +0900
commit6ebd6647ab195afc487ce73f5fc9f818e92ddd45 (patch)
treed471575357e01b091a7dd7cbea4090bda4fc854a
parent1918a0fa4f39111a5c9d47a6a9e3eb67ed0f33a2 (diff)
downloadtde-packaging-6ebd6647ab195afc487ce73f5fc9f818e92ddd45.tar.gz
tde-packaging-6ebd6647ab195afc487ce73f5fc9f818e92ddd45.zip
DEB tdebase: refresh ubuntu patches
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 5700a48796c183f712d9840550d68e06e626b0c7)
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff2
11 files changed, 11 insertions, 11 deletions
diff --git a/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 598cd7092..99db98c6f 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -1,6 +1,6 @@
--- a/starttde
+++ b/starttde
-@@ -288,17 +288,17 @@
+@@ -396,17 +396,17 @@
. "$tdehome/share/config/startupconfig"
fi
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
index 79aebbd1d..bb1dccd7b 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
@@ -2,7 +2,7 @@ diff --git a/kate/data/kwrite.desktop b/kate/data/kwrite.desktop
index dd64b58..0af3e44 100644
--- a/kate/data/kwrite.desktop
+++ b/kate/data/kwrite.desktop
-@@ -109,3 +109,4 @@ Terminal=false
+@@ -12,3 +12,4 @@ Terminal=false
X-TDE-InitialPreference=8
X-DCOP-ServiceType=Multi
Categories=Qt;TDE;TextEditor;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
index 608802a75..64adee330 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
@@ -2,7 +2,7 @@ diff --git a/knetattach/knetattach.desktop b/knetattach/knetattach.desktop
index 6003b68..f33e1f4 100644
--- a/knetattach/knetattach.desktop
+++ b/knetattach/knetattach.desktop
-@@ -80,3 +80,4 @@ Terminal=false
+@@ -11,3 +11,4 @@ Terminal=false
X-TDE-StartupNotify=true
Categories=Qt;TDE;Network;
X-DocPath=knetattach/index.html
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
index 0bbb613a9..e5b89e2ba 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
@@ -1,6 +1,6 @@
--- tdebase/kpersonalizer/kpersonalizer.desktop-orig 2005-03-17 01:05:16.091600616 +0000
+++ tdebase/kpersonalizer/kpersonalizer.desktop 2005-03-17 01:05:23.678447240 +0000
-@@ -77,3 +77,4 @@
+@@ -13,3 +13,4 @@
X-DCOP-ServiceType=Multi
Categories=Qt;TDE;Settings;
OnlyShowIn=TDE;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
index e12245486..ef79cc8eb 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
@@ -2,7 +2,7 @@ Index: b/konqueror/konquerorsu.desktop
===================================================================
--- a/konqueror/konquerorsu.desktop
+++ b/konqueror/konquerorsu.desktop
-@@ -88,3 +88,4 @@
+@@ -11,3 +11,4 @@
Categories=Qt;TDE;X-TDE-System-su;
OnlyShowIn=TDE;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
index 009d6f9db..e8f88b7f4 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
@@ -2,7 +2,7 @@ diff --git a/kcontrol/tdefontinst/viewpart/tdefontview.desktop b/kcontrol/tdefon
index 5d5e2b8..c989adf 100644
--- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
-@@ -99,3 +99,4 @@ Terminal=false
+@@ -10,3 +10,4 @@ Terminal=false
X-TDE-InitialPreference=1
Categories=Qt;TDE;Graphics;
X-DocPath=tdefontview/index.html
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
index 3eab104cb..e1d2567bd 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
@@ -1,6 +1,6 @@
--- tdebase/kpager/kpager.desktop
+++ tdebase/kpager/kpager.desktop
-@@ -96,3 +96,4 @@
+@@ -11,3 +11,4 @@
X-TDE-StartupNotify=false
X-DCOP-ServiceType=Unique
Categories=Qt;TDE;Utility;X-TDE-Utilities-Desktop;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
index a46ab143c..bfac9d8ea 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
@@ -1,6 +1,6 @@
--- tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop
+++ tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop
-@@ -90,3 +90,4 @@
+@@ -9,3 +9,4 @@
Terminal=false
X-DCOP-ServiceType=Multi
Categories=Qt;TDE;Utility;X-TDE-Utilities-Peripherals;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
index baeb8bfd5..f8f84573e 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
@@ -11,7 +11,7 @@
TQHBoxLayout* hbuttonbox;
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
-@@ -697,7 +697,7 @@
+@@ -725,7 +725,7 @@
2 * KDialog::spacingHint() );
// default factor
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
index 8db1221a5..98fae0e38 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
@@ -1,6 +1,6 @@
--- tdebase-3.5.7/kfind/Kfind.desktop
+++ tdebase-3.5.7/kfind/Kfind.desktop
-@@ -73,3 +73,4 @@
+@@ -9,3 +9,4 @@
X-TDE-StartupNotify=true
OnlyShowIn=TDE;
Categories=Qt;TDE;Core;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
index c312b6fb7..49a653275 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
@@ -1,6 +1,6 @@
--- tdebase-3.5.8/tdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200
+++ tdebase-3.5.8/tdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200
-@@ -996,9 +996,14 @@ ReapChildren( void )
+@@ -1023,9 +1023,14 @@ ReapChildren( void )
/* don't kill again */
break;
case running: