openSUSE Commits
Threads by month
- ----- 2024 -----
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
February 2009
- 1 participants
- 1117 discussions
Hello community,
here is the log from the commit of package nano for openSUSE:Factory
checked in at Fri Feb 27 01:12:40 CET 2009.
--------
--- nano/nano.changes 2009-01-05 21:45:58.000000000 +0100
+++ nano/nano.changes 2009-02-27 01:05:21.406212000 +0100
@@ -1,0 +2,11 @@
+Wed Feb 18 16:12:19 CET 2009 - crrodriguez(a)suse.de
+
+- update to version 2.1.9 see NEWS for details
+ * Issues with the new sped-up syntax highlighting code were
+ corrected. Other fixes include configure-time detection of groff HTML
+ support before attempting to generate the HTML version of man pages. Using
+ ~ or ~username syntax in .nanorc should now work again. Also, nano will now
+ only ask for one acknowledgment of errors it encounters when parsing nanorc
+ files, and a new -q (--quiet) flag will silence these messages altogether.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
nano-2.1.7.tar.bz2
New:
----
nano-2.1.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nano.spec ++++++
--- /var/tmp/diff_new_pack.x18927/_old 2009-02-27 01:12:20.000000000 +0100
+++ /var/tmp/diff_new_pack.x18927/_new 2009-02-27 01:12:20.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package nano (Version 2.1.7)
+# spec file for package nano (Version 2.1.9)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -25,7 +25,7 @@
Group: Productivity/Editors/Other
AutoReqProv: on
Summary: Pico Editor Clone with Enhancements
-Version: 2.1.7
+Version: 2.1.9
Release: 1
Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -84,6 +84,14 @@
%{_datadir}/nano
%changelog
+* Wed Feb 18 2009 crrodriguez(a)suse.de
+- update to version 2.1.9 see NEWS for details
+ * Issues with the new sped-up syntax highlighting code were
+ corrected. Other fixes include configure-time detection of groff HTML
+ support before attempting to generate the HTML version of man pages. Using
+ ~ or ~username syntax in .nanorc should now work again. Also, nano will now
+ only ask for one acknowledgment of errors it encounters when parsing nanorc
+ files, and a new -q (--quiet) flag will silence these messages altogether.
* Mon Jan 05 2009 crrodriguez(a)suse.de
- update to versison 2.1.7, see NEWS for details
* Wed Sep 03 2008 crrodriguez(a)suse.de
++++++ nano-2.1.7.tar.bz2 -> nano-2.1.9.tar.bz2 ++++++
++++ 71808 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
Hello community,
here is the log from the commit of package libxspf for openSUSE:Factory
checked in at Fri Feb 27 01:12:10 CET 2009.
--------
New Changes file:
--- /dev/null 2008-04-22 03:09:48.000000000 +0200
+++ libxspf/libxspf.changes 2009-02-26 20:03:49.000000000 +0100
@@ -0,0 +1,57 @@
+-------------------------------------------------------------------
+Thu Feb 26 20:03:37 CET 2009 - crrodriguez(a)suse.de
+
+- correct wrong -evel package requires
+
+-------------------------------------------------------------------
+Sun Feb 22 05:11:22 CET 2009 - crrodriguez(a)suse.de
+
+- upstream rename to libxspf
+- update to version 1.1.0
+- added pkgconfig file
+- fix compilation errors with gcc 43 and 44
+
+-------------------------------------------------------------------
+Fri Aug 22 04:24:59 CEST 2008 - crrodriguez(a)suse.de
+
+- add missing libexpat-devel to -devel package
+
+-------------------------------------------------------------------
+Thu Jul 31 20:29:02 CEST 2008 - crrodriguez(a)suse.de
+
+- update to version 0.8.4
+ * Fixed: Support for 'xml:base' attribute added
+ * Fixed: Test suite compile fix for GCC 4.3
+ Thanks to Samuli Suominen for the patch!
+ * Changed: Code::Blocks project files updated from file format
+ version 1.4 to 1.6, which is produced by Code::Blocks 8.02
+ * Added: Code::Blocks workspace file
+ * Fixed: Bundled Win32 CppTest updated to 1.1.0
+ * Fixed: Bundled Win32 uriparser updated to 0.7.1
+ * Soname: 1:4:0
+
+
+
+-------------------------------------------------------------------
+Sat Mar 8 01:42:51 CET 2008 - crrodriguez(a)suse.de
+
+- version 0.8.3
+ * Fixed: No more compile errors from GCC 4.3 (#1815520)
+ Thanks to Cristian Rodriguez for the patch!
+ * Added: Version guards for Autoconf/Automake
+ Thanks to Martin Michlmayr for reporting!
+ * Fixed: Compile error on Windows caused by out-of-date
+ file lists
+ * Fixed: Bundled Win32 uriparser updated to 0.6.4
+ * Soname: 1:3:0
+
+-------------------------------------------------------------------
+Tue Feb 5 03:41:32 CET 2008 - crrodriguez(a)suse.de
+
+- initial version for openSUSE 11, merge from OBS
+
+-------------------------------------------------------------------
+Thu Oct 18 02:59:46 UTC 2007 - crrodriguez(a)suse.de
+
+- update to version 0.8.2 , soname changed, now libspiff1
+
calling whatdependson for head-i586
New:
----
libxspf-1.1.0.tar.bz2
libxspf.changes
libxspf.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libxspf.spec ++++++
#
# spec file for package libxspf (Version 1.1.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: libxspf
Url: http://libspiff.sourceforge.net/
Version: 1.1.0
Release: 2
License: BSD 3-Clause; LGPL v2.1 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ libexpat-devel liburiparser-devel
Group: Development/Libraries/C and C++
Summary: Provides XSPF playlist reading and writing support
Source: http://downloads.xiph.org/releases/xspf/%{name}-%{version}.tar.bz2
%description
libSpiff brings XSPF playlist reading and writing support to your C++
application. Both version 0 and 1 are supported. libSpiff uses Expat
for XML parsing and CppTest for unit testing. libSpiff is the official
reference implementation for XSPF of the Xiph.Org Foundation. Features
* Full conformance to the XSPF specification
* Cross-platform (Unix, Windows, Mac OS X, ...)
* Read and write XSPF files
* XSPF-0 and XSPF-1 support
* Unicode support
* Full support for XSPF extensions
* Full support for XML namespaces
* Fast (XML parsing is done by Expat)
* Uses unit testing
* Liberal license: New BSD license
Authors:
--------
Sebastian Pipping, sping(a)xiph.org
Ed Schouten, ed(a)fxq.nl
%package -n libxspf4
License: BSD 3-Clause; LGPL v2.1 or later
Group: Development/Libraries/C and C++
Summary: Provides XSPF playlist reading and writing support
%description -n libxspf4
libSpiff brings XSPF playlist reading and writing support to your C++
application. Both version 0 and 1 are supported. libSpiff uses Expat
for XML parsing and CppTest for unit testing. libSpiff is the official
reference implementation for XSPF of the Xiph.Org Foundation. Features
* Full conformance to the XSPF specification
* Cross-platform (Unix, Windows, Mac OS X, ...)
* Read and write XSPF files
* XSPF-0 and XSPF-1 support
* Unicode support
* Full support for XSPF extensions
* Full support for XML namespaces
* Fast (XML parsing is done by Expat)
* Uses unit testing
* Liberal license: New BSD license
Authors:
--------
Sebastian Pipping, sping(a)xiph.org
Ed Schouten, ed(a)fxq.nl
%package -n libxspf-devel
License: BSD 3-Clause; LGPL v2.1 or later
Group: Development/Libraries/C and C++
Summary: libSpiff brings XSPF playlist reading and writing support to your C++ application
Requires: libxspf4 = %{version} libstdc++-devel libexpat-devel
%description -n libxspf-devel
libSpiff brings XSPF playlist reading and writing support to your C++
application. Both version 0 and 1 are supported. libSpiff uses Expat
for XML parsing and CppTest for unit testing. libSpiff is the official
reference implementation for XSPF of the Xiph.Org Foundation. Features
* Full conformance to the XSPF specification
* Cross-platform (Unix, Windows, Mac OS X, ...)
* Read and write XSPF files
* XSPF-0 and XSPF-1 support
* Unicode support
* Full support for XSPF extensions
* Full support for XML namespaces
* Fast (XML parsing is done by Expat)
* Uses unit testing
* Liberal license: New BSD license
Authors:
--------
Sebastian Pipping, sping(a)xiph.org
Ed Schouten, ed(a)fxq.nl
%prep
%setup -q
%build
autoreconf -fiv
%configure --disable-static --with-pic
%{__make} %{?jobs:-j%jobs}
%check
%{__make} %{?jobs:-j%jobs} check
%install
%makeinstall
%{__rm} -f %{buildroot}%{_libdir}/*.la
%clean
rm -rf %{buildroot}
%post -n libxspf4 -p /sbin/ldconfig
%postun -n libxspf4 -p /sbin/ldconfig
%files -n libxspf4
%defattr(-,root,root)
%{_libdir}/libxspf.so.4*
%files -n libxspf-devel
%defattr(-,root,root)
%{_bindir}/xspf_check
%{_bindir}/xspf_strip
%dir %{_includedir}/xspf
%dir %{_includedir}/xspf/ProjectOpus
%{_includedir}/xspf/ProjectOpus/*.h
%{_includedir}/xspf/*.h
%{_libdir}/libxspf.so
%{_libdir}/pkgconfig/xspf.pc
%changelog
* Thu Feb 26 2009 crrodriguez(a)suse.de
- correct wrong -evel package requires
* Sun Feb 22 2009 crrodriguez(a)suse.de
- upstream rename to libxspf
- update to version 1.1.0
- added pkgconfig file
- fix compilation errors with gcc 43 and 44
* Fri Aug 22 2008 crrodriguez(a)suse.de
- add missing libexpat-devel to -devel package
* Thu Jul 31 2008 crrodriguez(a)suse.de
- update to version 0.8.4
* Fixed: Support for 'xml:base' attribute added
* Fixed: Test suite compile fix for GCC 4.3
Thanks to Samuli Suominen for the patch!
* Changed: Code::Blocks project files updated from file format
version 1.4 to 1.6, which is produced by Code::Blocks 8.02
* Added: Code::Blocks workspace file
* Fixed: Bundled Win32 CppTest updated to 1.1.0
* Fixed: Bundled Win32 uriparser updated to 0.7.1
* Soname: 1:4:0
* Sat Mar 08 2008 crrodriguez(a)suse.de
- version 0.8.3
* Fixed: No more compile errors from GCC 4.3 (#1815520)
Thanks to Cristian Rodriguez for the patch!
* Added: Version guards for Autoconf/Automake
Thanks to Martin Michlmayr for reporting!
* Fixed: Compile error on Windows caused by out-of-date
file lists
* Fixed: Bundled Win32 uriparser updated to 0.6.4
* Soname: 1:3:0
* Tue Feb 05 2008 crrodriguez(a)suse.de
- initial version for openSUSE 11, merge from OBS
* Thu Oct 18 2007 crrodriguez(a)suse.de
- update to version 0.8.2 , soname changed, now libspiff1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory
checked in at Fri Feb 27 01:07:58 CET 2009.
--------
--- xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-02-26 12:38:49.000000000 +0100
+++ xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-02-26 16:39:34.523202276 +0100
@@ -1,0 +2,6 @@
+Thu Feb 26 16:39:03 CET 2009 - sndirsch(a)suse.de
+
+- xf86-input-mouse 1.4.0
+- adjusted p_mouse_misc.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-input-mouse-1.3.0.tar.bz2
New:
----
xf86-input-mouse-1.4.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-input.spec ++++++
--- /var/tmp/diff_new_pack.pz8019/_old 2009-02-27 01:07:21.000000000 +0100
+++ /var/tmp/diff_new_pack.pz8019/_new 2009-02-27 01:07:21.000000000 +0100
@@ -23,7 +23,7 @@
BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 16
+Release: 17
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -49,7 +49,7 @@
Source15: xf86-input-magellan-1.2.0.tar.bz2
Source16: xf86-input-magictouch-7f90f6a.tar.bz2
Source17: xf86-input-microtouch-1.2.0.tar.bz2
-Source18: xf86-input-mouse-1.3.0.tar.bz2
+Source18: xf86-input-mouse-1.4.0.tar.bz2
Source19: xf86-input-mutouch-1.2.1.tar.bz2
Source20: xf86-input-palmax-1.2.0.tar.bz2
Source21: xf86-input-penmount-1.4.0.tar.bz2
@@ -165,6 +165,9 @@
%changelog
* Thu Feb 26 2009 sndirsch(a)suse.de
+- xf86-input-mouse 1.4.0
+- adjusted p_mouse_misc.diff
+* Thu Feb 26 2009 sndirsch(a)suse.de
- xf86-input-acecad 1.3.0
- xf86-input-aiptek 1.2.0
- xf86-input-elographics 1.2.3
++++++ p_mouse_misc.diff ++++++
--- /var/tmp/diff_new_pack.pz8019/_old 2009-02-27 01:07:21.000000000 +0100
+++ /var/tmp/diff_new_pack.pz8019/_new 2009-02-27 01:07:21.000000000 +0100
@@ -10,3 +10,17 @@
pMse->Ctrl = MouseCtrl;
pMse->PostEvent = MousePostEvent;
pMse->CommonOptions = MouseCommonOptions;
+--- a/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 1 Nov 2004 16:46:39 -0000 1.1.1.21
++++ a/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 17 Mar 2005 18:39:52 -0000
+@@ -204,7 +204,11 @@
+ int dx, int dy, int dz, int dw);
+ typedef void (*MouseCommonOptProc)(InputInfoPtr pInfo);
+
++#define MOUSE_MAGIC 15031995
++
+ typedef struct _MouseDevRec {
++ unsigned long magic;
++ int size;
+ PtrCtrlProcPtr Ctrl;
+ PostMseEventProc PostEvent;
+ MouseCommonOptProc CommonOptions;
++++++ xf86-input-mouse-1.3.0.tar.bz2 -> xf86-input-mouse-1.4.0.tar.bz2 ++++++
++++ 23538 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
Hello community,
here is the log from the commit of package sffview for openSUSE:Factory
checked in at Fri Feb 27 01:07:14 CET 2009.
--------
--- sffview/sffview.changes 2007-10-11 14:37:37.000000000 +0200
+++ sffview/sffview.changes 2009-02-26 19:03:03.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Feb 26 19:02:42 CET 2009 - crrodriguez(a)suse.de
+
+- extend GCC 4.3 patch to cover GC 4.4 too
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sffview.spec ++++++
--- /var/tmp/diff_new_pack.Q28115/_old 2009-02-27 01:05:54.000000000 +0100
+++ /var/tmp/diff_new_pack.Q28115/_new 2009-02-27 01:05:54.000000000 +0100
@@ -1,22 +1,30 @@
#
# spec file for package sffview (Version 0.4)
#
-# Copyright (c) 2007 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.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
+
Name: sffview
BuildRequires: SDL-devel boost-devel gcc-c++ libtiff-devel update-desktop-files wxGTK-devel xorg-x11
License: X11/MIT
Group: Hardware/ISDN
AutoReqProv: on
Version: 0.4
-Release: 109
+Release: 251
Summary: Simple viewer for Structured Fax Files (.sff) used by ISDN applications
Source: %{name}-%{version}.tar.bz2
Url: http://sfftools.sourceforge.net/
@@ -42,10 +50,10 @@
%prep
%setup
%patch -p1
-%patch1 -p1
+%patch1
%build
-make
+%{__make} %{?jobs:-j%jobs}
%install
install -d $RPM_BUILD_ROOT/usr/bin
@@ -60,46 +68,49 @@
%defattr(-,root,root,-)
/usr/bin/sffview
%doc %{_defaultdocdir}/sffview
+
%changelog
-* Thu Oct 11 2007 - kkeil(a)suse.de
+* Thu Feb 26 2009 crrodriguez(a)suse.de
+- extend GCC 4.3 patch to cover GC 4.4 too
+* Thu Oct 11 2007 kkeil(a)suse.de
- fixes for GCC 4.3
-* Tue Mar 06 2007 - kkeil(a)suse.de
+* Tue Mar 06 2007 kkeil(a)suse.de
- fix string type issue for gcc42
-* Mon Oct 30 2006 - kkeil(a)suse.de
+* Mon Oct 30 2006 kkeil(a)suse.de
- update to 0.4
* include all our fixes
* print support
-* Mon Oct 16 2006 - kkeil(a)suse.de
+* Mon Oct 16 2006 kkeil(a)suse.de
- compile with RPM_OPT_FLAGS
- compile with unicode support (Thanks Andreas Hanke, #212502)
-* Fri Jan 27 2006 - kkeil(a)suse.de
+* Fri Jan 27 2006 kkeil(a)suse.de
- add gcc-c++ to BuildRequires
-* Wed Jan 25 2006 - mls(a)suse.de
+* Wed Jan 25 2006 mls(a)suse.de
- converted neededforbuild to BuildRequires
-* Wed Nov 02 2005 - dmueller(a)suse.de
+* Wed Nov 02 2005 dmueller(a)suse.de
- don't build as root
-* Fri Apr 15 2005 - mcihar(a)suse.de
+* Fri Apr 15 2005 mcihar(a)suse.de
- add SDL-devel-packages because of wxGTK
-* Sat Apr 09 2005 - kkeil(a)suse.de
+* Sat Apr 09 2005 kkeil(a)suse.de
- GCC4 fixes
-* Wed Mar 30 2005 - kkeil(a)suse.de
+* Wed Mar 30 2005 kkeil(a)suse.de
- a dword is always 32 bit, also on 64 bit OS (#75254)
-* Mon Nov 22 2004 - ro(a)suse.de
+* Mon Nov 22 2004 ro(a)suse.de
- fix build with new wxGTK
-* Wed Sep 15 2004 - kkeil(a)suse.de
+* Wed Sep 15 2004 kkeil(a)suse.de
- move to version 0.3 (#44574)
-* Fri Aug 20 2004 - ro(a)suse.de
+* Fri Aug 20 2004 ro(a)suse.de
- added wxGTK-compat to neededforbuild
-* Wed Apr 21 2004 - kkeil(a)suse.de
+* Wed Apr 21 2004 kkeil(a)suse.de
- fix package for new wxGTK with UNICODE enabled
-* Wed Jan 14 2004 - ro(a)suse.de
+* Wed Jan 14 2004 ro(a)suse.de
- use gtk2
-* Thu Jun 12 2003 - kkeil(a)suse.de
+* Thu Jun 12 2003 kkeil(a)suse.de
- fix filelist
-* Sun Feb 23 2003 - ghillie(a)suse.de
+* Sun Feb 23 2003 ghillie(a)suse.de
- use g++ instead of gcc
-* Mon Jan 20 2003 - ghillie(a)suse.de
+* Mon Jan 20 2003 ghillie(a)suse.de
- removed arch=i486 from Makefile (see gcc-3.2 patch)
- added glib and gtk to neededforbuild
-* Mon Dec 16 2002 - gernot(a)hillier.de
+* Mon Dec 16 2002 gernot(a)hillier.de
- first package
++++++ sffview-gcc43.diff ++++++
--- /var/tmp/diff_new_pack.Q28115/_old 2009-02-27 01:05:54.000000000 +0100
+++ /var/tmp/diff_new_pack.Q28115/_new 2009-02-27 01:05:54.000000000 +0100
@@ -1,7 +1,7 @@
-Index: sffview-0.4/sfffile.cpp
+Index: sfffile.cpp
===================================================================
---- sffview-0.4.orig/sfffile.cpp
-+++ sffview-0.4/sfffile.cpp
+--- sfffile.cpp.orig 2006-10-29 17:45:44.000000000 +0100
++++ sfffile.cpp 2009-02-26 18:48:42.000000000 +0100
@@ -33,6 +33,8 @@
#include <vector>
@@ -11,3 +11,16 @@
#include "sfftypes.h"
#include "common.h"
+Index: common.cpp
+===================================================================
+--- common.cpp.orig 2006-10-29 17:45:44.000000000 +0100
++++ common.cpp 2009-02-26 18:49:32.000000000 +0100
+@@ -34,7 +34,7 @@
+ #include "sfftypes.h"
+ #include "common.h"
+ #include "errno.h"
+-
++#include <stdio.h>
+ #include <time.h>
+ #if defined(_MSC_VER)
+ #include <sys/utime.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
Hello community,
here is the log from the commit of package sfftobmp for openSUSE:Factory
checked in at Fri Feb 27 01:05:47 CET 2009.
--------
--- sfftobmp/sfftobmp.changes 2008-02-21 12:51:36.000000000 +0100
+++ sfftobmp/sfftobmp.changes 2009-02-26 18:47:20.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Feb 26 18:47:02 CET 2009 - crrodriguez(a)suse.de
+
+- extend GCC 4.3 patch to over gcc 4.4 as well
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sfftobmp.spec ++++++
--- /var/tmp/diff_new_pack.V24259/_old 2009-02-27 01:05:24.000000000 +0100
+++ /var/tmp/diff_new_pack.V24259/_new 2009-02-27 01:05:24.000000000 +0100
@@ -1,10 +1,17 @@
#
# spec file for package sfftobmp (Version 3.1.1)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -17,7 +24,7 @@
Group: Hardware/ISDN
AutoReqProv: on
Version: 3.1.1
-Release: 42
+Release: 100
Summary: Tool to convert Structured Fax Files (.sff) to other image formats
Source: %{name}-%{version}.tar.bz2
Url: http://sfftools.sourceforge.net/
@@ -41,14 +48,14 @@
Peter Schaefer
%prep
-%setup -n %{name}%{version}
-%patch -p1
+%setup -q -n %{name}%{version}
+%patch
%build
-autoreconf --force --install -W none || true
-./configure \
- --prefix=/usr
-make CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS"
+touch INSTALL NEWS README AUTHORS ChangeLog COPYING
+autoreconf --force --install
+%configure
+%{__make} %{?jobs:-j%jobs}
%install
make DESTDIR=$RPM_BUILD_ROOT install
@@ -62,10 +69,12 @@
%files
%defattr(-,root,root)
-/usr/bin/sfftobmp
+%{_bindir}/sfftobmp
%doc %{_defaultdocdir}/sfftobmp
%changelog
+* Thu Feb 26 2009 crrodriguez(a)suse.de
+- extend GCC 4.3 patch to over gcc 4.4 as well
* Thu Feb 21 2008 kkeil(a)suse.de
- fix permissions of doc files
* Thu Oct 11 2007 kkeil(a)suse.de
++++++ sfftobmp-gcc43.diff ++++++
--- /var/tmp/diff_new_pack.V24259/_old 2009-02-27 01:05:24.000000000 +0100
+++ /var/tmp/diff_new_pack.V24259/_new 2009-02-27 01:05:24.000000000 +0100
@@ -1,7 +1,7 @@
-Index: sfftobmp3.1.1/src/input.cpp
+Index: src/input.cpp
===================================================================
---- sfftobmp3.1.1.orig/src/input.cpp
-+++ sfftobmp3.1.1/src/input.cpp
+--- src/input.cpp.orig 2007-10-07 21:01:20.000000000 +0200
++++ src/input.cpp 2009-02-26 18:10:08.000000000 +0100
@@ -38,6 +38,7 @@
#include <vector>
@@ -10,10 +10,10 @@
#include "sfftypes.h"
#include "common.h"
-Index: sfftobmp3.1.1/src/output.cpp
+Index: src/output.cpp
===================================================================
---- sfftobmp3.1.1.orig/src/output.cpp
-+++ sfftobmp3.1.1/src/output.cpp
+--- src/output.cpp.orig 2007-10-07 21:01:21.000000000 +0200
++++ src/output.cpp 2009-02-26 18:10:08.000000000 +0100
@@ -39,6 +39,7 @@
#include <cassert>
@@ -22,3 +22,28 @@
#include <boost/filesystem/path.hpp>
#include <boost/filesystem/convenience.hpp>
+Index: src/cmdline.cpp
+===================================================================
+--- src/cmdline.cpp.orig 2007-10-07 21:01:21.000000000 +0200
++++ src/cmdline.cpp 2009-02-26 18:11:53.000000000 +0100
+@@ -35,6 +35,7 @@
+
+ ---RCS-Info--------------------------------------------------*/
+
++#include <cstdio>
+ #include <vector>
+ #include <cassert>
+ #include <iostream>
+Index: src/common.cpp
+===================================================================
+--- src/common.cpp.orig 2007-10-07 21:01:20.000000000 +0200
++++ src/common.cpp 2009-02-26 18:42:35.000000000 +0100
+@@ -38,7 +38,7 @@
+
+ #include "sfftypes.h"
+ #include "common.h"
+-
++#include <stdio.h>
+ #include <time.h>
+ #include <errno.h>
+ #include <sys/types.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
Hello community,
here is the log from the commit of package OpenOffice_org-bootstrap for openSUSE:Factory
checked in at Fri Feb 27 01:05:16 CET 2009.
--------
--- OpenOffice_org-bootstrap/OpenOffice_org-bootstrap.changes 2009-02-20 15:19:27.000000000 +0100
+++ OpenOffice_org-bootstrap/OpenOffice_org-bootstrap.changes 2009-02-26 18:00:41.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Feb 26 17:58:04 CET 2009 - pmladek(a)suse.cz
+
+- fixed context of wpgimporter.diff to apply with new patch (bnc#479474)
+- added a workaround for bug in new boost (bnc#479659)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
ooo-build-3.0.0.16.1-sd-build-factory.diff
ooo-build-3.0.0.16.1-wpgimporter.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenOffice_org-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.P11264/_old 2009-02-27 01:03:35.000000000 +0100
+++ /var/tmp/diff_new_pack.P11264/_new 2009-02-27 01:03:35.000000000 +0100
@@ -115,7 +115,7 @@
License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
Group: Productivity/Office/Suite
Version: 3.0.0.16
-Release: 2
+Release: 3
AutoReqProv: on
Summary: OpenOffice.org Build Bootstrap
Url: http://www.openoffice.org/
@@ -136,6 +136,8 @@
# Patch0: ooo-build-2.4-enable-foo.diff # example
Patch0: ooo-build-help-in-usr-share.diff
Patch1: ooo-build-3.0.0.10-extensions-hack.diff
+Patch2: ooo-build-3.0.0.16.1-wpgimporter.diff
+Patch3: ooo-build-3.0.0.16.1-sd-build-factory.diff
#
# patches against the upstream sources, must be -p0
# Patch1000: bug-123456-fix-foo.diff # example
@@ -162,6 +164,8 @@
# %patch0 # example
%patch0
%patch1
+%patch2
+%patch3
%endif
chmod 755 bin/piece/file-list-libs_extern
@@ -303,6 +307,9 @@
%ooo_prefix/%ooo_home/ooo-build/*
%changelog
+* Thu Feb 26 2009 pmladek(a)suse.cz
+- fixed context of wpgimporter.diff to apply with new patch (bnc#479474)
+- added a workaround for bug in new boost (bnc#479659)
* Fri Feb 20 2009 pmladek(a)suse.cz
- updated ooo-build to version 3.0.0.16.1:
* do not lost charts (bnc#476293)
++++++ ooo-build-3.0.0.16.1-sd-build-factory.diff ++++++
--- patches/dev300/apply
+++ patches/dev300/apply
@@ -1049,6 +1049,8 @@
# even worse, the direcotry had the rights 444
installer-get-path-correctly.diff, pmladek
+sd-build-factory.diff
+
# enable build with IBM Java 1.6.0
build-ibm-java-enable.diff, i#93114, pmladek
--- patches/dev300/sd-build-factory.diff
+++ patches/dev300/sd-build-factory.diff
@@ -0,0 +1,12 @@
+--- sd/source/ui/app/makefile.mk.old 2008-04-10 21:23:42.000000000 +0200
++++ sd/source/ui/app/makefile.mk 2009-02-25 20:03:48.000000000 +0100
+@@ -78,6 +78,9 @@ SLOFILES = \
+
+ EXCEPTIONSFILES= \
+ $(SLO)$/sdxfer.obj \
++ $(SLO)$/sddll1.obj \
++ $(SLO)$/sddll2.obj \
++ $(SLO)$/sdmod2.obj \
+ $(SLO)$/sdmod1.obj \
+ $(SLO)$/tmplctrl.obj
+
++++++ ooo-build-3.0.0.16.1-wpgimporter.diff ++++++
--- patches/dev300/wpgimporter.diff
+++ patches/dev300/wpgimporter.diff
@@ -104,16 +104,16 @@
# count = 6
--- scp2/source/graphicfilter/file_graphicfilter.scp 20 Jun 2006 04:52:21 -0000 1.11
+++ scp2/source/graphicfilter/file_graphicfilter.scp 7 May 2007 13:55:23 -0000
-@@ -67,3 +67,5 @@
+@@ -62,3 +62,5 @@ STD_UNO_LIB_FILE( gid_File_Lib_Flash, fl
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svg, svgfilter )
+ STD_UNO_LIB_FILE( gid_File_Lib_Svg, svgfilter )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_WPGImport, wpgimport )
+
--- scp2/source/graphicfilter/module_graphicfilter.scp 9 Sep 2005 01:28:30 -0000 1.4
+++ scp2/source/graphicfilter/module_graphicfilter.scp 6 Jun 2007 07:53:53 -0000
-@@ -39,7 +39,7 @@
- MOD_NAME_DESC ( MODULE_OPTIONAL_GRFFLT );
+@@ -36,7 +36,7 @@ Module gid_Module_Optional_Grfflt
+ Sortkey = "600";
ParentID = gid_Module_Optional;
Default = YES;
- Files = (gid_File_Lib_Svg, gid_File_Lib_Flash,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package lablgtk2 for openSUSE:Factory
checked in at Fri Feb 27 01:03:21 CET 2009.
--------
--- lablgtk2/lablgtk2.changes 2008-04-21 13:06:13.000000000 +0200
+++ lablgtk2/lablgtk2.changes 2009-02-26 17:17:45.258707000 +0100
@@ -1,0 +2,12 @@
+Wed Feb 25 08:34:35 CET 2009 - seife(a)suse.de
+
+- update to version 2.12.0
+ - please see the changelog for details
+
+-------------------------------------------------------------------
+Thu Feb 19 12:34:56 CET 2009 - radomir.cernoch(a)gmail.com
+
+- 'make' changed to 'make world' to build additional libraries
+- 'configure' changed to '%configure'
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
lablgtk-2.10.1.tar.gz
New:
----
lablgtk-2.12.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lablgtk2.spec ++++++
--- /var/tmp/diff_new_pack.fw8764/_old 2009-02-27 01:02:58.000000000 +0100
+++ /var/tmp/diff_new_pack.fw8764/_new 2009-02-27 01:02:58.000000000 +0100
@@ -1,10 +1,17 @@
#
-# spec file for package lablgtk2 (Version 2.10.1)
+# spec file for package lablgtk2 (Version 2.12.0)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -16,14 +23,13 @@
%if 0%{?suse_version} >= 1010
BuildRequires: camlp4
%endif
-BuildRequires: librsvg-devel
License: LGPL v2.1 or later
Group: Development/Libraries/Other
Requires: ocaml
AutoReqProv: on
-Version: 2.10.1
+Version: 2.12.0
Release: 1
-Source0: http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk-%{version}.tar.gz
+Source0: lablgtk-%{version}.tar.bz2
Source1: rpmlintrc
Url: http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -78,8 +84,8 @@
%build
export CFLAGS="$RPM_OPT_FLAGS"
make configure
-./configure
-make
+%configure
+make world opt
%ifnarch ppc64 s390 s390x
cd src
make lablgtk.cmxa
@@ -89,7 +95,6 @@
%endif
%install
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2
make INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2\
@@ -115,6 +120,12 @@
%{_libdir}/ocaml/lablgtk2/*.h
%changelog
+* Wed Feb 25 2009 seife(a)suse.de
+- update to version 2.12.0
+ - please see the changelog for details
+* Thu Feb 19 2009 radomir.cernoch(a)gmail.com
+- 'make' changed to 'make world' to build additional libraries
+- 'configure' changed to '%%configure'
* Mon Apr 21 2008 seife(a)suse.de
- update to version 2.10.1
- fix wrong type in GContainer.mli (could not compile with 3.10.2)
@@ -131,7 +142,7 @@
* Fri Jun 15 2007 ro(a)suse.de
- added rsvg bindings
- handle ppc64 like s390 (no ocamlopt)
-* Wed Jun 06 2007 ro(a)suse.de
+* Tue Jun 05 2007 ro(a)suse.de
- added ocamlp4 to buildreq
- silence a compiler warning
* Fri May 25 2007 ro(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory
checked in at Fri Feb 27 01:02:51 CET 2009.
--------
--- kiwi/kiwi.changes 2009-02-23 17:43:56.000000000 +0100
+++ kiwi/kiwi.changes 2009-02-26 19:11:35.807903000 +0100
@@ -1,0 +2,26 @@
+Wed Feb 25 14:08:16 CET 2009 - ms(a)suse.de
+
+- v3.22
+- fixed this path evaluation in upgrade mode
+- removed static passwd/shadow and group files from examples
+- added md5 checksum test in OEM install mode (bnc #479842)
+- added progress information in recovery mode (bnc #479844)
+- fixed handling of oem-boot-title. If the title is set it
+ is prefered over the displayname attribute. Additionally
+ the given string is used as complete title name when oemboot
+ reconfigures the bootloader (bnc #479838)
+- added support for an alternative bootloader [syslinux].
+ You can specify bootloader="syslinux" as part of the type
+ setup and kiwi uses syslinux instead of grub. This works
+ for the _usb_ image type (bnc #478989)
+
+-------------------------------------------------------------------
+Tue Feb 24 10:57:26 CET 2009 - ms(a)suse.de
+
+- v3.21
+- fixed KIWIManager key/value parsing when zypper is used.
+ If the URL itself contains the "=" sign the key=value
+ regular expression returns the wrong result and the URL
+ was broken (bnc #478673)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.Jl2803/_old 2009-02-27 01:01:30.000000000 +0100
+++ /var/tmp/diff_new_pack.Jl2803/_new 2009-02-27 01:01:30.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kiwi (Version 3.20)
+# spec file for package kiwi (Version 3.22)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -50,7 +50,7 @@
Summary: OpenSuSE - KIWI Image System
Provides: kiwi2 <= 2.14
Obsoletes: kiwi2 <= 2.14
-Version: 3.20
+Version: 3.22
Release: 1
Group: System/Management
License: GPL v2 or later
@@ -551,6 +551,26 @@
%endif
%changelog
+* Wed Feb 25 2009 ms(a)suse.de
+- v3.22
+- fixed this path evaluation in upgrade mode
+- removed static passwd/shadow and group files from examples
+- added md5 checksum test in OEM install mode (bnc #479842)
+- added progress information in recovery mode (bnc #479844)
+- fixed handling of oem-boot-title. If the title is set it
+ is prefered over the displayname attribute. Additionally
+ the given string is used as complete title name when oemboot
+ reconfigures the bootloader (bnc #479838)
+- added support for an alternative bootloader [syslinux].
+ You can specify bootloader="syslinux" as part of the type
+ setup and kiwi uses syslinux instead of grub. This works
+ for the _usb_ image type (bnc #478989)
+* Tue Feb 24 2009 ms(a)suse.de
+- v3.21
+- fixed KIWIManager key/value parsing when zypper is used.
+ If the URL itself contains the "=" sign the key=value
+ regular expression returns the wrong result and the URL
+ was broken (bnc #478673)
* Mon Feb 23 2009 ms(a)suse.de
- v3.20
- added suse-11.2 boot image description (bnc #478461)
++++++ kiwi.tar.bz2 ++++++
kiwi/kiwi.tar.bz2 kiwi/kiwi.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package compiz for openSUSE:Factory
checked in at Fri Feb 27 01:01:15 CET 2009.
--------
--- compiz/compiz.changes 2009-02-26 00:53:46.000000000 +0100
+++ compiz/compiz.changes 2009-02-26 23:29:49.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Feb 26 17:17:26 EST 2009 - davidr(a)novell.com
+
+- Improve bug-475349-moveInputFocusToOtherWindow.diff. (bnc#480088)
+
+-------------------------------------------------------------------
+Thu Feb 26 12:10:11 EST 2009 - davidr(a)novell.com
+
+- Have dbus plugin register plugin options properly. (bnc#480007)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.q25172/_old 2009-02-27 00:58:52.000000000 +0100
+++ /var/tmp/diff_new_pack.q25172/_new 2009-02-27 00:58:52.000000000 +0100
@@ -44,7 +44,7 @@
%endif
AutoReqProv: on
Version: 0.7.8
-Release: 33
+Release: 34
Requires: compiz-decorator = %{version} compiz-branding = %{version}
Provides: windowmanager
Summary: OpenGL window and compositing manager.
@@ -436,6 +436,10 @@
%_datadir/compiz/sle.png
%changelog
+* Thu Feb 26 2009 davidr(a)novell.com
+- Improve bug-475349-moveInputFocusToOtherWindow.diff. (bnc#480088)
+* Thu Feb 26 2009 davidr(a)novell.com
+- Have dbus plugin register plugin options properly. (bnc#480007)
* Wed Feb 25 2009 davidr(a)novell.com
- Fix gconf plugin. (bnc#479749)
* Tue Feb 24 2009 davidr(a)novell.com
++++++ bug-475349-moveInputFocusToOtherWindow.diff ++++++
--- /var/tmp/diff_new_pack.q25172/_old 2009-02-27 00:58:52.000000000 +0100
+++ /var/tmp/diff_new_pack.q25172/_new 2009-02-27 00:58:52.000000000 +0100
@@ -1,5 +1,18 @@
+diff --git a/src/display.c b/src/display.c
+index 72515b6..1e3593b 100644
+--- a/src/display.c
++++ b/src/display.c
+@@ -2634,7 +2634,7 @@ manageDisplay (CompDisplay *d)
+
+ /* move input focus to root window so that we get a FocusIn event when
+ moving it to the default window */
+- XSetInputFocus (dpy, d->screens->root.id, RevertToPointerRoot,
++ XSetInputFocus (dpy, d->screens->root.id, RevertToNone,
+ CurrentTime);
+
+ if (focus == None || focus == PointerRoot)
diff --git a/src/event.c b/src/event.c
-index f9edcfc..4ca24c5 100644
+index f9edcfc..35ee54e 100644
--- a/src/event.c
+++ b/src/event.c
@@ -149,9 +149,8 @@ moveInputFocusToOtherWindow (CompWindow *w)
@@ -33,3 +46,61 @@
}
}
+@@ -2262,10 +2265,6 @@ handleEvent (CompDisplay *d,
+ if (w->parent == &w->screen->root)
+ d->activeWindow = w->id;
+
+- w->activeNum = w->screen->activeNum++;
+-
+- addToCurrentActiveWindowHistory (w->screen, w->id);
+-
+ XChangeProperty (d->display, w->screen->root.id,
+ d->winActiveAtom,
+ XA_WINDOW, 32, PropModeReplace,
+diff --git a/src/screen.c b/src/screen.c
+index 12ac091..1669059 100644
+--- a/src/screen.c
++++ b/src/screen.c
+@@ -2670,7 +2670,7 @@ focusDefaultWindow (CompScreen *s)
+ }
+ else
+ {
+- XSetInputFocus (d->display, s->root.id, RevertToPointerRoot,
++ XSetInputFocus (d->display, s->root.id, RevertToNone,
+ CurrentTime);
+ }
+ }
+diff --git a/src/window.c b/src/window.c
+index 4ef55d9..37d9cb5 100644
+--- a/src/window.c
++++ b/src/window.c
+@@ -3215,7 +3215,7 @@ moveInputFocusToWindow (CompWindow *w)
+
+ if (w->state & CompWindowStateHiddenMask)
+ {
+- XSetInputFocus (d->display, w->frame, RevertToPointerRoot,
++ XSetInputFocus (d->display, w->frame, RevertToNone,
+ CurrentTime);
+ XChangeProperty (d->display, w->parent->id, d->winActiveAtom,
+ XA_WINDOW, 32, PropModeReplace,
+@@ -3227,7 +3227,7 @@ moveInputFocusToWindow (CompWindow *w)
+
+ if (w->inputHint)
+ {
+- XSetInputFocus (d->display, w->id, RevertToPointerRoot,
++ XSetInputFocus (d->display, w->id, RevertToNone,
+ CurrentTime);
+ setFocus = TRUE;
+ }
+@@ -3268,6 +3268,11 @@ moveInputFocusToWindow (CompWindow *w)
+ }
+ }
+ }
++ else
++ {
++ w->activeNum = w->screen->activeNum++;
++ addToCurrentActiveWindowHistory (w->screen, w->id);
++ }
+ }
+ }
+
++++++ compiz-0.7.8-NOMAD.diff ++++++
--- /var/tmp/diff_new_pack.q25172/_old 2009-02-27 00:58:52.000000000 +0100
+++ /var/tmp/diff_new_pack.q25172/_new 2009-02-27 00:58:52.000000000 +0100
@@ -3590,10 +3590,10 @@
UNWRAP (cs, s, applyScreenTransform);
UNWRAP (cs, s, outputChangeNotify);
diff --git a/plugins/dbus.c b/plugins/dbus.c
-index bcc6f28..97f6218 100644
+index bcc6f28..01734d5 100644
--- a/plugins/dbus.c
+++ b/plugins/dbus.c
-@@ -65,8 +65,10 @@ typedef struct _DbusCore {
+@@ -65,13 +65,17 @@ typedef struct _DbusCore {
CompFileWatchHandle fileWatch[DBUS_FILE_WATCH_NUM];
@@ -3606,7 +3606,66 @@
} DbusCore;
typedef struct _DbusDisplay {
-@@ -2169,62 +2171,6 @@ dbusUnregisterPluginsForScreen (DBusConnection *connection,
+ char **pluginList;
+ unsigned int nPlugins;
++
++ CompTimeoutHandle registerPluginsHandle;
+ } DbusDisplay;
+
+ static DBusHandlerResult dbusHandleMessage (DBusConnection *,
+@@ -96,6 +100,19 @@ static DBusObjectPathVTable dbusMessagesVTable = {
+ DbusDisplay *dd = GET_DBUS_DISPLAY (d)
+
+ static void
++dbusEmptyPluginList (CompDisplay *d)
++{
++ int i;
++
++ DBUS_DISPLAY (d);
++
++ for (i = 0; i < dd->nPlugins; i++)
++ free (dd->pluginList[i]);
++
++ dd->nPlugins = 0;
++}
++
++static void
+ dbusUpdatePluginList (CompDisplay *d)
+ {
+ CompListValue *pl;
+@@ -105,20 +122,15 @@ dbusUpdatePluginList (CompDisplay *d)
+
+ pl = &d->opt[COMP_DISPLAY_OPTION_ACTIVE_PLUGINS].value.list;
+
+- for (i = 0; i < dd->nPlugins; i++)
+- free (dd->pluginList[i]);
++ dbusEmptyPluginList (d);
+
+ dd->pluginList = realloc (dd->pluginList, pl->nValue * sizeof (char *));
+ if (!dd->pluginList)
+- {
+- dd->nPlugins = 0;
+ return;
+- }
+
+ for (i = 0; i < pl->nValue; i++)
+- dd->pluginList[i] = strdup (pl->value[i].s);
+-
+- dd->nPlugins = pl->nValue;
++ if (findActivePlugin (pl->value[i].s))
++ dd->pluginList[dd->nPlugins++] = strdup (pl->value[i].s);
+ }
+
+ static CompOption *
+@@ -1814,6 +1826,7 @@ dbusHandleMessage (DBusConnection *connection,
+ dbus_free_string_array (path);
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
++
+ /* option message */
+ if (dbus_message_is_method_call (message, DBUS_INTERFACE_INTROSPECTABLE,
+ "Introspect"))
+@@ -2169,59 +2182,26 @@ dbusUnregisterPluginsForScreen (DBusConnection *connection,
}
static CompBool
@@ -3627,11 +3686,15 @@
-static Bool
-dbusInitPluginForScreen (CompPlugin *p,
- CompScreen *s)
--{
++dbusRegisterPlugins (void *data)
+ {
- char objectPath[256];
--
-- DBUS_CORE (&core);
--
++ CompDisplay *d = (CompDisplay *) data;
++ CompScreen *s;
+
+ DBUS_CORE (&core);
++ DBUS_DISPLAY (d);
+
- snprintf (objectPath, 256, "%s/%s/screen%d", COMPIZ_DBUS_ROOT_PATH,
- p->vTable->name, s->screenNum);
- dbusRegisterOptions (dc->connection, objectPath);
@@ -3646,11 +3709,14 @@
- CompBool status;
-
- DBUS_CORE (&core);
--
++ if (d->dirtyPluginList)
++ return TRUE;
+
- UNWRAP (dc, &core, initPluginForObject);
- status = (*core.initPluginForObject) (p, o);
- WRAP (dc, &core, initPluginForObject, dbusInitPluginForObject);
--
++ dd->registerPluginsHandle = 0;
+
- if (status && p->vTable->getObjectOptions)
- {
- static InitPluginForObjectProc dispTab[] = {
@@ -3658,18 +3724,44 @@
- (InitPluginForObjectProc) dbusInitPluginForDisplay,
- (InitPluginForObjectProc) dbusInitPluginForScreen
- };
--
++ dbusUpdatePluginList (d);
+
- RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), TRUE, (p, o));
- }
--
++ dbusRegisterPluginsForDisplay (dc->connection, d);
++ for (s = d->screens; s; s = s->next)
++ dbusRegisterPluginsForScreen (dc->connection, s);
+
- return status;
--}
--
--static CompBool
- dbusSetOptionForPlugin (CompObject *object,
- const char *plugin,
- const char *name,
-@@ -2297,6 +2243,81 @@ dbusSendPluginsChangedSignal (const char *name,
++ return FALSE;
+ }
+
+ static CompBool
+@@ -2262,16 +2242,19 @@ dbusSetOptionForPlugin (CompObject *object,
+ CompScreen *s;
+
+ CORE_DISPLAY (object);
++ DBUS_DISPLAY (d);
+
+ dbusUnregisterPluginsForDisplay (dc->connection, d);
+ for (s = d->screens; s; s = s->next)
+ dbusUnregisterPluginsForScreen (dc->connection, s);
+
+- dbusUpdatePluginList (d);
++ dbusEmptyPluginList (d);
+
+- dbusRegisterPluginsForDisplay (dc->connection, d);
+- for (s = d->screens; s; s = s->next)
+- dbusRegisterPluginsForScreen (dc->connection, s);
++ if (!dd->registerPluginsHandle)
++ dd->registerPluginsHandle =
++ compAddTimeout (10, -1,
++ dbusRegisterPlugins,
++ d);
+ }
+ }
+ }
+@@ -2297,6 +2280,84 @@ dbusSendPluginsChangedSignal (const char *name,
dbus_message_unref (signal);
}
@@ -3677,10 +3769,12 @@
+dbusDisplayAdd (CompCore *c,
+ CompDisplay *d)
+{
-+ DBUS_CORE (&core);
++ DBUS_DISPLAY (d);
+
-+ dbusUpdatePluginList (d);
-+ dbusRegisterPluginsForDisplay (dc->connection, d);
++ if (!dd->registerPluginsHandle)
++ dd->registerPluginsHandle = compAddTimeout (10, -1,
++ dbusRegisterPlugins,
++ d);
+}
+
+static void
@@ -3690,6 +3784,7 @@
+ DBUS_CORE (&core);
+
+ dbusUnregisterPluginsForDisplay (dc->connection, d);
++ dbusEmptyPluginList (d);
+}
+
+static void
@@ -3751,7 +3846,7 @@
static Bool
dbusInitCore (CompPlugin *p,
CompCore *c)
-@@ -2415,7 +2436,8 @@ dbusInitCore (CompPlugin *p,
+@@ -2415,7 +2476,8 @@ dbusInitCore (CompPlugin *p,
}
}
@@ -3761,7 +3856,7 @@
WRAP (dc, c, setOptionForPlugin, dbusSetOptionForPlugin);
c->base.privates[corePrivateIndex].ptr = dc;
-@@ -2452,7 +2474,8 @@ dbusFiniCore (CompPlugin *p,
+@@ -2452,7 +2514,8 @@ dbusFiniCore (CompPlugin *p,
dbus_connection_unref (dc->connection);
*/
@@ -3771,8 +3866,21 @@
UNWRAP (dc, c, setOptionForPlugin);
free (dc);
-@@ -2475,8 +2498,8 @@ dbusInitDisplay (CompPlugin *p,
+@@ -2464,8 +2527,6 @@ dbusInitDisplay (CompPlugin *p,
+ {
+ DbusDisplay *dd;
+
+- DBUS_CORE (&core);
+-
+ dd = malloc (sizeof (DbusDisplay));
+ if (!dd)
+ return FALSE;
+@@ -2473,10 +2534,12 @@ dbusInitDisplay (CompPlugin *p,
+ dd->pluginList = NULL;
+ dd->nPlugins = 0;
++ dd->registerPluginsHandle = 0;
++
d->base.privates[displayPrivateIndex].ptr = dd;
- dbusUpdatePluginList (d);
@@ -3782,7 +3890,7 @@
return TRUE;
}
-@@ -2485,10 +2508,10 @@ static void
+@@ -2485,10 +2548,13 @@ static void
dbusFiniDisplay (CompPlugin *p,
CompDisplay *d)
{
@@ -3790,12 +3898,15 @@
DBUS_DISPLAY (d);
- dbusUnregisterPluginsForDisplay (dc->connection, d);
++ if (dd->registerPluginsHandle)
++ compRemoveTimeout (dd->registerPluginsHandle);
++
+ if (d->base.parent)
+ dbusObjectRemove (d->base.parent, &d->base);
if (dd->pluginList)
{
-@@ -2506,9 +2529,8 @@ static Bool
+@@ -2506,9 +2572,8 @@ static Bool
dbusInitScreen (CompPlugin *p,
CompScreen *s)
{
@@ -3807,7 +3918,7 @@
return TRUE;
}
-@@ -2517,9 +2539,8 @@ static void
+@@ -2517,9 +2582,8 @@ static void
dbusFiniScreen (CompPlugin *p,
CompScreen *s)
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package yast2-printer for openSUSE:Factory
checked in at Fri Feb 27 00:56:39 CET 2009.
--------
--- yast2-printer/yast2-printer.changes 2009-02-17 14:07:17.000000000 +0100
+++ yast2-printer/yast2-printer.changes 2009-02-26 15:28:38.337136000 +0100
@@ -1,0 +2,21 @@
+Thu Feb 26 14:49:04 CET 2009 - jsmeix(a)suse.de
+
+- Fixed the "More Drivers" functionality in basicmodify.ycp
+ to show the current driver topmost in any case.
+- Enhanced help texts for basicadd.ycp and basicmodify.ycp
+ to describe driver related issues in much more detail.
+- Call Wizard::SetContents with empty content in basicadd.ycp
+ and basicmodify.ycp to avoid that initially the previous
+ dialog is shown until the real content is generated.
+- 2.18.7
+
+-------------------------------------------------------------------
+Wed Feb 25 16:19:45 CET 2009 - jsmeix(a)suse.de
+
+- Added a "More Drivers" functionality to basicadd.ycp and
+ basicmodify.ycp (see Novell/Suse Bugzilla bnc#468046).
+- Fixed the test whether there is a valid driver and a valid
+ connection before a queue is set up in printer_proposal.ycp.
+- 2.18.6
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-printer-2.18.5.tar.bz2
New:
----
yast2-printer-2.18.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.j10814/_old 2009-02-27 00:54:37.000000000 +0100
+++ /var/tmp/diff_new_pack.j10814/_new 2009-02-27 00:54:37.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.18.5)
+# spec file for package yast2-printer (Version 2.18.7)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,12 +20,12 @@
Url: http://en.opensuse.org/YaST/Modules/Printer
Name: yast2-printer
-Version: 2.18.5
+Version: 2.18.7
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.18.5.tar.bz2
+Source0: yast2-printer-2.18.7.tar.bz2
Prefix: /usr
BuildRequires: cups-devel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite
Recommends: netcat
@@ -65,7 +65,7 @@
Michal Zugec <mzugec(a)suse.cz>
%prep
-%setup -n yast2-printer-2.18.5
+%setup -n yast2-printer-2.18.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -127,6 +127,21 @@
%exclude %{prefix}/share/doc/packages/yast2-printer/COPYING
%exclude %{prefix}/share/doc/packages/yast2-printer/README
%changelog
+* Thu Feb 26 2009 jsmeix(a)suse.de
+- Fixed the "More Drivers" functionality in basicmodify.ycp
+ to show the current driver topmost in any case.
+- Enhanced help texts for basicadd.ycp and basicmodify.ycp
+ to describe driver related issues in much more detail.
+- Call Wizard::SetContents with empty content in basicadd.ycp
+ and basicmodify.ycp to avoid that initially the previous
+ dialog is shown until the real content is generated.
+- 2.18.7
+* Wed Feb 25 2009 jsmeix(a)suse.de
+- Added a "More Drivers" functionality to basicadd.ycp and
+ basicmodify.ycp (see Novell/Suse Bugzilla bnc#468046).
+- Fixed the test whether there is a valid driver and a valid
+ connection before a queue is set up in printer_proposal.ycp.
+- 2.18.6
* Tue Feb 17 2009 jsmeix(a)suse.de
- Removed Firewall Settings which were added in version 2.17.29
because it is not possible to implement it so that it works
++++++ yast2-printer-2.18.5.tar.bz2 -> yast2-printer-2.18.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.5/configure new/yast2-printer-2.18.7/configure
--- old/yast2-printer-2.18.5/configure 2009-02-17 13:53:52.000000000 +0100
+++ new/yast2-printer-2.18.7/configure 2009-02-26 15:22:24.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-printer 2.18.5.
+# Generated by GNU Autoconf 2.63 for yast2-printer 2.18.7.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-printer'
PACKAGE_TARNAME='yast2-printer'
-PACKAGE_VERSION='2.18.5'
-PACKAGE_STRING='yast2-printer 2.18.5'
+PACKAGE_VERSION='2.18.7'
+PACKAGE_STRING='yast2-printer 2.18.7'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1274,7 +1274,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-printer 2.18.5 to adapt to many kinds of systems.
+\`configure' configures yast2-printer 2.18.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1345,7 +1345,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-printer 2.18.5:";;
+ short | recursive ) echo "Configuration of yast2-printer 2.18.7:";;
esac
cat <<\_ACEOF
@@ -1425,7 +1425,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-printer configure 2.18.5
+yast2-printer configure 2.18.7
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1439,7 +1439,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-printer $as_me 2.18.5, which was
+It was created by yast2-printer $as_me 2.18.7, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2286,7 +2286,7 @@
# Define the identity of the package.
PACKAGE='yast2-printer'
- VERSION='2.18.5'
+ VERSION='2.18.7'
cat >>confdefs.h <<_ACEOF
@@ -2510,7 +2510,7 @@
-VERSION="2.18.5"
+VERSION="2.18.7"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec <mzugec(a)novell.com>"
@@ -3451,7 +3451,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-printer $as_me 2.18.5, which was
+This file was extended by yast2-printer $as_me 2.18.7, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3501,7 +3501,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-printer config.status 2.18.5
+yast2-printer config.status 2.18.7
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.5/configure.in new/yast2-printer-2.18.7/configure.in
--- old/yast2-printer-2.18.5/configure.in 2009-02-17 13:53:48.000000000 +0100
+++ new/yast2-printer-2.18.7/configure.in 2009-02-26 15:22:19.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-printer, 2.18.5, http://bugs.opensuse.org/, yast2-printer)
+AC_INIT(yast2-printer, 2.18.7, http://bugs.opensuse.org/, yast2-printer)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.18.5"
+VERSION="2.18.7"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec <mzugec(a)novell.com>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.5/src/basicadd.ycp new/yast2-printer-2.18.7/src/basicadd.ycp
--- old/yast2-printer-2.18.5/src/basicadd.ycp 2009-02-17 11:15:31.000000000 +0100
+++ new/yast2-printer-2.18.7/src/basicadd.ycp 2009-02-26 14:07:12.000000000 +0100
@@ -47,6 +47,16 @@
{ y2milestone( "entering BasicAddDialog" );
// Caption for the "Add Printer" dialog (BasicAddDialog):
string caption = _("Add New Printer Configuration");
+ // Clear whatever content of a previous dialog which would show up here for several seconds
+ // until all the following stuff is done before Wizard::SetContentsButtons is called
+ // which finally shows the right content for this dialog.
+ Wizard::SetContents( caption,
+ `Empty(),
+ HELPS["basic_add_dialog"]:"",
+ false,
+ false
+ );
+ Wizard::HideAbortButton();
string driver_filter_string = "BasicAddDialog";
string driver_filter_input_text = "";
string queue_name_proposal = "";
@@ -110,39 +120,47 @@
),
`VStretch(),
`VBox
- ( `HBox
- ( `ReplacePoint
+ ( `Left
+ ( `Label
+ ( // Caption for a printer driver selection:
+ _("Assign Driver")
+ )
+ ),
+ `HBox
+ ( `PushButton
+ ( `id(`apply_driver_filter),
+ // This button must be the default
+ // (it is activated when the user pressed the Enter key)
+ // because when the user has clicked into TextEntry to enter something
+ // it is normal to finish entering by pressing the Enter key
+ // but if the Enter key was linked to 'Next' or 'Back',
+ // the user would get the wrong action.
+ `opt(`default),
+ // Label of a PushButton to search a list for a search string
+ // and then show the search result:
+ _("&Search")
+ ),
+ `ReplacePoint
( `id(`driver_filter_input_replace_point),
`InputField
- ( `id(`driver_filter_input), `opt(`hstretch),
- // Caption for a printer driver selection:
- _("Search for &Drivers"),
+ ( `id(`driver_filter_input),
+ `opt(`hstretch),
+ // No InputField header because there is the "Caption for a printer driver selection":
+ "",
driver_filter_input_text
)
),
- `VBox
- ( `Label(""),
- `HBox
- ( `PushButton
- ( `id(`apply_driver_filter),
- // This button must be the default
- // (it is activated when the user pressed the Enter key)
- // because when the user has clicked into TextEntry to enter something
- // it is normal to finish entering by pressing the Enter key
- // but if the Enter key was linked to 'Next' or 'Back',
- // the user would get the wrong action.
- `opt(`default),
- // Label of a PushButton to search a list for a search string
- // and then show the search result:
- _("&Show Matching Drivers")
- ),
- `PushButton
- ( `id(`add_driver),
- // Label of a PushButton to go to the "Add Driver" dialog
- // to install a new driver (and perhaps download it before):
- _("&Add Driver")
- )
- )
+ `HStretch(),
+ `PushButton
+ ( `id(`more_drivers),
+ // Label of a PushButton to show more available printer drivers:
+ _("More &Drivers")
+ ),
+ `PushButton
+ ( `id(`add_driver),
+ // Label of a PushButton to go to the "Add Driver" dialog
+ // to install a new driver (and perhaps download it before):
+ _("&Add Driver")
)
),
`ReplacePoint
@@ -157,20 +175,39 @@
"",
[ `item( `id( -1 ), _("Select a driver.") ) ]
)
+ ),
+ `RadioButtonGroup
+ ( `id(`paper_size_radio_buttons),
+ `HBox
+ ( `Label
+ ( // Label of a RadioButtonGroup to specify the default paper size:
+ _("Default paper size (if printer and driver supports it)")
+ ),
+ // Have none of the RadioButtons preselected which means that
+ // by default the CUPS default is used for the default paper size.
+ // For the CUPS 1.3 default see http://www.cups.org/str.php?L2846
+ // For CUPS 1.4 the default depends on the "DefaultPaperSize" setting in cupsd.conf
+ // see https://bugzilla.novell.com/show_bug.cgi?id=395760
+ // and http://www.cups.org/str.php?L2848
+ `HSpacing( 2 ),
+ `RadioButton( `id(`a4), "A&4" ),
+ `HSpacing( 1 ),
+ `RadioButton( `id(`letter), "Le&tter" ),
+ `HStretch()
+ )
)
),
`VStretch(),
- `HBox
+ `Left
( `ReplacePoint
( `id(`queue_name_input_replace_point),
- `TextEntry
+ `InputField
( `id(`queue_name_input),
// Header of a TextEntry to enter the queue name:
_("Set &Name"),
queue_name_proposal
)
- ),
- `HStretch()
+ )
)
);
// According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE…
@@ -259,10 +296,18 @@
}
queue_name = validated_queue_name;
}
+ string default_paper_size = "";
+ any paper_size = UI::QueryWidget( `id(`paper_size_radio_buttons), `CurrentButton );
+ if( `a4 == paper_size )
+ { default_paper_size = "A4";
+ }
+ if( `letter == paper_size )
+ { default_paper_size = "Letter";
+ }
Wizard::DisableBackButton();
Wizard::DisableNextButton();
// No error messages here because Printer::AddQueue already shows them:
- Printer::AddQueue( queue_name );
+ Printer::AddQueue( queue_name, default_paper_size );
// After a local queue was added, enforce to show also local queues
// in particular when no local queues were shown before:
Printer::queue_filter_show_local = true;
@@ -333,10 +378,20 @@
{ queue_name_proposal = Printer::NewQueueName( tolower( model ) );
driver_filter_input_text = model;
driver_filter_string = filterchars( tolower( model ), Printer::lower_alnum_chars );
- // Match at the beginning also if the connection is from the connection wizard
- // because here the model is only the manufacturer name (or "Generic" or "Raw Queue")
- // so that match at the beginning is exactly right for connections from the connection wizard:
- driver_filter_string = "^" + driver_filter_string;
+ // The first word in the driver_filter_string is usually the first word of the manufacturer name.
+ // This fuzzy match is intended so that e.g. "Kyocera" and "Kyocera Mita" result the same.
+ string manufacturer = splitstring( driver_filter_string, " " )[0]:"";
+ // Match at the beginning only if the first word in the driver_filter_string
+ // is actually a known manufacturer name
+ // (there is only "Kyocera" but not "Kyocera Mita" in the known_manufacturers list).
+ foreach( string known_manufacturer,
+ Printer::known_manufacturers,
+ { if( manufacturer == tolower( known_manufacturer ) )
+ { driver_filter_string = "^" + driver_filter_string;
+ break;
+ }
+ }
+ );
}
if( "" == driver_filter_string )
{ // Set a fallback driver_filter_string which does not match to anything
@@ -348,8 +403,8 @@
UI::ReplaceWidget( `id(`driver_filter_input_replace_point),
`InputField
( `id(`driver_filter_input), `opt(`hstretch),
- // Caption for a printer driver selection:
- _("Search for &Drivers"),
+ // No InputField header because there is the "Caption for a printer driver selection":
+ "",
driver_filter_input_text
)
);
@@ -365,11 +420,12 @@
)
);
UI::ReplaceWidget( `id(`queue_name_input_replace_point),
- `TextEntry( `id(`queue_name_input),
- // Header of a TextEntry to enter the queue name:
- _("Set &Name"),
- queue_name_proposal
- )
+ `InputField
+ ( `id(`queue_name_input),
+ // Header of a TextEntry to enter the queue name:
+ _("Set &Name"),
+ queue_name_proposal
+ )
);
continue;
}
@@ -400,8 +456,8 @@
UI::ReplaceWidget( `id(`driver_filter_input_replace_point),
`InputField
( `id(`driver_filter_input), `opt(`hstretch),
- // Caption for a printer driver selection:
- _("Search for &Drivers"),
+ // No InputField header because there is the "Caption for a printer driver selection":
+ "",
driver_filter_input_text
)
);
@@ -418,6 +474,153 @@
);
continue;
}
+ if( ret == `more_drivers )
+ { driver_filter_string = "";
+ boolean valid_driver_found = false;
+ list driver_items = [];
+ // Use the existing value of model because for each subsequent run of this more_drivers section
+ // the existing value of model is shortened at the end (the last word is removed) to get
+ // more and mor derivers for each subsequent run of this more_drivers section.
+ y2milestone( "More drivers for '%1'", model );
+ if( "" != model
+ && "unknown" != tolower( model )
+ )
+ { // If the model string does not contain a space,
+ // model_words is a singleton list which contains only model.
+ list <string> model_words = splitstring( model, " " );
+ if( size( model_words ) >= 2 )
+ { // If there are less than two words the following does not make sense.
+ // Try to find the word which contains a model number.
+ // This is usually the first word which contains a number.
+ string model_number_word = "";
+ foreach( string word,
+ model_words,
+ { if( "" != filterchars( word, Printer::number_chars ) )
+ { model_number_word = word;
+ break;
+ }
+ }
+ );
+ // Provide visible feeback what is going on:
+ UI::ReplaceWidget( `id(`driver_filter_input_replace_point),
+ `InputField
+ ( `id(`driver_filter_input),
+ `opt(`hstretch),
+ // No InputField header because there is the "Caption for a printer driver selection":
+ "",
+ model_number_word
+ )
+ );
+ driver_filter_string = filterchars( tolower( model_number_word ), Printer::lower_alnum_chars );
+ if( "" != driver_filter_string )
+ { driver_items = Printer::DriverItems( driver_filter_string, true );
+ // Printer::DriverItems may result a driver_items list with one single element
+ // [ `item( `id( -1 ), _("No matching driver found.") ) ]
+ // to show at least a meaningful text as fallback entry to the user
+ // or Printer::DriverItems may result a driver_items list with the first item
+ // [ `item( `id( -1 ), _("Select a driver.") ), ... ]
+ // when Printer::DriverItems could not preselect a driver item.
+ // If a valid driver was found (but perhaps none was preselected),
+ // there would be a non-negative id value of the first or second element
+ // which is driver_items[0,0,0] or driver_items[1,0,0]
+ // (id[0] is the value of the id, see the comment in Printer::DriverItems).
+ if( driver_items[0,0,0]:-1 >= 0
+ || driver_items[1,0,0]:-1 >= 0
+ )
+ { valid_driver_found = true;
+ }
+ }
+ }
+ }
+ // Use the manufacturer when the existing value of model cannot be used
+ // or when nothing was found above:
+ if( ! valid_driver_found )
+ { driver_filter_string = "";
+ string model = Printer::connections[Printer::selected_connections_index,"model"]:"";
+ if( "" != model
+ && "unknown" != tolower( model )
+ )
+ { // The first word in the driver_filter_string is usually the first word of the manufacturer name.
+ // This fuzzy match is intended so that e.g. "Kyocera" and "Kyocera Mita" are the same.
+ string manufacturer = splitstring( model, " " )[0]:"";
+ if( "" != manufacturer )
+ { // Even more fuzziness for very ambiguous manufacturer names:
+ if( "hewlett" == substring( tolower( driver_filter_string ), 0, 7 ) )
+ { // Let "Hewlett-Packard", "Hewlett Packard", and "HP be the same:
+ manufacturer = "HP";
+ }
+ if( "oki" == substring( tolower( driver_filter_string ), 0, 3 ) )
+ { // Let "Oki", "Okidata", and "Okipage" be the same:
+ manufacturer = "Oki";
+ }
+ driver_filter_string = tolower( manufacturer );
+ // Match at the beginning only if the driver_filter_string is actually a known manufacturer:
+ foreach( string known_manufacturer,
+ Printer::known_manufacturers,
+ { if( driver_filter_string == tolower( known_manufacturer ) )
+ { driver_filter_string = "^" + driver_filter_string;
+ break;
+ }
+ }
+ );
+ // Provide visible feeback what is going on:
+ UI::ReplaceWidget( `id(`driver_filter_input_replace_point),
+ `InputField
+ ( `id(`driver_filter_input),
+ `opt(`hstretch),
+ // No InputField header because there is the "Caption for a printer driver selection":
+ "",
+ manufacturer
+ )
+ );
+ driver_items = Printer::DriverItems( driver_filter_string, true );
+ // Printer::DriverItems may result a driver_items list with one single element
+ // [ `item( `id( -1 ), _("No matching driver found.") ) ]
+ // to show at least a meaningful text as fallback entry to the user
+ // or Printer::DriverItems may result a driver_items list with the first item
+ // [ `item( `id( -1 ), _("Select a driver.") ), ... ]
+ // when Printer::DriverItems could not preselect a driver item.
+ // If a valid driver was found (but perhaps none was preselected),
+ // there would be a non-negative id value of the first or second element
+ // which is driver_items[0,0,0] or driver_items[1,0,0]
+ // (id[0] is the value of the id, see the comment in Printer::DriverItems).
+ if( driver_items[0,0,0]:-1 >= 0
+ || driver_items[1,0,0]:-1 >= 0
+ )
+ { valid_driver_found = true;
+ }
+ }
+ }
+ }
+ // Nothing was found above.
+ // Fall back to show all drivers:
+ if( ! valid_driver_found )
+ { // Provide visible feeback what is going on:
+ UI::ReplaceWidget( `id(`driver_filter_input_replace_point),
+ `InputField
+ ( `id(`driver_filter_input),
+ `opt(`hstretch),
+ // No InputField header because there is the "Caption for a printer driver selection":
+ "",
+ _("any model")
+ )
+ );
+ driver_items = Printer::DriverItems( "", true );
+ }
+ UI::ReplaceWidget( `id(`driver_selection_replace_point),
+ `SelectionBox
+ ( `id(`driver_selection),
+ // By default there is no UserInput()
+ // if only something was selected in the SelectionBox
+ // (without clicking additionally a button)
+ // but the notify option forces UserInput() in this case:
+ `opt(`notify),
+ "",
+ driver_items
+ )
+ );
+ continue;
+ }
y2milestone( "Ignoring unexpected returncode in BasicAddDialog: %1", ret );
continue;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.5/src/basicmodify.ycp new/yast2-printer-2.18.7/src/basicmodify.ycp
--- old/yast2-printer-2.18.5/src/basicmodify.ycp 2009-02-17 11:15:31.000000000 +0100
+++ new/yast2-printer-2.18.7/src/basicmodify.ycp 2009-02-26 14:11:07.000000000 +0100
@@ -66,6 +66,16 @@
// Title of the Basic Modify Dialog where %1 will be replaced by the queue name.
// The actual queue name is a system value which cannot be translated:
string caption = sformat( _("Modify %1") , name );
+ // Clear whatever content of a previous dialog which would show up here for several seconds
+ // until all the following stuff is done before Wizard::SetContentsButtons is called
+ // which finally shows the right content for this dialog.
+ Wizard::SetContents( caption,
+ `Empty(),
+ HELPS["basic_modify_dialog"]:"",
+ false,
+ false
+ );
+ Wizard::HideAbortButton();
string model = "";
list <string> description_words = splitstring( description, " " );
if( size( description_words ) > 2 )
@@ -293,39 +303,10 @@
),
`VStretch(),
`VBox
- ( `HBox
- ( `ReplacePoint
- ( `id(`driver_filter_input_replace_point),
- `InputField
- ( `id(`driver_filter_input), `opt(`hstretch),
- // Caption for a printer driver selection:
- _("Search for &Drivers"),
- driver_filter_input_text
- )
- ),
- `VBox
- ( `Label(""),
- `HBox
- ( `PushButton
- ( `id(`apply_driver_filter),
- // This button must be the default
- // (it is activated when the user pressed the Enter key)
- // because when the user has clicked into TextEntry to enter something
- // it is normal to finish entering by pressing the Enter key
- // but if the Enter key was linked to 'Next' or 'Back',
- // the user would get the wrong action.
- `opt(`default),
- // Label of a PushButton to search a list for a search string
- // and then show the search result:
- _("&Show Matching Drivers")
- ),
- `PushButton
- ( `id(`add_driver),
- // Label of a PushButton to go to the "Add Driver" dialog
- // to install a new driver (and perhaps download it before):
- _("&Add Driver")
- )
- )
+ ( `Left
+ ( `Label
+ ( // Caption for a printer driver selection:
+ _("Adjust Options of the Current Driver or Assign a Different Driver")
)
),
`ReplacePoint
@@ -335,6 +316,43 @@
`Left( driver_options_content )
)
),
+ `HBox
+ ( `PushButton
+ ( `id(`apply_driver_filter),
+ // This button must be the default
+ // (it is activated when the user pressed the Enter key)
+ // because when the user has clicked into TextEntry to enter something
+ // it is normal to finish entering by pressing the Enter key
+ // but if the Enter key was linked to 'Next' or 'Back',
+ // the user would get the wrong action.
+ `opt(`default),
+ // Label of a PushButton to search a list for a search string
+ // and then show the search result:
+ _("&Search")
+ ),
+ `ReplacePoint
+ ( `id(`driver_filter_input_replace_point),
+ `InputField
+ ( `id(`driver_filter_input),
+ `opt(`hstretch),
+ // No InputField header because there is the "Caption for a printer driver selection":
+ "",
+ driver_filter_input_text
+ )
+ ),
+ `HStretch(),
+ `PushButton
+ ( `id(`more_drivers),
+ // Label of a PushButton to show more available printer drivers:
+ _("More &Drivers")
+ ),
+ `PushButton
+ ( `id(`add_driver),
+ // Label of a PushButton to go to the "Add Driver" dialog
+ // to install a new driver (and perhaps download it before):
+ _("&Add Driver")
+ )
+ ),
`ReplacePoint
( `id(`driver_selection_replace_point),
`SelectionBox
@@ -674,12 +692,13 @@
driver_filter_string = "qqqqqqqqqq";
}
UI::ReplaceWidget( `id(`driver_filter_input_replace_point),
- `InputField
- ( `id(`driver_filter_input), `opt(`hstretch),
- // Caption for a printer driver selection:
- _("Search for &Drivers"),
- driver_filter_input_text
- )
+ `InputField
+ ( `id(`driver_filter_input),
+ `opt(`hstretch),
+ // No InputField header because there is the "Caption for a printer driver selection":
+ "",
+ driver_filter_input_text
+ )
);
UI::ReplaceWidget( `id(`driver_selection_replace_point),
`SelectionBox( `id(`driver_selection),
@@ -805,12 +824,13 @@
{ driver_filter_input_text = _("any model");
}
UI::ReplaceWidget( `id(`driver_filter_input_replace_point),
- `InputField
- ( `id(`driver_filter_input), `opt(`hstretch),
- // Caption for a printer driver selection:
- _("Search for &Drivers"),
- driver_filter_input_text
- )
+ `InputField
+ ( `id(`driver_filter_input),
+ `opt(`hstretch),
+ // No InputField header because there is the "Caption for a printer driver selection":
+ "",
+ driver_filter_input_text
+ )
);
UI::ReplaceWidget( `id(`driver_selection_replace_point),
`SelectionBox( `id(`driver_selection),
@@ -827,6 +847,154 @@
);
continue;
}
+ if( ret == `more_drivers )
+ { driver_filter_string = "";
+ boolean valid_driver_found = false;
+ list driver_items = [];
+ // Use the existing value of model because for each subsequent run of this more_drivers section
+ // the existing value of model is shortened at the end (the last word is removed) to get
+ // more and mor derivers for each subsequent run of this more_drivers section.
+ y2milestone( "More drivers for '%1'", model );
+ if( "" != model
+ && "unknown" != tolower( model )
+ )
+ { // If the model string does not contain a space,
+ // model_words is a singleton list which contains only model.
+ list <string> model_words = splitstring( model, " " );
+ if( size( model_words ) >= 2 )
+ { // If there are less than two words the following does not make sense.
+ // Try to find the word which contains a model number.
+ // This is usually the first word which contains a number.
+ string model_number_word = "";
+ foreach( string word,
+ model_words,
+ { if( "" != filterchars( word, Printer::number_chars ) )
+ { model_number_word = word;
+ break;
+ }
+ }
+ );
+ // Provide visible feeback what is going on:
+ UI::ReplaceWidget( `id(`driver_filter_input_replace_point),
+ `InputField
+ ( `id(`driver_filter_input),
+ `opt(`hstretch),
+ // No InputField header because there is the "Caption for a printer driver selection":
+ "",
+ model_number_word
+ )
+ );
+ driver_filter_string = filterchars( tolower( model_number_word ), Printer::lower_alnum_chars );
+ if( "" != driver_filter_string )
+ { driver_items = Printer::DriverItems( driver_filter_string, true );
+ // Printer::DriverItems may result a driver_items list with one single element
+ // [ `item( `id( -1 ), _("No matching driver found.") ) ]
+ // to show at least a meaningful text as fallback entry to the user
+ // or Printer::DriverItems may result a driver_items list with the first item
+ // [ `item( `id( -1 ), _("Select a driver.") ), ... ]
+ // when Printer::DriverItems could not preselect a driver item.
+ // If a valid driver was found (but perhaps none was preselected),
+ // there would be a non-negative id value of the first or second element
+ // which is driver_items[0,0,0] or driver_items[1,0,0]
+ // (id[0] is the value of the id, see the comment in Printer::DriverItems).
+ if( driver_items[0,0,0]:-1 >= 0
+ || driver_items[1,0,0]:-1 >= 0
+ )
+ { valid_driver_found = true;
+ }
+ }
+ }
+ }
+ // Use the manufacturer when the existing value of model cannot be used
+ // or when nothing was found above:
+ if( ! valid_driver_found )
+ { driver_filter_string = "";
+ string model = Printer::connections[Printer::selected_connections_index,"model"]:"";
+ if( "" != model
+ && "unknown" != tolower( model )
+ )
+ { // The first word in the driver_filter_string is usually the first word of the manufacturer name.
+ // This fuzzy match is intended so that e.g. "Kyocera" and "Kyocera Mita" are the same.
+ string manufacturer = splitstring( model, " " )[0]:"";
+ if( "" != manufacturer )
+ { // Even more fuzziness for very ambiguous manufacturer names:
+ if( "hewlett" == substring( tolower( driver_filter_string ), 0, 7 ) )
+ { // Let "Hewlett-Packard", "Hewlett Packard", and "HP be the same:
+ manufacturer = "HP";
+ }
+ if( "oki" == substring( tolower( driver_filter_string ), 0, 3 ) )
+ { // Let "Oki", "Okidata", and "Okipage" be the same:
+ manufacturer = "Oki";
+ }
+ driver_filter_string = tolower( manufacturer );
+ // Match at the beginning only if the driver_filter_string is actually a known manufacturer:
+ foreach( string known_manufacturer,
+ Printer::known_manufacturers,
+ { if( driver_filter_string == tolower( known_manufacturer ) )
+ { driver_filter_string = "^" + driver_filter_string;
+ break;
+ }
+ }
+ );
+ // Provide visible feeback what is going on:
+ UI::ReplaceWidget( `id(`driver_filter_input_replace_point),
+ `InputField
+ ( `id(`driver_filter_input),
+ `opt(`hstretch),
+ // No InputField header because there is the "Caption for a printer driver selection":
+ "",
+ manufacturer
+ )
+ );
+ driver_items = Printer::DriverItems( driver_filter_string, true );
+ // Printer::DriverItems may result a driver_items list with one single element
+ // [ `item( `id( -1 ), _("No matching driver found.") ) ]
+ // to show at least a meaningful text as fallback entry to the user
+ // or Printer::DriverItems may result a driver_items list with the first item
+ // [ `item( `id( -1 ), _("Select a driver.") ), ... ]
+ // when Printer::DriverItems could not preselect a driver item.
+ // If a valid driver was found (but perhaps none was preselected),
+ // there would be a non-negative id value of the first or second element
+ // which is driver_items[0,0,0] or driver_items[1,0,0]
+ // (id[0] is the value of the id, see the comment in Printer::DriverItems).
+ if( driver_items[0,0,0]:-1 >= 0
+ || driver_items[1,0,0]:-1 >= 0
+ )
+ { valid_driver_found = true;
+ }
+ }
+ }
+ }
+ // Nothing was found above.
+ // Fall back to show all drivers:
+ if( ! valid_driver_found )
+ { // Provide visible feeback what is going on:
+ UI::ReplaceWidget( `id(`driver_filter_input_replace_point),
+ `InputField
+ ( `id(`driver_filter_input),
+ `opt(`hstretch),
+ // No InputField header because there is the "Caption for a printer driver selection":
+ "",
+ _("any model")
+ )
+ );
+ driver_items = Printer::DriverItems( "", true );
+ }
+ UI::ReplaceWidget( `id(`driver_selection_replace_point),
+ `SelectionBox( `id(`driver_selection),
+ // By default there is no UserInput()
+ // if only something was selected in the SelectionBox
+ // (without clicking additionally a button)
+ // but the notify option forces UserInput() in this case:
+ `opt(`notify),
+ "",
+ prepend( driver_items,
+ current_driver
+ )
+ )
+ );
+ continue;
+ }
y2milestone( "Ignoring unexpected returncode in BasicModifyDialog: %1", ret );
continue;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.5/src/connectionwizard.ycp new/yast2-printer-2.18.7/src/connectionwizard.ycp
--- old/yast2-printer-2.18.5/src/connectionwizard.ycp 2009-02-17 11:15:31.000000000 +0100
+++ new/yast2-printer-2.18.7/src/connectionwizard.ycp 2009-02-26 10:57:06.000000000 +0100
@@ -42,61 +42,8 @@
string connection_uri="";
string connection_model="";
-list< string > known_manufacturers = [ "Generic",
- "Alps",
- "Anitech",
- "Apollo",
- "Apple",
- "Brother",
- "Canon",
- "Citizen",
- "CItoh",
- "Compaq",
- "DEC",
- "Dell",
- "Dymo",
- "Epson",
- "Fujifilm",
- "Fujitsu",
- "Gestetner",
- "Heidelberg",
- "Hitachi",
- "HP",
- "IBM",
- "Infotec",
- "Kodak",
- "KS",
- "Kyocera",
- "Lanier",
- "Lexmark",
- "Minolta",
- "Mitsubishi",
- "NEC",
- "NRG",
- "Oce",
- "Oki",
- "Olivetti",
- "Olympus",
- "Panasonic",
- "PCPI",
- "QMS",
- "Raven",
- "Ricoh",
- "Samsung",
- "Savin",
- "Seiko",
- "Sharp",
- "Shinko",
- "Sony",
- "Star",
- "Tally",
- "Tektronix",
- "Toshiba",
- "Xerox",
- "Zebra"
- ];
-list< string > manufacturers_for_using_driver = prepend( add( known_manufacturers, "Raw Queue" ), "" );
-list< string > manufacturers_for_raw_queue = prepend( known_manufacturers, "Raw Queue" );
+list< string > manufacturers_for_using_driver = prepend( add( Printer::known_manufacturers, "Raw Queue" ), "" );
+list< string > manufacturers_for_raw_queue = prepend( Printer::known_manufacturers, "Raw Queue" );
string getCurrentDeviceURI()
{ if( "" != Printer::connections[Printer::selected_connections_index,"uri"]:"")
@@ -139,7 +86,7 @@
`opt(`editable),
// Header for a ComboBox to keep the printer model or select another manufacturer:
_("Keep the printer model or select another &manufacturer"),
- prepend( add( known_manufacturers, "Raw Queue" ), current_model_info )
+ prepend( add( Printer::known_manufacturers, "Raw Queue" ), current_model_info )
)
);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.5/src/helps.ycp new/yast2-printer-2.18.7/src/helps.ycp
--- old/yast2-printer-2.18.5/src/helps.ycp 2009-02-17 13:44:41.000000000 +0100
+++ new/yast2-printer-2.18.7/src/helps.ycp 2009-02-26 15:22:17.000000000 +0100
@@ -62,9 +62,7 @@
It is possible to have several different print queues for the same printer
device.
For example a second queue with a monochrome-only driver for a color device
-or a PostScript queue and a queue with a PCL driver for a PostScript+PCL
-printer or a queue to print on one side only of a sheet of paper and one for two sided
-printing.
+or a PostScript queue and a queue with a PCL driver for a PostScript+PCL printer.
</p>") +
// Overview dialog help 2/7:
_("<p>
@@ -149,7 +147,48 @@
The <b>driver</b> determines that the right data is produced for the
specific printer model.<br>
If a wrong driver is assigned, wrong data is sent to the printer
-which results bad looking printout, chaotic printout, or no printout at all.
+which results bad looking printout, chaotic printout, or no printout at all.<br>
+Initially the input field for the driver search string is preset
+with the autodetected model name of the currently selected connection
+and those drivers where the driver description matches to the model name
+are shown by default.<br>
+If driver descriptions match to the autodetected model name
+and if all matching driver descriptions seem to belong to the same model,
+the driver descriptions are sorted so that the most reasonable driver
+should be listed topmost and this one is automatically preselected.
+If no driver is automatically preselected, you must manually
+find and select an appropriate driver.<br>
+On the other hand if a driver was automatically preselected,
+it does not necessarily mean that this driver is
+a reasonable driver for your particular needs.
+Strictly speaking an automatically preselected driver
+may not work at all for your particular printer model.
+The reason is that the automated driver selection
+can only work based upon comparison of strings
+(the autodetected model name and the driver descriptions)
+so that the result can be only a best-guess proposal
+how to set up your particular printer model.<br>
+Therefore check if the currently preselected values make sense
+and feel free to play around and modify the settings
+to what you know what works best for your printer.<br>
+If no driver description matches to the autodetected model name,
+it does not necessarily mean that there is no driver available for the model.
+Often only the model name in the driver descriptions
+is different from the autodetected model name.
+Therefore you can enter whatever you like as driver search string
+and search through all available driver descriptions.<br>
+Usually the default driver option settings should be reasonable
+so that the driver works for your particular printer model.
+Some driver option settings must match to your particular printer.
+In particular the default paper size setting of the driver
+must match to the paper which is actually loaded in your printer.
+You can either explicitely select A4 or Letter as default paper size
+or select nothing to use the built-in default paper size of the driver
+which is also the fallback if the driver neither supports A4 nor Letter
+(for example a driver for a small-format photo printer).
+If you like to adjust other driver options except A4 or Letter,
+you must first set up the queue and then in a second step
+you can adjust all driver options in the 'Edit/Modify' dialog.
</p>") +
// BasicAddDialog help 5/5:
_("<p>
@@ -177,7 +216,34 @@
The latter is provided by the HP driver package 'hplip'.
For plain printing both kind of connections should work but for anything else
(e.g. device status via 'hp-toolbox', or scanning with a HP all-in-one device)
-the 'hp:/...' connection must be used.
+the 'hp:/...' connection must be used.<br>
+When you exchange the currently used connection by another one,
+the input field for the driver search string is preset
+with the autodetected model name of the new selected connection
+and those drivers where the driver description matches to the model name
+are shown by default.<br>
+If driver descriptions match to the autodetected model name
+and if all matching driver descriptions seem to belong to the same model,
+the driver descriptions are sorted so that the most reasonable driver
+should be listed topmost (but still below the currently used driver).
+On the other hand, it does not necessarily mean that this driver is
+a reasonable driver for your particular needs.
+Strictly speaking the topmost listed driver
+may not work at all for your particular printer model.
+The reason is that the automated driver selection
+can only work based upon comparison of strings
+(the autodetected model name and the driver descriptions)
+so that the result can be only a best-guess proposal
+how to set up your particular printer model.<br>
+Therefore check if the currently preselected values make sense
+and feel free to play around and modify the settings
+to what you know what works best for your printer.<br>
+If no driver description matches to the autodetected model name,
+it does not necessarily mean that there is no driver available for the model.
+Often only the model name in the driver descriptions
+is different from the autodetected model name.
+Therefore you can enter whatever you like as driver search string
+and search through all available driver descriptions.
</p>") +
// BasicModifyDialog help 3/4:
_("<p>
@@ -195,7 +261,21 @@
should work for the particular driver.
Nevertheless it may happen that your particular printer fails to print
with high resolution. For example when you have a laser printer
-which has insufficient built-in memory to process high resolution pages.
+which has insufficient built-in memory to process high resolution pages.<br>
+When you exchange the currently used driver by another one,
+you must first apply this change to the print queue
+so that the new driver is used for the queue
+(i.e. you must finish this dialog as a first step)
+and then in a second step you can adjust all driver options
+by using this dialog again.<br>
+Initially the input field for the driver search string is preset
+with the description of the currently used driver when the connection was not changed.
+This results usually only one single driver which matches
+so that you would have to enter a less specific driver search string
+to get also other drivers or you use the 'More Drivers' button.
+If no driver matches, it does not mean that there is no driver available.
+Therefore you can enter whatever you like as driver search string
+and search through all available driver descriptions.
</p>") +
// BasicModifyDialog help 4/4:
_("<p>
@@ -301,9 +381,9 @@
(separated by slash '/' characters) which specify the details
for this kind of data-transfer.<br>
Finally there could be optional parameters (separated by a question mark '?')
-of the form option1=value1&option2=value2&option3=value3 so that
+of the form option1=value1&option2=value2&option3=value3 so that
a full device URI could be for example:<br>
-ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false<br>
+ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false<br>
Special characters must be percent-encoded (also known as URL encoding).
For example a space character ' ' must be written as '%20'
and a plus sign '+' must be written as '%2B'.<br>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.5/src/printer_proposal.ycp new/yast2-printer-2.18.7/src/printer_proposal.ycp
--- old/yast2-printer-2.18.5/src/printer_proposal.ycp 2009-02-17 11:15:31.000000000 +0100
+++ new/yast2-printer-2.18.7/src/printer_proposal.ycp 2009-02-26 10:57:06.000000000 +0100
@@ -214,12 +214,25 @@
string driver_filter_string = "^" + filterchars( tolower( model ), Printer::lower_alnum_chars );
if( "^" != driver_filter_string )
{ list drivers = Printer::DriverItems( driver_filter_string, true );
- if( size(drivers) > 0 )
- { y2internal("Available drivers: %1", drivers);
- y2internal("Selected driver: %1", drivers[0]:nil);
- Printer::selected_ppds_index = drivers[0,0,0]:-1;
- Printer::selected_connections_index = printer[0,0]:-1;
- if( Printer::AddQueue( queue_name ) )
+ // Printer::DriverItems may result a drivers list with one single element
+ // [ `item( `id( -1 ), _("No matching driver found.") ) ]
+ // to show at least a meaningful text as fallback entry to the user
+ // or Printer::DriverItems may result a drivers list with the first item
+ // [ `item( `id( -1 ), _("Select a driver.") ), ... ]
+ // when Printer::DriverItems could not preselect a driver item.
+ // In contrast if a valid driver was found and preselected, there would be
+ // a non-negative id value of the first element which is drivers[0,0,0]
+ // (id[0] is the value of the id, see the comment in Printer::DriverItems).
+ // Only a test if both selected_ppds_index and selected_connections_index
+ // are non-negative makes sure that there is a valid driver and a valid connection.
+ y2internal("Available drivers: %1", drivers);
+ Printer::selected_ppds_index = drivers[0,0,0]:-1;
+ Printer::selected_connections_index = printer[0,0]:-1;
+ if( Printer::selected_ppds_index >= 0
+ && Printer::selected_connections_index >= 0
+ )
+ { y2internal("Selected driver: %1", drivers[0]:nil);
+ if( Printer::AddQueue( queue_name, "" ) )
{ already_set_up_uris = add( already_set_up_uris, uri );
// Autodetect queues again so that Printer::NewQueueName
// can compare with existing queue names but ignore whatever failures
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.5/src/Printer.ycp new/yast2-printer-2.18.7/src/Printer.ycp
--- old/yast2-printer-2.18.5/src/Printer.ycp 2009-02-17 11:22:22.000000000 +0100
+++ new/yast2-printer-2.18.7/src/Printer.ycp 2009-02-26 10:57:06.000000000 +0100
@@ -108,6 +108,67 @@
global string lower_alnum_chars = number_chars + lower_chars;
/**
+ * Explicite listing of all known manufacturers in a standard installation
+ * which one gets as output from the command
+ * lpinfo -l -m | grep make-and-model | cut -s -d '=' -f 2 | cut -s -d ' ' -f 2 | sort -f -u
+ * and then a bit changing it (in particular removing duplicates and nonsense entries).
+ * The current list was made on openSUSE 11.0.
+ */
+global list< string > known_manufacturers = [ "Generic",
+ "Alps",
+ "Anitech",
+ "Apollo",
+ "Apple",
+ "Brother",
+ "Canon",
+ "Citizen",
+ "CItoh",
+ "Compaq",
+ "DEC",
+ "Dell",
+ "Dymo",
+ "Epson",
+ "Fujifilm",
+ "Fujitsu",
+ "Gestetner",
+ "Heidelberg",
+ "Hitachi",
+ "HP",
+ "IBM",
+ "Infotec",
+ "Kodak",
+ "KS",
+ "Kyocera",
+ "Lanier",
+ "Lexmark",
+ "Minolta",
+ "Mitsubishi",
+ "NEC",
+ "NRG",
+ "Oce",
+ "Oki",
+ "Olivetti",
+ "Olympus",
+ "Panasonic",
+ "PCPI",
+ "QMS",
+ "Raven",
+ "Ricoh",
+ "Samsung",
+ "Savin",
+ "Seiko",
+ "Sharp",
+ "Shinko",
+ "Sony",
+ "Star",
+ "Tally",
+ "Tektronix",
+ "Toshiba",
+ "Xerox",
+ "Zebra"
+ ];
+
+/**
* PPD database:
* the database is created anew in Printer::CreateDatabase() which calls
* the bash script "/usr/lib/YaST2/bin/create_ppd_database"
@@ -1233,8 +1294,8 @@
);
if( size( driver_items ) == 0 )
{ // If the driver_items list is empty (e.g. because of a too restrictive driver_filter_string),
- // show a meaningful text as fallback entry.
- driver_string = _("No matching driver found.");
+ // show a meaningful text as fallback entry ('More Drivers' is a button label).
+ driver_string = _("No matching driver found. Change the search string or try 'More Drivers'.");
driver_items = [ `item( `id( -1 ), driver_string ) ];
// Invalidate selected_ppds_index to be on the safe side.
// Otherwise it is possible to set up a queue with a previously selected driver
@@ -1616,7 +1677,7 @@
* Add new queue or overwrite existing queue
* @return true on success
*/
-global boolean AddQueue( string queue_name )
+global boolean AddQueue( string queue_name, string default_paper_size )
{ // Delete ' characters because they are used for quoting in the bash commandline below:
queue_name = deletechars( queue_name, "'" );
string uri = deletechars( connections[selected_connections_index,"uri"]:"", "'" );
@@ -1659,6 +1720,25 @@
Printerlib::ExecuteBashCommand( "/usr/sbin/lpadmin -h localhost -x '" + queue_name + "'" );
return false;
}
+ // Try to set the requested default_paper_size if it is an available choice for this queue.
+ // If no default_paper_size is requested, the CUPS default is used.
+ // For the CUPS 1.3 default see http://www.cups.org/str.php?L2846
+ // For CUPS 1.4 the default depends on the "DefaultPaperSize" setting in cupsd.conf
+ // see https://bugzilla.novell.com/show_bug.cgi?id=395760
+ // and http://www.cups.org/str.php?L2848
+ if( "" != default_paper_size )
+ { // The following command fails intentionally if the queue has no PPD file - i.e. when it is a "raw" queue
+ // (a queue with a "System V style interface script" cannot be set up with YaST).
+ // '\>' is used to find an available choice also when it is the last value on the line.
+ // Note the YCP quoting: \\< becomes \< and \\> becomes \> in the commandline.
+ commandline = "lpoptions -h localhost -p '" + queue_name + "' -l | grep '^PageSize.*\\<" + default_paper_size + "\\>'";
+ if( Printerlib::ExecuteBashCommand( commandline ) )
+ { commandline = "/usr/sbin/lpadmin -h localhost -p '" + queue_name + "' -o 'PageSize=" + default_paper_size + "'";
+ // Do not care if it fails to set the default_paper_size (i.e. show no error message to the user)
+ // because the default_paper_size setting is nice to have but not mandatoty for a working queue:
+ Printerlib::ExecuteBashCommand( commandline );
+ }
+ }
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.5/VERSION new/yast2-printer-2.18.7/VERSION
--- old/yast2-printer-2.18.5/VERSION 2009-02-17 12:29:24.000000000 +0100
+++ new/yast2-printer-2.18.7/VERSION 2009-02-26 14:49:01.000000000 +0100
@@ -1 +1 @@
-2.18.5
+2.18.7
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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