January 2008 - openSUSE Commits - openSUSE Mailing Lists

commit icewm
by root＠Hilbert.suse.de 30 Jan '08

30 Jan '08

Hello community, here is the log from the commit of package icewm checked in at Wed Jan 30 18:23:45 CET 2008. -------- --- icewm/icewm-lite.changes 2008-01-29 14:35:30.000000000 +0100 +++ icewm/icewm-lite.changes 2008-01-30 15:36:03.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Jan 29 15:41:57 CET 2008 - mmarek(a)suse.cz + +- build with --disable-taskbar --disable-winmenu --enable-lite + to save as much space as possible in the inst-sys (bnc#357240) + (this means that if you want a taskbar, you should use the + icewm-default package instead) + +------------------------------------------------------------------- New: ---- icewm-1.2.35-lite-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icewm-lite.spec ++++++ --- /var/tmp/diff_new_pack.R15190/_old 2008-01-30 18:23:05.000000000 +0100 +++ /var/tmp/diff_new_pack.R15190/_new 2008-01-30 18:23:05.000000000 +0100 @@ -19,7 +19,7 @@ Conflicts: icewm-default AutoReqProv: on Version: 1.2.35 -Release: 2 +Release: 3 Source: icewm-%{version}.tar.bz2 Patch0: icewm-LANG.menu.patch Patch1: icewm-multiByte.patch @@ -27,18 +27,19 @@ Patch3: icewm-docdir.patch Patch4: icewm-1.2.30-strict-aliasing.patch Patch5: icewm-1.2.35-override-config.patch +Patch6: icewm-1.2.35-lite-build.patch Url: http://www.icewm.org/ -Summary: Window Manager with Taskbar--Lite Version +Summary: IceWM Window Manager--Lite Version BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Window manager for the X Window System that can emulate the look of Windows 95, OS/2 Warp 3,4, Motif. It tries to take the best features of the above systems. It features multiple workspaces, opaque move and -resize, taskbar, window list, mailbox status, digital clock. It is fast -and small. +resize. It is fast and small. -This is the lite version with minimal features. +The icewm-default package features a taskbar, window list, mailbox +status and digital clock in addition to that. @@ -54,6 +55,7 @@ %patch3 %patch4 %patch5 +%patch6 %build %{?suse_update_config:%{suse_update_config -f}} @@ -69,6 +71,9 @@ --disable-nls \ --disable-guievents \ --with-xpm \ + --disable-taskbar \ + --disable-winmenu \ + --enable-lite \ --without-gnome-menus make %{?jobs:-j%jobs} @@ -90,6 +95,11 @@ %changelog * Tue Jan 29 2008 mmarek(a)suse.cz +- build with --disable-taskbar --disable-winmenu --enable-lite + to save as much space as possible in the inst-sys (bnc#357240) + (this means that if you want a taskbar, you should use the + icewm-default package instead) +* Tue Jan 29 2008 mmarek(a)suse.cz - make icewm --config=file work (override-config.patch) * Mon Jan 28 2008 mmarek(a)suse.cz ++++++ icewm.spec ++++++ --- /var/tmp/diff_new_pack.R15190/_old 2008-01-30 18:23:05.000000000 +0100 +++ /var/tmp/diff_new_pack.R15190/_new 2008-01-30 18:23:05.000000000 +0100 @@ -21,7 +21,7 @@ Requires: icewm-bin, xdg-menu, desktop-data AutoReqProv: on Version: 1.2.35 -Release: 2 +Release: 3 Source: icewm-%{version}.tar.bz2 Source1: %{name}.desktop Patch0: icewm-LANG.menu.patch @@ -30,6 +30,7 @@ Patch3: icewm-docdir.patch Patch4: icewm-1.2.30-strict-aliasing.patch Patch5: icewm-1.2.35-override-config.patch +Patch6: icewm-1.2.35-lite-build.patch Url: http://www.icewm.org/ Summary: Window Manager with a Taskbar BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -94,6 +95,7 @@ %patch3 %patch4 %patch5 +%patch6 %build %{?suse_update_config:%{suse_update_config -f}} ++++++ icewm-1.2.35-lite-build.patch ++++++ --- src/wmmgr.cc | 2 ++ 1 file changed, 2 insertions(+) --- src/wmmgr.cc.orig +++ src/wmmgr.cc @@ -676,9 +676,11 @@ void YWindowManager::handleClientMessage case ICEWM_ACTION_WINDOWLIST: wmapp->actionPerformed(actionWindowList, 0); break; +#ifndef LITE case ICEWM_ACTION_ABOUT: wmapp->actionPerformed(actionAbout, 0); break; +#endif } } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gtk2
by root＠Hilbert.suse.de 30 Jan '08

30 Jan '08

Hello community, here is the log from the commit of package gtk2 checked in at Wed Jan 30 18:21:54 CET 2008. -------- --- GNOME/gtk2/gtk2.changes 2008-01-23 17:36:44.000000000 +0100 +++ gtk2/gtk2.changes 2008-01-29 11:42:15.812146000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 29 10:48:21 CET 2008 - sbrabec(a)suse.cz + +- Use glibc locale for week info with glibc >= 2.7 (bnc#104417). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2.spec ++++++ --- /var/tmp/diff_new_pack.Jy6737/_old 2008-01-30 18:18:22.000000000 +0100 +++ /var/tmp/diff_new_pack.Jy6737/_new 2008-01-30 18:18:22.000000000 +0100 @@ -28,7 +28,7 @@ AutoReqProv: on PreReq: /usr/bin/touch /bin/rm /bin/rmdir Version: 2.12.5 -Release: 1 +Release: 4 Summary: Library for Creation of Graphical User Interfaces (version 2) Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar… Source1: SuSEconfig.gtk2 @@ -225,11 +225,13 @@ %ifarch ppc64 export CFLAGS="$CFLAGS -mminimal-toc" %endif -# Do not believe glibc first weekday: +%if %suse_version <= 1030 +# Do not believe glibc first weekday for glibc < 2.7: # https://bugzilla.novell.com/show_bug.cgi?id=130787 # https://bugzilla.novell.com/show_bug.cgi?id=104417 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=2388 sed -i /HAVE__NL_TIME_FIRST_WEEKDAY/d config.h.in +%endif # needed for gtk+-2.10.6: export CFLAGS="$CFLAGS -fno-strict-aliasing" %if %DIRECTFB_SUPPORT @@ -367,6 +369,8 @@ %{_datadir}/gtk-doc/html/* %changelog +* Tue Jan 29 2008 sbrabec(a)suse.cz +- Use glibc locale for week info with glibc >= 2.7 (bnc#104417). * Wed Jan 23 2008 maw(a)suse.de - Update to version 2.12.5: + Bugs (bugzilla.gnome.org) fixed: #494667, #496546, #503824, @@ -439,7 +443,7 @@ * Mon Aug 13 2007 federico(a)novell.com - Removed references to obsolete patches from the SPEC file. Fixes https://bugzilla.novell.com/show_bug.cgi?id=299262 -* Mon Aug 06 2007 maw(a)suse.de +* Tue Aug 07 2007 maw(a)suse.de - Split out a -lang subpackage - Use %%fdupes. * Thu Jul 26 2007 maw(a)suse.de @@ -514,7 +518,7 @@ - adding hicolor-icon-theme to Requires [#249043] * Thu Apr 19 2007 sbrabec(a)suse.cz - Correctly initialize XDG_DATA_DIRS in SuSEconfig (#240603). -* Wed Apr 11 2007 maw(a)suse.de +* Thu Apr 12 2007 maw(a)suse.de - Remove some extraneous comments that were inadvertently left in the .spec. * Tue Apr 10 2007 sbrabec(a)suse.cz @@ -543,7 +547,7 @@ https://bugzilla.novell.com/show_bug.cgi?id=216883. The "Home" and "Desktop" items in the shortcuts pane of the file chooser would not show sometimes in SAVE mode. -* Wed Jan 17 2007 maw(a)suse.de +* Thu Jan 18 2007 maw(a)suse.de - Add gtk2-235661-pixbuf-loader-error-checking.diff (#235661). * Tue Jan 16 2007 sbrabec(a)suse.cz - Build with correct CFLAGS. @@ -568,7 +572,7 @@ - 359053 Reduce relocations - 359052 gtk_print_settings_get_duplex() return wrong value for one of vertical setting -* Sat Oct 14 2006 danw(a)suse.de +* Sun Oct 15 2006 danw(a)suse.de - Remove dead patches - Remove gtk2-179040-file-chooser-location-entry-folder.diff, which never actually worked, but was effectively reverted in CODE10 by @@ -618,7 +622,7 @@ * Wed Aug 09 2006 aj(a)suse.de - Fix lib64 patch to apply. - Fix po files to pass new gettext checks. -* Fri Jul 28 2006 gekker(a)suse.de +* Sat Jul 29 2006 gekker(a)suse.de - Update to version 2.10.1 - Remove upstream patchesa - lots of updates in the printing area @@ -689,7 +693,7 @@ https://bugzilla.novell.com/show_bug.cgi?id=151580 (about Beagle support) and https://bugzilla.novell.com/show_bug.cgi?id=148896 (about not having a highlighted shortcut at startup). -* Fri Feb 03 2006 federico(a)novell.com +* Sat Feb 04 2006 federico(a)novell.com - Added gtk2-117163-cairo-repeat-pattern-workaround.diff as a fix for bug #117163. In this bug, the desktop gets repainted very slowly due to bugs in Cairo and XRENDER. The workaround uses a faster code path in GTK+. @@ -736,7 +740,7 @@ * Fri Oct 28 2005 federico(a)novell.com - Added gtk2-127646-dnd-cursor-offset.diff to fix the position of the default cursor for drag and drop. -* Tue Oct 11 2005 gekker(a)suse.de +* Wed Oct 12 2005 gekker(a)suse.de - Update to version 2.8.6 - Fix return of random data * Wed Oct 05 2005 federico(a)novell.com @@ -776,7 +780,7 @@ * Thu Aug 11 2005 gekker(a)suse.de - Update to version 2.7.5 - Remove upstreamed patch -* Wed Aug 10 2005 clahey(a)suse.de +* Thu Aug 11 2005 clahey(a)suse.de - Patch to check for updated icon theme (especially cache) every 30 seconds. * Fri Aug 05 2005 sbrabec(a)suse.cz @@ -803,7 +807,7 @@ - Fix sentinel patch to work with new version of glib2. * Wed Jun 01 2005 sbrabec(a)suse.cz - Use current name for XFree86-devel in Requires (#54136). -* Mon May 02 2005 gekker(a)suse.de +* Tue May 03 2005 gekker(a)suse.de - Fix crasher in gtktextview (380). * Mon Apr 04 2005 aj(a)suse.de - Disable visibility to build with GCC4. This should be @@ -845,7 +849,7 @@ - Added work-around for GTK_PATH bi-arch problems (#45386). * Mon Sep 06 2004 meissner(a)suse.de - Added ico overflow security patch, CAN-2004-0788. -* Tue Aug 31 2004 dave(a)suse.de +* Wed Sep 01 2004 dave(a)suse.de - Added gtk2-cancel-rename.patch, ximian #59669 * Fri Aug 27 2004 federico(a)ximian.com - Removed stray g_print() from gtk-xpm-secfix.dif; normalized the patch @@ -857,7 +861,7 @@ CAN-2004-0782, CAN-2004-0783. * Wed Aug 04 2004 clahey(a)suse.de - Added gtk2-esc-closes.patch from Federico. -* Fri Jun 04 2004 clahey(a)suse.de +* Sat Jun 05 2004 clahey(a)suse.de - Fixed filesel patch to just go directly to Desktop. * Tue Apr 27 2004 sbrabec(a)suse.cz - Fixed gtk64.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 gnome-spell2
by root＠Hilbert.suse.de 30 Jan '08

30 Jan '08

Hello community, here is the log from the commit of package gnome-spell2 checked in at Wed Jan 30 18:16:32 CET 2008. -------- --- GNOME/gnome-spell2/gnome-spell2.changes 2007-08-07 22:01:04.000000000 +0200 +++ gnome-spell2/gnome-spell2.changes 2008-01-30 16:41:25.035868000 +0100 @@ -1,0 +2,8 @@ +Wed Jan 30 16:42:36 CET 2008 - rodrigo(a)suse.de + +- Update to version 1.0.8: + * Win32 fixes + * New translations +- Use libidl-devel for BuildRequires, not libidl + +------------------------------------------------------------------- Old: ---- gnome-spell-1.0.7.tar.bz2 New: ---- gnome-spell-1.0.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-spell2.spec ++++++ --- /var/tmp/diff_new_pack.rT1191/_old 2008-01-30 18:16:18.000000000 +0100 +++ /var/tmp/diff_new_pack.rT1191/_new 2008-01-30 18:16:18.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gnome-spell2 (Version 1.0.7) +# spec file for package gnome-spell2 (Version 1.0.8) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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. # @@ -11,14 +11,14 @@ # norootforbuild Name: gnome-spell2 -BuildRequires: aspell-devel fdupes gnome-common intltool libglade2-devel libgnomeui-devel libidl -URL: http://www.gnome.org/ +BuildRequires: aspell-devel fdupes gnome-common intltool libglade2-devel libgnomeui-devel libidl-devel +Url: http://www.gnome.org/ %define _name gnome-spell License: GPL v2 or later Group: Development/Libraries/GNOME -Autoreqprov: on -Version: 1.0.7 -Release: 96 +AutoReqProv: on +Version: 1.0.8 +Release: 1 # Dropped (needed for <9.0): Provides: bonobo-conf Obsoletes: bonobo-conf @@ -39,7 +39,7 @@ %lang_package %prep %setup -q -n %{_name}-%{version} -rm po/no.* +#rm po/no.* sed -i "s/$ALL_LINGUAS.*$ no /\1 /" configure.in %build @@ -51,7 +51,6 @@ make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{_name}-%{version} rm $RPM_BUILD_ROOT%{_libdir}/*/*.*a - %fdupes $RPM_BUILD_ROOT %clean @@ -72,60 +71,65 @@ %files lang -f %{_name}-%{version}.lang %changelog -* Tue Aug 07 2007 - maw(a)suse.de +* Wed Jan 30 2008 rodrigo(a)suse.de +- Update to version 1.0.8: + * Win32 fixes + * New translations +- Use libidl-devel for BuildRequires, not libidl +* Tue Aug 07 2007 maw(a)suse.de - Use %%fdupes - Split off a -lang subpackage. -* Sat Aug 04 2007 - aj(a)suse.de +* Sat Aug 04 2007 aj(a)suse.de - Add provides for bonobo-conf as well. -* Mon Jan 08 2007 - sbrabec(a)suse.cz +* Mon Jan 08 2007 sbrabec(a)suse.cz - Spec file cleanup. -* Mon Jan 08 2007 - ro(a)suse.de +* Mon Jan 08 2007 ro(a)suse.de - GNOME moved to /usr -* Thu Oct 19 2006 - jhargadon(a)suse.de +* Thu Oct 19 2006 jhargadon(a)suse.de - removed the devel split because this broke other packages and the fact that there are no devel files in the package. -* Fri Oct 13 2006 - danw(a)suse.de +* Fri Oct 13 2006 danw(a)suse.de - Remove dead patch -* Tue Oct 10 2006 - jhargadon(a)suse.de +* Tue Oct 10 2006 jhargadon(a)suse.de - split out the devel files into a -devel package -* Thu Sep 21 2006 - jhargadon(a)suse.de +* Thu Sep 21 2006 jhargadon(a)suse.de - update to version 1.0.7 - added all languages listed by gnome-spell - win build fixes - added gl language - translation updates -* Sun Feb 19 2006 - aj(a)suse.de +* Sun Feb 19 2006 aj(a)suse.de - Reduce BuildRequires. -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Tue Aug 23 2005 - ro(a)suse.de +* Tue Aug 23 2005 ro(a)suse.de - removed control-center from nfb and added dirs instead to break up build-dep cycle -* Sat Feb 12 2005 - gekker(a)suse.de +* Sat Feb 12 2005 gekker(a)suse.de - Update to version 1.0.6 -* Fri Nov 19 2004 - ro(a)suse.de +* Fri Nov 19 2004 ro(a)suse.de - removed extra aclocal include directive -* Tue Nov 02 2004 - ro(a)suse.de +* Tue Nov 02 2004 ro(a)suse.de - locale rename: no -> nb -* Fri Sep 10 2004 - ro(a)suse.de +* Fri Sep 10 2004 ro(a)suse.de - added shared-mime-info to neededforbuild -* Wed May 19 2004 - ro(a)suse.de +* Wed May 19 2004 ro(a)suse.de - do not define GTK_DISABLE_DEPRECATED - make clean to regenerate Spell-stubs.c -* Sun Jan 11 2004 - adrian(a)suse.de +* Sun Jan 11 2004 adrian(a)suse.de - add %%defattr -* Mon Sep 22 2003 - sbrabec(a)suse.cz +* Mon Sep 22 2003 sbrabec(a)suse.cz - Obsolete bonobo-conf. -* Tue Sep 16 2003 - sbrabec(a)suse.cz +* Tue Sep 16 2003 sbrabec(a)suse.cz - Fixed building of shared library (bug #30329). - Not packaged unneeded *.*a files. -* Mon Aug 18 2003 - sbrabec(a)suse.cz +* Mon Aug 18 2003 sbrabec(a)suse.cz - Updated to version 1.0.5. -* Mon Jul 14 2003 - sbrabec(a)suse.cz +* Mon Jul 14 2003 sbrabec(a)suse.cz - GNOME prefix change to /opt/gnome. -* Tue Jul 01 2003 - ro(a)suse.de +* Tue Jul 01 2003 ro(a)suse.de - added control-center2 to neededforbuild -* Mon Jun 02 2003 - sbrabec(a)suse.cz +* Mon Jun 02 2003 sbrabec(a)suse.cz - Updated to version 1.0.4. -* Thu May 22 2003 - sbrabec(a)suse.cz +* Thu May 22 2003 sbrabec(a)suse.cz - Initial SuSE version of GNOME2 port. ++++++ gnome-spell-1.0.7.tar.bz2 -> gnome-spell-1.0.8.tar.bz2 ++++++ ++++ 144809 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 gnome-power-manager
by root＠Hilbert.suse.de 30 Jan '08

30 Jan '08

Hello community, here is the log from the commit of package gnome-power-manager checked in at Wed Jan 30 18:16:07 CET 2008. -------- --- GNOME/gnome-power-manager/gnome-power-manager.changes 2007-11-29 14:04:33.000000000 +0100 +++ gnome-power-manager/gnome-power-manager.changes 2008-01-30 16:32:42.757661000 +0100 @@ -1,0 +2,23 @@ +Wed Jan 30 16:31:15 CET 2008 - rodrigo(a)suse.de + +- Update to version 2.21.1: + * Fixed bgo#13360, After loading gnome gpm starts but shows + nothing in tray icon despite option + * Fixed bgo#474973, Lack of context to translate + * Fixed bgo#497298, The +/- buttons on the brightness applet + sometimes get stuck + * Fixed bgo#497298, Avoid float computation error + * Fixed bgo#497328, Incorrect documentation for --enable-checkfg + * Fixed bgo#496367, Work out the size of the label text to avoid + truncating numbers in other locales + * Correct much of the documentation in many different ways + * Use _NEVER for sleep problems notification, so that the user + can always see it + * Pass make distcheck on a desktop machine without a battery + * Fix the keyboard brightness up button + * Use the correct DBUS return types now HAL enforces the return type + * Rip out GpmWebcam + * Updated translations +- Removed upstreamed patches + +------------------------------------------------------------------- Old: ---- gnome-power-manager-2.20.0.tar.bz2 gnome-power-manager-brightness-BNC310273.patch gnome-power-manager-sleep-notification.patch New: ---- gnome-power-manager-2.21.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.J31268/_old 2008-01-30 18:15:21.000000000 +0100 +++ /var/tmp/diff_new_pack.J31268/_new 2008-01-30 18:15:21.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gnome-power-manager (Version 2.20.0) +# spec file for package gnome-power-manager (Version 2.21.1) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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. # @@ -13,8 +13,8 @@ Name: gnome-power-manager # BuildRequires: PolicyKit-devel docbook-utils docbook_4 gnome-common gnome-doc-utils-devel gnome-icon-theme gnome-panel-devel gnome-patch-translation intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libnotify-devel libwnck-devel notification-daemon scrollkeeper update-desktop-files xmlto BuildRequires: docbook-utils docbook_4 fdupes gnome-common gnome-doc-utils-devel gnome-panel-devel gnome-patch-translation gstreamer010-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libnotify-devel libwnck-devel notification-daemon scrollkeeper update-desktop-files xmlto -Version: 2.20.0 -Release: 37 +Version: 2.21.1 +Release: 1 Url: http://gnome-power.sourceforge.net/ Group: System/GUI/GNOME License: GPL v2 or later @@ -27,11 +27,8 @@ Patch8: gpm-zh_CN-translation.patch Patch9: gnome-power-manager-system-policy.patch Patch10: gnome-power-manager-initialize-vars.patch -Patch11: gnome-power-manager-brightness-BNC310273.patch # PATCH-FIX-OPENSUSE gnome-power-manager-enable-cpufreq.patch bnc222021 Patch12: gnome-power-manager-enable-cpufreq.patch -# PATCH-FIX-UPSTREAM gnome-power-manager-sleep-notification.patch bnc241440 -Patch13: gnome-power-manager-sleep-notification.patch Requires: hal dbus-1 gnome-screensaver notification-daemon Requires: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,9 +65,7 @@ #%patch8 %patch9 %patch10 -p1 -%patch11 -p0 %patch12 -%patch13 #gnome-patch-translation-update %build @@ -124,20 +119,40 @@ %files lang -f %{name}.lang %changelog -* Thu Nov 29 2007 - rodrigo(a)suse.de +* Wed Jan 30 2008 rodrigo(a)suse.de +- Update to version 2.21.1: + * Fixed bgo#13360, After loading gnome gpm starts but shows + nothing in tray icon despite option + * Fixed bgo#474973, Lack of context to translate + * Fixed bgo#497298, The +/- buttons on the brightness applet + sometimes get stuck + * Fixed bgo#497298, Avoid float computation error + * Fixed bgo#497328, Incorrect documentation for --enable-checkfg + * Fixed bgo#496367, Work out the size of the label text to avoid + truncating numbers in other locales + * Correct much of the documentation in many different ways + * Use _NEVER for sleep problems notification, so that the user + can always see it + * Pass make distcheck on a desktop machine without a battery + * Fix the keyboard brightness up button + * Use the correct DBUS return types now HAL enforces the return type + * Rip out GpmWebcam + * Updated translations +- Removed upstreamed patches +* Thu Nov 29 2007 rodrigo(a)suse.de - Added upstreamed patch to leave the sleep error notification up until dismissed by the user (#241440) -* Thu Nov 08 2007 - rodrigo(a)suse.de +* Thu Nov 08 2007 rodrigo(a)suse.de - Enable cpufreq settings by default (#222021) -* Tue Oct 02 2007 - sreeves(a)suse.de +* Tue Oct 02 2007 sreeves(a)suse.de - Fix for 310273 - brightness problems -* Tue Sep 18 2007 - maw(a)suse.de +* Tue Sep 18 2007 maw(a)suse.de - Update to version 2.20.0: + Fix for bugzilla.gnome.org #470481 + Updated translations. -* Wed Sep 12 2007 - rodrigo(a)suse.de +* Wed Sep 12 2007 rodrigo(a)suse.de - Disable PolicyKit, upstream is not ported to last release (#302413) -* Mon Sep 10 2007 - cthiel(a)suse.de +* Mon Sep 10 2007 cthiel(a)suse.de - update to version 2.19.92 * Bugs (bugzilla.gnome.org) [#449274], Application specific icons are installed in the wrong directory @@ -147,12 +162,12 @@ [#468509], Some grammar issues [#468825], Possible error in GUI text strings * Updated translations -* Mon Sep 10 2007 - rodrigo(a)suse.de +* Mon Sep 10 2007 rodrigo(a)suse.de - Remove patch that calls Yast2 PM module (#302413) -* Tue Aug 07 2007 - maw(a)suse.de +* Tue Aug 07 2007 maw(a)suse.de - Use %%fdupes - Split off a -lang subpackage. -* Thu Aug 02 2007 - maw(a)suse.de +* Thu Aug 02 2007 maw(a)suse.de - Update to version 2.19.6: + Bugs (bugzilla.gnome.org) fixed: #405421, #436717, #445173, [#448570], #450154, #453853, #455148, #455499, #457414, #458609, @@ -162,26 +177,26 @@ + Updated translations - Add gnome-power-manager-initialize-vars.patch - Use %%fdupes. -* Mon Jul 09 2007 - maw(a)suse.de +* Mon Jul 09 2007 maw(a)suse.de - Update to version 2.19.3 - Fixes for bugzilla.gnome.org #359089, #393388, #414032, #418605, [#419403], #437042, #437920, #428401, #438838, #440409, and #445173 - Updated translations -* Thu Jun 07 2007 - sbrabec(a)suse.cz +* Thu Jun 07 2007 sbrabec(a)suse.cz - Removed invalid desktop Category "Application" (#254654). -* Mon May 14 2007 - pgajdos(a)suse.cz +* Mon May 14 2007 pgajdos(a)suse.cz - removed gnome-icon-theme from Requires and BuildRequires [#247450] -* Wed Apr 11 2007 - maw(a)suse.de +* Wed Apr 11 2007 maw(a)suse.de - Update to version 2.18.2 - Fixes for b.g.o #422345 and #425000 - Updated translations for various locales. -* Fri Mar 30 2007 - maw(a)suse.de +* Fri Mar 30 2007 maw(a)suse.de - Update to version 2.18.0 - b.g.o 414311, 412345, 414010, 411592, 407613, 408705, 383653, and 407613. -* Thu Mar 08 2007 - maw(a)suse.de +* Fri Mar 09 2007 maw(a)suse.de - Update to version 2.17.91, which brings us: - General fixes: - Fixed #402823, crash in Power Manager: It had crashed when I re... @@ -202,30 +217,30 @@ - Updated ar: Djihed Afifi - Updated th: Theppitak Karoonboonyanan - Updated en_GB: David Lodge -* Wed Mar 07 2007 - sbrabec(a)suse.cz +* Wed Mar 07 2007 sbrabec(a)suse.cz - Updated BuildRequires: PolicyKit -> PolicyKit-devel. -* Mon Jan 22 2007 - sbrabec(a)suse.cz +* Mon Jan 22 2007 sbrabec(a)suse.cz - Prefix changed to /usr. - Spec file cleanup. - Enabled PolicyKit support. -* Tue Nov 14 2006 - sbrabec(a)suse.cz +* Tue Nov 14 2006 sbrabec(a)suse.cz - Use translation compendium gnome-patch-translation (#220304). -* Tue Oct 31 2006 - rodrigo(a)suse.de +* Tue Oct 31 2006 rodrigo(a)suse.de - Removed custom autostart installation directory patch. -* Tue Oct 24 2006 - rodrigo(a)suse.de +* Tue Oct 24 2006 rodrigo(a)suse.de - Removed unneeded gnome-power-manager-disable-actions.patch. - Fixed gnome-power-manager-yast-settings.patch to match variable names changes. -* Mon Oct 16 2006 - danw(a)suse.de +* Mon Oct 16 2006 danw(a)suse.de - Remove dead patches - Update and re-enable gnome-power-manager-yast-settings.patch and gnome-power-manager-disable-actions.patch -* Fri Oct 13 2006 - ro(a)suse.de +* Fri Oct 13 2006 ro(a)suse.de - added gnome-doc-utils-devel to buildreq -* Mon Oct 09 2006 - hmacht(a)suse.de +* Mon Oct 09 2006 hmacht(a)suse.de - add temporary patch to grab org.freedesktop.Policy.Power system interface on startup -* Tue Oct 03 2006 - jhargadon(a)suse.de +* Tue Oct 03 2006 jhargadon(a)suse.de - update to version 2.16.1 - Use the step value we computed (rather than one) to fix pressing brightness-down on the Macbook Pro @@ -242,18 +257,18 @@ - Increase dep of libgnome to 2.14.0 because we are using GNOME_PARAM_GOPTION_CONTEXT, which was introduced in 2-14 - translation updates -* Fri Sep 29 2006 - rodrigo(a)suse.de +* Fri Sep 29 2006 rodrigo(a)suse.de - Removed gnome-power-manager-powersave-dbus.patch, we don't connect to the powersave daemon anymore. - Move the part of the patch to add the YAST button to its own file. -* Thu Sep 14 2006 - jhargadon(a)suse.de +* Thu Sep 14 2006 jhargadon(a)suse.de - update to version 2.16.0 - Turn off Werror in configure. #352448 - Be more specific for our device checks in the expanded device information to fix the display of CSR properties. rh:203849 - Fix some small memory leaks. (Paolo Borelli) #352858. - translation updates -* Thu Aug 31 2006 - jhargadon(a)suse.de +* Thu Aug 31 2006 jhargadon(a)suse.de - update to version 2.15.92 - Fix a double free in the new smartcard code - Work round a compiler bug which caused compilation to fail when using a @@ -265,7 +280,7 @@ Doing clever tricks with imagemagick didn't work very well - Add a timed exit option to the daemon - translation updates -* Wed Aug 23 2006 - jhargadon(a)suse.de +* Wed Aug 23 2006 jhargadon(a)suse.de - update to version 2.15.91 - Turn on the monitor unconditionally, as we may be using a smart-card to authenticate and DPMS might still be on @@ -281,97 +296,97 @@ circumstances. - Fix a crasher where the g-s timeout was larger than the max range for gnome-power-preferences. -* Mon Jun 26 2006 - gekker(a)suse.de +* Mon Jun 26 2006 gekker(a)suse.de - Update translations for cs de es fr it ja pt_BR zh_CN zh_TW -* Fri Jun 16 2006 - gekker(a)suse.de +* Fri Jun 16 2006 gekker(a)suse.de - Update translations for hu -* Thu Jun 08 2006 - gekker(a)suse.de +* Thu Jun 08 2006 gekker(a)suse.de - Update translations for zh_CN for zsu (#179552) -* Tue Jun 06 2006 - rodrigo(a)suse.de +* Tue Jun 06 2006 rodrigo(a)suse.de - Fixed layout of baterry preferences page (#179110) -* Fri Apr 21 2006 - rodrigo(a)suse.de +* Fri Apr 21 2006 rodrigo(a)suse.de - Added patch that makes gpm respond correctly to systray crashes (#165471) -* Thu Apr 13 2006 - sbrabec(a)suse.cz +* Thu Apr 13 2006 sbrabec(a)suse.cz - Call %%suse_update_desktop_file. - Use new control-center Categories instead of old ones. - File list fix. -* Mon Apr 03 2006 - rodrigo(a)suse.de +* Mon Apr 03 2006 rodrigo(a)suse.de - Return NOT_YET_HANDLED for dbus messages we don't handle in the powersave_filter_function (#162807). -* Fri Mar 31 2006 - rodrigo(a)suse.de +* Fri Mar 31 2006 rodrigo(a)suse.de - Added code to query the powersave daemon for suspend/hibernate availability. And added a button to open yast power management applet (#158105) -* Fri Mar 31 2006 - rodrigo(a)suse.de +* Fri Mar 31 2006 rodrigo(a)suse.de - Added gnome-power-manager-disable-actions.patch to disable handling of powersave button events (#157477). -* Wed Mar 29 2006 - dobey(a)suse.de +* Wed Mar 29 2006 dobey(a)suse.de - Update icons tarball with 24x24 icons instead of 22x22, this changed upstream for the 2.14 release to 24x24, so we need to use this size to avoid blurry icons -* Mon Mar 27 2006 - rodrigo(a)suse.de +* Tue Mar 28 2006 rodrigo(a)suse.de - Updated gnome-power-manager-powersave-dbus.patch to handle apropriate signals from powersave dbus interface (#157477) - Updated icons tarball with new art from UI team. -* Mon Mar 20 2006 - rodrigo(a)suse.de +* Mon Mar 20 2006 rodrigo(a)suse.de - Added gnome-power-manager-battery-removal.patch, fixes #158682. -* Tue Mar 14 2006 - rodrigo(a)suse.de +* Tue Mar 14 2006 rodrigo(a)suse.de - Updated to latest upstream release, which fixes the HAL part of [#150042]. - Updated gnome-screensaver-autostart.patch. -* Fri Mar 03 2006 - rodrigo(a)suse.de +* Fri Mar 03 2006 rodrigo(a)suse.de - Updated to 2.13.92, which fixes several bugs (#140871, #153594) - Removed upstreamed patch. -* Mon Feb 27 2006 - rodrigo(a)suse.de +* Mon Feb 27 2006 rodrigo(a)suse.de - Establish connection to D-BUS powersave interface (#6196) -* Tue Feb 21 2006 - dobey(a)suse.de +* Tue Feb 21 2006 dobey(a)suse.de - Update new artwork - Fixes missing new artwork for a couple of status icons and about box logo image -* Tue Feb 21 2006 - dobey(a)suse.de +* Tue Feb 21 2006 dobey(a)suse.de - Add in new icon artwork -* Thu Feb 09 2006 - jpr(a)suse.de +* Thu Feb 09 2006 jpr(a)suse.de - Pass extra param to prevent crash (#144346) -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Mon Jan 23 2006 - rodrigo(a)suse.de +* Mon Jan 23 2006 rodrigo(a)suse.de - Reenable libnotify support. -* Mon Jan 23 2006 - rodrigo(a)suse.de +* Mon Jan 23 2006 rodrigo(a)suse.de - Use --sm-disable when running autostarted daemon. -* Wed Jan 18 2006 - gekker(a)suse.de +* Wed Jan 18 2006 gekker(a)suse.de - Disable scrollkeeper update during build -* Tue Jan 17 2006 - mls(a)suse.de +* Tue Jan 17 2006 mls(a)suse.de - xsltproc -> libxslt -* Tue Jan 17 2006 - rodrigo(a)suse.de +* Tue Jan 17 2006 rodrigo(a)suse.de - Added xsltproc to neededforbuild. -* Tue Jan 17 2006 - rodrigo(a)suse.de +* Tue Jan 17 2006 rodrigo(a)suse.de - Updated to 0.3.4 releases. - Removed obsolete patch. - Fixed package dependencies and build problems. -* Mon Dec 12 2005 - jpr(a)suse.de +* Mon Dec 12 2005 jpr(a)suse.de - Update to cvs snapshot to work with latest hal - Temporarily disable libnotify support -* Wed Nov 09 2005 - rodrigo(a)suse.de +* Wed Nov 09 2005 rodrigo(a)suse.de - Added X-GNOME-Autostart-enabled flag to autostart .desktop file. - Made autostart .desktop file %%config. -* Wed Nov 09 2005 - rodrigo(a)suse.de +* Wed Nov 09 2005 rodrigo(a)suse.de - Added gnome-session-autostart.patch to include needed files for autostart implementation. -* Mon Oct 24 2005 - ro(a)suse.de +* Mon Oct 24 2005 ro(a)suse.de - added hal to nfb -* Tue Oct 04 2005 - rodrigo(a)suse.de +* Tue Oct 04 2005 rodrigo(a)suse.de - Added gnome-power-manager-desktop.patch, to show the icon in the GNOME control center. -* Mon Oct 03 2005 - rodrigo(a)suse.de +* Mon Oct 03 2005 rodrigo(a)suse.de - Update to version 0.2.6. - Removed upstreamed patches. -* Thu Sep 22 2005 - gekker(a)suse.de +* Thu Sep 22 2005 gekker(a)suse.de - Use RPM_OPT_FLAGS - Fix uninitialized variables - Fix strict aliasing -* Thu Sep 22 2005 - rodrigo(a)suse.de +* Thu Sep 22 2005 rodrigo(a)suse.de - Update to version 0.2.4. - Added 64bit patch. -* Wed Sep 21 2005 - rodrigo(a)suse.de +* Wed Sep 21 2005 rodrigo(a)suse.de - Created template. ++++++ gnome-power-manager-2.20.0.tar.bz2 -> gnome-power-manager-2.21.1.tar.bz2 ++++++ ++++ 24005 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 gnome-menus
by root＠Hilbert.suse.de 30 Jan '08

30 Jan '08

Hello community, here is the log from the commit of package gnome-menus checked in at Wed Jan 30 18:15:11 CET 2008. -------- --- GNOME/gnome-menus/gnome-menus.changes 2007-09-18 18:13:24.000000000 +0200 +++ gnome-menus/gnome-menus.changes 2008-01-29 16:07:56.700440000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 29 16:09:18 CET 2008 - rodrigo(a)suse.de + +- Updated to version 2.21.90: + * When using gio, require version 2.15.2 + * Updated translations + +------------------------------------------------------------------- Old: ---- gnome-menus-2.20.0.tar.bz2 New: ---- gnome-menus-2.21.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-menus.spec ++++++ --- /var/tmp/diff_new_pack.U29381/_old 2008-01-30 18:14:48.000000000 +0100 +++ /var/tmp/diff_new_pack.U29381/_new 2008-01-30 18:14:48.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gnome-menus (Version 2.20.0) +# spec file for package gnome-menus (Version 2.21.90) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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. # @@ -12,9 +12,9 @@ Name: gnome-menus BuildRequires: fdupes gnome-common gnome-patch-translation gnome-vfs2-devel intltool perl-XML-Parser python-devel python-gtk -License: GNU Free Documentation License, Version 1.1 (GFDL 1.1), GPL v2 or later +License: GNU Free Documentation License, Version 1.1 (GFDL 1.1); GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME -Version: 2.20.0 +Version: 2.21.90 Release: 1 Summary: The GNOME Desktop Menu Source: %{name}-%{version}.tar.bz2 @@ -31,6 +31,7 @@ Patch: gnome-desktop-ximian-menus.patch Patch2: gnome-menus-preferences-no-merge.patch Patch3: gnome-menus-x-suse-unimportant.patch +# PATCH-NEEDS-REBASE gnome-menus-gnome-vfs.patch Patch6: gnome-menus-gnome-vfs.patch Patch7: gnome-menus-preferences.patch Requires: %{name}-lang = %{version} @@ -84,7 +85,7 @@ %patch -p1 %patch2 -p1 %patch3 -%patch6 +#%patch6 # Icons for these desktop directories are part of control-center2. # Never mind, because these directory files are used only by # gnome-control-center. @@ -143,38 +144,42 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Tue Sep 18 2007 - sbrabec(a)suse.cz +* Tue Jan 29 2008 rodrigo(a)suse.de +- Updated to version 2.21.90: + * When using gio, require version 2.15.2 + * Updated translations +* Tue Sep 18 2007 sbrabec(a)suse.cz - Updated to version 2.20.0: * translations update -* Mon Sep 10 2007 - mauro(a)suse.de +* Mon Sep 10 2007 mauro(a)suse.de - Update to version 2.19.92: + Fix potential crash + Updated translations -* Fri Aug 31 2007 - maw(a)suse.de +* Fri Aug 31 2007 maw(a)suse.de - Update to version 2.19.90: + Updated translations. -* Sat Aug 18 2007 - aj(a)suse.de +* Sat Aug 18 2007 aj(a)suse.de - Fix build. -* Wed Aug 08 2007 - maw(a)suse.de +* Wed Aug 08 2007 maw(a)suse.de - Use %%fdupes - Split off a -lang subpackage - s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun. -* Fri Aug 03 2007 - mauro(a)suse.de +* Fri Aug 03 2007 mauro(a)suse.de - Update to version 2.19.6 - Bugfix for #448361. -* Wed Jul 11 2007 - maw(a)suse.de +* Wed Jul 11 2007 maw(a)suse.de - Obsoletes: gnome-core is obsolete. -* Mon Jul 09 2007 - maw(a)suse.de +* Mon Jul 09 2007 maw(a)suse.de - Update to version 2.19.4 - Crashes in python bindings and inotify backend fixed - Updated translations -* Fri Apr 27 2007 - sbrabec(a)suse.cz +* Fri Apr 27 2007 sbrabec(a)suse.cz - Do not call meinproc (#227624). -* Thu Mar 29 2007 - maw(a)suse.de +* Fri Mar 30 2007 maw(a)suse.de - Update to version 2.18.0 - Updated Ukranian translation - Reverts to the default use of the shell. -* Tue Feb 27 2007 - maw(a)suse.de +* Tue Feb 27 2007 maw(a)suse.de - Update to version 2.17.91. * Rework the layout so that it's easy to have the old layout. The control center will ship its own menu file to have the layout for the @@ -183,30 +188,30 @@ * Flesh out inotify support (use --enable-inotify) (Mark) * Don't load incorrectly encoded .desktop files (Mark) * Fix compile warning (Mark) -* Tue Feb 13 2007 - sbrabec(a)suse.cz +* Tue Feb 13 2007 sbrabec(a)suse.cz - Do not build unusable static libraries (#238552#c17). -* Tue Jan 09 2007 - sbrabec(a)suse.cz +* Tue Jan 09 2007 sbrabec(a)suse.cz - More spec file cleanups. -* Wed Dec 13 2006 - maw(a)suse.de +* Thu Dec 14 2006 maw(a)suse.de - Move to /usr - Do some spec cleanup. -* Tue Nov 21 2006 - sbrabec(a)suse.cz +* Tue Nov 21 2006 sbrabec(a)suse.cz - Do not explicitly require mDNSResponder-lib blocking avahi compat package. -* Fri Oct 13 2006 - danw(a)suse.de +* Fri Oct 13 2006 danw(a)suse.de - Remove dead patches -* Mon Oct 02 2006 - jhargadon(a)suse.de +* Mon Oct 02 2006 jhargadon(a)suse.de - update to version 2.16.1 - updated translations -* Tue Sep 26 2006 - jhargadon(a)suse.de +* Tue Sep 26 2006 jhargadon(a)suse.de - added %%py_requires to the specfile for bug #207922 -* Thu Sep 14 2006 - jhargadon(a)suse.de +* Thu Sep 14 2006 jhargadon(a)suse.de - update to version 2.16.0 - updated translations -* Mon Aug 21 2006 - jhargadon(a)suse.de +* Tue Aug 22 2006 jhargadon(a)suse.de - update to version 2.15.91 - update translations -* Wed Aug 02 2006 - gekker(a)suse.de +* Wed Aug 02 2006 gekker(a)suse.de - Update to version 2.15.90 * Correctly update LT_VERSION (Vincent) * Add new API to know if an application should be launched in a @@ -220,73 +225,73 @@ * Remove some unused code (Kjartan Maraas) * Fix incorrect escaping of C format string (The Written Word) * Update translations -* Tue May 02 2006 - sbrabec(a)suse.cz +* Tue May 02 2006 sbrabec(a)suse.cz - Moved system language settings from Personal to System (#171526). -* Wed Apr 19 2006 - sreeves(a)suse.de +* Wed Apr 19 2006 sreeves(a)suse.de - Fix for 152999 - Add "yast2 lan" to CC Fix for 152681 - Add "yast2 modem" and "yast2 dsl" to CC -* Wed Mar 29 2006 - sreeves(a)suse.de +* Wed Mar 29 2006 sreeves(a)suse.de - Look for new X-SuSE-ControlCenter-* category in preferences.menu -* Tue Feb 21 2006 - sbrabec(a)suse.cz +* Tue Feb 21 2006 sbrabec(a)suse.cz - Added infrastructure to allow translation of control center labels (144946#c12). -* Sun Feb 05 2006 - aj(a)suse.de +* Sun Feb 05 2006 aj(a)suse.de - Cleanup Requires. -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Sat Dec 17 2005 - sreeves(a)suse.de +* Sat Dec 17 2005 sreeves(a)suse.de - Add additional yast items into control-center as per the spec -* Mon Sep 26 2005 - mls(a)suse.de +* Mon Sep 26 2005 mls(a)suse.de - make devel package require base package -* Fri Sep 09 2005 - jpr(a)suse.de +* Fri Sep 09 2005 jpr(a)suse.de - Revert patch for #113531 -* Tue Sep 06 2005 - sbrabec(a)suse.cz +* Tue Sep 06 2005 sbrabec(a)suse.cz - Updated to version 2.12.0. -* Wed Aug 31 2005 - clahey(a)suse.de +* Wed Aug 31 2005 clahey(a)suse.de - Switch from fam to gnome-vfs. Thanks cutch. Fixes bug #112846. -* Wed Aug 31 2005 - clahey(a)suse.de +* Wed Aug 31 2005 clahey(a)suse.de - Patch from Meeks. Fixes bug #113531 -* Tue Aug 23 2005 - gekker(a)suse.de +* Tue Aug 23 2005 gekker(a)suse.de - Update to version 2.11.92 - Remove upstreamed patch -* Thu Aug 18 2005 - clahey(a)suse.de +* Fri Aug 19 2005 clahey(a)suse.de - Add patch to get rid of Applications->Applications. -* Tue Aug 16 2005 - sbrabec(a)suse.cz +* Tue Aug 16 2005 sbrabec(a)suse.cz - Do not require kdebase3. -* Tue Aug 02 2005 - gekker(a)suse.de +* Tue Aug 02 2005 gekker(a)suse.de - Update to 2.11.90 -* Fri Jun 17 2005 - gekker(a)suse.de +* Fri Jun 17 2005 gekker(a)suse.de - Update to 2.11.1.1 -* Mon Mar 14 2005 - clahey(a)suse.de +* Mon Mar 14 2005 clahey(a)suse.de - Add hack to hide menus items with X-SuSE-Unimportant. -* Sat Mar 12 2005 - clahey(a)suse.de +* Sat Mar 12 2005 clahey(a)suse.de - Don't merge in default merge dirs in preferences.gnome.menu. Fixes 72148. -* Wed Mar 09 2005 - clahey(a)suse.de +* Thu Mar 10 2005 clahey(a)suse.de - Replace the first section of Desktop menu with gnomecc and YaST. -* Wed Mar 09 2005 - gekker(a)suse.de +* Wed Mar 09 2005 gekker(a)suse.de - Update to version 2.10.0 (GNOME 2.10). -* Tue Mar 08 2005 - clahey(a)suse.de +* Tue Mar 08 2005 clahey(a)suse.de - Replaced individual patches with a backport of the fixes in gnome-menus 2.10.1. -* Fri Mar 04 2005 - clahey(a)suse.de +* Fri Mar 04 2005 clahey(a)suse.de - Add patches from gnome cvs for gnome bugs 168444 and 168445. -* Thu Mar 03 2005 - gekker(a)suse.de +* Thu Mar 03 2005 gekker(a)suse.de - Update to version 2.9.92 - Remove upstreamed patch -* Thu Feb 24 2005 - clahey(a)suse.de +* Fri Feb 25 2005 clahey(a)suse.de - Include the gnome preferences hidden in our preferences so that they won't appear in OnlyUnallocated <All/>. -* Mon Feb 21 2005 - gekker(a)suse.de +* Mon Feb 21 2005 gekker(a)suse.de - Add patch for menus showing up twice in some cases (167758 b.g.o) -* Wed Feb 16 2005 - gekker(a)suse.de +* Wed Feb 16 2005 gekker(a)suse.de - Fix control-center2 to show it's capplets (50904). -* Sun Feb 06 2005 - gekker(a)suse.de +* Sun Feb 06 2005 gekker(a)suse.de - Update to version 2.9.90 -* Fri Feb 04 2005 - clahey(a)suse.de +* Fri Feb 04 2005 clahey(a)suse.de - Updated preferences.menu to be more correct. -* Mon Jan 24 2005 - clahey(a)suse.de +* Mon Jan 24 2005 clahey(a)suse.de - Added applications.menu. -* Fri Jan 21 2005 - gekker(a)suse.de +* Fri Jan 21 2005 gekker(a)suse.de - Adding package gnome-menus to distro - Initial version 2.9.4 ++++++ gnome-menus-2.20.0.tar.bz2 -> gnome-menus-2.21.90.tar.bz2 ++++++ ++++ 13059 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 gimp
by root＠Hilbert.suse.de 30 Jan '08

30 Jan '08

Hello community, here is the log from the commit of package gimp checked in at Wed Jan 30 18:14:38 CET 2008. -------- --- GNOME/gimp/gimp.changes 2007-12-07 15:07:16.000000000 +0100 +++ gimp/gimp.changes 2008-01-30 18:04:30.651538000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 30 13:36:26 CET 2008 - sbrabec(a)suse.cz + +- Split plugins requiring python-gtk into a separate package + (bnc#339862). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gimp.spec ++++++ --- /var/tmp/diff_new_pack.d25616/_old 2008-01-30 18:12:32.000000000 +0100 +++ /var/tmp/diff_new_pack.d25616/_new 2008-01-30 18:12:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gimp (Version 2.4.0) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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. # @@ -15,27 +15,219 @@ BuildRequires: aalib-devel alsa-devel cups cups-devel curl-devel dbus-1-glib-devel gnome-common gnutls-devel gtk-doc hal-devel intltool libexif-devel libgimpprint libgimpprint-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libgtkhtml-devel liblcms-devel libmng-devel libpoppler-glib-devel librsvg-devel libtiff-devel libwmf-devel libwnck-devel perl-XML-Parser postfix python-devel python-gtk-devel slang-devel update-desktop-files Url: http://www.gimp.org/ Version: 2.4.0 -Release: 18 +Release: 35 License: GPL v2 or later Group: Productivity/Graphics/Bitmap Editors -Requires: glib2 >= 2.10.2 gtk2 >= 2.8.17 gutenprint python-gtk -%if %suse_version > 1000 Suggests: AdobeICCProfiles -%endif Provides: gimp-2.0 Provides: gimp-unstable = %{version} Obsoletes: gimp-unstable < 2.4.0 Requires: %{name}-lang = %{version} -Summary: The GNU Image Manipulation Program--Development Branch +Summary: The GNU Image Manipulation Program Source: ftp://ftp.gimp.org/pub/gimp/v2.3/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -This is an unstable development branch of the GIMP package for -adventurous users. It contains many new features, but might be -unstable, crash, or not work at all. Report problems not related to -packaging to http://bugzilla.gnome.org/. +The GIMP (GNU Image Manipulation Program) is a powerful image +composition and editing program, which can be extremely useful for +creating logos and other graphics for Web pages. The GIMP offers many +of the tools and filters you would expect to find in similar commercial +offerings and contains some interesting extras as well. The GIMP +provides alarge image manipulation toolbox, including channel +operations and layers, effects, subpixel imaging and antialiasing, and +conversions- all including multilevel undo. The GIMP offers a scripting +facility, but many of the included scripts rely on fonts that we cannot +distribute. The GIMP FTP sitehas a package of fonts that you need to +run the included scripts and that you can install yourself. Some of the +fonts have unusual licensing requirements, but all the licenses are +documented in the package. Get +ftp://ftp.gimp.org/pub/gimp/fonts/freefonts-0.10.tar.gz and +ftp://ftp.gimp.org/pub/gimp/fonts/sharefonts-0.10.tar.gz if you like to +do so. Alternatively, choose fonts that exist on your systembefore +running the scripts. . + + +Authors: +-------- + Spencer Kimball + Peter Mattis + Lauri Alanko + Shawn Amundson + Sven Anders + Karl-Johan Andersson + John Beale + Zach Beane + Tom Bech + Marc Bless + Edward Blevins + Reagan Blundell + Xavier Bouchoux + Roberto Boyd + Stanislav Brabec + Robert Brady + Hans Breuer + Simon Budig + Carey Bunks + Seth Burgess + Brent Burton + Francisco Bustamante + Albert Cahalan + Sean Cier + Winston Chang + Kenneth Christiansen + Zbigniew Chyla + Ed Connel + Piers Cornwell + Daniel Cotting + Jay Cox + Brian Degenhardt + Gert Dewit + Andreas Dilger + Austin Donnelly + Scott Draves + Daniel Dunbar + Misha Dynin + Daniel Egger + Morton Eriksen + Larry Ewing + Nick Fetchak + Valek Filippov + David Forsyth + Raphael Francois + Jochen Friedrich + Sami Gerdt + Jim Geuther + Graeme Gill + Scott Goehring + Heiko Goller + Marcelo de Gomensoro Malheiros + Pavel Grinfeld + Michael Hammel + Henrik Hansen + Ville Hautamaki + James Henstridge + Eric Hernes + David Hodson + Christoph Hoegl + Wolfgang Hofer + Jan Hubicka + Andreas Hyden + Ben Jackson + Krzysztof Jakubowski + Simon Janes + Tim Janik + Fellmann Joaquim + Andrew Kieschnick + Peter Kirchgessner + Philipp Klaus + David Koblas + Robert L Krawitz + Tuomas Kuosmanen + Karin Kylander + Olof S Kylander + Karl La Rocca + Chris Lahey + Nick Lamb + Marco Lamberto + Jens Lautenbacher + Laramie Leavitt + Elliot Lee + Marc Lehmann + Ray Lehtiniemi + Raph Levien + Wing Tung Leung + Adrian Likins + Tor Lillqvist + Ingo Luetkebohle + Josh MacDonald + Ed Mackey + Vidar Madsen + Ian Main + Kjartan Maraas + Kelly Martin + Torsten Martinsen + Gordon Matzigkeit + Gregory McLean + Daniele Medri + Federico Mena Quintero + James Mitchell + Hirotsuna Mizuno + David Monniaux + Adam D Moss + Balazs Nagy + Yukihiro Nakai + Sung-Hyun Nam + Shuji Narazaki + Felix Natter + Michael Natterer + David Neary + Sven Neumann + Stephen Robert Norris + Tim Newsome + Erik Nygren + Miles O'Neal + David Neary + David Necas + David Odin + Thom van Os + Garry R. Osgood + Alan Paeth + Jay Painter + Sergey Panov + Ville Patsi + Asbjorn Pettersen + Mike Phillips + Artur Polaczynski + Raphael Quinet + Tom Rathborne + Vincent Renardias + Jens Restemeier + Maurits Rijk + Daniel Risacher + James Robinson + Guillermo S. Romero + Tim Rowley + Pablo Saratxaga + Mike Schaeffer + John Schlag + Norbert Schmitz + Thorsten Schnier + Alexander Schulz + Tracy Scott + Craig Setera + Aaron Sherman + Manish Singh + Daniel Skarda + Adam Spiers + Jakub Steiner + Nathan Summers + Mike Sweet + Yuri Syrota + Eiichi Takamori + Tristan Tarrant + Michael Taylor + Owen Taylor + Ian Tester + Andy Thomas + Kevin Turner + Rebecca Walter + Martin Weber + James Wang + Kris Wehner + Nigel Wetten + Calvin Williamson + Matthew Wilson + Shirasaki Yasuhiro + +%package plugins-python +Summary: The GNU Image Manipulation Program - python-gtk based plugins +Requires: %{name} = %{version} python-gtk +Provides: %{name}:%{_libdir}/gimp/2.0/plug-ins/pyconsole.py = %{version} +Supplements: %{name} +Group: Productivity/Graphics/Bitmap Editors + +%description plugins-python The GIMP (GNU Image Manipulation Program) is a powerful image composition and editing program, which can be extremely useful for creating logos and other graphics for Web pages. The GIMP offers many @@ -229,7 +421,7 @@ Shirasaki Yasuhiro %package devel -Summary: The GNU Image Manipulation Program--Development Branch +Summary: The GNU Image Manipulation Program Requires: %{name} = %{version} gtk2-devel glib2-devel glibc-devel Provides: gimp-2.0-devel Provides: gimp-unstable-devel = %{version} @@ -237,11 +429,6 @@ Group: Productivity/Graphics/Bitmap Editors %description devel -This is an unstable development branch of the GIMP package for -adventurous users. It contains many new features, but might be -unstable, crash, or not work at all. Report problems not related to -packaging to http://bugzilla.gnome.org/. - The GIMP (GNU Image Manipulation Program) is a powerful image composition and editing program, which can be extremely useful for creating logos and other graphics for Web pages. The GIMP offers many @@ -435,7 +622,7 @@ Shirasaki Yasuhiro %package doc -Summary: The GNU Image Manipulation Program--Development Branch +Summary: The GNU Image Manipulation Program Requires: %{name} = %{version} Provides: gimp-2.0-doc Provides: gimp-unstable-doc = %{version} @@ -443,11 +630,6 @@ Group: Productivity/Graphics/Bitmap Editors %description doc -This is an unstable development branch of the GIMP package for -adventurous users. It contains many new features, but might be -unstable, crash, or not work at all. Report problems not related to -packaging to http://bugzilla.gnome.org/. - The GIMP (GNU Image Manipulation Program) is a powerful image composition and editing program, which can be extremely useful for creating logos and other graphics for Web pages. The GIMP offers many @@ -655,6 +837,7 @@ # needed for gimp-2.4.0: export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure\ + --disable-static\ --libexecdir=%{_prefix}/lib\ --enable-default-binary\ --enable-mp @@ -670,6 +853,15 @@ %find_lang gimp20-script-fu gimp20.lang %find_lang gimp20-std-plug-ins gimp20.lang %find_lang gimp20-tips gimp20.lang +echo "%%defattr(-,root,root)" >plugins.list +echo "%%defattr(-,root,root)" >plugins-python.list +for PLUGIN in $RPM_BUILD_ROOT%{_libdir}/gimp/2.0/plug-ins/* ; do + if grep -q '^#!.*python' $PLUGIN ; then + echo "${PLUGIN#$RPM_BUILD_ROOT}" >>plugins-python.list + else + echo "${PLUGIN#$RPM_BUILD_ROOT}" >>plugins.list + fi +done %post -p /sbin/ldconfig @@ -678,7 +870,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f plugins.list %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog* NEWS* README* %{_bindir}/gimp @@ -688,9 +880,25 @@ %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/*/apps/*.svg %{_datadir}/gimp -%{_libdir}/gimp +%dir %{_libdir}/gimp +%dir %{_libdir}/gimp/2.0 +%dir %{_libdir}/gimp/2.0/environ +%{_libdir}/gimp/2.0/environ/default.env +%dir %{_libdir}/gimp/2.0/interpreters +%{_libdir}/gimp/2.0/interpreters/default.interp +%{_libdir}/gimp/2.0/modules +%dir %{_libdir}/gimp/2.0/plug-ins %doc %{_mandir}/man?/*.* -%{_sysconfdir}/gimp +%dir %{_sysconfdir}/gimp +%dir %{_sysconfdir}/gimp/2.0 +%config %{_sysconfdir}/gimp/2.0/*rc + +%files plugins-python -f plugins-python.list +%defattr(-,root,root) +%{_libdir}/gimp/2.0/environ/pygimp.env +%{_libdir}/gimp/2.0/interpreters/pygimp.interp +%{_libdir}/gimp/2.0/python +# FIXME: Maybe split gimp-lang and gimp-plugins-python-lang %files lang -f gimp20.lang ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 fvwm2
by root＠Hilbert.suse.de 30 Jan '08

30 Jan '08

Hello community, here is the log from the commit of package fvwm2 checked in at Wed Jan 30 18:12:19 CET 2008. -------- --- fvwm2/fvwm2.changes 2008-01-11 11:33:49.000000000 +0100 +++ fvwm2/fvwm2.changes 2008-01-30 16:11:57.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Jan 30 16:10:05 CET 2008 - lmichnovic(a)suse.cz + +- adjusted system.fvwm2rc and _system.fvwm2rc files + * checked and fixed menu entries + * fixed missing wallpaper after restart + * changed Control center execution for systems with X.org < 7.0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fvwm2.spec ++++++ --- /var/tmp/diff_new_pack.f18500/_old 2008-01-30 18:08:55.000000000 +0100 +++ /var/tmp/diff_new_pack.f18500/_new 2008-01-30 18:08:55.000000000 +0100 @@ -18,7 +18,7 @@ Obsoletes: fvwm xpmroot AutoReqProv: on Version: 2.5.24 -Release: 1 +Release: 7 Summary: Improved Version of FVWM Window Manager Url: http://www.fvwm.org Source0: fvwm-2.5.24.tar.bz2 @@ -211,7 +211,12 @@ %{_prefix}/%{_xorg7libs32}/X11/fvwm2/FvwmGtk* %changelog -* Fri Jan 11 2008 - lmichnovic(a)suse.cz +* Wed Jan 30 2008 lmichnovic(a)suse.cz +- adjusted system.fvwm2rc and _system.fvwm2rc files + * checked and fixed menu entries + * fixed missing wallpaper after restart + * changed Control center execution for systems with X.org < 7.0 +* Fri Jan 11 2008 lmichnovic(a)suse.cz - update to version 2.5.24 * New features: - Disabled paging during interactive resize operations by @@ -237,19 +242,19 @@ - Fixed the "screen w" argument of the Move and other commands. - Clicking on a menu title did not close the menu by default. - Temporary files in FvwmPerl overwrote each other. -* Tue Oct 23 2007 - lmichnovic(a)suse.cz +* Tue Oct 23 2007 lmichnovic(a)suse.cz - Removed librsvg from BuildRequires to keep the fvwm lightweight WM suitable for installation; keeping gnome-libs-devel which affects only gtk subpackage [#335658] -* Mon Oct 15 2007 - lmichnovic(a)suse.cz +* Mon Oct 15 2007 lmichnovic(a)suse.cz - fixed wrong font for non ascii characters in titles of windows especially for english locales (charset_in_title.patch) [#307361] -* Tue Sep 25 2007 - lmichnovic(a)suse.cz +* Tue Sep 25 2007 lmichnovic(a)suse.cz - excluding useless file README.vms - file list with %%lang (macro find_lang is hard to use for fvwm) - added gnome-libs-devel (/usr/bin/gnome-config) and librsvg into BuildReq to enable more features -* Tue Sep 25 2007 - lmichnovic(a)suse.cz +* Tue Sep 25 2007 lmichnovic(a)suse.cz - update to version 2.5.23 - obsoletes *string_compar.patch - fixes segfault on dual core processors [#304236] @@ -319,41 +324,41 @@ - Fixed parsing of the PropertyChange command. - Fixed windowlist crash when combining CurrentAtEnd with IconifiedAtEnd and all windows are iconified. -* Fri Aug 10 2007 - dmueller(a)suse.de +* Fri Aug 10 2007 dmueller(a)suse.de - package size reduction (#217472) -* Thu Jul 19 2007 - lmichnovic(a)suse.cz +* Thu Jul 19 2007 lmichnovic(a)suse.cz - wiped susewmif from rc file because it's not available since 9.1 -* Thu May 10 2007 - ro(a)suse.de +* Thu May 10 2007 ro(a)suse.de - split off FvwmGtk to its own subpackage -* Wed Apr 04 2007 - schwab(a)suse.de +* Wed Apr 04 2007 schwab(a)suse.de - Fix last change. -* Wed Apr 04 2007 - lmichnovic(a)suse.cz +* Wed Apr 04 2007 lmichnovic(a)suse.cz - fixed gcc warnings: comparing a char* pointer with a string literal (string_compar.patch) -* Fri Mar 09 2007 - lmichnovic(a)suse.cz +* Fri Mar 09 2007 lmichnovic(a)suse.cz - Fixed corrupted characters in sax2 test mode for some locales [#251639] (*utf_encoding.patch) -* Wed Feb 28 2007 - lmichnovic(a)suse.cz +* Wed Feb 28 2007 lmichnovic(a)suse.cz - renamed sv_SE to sv, (sv_SE.patch) [#248751] - removed xorg-x11 from Requires and Buildrequires since /usr/share/xsessions is part of filesystem [#229172] -* Tue Feb 13 2007 - lmichnovic(a)suse.cz +* Tue Feb 13 2007 lmichnovic(a)suse.cz - adjusted fvwm2rc file, thanks to Thomas Adam [#242015] -* Tue Feb 13 2007 - lmichnovic(a)suse.cz +* Tue Feb 13 2007 lmichnovic(a)suse.cz - update to version 2.5.21 * New feature: The command Scroll can now be used for interactive scrolling. * Bug Fix: Tile...Placement styles (SmartPlacement) that were broken in 2.5.20. -* Wed Jan 24 2007 - lmichnovic(a)suse.cz +* Wed Jan 24 2007 lmichnovic(a)suse.cz - removed superfluous slashes ante macros - now building with icecream -* Tue Jan 16 2007 - lmichnovic(a)suse.cz +* Tue Jan 16 2007 lmichnovic(a)suse.cz - fixed wrong path for icons in system.fvwm2rc [#223521] - changed titles to openSUSE - created openSuSE.xpm icon for Button bar menu - spec cleanup -* Mon Jan 15 2007 - lmichnovic(a)suse.cz +* Mon Jan 15 2007 lmichnovic(a)suse.cz - update to 2.5.20 - many bug fixes - fixed few memory leaks @@ -365,12 +370,12 @@ and StickyAcrossDesksIcon. * Hilighted menu backgrounds now use pixmaps gradients and transparency from their related colorset. -* Fri Jan 05 2007 - lmichnovic(a)suse.cz +* Fri Jan 05 2007 lmichnovic(a)suse.cz - fixed missing background image [#223521] -* Tue Dec 19 2006 - lmichnovic(a)suse.cz +* Tue Dec 19 2006 lmichnovic(a)suse.cz - added xorg-x11 into Requires and Buildrequires and excluding /usr/share/xsessions directory from filelist [#229172] -* Tue Dec 12 2006 - lmichnovic(a)suse.cz +* Tue Dec 12 2006 lmichnovic(a)suse.cz - update to version 2.5.19 including bugfix in FvwmWinList: problem with window name/button mixups during Init/Restart of fvwm. * Many bugfixes: @@ -397,46 +402,46 @@ current window size. - New command ModuleListenOnly. - New "Periodic" option added to Schedule command. -* Tue Nov 14 2006 - lmichnovic(a)suse.cz +* Tue Nov 14 2006 lmichnovic(a)suse.cz - fixed possible command execution (sec-fvwmname.patch) [#220708] -* Tue Sep 05 2006 - lmichnovic(a)suse.cz +* Tue Sep 05 2006 lmichnovic(a)suse.cz - distinquishing from X.org version which config file to install (Source4 resp. Source5) -* Mon Sep 04 2006 - lmichnovic(a)suse.cz +* Mon Sep 04 2006 lmichnovic(a)suse.cz - omitting X11R6 in config file (which is Source4) - specifying X.org libs and headers -* Sun Aug 06 2006 - pnemec(a)suse.cz +* Sun Aug 06 2006 pnemec(a)suse.cz - major change in specfile instalation and file section to build with Xorg 7 -* Mon Jul 03 2006 - schwab(a)suse.de +* Mon Jul 03 2006 schwab(a)suse.de - Set mandir. -* Tue May 30 2006 - pnemec(a)suse.cz +* Tue May 30 2006 pnemec(a)suse.cz - updated to 2.5.16 clean up in code see changelog - patches (-64bit, -grab_pointer, -conf) are in upstream now - patch -ia64 is in upstream only partially -* Fri Feb 17 2006 - pnemec(a)suse.cz +* Fri Feb 17 2006 pnemec(a)suse.cz - fixed menu entry #150221 -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Thu Oct 20 2005 - pnemec(a)suse.cz +* Thu Oct 20 2005 pnemec(a)suse.cz - changed fvmw default theme to use diferent program to set background #106011 - fixed gcc warnings -* Thu Aug 25 2005 - schwab(a)suse.de +* Thu Aug 25 2005 schwab(a)suse.de - Remove obsolete patch. -* Mon May 16 2005 - ltinkl(a)suse.cz +* Mon May 16 2005 ltinkl(a)suse.cz - update to 2.5.12 - adapt patches -* Thu Feb 10 2005 - adrian(a)suse.de +* Thu Feb 10 2005 adrian(a)suse.de - install session desktop file -* Thu Jan 27 2005 - ro(a)suse.de +* Thu Jan 27 2005 ro(a)suse.de - add 64bit fix from lubos (#50203) -* Fri May 07 2004 - ltinkl(a)suse.cz +* Fri May 07 2004 ltinkl(a)suse.cz - added mktemp to requirements - updated sources to 2.5.10 -* Thu Apr 08 2004 - ltinkl(a)suse.cz +* Thu Apr 08 2004 ltinkl(a)suse.cz - fix button background (#37677) -* Thu Mar 18 2004 - ltinkl(a)suse.cz +* Thu Mar 18 2004 ltinkl(a)suse.cz - fixed missing icons (#35551) - fixed SUSE helpcenter command line - reworked color scheme to match the current blueish design @@ -444,33 +449,33 @@ - fixed the invocation of fvwm2 manpage - build with -fno-strict-aliasing - make Acroread work in fullscreen mode (#36189) -* Mon Mar 15 2004 - kukuk(a)suse.de +* Mon Mar 15 2004 kukuk(a)suse.de - Provide/Obsolete xpmroot -* Thu Mar 11 2004 - ltinkl(a)suse.cz +* Thu Mar 11 2004 ltinkl(a)suse.cz - SuSE -> SUSE - use the default system wallpaper (#31644, #35687) -* Tue Mar 09 2004 - schwab(a)suse.de +* Tue Mar 09 2004 schwab(a)suse.de - Don't require on xpmroot. -* Thu Mar 04 2004 - ltinkl(a)suse.cz +* Thu Mar 04 2004 ltinkl(a)suse.cz - updated to 2.4.9 -* Wed Jan 28 2004 - ltinkl(a)suse.cz +* Wed Jan 28 2004 ltinkl(a)suse.cz - fix security problem with temp file handling (#34077) -* Sat Jan 10 2004 - adrian(a)suse.de +* Sat Jan 10 2004 adrian(a)suse.de - build as user -* Wed Dec 17 2003 - mfabian(a)suse.de +* Wed Dec 17 2003 mfabian(a)suse.de - enable building with Xft2 again (configure script had changed the way of detecting Xft2, therefore building with Xft2 was accidentally disabled again after the update). -* Tue Nov 18 2003 - ltinkl(a)suse.cz +* Tue Nov 18 2003 ltinkl(a)suse.cz - update to latest stable version 2.5.8 -* Wed Sep 17 2003 - ltinkl(a)suse.cz +* Wed Sep 17 2003 ltinkl(a)suse.cz - fix menu encoding (has to be UTF-8) - fix RMB desktop menu -* Mon Sep 15 2003 - ltinkl(a)suse.cz +* Mon Sep 15 2003 ltinkl(a)suse.cz - adjusted default fonts and fixed some broken menu entries (#30521) -* Sat Sep 13 2003 - schwab(a)suse.de +* Sat Sep 13 2003 schwab(a)suse.de - Workaround broken module interface (it can't handle padding). -* Fri Sep 05 2003 - mfabian(a)suse.de +* Fri Sep 05 2003 mfabian(a)suse.de - enable Xft2 support to get better i18n support out of the box and to be able to finally fix Bugzilla #24765. - change system.fvwm2rc to use only fonts via Xft2 by default @@ -480,23 +485,23 @@ obsolete now. - add xpmroot to Requires because it is used to draw the background in system.fvwmrc. -* Fri Sep 05 2003 - ltinkl(a)suse.cz +* Fri Sep 05 2003 ltinkl(a)suse.cz - integrate common (XDG) menu, closes #29498 -* Tue Sep 02 2003 - ltinkl(a)suse.cz +* Tue Sep 02 2003 ltinkl(a)suse.cz - created an implicit configuration to fix #29498 -* Wed Jul 30 2003 - schwab(a)suse.de +* Wed Jul 30 2003 schwab(a)suse.de - Update to fvwm 2.5.7. - Fix misalignment bug. -* Tue Jul 15 2003 - ltinkl(a)suse.cz +* Tue Jul 15 2003 ltinkl(a)suse.cz - updated sources to 2.4.16 -* Sat Mar 08 2003 - adrian(a)suse.de +* Sun Mar 09 2003 adrian(a)suse.de - add wallpaper background pixmap -* Sun Feb 16 2003 - adrian(a)suse.de +* Sun Feb 16 2003 adrian(a)suse.de - do not require icon packages anymore, default config will be without icons due to dropped package. Let's see what breaks :/ -* Tue Feb 04 2003 - pmladek(a)suse.cz +* Tue Feb 04 2003 pmladek(a)suse.cz - updated to version 2.4.15 (many bug fixes) -* Tue Sep 03 2002 - mfabian(a)suse.de +* Tue Sep 03 2002 mfabian(a)suse.de - add fvwm-2.4.8-utf-8-font-load.patch. Thanks to Egbert Eich <eich(a)suse.de> Without this patch, fvwm2 doesn't work in UTF-8 locales. @@ -504,77 +509,77 @@ to stdout and the menus are empty because the fonts couldn't be loaded. I.e. without this patch fvwm2 is unusable in UTF-8 locales. -* Sat Aug 17 2002 - ro(a)suse.de +* Sat Aug 17 2002 ro(a)suse.de - don't duplicate README's in filelist -* Tue Jul 09 2002 - pmladek(a)suse.cz +* Tue Jul 09 2002 pmladek(a)suse.cz - updated to version 2.4.8: * many bugfixes, some improvents - removed obsolete ia64-prep patch -* Tue Apr 02 2002 - pmladek(a)suse.cz +* Tue Apr 02 2002 pmladek(a)suse.cz - fixed to compile with autoconf-2.53 * added missing brackets into smr_SWITCH macro * removed redundant AC_SUBST(LIBOBJS) -* Wed Mar 06 2002 - mmj(a)suse.de +* Wed Mar 06 2002 mmj(a)suse.de - Fixed permissions [Bug #14421] -* Sun Feb 10 2002 - ro(a)suse.de +* Sun Feb 10 2002 ro(a)suse.de - new option for bz2 tar is "j" -* Tue Feb 05 2002 - pmladek(a)suse.cz +* Tue Feb 05 2002 pmladek(a)suse.cz - updated to version 2.4.5 -* Mon Jan 21 2002 - pmladek(a)suse.cz +* Mon Jan 21 2002 pmladek(a)suse.cz - updated to version 2.4.4 -* Tue Dec 04 2001 - pmladek(a)suse.cz +* Tue Dec 04 2001 pmladek(a)suse.cz - fixed too long time of deadlock when fvwm2 tries to grab mouse pointer but the mouse pointer is already grabbed by another application (#12167) -* Thu Nov 29 2001 - pmladek(a)suse.cz +* Thu Nov 29 2001 pmladek(a)suse.cz - updated to version 2.4.3 * many bug fixes * new commands and options -* Thu Aug 09 2001 - pmladek(a)suse.cz +* Thu Aug 09 2001 pmladek(a)suse.cz - updated to stable version 2.4.0 - fixed configure.in * forget cached value in readline tests -* Thu Jun 14 2001 - pmladek(a)suse.cz +* Thu Jun 14 2001 pmladek(a)suse.cz - fixed to compile with new automake -* Wed May 16 2001 - pmladek(a)suse.cz +* Wed May 16 2001 pmladek(a)suse.cz - fixed cast warnigs on ia64 -* Thu May 10 2001 - pmladek(a)suse.cz +* Thu May 10 2001 pmladek(a)suse.cz - removed link: ln -sf system.fvwm2rc $RPM_BUILD_ROOT/etc/X11/fvwm2/.fvwm2rc (because susewm generates right config file system.fvwm2rc now) - /etc/X11/fvwm2/system.fvwm2rc is right config file now -* Tue Apr 24 2001 - pmladek(a)suse.cz +* Tue Apr 24 2001 pmladek(a)suse.cz - fixed conversions int <-> poiter on ia64 - fixed preprocesor problems on ia64 -* Thu Apr 12 2001 - pmladek(a)suse.cz +* Thu Apr 12 2001 pmladek(a)suse.cz - updated to version 2.3.31 -* Mon Apr 09 2001 - pmladek(a)suse.cz +* Mon Apr 09 2001 pmladek(a)suse.cz - added icons-xpm to Requires -* Wed Apr 04 2001 - mfabian(a)suse.de +* Wed Apr 04 2001 mfabian(a)suse.de - removed rplay again from "# neededforbuild" because a small fvwm2 is needed as a default windowmanager and rplay will not be in the default selection. -* Wed Apr 04 2001 - mfabian(a)suse.de +* Wed Apr 04 2001 mfabian(a)suse.de - added libstroke, libstroke-devel, and rplay to "# neededforbuild" (request of upstream fvwm2 authors) -* Fri Mar 30 2001 - pmladek(a)suse.cz +* Fri Mar 30 2001 pmladek(a)suse.cz - updated to version 2.3.30 - added URL - compiled witk GTK and IMLIB * added gtk gtk-devel gtkdoc glib glib-devel imlib imlib-devel imlib-config to neededforbuild - fixed call of suse_update_config -* Thu Mar 15 2001 - cihlar(a)suse.cz +* Thu Mar 15 2001 cihlar(a)suse.cz - fixed file list - removed xselection, package xselect is better -* Wed Mar 07 2001 - mfabian(a)suse.de +* Wed Mar 07 2001 mfabian(a)suse.de - repair packaging mistake, forgot to pack /usr/X11R6/share/ -* Wed Mar 07 2001 - mfabian(a)suse.de +* Wed Mar 07 2001 mfabian(a)suse.de - upgrade to fvwm2-2.3.29 - improve nls examples -* Fri Feb 23 2001 - ro(a)suse.de +* Fri Feb 23 2001 ro(a)suse.de - added readline/readline-devel to neededforbuild (split from bash) -* Sun Jan 28 2001 - mfabian(a)suse.de +* Sun Jan 28 2001 mfabian(a)suse.de - upgraded to "stable beta release" FVWM 2.3.28. - added icons tarball (previously included in main tarball) - added "--enable-multibyte" to ./configure @@ -586,30 +591,30 @@ SuSEconfig generates /etc/X11/fvwm/.fvwm2rc) - removed patches changing path of perl (handled by configure now) - removed old i18n patch (already included upstream now) -* Wed Dec 13 2000 - cihlar(a)suse.cz +* Wed Dec 13 2000 cihlar(a)suse.cz - fixed i18n patch [#4532] - removed %%preun -* Mon Nov 20 2000 - cihlar(a)suse.cz +* Mon Nov 20 2000 cihlar(a)suse.cz - fixed neededforbuild - requires: icons ... -* Fri Oct 13 2000 - cihlar(a)suse.cz +* Fri Oct 13 2000 cihlar(a)suse.cz - fixed i18n - bzipped sources - fixed configuration -* Fri Aug 18 2000 - cihlar(a)suse.cz +* Fri Aug 18 2000 cihlar(a)suse.cz - fixed to work with new pixmaps - fixed config file -* Tue Jun 06 2000 - kukuk(a)suse.de +* Tue Jun 06 2000 kukuk(a)suse.de - Update to 2.2.4 - Move sysconfdir to /etc/X11/fvwm2 -* Mon Jun 05 2000 - ro(a)suse.de +* Mon Jun 05 2000 ro(a)suse.de - doc relocation -* Mon Dec 13 1999 - ro(a)suse.de +* Tue Dec 14 1999 ro(a)suse.de - use /usr/X11R6/bin instead of /usr/bin/X11 - use /usr/X11R6/lib/X11 instead of /usr/lib/X11 -* Mon Sep 20 1999 - ro(a)suse.de +* Mon Sep 20 1999 ro(a)suse.de - added Provides windowmanager -* Mon Sep 13 1999 - bs(a)suse.de +* Mon Sep 13 1999 bs(a)suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Sat Jul 17 1999 - maddin(a)suse.de +* Sat Jul 17 1999 maddin(a)suse.de - created package version 2.2.2 (based on and conflicting with fvwm-2.0) ++++++ _system.fvwm2rc ++++++ --- fvwm2/_system.fvwm2rc 2007-07-19 18:01:26.000000000 +0200 +++ fvwm2/_system.fvwm2rc 2008-01-30 16:09:50.000000000 +0100 @@ -94,6 +94,7 @@ + I Test (Init) Module FvwmBanner + I Test (Init) Exec exec xterm -ls -geometry +150+85 + I Test (Init) Exec exec xli -onroot -fillscreen -border black /usr/share/wallpapers/default-1600x1200.jpg ++ I Test (Restart) Exec exec xli -onroot -fillscreen -border black /usr/share/wallpapers/default-1600x1200.jpg + I Module FvwmButtons AddToFunc ExitFunction @@ -128,10 +129,12 @@ AddToMenu bargraphicspopup "Graphics" Title + "Gimp" Exec exec gimp + + "Inkscape" Exec exec inkscape + "XV" Exec exec xv AddToMenu bartoolspopup "Tools" Title + "Firefox" Exec exec firefox + + "OpenOffice" Exec exec soffice AddToMenu barshellspopup "Shell in XTerm" Title + "Shell in XTerm" Exec exec xterm -ls @@ -139,7 +142,9 @@ AddToMenu barsusepopup "openSUSE" Title - + "Control Center" Exec exec xterm -e su - -cyast2 +## calling su - on SUSE version 10.1 (SLE) won't work (FIXME) +## because "su -" does not export $DISPLAY + + "Control Center" Exec exec xterm -e su -cyast2 + "Help" Exec exec susehelp + "openSUSE menu" Popup xdg_menu @@ -160,20 +165,20 @@ #Menu: Fvwm-Manpages AddToMenu manpages_popup "Fvwm-Manpages" Title - + "FvwmAudio" Exec exec xterm -e man FvwmAudio + + "FvwmEvent" Exec exec xterm -e man FvwmEvent + "FvwmAuto" Exec exec xterm -e man FvwmAuto + "FvwmBacker" Exec exec xterm -e man FvwmBacker + "FvwmBanner" Exec exec xterm -e man FvwmBanner + "FvwmButtons" Exec exec xterm -e man FvwmButtons - + "FvwmCascade" Exec exec xterm -e man FvwmCascade +## + "FvwmCascade" Exec exec xterm -e man FvwmCascade + "FvwmCommand" Exec exec xterm -e man FvwmCommand - + "FvwmConfig" Exec exec xterm -e man FvwmConfig + + "FvwmConfig" Exec exec xterm -e man fvwm-config + "FvwmConsole" Exec exec xterm -e man FvwmConsole + "FvwmConsoleC" Exec exec xterm -e man FvwmConsoleC + "FvwmCpp" Exec exec xterm -e man FvwmCpp + "FvwmDebug" Exec exec xterm -e man FvwmDebug + "FvwmForm" Exec exec xterm -e man FvwmForm - + "FvwmGoodStuff" Exec exec xterm -e man FvwmGoodStuff +## + "FvwmGoodStuff" Exec exec xterm -e man FvwmGoodStuff + "FvwmIconBox" Exec exec xterm -e man FvwmIconBox + "FvwmIconMan" Exec exec xterm -e man FvwmIconMan + "FvwmIdent" Exec exec xterm -e man FvwmIdent @@ -183,7 +188,7 @@ + "FvwmSaveDesk" Exec exec xterm -e man FvwmSaveDesk + "FvwmScript" Exec exec xterm -e man FvwmScript + "FvwmScroll" Exec exec xterm -e man FvwmScroll - + "FvwmTalk" Exec exec xterm -e man FvwmTalk +## + "FvwmTalk" Exec exec xterm -e man FvwmTalk + "FvwmTaskBar" Exec exec xterm -e man FvwmTaskBar + "FvwmTile" Exec exec xterm -e man FvwmTile + "FvwmWharf" Exec exec xterm -e man FvwmWharf @@ -194,7 +199,7 @@ #Menu: Modules AddToMenu modules_popup "Modules" Title - + "Audio" Module FvwmAudio + + "Event" Module FvwmEvent + "Autoraise off" KillModule FvwmAuto + "Autoraise 500ms" Module FvwmAuto 500 + "Banner" Module FvwmBanner @@ -220,6 +225,7 @@ + "TaskBar" Module FvwmTaskBar + "Tile" Module FvwmTile + "Wharf" Module FvwmWharf + + "WindowMenu" Module FvwmWindowMenu + "WinList" Module FvwmWinList @@ -266,9 +272,9 @@ -#Menu: xlock +#Menu: Screensaver -AddToMenu settings_xlock_popup "xlock" Title +AddToMenu screen_popup "Screensaver" Title + "Blank" Exec exec xset s blank + "Off" Exec exec xset s off + "Pattern after 5 min" Exec exec xset s noblank s 300 300 @@ -277,24 +283,13 @@ -#Menu: Screen - -PipeRead 'fvwm-menu-xlock --special-first' -PipeRead 'fvwm-menu-xlock --special-first --name=XSaverMenu -- -nolock' - -AddToMenu screen_popup "Screen" Title - + "Screen-Lock" Popup XLockMenu - + "Screensaver" Popup XSaverMenu - - - #Menu: Settings AddToMenu settings_popup "Settings" Title + "Keyboardclicks" Popup settings_kbdclick_popup + "Mouse" Popup settings_mouse_popup + "Speaker" Popup settings_speaker_popup - + "xlock" Popup settings_xlock_popup + + "Screensaver" Popup screen_popup #Menu: Work @@ -307,7 +302,6 @@ + "" Nop + "Top" Exec exec xterm -e top + "" Nop - + "Screen" Popup screen_popup + "Settings" Popup settings_popup + "WindowManager" Popup THISWM_MENU_popup + "openSUSE" Popup xdg_menu ++++++ system.fvwm2rc ++++++ --- fvwm2/system.fvwm2rc 2007-07-19 17:59:49.000000000 +0200 +++ fvwm2/system.fvwm2rc 2008-01-30 13:17:33.000000000 +0100 @@ -29,13 +29,13 @@ #paths specific to fvwm2 # -# The difference between X.org 6.x and 7.x -# If you switch to X.org version 6.9 or below change the paths below -# /usr/lib/X11/fvwm2 -> /usr/X11R6/lib... -# /usr/share/X11/fvwm2/pixmaps -> /usr/X11R6/lib/X11/fvwm2/pixmaps +## The difference between X.org 6.x and 7.x +## If you switch to X.org version 6.9 or below change the paths for ImagePath +## /usr/lib/X11/fvwm2 -> /usr/X11R6/lib... +## /usr/share/X11/fvwm2/pixmaps -> /usr/X11R6/lib/X11/fvwm2/pixmaps ### No, redefining ModulePath is the wrong thing to do. -#ModulePath /usr/lib/X11/fvwm2 +##ModulePath /usr/lib/X11/fvwm2 ## Adding $[FVWM_USERDIR] here doesn't hurt, and neither does prepending the ## *internal* ImagePath. @@ -91,6 +91,7 @@ + I Test (Init) Module FvwmBanner + I Test (Init) Exec exec xterm -ls -geometry +150+85 + I Test (Init) Exec exec xli -onroot -fillscreen -border black /usr/share/wallpapers/default-1600x1200.jpg ++ I Test (Restart) Exec exec xli -onroot -fillscreen -border black /usr/share/wallpapers/default-1600x1200.jpg + I Module FvwmButtons AddToFunc ExitFunction @@ -126,10 +127,12 @@ AddToMenu bargraphicspopup "Graphics" Title + "Gimp" Exec exec gimp + + "Inkscape" Exec exec inkscape + "XV" Exec exec xv AddToMenu bartoolspopup "Tools" Title + "Firefox" Exec exec firefox + + "OpenOffice" Exec exec soffice AddToMenu barshellspopup "Shell in XTerm" Title + "Shell in XTerm" Exec exec xterm -ls @@ -158,20 +161,20 @@ #Menu: Fvwm-Manpages AddToMenu manpages_popup "Fvwm-Manpages" Title - + "FvwmAudio" Exec exec xterm -e man FvwmAudio + + "FvwmEvent" Exec exec xterm -e man FvwmEvent + "FvwmAuto" Exec exec xterm -e man FvwmAuto + "FvwmBacker" Exec exec xterm -e man FvwmBacker + "FvwmBanner" Exec exec xterm -e man FvwmBanner + "FvwmButtons" Exec exec xterm -e man FvwmButtons - + "FvwmCascade" Exec exec xterm -e man FvwmCascade +## + "FvwmCascade" Exec exec xterm -e man FvwmCascade + "FvwmCommand" Exec exec xterm -e man FvwmCommand - + "FvwmConfig" Exec exec xterm -e man FvwmConfig + + "FvwmConfig" Exec exec xterm -e man fvwm-config + "FvwmConsole" Exec exec xterm -e man FvwmConsole + "FvwmConsoleC" Exec exec xterm -e man FvwmConsoleC + "FvwmCpp" Exec exec xterm -e man FvwmCpp + "FvwmDebug" Exec exec xterm -e man FvwmDebug + "FvwmForm" Exec exec xterm -e man FvwmForm - + "FvwmGoodStuff" Exec exec xterm -e man FvwmGoodStuff +## + "FvwmGoodStuff" Exec exec xterm -e man FvwmGoodStuff + "FvwmIconBox" Exec exec xterm -e man FvwmIconBox + "FvwmIconMan" Exec exec xterm -e man FvwmIconMan + "FvwmIdent" Exec exec xterm -e man FvwmIdent @@ -181,7 +184,7 @@ + "FvwmSaveDesk" Exec exec xterm -e man FvwmSaveDesk + "FvwmScript" Exec exec xterm -e man FvwmScript + "FvwmScroll" Exec exec xterm -e man FvwmScroll - + "FvwmTalk" Exec exec xterm -e man FvwmTalk +## + "FvwmTalk" Exec exec xterm -e man FvwmTalk + "FvwmTaskBar" Exec exec xterm -e man FvwmTaskBar + "FvwmTile" Exec exec xterm -e man FvwmTile + "FvwmWharf" Exec exec xterm -e man FvwmWharf @@ -192,7 +195,7 @@ #Menu: Modules AddToMenu modules_popup "Modules" Title - + "Audio" Module FvwmAudio + + "Event" Module FvwmEvent + "Autoraise off" KillModule FvwmAuto + "Autoraise 500ms" Module FvwmAuto 500 + "Banner" Module FvwmBanner @@ -210,7 +213,7 @@ + "M4" Module FvwmM4 + "Pager" Module FvwmPager 0 0 ## + "Pipe" Module FvwmPipe -## + "Save" Module FvwmSave + + "Save" Module FvwmSave ## + "SaveDesk" Module FvwmSaveDesk + "Script" Module FvwmScript + "Scroll" Module FvwmScroll @@ -218,6 +221,7 @@ + "TaskBar" Module FvwmTaskBar + "Tile" Module FvwmTile + "Wharf" Module FvwmWharf + + "WindowMenu" Module FvwmWindowMenu + "WinList" Module FvwmWinList @@ -264,9 +268,9 @@ -#Menu: xlock +#Menu: Screensaver -AddToMenu settings_xlock_popup "xlock" Title +AddToMenu screen_popup "Screensaver" Title + "Blank" Exec exec xset s blank + "Off" Exec exec xset s off + "Pattern after 5 min" Exec exec xset s noblank s 300 300 @@ -275,24 +279,13 @@ -#Menu: Screen - -PipeRead 'fvwm-menu-xlock --special-first' -PipeRead 'fvwm-menu-xlock --special-first --name=XSaverMenu -- -nolock' - -AddToMenu screen_popup "Screen" Title - + "Screen-Lock" Popup XLockMenu - + "Screensaver" Popup XSaverMenu - - - #Menu: Settings AddToMenu settings_popup "Settings" Title + "Keyboardclicks" Popup settings_kbdclick_popup + "Mouse" Popup settings_mouse_popup + "Speaker" Popup settings_speaker_popup - + "xlock" Popup settings_xlock_popup + + "Screensaver" Popup screen_popup #Menu: Work @@ -305,7 +298,6 @@ + "" Nop + "Top" Exec exec xterm -e top + "" Nop - + "Screen" Popup screen_popup + "Settings" Popup settings_popup + "WindowManager" Popup THISWM_MENU_popup + "openSUSE" Popup xdg_menu ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 fox16
by root＠Hilbert.suse.de 30 Jan '08

30 Jan '08

Hello community, here is the log from the commit of package fox16 checked in at Wed Jan 30 18:08:47 CET 2008. -------- --- fox16/fox16.changes 2007-10-10 12:51:54.000000000 +0200 +++ fox16/fox16.changes 2008-01-30 13:37:22.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Dec 17 18:50:03 CET 2007 - lrupp(a)suse.de + +- update to 1.6.31: + + Bug fix to strtoull() for systems which have + no native strtoull(). + + Missing tr() added in FXMDIClient. + + Fix for FXRuby in FXMDIClient (don't test for message==0 + in notify message). +- split libfox%soname to follow shared library packaging policy +- fix desktop files and add them as normal files +- enable warnings again + +------------------------------------------------------------------- Old: ---- fox-1.6.30.tar.bz2 New: ---- adie.desktop calculator.desktop fox-1.6.31.tar.bz2 pathfinder.desktop ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fox16.spec ++++++ --- /var/tmp/diff_new_pack.v15264/_old 2008-01-30 18:07:24.000000000 +0100 +++ /var/tmp/diff_new_pack.v15264/_new 2008-01-30 18:07:24.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package fox16 (Version 1.6.30) +# spec file for package fox16 (Version 1.6.31) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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. # @@ -14,16 +14,21 @@ Url: http://www.fox-toolkit.org/ Summary: Shared Libraries for the FOX Toolkit Group: Development/Languages/C and C++ -License: LGPL v2 or later -Version: 1.6.30 +License: LGPL v2.1 or later +Version: 1.6.31 Release: 1 +%define soname 1_6 AutoReqProv: on Source: fox-%{version}.tar.bz2 Source1: calculator.png Source2: pathfinder.png Source3: adie.png Source4: fox16-rpmlintrc +Source5: adie.desktop +Source6: calculator.desktop +Source7: pathfinder.desktop Provides: fox = %{version}-%{release} +Requires: libfox%soname = %{version} Patch1: fox-1.6.26_initialise_local_variable.patch Patch2: fox-1.6.26-missing_html_tag.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -84,6 +89,35 @@ David Tyree Jeroen van der Zijp +%package -n libfox1_6 +Summary: Shared Libraries for the FOX Toolkit +Group: Development/Languages/C and C++ + +%description -n libfox%soname +This package contains the shared libraries needed +by applications compiled with the FOX GUI Toolkit. + +Authors: +-------- + Johnathan Bush + Pierre Cyr + Janusz Ganczarski + Daniel Gehriger + Eric Gillet + Freddy Golos + Angel-Ventura Mendo Gomez + Sean Hubbell + Sander Jansen + Lyle Johnson + Torsten Landschoff + René van Paassen + Guoqing Tian + David Tyree + Charles W. Warren + David Tyree + Jeroen van der Zijp + + %package devel Summary: Development Files and Documentation for the FOX GUI Toolkit Group: Development/Languages/C and C++ @@ -134,18 +168,15 @@ Jeroen van der Zijp %package static -Summary: Shared Libraries for the FOX Toolkit +Summary: Static Libraries for the FOX Toolkit Group: Development/Languages/C and C++ # skip dependency checks required by libtool .la files => skip-check-libtool-deps %description static -FOX is a C++-based library for graphical user interface development. +This package contains static libraries for developing applications +which are statically linked against the FOX libraries. -FOX supports modern GUI features such as drag-and-drop, tooltips, tab -books, tree lists, icons, multiple document interfaces (MDI), timers, -idle processing, automatic GUI updating, as well as OpenGL/Mesa for 3D -graphics. Subclassing of basic FOX widgets allows for easy extension -beyond the built-in widgets by application writers. +FOX is a C++-based library for graphical user interface development. @@ -177,7 +208,15 @@ %description example-apps The example-apps package contains executables for several FOX-based -applications, including Adie, calculator, shutterbug and PathFinder. +applications, including: + +* Adie : Programmer's Text Editor + +* calculator : Calculator Applet + +* shutterbug : Screenshot Utility + +* PathFinder : File Browser @@ -208,7 +247,6 @@ %build autoreconf -fi -## CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -Wuninitialized -fno-strict-aliasing" \ %configure \ --enable-threadsafe \ --enable-release \ @@ -237,66 +275,31 @@ install -m 644 %SOURCE1 %buildroot/%{_datadir}/pixmaps/ install -m 644 %SOURCE2 %buildroot/%{_datadir}/pixmaps/ install -m 644 %SOURCE3 %buildroot/%{_datadir}/pixmaps/ -cat > %buildroot/%{_datadir}/applications/calculator.desktop << EOF -[Desktop Entry] -Encoding=UTF-8 -Name=Calculator -Icon=calculator.png -Exec=calculator -GenericName=Calculator -GenericName[de]=Taschenrechner -Terminal=false -Type=Application -Categories=Qt;KDE;Utility;X-KDE-Utilities-Desktop;Calculator; -Comment=A fox-toolkit based calculator -Comment[de]=Ein auf dem Fox-Toolkit basierender Taschenrechner -EOF -cat > %buildroot/%{_datadir}/applications/pathfinder.desktop << EOF -[Desktop Entry] -Encoding=UTF-8 -Name=PathFinder -Icon=pathfinder.png -Exec=PathFinder -GenericName=File Manager -GenericName[de]=Dateimanager -Terminal=false -Type=Application -Categories=Application;System;FileManager; -EOF -cat > %buildroot/%{_datadir}/applications/adie.desktop << EOF -[Desktop Entry] -Encoding=UTF-8 -Name=Adie -Icon=adie.png -Exec=adie -GenericName=Text Editor -GenericName[de]=Texteditor -Terminal=false -Type=Application -MimeType=text/english;text/plain; -Categories=TextEditor -EOF +install -m 644 %SOURCE5 %buildroot/%{_datadir}/applications/ +install -m 644 %SOURCE6 %buildroot/%{_datadir}/applications/ +install -m 644 %SOURCE7 %buildroot/%{_datadir}/applications/ %suse_update_desktop_file calculator %suse_update_desktop_file pathfinder %suse_update_desktop_file adie %endif %clean -rm -rf %{buildroot} +rm -rf %buildroot -%post -p /sbin/ldconfig +%post -n libfox1_6 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libfox1_6 -p /sbin/ldconfig %files %defattr(644, root, root, 0755) %doc doc %doc ADDITIONS AUTHORS LICENSE* README TRACING index.html -%defattr(-, root, root, 0755) + +%files -n libfox1_6 +%defattr(-, root, root) %{_libdir}/libFOX-*.so* %{_libdir}/libCHART-*.so* -%exclude %{_libdir}/libFOX-*.so -%exclude %{_libdir}/libCHART-*.so +%exclude %{_libdir}/*.so %files devel %defattr(-,root,root) @@ -328,8 +331,19 @@ %{_mandir}/man1/calculator* %{_mandir}/man1/PathFinder* %{_mandir}/man1/shutterbug* + %changelog -* Wed Oct 10 2007 - lrupp(a)suse.de +* Mon Dec 17 2007 lrupp(a)suse.de +- update to 1.6.31: + + Bug fix to strtoull() for systems which have + no native strtoull(). + + Missing tr() added in FXMDIClient. + + Fix for FXRuby in FXMDIClient (don't test for message==0 + in notify message). +- split libfox%%soname to follow shared library packaging policy +- fix desktop files and add them as normal files +- enable warnings again +* Wed Oct 10 2007 lrupp(a)suse.de - update to 1.6.30: + Fixed some issues with flush() in FXBZFileStream and FXGZFileStream. @@ -349,7 +363,7 @@ - added fox16-rpmlintrc - added LICENSE_ADDENDUM, removed INSTALL from %%doc - create desktop entries for adie, calculator and pathfinder -* Tue Jun 05 2007 - lrupp(a)suse.de +* Tue Jun 05 2007 lrupp(a)suse.de - update to 1.6.27 + Fixed regression in glUseFXFont() when using Xft instead of XLFD. + Fixed bug in FXVisual which caused drawing to FXBitmap to fail. @@ -366,9 +380,9 @@ default size. - Remove libbz2 from BuildRequires (in buildsystem now) - Remove "--with-xim": breaks keyboard support -* Thu May 10 2007 - ro(a)suse.de +* Fri May 11 2007 ro(a)suse.de - fix typo in specfile -* Thu May 03 2007 - lars(a)suse.de +* Thu May 03 2007 lars(a)suse.de - update to 1.6.26 - remove upstremed patches: + fox-1.6.20_configure_x11_extensions_header.patch @@ -376,9 +390,9 @@ - adapt fox-1.6.26_initialise_local_variable.patch - added Mandriva and Fedora dependencies - require libexpat-devel for openSUSE > 10.2 -* Wed Mar 07 2007 - lrupp(a)suse.de +* Wed Mar 07 2007 lrupp(a)suse.de - fixed requires for devel package on older distributions -* Tue Mar 06 2007 - lrupp(a)suse.de +* Tue Mar 06 2007 lrupp(a)suse.de - update to 1.6.23: + Fixed problem with X11 XLFD fonts. If XLFD font name specified directly, no font was matched. @@ -386,14 +400,14 @@ FXTreeListBox. + Always define vfscanf(), vscanf(), and vsscanf() when on Windows. + Remove FXAPI in FXObjectListOf template. -* Sun Jan 28 2007 - lrupp(a)suse.de +* Sun Jan 28 2007 lrupp(a)suse.de - add static package - compile for release - reorder documentation -* Fri Jan 26 2007 - lrupp(a)suse.de +* Fri Jan 26 2007 lrupp(a)suse.de - added version numbers in provides - build on older distributions -* Fri Dec 01 2006 - lrupp(a)suse.de +* Fri Dec 01 2006 lrupp(a)suse.de - update to 1.6.20 + Rolled back explicit template instantiation stuff: not supported everywhere. @@ -405,7 +419,7 @@ button release. + Fixed problems in FXFile, FXSocket, FXPipe occurring on 64-bit Windows. -* Fri Oct 13 2006 - lrupp(a)suse.de +* Fri Oct 13 2006 lrupp(a)suse.de - update to 1.6.16 + Fixed issue with FXMDIChild and FXTopWindow close() routine; this mostly affects FXRuby @@ -416,17 +430,17 @@ + FXToolTip & FXExpression bugs fixed + Updated Adie.stx - removed fox-1.6.4_optflags.patch -* Tue Jun 13 2006 - lrupp(a)suse.de +* Tue Jun 13 2006 lrupp(a)suse.de - fix #183748 : fox development files in run-time package - fix #183746 : package fox is compiled without RPM_OPT_FLAGS - fix #183739 : fox-1.6.4-3: local variable used before set - reduce BuildRequires - enable configure options: cups,xft,xim,xcursor,xrandr,opengl,shape,xshm -* Wed Apr 26 2006 - lrupp(a)suse.de +* Wed Apr 26 2006 lrupp(a)suse.de - new source 1.6.4 from upstream - package is alive again ;-) -* Mon Jun 23 2003 - pthomas(a)suse.de +* Mon Jun 23 2003 pthomas(a)suse.de - Include accidently left out libFOX.so. -* Fri Jun 20 2003 - pthomas(a)suse.de +* Fri Jun 20 2003 pthomas(a)suse.de - Initial package creation. - Use AM_CXXFLAGS instead of overriding CXXFLAGS. - Clean up code, including int->pointer casts. ++++++ fox-1.6.30.tar.bz2 -> fox-1.6.31.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.30/configure new/fox-1.6.31/configure --- old/fox-1.6.30/configure 2007-10-06 15:28:23.000000000 +0200 +++ new/fox-1.6.31/configure 2007-11-16 16:21:22.000000000 +0100 @@ -1520,7 +1520,7 @@ FOX_MINOR_VERSION=6 -FOX_PATCH_LEVEL=30 +FOX_PATCH_LEVEL=31 FOX_INTERFACE_VERSION=0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.30/configure.in new/fox-1.6.31/configure.in --- old/fox-1.6.30/configure.in 2007-10-06 15:27:26.000000000 +0200 +++ new/fox-1.6.31/configure.in 2007-11-16 16:21:15.000000000 +0100 @@ -8,7 +8,7 @@ FOX_MINOR_VERSION=6 dnl Increment after every source code change -FOX_PATCH_LEVEL=30 +FOX_PATCH_LEVEL=31 dnl Binaries compiled with this patchlevel of FOX will need at least dnl version MAJOR.MINOR.INTERFACE_VERSION to run. The assertion diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.30/include/fxver.h new/fox-1.6.31/include/fxver.h --- old/fox-1.6.30/include/fxver.h 2007-10-06 15:35:45.000000000 +0200 +++ new/fox-1.6.31/include/fxver.h 2007-11-16 16:21:37.000000000 +0100 @@ -5,7 +5,7 @@ // FOX version #define FOX_MAJOR 1 #define FOX_MINOR 6 -#define FOX_LEVEL 30 +#define FOX_LEVEL 31 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.30/src/FXMDIClient.cpp new/fox-1.6.31/src/FXMDIClient.cpp --- old/fox-1.6.30/src/FXMDIClient.cpp 2006-05-19 03:15:09.000000000 +0200 +++ new/fox-1.6.31/src/FXMDIClient.cpp 2007-11-16 16:20:40.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXMDIClient.cpp,v 1.62.2.1 2006/05/10 13:18:13 fox Exp $ * +* $Id: FXMDIClient.cpp,v 1.62.2.2 2007/10/25 15:08:51 fox Exp $ * ********************************************************************************/ #include "xincs.h" #include "fxver.h" @@ -326,10 +326,10 @@ // Show a menu of other MDI child windows long FXMDIClient::onCmdOthersWindows(FXObject*,FXSelector,void*){ - FXDialogBox choose(this,"Select Window",DECOR_TITLE|DECOR_BORDER|DECOR_RESIZE,0,0,300,200,10,10,10,10, 10,10); + FXDialogBox choose(this,tr("Select Window"),DECOR_TITLE|DECOR_BORDER|DECOR_RESIZE,0,0,300,200,10,10,10,10, 10,10); FXHorizontalFrame* buttons=new FXHorizontalFrame(&choose,LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|PACK_UNIFORM_WIDTH|PACK_UNIFORM_HEIGHT,0,0,0,0,0,0,0,0); - new FXButton(buttons,"&OK",NULL,&choose,FXDialogBox::ID_ACCEPT,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD); - new FXButton(buttons,"&Cancel",NULL,&choose,FXDialogBox::ID_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD); + new FXButton(buttons,tr("&OK"),NULL,&choose,FXDialogBox::ID_ACCEPT,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD); + new FXButton(buttons,tr("&Cancel"),NULL,&choose,FXDialogBox::ID_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD); FXVerticalFrame* mdilistframe=new FXVerticalFrame(&choose,FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y,0,0,0,0,0,0,0,0,0,0); FXList* mdilist=new FXList(mdilistframe,NULL,0,LIST_BROWSESELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y); mdilist->setNumVisible(10); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.30/src/strtoll.cpp new/fox-1.6.31/src/strtoll.cpp --- old/fox-1.6.30/src/strtoll.cpp 2006-06-13 04:25:33.000000000 +0200 +++ new/fox-1.6.31/src/strtoll.cpp 2007-11-16 16:20:41.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: strtoll.cpp,v 1.9.2.1 2006/06/13 02:25:33 fox Exp $ * +* $Id: strtoll.cpp,v 1.9.2.2 2007/11/16 14:50:40 fox Exp $ * ********************************************************************************/ #include "xincs.h" #include "fxver.h" @@ -182,7 +182,7 @@ if(endptr) *endptr=s; // Skip spaces - while((c=*s++)!='\0' && Ascii::isSpace(c)) s++; + while(*s!='\0' && Ascii::isSpace(*s)) s++; // Process sign if(*s=='-'){ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.30/src/version.rc new/fox-1.6.31/src/version.rc --- old/fox-1.6.30/src/version.rc 2007-10-06 15:49:57.000000000 +0200 +++ new/fox-1.6.31/src/version.rc 2007-11-16 16:26:38.000000000 +0100 @@ -1,5 +1,5 @@ 1 VERSIONINFO -FILEVERSION 1,6,30,0 +FILEVERSION 1,6,31,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -15,7 +15,7 @@ BLOCK "040904b0" BEGIN VALUE "FileDescription", "FOX GUI Library\0" -VALUE "FileVersion", "1,6,30.0\0" +VALUE "FileVersion", "1,6,31.0\0" VALUE "LegalCopyright", "GNU Library General Public License\0" END END ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 fillets-ng
by root＠Hilbert.suse.de 30 Jan '08

30 Jan '08

Hello community, here is the log from the commit of package fillets-ng checked in at Wed Jan 30 18:06:57 CET 2008. -------- --- fillets-ng/fillets-ng.changes 2007-10-25 18:14:53.000000000 +0200 +++ fillets-ng/fillets-ng.changes 2008-01-29 20:02:32.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Jan 29 20:01:50 CET 2008 - lrupp(a)suse.de + +- update to 0.8.0: + + Undo (on key '-') + + Five extra levels (by Mirek Olsak) + + Slovenian translation (by Marko Burjek) + + Brazilian Portuguese translation (by Ricardo Faria) + + Russian translation + (by Leonid Myravjev, Maria Antropova, Gregory Bonik) + +------------------------------------------------------------------- Old: ---- fillets-ng-0.7.4-gcc4.3.diff fillets-ng-0.7.4.tar.bz2 New: ---- fillets-ng-0.8.0.tar.bz2 fillets-ng-0.8.0-undeclared.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fillets-ng.spec ++++++ --- /var/tmp/diff_new_pack.e12191/_old 2008-01-30 18:06:07.000000000 +0100 +++ /var/tmp/diff_new_pack.e12191/_new 2008-01-30 18:06:07.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package fillets-ng (Version 0.7.4) +# spec file for package fillets-ng (Version 0.8.0) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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. # @@ -11,20 +11,25 @@ # norootforbuild Name: fillets-ng -BuildRequires: SDL_image-devel SDL_mixer-devel SDL_ttf-devel fribidi-devel gcc-c++ lua-devel pkgconfig update-desktop-files +BuildRequires: SDL_image-devel SDL_mixer-devel fribidi-devel gcc-c++ lua-devel pkgconfig update-desktop-files +%if 0%{?suse_version} >= 1020 +BuildRequires: SDL_ttf-devel +%else +BuildRequires: SDL_ttf +%endif License: GPL v2 or later Group: Amusements/Games/Action/Arcade Summary: Fish Fillets--Next Generation -Version: 0.7.4 -Release: 72 +Version: 0.8.0 +Release: 1 Url: http://fillets.sourceforge.net Source0: %{name}-%{version}.tar.bz2 Source1: %name.desktop Source2: %name.png -Patch: %{name}-%{version}.diff -Patch1: %{name}-%{version}-gcc4.3.diff +Patch: %name-0.7.4.diff +Patch1: fillets-ng-0.8.0-undeclared.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: fillets-ng-data >= 0.7.4 +Requires: fillets-ng-data = %version %description Fish Fillets is strictly a puzzle game. The goal in each of the 70 @@ -53,19 +58,13 @@ libtoolize --force autoconf --force automake -afc -CXXFLAGS="$RPM_OPT_FLAGS" \ -CPPFLAGS="$RPM_OPT_FLAGS" \ -LDFLAGS="-ldl" \ -./configure --prefix=%{_prefix} \ - --bindir=%{_prefix}/games \ - --datadir=%{_datadir} \ - --mandir=%{_mandir} -make +%configure --bindir=%{_prefix}/games +make %{?jobs:-j%jobs} %install -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps -install -m 0644 %{S:2} $RPM_BUILD_ROOT/usr/share/pixmaps/fillets-ng.png +install -m644 %{S:2} $RPM_BUILD_ROOT/usr/share/pixmaps/fillets-ng.png %suse_update_desktop_file -i %name Game ArcadeGame %clean @@ -80,47 +79,56 @@ %{_prefix}/games/fillets %{_datadir}/applications/%name.desktop %{_datadir}/pixmaps/%name.png + %changelog -* Thu Oct 25 2007 - anicka(a)suse.cz +* Tue Jan 29 2008 lrupp(a)suse.de +- update to 0.8.0: + + Undo (on key '-') + + Five extra levels (by Mirek Olsak) + + Slovenian translation (by Marko Burjek) + + Brazilian Portuguese translation (by Ricardo Faria) + + Russian translation + (by Leonid Myravjev, Maria Antropova, Gregory Bonik) +* Thu Oct 25 2007 anicka(a)suse.cz - fix for gcc 4.3 -* Tue Jul 03 2007 - anicka(a)suse.cz +* Tue Jul 03 2007 anicka(a)suse.cz - fix dependency on SDL_ttf-devel -* Mon Feb 19 2007 - anicka(a)suse.cz +* Mon Feb 19 2007 anicka(a)suse.cz - update to 0.7.4 * fixes for new version of lua - update fixes #246724 - remove last patch (fixed in upstream) -* Fri Oct 20 2006 - ro(a)suse.de +* Fri Oct 20 2006 ro(a)suse.de - fix build with current lua -* Tue Aug 15 2006 - anicka(a)suse.cz +* Tue Aug 15 2006 anicka(a)suse.cz - add desktop file and icon (#198287) -* Thu Mar 16 2006 - anicka(a)suse.cz +* Thu Mar 16 2006 anicka(a)suse.cz - fix dependencies (#158267) -* Mon Jan 30 2006 - ro(a)suse.de +* Mon Jan 30 2006 ro(a)suse.de - added gcc-c++ to BuildRequires -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Thu Jan 05 2006 - anicka(a)suse.cz +* Thu Jan 05 2006 anicka(a)suse.cz - update to 0.7.3 - require fribidi - add -ldl to LDFLAGS -* Fri Sep 09 2005 - ro(a)suse.de +* Fri Sep 09 2005 ro(a)suse.de - fix configure to find liblua -* Wed Jul 20 2005 - anicka(a)suse.cz +* Wed Jul 20 2005 anicka(a)suse.cz - update to 0.7.1 -* Mon Jun 20 2005 - anicka(a)suse.cz +* Mon Jun 20 2005 anicka(a)suse.cz - update to 0.7.0 -* Wed Oct 13 2004 - mcihar(a)suse.cz +* Wed Oct 13 2004 mcihar(a)suse.cz - update to 0.6.0 - versioned dependancy on fillets-ng-data -* Thu Aug 12 2004 - mcihar(a)suse.cz +* Thu Aug 12 2004 mcihar(a)suse.cz - version 0.5.0 doesn't require boost -* Thu Aug 12 2004 - mcihar(a)suse.cz +* Thu Aug 12 2004 mcihar(a)suse.cz - update to 0.5.0 - split data to noarch package -* Wed Aug 04 2004 - mcihar(a)suse.cz +* Wed Aug 04 2004 mcihar(a)suse.cz - update to 0.4.1 -* Mon May 10 2004 - mcihar(a)suse.cz +* Mon May 10 2004 mcihar(a)suse.cz - updated to 0.3.0: * game world map * save/load (F2/F3) @@ -128,5 +136,5 @@ * two animated videos * optional controls with spacebar and arrow keys * How to Play manual -* Fri Apr 23 2004 - mcihar(a)suse.cz +* Fri Apr 23 2004 mcihar(a)suse.cz - initial packaging ++++++ fillets-ng-0.7.4.tar.bz2 -> fillets-ng-0.8.0.tar.bz2 ++++++ ++++ 2699 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/AUTHORS new/fillets-ng-0.8.0/AUTHORS --- old/fillets-ng-0.7.4/AUTHORS 2006-12-17 22:24:25.000000000 +0100 +++ new/fillets-ng-0.8.0/AUTHORS 2007-12-22 00:54:39.000000000 +0100 @@ -29,6 +29,15 @@ Olov Gustavsson <olov.gustavsson(a)bredband.net> - Swedish translation +Marko Burjek <email4marko(a)gmail.com> +- Slovenian translation + +Ricardo Faria <rickybrag(a)gmail.com> +- Brazilian Portuguese translation + +Leonid Myravjev <lemy(a)bk.ru> +- Russian translation + ALTAR interactive <info(a)altarinteractive.com> - developed original game in 1998 (for Win32) - released code and data under GNU/GPL in 03/2004 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/ChangeLog new/fillets-ng-0.8.0/ChangeLog --- old/fillets-ng-0.7.4/ChangeLog 2006-12-20 22:16:49.000000000 +0100 +++ new/fillets-ng-0.8.0/ChangeLog 2007-12-22 01:02:25.000000000 +0100 @@ -1,3 +1,118 @@ +2007-12-22 00:55 fidlej + + * AUTHORS: Updated AUTHORS. + +2007-12-22 00:53 fidlej + + * README: Updated README. + +2007-12-21 23:36 fidlej + + * fillets.6: Updated man page. + +2007-12-21 23:26 fidlej + + * NEWS, configure.in: Preparing release 0.8. + +2007-12-21 23:25 fidlej + + * src/: level/Controls.cpp, plan/ConsoleInput.cpp: Replaced + std::string.push_back() with append() (for BeOS). + +2007-12-15 17:25 fidlej + + * NEWS: Fixed NEWS. + +2007-12-15 17:20 fidlej + + * NEWS: Updated NEWS. + +2007-12-15 17:09 fidlej + + * NEWS, configure.in: Prepared release-0_8_0-pre2. + +2007-12-15 14:31 fidlej + + * src/level/: Controls.cpp, Controls.h, Level.cpp, StepCounter.h, + Unit.cpp, Unit.h: Undo is saved before every move down. + +2007-12-09 19:41 fidlej + + * src/level/: Level.cpp, Level.h: Simplified undo saving. + +2007-12-09 18:26 fidlej + + * src/level/Level.cpp: Fixed force undo save. + +2007-12-09 17:59 fidlej + + * src/level/Level.cpp: Fixed saving of state to the correct moves. + +2007-12-01 17:39 fidlej + + * src/level/: Cube.cpp, game-script.cpp: Optimized undo saving for + normal models. + +2007-12-01 16:31 fidlej + + * src/level/: Controls.cpp, Controls.h, Level.cpp, Rules.h, + StepCounter.h, Unit.cpp: Saved only pushing and every 10th undo. + +2007-10-21 13:49 fidlej + + * NEWS, configure.in: Preparing 0.8.0-pre1 release. + +2007-09-28 23:29 fidlej + + * src/level/Rules.cpp: Fixed support for nowall moving stars. + +2007-09-28 22:55 fidlej + + * src/level/: Cube.cpp, Cube.h, LevelScript.cpp, game-script.cpp, + game-script.h: Added support to save extra parameters. + +2007-09-28 20:55 fidlej + + * src/level/: Controls.cpp, Controls.h, Level.cpp, Unit.cpp, + Unit.h: Last moving fish is activated after undo. + +2007-09-28 20:01 fidlej + + * src/level/: Level.cpp, Rules.cpp: Fixed undo when a fish is out. + +2007-09-28 18:08 fidlej + + * src/level/: Controls.h, Cube.h, Field.cpp, Field.h, Level.cpp, + Level.h, LevelInput.cpp, LevelInput.h, LevelLoading.h, + LevelScript.cpp, MarkMask.cpp, MarkMask.h, Room.cpp, Room.h, + Rules.cpp, Rules.h, game-script.cpp, game-script.h: Provided undo + on key minus. + +2007-09-28 18:06 fidlej + + * src/level/LevelCountDown.cpp: Fixed English. + +2007-09-28 18:03 fidlej + + * src/effect/EffectMirror.cpp: Fixed English. + +2007-06-30 17:31 fidlej + + * src/plan/Title.cpp: Proper UTF-8 length calculation. + +2007-06-30 17:04 fidlej + + * src/gengine/: Dialog.cpp, StringTool.cpp, StringTool.h: Fixed + dialog duration (thanks to Gregory Bonik and Egmont Koblinger). + +2007-06-30 16:50 fidlej + + * NEWS: Used sentences without dots. + +2006-12-20 23:18 fidlej + + * configure.in: More informative have_x11. + 2006-12-17 23:02 fidlej * NEWS: Updated news by Swedish translation. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/configure.in new/fillets-ng-0.8.0/configure.in --- old/fillets-ng-0.7.4/configure.in 2006-12-17 23:18:38.000000000 +0100 +++ new/fillets-ng-0.8.0/configure.in 2007-12-21 23:24:58.000000000 +0100 @@ -5,7 +5,7 @@ # The AM_INIT_AUTOMAKE macro tells automake the name and version number # of the software package so it can generate rules for building a source # archive. -AM_INIT_AUTOMAKE(fillets-ng, 0.7.4) +AM_INIT_AUTOMAKE(fillets-ng, 0.8.0) # Checks for programs. AC_PROG_CXX diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/fillets.6 new/fillets-ng-0.8.0/fillets.6 --- old/fillets-ng-0.7.4/fillets.6 2005-04-18 17:04:20.000000000 +0200 +++ new/fillets-ng-0.8.0/fillets.6 2007-12-21 23:36:13.000000000 +0100 @@ -117,6 +117,8 @@ .PP restart level - Backspace .br +undo - - +.br help - F1 .br save game - F2 @@ -170,6 +172,34 @@ .br - Polish translation .PP +César Catrián C. <ccatrian(a)eml.cc> +.br +- Spanish translation +.PP +Astrid de Wijn <a.s.dewijn(a)phys.uu.nl> +.br +- Dutch translation +.PP +Damyan Ivanov <divanov(a)creditreform.bg> +.br +- Bulgarian translation +.PP +Olov Gustavsson <olov.gustavsson(a)bredband.net> +.br +- Swedish translation +.PP +Marko Burjek <email4marko[at]gmail[dot]com> +.br +- Slovenian translation +.PP +Ricardo Faria <rickybrag(a)gmail.com> +.br +- Brazilian Portuguese translation +.PP +Leonid Myravjev <lemy(a)bk.ru> +.br +- Russian translation +.PP ALTAR interactive <info(a)altarinteractive.com> .br - developed original game in 1998 (for Win32) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/NEWS new/fillets-ng-0.8.0/NEWS --- old/fillets-ng-0.7.4/NEWS 2006-12-17 23:02:14.000000000 +0100 +++ new/fillets-ng-0.8.0/NEWS 2007-12-21 23:24:30.000000000 +0100 @@ -1,8 +1,16 @@ +Fish Fillets NG - 0.8.0 +* Undo (on key '-') +* Five extra levels (by Mirek Olsak) +* Slovenian translation (by Marko Burjek) +* Brazilian Portuguese translation (by Ricardo Faria) +* Russian translation (by Leonid Myravjev, Maria Antropova, Gregory Bonik) + + Fish Fillets NG - 0.7.4 -* One extra level (by Mirek Olsak). -* Bulgarian translation (by Damyan Ivanov). -* Swedish translation (by Olov Gustavsson). -* Fixed table iterations for lua5.1. +* One extra level (by Mirek Olsak) +* Bulgarian translation (by Damyan Ivanov) +* Swedish translation (by Olov Gustavsson) +* Fixed table iterations for lua5.1 Fish Fillets NG - 0.7.3 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/README new/fillets-ng-0.8.0/README --- old/fillets-ng-0.7.4/README 2005-04-17 14:14:13.000000000 +0200 +++ new/fillets-ng-0.8.0/README 2007-12-22 00:53:04.000000000 +0100 @@ -63,6 +63,7 @@ See also "How to Play" data/doc/html/manual.html restart level - Backspace +undo - - help - F1 save game - F2 load game - F3 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/effect/EffectMirror.cpp new/fillets-ng-0.8.0/src/effect/EffectMirror.cpp --- old/fillets-ng-0.7.4/src/effect/EffectMirror.cpp 2004-07-26 21:17:53.000000000 +0200 +++ new/fillets-ng-0.8.0/src/effect/EffectMirror.cpp 2007-09-04 23:46:00.000000000 +0200 @@ -15,7 +15,7 @@ /** * Mirror effect. Draw left side inside. * The pixel in the middle will be used as a mask. - * NOTE: mirror object should be draw as the last. + * NOTE: mirror object should be drawn as the last. */ void EffectMirror::blit(SDL_Surface *screen, SDL_Surface *surface, int x, int y) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/gengine/Dialog.cpp new/fillets-ng-0.8.0/src/gengine/Dialog.cpp --- old/fillets-ng-0.7.4/src/gengine/Dialog.cpp 2004-09-25 17:38:58.000000000 +0200 +++ new/fillets-ng-0.8.0/src/gengine/Dialog.cpp 2007-06-30 16:48:05.000000000 +0200 @@ -86,7 +86,7 @@ int Dialog::getMinTime() const { - return min(180, m_subtitle.size()); + return min(180, StringTool::utf8Length(m_subtitle)); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/gengine/StringTool.cpp new/fillets-ng-0.8.0/src/gengine/StringTool.cpp --- old/fillets-ng-0.7.4/src/gengine/StringTool.cpp 2004-08-18 23:37:41.000000000 +0200 +++ new/fillets-ng-0.8.0/src/gengine/StringTool.cpp 2007-06-30 16:55:12.000000000 +0200 @@ -98,3 +98,23 @@ return args; } +//----------------------------------------------------------------- +/** + * Return number of Unicode entities inside given UTF-8 text. + */ + int +StringTool::utf8Length(const std::string &str) { + int length = 0; + const char *p = str.c_str(); + char c; + // How to recognize entity: + // Unicode entities start with 0xxxxxxx or 11xxxxxx, + // the other bytes start with 10xxxxxx. + // (thanks to Egmont Koblinger) + while ((c = *p++) != 0) { + if ((c & 0xC0) != 0x80) { + length++; + } + } + return length; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/gengine/StringTool.h new/fillets-ng-0.8.0/src/gengine/StringTool.h --- old/fillets-ng-0.7.4/src/gengine/StringTool.h 2004-08-18 23:36:54.000000000 +0200 +++ new/fillets-ng-0.8.0/src/gengine/StringTool.h 2007-06-30 16:46:33.000000000 +0200 @@ -19,6 +19,7 @@ static void replace(std::string &buffer, const std::string &pattern, const std::string &newstring); static t_args split(const std::string &str, char separator); + static int utf8Length(const std::string &str); }; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/Controls.cpp new/fillets-ng-0.8.0/src/level/Controls.cpp --- old/fillets-ng-0.7.4/src/level/Controls.cpp 2004-11-19 00:06:48.000000000 +0100 +++ new/fillets-ng-0.8.0/src/level/Controls.cpp 2007-12-18 21:15:41.000000000 +0100 @@ -152,7 +152,7 @@ } if (moved != ControlSym::SYM_NONE) { - m_moves.push_back(moved); + m_moves.append(1, moved); } return (moved != ControlSym::SYM_NONE); } @@ -281,6 +281,34 @@ return false; } //----------------------------------------------------------------- + void +Controls::setMoves(const std::string &moves) +{ + m_moves = moves; + if (!m_moves.empty()) { + activateDriven(m_moves[m_moves.size() - 1]); + } +} +//----------------------------------------------------------------- +/** + * Activate fish driven by given symbol. + * @param symbol one of fish symbols + * @return true when fish was selected + */ +bool +Controls::activateDriven(char symbol) +{ + t_units::iterator end = m_units.end(); + for (t_units::iterator i = m_units.begin(); i != end; ++i) { + if ((*i)->isDrivenBy(symbol)) { + m_active = i; + m_switch = true; + return true; + } + } + return false; +} +//----------------------------------------------------------------- /** * Change active unit. * NOTE: change is without switch animation @@ -305,7 +333,7 @@ for (t_units::iterator i = m_units.begin(); i != end; ++i) { if ((*i)->driveOrder(move) == move) { setActive(i); - m_moves.push_back(move); + m_moves.append(1, move); return true; } } @@ -339,5 +367,19 @@ } return result; } +//----------------------------------------------------------------- +/** + * Returns true when active fish is doing a dangerous move. + */ +bool +Controls::isDangerousMove() const +{ + bool result = false; + if (m_active != m_units.end()) { + result = (*m_active)->isPushing() + || (*m_active)->isMovingDown(); + } + return result; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/Controls.h new/fillets-ng-0.8.0/src/level/Controls.h --- old/fillets-ng-0.7.4/src/level/Controls.h 2004-11-18 23:58:16.000000000 +0100 +++ new/fillets-ng-0.8.0/src/level/Controls.h 2007-12-15 14:24:45.000000000 +0100 @@ -36,9 +36,11 @@ bool driveUnit(const InputProvider *input); void setActive(t_units::iterator active); int getNeededPhases(int speedup) const; + bool activateDriven(char symbol); public: Controls(PhaseLocker *locker); ~Controls(); + void setMoves(const std::string &moves); void addUnit(Unit *unit); const Unit *getActive(); @@ -56,6 +58,7 @@ virtual int getStepCount() const { return m_moves.size(); } virtual std::string getMoves() const { return m_moves; } virtual bool isPowerful() const; + virtual bool isDangerousMove() const; }; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/Cube.cpp new/fillets-ng-0.8.0/src/level/Cube.cpp --- old/fillets-ng-0.7.4/src/level/Cube.cpp 2004-09-07 13:17:44.000000000 +0200 +++ new/fillets-ng-0.8.0/src/level/Cube.cpp 2007-12-01 17:34:43.000000000 +0100 @@ -97,11 +97,16 @@ return m_rules->getDir(); } //----------------------------------------------------------------- +/** + * Set params for special 'output_DIR' model. + * Used just for the 'spuntik' in windoze level. + */ void -Cube::setOutDir(Dir::eDir dir) +Cube::setOutDir(Dir::eDir dir, int capacity, eWeight weight) { - m_outCapacity = 2; + m_outCapacity = capacity; m_outDir = dir; + m_weight = weight; } //----------------------------------------------------------------- /** @@ -116,6 +121,7 @@ if (m_outCapacity == 0) { m_outDir = Dir::DIR_NO; m_weight = LIGHT; + m_outCapacity = -1; } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/Cube.h new/fillets-ng-0.8.0/src/level/Cube.h --- old/fillets-ng-0.7.4/src/level/Cube.h 2004-10-08 21:25:42.000000000 +0200 +++ new/fillets-ng-0.8.0/src/level/Cube.h 2007-12-01 17:34:44.000000000 +0100 @@ -63,7 +63,7 @@ void change_goOut(); void change_remove(); void change_turnSide(); - void change_setLocation(V2 loc) { m_loc = loc; } + void change_setLocation(const V2 &loc) { m_loc = loc; } V2 getLocation() const { return m_loc; } bool isAlive() const { return m_alive; } @@ -81,7 +81,10 @@ Dir::eDir getLastMoveDir() const; bool isOutDir(Dir::eDir dir) const { return m_outDir == dir; } - void setOutDir(Dir::eDir outDir); + Dir::eDir getOutDir() { return m_outDir; } + int getOutCapacity() { return m_outCapacity; } + void setOutDir(Dir::eDir outDir, + int capacity=2, eWeight weight=Cube::FIXED); void decOutCapacity(); bool isTalking() const; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/Field.cpp new/fillets-ng-0.8.0/src/level/Field.cpp --- old/fillets-ng-0.7.4/src/level/Field.cpp 2004-09-14 14:35:41.000000000 +0200 +++ new/fillets-ng-0.8.0/src/level/Field.cpp 2007-09-28 16:37:58.000000000 +0200 @@ -66,15 +66,20 @@ /** * Mark this location as occupied by model. * Locations out of field will not be filled. + * @param loc write location + * @param model model to put on given location + * @param toOverride allowed model to overwrite or NULL */ void -Field::setModel(const V2 &loc, Cube *model) +Field::setModel(const V2 &loc, Cube *model, Cube *toOverride) { int x = loc.getX(); int y = loc.getY(); if ((0 <= x && x < m_w) && (0 <= y && y < m_h)) { - m_marks[y][x] = model; + if (toOverride == NULL || m_marks[y][x] == toOverride) { + m_marks[y][x] = model; + } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/Field.h new/fillets-ng-0.8.0/src/level/Field.h --- old/fillets-ng-0.7.4/src/level/Field.h 2004-09-10 14:49:41.000000000 +0200 +++ new/fillets-ng-0.8.0/src/level/Field.h 2007-09-28 16:38:08.000000000 +0200 @@ -23,7 +23,7 @@ int getH() const { return m_h; } Cube *getModel(const V2 &loc); - void setModel(const V2 &loc, Cube *model); + void setModel(const V2 &loc, Cube *model, Cube *toOverride); }; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/game-script.cpp new/fillets-ng-0.8.0/src/level/game-script.cpp --- old/fillets-ng-0.7.4/src/level/game-script.cpp 2006-11-30 12:23:51.000000000 +0100 +++ new/fillets-ng-0.8.0/src/level/game-script.cpp 2007-12-01 17:35:04.000000000 +0100 @@ -584,6 +584,24 @@ } //----------------------------------------------------------------- /** + * void model_change_setLocation(model_index, x, y) + * Change model position (used to load undo). + */ + int +script_model_change_setLocation(lua_State *L) throw() +{ + BEGIN_NOEXCEPTION; + int model_index = luaL_checkint(L, 1); + int x = luaL_checkint(L, 2); + int y = luaL_checkint(L, 3); + Cube *model = getModel(L, model_index); + model->rules()->change_setLocation(V2(x, y)); + + END_NOEXCEPTION; + return 0; +} +//----------------------------------------------------------------- +/** * void model_setViewShift(model_index, shift_x, shift_y) * Shift view (used for obsolete animation effects). */ @@ -634,6 +652,72 @@ END_NOEXCEPTION; return 0; } +//----------------------------------------------------------------- +/** + * table model_getExtraParams(model_index) + * + * Returns extra parameters needed to restore after undo. + */ + int +script_model_getExtraParams(lua_State *L) throw() +{ + BEGIN_NOEXCEPTION; + int model_index = luaL_checkint(L, 1); + Cube *model = getModel(L, model_index); + + if (model->getOutCapacity() != 0) { + lua_newtable(L); + lua_pushstring(L, "outDir"); + lua_pushnumber(L, model->getOutDir()); + lua_settable(L, -3); + + lua_pushstring(L, "outCapacity"); + lua_pushnumber(L, model->getOutCapacity()); + lua_settable(L, -3); + + lua_pushstring(L, "weight"); + lua_pushnumber(L, model->getWeight()); + lua_settable(L, -3); + } + else { + lua_pushnil(L); + } + + END_NOEXCEPTION; + return 1; +} +//----------------------------------------------------------------- +/** + * void model_change_setExtraParams(model_index, table) + * + * Restores extra parameters after undo. + */ + int +script_model_change_setExtraParams(lua_State *L) throw() +{ + BEGIN_NOEXCEPTION; + int model_index = luaL_checkint(L, 1); + + if (!lua_isnil(L, 2)) { + lua_pushstring(L, "outDir"); + lua_gettable(L, 2); + int outDir = luaL_checkint(L, -1); + + lua_pushstring(L, "outCapacity"); + lua_gettable(L, 2); + int outCapacity = luaL_checkint(L, -1); + + lua_pushstring(L, "weight"); + lua_gettable(L, 2); + int weight = luaL_checkint(L, -1); + + Cube *model = getModel(L, model_index); + model->setOutDir((Dir::eDir)outDir, outCapacity, (Cube::eWeight)weight); + } + + END_NOEXCEPTION; + return 0; +} //----------------------------------------------------------------- /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/game-script.h new/fillets-ng-0.8.0/src/level/game-script.h --- old/fillets-ng-0.7.4/src/level/game-script.h 2004-09-24 22:35:15.000000000 +0200 +++ new/fillets-ng-0.8.0/src/level/game-script.h 2007-09-28 22:33:40.000000000 +0200 @@ -33,9 +33,12 @@ extern int script_model_getH(lua_State *L) throw(); extern int script_model_setGoal(lua_State *L) throw(); extern int script_model_change_turnSide(lua_State *L) throw(); +extern int script_model_change_setLocation(lua_State *L) throw(); extern int script_model_setViewShift(lua_State *L) throw(); extern int script_model_getViewShift(lua_State *L) throw(); extern int script_model_setBusy(lua_State *L) throw(); +extern int script_model_getExtraParams(lua_State *L) throw(); +extern int script_model_change_setExtraParams(lua_State *L) throw(); extern int script_model_equals(lua_State *L) throw(); extern int script_sound_addSound(lua_State *L) throw(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/LevelCountDown.cpp new/fillets-ng-0.8.0/src/level/LevelCountDown.cpp --- old/fillets-ng-0.7.4/src/level/LevelCountDown.cpp 2004-11-19 00:08:44.000000000 +0100 +++ new/fillets-ng-0.8.0/src/level/LevelCountDown.cpp 2007-09-24 19:50:47.000000000 +0200 @@ -42,7 +42,7 @@ //----------------------------------------------------------------- /** * Countdown to zero. - * @param advisor advisor which known usable coundown values + * @param advisor advisor which know usable coundown values * @return true when counter is at zero */ bool diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/Level.cpp new/fillets-ng-0.8.0/src/level/Level.cpp --- old/fillets-ng-0.7.4/src/level/Level.cpp 2006-11-30 12:05:48.000000000 +0100 +++ new/fillets-ng-0.8.0/src/level/Level.cpp 2007-12-15 14:19:05.000000000 +0100 @@ -46,6 +46,7 @@ { m_desc = NULL; m_restartCounter = 1; + m_insideUndo = false; m_depth = depth; m_newRound = false; m_locker = new PhaseLocker(); @@ -211,6 +212,29 @@ } //----------------------------------------------------------------- /** + * Save state for undo. + * Should be called after a player move, + * but still before level script update. + * @param oldMoves moves before the last move + */ + void +Level::saveUndo(const std::string &oldMoves) +{ + if (oldMoves.empty()) { + return; + } + + if (m_levelScript->isRoom()) { + Room *room = m_levelScript->room(); + bool forceSave = room->stepCounter()->isDangerousMove(); + + std::string forceSaveValue = forceSave ? "true" : "false"; + m_levelScript->scriptDo("script_saveUndo(\"" + + oldMoves + "\"," + forceSaveValue + ")"); + } +} +//----------------------------------------------------------------- +/** * Finish complete level. * Save solution. */ @@ -240,7 +264,15 @@ Level::nextPlayerAction() { if (m_levelScript->isRoom()) { - m_levelScript->room()->nextRound(getInput()); + Room *room = m_levelScript->room(); + bool wasSolvable = room->isSolvable(); + std::string oldMoves = room->stepCounter()->getMoves(); + room->nextRound(getInput()); + + unsigned int stepsAfter = room->stepCounter()->getStepCount(); + if (wasSolvable && stepsAfter != oldMoves.size()) { + saveUndo(oldMoves); + } } } @@ -293,7 +325,14 @@ void Level::loadGame(const std::string &moves) { - m_loading->loadGame(moves); + if (m_insideUndo) { + if (m_levelScript->isRoom()) { + m_levelScript->room()->setMoves(moves); + } + } + else { + m_loading->loadGame(moves); + } } //----------------------------------------------------------------- /** @@ -341,8 +380,8 @@ { own_cleanState(); m_restartCounter++; - //TODO: is ok to run the script on second time? - //NOTE: planned show remains after restart + //NOTE: The script is just overridden by itself, + // so planned shows and undo remain after restart. own_initState(); return true; } @@ -387,6 +426,7 @@ m_restartCounter--; action_restart(); m_levelScript->scriptInclude(file); + m_insideUndo = false; m_levelScript->scriptDo("script_load()"); } else { @@ -395,7 +435,22 @@ } return true; } +//----------------------------------------------------------------- +/** + * Naive undo by reloading the level. + */ + bool +Level::action_undo() +{ + if (m_levelScript->isRoom()) { + m_restartCounter--; + action_restart(); + m_insideUndo = true; + m_levelScript->scriptDo("script_loadUndo()"); + } + return true; +} //----------------------------------------------------------------- void Level::switchFish() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/Level.h new/fillets-ng-0.8.0/src/level/Level.h --- old/fillets-ng-0.7.4/src/level/Level.h 2004-09-10 22:17:00.000000000 +0200 +++ new/fillets-ng-0.8.0/src/level/Level.h 2007-12-09 19:14:53.000000000 +0100 @@ -42,12 +42,14 @@ LevelCountDown *m_countdown; CommandQueue *m_show; int m_restartCounter; + bool m_insideUndo; MultiDrawer *m_background; StatusDisplay *m_statusDisplay; private: void initScreen(); void nextAction(); void updateLevel(); + void saveUndo(const std::string &oldMoves); void finishLevel(); void nextLoadAction(); void nextShowAction(); @@ -77,6 +79,7 @@ bool action_move(char symbol); bool action_save(); bool action_load(); + bool action_undo(); void switchFish(); void controlEvent(const KeyStroke &stroke); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/LevelInput.cpp new/fillets-ng-0.8.0/src/level/LevelInput.cpp --- old/fillets-ng-0.7.4/src/level/LevelInput.cpp 2005-04-17 12:23:19.000000000 +0200 +++ new/fillets-ng-0.8.0/src/level/LevelInput.cpp 2007-09-04 21:04:46.000000000 +0200 @@ -30,6 +30,10 @@ KeyDesc(KEY_RESTART, "restart")); m_keymap->registerKey(KeyStroke(SDLK_F5, KMOD_NONE), KeyDesc(KEY_SHOW_STEPS, "show number of steps")); + + KeyDesc undo = KeyDesc(KEY_UNDO, "undo"); + m_keymap->registerKey(KeyStroke(SDLK_MINUS, KMOD_NONE), undo); + m_keymap->registerKey(KeyStroke(SDLK_KP_MINUS, KMOD_NONE), undo); } //----------------------------------------------------------------- Level * @@ -60,6 +64,10 @@ getLevel()->interruptShow(); getLevel()->action_restart(); break; + case KEY_UNDO: + getLevel()->interruptShow(); + getLevel()->action_undo(); + break; case KEY_SHOW_STEPS: toggleParam("show_steps"); break; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/LevelInput.h new/fillets-ng-0.8.0/src/level/LevelInput.h --- old/fillets-ng-0.7.4/src/level/LevelInput.h 2004-09-27 01:50:06.000000000 +0200 +++ new/fillets-ng-0.8.0/src/level/LevelInput.h 2007-09-04 21:02:41.000000000 +0200 @@ -16,7 +16,8 @@ static const int KEY_SAVE = 102; static const int KEY_LOAD = 103; static const int KEY_RESTART = 104; - static const int KEY_SHOW_STEPS = 105; + static const int KEY_UNDO = 105; + static const int KEY_SHOW_STEPS = 106; private: Level *getLevel(); protected: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/LevelLoading.h new/fillets-ng-0.8.0/src/level/LevelLoading.h --- old/fillets-ng-0.7.4/src/level/LevelLoading.h 2004-08-25 21:21:30.000000000 +0200 +++ new/fillets-ng-0.8.0/src/level/LevelLoading.h 2007-09-04 21:56:29.000000000 +0200 @@ -21,6 +21,7 @@ RoomAccess *m_access; public: LevelLoading(RoomAccess *access); + void setLoadSpeed(int loadSpeed) { m_loadSpeed = loadSpeed; } void reset(); void loadGame(const std::string &moves); void loadReplay(const std::string &moves); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/LevelScript.cpp new/fillets-ng-0.8.0/src/level/LevelScript.cpp --- old/fillets-ng-0.7.4/src/level/LevelScript.cpp 2004-10-08 21:27:56.000000000 +0200 +++ new/fillets-ng-0.8.0/src/level/LevelScript.cpp 2007-09-28 22:33:39.000000000 +0200 @@ -145,11 +145,16 @@ m_script->registerFunc("model_setGoal", script_model_setGoal); m_script->registerFunc("model_change_turnSide", script_model_change_turnSide); + m_script->registerFunc("model_change_setLocation", + script_model_change_setLocation); m_script->registerFunc("model_setViewShift", script_model_setViewShift); m_script->registerFunc("model_getViewShift", script_model_getViewShift); m_script->registerFunc("model_setBusy", script_model_setBusy); + m_script->registerFunc("model_getExtraParams", script_model_getExtraParams); + m_script->registerFunc("model_change_setExtraParams", + script_model_change_setExtraParams); m_script->registerFunc("model_equals", script_model_equals); m_script->registerFunc("sound_addSound", script_sound_addSound); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/MarkMask.cpp new/fillets-ng-0.8.0/src/level/MarkMask.cpp --- old/fillets-ng-0.7.4/src/level/MarkMask.cpp 2004-09-10 15:49:28.000000000 +0200 +++ new/fillets-ng-0.8.0/src/level/MarkMask.cpp 2007-09-28 16:38:54.000000000 +0200 @@ -70,7 +70,7 @@ void MarkMask::mask() { - writeModel(m_model); + writeModel(m_model, NULL); } //----------------------------------------------------------------- /** @@ -79,18 +79,18 @@ void MarkMask::unmask() { - writeModel(NULL); + writeModel(NULL, m_model); } //----------------------------------------------------------------- void -MarkMask::writeModel(Cube *model) +MarkMask::writeModel(Cube *model, Cube *toOverride) { V2 loc = m_model->getLocation(); const Shape *shape = m_model->shape(); Shape::const_iterator end = shape->marksEnd(); for (Shape::const_iterator i = shape->marksBegin(); i != end; ++i) { V2 mark = loc.plus(*i); - m_field->setModel(mark, model); + m_field->setModel(mark, model, toOverride); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/MarkMask.h new/fillets-ng-0.8.0/src/level/MarkMask.h --- old/fillets-ng-0.7.4/src/level/MarkMask.h 2004-09-10 15:34:52.000000000 +0200 +++ new/fillets-ng-0.8.0/src/level/MarkMask.h 2007-09-28 16:39:00.000000000 +0200 @@ -16,7 +16,7 @@ Cube *m_model; Field *m_field; private: - void writeModel(Cube *model); + void writeModel(Cube *model, Cube *toOverride); bool isBorderDir(Dir::eDir dir) const; bool isInRoom() const; public: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/Room.cpp new/fillets-ng-0.8.0/src/level/Room.cpp --- old/fillets-ng-0.7.4/src/level/Room.cpp 2005-03-13 03:11:55.000000000 +0100 +++ new/fillets-ng-0.8.0/src/level/Room.cpp 2007-12-09 19:40:17.000000000 +0100 @@ -347,6 +347,12 @@ } //----------------------------------------------------------------- void +Room::setMoves(const std::string &moves) +{ + m_controls->setMoves(moves); +} +//----------------------------------------------------------------- + void Room::checkActive() { return m_controls->checkActive(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/Room.h new/fillets-ng-0.8.0/src/level/Room.h --- old/fillets-ng-0.7.4/src/level/Room.h 2004-11-19 00:07:52.000000000 +0100 +++ new/fillets-ng-0.8.0/src/level/Room.h 2007-09-28 20:46:40.000000000 +0200 @@ -75,6 +75,7 @@ void checkActive(); void unBusyUnits(); const StepCounter *stepCounter() const; + void setMoves(const std::string &moves); int getW() const; int getH() const; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/Rules.cpp new/fillets-ng-0.8.0/src/level/Rules.cpp --- old/fillets-ng-0.7.4/src/level/Rules.cpp 2006-11-30 18:31:20.000000000 +0100 +++ new/fillets-ng-0.8.0/src/level/Rules.cpp 2007-12-09 19:37:42.000000000 +0100 @@ -95,6 +95,24 @@ } //----------------------------------------------------------------- /** + * Force model to a new position. + * Used just for undo loading. + */ + void +Rules::change_setLocation(const V2 &loc) +{ + m_mask->unmask(); + //HACK: model.out flag is recognized by its location + if (loc.getX() < 0 && loc.getY() < 0) { + m_model->change_goOut(); + } + else { + m_model->change_setLocation(loc); + m_mask->mask(); + } +} +//----------------------------------------------------------------- +/** * Check dead fishes. * Fish is dead: * - when any model moves in dir != Dir::DIR_UP @@ -511,7 +529,7 @@ //----------------------------------------------------------------- /** * There is one special case. - * When model touch output_DIR then it goes out. + * When model touches output_DIR then it goes out. * This is used only in level 'windoze'. */ bool diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/Rules.h new/fillets-ng-0.8.0/src/level/Rules.h --- old/fillets-ng-0.7.4/src/level/Rules.h 2004-09-14 16:01:00.000000000 +0200 +++ new/fillets-ng-0.8.0/src/level/Rules.h 2007-12-01 16:20:42.000000000 +0100 @@ -52,6 +52,7 @@ Rules(Cube *model); ~Rules(); void takeField(Field *field); + void change_setLocation(const V2 &loc); void occupyNewPos(); bool checkDead(Cube::eAction lastAction); @@ -73,6 +74,7 @@ bool isAtBorder() const; bool isFreePlace(const V2 &loc) const; const Cube::t_models getResist(Dir::eDir dir) const; + bool isPushing() const { return m_pushing; }; }; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/StepCounter.h new/fillets-ng-0.8.0/src/level/StepCounter.h --- old/fillets-ng-0.7.4/src/level/StepCounter.h 2004-11-18 23:54:06.000000000 +0100 +++ new/fillets-ng-0.8.0/src/level/StepCounter.h 2007-12-15 14:24:59.000000000 +0100 @@ -12,6 +12,7 @@ virtual int getStepCount() const = 0; virtual std::string getMoves() const = 0; virtual bool isPowerful() const = 0; + virtual bool isDangerousMove() const = 0; }; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/Unit.cpp new/fillets-ng-0.8.0/src/level/Unit.cpp --- old/fillets-ng-0.7.4/src/level/Unit.cpp 2004-11-18 23:57:38.000000000 +0100 +++ new/fillets-ng-0.8.0/src/level/Unit.cpp 2007-12-15 14:25:22.000000000 +0100 @@ -236,6 +236,12 @@ } //----------------------------------------------------------------- bool +Unit::isMovingDown() const +{ + return m_model->rules()->getDir() == Dir::DIR_DOWN; +} +//----------------------------------------------------------------- +bool Unit::isTurning() const { std::string action = m_model->rules()->getAction(); @@ -245,7 +251,16 @@ bool Unit::isPushing() const { - return m_model->rules()->getState() == "pushing"; + return m_model->rules()->isPushing(); +} +//----------------------------------------------------------------- +bool +Unit::isDrivenBy(char symbol) const +{ + return m_symbols.getLeft() == symbol + || m_symbols.getRight() == symbol + || m_symbols.getUp() == symbol + || m_symbols.getDown() == symbol; } //----------------------------------------------------------------- /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/level/Unit.h new/fillets-ng-0.8.0/src/level/Unit.h --- old/fillets-ng-0.7.4/src/level/Unit.h 2004-11-18 23:57:46.000000000 +0100 +++ new/fillets-ng-0.8.0/src/level/Unit.h 2007-12-15 14:24:05.000000000 +0100 @@ -45,8 +45,10 @@ char driveOrder(char move); bool isMoving() const; + bool isMovingDown() const; bool isTurning() const; bool isPushing() const; + bool isDrivenBy(char symbol) const; bool equalsModel(const Cube *other) const; V2 getLoc() const; int getW() const; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/plan/ConsoleInput.cpp new/fillets-ng-0.8.0/src/plan/ConsoleInput.cpp --- old/fillets-ng-0.7.4/src/plan/ConsoleInput.cpp 2005-04-17 12:23:19.000000000 +0200 +++ new/fillets-ng-0.8.0/src/plan/ConsoleInput.cpp 2007-12-18 21:15:08.000000000 +0100 @@ -95,7 +95,7 @@ char c = stroke.getUnicode() & 0x7F; if (isprint(c)) { std::string input = getConsole()->getInput(); - input.push_back(c); + input.append(1, c); getConsole()->setInput(input); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fillets-ng-0.7.4/src/plan/Title.cpp new/fillets-ng-0.8.0/src/plan/Title.cpp --- old/fillets-ng-0.7.4/src/plan/Title.cpp 2005-08-21 00:33:23.000000000 +0200 +++ new/fillets-ng-0.8.0/src/plan/Title.cpp 2007-06-30 17:23:45.000000000 +0200 @@ -11,6 +11,7 @@ #include "Font.h" #include "Color.h" #include "OptionAgent.h" +#include "StringTool.h" //----------------------------------------------------------------- /** @@ -41,7 +42,7 @@ m_y = m_screenH - baseY; m_finalY = m_screenH - finalY; m_limitY = m_screenH - limitY; - m_mintime = m_content.size() * TIME_PER_CHAR; + m_mintime = StringTool::utf8Length(m_content) * TIME_PER_CHAR; if (m_mintime < TIME_MIN) { m_mintime = TIME_MIN; } ++++++ fillets-ng-0.8.0-undeclared.patch ++++++ Index: src/gengine/OptionAgent.cpp =================================================================== --- src/gengine/OptionAgent.cpp.orig +++ src/gengine/OptionAgent.cpp @@ -25,6 +25,7 @@ #include <string.h> //strlen #include <locale.h> //setlocale +#include <cstdlib> //getenv #ifndef LC_MESSAGES #define LC_MESSAGES LC_CTYPE Index: src/gengine/StringTool.cpp =================================================================== --- src/gengine/StringTool.cpp.orig +++ src/gengine/StringTool.cpp @@ -7,7 +7,7 @@ * (at your option) any later version. */ #include "StringTool.h" - +#include <stdlib.h> #include <sstream> //----------------------------------------------------------------- Index: src/level/Landslip.cpp =================================================================== --- src/level/Landslip.cpp.orig +++ src/level/Landslip.cpp @@ -6,6 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ +#include <string.h> #include "Landslip.h" #include "Rules.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 dhcpv6
by root＠Hilbert.suse.de 30 Jan '08

30 Jan '08

Hello community, here is the log from the commit of package dhcpv6 checked in at Wed Jan 30 18:05:58 CET 2008. -------- --- dhcpv6/dhcpv6.changes 2008-01-14 13:30:24.000000000 +0100 +++ dhcpv6/dhcpv6.changes 2008-01-30 16:32:33.148282000 +0100 @@ -1,0 +2,8 @@ +Wed Jan 30 16:30:37 CET 2008 - kkeil(a)suse.de + +- update to 1.0.10 + * build fix for ia64 + * minor bugfixes + * License clarification: LGPLv2 + +------------------------------------------------------------------- Old: ---- dhcpv6-1.0.4-cmd.patch dhcpv6-1.0.4-destdir.patch dhcpv6-1.0.4-fixes.patch dhcpv6-1.0.4.tar.bz2 New: ---- dhcpv6-1.0.10-cmd.patch dhcpv6-1.0.10-destdir.patch dhcpv6-1.0.10-fixes.patch dhcpv6-1.0.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcpv6.spec ++++++ --- /var/tmp/diff_new_pack.o10036/_old 2008-01-30 18:04:27.000000000 +0100 +++ /var/tmp/diff_new_pack.o10036/_new 2008-01-30 18:04:27.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package dhcpv6 (Version 1.0.4) +# spec file for package dhcpv6 (Version 1.0.10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,10 +14,10 @@ BuildRequires: bison flex linux-kernel-headers openssl-devel Url: http://dcantrel.fedorapeople.org/dhcpv6/ %define prefix /usr -License: BSD 3-Clause +License: BSD 3-Clause; LGPL v2.1 or later Group: Productivity/Networking/System Summary: DHCP Client and Server for IPv6 -Version: 1.0.4 +Version: 1.0.10 Release: 1 Source0: %{name}-%{version}.tar.bz2 Source1: dhcp6c_update.sh @@ -154,49 +154,54 @@ %{_libdir}/libdhcp6client-1.0.so.* %changelog -* Mon Jan 14 2008 - kkeil(a)suse.de +* Wed Jan 30 2008 kkeil(a)suse.de +- update to 1.0.10 + * build fix for ia64 + * minor bugfixes + * License clarification: LGPLv2 +* Mon Jan 14 2008 kkeil(a)suse.de - rename to dhcpv6 to follow mainline name convention -* Fri Jan 11 2008 - kkeil(a)suse.de +* Fri Jan 11 2008 kkeil(a)suse.de - update to version 1.0.4 (Fate 303301) -* Thu Mar 29 2007 - meissner(a)suse.de +* Thu Mar 29 2007 meissner(a)suse.de - buildrequires flex,bison -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Wed Jan 18 2006 - schwab(a)suse.de +* Wed Jan 18 2006 schwab(a)suse.de - Don't strip binaries. - Don't build as root. -* Fri Nov 18 2005 - meissner(a)suse.de +* Fri Nov 18 2005 meissner(a)suse.de - no strict aliasing. -* Fri Oct 14 2005 - meissner(a)suse.de +* Fri Oct 14 2005 meissner(a)suse.de - fixed build. -* Wed May 12 2004 - okir(a)suse.de +* Wed May 12 2004 okir(a)suse.de - use new IANA assigned numbers for dhcp6 (#40438) -* Wed Apr 21 2004 - meissner(a)suse.de +* Wed Apr 21 2004 meissner(a)suse.de - missing argument to dprintf added, spotted by compiler warning checks. -* Tue Mar 16 2004 - meissner(a)suse.de +* Tue Mar 16 2004 meissner(a)suse.de - Upgraded to 0.10. Fixed all important warnings and bugs from upstream. -* Fri Aug 22 2003 - meissner(a)suse.de +* Fri Aug 22 2003 meissner(a)suse.de - Upgraded to 0.85, added unsigned int configuration parse patch. -* Wed Jun 11 2003 - meissner(a)suse.de +* Wed Jun 11 2003 meissner(a)suse.de - Upgraded to 0.8, dropped some of the old patches. -* Mon May 05 2003 - meissner(a)suse.de +* Mon May 05 2003 meissner(a)suse.de - Updated to 0.6, redid patches. -* Wed Apr 02 2003 - kukuk(a)suse.de +* Wed Apr 02 2003 kukuk(a)suse.de - Remove libinet6 - Fix compiler warnings for x86-64 -* Wed Mar 26 2003 - okir(a)suse.de +* Wed Mar 26 2003 okir(a)suse.de - backed out the previous patch as per request from Venkata - it's not required -* Mon Mar 24 2003 - okir(a)suse.de +* Mon Mar 24 2003 okir(a)suse.de - dhcp6 client: drop the address if server returns UNSPECFAIL (#25782) -* Thu Mar 20 2003 - kukuk(a)suse.de +* Thu Mar 20 2003 kukuk(a)suse.de - Fix last patch -* Wed Mar 19 2003 - kukuk(a)suse.de +* Wed Mar 19 2003 kukuk(a)suse.de - Change /var/db -> /var/lib [Bug #25612] -* Fri Mar 14 2003 - meissner(a)suse.de +* Fri Mar 14 2003 meissner(a)suse.de - Updated to 0.3 version, adds prefix things. -* Tue Feb 25 2003 - meissner(a)suse.de +* Tue Feb 25 2003 meissner(a)suse.de - DHCP for ipv6, first revision. (from sourceforge, adapted to USAGI headers) ++++++ dhcpv6-1.0.4-cmd.patch -> dhcpv6-1.0.10-cmd.patch ++++++ ++++++ dhcpv6-1.0.4-destdir.patch -> dhcpv6-1.0.10-destdir.patch ++++++ ++++++ dhcpv6-1.0.4-fixes.patch -> dhcpv6-1.0.10-fixes.patch ++++++ --- dhcpv6/dhcpv6-1.0.4-fixes.patch 2008-01-11 19:52:48.000000000 +0100 +++ dhcpv6/dhcpv6-1.0.10-fixes.patch 2008-01-30 16:28:44.117535000 +0100 @@ -1,7 +1,7 @@ -Index: dhcpv6-1.0.4/src/lease_token.l +Index: dhcpv6-1.0.10/src/lease_token.l =================================================================== ---- dhcpv6-1.0.4.orig/src/lease_token.l -+++ dhcpv6-1.0.4/src/lease_token.l +--- dhcpv6-1.0.10.orig/src/lease_token.l ++++ dhcpv6-1.0.10/src/lease_token.l @@ -239,7 +239,7 @@ lease_parse(file) fseek(file, 0, 0); @@ -11,29 +11,60 @@ yy_start = 0; yylex(); return; -Index: dhcpv6-1.0.4/etc/init.d/dhcp6r.sh +Index: dhcpv6-1.0.10/src/common.c =================================================================== ---- dhcpv6-1.0.4.orig/etc/init.d/dhcp6r.sh -+++ dhcpv6-1.0.4/etc/init.d/dhcp6r.sh -@@ -5,7 +5,7 @@ - # Default-Start: - # Default-Stop: - # Should-Start: --# Required-Start: $network -+# Required-Start: $network $remote_fs - # Required-Stop: - # Short-Description: Start and stop the DHCPv6 relay agent - # Description: dhcp6r acts as a DHCPv6 relay agent forwarding DHCPv6 messages -Index: dhcpv6-1.0.4/etc/init.d/dhcp6s.sh +--- dhcpv6-1.0.10.orig/src/common.c ++++ dhcpv6-1.0.10/src/common.c +@@ -736,7 +736,7 @@ get_duid(const char *idfile, const char + goto fail; + } + } else { +- len = calculate_duid_len(ifname); ++ len = calculate_duid_len(ifname, &hwtype); + } + + memset(duid, 0, sizeof(*duid)); +@@ -794,10 +794,10 @@ int + save_duid(const char *idfile, const char *ifname, struct duid *duid) + { + FILE *fp = NULL; +- u_int16_t len = 0; ++ u_int16_t len = 0, hwtype; + + /* calculate DUID length */ +- len = calculate_duid_len(ifname); ++ len = calculate_duid_len(ifname, &hwtype); + + /* save the (new) ID to the file for next time */ + #ifdef LIBDHCP +@@ -835,14 +835,14 @@ save_duid(const char *idfile, const char + } + + u_int16_t +-calculate_duid_len(const char *ifname) ++calculate_duid_len(const char *ifname, u_int16_t *hwtype) + { + int l; +- u_int16_t ret = 0, hwtype; ++ u_int16_t ret = 0; + struct dhcp6_duid_type1 *dp; /* we only support the type1 DUID */ + unsigned char tmpbuf[256]; /* DUID should be no more than 256 bytes */ + +- if ((l = gethwid(tmpbuf, sizeof(tmpbuf), ifname, &hwtype)) < 0) { ++ if ((l = gethwid(tmpbuf, sizeof(tmpbuf), ifname, hwtype)) < 0) { + dprintf(LOG_INFO, "%s" + "failed to get a hardware address", FNAME); + return 0; +Index: dhcpv6-1.0.10/include/common.h =================================================================== ---- dhcpv6-1.0.4.orig/etc/init.d/dhcp6s.sh -+++ dhcpv6-1.0.4/etc/init.d/dhcp6s.sh -@@ -5,7 +5,7 @@ - # Default-Start: - # Default-Stop: - # Should-Start: --# Required-Start: $network -+# Required-Start: $network $remote_fs - # Required-Stop: - # Short-Description: Start and stop the DHCPv6 server agent - # Description: dhcp6s provides IPv6 addresses and prefix assignment +--- dhcpv6-1.0.10.orig/include/common.h ++++ dhcpv6-1.0.10/include/common.h +@@ -82,7 +82,7 @@ extern void dprintf __P((int, const char + + extern int get_duid __P((const char *, const char *, struct duid *)); + extern int save_duid __P((const char *, const char *, struct duid *)); +-extern u_int16_t calculate_duid_len __P((const char *)); ++extern u_int16_t calculate_duid_len __P((const char *, u_int16_t *)); + extern void dhcp6_init_options __P((struct dhcp6_optinfo *)); + extern void dhcp6_clear_options __P((struct dhcp6_optinfo *)); + extern int dhcp6_copy_options __P((struct dhcp6_optinfo *, ++++++ dhcpv6-1.0.4.tar.bz2 -> dhcpv6-1.0.10.tar.bz2 ++++++ ++++ 4302 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