August 2008 - openSUSE Commits - openSUSE Mailing Lists

commit kdebase4-workspace
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package kdebase4-workspace checked in at Mon Aug 11 22:57:16 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-07-30 00:55:59.000000000 +0200 +++ kdebase4-workspace/kdebase4-wallpapers.changes 2008-08-11 22:55:37.210753000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 11 16:17:27 CEST 2008 - coolo(a)suse.de + +- exclude kdm pictures in branding packages + +------------------------------------------------------------------- kdebase4-workspace.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.xp5362/_old 2008-08-11 22:55:52.000000000 +0200 +++ /var/tmp/diff_new_pack.xp5362/_new 2008-08-11 22:55:52.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package kdebase4-wallpapers (Version 4.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -22,7 +29,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.1.0 -Release: 1 +Release: 13 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -59,6 +66,8 @@ /usr/share/wallpapers %changelog +* Mon Aug 11 2008 coolo(a)suse.de +- exclude kdm pictures in branding packages * Wed Jul 23 2008 dmueller(a)suse.de - update to 4.1.0 * Fri Jul 18 2008 dmueller(a)suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.xp5362/_old 2008-08-11 22:55:52.000000000 +0200 +++ /var/tmp/diff_new_pack.xp5362/_new 2008-08-11 22:55:52.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package kdebase4-workspace (Version 4.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -27,7 +34,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.1.0 -Release: 1 +Release: 11 Source0: kdebase-workspace-%version.tar.bz2 Source2: titlebar_decor.png Source90: _upstream @@ -225,7 +232,6 @@ %doc COPYING %config(noreplace) %_kde_config_dir/kdm/backgroundrc %_kde_share_dir/apps/kdm/pics -%_kde_share_dir/apps/kdm/themes/oxygen %package ksysguardd License: GPL v2 or later @@ -371,6 +377,7 @@ %dir /usr/share/kde4/apps/doc %dir /usr/share/kde4/apps/doc/kdm %_kde_share_dir/apps/kdm +%exclude %_kde_share_dir/apps/kdm/pics %files -f filelists/exclude %defattr(-,root,root) @@ -717,6 +724,8 @@ /usr/share/kde4/apps/kconf_update/plasma-add-shortcut-to-menu.upd %changelog +* Mon Aug 11 2008 coolo(a)suse.de +- exclude kdm pictures in branding packages * Wed Jul 23 2008 dmueller(a)suse.de - update to 4.1.0 * Fri Jul 18 2008 dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hal
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package hal checked in at Mon Aug 11 22:50:09 CEST 2008. -------- --- hal/hal.changes 2008-07-25 12:14:27.000000000 +0200 +++ hal/hal.changes 2008-08-11 18:20:35.709313000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 11 18:20:27 CEST 2008 - ro(a)suse.de + +- fix build for hal-doc package + +------------------------------------------------------------------- hal-doc.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal-doc.spec ++++++ --- /var/tmp/diff_new_pack.q29104/_old 2008-08-11 22:48:38.000000000 +0200 +++ /var/tmp/diff_new_pack.q29104/_new 2008-08-11 22:48:38.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package hal-doc (Version 0.5.11_git20080626) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -22,7 +29,7 @@ %define hal_info_version 20080716 %define libsmbios_version 2.0.2 Version: 0.5.11_git20080626 -Release: 1 +Release: 2 Url: http://freedesktop.org/Software/hal License: Other uncritical OpenSource License Group: System/Daemons @@ -186,7 +193,7 @@ %patch107 -p1 %patch108 -p1 %patch109 -p1 -%patch110 -p1 +%patch110 -p0 #%patch200 -p1 #%patch300 -p1 #%patch1000 -p1 @@ -384,6 +391,8 @@ %endif %changelog +* Mon Aug 11 2008 ro(a)suse.de +- fix build for hal-doc package * Thu Jul 24 2008 dkukawka(a)suse.de - enabled ACL support * Wed Jul 16 2008 dkukawka(a)suse.de ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.q29104/_old 2008-08-11 22:48:38.000000000 +0200 +++ /var/tmp/diff_new_pack.q29104/_new 2008-08-11 22:48:38.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package hal (Version 0.5.11_git20080626) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -22,7 +29,7 @@ %define hal_info_version 20080716 %define libsmbios_version 2.0.2 Version: 0.5.11_git20080626 -Release: 1 +Release: 13 Url: http://freedesktop.org/Software/hal License: GPL v2 or later; AFL Group: System/Daemons @@ -383,6 +390,8 @@ %endif %changelog +* Mon Aug 11 2008 ro(a)suse.de +- fix build for hal-doc package * Thu Jul 24 2008 dkukawka(a)suse.de - enabled ACL support * Wed Jul 16 2008 dkukawka(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gpm
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package gpm checked in at Mon Aug 11 22:43:35 CEST 2008. -------- --- gpm/gpm.changes 2008-04-10 12:58:04.000000000 +0200 +++ gpm/gpm.changes 2008-08-11 10:24:44.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 11 10:20:49 CEST 2008 - anosek(a)suse.cz + +- fixed gpm not enabled at all run levels (bnc#340646) + - enabled gpm also for runlevel 5 in /etc/init.d/gpm + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpm.spec ++++++ --- /var/tmp/diff_new_pack.BQ5649/_old 2008-08-11 22:42:33.000000000 +0200 +++ /var/tmp/diff_new_pack.BQ5649/_new 2008-08-11 22:42:33.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package gpm (Version 1.20.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -20,7 +27,7 @@ PreReq: /bin/sed %insserv_prereq %fillup_prereq AutoReqProv: on Version: 1.20.1 -Release: 415 +Release: 437 Summary: Console Mouse Support Source0: http://arcana.linux.it/pub/gpm/gpm-%{version}.tar.bz2 Source1: rcgpm @@ -167,6 +174,9 @@ /var/adm/fillup-templates/* %changelog +* Mon Aug 11 2008 anosek(a)suse.cz +- fixed gpm not enabled at all run levels (bnc#340646) + - enabled gpm also for runlevel 5 in /etc/init.d/gpm * Thu Apr 10 2008 ro(a)suse.de - added baselibs.conf file to build xxbit packages for multilib support ++++++ rcgpm ++++++ --- gpm/rcgpm 2008-02-22 00:05:11.000000000 +0100 +++ gpm/rcgpm 2008-08-11 10:20:33.000000000 +0200 @@ -16,8 +16,8 @@ # Should-Start: # Required-Stop: $remote_fs $syslog # Should-Stop: -# Default-Start: 2 3 -# Default-Stop: 0 1 5 6 +# Default-Start: 2 3 5 +# Default-Stop: 0 1 6 # Description: Start gpm to allow mouse on console # Short-Description: Console mouse support ### END INIT INFO ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit freeglut
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package freeglut checked in at Mon Aug 11 22:37:27 CEST 2008. -------- --- freeglut/freeglut.changes 2008-04-10 12:57:39.000000000 +0200 +++ freeglut/freeglut.changes 2008-08-11 10:25:47.903032965 +0200 @@ -1,0 +2,26 @@ +Mon Aug 11 10:21:32 CEST 2008 - sndirsch(a)suse.de + +- switched to current freeglut sources in SVN (2008-07-21): + * Changed "fgStructure.GameMode" to "fgStructure.GameModeWindow" + to reflect better what it is + * Added an end-of-line character to a warning message about an + unknown X event type + * Fixing a problem in which "glutGetWindow" would return a menu's + window instead of the menu's parent window + * Added some handy comments, spacing, fixed a typo in a comment + * Changed "TARGET_HOST_UNIX_X11" to "TARGET_HOST_POSIX_X11" to + avoid trademark issues, per Joe Krahn; also rationalized the + other "TARGET_HOST" definitions + * Added futher callback functionality to the CallbackMaker demo + program. Also added a prompt for user input to highlight a + difference betwen GLUT and "freeglut" + * Added multisampling support for *nix and Windows; some other + pixel format changes for Windows + * Added Markus Henschel's change (e-mail to developers' list, + June 28, 2006) to have the "glutInitDisplayString" ignore + numerical assignments to tokens as a temporary fix. + * Fixed buy #1398196 in the bug tracker to the effect that + passing the wrong argument in "fghSleepForEvents" can cause + odd delays + +------------------------------------------------------------------- Old: ---- freeglut-060903.diff freeglut-060903.tar.bz2 New: ---- freeglut-080721.diff freeglut-080721.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeglut.spec ++++++ --- /var/tmp/diff_new_pack.D16555/_old 2008-08-11 22:36:19.000000000 +0200 +++ /var/tmp/diff_new_pack.D16555/_new 2008-08-11 22:36:19.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package freeglut (Version 060903) +# spec file for package freeglut (Version 080721) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -14,8 +21,8 @@ Name: freeglut BuildRequires: Mesa-devel gcc-c++ libdrm-devel pkgconfig xorg-x11-devel Summary: Freely licensed alternative to the GLUT library -Version: 060903 -Release: 122 +Version: 080721 +Release: 1 Url: http://freeglut.sourceforge.net/ %define USE_EXTERNAL_MESA 1 Source0: freeglut-%{version}.tar.bz2 @@ -173,6 +180,29 @@ %{_mandir}/man3/* %changelog +* Mon Aug 11 2008 sndirsch(a)suse.de +- switched to current freeglut sources in SVN (2008-07-21): + * Changed "fgStructure.GameMode" to "fgStructure.GameModeWindow" + to reflect better what it is + * Added an end-of-line character to a warning message about an + unknown X event type + * Fixing a problem in which "glutGetWindow" would return a menu's + window instead of the menu's parent window + * Added some handy comments, spacing, fixed a typo in a comment + * Changed "TARGET_HOST_UNIX_X11" to "TARGET_HOST_POSIX_X11" to + avoid trademark issues, per Joe Krahn; also rationalized the + other "TARGET_HOST" definitions + * Added futher callback functionality to the CallbackMaker demo + program. Also added a prompt for user input to highlight a + difference betwen GLUT and "freeglut" + * Added multisampling support for *nix and Windows; some other + pixel format changes for Windows + * Added Markus Henschel's change (e-mail to developers' list, + June 28, 2006) to have the "glutInitDisplayString" ignore + numerical assignments to tokens as a temporary fix. + * Fixed buy #1398196 in the bug tracker to the effect that + passing the wrong argument in "fghSleepForEvents" can cause + odd delays * Thu Apr 10 2008 ro(a)suse.de - added baselibs.conf file to build xxbit packages for multilib support ++++++ freeglut-060903.diff -> freeglut-080721.diff ++++++ ++++++ freeglut-060903.tar.bz2 -> freeglut-080721.tar.bz2 ++++++ ++++ 12676 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit findutils
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package findutils checked in at Mon Aug 11 22:34:30 CEST 2008. -------- --- findutils/findutils.changes 2008-08-04 11:19:41.000000000 +0200 +++ findutils/findutils.changes 2008-08-11 11:07:54.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 11 11:07:15 CEST 2008 - schwab(a)suse.de + +- Fix undefined behaviour. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ findutils.spec ++++++ --- /var/tmp/diff_new_pack.Qn7300/_old 2008-08-11 22:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.Qn7300/_new 2008-08-11 22:33:25.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package findutils (Version 4.4.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19,7 +26,7 @@ AutoReqProv: on PreReq: %{install_info_prereq} Version: 4.4.0 -Release: 23 +Release: 27 Summary: GNU find--Finding Files Source: findutils-%{version}.tar.bz2 Source1: sysconfig.locate @@ -131,6 +138,8 @@ /var/adm/fillup-templates/* %changelog +* Mon Aug 11 2008 schwab(a)suse.de +- Fix undefined behaviour. * Mon Aug 04 2008 schwab(a)suse.de - Don't use fts. * Tue Mar 18 2008 schwab(a)suse.de ++++++ findutils-4.4.0.diff ++++++ --- /var/tmp/diff_new_pack.Qn7300/_old 2008-08-11 22:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.Qn7300/_new 2008-08-11 22:33:25.000000000 +0200 @@ -43,6 +43,26 @@ if (options.maxdepth >= 0) { if (ent->fts_level >= options.maxdepth) +--- find/parser.c ++++ find/parser.c +@@ -3234,7 +3234,7 @@ get_relative_timestamp (const char *str, + double sec_per_unit, + const char *overflowmessage) + { +- uintmax_t checkval; ++ double checkval; + double offset, seconds, nanosec; + + if (get_comp_type(&str, &result->kind)) +@@ -3259,7 +3259,7 @@ get_relative_timestamp (const char *str, + + result->ts.tv_sec = origin.tv_sec - seconds; + result->ts.tv_nsec = origin.tv_nsec - nanosec; +- checkval = (uintmax_t)origin.tv_sec - seconds; ++ checkval = origin.tv_sec - seconds; + + if (origin.tv_nsec < nanosec) + { --- locate/updatedb.1 +++ locate/updatedb.1 @@ -75,8 +75,7 @@ Default is \fInfs NFS proc\fP. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit deb
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package deb checked in at Mon Aug 11 22:29:20 CEST 2008. -------- --- deb/deb.changes 2008-07-21 11:19:16.000000000 +0200 +++ deb/deb.changes 2008-08-11 13:21:29.070351000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 11 13:21:25 CEST 2008 - coolo(a)suse.de + +- fix paths + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deb.spec ++++++ --- /var/tmp/diff_new_pack.X24771/_old 2008-08-11 22:27:29.000000000 +0200 +++ /var/tmp/diff_new_pack.X24771/_new 2008-08-11 22:27:29.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package deb (Version 1.14.19) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -22,7 +29,7 @@ Requires: cpio patch make html2text update-alternatives AutoReqProv: on Version: 1.14.19 -Release: 8 +Release: 22 Summary: Tools for Debian Packages Source: dpkg_%{version}.tar.bz2 Source1: debhelper_7.0.16.tar.bz2 @@ -95,10 +102,10 @@ install -d -m 755 $RPM_BUILD_ROOT/usr/share/debhelper/autoscripts install -m 644 autoscripts/* $RPM_BUILD_ROOT/usr/share/debhelper/autoscripts # perl modules: -install -d -m 755 $RPM_BUILD_ROOT%{perl_vendorlib}/Dpkg/Debhelper -install -d -m 755 $RPM_BUILD_ROOT%{perl_vendorlib}/Dpkg/Debhelper/Sequence -install -m 644 Debian/Debhelper/Sequence/python_support.pm $RPM_BUILD_ROOT%{perl_vendorlib}/Dpkg/Debhelper/Sequence -install -m 644 Debian/Debhelper/Dh_* $RPM_BUILD_ROOT%{perl_vendorlib}/Dpkg/Debhelper +install -d -m 755 $RPM_BUILD_ROOT%{perl_vendorlib}/Debian/Debhelper +install -d -m 755 $RPM_BUILD_ROOT%{perl_vendorlib}/Debian/Debhelper/Sequence +install -m 644 Debian/Debhelper/Sequence/*.pm $RPM_BUILD_ROOT%{perl_vendorlib}/Debian/Debhelper/Sequence +install -m 644 Debian/Debhelper/*.pm $RPM_BUILD_ROOT%{perl_vendorlib}/Debian/Debhelper # docs: install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/deb/debhelper/examples install -m 644 examples/* $RPM_BUILD_ROOT%{_docdir}/deb/debhelper/examples @@ -157,6 +164,8 @@ %{perl_vendorlib}/Dpkg.pm %changelog +* Mon Aug 11 2008 coolo(a)suse.de +- fix paths * Mon Jul 21 2008 puzel(a)suse.cz - update debhelper to 7.0.16 * dh: Avoid passing --with on to subcommands. Closes debian bug #490886 ++++++ debhelper_7.0.16.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ConsoleKit
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package ConsoleKit checked in at Mon Aug 11 22:27:20 CEST 2008. -------- --- ConsoleKit/ConsoleKit.changes 2008-07-21 10:45:17.000000000 +0200 +++ ConsoleKit/ConsoleKit.changes 2008-08-11 18:13:07.062510000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 11 18:12:54 CEST 2008 - ro(a)suse.de + +- fix build for ConsoleKit-doc + +------------------------------------------------------------------- ConsoleKit-doc.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ConsoleKit-doc.spec ++++++ --- /var/tmp/diff_new_pack.j19357/_old 2008-08-11 22:26:16.000000000 +0200 +++ /var/tmp/diff_new_pack.j19357/_new 2008-08-11 22:26:16.000000000 +0200 @@ -32,7 +32,7 @@ %endif Summary: System daemon for tracking users, sessions and seats Version: 0.2.10 -Release: 37 +Release: 38 License: GPL v2 or later Group: System/Daemons AutoReqProv: on @@ -148,6 +148,7 @@ rm -rf $RPM_BUILD_ROOT/%_mandir/ rm -rf $RPM_BUILD_ROOT/%{_prefix}/lib rm -rf $RPM_BUILD_ROOT/%_lib/security +rm -rf $RPM_BUILD_ROOT/%_datadir/PolicyKit/policy/ConsoleKit.policy %endif %if !%{build_doc} @@ -204,6 +205,8 @@ %endif %changelog +* Mon Aug 11 2008 ro(a)suse.de +- fix build for ConsoleKit-doc * Fri Jul 18 2008 hmacht(a)suse.de - build with PolicyKit support (bnc#399476) - update ConsoleKit-libexecdir.patch ++++++ ConsoleKit.spec ++++++ --- /var/tmp/diff_new_pack.j19357/_old 2008-08-11 22:26:16.000000000 +0200 +++ /var/tmp/diff_new_pack.j19357/_new 2008-08-11 22:26:16.000000000 +0200 @@ -32,7 +32,7 @@ %endif Summary: System daemon for tracking users, sessions and seats Version: 0.2.10 -Release: 28 +Release: 32 License: GPL v2 or later Group: System/Daemons AutoReqProv: on @@ -148,6 +148,7 @@ rm -rf $RPM_BUILD_ROOT/%_mandir/ rm -rf $RPM_BUILD_ROOT/%{_prefix}/lib rm -rf $RPM_BUILD_ROOT/%_lib/security +rm -rf $RPM_BUILD_ROOT/%_datadir/PolicyKit/policy/ConsoleKit.policy %endif %if !%{build_doc} @@ -204,6 +205,8 @@ %endif %changelog +* Mon Aug 11 2008 ro(a)suse.de +- fix build for ConsoleKit-doc * Fri Jul 18 2008 hmacht(a)suse.de - build with PolicyKit support (bnc#399476) - update ConsoleKit-libexecdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit automoc4
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package automoc4 checked in at Mon Aug 11 22:15:15 CEST 2008. -------- --- KDE/automoc4/automoc4.changes 2008-06-20 16:40:26.000000000 +0200 +++ automoc4/automoc4.changes 2008-08-11 11:32:12.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Aug 11 11:29:42 CEST 2008 - dmueller(a)suse.de + +- update to 0.9.87: + * automoc4_add_library macro added + +------------------------------------------------------------------- +Fri Aug 8 00:03:31 CEST 2008 - dmueller(a)suse.de + +- fix build after last change + +------------------------------------------------------------------- +Thu Aug 7 18:07: CEST 2008 - wstephenson(a)suse.de + +- update to 0.9.84 + * no significant change + +------------------------------------------------------------------- Old: ---- automoc4-0.9.83.tar.bz2 New: ---- automoc4-0.9.87.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ automoc4.spec ++++++ --- /var/tmp/diff_new_pack.Y20842/_old 2008-08-11 22:13:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Y20842/_new 2008-08-11 22:13:34.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package automoc4 (Version 0.9.83) +# spec file for package automoc4 (Version 0.9.87) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,7 +20,7 @@ Name: automoc4 BuildRequires: cmake kde4-filesystem libqt4-devel -Version: 0.9.83 +Version: 0.9.87 Release: 1 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,9 +56,17 @@ %files %defattr(-,root,root) /usr/bin/automoc4 -/usr/lib/automoc4 +%_libdir/automoc4 %changelog +* Mon Aug 11 2008 dmueller(a)suse.de +- update to 0.9.87: + * automoc4_add_library macro added +* Fri Aug 08 2008 dmueller(a)suse.de +- fix build after last change +* Thu Aug 07 2008 wstephenson(a)suse.de +- update to 0.9.84 + * no significant change * Fri Jun 20 2008 dmueller(a)suse.de - update to released tarball * no significant change ++++++ automoc4-0.9.83.tar.bz2 -> automoc4-0.9.87.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/automoc4-0.9.83/Automoc4Config.cmake new/automoc4-0.9.87/Automoc4Config.cmake --- old/automoc4-0.9.83/Automoc4Config.cmake 2008-06-20 16:01:39.000000000 +0200 +++ new/automoc4-0.9.87/Automoc4Config.cmake 2008-08-05 17:34:02.000000000 +0200 @@ -1,6 +1,10 @@ + get_filename_component(_AUTOMOC4_CURRENT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +# set the automoc version number +include(${_AUTOMOC4_CURRENT_DIR}/Automoc4Version.cmake) + # are we in the source tree or already installed ? if(EXISTS ${_AUTOMOC4_CURRENT_DIR}/kde4automoc.cpp) get_target_property(AUTOMOC4_EXECUTABLE automoc4 LOCATION) @@ -13,6 +17,7 @@ set(_AUTOMOC4_EXECUTABLE_DEP) endif(EXISTS ${_AUTOMOC4_CURRENT_DIR}/kde4automoc.cpp) + macro (AUTOMOC4_MOC_HEADERS _target_NAME) set (_headers_to_moc) foreach (_current_FILE ${ARGN}) @@ -27,19 +32,18 @@ # and add it to the target if(_headers_to_moc) set(_automoc4_headers_${_target_NAME} "${_headers_to_moc}") + set(_automoc4_headers_${_target_NAME}_automoc "${_headers_to_moc}") endif(_headers_to_moc) endmacro (AUTOMOC4_MOC_HEADERS) macro(AUTOMOC4 _target_NAME _SRCS) set(_moc_files) -# set(_moc_headers) # first list all explicitly set headers foreach(_header_to_moc ${_automoc4_headers_${_target_NAME}} ) get_filename_component(_abs_header ${_header_to_moc} ABSOLUTE) list(APPEND _moc_files ${_abs_header}) -# list(APPEND _moc_headers ${_abs_header}) endforeach(_header_to_moc) # now add all the sources for the automoc @@ -52,16 +56,6 @@ get_filename_component(_suffix "${_current_FILE}" EXT) # skip every source file that's not C++ if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C") -# get_filename_component(_basename "${_current_FILE}" NAME_WE) -# get_filename_component(_abs_path "${_abs_current_FILE}" PATH) -# set(_header "${_abs_path}/${_basename}.h") -# if(EXISTS "${_header}") -# list(APPEND _moc_headers ${_header}) -# endif(EXISTS "${_header}") -# set(_pheader "${_abs_path}/${_basename}_p.h") -# if(EXISTS "${_pheader}") -# list(APPEND _moc_headers ${_pheader}) -# endif(EXISTS "${_pheader}") list(APPEND _moc_files ${_abs_current_FILE}) endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C") endif(NOT _generated AND NOT _skip) @@ -71,22 +65,11 @@ set(_automoc_source "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_automoc.cpp") get_directory_property(_moc_incs INCLUDE_DIRECTORIES) get_directory_property(_moc_defs DEFINITIONS) + get_directory_property(_moc_cdefs COMPILE_DEFINITIONS) - # configure_file replaces _moc_files, _moc_incs and _moc_defs + # configure_file replaces _moc_files, _moc_incs, _moc_cdefs and _moc_defs configure_file(${_AUTOMOC4_CURRENT_DIR}/automoc4.files.in ${_automoc_source}.files) -# add_custom_target(${_target_NAME}_automoc -# ALL -# COMMAND ${AUTOMOC4_EXECUTABLE} -# ${_automoc_source} -# ${CMAKE_CURRENT_SOURCE_DIR} -# ${CMAKE_CURRENT_BINARY_DIR} -# ${QT_MOC_EXECUTABLE} -# ${CMAKE_COMMAND} -# DEPENDS ${_automoc_source}.files ${_AUTOMOC4_EXECUTABLE_DEP} ${_moc_headers} ${${_SRCS}} -# #COMMENT "" -# VERBATIM -# ) add_custom_command(OUTPUT ${_automoc_source} COMMAND ${AUTOMOC4_EXECUTABLE} ${_automoc_source} @@ -94,15 +77,121 @@ ${CMAKE_CURRENT_BINARY_DIR} ${QT_MOC_EXECUTABLE} ${CMAKE_COMMAND} + --touch DEPENDS ${_automoc_source}.files ${_AUTOMOC4_EXECUTABLE_DEP} -# COMMENT "Running automoc for ${_target_NAME}" COMMENT "" VERBATIM ) -# set_source_files_properties(${_automoc_source} PROPERTIES GENERATED TRUE) -# set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_automoc_source}) set(${_SRCS} ${_automoc_source} ${${_SRCS}}) -# add_dependencies(${_target_NAME} ${_target_NAME}_automoc) endif(_moc_files) endmacro(AUTOMOC4) +macro(ADD_AUTOMOC4_TARGET _target_NAME _SRCS) + set(_moc_files) + set(_moc_headers) + + # first list all explicitly set headers + foreach(_header_to_moc ${_automoc4_headers_${_target_NAME}} ) + get_filename_component(_abs_header ${_header_to_moc} ABSOLUTE) + list(APPEND _moc_files ${_abs_header}) + list(APPEND _moc_headers ${_abs_header}) + endforeach(_header_to_moc) + + # now add all the sources for the automoc + foreach (_current_FILE ${${_SRCS}}) + get_filename_component(_abs_current_FILE "${_current_FILE}" ABSOLUTE) + get_source_file_property(_skip "${_abs_current_FILE}" SKIP_AUTOMOC) + get_source_file_property(_generated "${_abs_current_FILE}" GENERATED) + + if(NOT _generated AND NOT _skip) + get_filename_component(_suffix "${_current_FILE}" EXT) + # skip every source file that's not C++ + if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C") + get_filename_component(_basename "${_current_FILE}" NAME_WE) + get_filename_component(_abs_path "${_abs_current_FILE}" PATH) + set(_header "${_abs_path}/${_basename}.h") + if(EXISTS "${_header}") + list(APPEND _moc_headers ${_header}) + endif(EXISTS "${_header}") + set(_pheader "${_abs_path}/${_basename}_p.h") + if(EXISTS "${_pheader}") + list(APPEND _moc_headers ${_pheader}) + endif(EXISTS "${_pheader}") + list(APPEND _moc_files ${_abs_current_FILE}) + endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C") + endif(NOT _generated AND NOT _skip) + endforeach (_current_FILE) + + if(_moc_files) + set(_automoc_source "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}.cpp") + set(_automoc_dotFiles "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}.cpp.files") + get_directory_property(_moc_incs INCLUDE_DIRECTORIES) + get_directory_property(_moc_defs DEFINITIONS) + get_directory_property(_moc_cdefs COMPILE_DEFINITIONS) + + # configure_file replaces _moc_files, _moc_incs, _moc_cdefs and _moc_defs + configure_file(${_AUTOMOC4_CURRENT_DIR}/automoc4.files.in ${_automoc_dotFiles}) + + add_custom_target(${_target_NAME} + ALL + COMMAND ${AUTOMOC4_EXECUTABLE} + ${_automoc_source} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${QT_MOC_EXECUTABLE} + ${CMAKE_COMMAND} + DEPENDS ${_automoc_dotFiles} ${_AUTOMOC4_EXECUTABLE_DEP} ${_moc_headers} ${${_SRCS}} + COMMENT "" + VERBATIM + ) + set_source_files_properties(${_automoc_source} PROPERTIES GENERATED TRUE) + set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_automoc_source}) + set(${_SRCS} ${_automoc_source} ${${_SRCS}}) + endif(_moc_files) +endmacro(ADD_AUTOMOC4_TARGET) + +macro(AUTOMOC4_ADD_EXECUTABLE _target_NAME) + set(_SRCS ${ARGN}) + + set(_add_executable_param) + foreach(_argName "WIN32" "MACOSX_BUNDLE" "EXCLUDE_FROM_ALL") + list(FIND _SRCS ${_argName} _index) + if(_index GREATER -1) + list(APPEND _add_executable_param ${_argName}) + list(REMOVE_AT _SRCS ${_index}) + endif(_index GREATER -1) + endforeach(_argName) + + if(MSVC) + add_automoc4_target("${_target_NAME}_automoc" _SRCS) + else(MSVC) + automoc4(${_target_NAME} _SRCS) + endif(MSVC) + add_executable(${_target_NAME} ${_add_executable_param} ${_SRCS}) + if(MSVC) + add_dependencies(${_target_NAME} "${_target_NAME}_automoc") + endif(MSVC) +endmacro(AUTOMOC4_ADD_EXECUTABLE) + +macro(AUTOMOC4_ADD_LIBRARY _target_NAME) + set(_SRCS ${ARGN}) + + set(_add_executable_param) + foreach(_argName "STATIC" "SHARED" "MODULE" "EXCLUDE_FROM_ALL") + list(FIND _SRCS ${_argName} _index) + if(_index GREATER -1) + list(APPEND _add_executable_param ${_argName}) + list(REMOVE_AT _SRCS ${_index}) + endif(_index GREATER -1) + endforeach(_argName) + + if(MSVC) + add_automoc4_target("${_target_NAME}_automoc" _SRCS) + else(MSVC) + automoc4(${_target_NAME} _SRCS) + endif(MSVC) + add_library(${_target_NAME} ${_add_executable_param} ${_SRCS}) + if(MSVC) + add_dependencies(${_target_NAME} "${_target_NAME}_automoc") + endif(MSVC) +endmacro(AUTOMOC4_ADD_LIBRARY) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/automoc4-0.9.83/automoc4_config.h.in new/automoc4-0.9.87/automoc4_config.h.in --- old/automoc4-0.9.83/automoc4_config.h.in 1970-01-01 01:00:00.000000000 +0100 +++ new/automoc4-0.9.87/automoc4_config.h.in 2008-07-18 00:38:30.000000000 +0200 @@ -0,0 +1,7 @@ +#ifndef AUTOMOC4_CONFIG_H +#define AUTOMOC4_CONFIG_H + +#define AUTOMOC4_VERSION "@AUTOMOC4_VERSION_MAJOR@.@AUTOMOC4_VERSION_MINOR@.@AUTOMOC4_VERSION_PATCH@" + + +#endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/automoc4-0.9.83/automoc4.files.in new/automoc4-0.9.87/automoc4.files.in --- old/automoc4-0.9.83/automoc4.files.in 2008-06-20 16:01:39.000000000 +0200 +++ new/automoc4-0.9.87/automoc4.files.in 2008-07-17 11:17:29.000000000 +0200 @@ -1,5 +1,7 @@ SOURCES: @_moc_files@ +MOC_COMPILE_DEFINITIONS: +@_moc_cdefs@ MOC_DEFINITIONS: @_moc_defs@ MOC_INCLUDES: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/automoc4-0.9.83/Automoc4Version.cmake new/automoc4-0.9.87/Automoc4Version.cmake --- old/automoc4-0.9.83/Automoc4Version.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/automoc4-0.9.87/Automoc4Version.cmake 2008-08-06 16:55:45.000000000 +0200 @@ -0,0 +1,7 @@ +# set the current version number +set(AUTOMOC4_VERSION_MAJOR "0") +set(AUTOMOC4_VERSION_MINOR "9") +set(AUTOMOC4_VERSION_PATCH "87") + +set(AUTOMOC4_VERSION "${AUTOMOC4_VERSION_MAJOR}.${AUTOMOC4_VERSION_MINOR}.${AUTOMOC4_VERSION_PATCH}") + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/automoc4-0.9.83/CMakeLists.txt new/automoc4-0.9.87/CMakeLists.txt --- old/automoc4-0.9.83/CMakeLists.txt 2008-06-20 16:01:39.000000000 +0200 +++ new/automoc4-0.9.87/CMakeLists.txt 2008-08-05 13:51:11.000000000 +0200 @@ -8,6 +8,13 @@ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common") endif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc") +# set the current version number +include(Automoc4Version.cmake) + +configure_file(automoc4_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/automoc4_config.h) + +# Always include srcdir and builddir in include path +set(CMAKE_INCLUDE_CURRENT_DIR ON) include_directories(${QT_INCLUDE_DIR}) add_executable(automoc4 kde4automoc.cpp) @@ -17,4 +24,4 @@ target_link_libraries(automoc4 ${QT_QTCORE_LIBRARY}) install(TARGETS automoc4 DESTINATION bin) -install(FILES Automoc4Config.cmake automoc4.files.in DESTINATION lib/automoc4) +install(FILES Automoc4Config.cmake Automoc4Version.cmake automoc4.files.in DESTINATION lib${LIB_SUFFIX}/automoc4) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/automoc4-0.9.83/kde4automoc.cpp new/automoc4-0.9.87/kde4automoc.cpp --- old/automoc4-0.9.83/kde4automoc.cpp 2008-06-20 16:01:39.000000000 +0200 +++ new/automoc4-0.9.87/kde4automoc.cpp 2008-08-06 17:11:28.000000000 +0200 @@ -25,6 +25,7 @@ #include <QtCore/QCoreApplication> #include <QtCore/QDateTime> +#include <QtCore/QDir> #include <QtCore/QFile> #include <QtCore/QFileInfo> #include <QtCore/QHash> @@ -46,6 +47,9 @@ #include <utime.h> #endif +// currently this is only used for the version number, Alex +#include "automoc4_config.h" + class AutoMoc { public: @@ -54,20 +58,20 @@ private: void dotFilesCheck(bool); + void lazyInitMocDefinitions(); void lazyInit(); bool touch(const QString &filename); bool generateMoc(const QString &sourceFile, const QString &mocFileName); - void waitForProcesses(); void printUsage(const QString &); void printVersion(); void echoColor(const QString &msg) { - QProcess *cmakeEcho = new QProcess; - cmakeEcho->setProcessChannelMode(QProcess::ForwardedChannels); + QProcess cmakeEcho; + cmakeEcho.setProcessChannelMode(QProcess::ForwardedChannels); QStringList args(cmakeEchoColorArgs); args << msg; - cmakeEcho->start(cmakeExecutable, args, QIODevice::NotOpen); - processes.enqueue(Process(cmakeEcho, QString())); + cmakeEcho.start(cmakeExecutable, args, QIODevice::NotOpen); + cmakeEcho.waitForFinished(-1); } QString builddir; @@ -80,26 +84,20 @@ const bool verbose; QTextStream cerr; QTextStream cout; - struct Process - { - Process(QProcess *a, const QString &b) : qproc(a), mocFilePath(b) {} - QProcess *qproc; - QString mocFilePath; - }; - QQueue<Process> processes; bool failed; bool automocCppChanged; bool generateAll; + bool doTouch; }; void AutoMoc::printUsage(const QString &path) { - cout << "usage: " << path << " <outfile> <srcdir> <builddir> <moc executable> <cmake executable>" << endl; + cout << "Usage: " << path << " <outfile> <srcdir> <builddir> <moc executable> <cmake executable> [--touch]" << endl; } void AutoMoc::printVersion() { - cout << "automoc4 0.9.83" << endl; + cout << "automoc4 " << AUTOMOC4_VERSION << endl; } void AutoMoc::dotFilesCheck(bool x) @@ -121,7 +119,7 @@ AutoMoc::AutoMoc() : verbose(!qgetenv("VERBOSE").isEmpty()), cerr(stderr), cout(stdout), failed(false), - automocCppChanged(false) + automocCppChanged(false), generateAll(false), doTouch(false) { const QByteArray colorEnv = qgetenv("COLOR"); cmakeEchoColorArgs << QLatin1String("-E") << QLatin1String("cmake_echo_color") @@ -129,24 +127,51 @@ << QLatin1String("--bold"); } +void AutoMoc::lazyInitMocDefinitions() +{ + static bool done = false; + if (done) { + return; + } + done = true; + QByteArray line = dotFiles.readLine(); + dotFilesCheck(line == "MOC_COMPILE_DEFINITIONS:\n"); + line = dotFiles.readLine().trimmed(); + const QStringList &cdefList = QString::fromUtf8(line).split(';', QString::SkipEmptyParts); + line = dotFiles.readLine(); + dotFilesCheck(line == "MOC_DEFINITIONS:\n"); + line = dotFiles.readLine().trimmed(); + if (!cdefList.isEmpty()) { + foreach (const QString &def, cdefList) { + Q_ASSERT(!def.isEmpty()); + mocDefinitions << QLatin1String("-D") + def; + } + } else { + const QStringList &defList = QString::fromUtf8(line).split(' ', QString::SkipEmptyParts); + foreach (const QString &def, defList) { + Q_ASSERT(!def.isEmpty()); + if (def.startsWith(QLatin1String("-D"))) { + mocDefinitions << def; + } + } + } +} + void AutoMoc::lazyInit() { const QStringList &args = QCoreApplication::arguments(); mocExe = args[4]; cmakeExecutable = args[5]; - QByteArray line = dotFiles.readLine(); - dotFilesCheck(line == "MOC_DEFINITIONS:\n"); - line = dotFiles.readLine().trimmed(); - const QStringList &defList = QString::fromUtf8(line).split(' ', QString::SkipEmptyParts); - foreach (const QString &def, defList) { - Q_ASSERT(!def.isEmpty()); - if (def.startsWith(QLatin1String("-D"))) { - mocDefinitions << def; + if (args.size() > 6) { + if (args[6] == QLatin1String("--touch")) { + doTouch = true; } } - line = dotFiles.readLine(); + lazyInitMocDefinitions(); + + QByteArray line = dotFiles.readLine(); dotFilesCheck(line == "MOC_INCLUDES:\n"); line = dotFiles.readLine().trimmed(); const QStringList &incPaths = QString::fromUtf8(line).split(';', QString::SkipEmptyParts); @@ -206,6 +231,10 @@ printVersion(); ::exit(0); } + else { + printUsage(args[0]); + ::exit(EXIT_FAILURE); + } } else if (args.size() < 5) { printUsage(args[0]); @@ -223,8 +252,6 @@ builddir += '/'; } - generateAll = !outfile.exists(); - dotFiles.setFileName(args[1] + QLatin1String(".files")); dotFiles.open(QIODevice::ReadOnly | QIODevice::Text); @@ -232,6 +259,20 @@ dotFilesCheck(line == "SOURCES:\n"); const QStringList &sourceFiles = QString::fromUtf8(dotFiles.readLine().trimmed()).split(';', QString::SkipEmptyParts); + if (outfile.exists()) { + // set generateAll = true if MOC_COMPILE_DEFINITIONS changed + outfile.open(QIODevice::ReadOnly | QIODevice::Text); + QByteArray buf = outfile.readLine(); + // the second line contains the joined mocDefinitions + buf = outfile.readLine(); + buf.chop(1); // remove trailing \n + lazyInitMocDefinitions(); + generateAll = (buf != mocDefinitions.join(QString(QLatin1Char(' '))).toUtf8()); + outfile.close(); + } else { + generateAll = true; + } + // the program goes through all .cpp files to see which moc files are included. It is not really // interesting how the moc file is named, but what file the moc is created from. Once a moc is // included the same moc may not be included in the _automoc.cpp file anymore. OTOH if there's a @@ -240,7 +281,7 @@ QHash<QString, QString> includedMocs; // key = moc source filepath, value = moc output filepath QHash<QString, QString> notIncludedMocs; // key = moc source filepath, value = moc output filename - QRegExp mocIncludeRegExp(QLatin1String("[\n]\\s*#\\s*include\\s+[\"<](moc_[^ \">]+\\.cpp|[^ \">]+\\.moc)[\">]")); + QRegExp mocIncludeRegExp(QLatin1String("[\n]\\s*#\\s*include\\s+[\"<]((?:[^ \">]+/)?moc_[^ \">/]+\\.cpp|[^ \">]+\\.moc)[\">]")); QRegExp qObjectRegExp(QLatin1String("[\n]\\s*Q_OBJECT\\b")); QStringList headerExtensions; #ifdef Q_OS_WIN @@ -337,15 +378,28 @@ do { // call this for every moc include in the file const QString currentMoc = mocIncludeRegExp.cap(1); //qDebug() << "found moc include: " << currentMoc << " at offset " << matchOffset; - QString basename = QFileInfo(currentMoc).completeBaseName(); - const bool moc_style = currentMoc.startsWith("moc_"); + const QFileInfo currentMocInfo(currentMoc); + QString basename = currentMocInfo.completeBaseName(); + const bool moc_style = basename.startsWith("moc_"); + + // If the moc include is of the moc_foo.cpp style we expect the Q_OBJECT class + // declaration in a header file. + // If the moc include is of the foo.moc style we need to look for a Q_OBJECT + // macro in the current source file, if it contains the macro we generate the + // moc file from the source file, else from the header. + // + // TODO: currently any .moc file name will be used if the source contains + // Q_OBJECT if (moc_style || qObjectRegExp.indexIn(contentsString) < 0) { if (moc_style) { + // basename should be the part of the moc filename used for finding the + // correct header, so we need to remove the moc_ part basename = basename.right(basename.length() - 4); } + bool headerFound = false; foreach (const QString &ext, headerExtensions) { - QString sourceFilePath = absPath + basename + ext; + const QString &sourceFilePath = absPath + basename + ext; if (QFile::exists(sourceFilePath)) { headerFound = true; includedMocs.insert(sourceFilePath, currentMoc); @@ -354,11 +408,34 @@ } } if (!headerFound) { + // the moc file is in a subdir => look for the header in the same subdir + if (currentMoc.indexOf('/') != -1) { + const QString &filepath = absPath + currentMocInfo.path() + QLatin1Char('/') + basename; + + foreach (const QString &ext, headerExtensions) { + const QString &sourceFilePath = filepath + ext; + if (QFile::exists(sourceFilePath)) { + headerFound = true; + includedMocs.insert(sourceFilePath, currentMoc); + notIncludedMocs.remove(sourceFilePath); + break; + } + } + if (!headerFound) { + cerr << "automoc4: The file \"" << absFilename << + "\" includes the moc file \"" << currentMoc << "\", but neither \"" << + absPath + basename + "{" + headerExtensions.join(",") + "}\" nor \"" << + filepath + "{" + headerExtensions.join(",") + "}" << + "\" exist." << endl; + ::exit(EXIT_FAILURE); + } + } else { cerr << "automoc4: The file \"" << absFilename << "\" includes the moc file \"" << currentMoc << "\", but \"" << absPath + basename + "{" + headerExtensions.join(",") + "}" << - "\" do not exist." << endl; + "\" does not exist." << endl; ::exit(EXIT_FAILURE); + } } } else { includedMocs.insert(absFilename, currentMoc); @@ -395,7 +472,8 @@ QByteArray automocSource; QTextStream outStream(&automocSource, QIODevice::WriteOnly); - outStream << "/* This file is autogenerated, do not edit */\n"; + outStream << "/* This file is autogenerated, do not edit\n" + << mocDefinitions.join(QString(QLatin1Char(' '))) << "\n*/\n"; if (notIncludedMocs.isEmpty()) { outStream << "enum some_compilers { need_more_than_nothing };\n"; @@ -411,9 +489,6 @@ } } - // let all remaining moc processes finish - waitForProcesses(); - if (failed) { // if any moc process failed we don't want to touch the _automoc.cpp file so that // automoc4 is rerun until the issue is fixed @@ -441,7 +516,7 @@ // update the timestamp on the _automoc.cpp.files file to make sure we get called again dotFiles.close(); - if (!touch(dotFiles.fileName())) { + if (doTouch && !touch(dotFiles.fileName())) { return false; } @@ -471,32 +546,18 @@ return true; } -void AutoMoc::waitForProcesses() -{ - while (!processes.isEmpty()) { - Process proc = processes.dequeue(); - - bool result = proc.qproc->waitForFinished(-1); - //ignore errors from the cmake echo process - if (!proc.mocFilePath.isEmpty()) { - if (!result || proc.qproc->exitCode()) { - cerr << "automoc4: process for " << proc.mocFilePath - << " failed: " << proc.qproc->errorString() << endl; - cerr << "pid to wait for: " << proc.qproc->pid() << endl; - cerr << "processes in queue: " << processes.size() << endl; - failed = true; - QFile::remove(proc.mocFilePath); - } - } - delete proc.qproc; - } -} - bool AutoMoc::generateMoc(const QString &sourceFile, const QString &mocFileName) { //qDebug() << Q_FUNC_INFO << sourceFile << mocFileName; const QString mocFilePath = builddir + mocFileName; - if (generateAll || QFileInfo(mocFilePath).lastModified() <= QFileInfo(sourceFile).lastModified()) { + QFileInfo mocInfo(mocFilePath); + if (generateAll || mocInfo.lastModified() <= QFileInfo(sourceFile).lastModified()) { + QDir mocDir = mocInfo.dir(); + // make sure the directory for the resulting moc file exists + if (!mocDir.exists()) { + mocDir.mkpath(mocDir.path()); + } + static bool initialized = false; if (!initialized) { initialized = true; @@ -508,19 +569,8 @@ echoColor("Generating " + mocFileName); } - // we don't want too many child processes -#ifdef Q_OS_FREEBSD - static const int max_processes = 0; -#else - static const int max_processes = 10; -#endif - - if (processes.size() > max_processes) { - waitForProcesses(); - } - - QProcess *mocProc = new QProcess; - mocProc->setProcessChannelMode(QProcess::ForwardedChannels); + QProcess mocProc; + mocProc.setProcessChannelMode(QProcess::ForwardedChannels); QStringList args(mocIncludes + mocDefinitions); #ifdef Q_OS_WIN args << "-DWIN32"; @@ -530,15 +580,21 @@ if (verbose) { cout << mocExe << " " << args.join(QLatin1String(" ")) << endl; } - mocProc->start(mocExe, args, QIODevice::NotOpen); - if (mocProc->waitForStarted()) { - processes.enqueue(Process(mocProc, mocFilePath)); + mocProc.start(mocExe, args, QIODevice::NotOpen); + if (mocProc.waitForStarted()) { + const bool result = mocProc.waitForFinished(-1); + if (!result || mocProc.exitCode()) { + cerr << "automoc4: process for " << mocFilePath + << " failed: " << mocProc.errorString() << endl; + cerr << "pid to wait for: " << mocProc.pid() << endl; + failed = true; + QFile::remove(mocFilePath); + } return true; } else { cerr << "automoc4: process for " << mocFilePath << "failed to start: " - << mocProc->errorString() << endl; + << mocProc.errorString() << endl; failed = true; - delete mocProc; } } return false; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autofs
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package autofs checked in at Mon Aug 11 22:13:26 CEST 2008. -------- --- autofs/autofs.changes 2008-06-26 17:01:23.000000000 +0200 +++ autofs/autofs.changes 2008-08-11 14:30:54.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 11 14:28:40 CEST 2008 - mkoenig(a)suse.de + +- update upstream patches 20080806 +- remove patch + autofs-5.0.3-allow_rootfs_nonlocal.patch + +------------------------------------------------------------------- Old: ---- autofs-5.0.3-allow_rootfs_nonlocal.patch autofs-5.0.3-upstream-patches-20080528 New: ---- autofs-5.0.3-upstream-patches-20080806.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.Z16302/_old 2008-08-11 22:12:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Z16302/_new 2008-08-11 22:12:11.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package autofs (Version 5.0.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -18,7 +25,7 @@ Group: System/Daemons AutoReqProv: on Version: 5.0.3 -Release: 46 +Release: 60 Summary: A Kernel-Based Automounter BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.bz2 @@ -27,13 +34,12 @@ Source4: README.SuSE.ldap Source5: README.SuSE Source7: NetworkManager-autofs -Patch0: autofs-5.0.3-upstream-patches-20080528 +Patch0: autofs-5.0.3-upstream-patches-20080806.bz2 Patch10: autofs-suse-auto_master_default.patch Patch11: autofs-suse-autofs_init.patch Patch12: autofs-5.0.1-mount_xdr_no_strict_aliasing.patch Patch13: autofs-5.0.2-use_local_cflags.patch Patch15: autofs-5.0.3-link_kerberos.patch -Patch16: autofs-5.0.3-allow_rootfs_nonlocal.patch PreReq: %fillup_prereq %insserv_prereq %if %suse_version > 1020 Recommends: nfs-client @@ -65,7 +71,6 @@ %patch12 -p1 %patch13 -p1 %patch15 -p1 -%patch16 -p1 %build autoconf -f @@ -149,6 +154,10 @@ /usr/sbin/automount %changelog +* Mon Aug 11 2008 mkoenig(a)suse.de +- update upstream patches 20080806 +- remove patch + autofs-5.0.3-allow_rootfs_nonlocal.patch * Thu Jun 26 2008 mkoenig(a)suse.de - update upstream patches 20080528 - allow rootfs to be non-local [bnc#399944] ++++++ autofs-5.0.3-upstream-patches-20080806.bz2 ++++++ ++++ 9483 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package aaa_base checked in at Mon Aug 11 22:12:01 CEST 2008. -------- --- aaa_base/aaa_base.changes 2008-08-08 17:43:06.000000000 +0200 +++ aaa_base/aaa_base.changes 2008-08-11 17:00:40.293831000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 11 16:57:15 CEST 2008 - werner(a)suse.de + +- Fix shell syntax in boot scripts from last change +- Fix some boot script dependencies + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.p11651/_old 2008-08-11 22:10:37.000000000 +0200 +++ /var/tmp/diff_new_pack.p11651/_new 2008-08-11 22:10:37.000000000 +0200 @@ -28,7 +28,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv udev net-tools AutoReqProv: on Version: 11.0.42 -Release: 27 +Release: 29 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -150,6 +150,9 @@ %defattr(-,root,root) %changelog +* Mon Aug 11 2008 werner(a)suse.de +- Fix shell syntax in boot scripts from last change +- Fix some boot script dependencies * Fri Aug 08 2008 werner(a)suse.de - Implement forcefsck from kernels command line (bnc#379597) * Fri Aug 08 2008 werner(a)suse.de ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.cleanup new/aaa_base/etc/init.d/boot.cleanup --- old/aaa_base/etc/init.d/boot.cleanup 2008-07-22 11:31:13.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.cleanup 2008-08-11 16:50:41.000000000 +0200 @@ -9,8 +9,8 @@ # Provides: boot.cleanup # Required-Start: boot.rootfsck # Should-Start: $local_fs boot.quota -# Required-Stop: -# Should-Stop: +# Required-Stop: $null +# Should-Stop: $null # Default-Start: B # Default-Stop: # Short-Description: do cleanup diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.clock new/aaa_base/etc/init.d/boot.clock --- old/aaa_base/etc/init.d/boot.clock 2008-07-22 11:34:05.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.clock 2008-08-11 16:51:58.000000000 +0200 @@ -9,9 +9,9 @@ ### BEGIN INIT INFO # Provides: boot.clock # Required-Start: boot.rootfsck -# Required-Stop: +# Required-Stop: boot.rootfsck # X-Start-Before: boot.localfs -# X-Stop-After: +# X-Stop-After: $null # Default-Start: B S # Default-Stop: # Description: Read hardware clock and set system clock diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.ipconfig new/aaa_base/etc/init.d/boot.ipconfig --- old/aaa_base/etc/init.d/boot.ipconfig 2008-07-22 11:45:55.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.ipconfig 2008-08-11 16:52:38.000000000 +0200 @@ -7,10 +7,10 @@ # ### BEGIN INIT INFO # Provides: boot.ipconfig -# Required-Start: +# Required-Start: # Should-Start: boot.sysctl # Required-Stop: -# Should-Stop: +# Should-Stop: $null # Default-Start: B # Default-Stop: # Short-Description: run ip configuration hooks diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.klog new/aaa_base/etc/init.d/boot.klog --- old/aaa_base/etc/init.d/boot.klog 2008-07-22 11:46:57.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.klog 2008-08-11 16:52:56.000000000 +0200 @@ -8,7 +8,7 @@ # Provides: boot.klog # Required-Start: boot.rootfsck # Should-Start: $local_fs -# Required-Stop: +# Required-Stop: $null # Should-Stop: $local_fs # Default-Start: B # Default-Stop: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.localfs new/aaa_base/etc/init.d/boot.localfs --- old/aaa_base/etc/init.d/boot.localfs 2008-08-08 17:41:26.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.localfs 2008-08-11 16:38:48.000000000 +0200 @@ -151,7 +151,7 @@ FSCK_OPTS="$FSCK_OPTS -f" fi # If we use a serial console, don't use the fsck progress bar - if "$REDIRECT" = "/dev/tty1" ; then + if test "$REDIRECT" = "/dev/tty1" ; then FSCK_OPTS="$FSCK_OPTS -C" else FSCK_OPTS="$FSCK_OPTS -V" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.rootfsck new/aaa_base/etc/init.d/boot.rootfsck --- old/aaa_base/etc/init.d/boot.rootfsck 2008-08-08 17:41:43.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.rootfsck 2008-08-11 16:53:12.000000000 +0200 @@ -8,7 +8,7 @@ ### BEGIN INIT INFO # Provides: boot.rootfsck # Required-Start: boot.udev -# Required-Stop: +# Required-Stop: $null # Default-Start: B # Default-Stop: # Short-Description: check and mount root filesystem @@ -60,10 +60,11 @@ MAY_FSCK=1 fi fi - # - FSCK_FORCE="" + # common options for file system check + FSCK_OPTS="-a" if test -f /forcefsck -o "$DO_FORCEFSCK" = "yes" ; then - FSCK_FORCE="-f" + # force file system check if forced is specified + FSCK_OPTS="$FSCK_OPTS -f" ROOTFS_FSCK="" fi if test "$ROOTFS_FSCK" = "0" ; then @@ -71,14 +72,8 @@ MAY_FSCK=0 fi if test ! -f /fastboot -a -z "$DO_FASTBOOT" -a $MAY_FSCK -eq 1 ; then - # common options for file system check - FSCK_OPTS="-a" - # force file system check if forced - if test -f /forcefsck -o "$DO_FORCEFSCK" = "yes" ; then - FSCK_OPTS="$FSCK_OPTS -f" - fi # If we use a serial console, don't use the fsck progress bar - if "$REDIRECT" = "/dev/tty1" ; then + if test "$REDIRECT" = "/dev/tty1" ; then FSCK_OPTS="$FSCK_OPTS -C" else FSCK_OPTS="$FSCK_OPTS -V" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0