Hello community, here is the log from the commit of package yast2-control-center checked in at Tue Apr 29 23:10:15 CEST 2008. -------- --- yast2-control-center/yast2-control-center.changes 2007-11-27 13:49:06.000000000 +0100 +++ yast2-control-center/yast2-control-center.changes 2008-04-29 23:09:26.349334000 +0200 @@ -2 +2,7 @@ -Tue Nov 27 13:39:45 CET 2007 - tgoettlicher@suse.de +Tue Apr 29 16:44:03 CEST 2008 - sh@suse.de + +- Fixed bnc #144694: Too low resolution for control center app icon +- V 2.16.1 + +------------------------------------------------------------------- +Tue Nov 27 13:41:45 CET 2007 - tgoettlicher@suse.de Old: ---- yast2-control-center-2.16.0.tar.bz2 New: ---- yast2-control-center-2.16.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-control-center.spec ++++++ --- /var/tmp/diff_new_pack.S32344/_old 2008-04-29 23:09:42.000000000 +0200 +++ /var/tmp/diff_new_pack.S32344/_new 2008-04-29 23:09:42.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package yast2-control-center (Version 2.16.0) +# spec file for package yast2-control-center (Version 2.16.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. # @@ -10,13 +10,14 @@ # norootforbuild + Name: yast2-control-center -Version: 2.16.0 +Version: 2.16.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-control-center-2.16.0.tar.bz2 +Source0: yast2-control-center-2.16.1.tar.bz2 Prefix: /usr BuildRequires: libdrm-devel libjpeg-devel pkgconfig qt3-devel update-desktop-files yast2-devtools Summary: YaST2 - Control Center @@ -30,6 +31,7 @@ %package qt +License: GPL v2 or later Summary: YaST2 - Control Center (Qt Version) Requires: yast2-control-center PreReq: yast2-control-center @@ -45,7 +47,7 @@ %prep -%setup -n yast2-control-center-2.16.0 +%setup -n yast2-control-center-2.16.1 %build %{prefix}/bin/y2tool y2autoconf @@ -78,355 +80,359 @@ %defattr(-,root,root) %{prefix}/lib/YaST2/bin/y2controlcenter %doc %{prefix}/share/doc/packages/yast2-control-center + %changelog -* Tue Nov 27 2007 - mvidner@suse.cz -- Make it build in a prefix different from /usr. -* Tue Nov 27 2007 - tgoettlicher@suse.de +* Tue Apr 29 2008 sh@suse.de +- Fixed bnc #144694: Too low resolution for control center app icon +- V 2.16.1 +* Tue Nov 27 2007 tgoettlicher@suse.de - V 2.16.0 -* Fri Oct 26 2007 - tgoettlicher@suse.de +* Tue Nov 27 2007 mvidner@suse.cz +- Make it build in a prefix different from /usr. +* Fri Oct 26 2007 tgoettlicher@suse.de - launch yast modules only when LMB is clicked (#332476) - V 2.15.7 -* Wed Oct 24 2007 - tgoettlicher@suse.de +* Wed Oct 24 2007 tgoettlicher@suse.de - fixed YaST control center shows empty section (#309452) - V 2.15.6 -* Wed Oct 24 2007 - tgoettlicher@suse.de +* Wed Oct 24 2007 tgoettlicher@suse.de - fixed pixelated icons in YaST navigation (left pane) (#308641) - V 2.15.5 -* Wed Aug 29 2007 - tgoettlicher@suse.de +* Wed Aug 29 2007 tgoettlicher@suse.de - controlcenter shows titlebar depending on existence of title-bar-gradient.png - r40572 - V 2.15.4 -* Fri Aug 24 2007 - sh@suse.de +* Fri Aug 24 2007 sh@suse.de - Added borders around group icons (bug #295712) - V 2.15.3 -* Fri Aug 24 2007 - sh@suse.de +* Fri Aug 24 2007 sh@suse.de - Don't show menu entry in desktops other than KDE or GNOME (won't run properly anyway without root permission which is a non-standard extension of the desktop file format) - V 2.15.2 -* Fri Aug 03 2007 - sh@suse.de +* Fri Aug 03 2007 sh@suse.de - V 2.15.1 - Fixed bug #274326: yast2-control-center-* needs PreReq: yast2-control-center -* Fri May 25 2007 - jsrain@suse.cz +* Fri May 25 2007 jsrain@suse.cz - removed outdated translations from .desktop-files (#271209) -* Wed Apr 25 2007 - sh@suse.de +* Wed Apr 25 2007 sh@suse.de - Fixed desktop-file-validate complaints in YaST.desktop: - Added 'Encoding=UTF-8' - Removed duplicate X-KDE-SustituteUID -* Thu Mar 29 2007 - sh@suse.de +* Thu Mar 29 2007 sh@suse.de - Use correct textdomain for warning popup if started as non-root -* Mon Mar 19 2007 - sh@suse.de +* Mon Mar 19 2007 sh@suse.de - Added split-provides (bug #255368) - V 2.15.5 -* Mon Mar 19 2007 - tgoettlicher@suse.de +* Mon Mar 19 2007 tgoettlicher@suse.de - Added support for saving log files via Shift-F8 (#225707) -* Mon Mar 05 2007 - sh@suse.de +* Mon Mar 05 2007 sh@suse.de - Package split (fix for bug #240240): - yast2-control-center with .desktop file and icon - yast2-control-center-qt with binary - V 2.14.4 -* Tue Feb 27 2007 - sh@suse.de +* Tue Feb 27 2007 sh@suse.de - No longer using "NotShowIn=GNOME" See also bug #247812: No YaST2 control center in GNOME - V 2.14.3 -* Fri Feb 16 2007 - sh@suse.de +* Fri Feb 16 2007 sh@suse.de - Fixed bug #246018: Typo in msg -* Tue Feb 13 2007 - sh@suse.de +* Tue Feb 13 2007 sh@suse.de - Fixed bug #240240: Added "NotShowIn=GNOME" to .desktop file - V 2.14.2 -* Fri Nov 10 2006 - sh@suse.de +* Fri Nov 10 2006 sh@suse.de - Merged SLE-10-SP1-Branch to trunk (-r31627:34246) - V 2.14.1 -* Mon Nov 06 2006 - sh@suse.de +* Mon Nov 06 2006 sh@suse.de - Fixed bug #217247: No contrast in categories list box - V 2.13.5 -* Thu Oct 26 2006 - sh@suse.de +* Thu Oct 26 2006 sh@suse.de - Fixed bug #213869: Missing ellipsis on "Search" button - V 2.13.4 -* Wed Oct 18 2006 - sh@suse.de +* Wed Oct 18 2006 sh@suse.de - Implemented feature #300460: Use gettext for module names - V 2.13.3 -* Wed Oct 18 2006 - sh@suse.de +* Wed Oct 18 2006 sh@suse.de - Implemented feature #300915: Increase Visibility of Search Function -* Tue May 02 2006 - sreeves@suse.de +* Tue May 02 2006 sreeves@suse.de - Fix for #170702 - add to Control Center. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Mon Nov 21 2005 - sh@suse.de +* Mon Nov 21 2005 sh@suse.de - V 2.13.2 - Reduced initial window size (less empty space) -* Mon Nov 14 2005 - sh@suse.de +* Mon Nov 14 2005 sh@suse.de - V 2.13.1 - Fixed bug #105481: Missing ellipsis in "Search..." menu entry -* Thu Sep 01 2005 - sh@suse.de +* Thu Sep 01 2005 sh@suse.de - V 2.12.4 - Fixed bug #114707: Added missing translation markers -* Fri Jun 10 2005 - sh@suse.de +* Fri Jun 10 2005 sh@suse.de - Fixed icon name in .desktop file - V 2.12.3 -* Thu May 19 2005 - sh@suse.de +* Thu May 19 2005 sh@suse.de - Made y2cc look more like a normal Qt application (upon eanderson's request): - Removed graphical title bar - Removed all buttons - Added menus - V 2.12.2 -* Tue Apr 05 2005 - sh@suse.de +* Tue Apr 05 2005 sh@suse.de - Merged 9.3-branch 21937:22910 to trunk - V 2.12.1 -* Wed Mar 16 2005 - sh@suse.de +* Wed Mar 16 2005 sh@suse.de - Fixed bug #71816: date-time module doesn't start after setting localtime - V 2.11.4 -* Fri Feb 18 2005 - visnov@suse.cz +* Fri Feb 18 2005 visnov@suse.cz - Follow "Hidden" attribute in the desktop files - V 2.11.3 -* Mon Nov 29 2004 - sh@suse.de +* Mon Nov 29 2004 sh@suse.de - Fixed autobuild error: No icon installed - V 2.11.2 -* Tue Nov 02 2004 - mvidner@suse.cz +* Tue Nov 02 2004 mvidner@suse.cz - Added pkgconfig to neededforbuild. - 2.11.1 -* Wed Oct 27 2004 - sh@suse.de +* Wed Oct 27 2004 sh@suse.de - Added support for LANG with country code (de_DE, zh_CN, ...), fall back to LANG without country (de, zh), then defaults (bug #47668) -* Thu Aug 26 2004 - sh@suse.de +* Thu Aug 26 2004 sh@suse.de - Bumped version to 2.10.1 -* Tue May 04 2004 - gs@suse.de +* Tue May 04 2004 gs@suse.de - messages from proof reading merged back -* Fri Apr 02 2004 - sh@suse.de +* Fri Apr 02 2004 sh@suse.de - License change to GPL -* Thu Apr 01 2004 - sh@suse.de +* Thu Apr 01 2004 sh@suse.de - V 2.9.10 - Added black horizontal line below title bar -* Thu Mar 25 2004 - sh@suse.de +* Thu Mar 25 2004 sh@suse.de - V 2.9.9 - Stole title bar layout from YQWizard (3 pics, not only 1) -* Tue Mar 23 2004 - sh@suse.de +* Tue Mar 23 2004 sh@suse.de - V 2.9.8 - Moved icons to yast2-theme - Changed icon paths to new yast2-theme paths -* Sat Mar 06 2004 - arvin@suse.de +* Sat Mar 06 2004 arvin@suse.de - added icon for uml installation -* Fri Mar 05 2004 - arvin@suse.de +* Fri Mar 05 2004 arvin@suse.de - added icon for installation into directory -* Mon Mar 01 2004 - sh@suse.de +* Mon Mar 01 2004 sh@suse.de - (adrian) added symlink for icons -* Thu Feb 26 2004 - msvec@suse.cz +* Thu Feb 26 2004 msvec@suse.cz - added power management icon (#35067) - 2.9.4 -* Thu Feb 05 2004 - sh@suse.de +* Thu Feb 05 2004 sh@suse.de - V 2.9.3 - Migration to multiple .desktop files for module groups, too (reading /usr/share/applications/YaST2/groups/*.desktop) -* Wed Jan 14 2004 - sh@suse.de +* Wed Jan 14 2004 sh@suse.de - V 2.9.2 - Migrated to .desktop files .y2cc files are now obsolete for YaST2 modules, the y2cc only needs y2cc.groups and the .desktop files -* Thu Jan 08 2004 - arvin@suse.de +* Thu Jan 08 2004 arvin@suse.de - dropped broken pre-start feature (bug #33860) -* Fri Sep 19 2003 - adrian@suse.de +* Fri Sep 19 2003 adrian@suse.de - V 2.8.10 - update babelfish icon and ldap_client icon -* Wed Sep 17 2003 - sh@suse.de +* Wed Sep 17 2003 sh@suse.de - V 2.8.9 - Fixed bug #30236: Bad fullscreen geometry for some window managers -* Thu Sep 11 2003 - adrian@suse.de +* Thu Sep 11 2003 adrian@suse.de - V 2.8.8 - update icons - call YaST with root password in menu -* Mon Sep 08 2003 - arvin@suse.de +* Mon Sep 08 2003 arvin@suse.de - updated icons -* Mon Sep 08 2003 - arvin@suse.de +* Mon Sep 08 2003 arvin@suse.de - updated icons -* Wed Sep 03 2003 - sh@suse.de +* Wed Sep 03 2003 sh@suse.de - V 2.8.5 - Added .desktop file -* Tue Aug 19 2003 - msvec@suse.cz +* Tue Aug 19 2003 msvec@suse.cz - added yast2-phone-services icons - 2.8.4 -* Tue Jun 17 2003 - arvin@suse.de +* Tue Jun 17 2003 arvin@suse.de - added directories to file list -* Thu Jun 12 2003 - sh@suse.de +* Thu Jun 12 2003 sh@suse.de - V 2.8.2 - Removed obsolete logcontrol (unpackaged anyway) -* Fri Mar 14 2003 - sh@suse.de +* Fri Mar 14 2003 sh@suse.de - New kerberos icon by Ken -* Wed Feb 19 2003 - sh@suse.de +* Wed Feb 19 2003 sh@suse.de - Fixed bug #23654: Window partially invisible -* Thu Feb 06 2003 - sh@suse.de +* Thu Feb 06 2003 sh@suse.de - V 2.7.1 - Added new command line options --fullscreen --noborder - Propagate those options to child processes -* Mon Jan 13 2003 - arvin@suse.de +* Mon Jan 13 2003 arvin@suse.de - remotechooser.ycp and remoteinstall.ycp move to yast2 package - use icon dsl.png for adsl and dsl -* Wed Sep 04 2002 - lslezak@suse.cz +* Wed Sep 04 2002 lslezak@suse.cz - added new backup.png and restore.png icon - version 2.6.14 -* Tue Sep 03 2002 - lnussel@suse.de +* Tue Sep 03 2002 lnussel@suse.de - new headline icon again - version 2.6.13 -* Mon Sep 02 2002 - lslezak@suse.cz +* Mon Sep 02 2002 lslezak@suse.cz - added new powertweak.png icon - version 2.6.12 -* Thu Aug 29 2002 - lnussel@suse.de +* Thu Aug 29 2002 lnussel@suse.de - new headline icon -* Tue Aug 27 2002 - msvec@suse.cz +* Tue Aug 27 2002 msvec@suse.cz - proxy icon - 2.6.9 -* Mon Aug 26 2002 - lslezak@suse.cz +* Mon Aug 26 2002 lslezak@suse.cz - new icon joystick.png for yast2-sound (joystick configuration) - version 2.6.8 -* Fri Aug 23 2002 - jsuchome@suse.cz +* Fri Aug 23 2002 jsuchome@suse.cz - new icon for yast2-profile-manager -* Fri Aug 16 2002 - arvin@suse.de +* Fri Aug 16 2002 arvin@suse.de - bind to correct textdomain -* Thu Aug 15 2002 - jsuchome@suse.cz +* Thu Aug 15 2002 jsuchome@suse.cz - Merged proofread texts for the second translation round. -* Thu Jul 25 2002 - arvin@suse.de +* Thu Jul 25 2002 arvin@suse.de - also extract texts from C++ source files (bug #17216) -* Fri Jul 12 2002 - arvin@suse.de +* Fri Jul 12 2002 arvin@suse.de - use proper namespace for Args and CallFunction (#16776) -* Thu Jul 04 2002 - arvin@suse.de +* Thu Jul 04 2002 arvin@suse.de - move non binary file from /usr/lib/YaST2 to /usr/share/YaST2 -* Mon Jun 24 2002 - arvin@suse.de +* Mon Jun 24 2002 arvin@suse.de - renamed to yast2-control-center from yast2-menu -* Wed Jun 12 2002 - arvin@suse.de +* Wed Jun 12 2002 arvin@suse.de - adapted to new command line of yast2 -* Fri Apr 26 2002 - arvin@suse.de +* Fri Apr 26 2002 arvin@suse.de - fixed linking with qt for x86-64 -* Sun Apr 14 2002 - arvin@suse.de +* Sun Apr 14 2002 arvin@suse.de - fixes for gcc 3.1 -* Thu Mar 21 2002 - lnussel@suse.de +* Thu Mar 21 2002 lnussel@suse.de - remove quickstart popup (#15231,#14382) -* Thu Mar 14 2002 - lnussel@suse.de +* Thu Mar 14 2002 lnussel@suse.de - added the lost new title graphics again, this time with a different name (#14920) -* Fri Mar 08 2002 - mike@suse.de +* Fri Mar 08 2002 mike@suse.de - new icons made by tackat -* Mon Mar 04 2002 - lnussel@suse.de +* Mon Mar 04 2002 lnussel@suse.de - added simplifyWhiteSpace to remove LF from helptexts (#14337) - removed some debug output (#14318) -* Wed Feb 27 2002 - sh@suse.de +* Wed Feb 27 2002 sh@suse.de - V 2.5.11 - Exchanged title graphics to match new YaST2 design -* Mon Feb 25 2002 - sh@suse.de +* Mon Feb 25 2002 sh@suse.de - Fixed wish #13876: Host name in window title bar -* Fri Feb 22 2002 - lnussel@suse.de +* Fri Feb 22 2002 lnussel@suse.de - removed MountAllAgents from pre-start.ycp - added -Q commandline switch to disable quickstart -* Mon Feb 18 2002 - lnussel@suse.de +* Mon Feb 18 2002 lnussel@suse.de - filter out empty strings as arguments, fixes bug #13360 -* Fri Feb 08 2002 - lnussel@suse.de +* Fri Feb 08 2002 lnussel@suse.de - module arguments possible with quick start - only strings are allowed as arguments -* Tue Feb 05 2002 - mike@suse.de +* Tue Feb 05 2002 mike@suse.de - fast YaST2 start -* Fri Jan 25 2002 - arvin@suse.de +* Fri Jan 25 2002 arvin@suse.de - use buildroot -* Tue Jan 15 2002 - lnussel@suse.de +* Tue Jan 15 2002 lnussel@suse.de - use multi threaded qt library if detected by configure -* Thu Jan 10 2002 - lnussel@suse.de +* Thu Jan 10 2002 lnussel@suse.de - use qt3 if available - auto arrange icons on window resize -* Wed Oct 10 2001 - lnussel@suse.de +* Wed Oct 10 2001 lnussel@suse.de - added an icon to be displayed by windowmanagers (#8308) -* Fri Sep 21 2001 - gs@suse.de +* Fri Sep 21 2001 gs@suse.de - new icon for Routing, icons for NFS server/client changed -* Thu Sep 20 2001 - gs@suse.de +* Thu Sep 20 2001 gs@suse.de - new icons for tv card configuration, system- and startprotocol, keyboard, runlevel editor -* Wed Sep 19 2001 - mike@suse.de +* Wed Sep 19 2001 mike@suse.de - new firewall icon -* Fri Sep 14 2001 - mike@suse.de +* Fri Sep 14 2001 mike@suse.de - new icons for scanner and firewall -* Mon Sep 10 2001 - lnussel@suse.de +* Mon Sep 10 2001 lnussel@suse.de - make get_modulesdata switch textdomain to have group names translated -* Wed Sep 05 2001 - lnussel@suse.de +* Wed Sep 05 2001 lnussel@suse.de - typo .targe.size -> .target.size -* Mon Aug 27 2001 - lnussel@suse.de +* Mon Aug 27 2001 lnussel@suse.de - fix for bug #5728: use of ngettext for plural form -* Tue Aug 21 2001 - kkaempf@suse.de +* Tue Aug 21 2001 kkaempf@suse.de - replace fileexist with SCR::Read(.targe.size, ...) -* Wed Aug 08 2001 - lnussel@suse.de +* Wed Aug 08 2001 lnussel@suse.de - New feature sortkey for groups and modules - Major code cleanup -* Mon Jun 18 2001 - lnussel@suse.de +* Mon Jun 18 2001 lnussel@suse.de - Added drag and drop support -* Mon May 14 2001 - lnussel@suse.de +* Mon May 14 2001 lnussel@suse.de - removed fixlocale call - moved bindtextdomain and textdomain calls right after main - added bind_textdomain_codeset("menu","UTF-8") to fix captions in windowmanagers -* Fri May 11 2001 - gs@suse.de +* Fri May 11 2001 gs@suse.de - new icons for Update and Online-Update ( bug # 7518 ) - icons Create user and Create groups added -* Fri May 11 2001 - kkaempf@suse.de +* Fri May 11 2001 kkaempf@suse.de - added "babelfish.png" icon -* Tue May 08 2001 - mike@suse.de +* Tue May 08 2001 mike@suse.de - new icons, configurable startup size for modules -* Mon Apr 30 2001 - sh@suse.de +* Mon Apr 30 2001 sh@suse.de - Fix for bug #7358: No Umlauts in Y2CC always use UTF-8 locale V 2.3.9 -* Mon Apr 30 2001 - kkaempf@suse.de +* Mon Apr 30 2001 kkaempf@suse.de - new icon for timezone -* Thu Apr 26 2001 - gs@suse.de +* Thu Apr 26 2001 gs@suse.de - new icon for network and Patch CD Update -* Thu Apr 26 2001 - lnussel@suse.de +* Thu Apr 26 2001 lnussel@suse.de - `geometry from menuentry now passed as env. Variable Y2_GEOMETRY to /sbin/yast2 -* Wed Apr 25 2001 - kkaempf@suse.de +* Wed Apr 25 2001 kkaempf@suse.de - move menu.ycp to package yast2 (#7168) -* Thu Apr 19 2001 - gs@suse.de +* Thu Apr 19 2001 gs@suse.de - new icons for group misc and network advanced -* Tue Apr 17 2001 - gs@suse.de +* Tue Apr 17 2001 gs@suse.de - group System added and group Network splitted -* Thu Apr 12 2001 - kkaempf@suse.de +* Thu Apr 12 2001 kkaempf@suse.de - rename y2m_menu -> yast2-menu -* Thu Jan 25 2001 - mike@suse.de +* Thu Jan 25 2001 mike@suse.de - menulogo.png deleted, not needed anymore -* Mon Jan 22 2001 - kkaempf@suse.de +* Mon Jan 22 2001 kkaempf@suse.de - compile with -O0 on AXP, gcc bug workaround -* Fri Jan 19 2001 - mike@suse.de +* Fri Jan 19 2001 mike@suse.de - new icons -* Mon Jan 15 2001 - mike@suse.de +* Mon Jan 15 2001 mike@suse.de - bug 5490 Multiple clicks onto help causes problems -* Fri Jan 12 2001 - mike@suse.de +* Sat Jan 13 2001 mike@suse.de - new icons -* Wed Jan 03 2001 - mike@suse.de +* Thu Jan 04 2001 mike@suse.de - new icons, little fixes The modules REMOTE-INSTALL and REMOTE-ADMIN are not available any more -* Thu Dec 14 2000 - kkaempf@suse.de +* Thu Dec 14 2000 kkaempf@suse.de - fix specfile -* Thu Dec 14 2000 - kkaempf@suse.de +* Thu Dec 14 2000 kkaempf@suse.de - fix EXTRA_DIST in src/Makefile.am -* Thu Dec 14 2000 - kkaempf@suse.de +* Thu Dec 14 2000 kkaempf@suse.de - put gpp and qt into neededforbuild -* Wed Dec 13 2000 - mike@suse.de +* Wed Dec 13 2000 mike@suse.de - NEW NICE YaST2 Module Starter: "Yast2 Control Center" -* Mon Dec 04 2000 - kkaempf@suse.de +* Mon Dec 04 2000 kkaempf@suse.de - switch to bz2 packaging -* Tue Nov 21 2000 - kkaempf@suse.de +* Tue Nov 21 2000 kkaempf@suse.de - use target agent -* Fri Jul 14 2000 - kkaempf@suse.de +* Fri Jul 14 2000 kkaempf@suse.de - removed non-working logcontrol version 2.0.4 -* Thu Jul 13 2000 - kkaempf@suse.de +* Thu Jul 13 2000 kkaempf@suse.de - Requires: y2t_menu version 2.0.3 -* Thu Jul 06 2000 - sh@suse.de +* Thu Jul 06 2000 sh@suse.de - Removed option `immediate from SelectionBox (unnecessary and nonexistent) - version 2.0.2 -* Thu Jun 29 2000 - kkaempf@suse.de +* Thu Jun 29 2000 kkaempf@suse.de - make module list wider, select "Welcome" as default version 2.0.1 -* Mon May 22 2000 - kkaempf@suse.de +* Mon May 22 2000 kkaempf@suse.de - fix filelist in .spec file -* Thu May 18 2000 - kkaempf@suse.de +* Thu May 18 2000 kkaempf@suse.de - initial version based on YaST2 (6.4 - i386) ++++++ yast2-control-center-2.16.0.tar.bz2 -> yast2-control-center-2.16.1.tar.bz2 ++++++ ++++ 9278 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/yast2-control-center-2.16.0/configure.in new/yast2-control-center-2.16.1/configure.in --- old/yast2-control-center-2.16.0/configure.in 2007-11-22 10:58:15.000000000 +0100 +++ new/yast2-control-center-2.16.1/configure.in 2008-04-16 15:52:27.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-control-center dnl -dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-control-center, 2.15.7, http://bugs.opensuse.org/, yast2-control-center) +AC_INIT(yast2-control-center, 2.16.0, http://bugs.opensuse.org/, yast2-control-center) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -14,10 +14,11 @@ AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs +dnl long filenames; we use GNU Make extensions and that's ok +AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.15.7" +VERSION="2.16.0" RPMNAME="yast2-control-center" MAINTAINER="Stefan Hundhammer <sh@suse.de>" @@ -107,7 +108,7 @@ dnl no need for AC_ARG_VAR AC_PATH_PROG(XGETTEXT, xgettext) if test -z "$XGETTEXT" ; then - AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) + AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` 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/yast2-control-center-2.16.0/COPYRIGHT.english new/yast2-control-center-2.16.1/COPYRIGHT.english --- old/yast2-control-center-2.16.0/COPYRIGHT.english 2007-11-27 13:44:43.000000000 +0100 +++ new/yast2-control-center-2.16.1/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100 @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. 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/yast2-control-center-2.16.0/Makefile.am new/yast2-control-center-2.16.1/Makefile.am --- old/yast2-control-center-2.16.0/Makefile.am 2007-11-22 10:58:15.000000000 +0100 +++ new/yast2-control-center-2.16.1/Makefile.am 2008-04-16 15:52:27.000000000 +0200 @@ -23,13 +23,14 @@ ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) -COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english +COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) +# less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally 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/yast2-control-center-2.16.0/missing new/yast2-control-center-2.16.1/missing --- old/yast2-control-center-2.16.0/missing 2007-11-22 10:58:30.000000000 +0100 +++ new/yast2-control-center-2.16.1/missing 2008-04-16 15:52:46.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2005-06-08.21 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,8 +33,6 @@ fi run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -46,7 +44,7 @@ msg="missing on your system" -case $1 in +case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -79,7 +77,6 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -109,7 +106,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case $1 in +case "$1" in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -138,7 +135,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case "$1" in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -167,7 +164,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case $f in + case "$f" in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -195,8 +192,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` if test -f "$file"; then touch $file else @@ -217,25 +214,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if test $# -ne 1; then + if [ $# -ne 1 ]; then eval LASTARG="\${$#}" - case $LASTARG in + case "$LASTARG" in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if test ! -f y.tab.h; then + if [ ! -f y.tab.h ]; then echo >y.tab.h fi - if test ! -f y.tab.c; then + if [ ! -f y.tab.c ]; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -247,18 +244,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if test $# -ne 1; then + if [ $# -ne 1 ]; then eval LASTARG="\${$#}" - case $LASTARG in + case "$LASTARG" in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if test ! -f lex.yy.c; then + if [ ! -f lex.yy.c ]; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -270,9 +267,11 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then touch $file else test -z "$file" || exec >$file @@ -290,17 +289,11 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -324,13 +317,13 @@ fi firstarg="$1" if shift; then - case $firstarg in + case "$firstarg" in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case $firstarg in + case "$firstarg" in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 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/yast2-control-center-2.16.0/src/main.cpp new/yast2-control-center-2.16.1/src/main.cpp --- old/yast2-control-center-2.16.0/src/main.cpp 2007-10-24 10:06:14.000000000 +0200 +++ new/yast2-control-center-2.16.1/src/main.cpp 2008-04-29 16:21:37.000000000 +0200 @@ -35,7 +35,7 @@ #include "myintl.h" #include "y2controlcenter.h" #include "y2cc_config.h" -#include "suseicon.xpm" + //global class with config options Config config; @@ -114,7 +114,6 @@ } } y2cc.setCaption( title ); - y2cc.setIcon(QPixmap((const char **)suseicon_xpm)); y2cc.show(); QTimer::singleShot( 0, &y2cc, SLOT( configure() ) ); @@ -122,4 +121,3 @@ return app.exec(); } -// vim: sw=4 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/yast2-control-center-2.16.0/src/Makefile.am new/yast2-control-center-2.16.1/src/Makefile.am --- old/yast2-control-center-2.16.0/src/Makefile.am 2007-11-27 13:37:22.000000000 +0100 +++ new/yast2-control-center-2.16.1/src/Makefile.am 2008-04-29 16:21:52.000000000 +0200 @@ -45,8 +45,7 @@ y2controlcenter.h \ y2controlcenterview.h \ yastmodules.h \ - y2savelogs.h \ - suseicon.xpm + y2savelogs.h y2controlcenter_METASOURCES = \ process.moc.cpp \ 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/yast2-control-center-2.16.0/src/suseicon.xpm new/yast2-control-center-2.16.1/src/suseicon.xpm --- old/yast2-control-center-2.16.0/src/suseicon.xpm 2007-11-27 13:37:22.000000000 +0100 +++ new/yast2-control-center-2.16.1/src/suseicon.xpm 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -/* XPM */ -static const char * suseicon_xpm[] = { -"16 16 17 1", -" c None", -". c #538C0E", -"+ c #EEEADE", -"@ c #E2EBDA", -"# c #8AAE82", -"$ c #87B16F", -"% c #7CAA57", -"& c #68A043", -"* c #5D9732", -"= c #609708", -"- c #EEEEE6", -"; c #FCFDFC", -"> c #9BBA7F", -", c #60952A", -"' c #A6BE72", -") c #B2C998", -"! c #6A9D08", -" ;;;;;; ", -" ;;;)$%);;; ", -" ;;)=*,&,*);; ", -" ;;!==,@--#%);; ", -" ;'!!.)>%%-$$); ", -";-!!!!@*%@&-,$-;", -";)!!!!-&$%$@=.);", -";=...=$@&&@&=!,;", -";=';@&,&-@..=,$;", -";)!$)@@>&&%>@@);", -";-!==.%)@@+@&.);", -" ;.!=!=....=,#; ", -" ;;=!=!====.$;; ", -" ;;.!.!==,';; ", -" ;;-)#>)-;; ", -" ;;;;;; "}; 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/yast2-control-center-2.16.0/src/y2controlcenter.cpp new/yast2-control-center-2.16.1/src/y2controlcenter.cpp --- old/yast2-control-center-2.16.0/src/y2controlcenter.cpp 2007-10-24 10:06:14.000000000 +0200 +++ new/yast2-control-center-2.16.1/src/y2controlcenter.cpp 2008-04-29 16:46:49.000000000 +0200 @@ -18,6 +18,7 @@ Y2ControlCenter::Y2ControlCenter( WFlags wflags ) : QMainWindow( 0, 0, wflags ) // parent, name, wflags { + setAppIcon(); initStatusBar(); _view = new Y2ControlCenterView( this ); @@ -30,12 +31,30 @@ connect(y2LogSaver, SIGNAL(statusMsg(const QString&)), this, SLOT(slotStatusHelpMsg(const QString&))); } + Y2ControlCenter::~Y2ControlCenter() { delete y2LogSaver; } +void Y2ControlCenter::setAppIcon() +{ + QString iconName( ICON_DIR "/yast.png" ); + QPixmap appIcon( iconName ); + + if ( ! appIcon.isNull() ) + { + // fprintf( stderr, "y2controlcenter: Using icon %s\n", iconName.ascii() ); + topLevelWidget()->setIcon( appIcon ); + } + else + { + fprintf( stderr, "y2controlcenter: No icon %s\n", iconName.ascii() ); + } +} + + void Y2ControlCenter::configure() { statusBar()->message(_("Reading module 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/yast2-control-center-2.16.0/src/y2controlcenter.h new/yast2-control-center-2.16.1/src/y2controlcenter.h --- old/yast2-control-center-2.16.0/src/y2controlcenter.h 2007-10-24 10:06:14.000000000 +0200 +++ new/yast2-control-center-2.16.1/src/y2controlcenter.h 2008-04-29 15:47:34.000000000 +0200 @@ -63,6 +63,7 @@ protected: + void setAppIcon(); void initMenuBar(); void initStatusBar(); bool eventFilter( QObject *obj, QEvent *ev ); 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/yast2-control-center-2.16.0/VERSION new/yast2-control-center-2.16.1/VERSION --- old/yast2-control-center-2.16.0/VERSION 2007-11-27 13:43:48.000000000 +0100 +++ new/yast2-control-center-2.16.1/VERSION 2008-04-29 16:44:00.000000000 +0200 @@ -1 +1 @@ -2.16.0 +2.16.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de