From 7d522cec1a98c15df1c454d67f92a6cd79512ad7 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mar 10 2009 10:13:19 +0000 Subject: - New upstream release. - Fix a double-free issue. (#485595) - Workaround to get the accelerator keys working on X apps. (#488713) - Get rid of debugging messages (#489119) --- diff --git a/.cvsignore b/.cvsignore index 277f423..04525bb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -11,3 +11,4 @@ imsettings-0.104.1.tar.bz2 imsettings-0.105.0.tar.bz2 imsettings-0.105.1.tar.bz2 imsettings-0.106.0.tar.bz2 +imsettings-0.106.1.tar.bz2 diff --git a/imsettings-constraint-of-language.patch b/imsettings-constraint-of-language.patch index 1374842..409d7f0 100644 --- a/imsettings-constraint-of-language.patch +++ b/imsettings-constraint-of-language.patch @@ -1,7 +1,7 @@ -diff -ruN imsettings-0.105.0.orig/data/xinput.sh.in.in imsettings-0.105.0/data/xinput.sh.in.in ---- imsettings-0.105.0.orig/data/xinput.sh.in.in 2008-10-11 14:54:28.000000000 +0900 -+++ imsettings-0.105.0/data/xinput.sh.in.in 2008-10-21 14:57:51.000000000 +0900 -@@ -152,7 +152,20 @@ +diff -pruN imsettings-0.106.0.1.orig/data/xinput.sh.in.in imsettings-0.106.0.1/data/xinput.sh.in.in +--- imsettings-0.106.0.1.orig/data/xinput.sh.in.in 2009-03-04 12:18:10.000000000 +0900 ++++ imsettings-0.106.0.1/data/xinput.sh.in.in 2009-03-04 17:44:14.000000000 +0900 +@@ -158,7 +158,20 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTING SHORT_DESC="User Specific" fi elif [ -r "$SYS_XINPUTRC" ]; then @@ -22,4 +22,4 @@ diff -ruN imsettings-0.105.0.orig/data/xinput.sh.in.in imsettings-0.105.0/data/x + fi fi - [ -z "$XIM" ] && XIM=none + [ -z "$IMSETTINGS_INTEGRATE_DESKTOP" ] && IMSETTINGS_INTEGRATE_DESKTOP=yes diff --git a/imsettings.spec b/imsettings.spec index 2c8d513..36fe60f 100644 --- a/imsettings.spec +++ b/imsettings.spec @@ -1,5 +1,5 @@ Name: imsettings -Version: 0.106.0 +Version: 0.106.1 Release: 1%{?dist} License: LGPLv2+ URL: http://code.google.com/p/imsettings/ @@ -110,8 +110,6 @@ rm -f $RPM_BUILD_ROOT%{_libexecdir}/qt-im-settings-daemon mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/env install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/ -sed -i -e '/^Hidden=true$/d' $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop -touch -r backends/xfce_xfconf/imsettings-xfce-helper.desktop $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop #desktop-file-install \ # --delete-original \ # --dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \ @@ -173,6 +171,7 @@ fi %{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh %{_sysconfdir}/X11/xinit/xinput.d %{_sysconfdir}/xdg/autostart/imsettings-applet.desktop +%{_sysconfdir}/xdg/autostart/imsettings-start.desktop %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas %{_sysconfdir}/kde/env/*.sh @@ -198,6 +197,12 @@ fi %changelog +* Tue Mar 10 2009 Akira TAGOH - 0.106.1-1 +- New upstream release. + - Fix a double-free issue. (#485595) + - Workaround to get the accelerator keys working on X apps. (#488713) + - Get rid of debugging messages (#489119) + * Mon Feb 23 2009 Akira TAGOH - 0.106.0-1 - New upstream release. - Fix a parser error for Compose data. (#484142) diff --git a/sources b/sources index 9f5fb94..36f419d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec96c8f421559fe8654e85830871fdb8 imsettings-0.106.0.tar.bz2 +c561896f78388e5cab13f95fa9996259 imsettings-0.106.1.tar.bz2