[SCM] KDE Base Workspace module packaging branch, kde4.8, updated. debian/4.8.3-2-7-gbfb802e
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Tue Jun 5 16:56:56 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdebase-workspace.git;a=commitdiff;h=a5842f0
The following commit has been merged in the kde4.8 branch:
commit a5842f030072bbb90f9596a8dc6c75f511272185
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Tue Jun 5 17:32:15 2012 +0200
Refresh patches to make them apply without any offset.
---
debian/changelog | 1 +
debian/patches/enable_debianabimanager.diff | 2 +-
debian/patches/enable_dlrestrcitions.diff | 2 +-
debian/patches/genkdmconf.diff | 12 ++++++------
debian/patches/kdm_does_not_wreak_havoc.diff | 2 +-
debian/patches/kdm_vt_switching_on_kfreebsd.diff | 6 +++---
debian/patches/kdm_xreset_hook_framework.diff | 2 +-
debian/patches/place_global_config_in_etc.diff | 6 +++---
debian/patches/plasma_netbook_fix_autostart.diff | 2 +-
9 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1e368ab..1327b1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kde-workspace (4:4.8.4-0r0) UNRELEASED; urgency=low
[ José Manuel Santamaría Lema ]
* Bump kde-sc-dev-latest build dependency to 4:4.8.4.
+ * Refresh patches to make them apply without any offset.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 05 Jun 2012 16:48:51 +0200
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index b1903aa..aa49d06 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -9,7 +9,7 @@ For more information about DebianABIManager, refer to
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -258,3 +258,6 @@ install(EXPORT kdeworkspaceLibraryTarget
+@@ -261,3 +261,6 @@ install(EXPORT kdeworkspaceLibraryTarget
NAMESPACE ${KDE4WORKSPACE_TARGET_PREFIX}
DESTINATION ${_KDE4WorkspaceConfig_INSTALL_DIR}
FILE KDE4WorkspaceLibraryTargets.cmake )
diff --git a/debian/patches/enable_dlrestrcitions.diff b/debian/patches/enable_dlrestrcitions.diff
index c5ca823..943e393 100644
--- a/debian/patches/enable_dlrestrcitions.diff
+++ b/debian/patches/enable_dlrestrcitions.diff
@@ -9,7 +9,7 @@ not stable and structures frequently conflict.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -261,3 +261,10 @@ install(EXPORT kdeworkspaceLibraryTarget
+@@ -264,3 +264,10 @@ install(EXPORT kdeworkspaceLibraryTarget
# Add support for DebianABIManager
include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff --git a/debian/patches/genkdmconf.diff b/debian/patches/genkdmconf.diff
index 1caf0d2..c513f63 100644
--- a/debian/patches/genkdmconf.diff
+++ b/debian/patches/genkdmconf.diff
@@ -1,6 +1,6 @@
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
-@@ -613,7 +613,7 @@ static const char def_xaccess[] =
+@@ -622,7 +622,7 @@ static const char def_xaccess[] =
"# right hand sides can match.
"
"#
"
"
"
@@ -9,7 +9,7 @@
"
"
"#
"
"# To hardwire a specific terminal to a specific host, you can
"
-@@ -631,7 +631,7 @@ static const char def_xaccess[] =
+@@ -640,7 +640,7 @@ static const char def_xaccess[] =
"# so this may not work in all environments.
"
"#
"
"
"
@@ -18,7 +18,7 @@
"
"
"#
"
"# If you would prefer to configure the set of hosts each terminal sees,
"
-@@ -667,16 +667,18 @@ static const char def_startup[] =
+@@ -676,16 +676,18 @@ static const char def_startup[] =
"#! /bin/sh
"
"# Xstartup - run as root before session starts
"
"
"
@@ -46,7 +46,7 @@
"
"
"# NOTE: The session is aborted if the last command returns non-zero.
";
-@@ -722,6 +724,7 @@ static const char def_session1[] =
+@@ -731,6 +733,7 @@ static const char def_session1[] =
" [ -f $zhome/.zprofile ] && . $zhome/.zprofile
"
" [ -f $zdir/zlogin ] && . $zdir/zlogin
"
" [ -f $zhome/.zlogin ] && . $zhome/.zlogin
"
@@ -54,7 +54,7 @@
" ;;
"
" */csh|*/tcsh)
"
" # [t]cshrc is always sourced automatically.
"
-@@ -739,36 +742,8 @@ static const char def_session2[] =
+@@ -748,36 +751,8 @@ static const char def_session2[] =
" ;;
"
"esac
"
"
"
@@ -93,7 +93,7 @@
static const char def_background[] =
"[Desktop0]
"
-@@ -1119,29 +1094,6 @@ getInitTab(void)
+@@ -1128,29 +1103,6 @@ getInitTab(void)
if (maxTTY)
return;
diff --git a/debian/patches/kdm_does_not_wreak_havoc.diff b/debian/patches/kdm_does_not_wreak_havoc.diff
index 195ba5b..bef2849 100644
--- a/debian/patches/kdm_does_not_wreak_havoc.diff
+++ b/debian/patches/kdm_does_not_wreak_havoc.diff
@@ -1,6 +1,6 @@
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
-@@ -3145,9 +3145,11 @@ int main(int argc, char **argv)
+@@ -3154,9 +3154,11 @@ int main(int argc, char **argv)
memcmp(oldkde + olen - sizeof(SHR_CONF) + 1,
SHR_CONF, sizeof(SHR_CONF)))
{
diff --git a/debian/patches/kdm_vt_switching_on_kfreebsd.diff b/debian/patches/kdm_vt_switching_on_kfreebsd.diff
index c6a4bf5..f677f60 100644
--- a/debian/patches/kdm_vt_switching_on_kfreebsd.diff
+++ b/debian/patches/kdm_vt_switching_on_kfreebsd.diff
@@ -139,7 +139,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
# ifdef XDMCP
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
-@@ -1538,7 +1538,8 @@ static void
+@@ -1547,7 +1547,8 @@ static void
upd_servervts(Entry *ce, Section *cs ATTR_UNUSED)
{
if (!ce->active) { /* there is only the Global one */
@@ -149,7 +149,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
getInitTab();
ASPrintf((char **)&ce->value, "-%d", maxTTY + 1);
ce->active = ce->written = True;
-@@ -1550,14 +1551,19 @@ static void
+@@ -1559,14 +1560,19 @@ static void
upd_consolettys(Entry *ce, Section *cs ATTR_UNUSED)
{
if (!ce->active) { /* there is only the Global one */
@@ -170,7 +170,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
if (buf) {
ce->value = buf + 1;
ce->active = ce->written = True;
-@@ -3190,7 +3196,7 @@ int main(int argc, char **argv)
+@@ -3199,7 +3205,7 @@ int main(int argc, char **argv)
}
}
}
diff --git a/debian/patches/kdm_xreset_hook_framework.diff b/debian/patches/kdm_xreset_hook_framework.diff
index c172e6e..384627e 100644
--- a/debian/patches/kdm_xreset_hook_framework.diff
+++ b/debian/patches/kdm_xreset_hook_framework.diff
@@ -5,7 +5,7 @@ Author: Fathi Boudra <fabo at debian.org>
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
-@@ -692,7 +692,12 @@ static const char def_reset[] =
+@@ -701,7 +701,12 @@ static const char def_reset[] =
"#chown root /dev/console
"
"#chmod 622 /dev/console
"
"
"
diff --git a/debian/patches/place_global_config_in_etc.diff b/debian/patches/place_global_config_in_etc.diff
index 5f7bdf8..c1245dc 100644
--- a/debian/patches/place_global_config_in_etc.diff
+++ b/debian/patches/place_global_config_in_etc.diff
@@ -60,7 +60,7 @@ least FTBFS, so that we have the chance to inspect.
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
-@@ -2918,7 +2918,7 @@ fprintfLineWrap(FILE *f, const char *msg
+@@ -2927,7 +2927,7 @@ fprintfLineWrap(FILE *f, const char *msg
static const char * const oldkdes[] = {
@@ -69,7 +69,7 @@ least FTBFS, so that we have the chance to inspect.
"/opt/kde4/share/config",
"/usr/local/kde4/share/config",
-@@ -2926,6 +2926,7 @@ static const char * const oldkdes[] = {
+@@ -2935,6 +2935,7 @@ static const char * const oldkdes[] = {
"/usr/local/kde/share/config",
"/usr/local/share/config",
"/usr/share/config",
@@ -77,7 +77,7 @@ least FTBFS, so that we have the chance to inspect.
"/opt/kde3/share/config",
"/usr/local/kde3/share/config",
-@@ -2969,7 +2970,7 @@ int main(int argc, char **argv)
+@@ -2978,7 +2979,7 @@ int main(int argc, char **argv)
" Note that you possibly need to use --no-old-kde to make this take effect.
"
" --old-kde /path/to/old/kde-config-dir
"
" Where to look for the kdmrc of a previously installed kdm.
"
diff --git a/debian/patches/plasma_netbook_fix_autostart.diff b/debian/patches/plasma_netbook_fix_autostart.diff
index ed84f07..ae0215c 100644
--- a/debian/patches/plasma_netbook_fix_autostart.diff
+++ b/debian/patches/plasma_netbook_fix_autostart.diff
@@ -161,7 +161,7 @@ showstopper for this goal.
#endif // multiple inclusion guard
--- a/startkde.cmake
+++ b/startkde.cmake
-@@ -290,6 +290,24 @@ else
+@@ -278,6 +278,24 @@ else
exit 1
fi
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list