[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-7+squeeze1-110-g4ad8b69
Modestas Vainius
modax at alioth.debian.org
Mon Mar 28 22:11:54 UTC 2011
The following commit has been merged in the master branch:
commit 186b0b3cd7b2e75127427f8575f42b518f2be948
Author: Modestas Vainius <modax at debian.org>
Date: Tue Mar 29 00:39:17 2011 +0300
Strip sequence numbers from the debian/patches/*.
---
debian/changelog | 1 +
...> be_better_at_honouring_user_kdm_theming.diff} | 0
...braries.diff => fix_target_link_libraries.diff} | 0
.../{09_genkdm_make.diff => genkdm_make.diff} | 0
.../{08_genkdmconf.diff => genkdmconf.diff} | 0
.../{11_kdm_X_path.diff => kdm_X_path.diff} | 0
...ak_havoc.diff => kdm_does_not_wreak_havoc.diff} | 0
.../{10_kdm_no_custom.diff => kdm_no_custom.diff} | 0
...m_override_docs.diff => kdm_override_docs.diff} | 0
...ebsd.diff => kdm_vt_switching_on_kfreebsd.diff} | 0
...amework.diff => kdm_xreset_hook_framework.diff} | 0
...{07_kdmrc_defaults.diff => kdmrc_defaults.diff} | 0
...iff => ksmserver_fadeeffect_use_sse2_free.diff} | 0
...in_etc.diff => place_global_config_in_etc.diff} | 0
...tart.diff => plasma_netbook_fix_autostart.diff} | 0
...diff => qguiplatformplugin_kde_NULL_check.diff} | 0
..._kde.diff => run_kaboom_when_starting_kde.diff} | 0
debian/patches/series | 32 ++++++++++----------
...t_font.diff => use_dejavu_as_default_font.diff} | 0
19 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c5432c4..7f56bb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -136,6 +136,7 @@ kdebase-workspace (4:4.6.1-0r2) UNRELEASED; urgency=low
+ replace @Base with appropriate @ABI string;
+ restart symbol confirmation process at 4:4.6.1;
* Add symbol file for libweather-ion6.
+ * Strip sequence numbers from the debian/patches/*.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 31 Jul 2010 16:41:50 +0300
diff --git a/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff b/debian/patches/be_better_at_honouring_user_kdm_theming.diff
similarity index 100%
rename from debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
rename to debian/patches/be_better_at_honouring_user_kdm_theming.diff
diff --git a/debian/patches/97_fix_target_link_libraries.diff b/debian/patches/fix_target_link_libraries.diff
similarity index 100%
rename from debian/patches/97_fix_target_link_libraries.diff
rename to debian/patches/fix_target_link_libraries.diff
diff --git a/debian/patches/09_genkdm_make.diff b/debian/patches/genkdm_make.diff
similarity index 100%
rename from debian/patches/09_genkdm_make.diff
rename to debian/patches/genkdm_make.diff
diff --git a/debian/patches/08_genkdmconf.diff b/debian/patches/genkdmconf.diff
similarity index 100%
rename from debian/patches/08_genkdmconf.diff
rename to debian/patches/genkdmconf.diff
diff --git a/debian/patches/11_kdm_X_path.diff b/debian/patches/kdm_X_path.diff
similarity index 100%
rename from debian/patches/11_kdm_X_path.diff
rename to debian/patches/kdm_X_path.diff
diff --git a/debian/patches/06_kdm_does_not_wreak_havoc.diff b/debian/patches/kdm_does_not_wreak_havoc.diff
similarity index 100%
rename from debian/patches/06_kdm_does_not_wreak_havoc.diff
rename to debian/patches/kdm_does_not_wreak_havoc.diff
diff --git a/debian/patches/10_kdm_no_custom.diff b/debian/patches/kdm_no_custom.diff
similarity index 100%
rename from debian/patches/10_kdm_no_custom.diff
rename to debian/patches/kdm_no_custom.diff
diff --git a/debian/patches/13_kdm_override_docs.diff b/debian/patches/kdm_override_docs.diff
similarity index 100%
rename from debian/patches/13_kdm_override_docs.diff
rename to debian/patches/kdm_override_docs.diff
diff --git a/debian/patches/31_kdm_vt_switching_on_kfreebsd.diff b/debian/patches/kdm_vt_switching_on_kfreebsd.diff
similarity index 100%
rename from debian/patches/31_kdm_vt_switching_on_kfreebsd.diff
rename to debian/patches/kdm_vt_switching_on_kfreebsd.diff
diff --git a/debian/patches/22_kdm_xreset_hook_framework.diff b/debian/patches/kdm_xreset_hook_framework.diff
similarity index 100%
rename from debian/patches/22_kdm_xreset_hook_framework.diff
rename to debian/patches/kdm_xreset_hook_framework.diff
diff --git a/debian/patches/07_kdmrc_defaults.diff b/debian/patches/kdmrc_defaults.diff
similarity index 100%
rename from debian/patches/07_kdmrc_defaults.diff
rename to debian/patches/kdmrc_defaults.diff
diff --git a/debian/patches/32_ksmserver_fadeeffect_use_sse2_free.diff b/debian/patches/ksmserver_fadeeffect_use_sse2_free.diff
similarity index 100%
rename from debian/patches/32_ksmserver_fadeeffect_use_sse2_free.diff
rename to debian/patches/ksmserver_fadeeffect_use_sse2_free.diff
diff --git a/debian/patches/21_place_global_config_in_etc.diff b/debian/patches/place_global_config_in_etc.diff
similarity index 100%
rename from debian/patches/21_place_global_config_in_etc.diff
rename to debian/patches/place_global_config_in_etc.diff
diff --git a/debian/patches/30_plasma_netbook_fix_autostart.diff b/debian/patches/plasma_netbook_fix_autostart.diff
similarity index 100%
rename from debian/patches/30_plasma_netbook_fix_autostart.diff
rename to debian/patches/plasma_netbook_fix_autostart.diff
diff --git a/debian/patches/33_qguiplatformplugin_kde_NULL_check.diff b/debian/patches/qguiplatformplugin_kde_NULL_check.diff
similarity index 100%
rename from debian/patches/33_qguiplatformplugin_kde_NULL_check.diff
rename to debian/patches/qguiplatformplugin_kde_NULL_check.diff
diff --git a/debian/patches/26_run_kaboom_when_starting_kde.diff b/debian/patches/run_kaboom_when_starting_kde.diff
similarity index 100%
rename from debian/patches/26_run_kaboom_when_starting_kde.diff
rename to debian/patches/run_kaboom_when_starting_kde.diff
diff --git a/debian/patches/series b/debian/patches/series
index e5e4b6c..878075a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,18 +1,18 @@
-06_kdm_does_not_wreak_havoc.diff
-07_kdmrc_defaults.diff
-08_genkdmconf.diff
-09_genkdm_make.diff
-10_kdm_no_custom.diff
-11_kdm_X_path.diff
-12_be_better_at_honouring_user_kdm_theming.diff
-13_kdm_override_docs.diff
-20_use_dejavu_as_default_font.diff
-21_place_global_config_in_etc.diff
-22_kdm_xreset_hook_framework.diff
-26_run_kaboom_when_starting_kde.diff
-30_plasma_netbook_fix_autostart.diff
-32_ksmserver_fadeeffect_use_sse2_free.diff
-33_qguiplatformplugin_kde_NULL_check.diff
-97_fix_target_link_libraries.diff
+kdm_does_not_wreak_havoc.diff
+kdmrc_defaults.diff
+genkdmconf.diff
+genkdm_make.diff
+kdm_no_custom.diff
+kdm_X_path.diff
+be_better_at_honouring_user_kdm_theming.diff
+kdm_override_docs.diff
+use_dejavu_as_default_font.diff
+place_global_config_in_etc.diff
+kdm_xreset_hook_framework.diff
+run_kaboom_when_starting_kde.diff
+plasma_netbook_fix_autostart.diff
+ksmserver_fadeeffect_use_sse2_free.diff
+qguiplatformplugin_kde_NULL_check.diff
+fix_target_link_libraries.diff
upstream_kwin_blacklist_add_shebang.diff
enable_debianabimanager.diff
diff --git a/debian/patches/20_use_dejavu_as_default_font.diff b/debian/patches/use_dejavu_as_default_font.diff
similarity index 100%
rename from debian/patches/20_use_dejavu_as_default_font.diff
rename to debian/patches/use_dejavu_as_default_font.diff
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list