[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.6.3-1-10-ge915bfb
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Sun Jun 12 16:39:38 UTC 2011
The following commit has been merged in the master branch:
commit 1fb63c07daa1573f06c77bac2c03619bbd7ef8eb
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Sun Jun 12 12:26:59 2011 +0200
Refresh patches.
---
debian/changelog | 3 ++
.../be_better_at_honouring_user_kdm_theming.diff | 2 +-
debian/patches/genkdmconf.diff | 22 +++++++++++--------
debian/patches/kdm_does_not_wreak_havoc.diff | 2 +-
debian/patches/kdm_override_docs.diff | 2 +-
debian/patches/kdmrc_defaults.diff | 14 ++++++------
6 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e27e635..b8098d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ kdebase-workspace (4:4.6.4-0r0) UNRELEASED; urgency=low
[ José Manuel Santamaría Lema ]
* Bump kde-sc-dev-latest build dependency to 4:4.6.4.
+ * Refresh patches:
+ - Update genkdmconf.diff to make it apply to this version.
+ - Refresh other patches to make it apply without any offset.
-- Modestas Vainius <modax at debian.org> Fri, 03 Jun 2011 01:11:58 +0300
diff --git a/debian/patches/be_better_at_honouring_user_kdm_theming.diff b/debian/patches/be_better_at_honouring_user_kdm_theming.diff
index abced58..c889f15 100644
--- a/debian/patches/be_better_at_honouring_user_kdm_theming.diff
+++ b/debian/patches/be_better_at_honouring_user_kdm_theming.diff
@@ -1,6 +1,6 @@
--- a/kdm/config.def
+++ b/kdm/config.def
-@@ -2679,7 +2679,7 @@ Key: Theme
+@@ -2682,7 +2682,7 @@
Type: string
Default: ""
User: greeter
diff --git a/debian/patches/genkdmconf.diff b/debian/patches/genkdmconf.diff
index 2c2925b..0a5559a 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[] =
+@@ -613,7 +613,7 @@
"# 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[] =
+@@ -631,7 +631,7 @@
"# 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[] =
+@@ -667,16 +667,18 @@
"#! /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[] =
+@@ -722,6 +724,7 @@
" [ -f $zhome/.zprofile ] && . $zhome/.zprofile
"
" [ -f $zdir/zlogin ] && . $zdir/zlogin
"
" [ -f $zhome/.zlogin ] && . $zhome/.zlogin
"
@@ -54,16 +54,20 @@
" ;;
"
" */csh|*/tcsh)
"
" # [t]cshrc is always sourced automatically.
"
-@@ -739,32 +742,8 @@ static const char def_session2[] =
+@@ -739,36 +742,8 @@
" ;;
"
"esac
"
"
"
-"[ -f /etc/xprofile ] && . /etc/xprofile
"
-"[ -f $HOME/.xprofile ] && . $HOME/.xprofile
"
-"
"
--"for i in /etc/X11/Xresources/*; do
"
--" [ -f $i ] && xrdb -merge $i
"
--"done
"
+-"if [ -d /etc/X11/Xresources ]; then
"
+-" for i in /etc/X11/Xresources/*; do
"
+-" [ -f $i ] && xrdb -merge $i
"
+-" done
"
+-"elif [ -f /etc/X11/Xresources ]; then
"
+-" xrdb -merge /etc/X11/Xresources
"
+-"fi
"
-"[ -f $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources
"
-"
"
-"case $session in
"
@@ -89,7 +93,7 @@
static const char def_background[] =
"[Desktop0]
"
-@@ -1115,29 +1094,6 @@ getInitTab(void)
+@@ -1119,29 +1094,6 @@
if (maxTTY)
return;
diff --git a/debian/patches/kdm_does_not_wreak_havoc.diff b/debian/patches/kdm_does_not_wreak_havoc.diff
index 0caa199..337085c 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
-@@ -3141,9 +3141,11 @@ int main(int argc, char **argv)
+@@ -3145,9 +3145,11 @@
memcmp(oldkde + olen - sizeof(SHR_CONF) + 1,
SHR_CONF, sizeof(SHR_CONF)))
{
diff --git a/debian/patches/kdm_override_docs.diff b/debian/patches/kdm_override_docs.diff
index 8a520be..f40078e 100644
--- a/debian/patches/kdm_override_docs.diff
+++ b/debian/patches/kdm_override_docs.diff
@@ -1,6 +1,6 @@
--- a/kdm/config.def
+++ b/kdm/config.def
-@@ -89,6 +89,12 @@
+@@ -92,6 +92,12 @@
<kdmrc>
&kdm; master configuration file
_
diff --git a/debian/patches/kdmrc_defaults.diff b/debian/patches/kdmrc_defaults.diff
index c67e878..1ec4e5e 100644
--- a/debian/patches/kdmrc_defaults.diff
+++ b/debian/patches/kdmrc_defaults.diff
@@ -1,6 +1,6 @@
--- a/kdm/config.def
+++ b/kdm/config.def
-@@ -49,11 +49,11 @@
+@@ -52,11 +52,11 @@
#endif
#if defined(BSD) || defined(__linux__)
@@ -16,7 +16,7 @@
#endif
#if 0 /*def HASXDMAUTH*/
-@@ -1369,13 +1369,13 @@ Description:
+@@ -1372,13 +1372,13 @@
This string is subject to word splitting.
</para><para>
The default is something reasonable for the system on which &kdm; was built,
@@ -32,7 +32,7 @@
Comment: &
Description:
Additional arguments for the &X-Server;s for local sessions.
-@@ -1929,10 +1929,10 @@ Description:
+@@ -1932,10 +1932,10 @@
Key: SessionsDirs
Type: list
@@ -45,7 +45,7 @@
Update: upd_sessionsdirs
Comment:
The directories containing session type definitions in .desktop format,
-@@ -2001,7 +2001,7 @@ Description:
+@@ -2004,7 +2004,7 @@
Key: UseSessReg
Type: bool
@@ -54,7 +54,7 @@
User: core
Instance: #*/!
Comment:
-@@ -2092,9 +2092,9 @@ Description:
+@@ -2095,9 +2095,9 @@
Key: GreetString
Type: string
@@ -66,7 +66,7 @@
Comment:
The headline in the greeter. The following character pairs are replaced:
- %d -> current display
-@@ -2553,7 +2553,6 @@ Type: int
+@@ -2556,7 +2556,6 @@
Default: 0
User: greeter
Instance: #*/
@@ -74,7 +74,7 @@
Comment:
Random seed for forging saved session types, etc. of unknown users.
This value should be random but constant across the login domain.
-@@ -2650,7 +2649,7 @@ Key: AllowClose
+@@ -2653,7 +2652,7 @@
Type: bool
Default: true
User: greeter
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list