[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-2+squeeze1-119-g8489bf3

Modestas Vainius modax at alioth.debian.org
Sun Mar 27 17:42:58 UTC 2011


The following commit has been merged in the master branch:
commit 940a74e94e2b4ef64460bb638fe151534d14fd77
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Mar 27 14:24:05 2011 +0300

    Remove sequence numbers from debian/patches.
---
 debian/changelog                                   |    1 +
 ..._build_type.diff => add_debian_build_type.diff} |    0
 .../{16_debian_menu.diff => debian_menu.diff}      |    0
 ...efix.diff => default_kde4_xdg_menu_prefix.diff} |    0
 ...ath.diff => disable_usr_lib_install_rpath.diff} |    0
 ...read.diff => findqt4_optional_x11_pthread.diff} |    0
 ...findservicebydesktoppath_try_realfilepath.diff} |    0
 ...diff => hack_in_etc_kde4_in_kstandarddirs.diff} |    0
 ...de_ptm_device.diff => hardcode_ptm_device.diff} |    0
 .../{29_hurd_support.diff => hurd_support.diff}    |    0
 ...kconf_update_migrate_from_kde3_icon_theme.diff} |    0
 ...set.diff => kfileshare_kdesu_fileshareset.diff} |    0
 ...kfreebsd_support.diff => kfreebsd_support.diff} |    0
 ...kfreebsd_fix.diff => konsole_kfreebsd_fix.diff} |    0
 ...uitools.diff => ld_exclude_libs_qtuitools.diff} |    0
 ..._private.diff => make_libkdeinit4_private.diff} |    0
 ...ns_path.diff => qt4_designer_plugins_path.diff} |    0
 ...ck.diff => relax_plugin_kde_version_check.diff} |    0
 debian/patches/series                              |   36 ++++++++++----------
 ...ouble_build.diff => solid_no_double_build.diff} |    0
 ...t_font.diff => use_dejavu_as_default_font.diff} |    0
 21 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index deed54a..3f12aaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ kde4libs (4:4.6.1-0r1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.1: add Breaks next to Replaces where needed.
   * Switch debian/rules engine to dhmk based qt-kde-team/2/*.
   * Drop kdelibs5 transitional package.
+  * Remove sequence numbers from debian/patches.
 
   [ George Kiagiadakis ]
   * Change my email address in uploaders.
diff --git a/debian/patches/08_add_debian_build_type.diff b/debian/patches/add_debian_build_type.diff
similarity index 100%
rename from debian/patches/08_add_debian_build_type.diff
rename to debian/patches/add_debian_build_type.diff
diff --git a/debian/patches/16_debian_menu.diff b/debian/patches/debian_menu.diff
similarity index 100%
rename from debian/patches/16_debian_menu.diff
rename to debian/patches/debian_menu.diff
diff --git a/debian/patches/11_default_kde4_xdg_menu_prefix.diff b/debian/patches/default_kde4_xdg_menu_prefix.diff
similarity index 100%
rename from debian/patches/11_default_kde4_xdg_menu_prefix.diff
rename to debian/patches/default_kde4_xdg_menu_prefix.diff
diff --git a/debian/patches/09_disable_usr_lib_install_rpath.diff b/debian/patches/disable_usr_lib_install_rpath.diff
similarity index 100%
rename from debian/patches/09_disable_usr_lib_install_rpath.diff
rename to debian/patches/disable_usr_lib_install_rpath.diff
diff --git a/debian/patches/19_findqt4_optional_x11_pthread.diff b/debian/patches/findqt4_optional_x11_pthread.diff
similarity index 100%
rename from debian/patches/19_findqt4_optional_x11_pthread.diff
rename to debian/patches/findqt4_optional_x11_pthread.diff
diff --git a/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff b/debian/patches/findservicebydesktoppath_try_realfilepath.diff
similarity index 100%
rename from debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
rename to debian/patches/findservicebydesktoppath_try_realfilepath.diff
diff --git a/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff b/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff
similarity index 100%
rename from debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
rename to debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff
diff --git a/debian/patches/14_hardcode_ptm_device.diff b/debian/patches/hardcode_ptm_device.diff
similarity index 100%
rename from debian/patches/14_hardcode_ptm_device.diff
rename to debian/patches/hardcode_ptm_device.diff
diff --git a/debian/patches/29_hurd_support.diff b/debian/patches/hurd_support.diff
similarity index 100%
rename from debian/patches/29_hurd_support.diff
rename to debian/patches/hurd_support.diff
diff --git a/debian/patches/01_kconf_update_migrate_from_kde3_icon_theme.diff b/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff
similarity index 100%
rename from debian/patches/01_kconf_update_migrate_from_kde3_icon_theme.diff
rename to debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff
diff --git a/debian/patches/30_kfileshare_kdesu_fileshareset.diff b/debian/patches/kfileshare_kdesu_fileshareset.diff
similarity index 100%
rename from debian/patches/30_kfileshare_kdesu_fileshareset.diff
rename to debian/patches/kfileshare_kdesu_fileshareset.diff
diff --git a/debian/patches/15_kfreebsd_support.diff b/debian/patches/kfreebsd_support.diff
similarity index 100%
rename from debian/patches/15_kfreebsd_support.diff
rename to debian/patches/kfreebsd_support.diff
diff --git a/debian/patches/27_konsole_kfreebsd_fix.diff b/debian/patches/konsole_kfreebsd_fix.diff
similarity index 100%
rename from debian/patches/27_konsole_kfreebsd_fix.diff
rename to debian/patches/konsole_kfreebsd_fix.diff
diff --git a/debian/patches/25_ld_exclude_libs_qtuitools.diff b/debian/patches/ld_exclude_libs_qtuitools.diff
similarity index 100%
rename from debian/patches/25_ld_exclude_libs_qtuitools.diff
rename to debian/patches/ld_exclude_libs_qtuitools.diff
diff --git a/debian/patches/10_make_libkdeinit4_private.diff b/debian/patches/make_libkdeinit4_private.diff
similarity index 100%
rename from debian/patches/10_make_libkdeinit4_private.diff
rename to debian/patches/make_libkdeinit4_private.diff
diff --git a/debian/patches/13_qt4_designer_plugins_path.diff b/debian/patches/qt4_designer_plugins_path.diff
similarity index 100%
rename from debian/patches/13_qt4_designer_plugins_path.diff
rename to debian/patches/qt4_designer_plugins_path.diff
diff --git a/debian/patches/31_relax_plugin_kde_version_check.diff b/debian/patches/relax_plugin_kde_version_check.diff
similarity index 100%
rename from debian/patches/31_relax_plugin_kde_version_check.diff
rename to debian/patches/relax_plugin_kde_version_check.diff
diff --git a/debian/patches/series b/debian/patches/series
index c7f3c14..e406468 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,18 +1,18 @@
-01_kconf_update_migrate_from_kde3_icon_theme.diff
-08_add_debian_build_type.diff
-09_disable_usr_lib_install_rpath.diff
-10_make_libkdeinit4_private.diff
-11_default_kde4_xdg_menu_prefix.diff
-13_qt4_designer_plugins_path.diff
-14_hardcode_ptm_device.diff
-15_kfreebsd_support.diff
-16_debian_menu.diff
-17_findservicebydesktoppath_try_realfilepath.diff
-19_findqt4_optional_x11_pthread.diff
-20_use_dejavu_as_default_font.diff
-22_hack_in_etc_kde4_in_kstandarddirs.diff
-25_ld_exclude_libs_qtuitools.diff
-27_konsole_kfreebsd_fix.diff
-29_hurd_support.diff
-30_kfileshare_kdesu_fileshareset.diff
-31_relax_plugin_kde_version_check.diff
+kconf_update_migrate_from_kde3_icon_theme.diff
+add_debian_build_type.diff
+disable_usr_lib_install_rpath.diff
+make_libkdeinit4_private.diff
+default_kde4_xdg_menu_prefix.diff
+qt4_designer_plugins_path.diff
+hardcode_ptm_device.diff
+kfreebsd_support.diff
+debian_menu.diff
+findservicebydesktoppath_try_realfilepath.diff
+findqt4_optional_x11_pthread.diff
+use_dejavu_as_default_font.diff
+hack_in_etc_kde4_in_kstandarddirs.diff
+ld_exclude_libs_qtuitools.diff
+konsole_kfreebsd_fix.diff
+hurd_support.diff
+kfileshare_kdesu_fileshareset.diff
+relax_plugin_kde_version_check.diff
diff --git a/debian/patches/23_solid_no_double_build.diff b/debian/patches/solid_no_double_build.diff
similarity index 100%
rename from debian/patches/23_solid_no_double_build.diff
rename to debian/patches/solid_no_double_build.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 Development Platform Libraries module packaging



More information about the pkg-kde-commits mailing list