what does break? On 2010-10-29, at 10:15 PM, Auke Kok wrote:
> > ConsoleKit 0.4.2 breaks uxlaunch > > unless you have a solution for that breakage, this version cannot be merged. > > Auke > > > > On 10/28/10 06:24, Yin, Yan wrote: >> Got you, I'll use "remove patches which has been merged" afterwards. >> >> Regards, >> Yin, Yan >> >> >>> -----Original Message----- >>> From: Zhu, Peter J >>> Sent: Thursday, October 28, 2010 9:24 PM >>> To: Yin, Yan; [email protected] >>> Subject: RE: [meego-commits] 9007: Changes to Trunk:Testing/ConsoleKit >>> >>> OK. I mean we hit issues before without the patches. >>> >>> Peter >>> >>>> -----Original Message----- >>>> From: Yin, Yan >>>> Sent: Thursday, October 28, 2010 9:14 PM >>>> To: Zhu, Peter J; [email protected] >>>> Subject: RE: [meego-commits] 9007: Changes to >>> Trunk:Testing/ConsoleKit >>>> >>>> Yes, I already test it, those packages are already integrated in the >>> new tarball, >>>> what issues are you hitting? >>>> >>>> Regards, >>>> Yin, Yan >>>> >>>>> -----Original Message----- >>>>> From: Zhu, Peter J >>>>> Sent: Thursday, October 28, 2010 9:13 PM >>>>> To: [email protected]; Yin, Yan >>>>> Subject: RE: [meego-commits] 9007: Changes to >>> Trunk:Testing/ConsoleKit >>>>> >>>>> Why did you remove the patches? Did you test with the sr? We hit >>> big >>>>> issues without the patches. >>>>> >>>>> Peter >>>>> >>>>>> -----Original Message----- >>>>>> From: [email protected] >>>>>> [mailto:[email protected]] On Behalf Of Yan Yin >>>>>> Sent: Thursday, October 28, 2010 5:32 PM >>>>>> To: [email protected] >>>>>> Subject: [meego-commits] 9007: Changes to >>> Trunk:Testing/ConsoleKit >>>>>> >>>>>> Hi, >>>>>> I have made the following changes to ConsoleKit in project >>>>> Trunk:Testing. >>>>>> Please review and accept ASAP. >>>>>> >>>>>> Thank You, >>>>>> Yan Yin >>>>>> >>>>>> [This message was auto-generated] >>>>>> >>>>>> --- >>>>>> >>>>>> Request #9007: >>>>>> >>>>>> submit: >>> home:yyin2:branches:Trunk:Testing/ConsoleKit(r3)(cleanup) >>>>> -> >>>>>> Trunk:Testing/ConsoleKit >>>>>> >>>>>> >>>>>> Message: >>>>>> update to 0.4.2 >>>>>> >>>>>> State: new 2010-10-28T02:32:11 yyin2 >>>>>> Comment: None >>>>>> >>>>>> >>>>>> >>>>>> changes files: >>>>>> -------------- >>>>>> --- ConsoleKit.changes >>>>>> +++ ConsoleKit.changes >>>>>> @@ -0,0 +1,5 @@ >>>>>> +* Thu Oct 28 2010 Yan Yin<[email protected]> - 0.4.2 >>>>>> +- Update to 0.4.2 >>>>>> +- Fix missing licenses for subpackage due to spectacle 0.17 bug >>>>>> +- Remove unneeded nodaemon.patch and reorder- >>> initialization.patch >>>>>> + >>>>>> >>>>>> old: >>>>>> ---- >>>>>> ConsoleKit-0.4.1.tar.bz2 >>>>>> nodaemon.patch >>>>>> reorder-initialization.patch >>>>>> >>>>>> new: >>>>>> ---- >>>>>> ConsoleKit-0.4.2.tar.bz2 >>>>>> >>>>>> spec files: >>>>>> ----------- >>>>>> --- ConsoleKit.spec >>>>>> +++ ConsoleKit.spec >>>>>> @@ -1,6 +1,6 @@ >>>>>> # >>>>>> -# Do not Edit! Generated by: >>>>>> -# spectacle version 0.17 >>>>>> +# Do NOT Edit the Auto-generated Part! >>>>>> +# Generated by: spectacle version 0.20 >>>>>> # >>>>>> #>> macros >>>>>> %define glib2_version 2.7.0 >>>>>> @@ -11,7 +11,7 @@ >>>>>> >>>>>> Name: ConsoleKit >>>>>> Summary: System daemon for tracking users, sessions and seats >>>>>> -Version: 0.4.1 >>>>>> +Version: 0.4.2 >>>>>> Release: 3 >>>>>> Group: System/Libraries >>>>>> License: GPLv2+ >>>>>> @@ -19,8 +19,6 @@ >>>>>> Source0: >>>>>> http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit- >>>>> %{version}.t >>>>>> ar.bz2 >>>>>> Source100: ConsoleKit.yaml >>>>>> Patch0: consolekit-allow-with-parameters.patch >>>>>> -Patch1: nodaemon.patch >>>>>> -Patch2: reorder-initialization.patch >>>>>> Requires: dbus>= %{dbus_version} >>>>>> Requires: dbus-glib>= %{dbus_glib_version} >>>>>> BuildRequires: pkgconfig(dbus-1)>= %{dbus_version} >>>>>> @@ -47,6 +45,7 @@ >>>>>> >>>>>> %package libs >>>>>> Summary: ConsoleKit libraries >>>>>> +License: MIT >>>>>> Group: System/Libraries >>>>>> Requires: %{name} = %{version}-%{release} >>>>>> Requires: pam >>>>>> @@ -61,6 +60,7 @@ >>>>>> >>>>>> %package x11 >>>>>> Summary: X11-requiring add-ons for ConsoleKit >>>>>> +License: GPLv2+ >>>>>> Group: System/Libraries >>>>>> Requires: %{name} = %{version}-%{release} >>>>>> Requires: libX11 >>>>>> @@ -83,6 +83,7 @@ >>>>>> >>>>>> %package devel >>>>>> Summary: Development files for ConsoleKit >>>>>> +License: MIT >>>>>> Group: Development/Libraries >>>>>> Requires: %{name} = %{version}-%{release} >>>>>> Requires: dbus-devel>= %{dbus_version} >>>>>> @@ -99,10 +100,6 @@ >>>>>> >>>>>> # consolekit-allow-with-parameters.patch >>>>>> %patch0 -p1 >>>>>> -# nodaemon.patch >>>>>> -%patch1 -p1 >>>>>> -# reorder-initialization.patch >>>>>> -%patch2 -p1 >>>>>> #>> setup >>>>>> #<< setup >>>>>> >>>>>> >>>>>> other changes: >>>>>> -------------- >>>>>> >>>>>> ++++++ ConsoleKit-0.4.1.tar.bz2 -> ConsoleKit-0.4.2.tar.bz2 >>>>>> 30514 lines of diff (skipped) >>>>>> >>>>>> ++++++ ConsoleKit.yaml >>>>>> --- ConsoleKit.yaml >>>>>> +++ ConsoleKit.yaml >>>>>> @@ -1,6 +1,6 @@ >>>>>> Name: ConsoleKit >>>>>> Summary: System daemon for tracking users, sessions and seats >>>>>> -Version: 0.4.1 >>>>>> +Version: 0.4.2 >>>>>> Release: 3 >>>>>> Group: System/Libraries >>>>>> License: GPLv2+ >>>>>> @@ -9,8 +9,6 @@ >>>>>> - >>>>>> http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit- >>>>> %{version}.t >>>>>> ar.bz2 >>>>>> Patches: >>>>>> - consolekit-allow-with-parameters.patch >>>>>> - - nodaemon.patch >>>>>> - - reorder-initialization.patch >>>>>> Description: | >>>>>> ConsoleKit is a system daemon for tracking what users are >>> logged >>>>>> into the system and how they interact with the computer (e.g. >>>>>> >>>>>> ++++++ deleted files: >>>>>> --- nodaemon.patch >>>>>> --- reorder-initialization.patch >>>>>> >>>>>> _______________________________________________ >>>>>> Meego-commits mailing list >>>>>> [email protected] >>>>>> http://lists.meego.com/listinfo/meego-commits >> _______________________________________________ >> MeeGo-packaging mailing list >> [email protected] >> http://lists.meego.com/listinfo/meego-packaging > > _______________________________________________ > MeeGo-packaging mailing list > [email protected] > http://lists.meego.com/listinfo/meego-packaging _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
