openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
January 2008
- 1 participants
- 1057 discussions
Hello community,
here is the log from the commit of package libbonobo
checked in at Thu Jan 31 01:20:56 CET 2008.
--------
--- GNOME/libbonobo/libbonobo.changes 2008-01-24 16:58:13.000000000 +0100
+++ libbonobo/libbonobo.changes 2008-01-30 23:59:59.323148000 +0100
@@ -1,0 +2,7 @@
+Wed Jan 30 23:45:25 CET 2008 - maw(a)suse.de
+
+- Update to version 2.21.90:
+ + Fix build against glib 2.15.4
+- Build with -fno-strict-aliasing.
+
+-------------------------------------------------------------------
Old:
----
libbonobo-2.20.3.tar.bz2
New:
----
libbonobo-2.21.90.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libbonobo.spec ++++++
--- /var/tmp/diff_new_pack.FH3170/_old 2008-01-31 01:20:45.000000000 +0100
+++ /var/tmp/diff_new_pack.FH3170/_new 2008-01-31 01:20:45.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libbonobo (Version 2.20.3)
+# spec file for package libbonobo (Version 2.21.90)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,7 +13,7 @@
Name: libbonobo
BuildRequires: bison docbook_4 fdupes flex glib2-devel gnome-common gtk-doc intltool libidl libxml2-devel openssl orbit2-devel perl-XML-Parser xmlcharent
Summary: The Bonobo Component System for the GNOME 2.x Desktop Platform
-Version: 2.20.3
+Version: 2.21.90
Release: 1
License: GPL v2 or later; LGPL v2.1 or later
# Obsolete for >=9.1:
@@ -108,6 +108,7 @@
%build
autoreconf -f -i
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure\
--libexecdir=%{_prefix}/lib/bonobo\
--disable-static
@@ -122,11 +123,9 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
@@ -160,6 +159,10 @@
%{_libdir}/bonobo-2.0/samples
%changelog
+* Thu Jan 31 2008 maw(a)suse.de
+- Update to version 2.21.90:
+ + Fix build against glib 2.15.4
+- Build with -fno-strict-aliasing.
* Thu Jan 24 2008 jpr(a)suse.de
- Update to version 2.20.3:
* Fix some gcc'isms causing problems with glib 2.15.0
@@ -197,7 +200,7 @@
* Wed Mar 21 2007 maw(a)suse.de
- Update to version 2.18.0
- Bug fixes, including b.g.o 409065, 363033, and 363033.
-* Fri Feb 16 2007 maw(a)suse.de
+* Sat Feb 17 2007 maw(a)suse.de
- Update to version 2.17.91.
* Tue Feb 13 2007 sbrabec(a)suse.cz
- Do not build unusable static libraries (#238552#c17).
@@ -225,7 +228,7 @@
- Various bonobo-activation login fixes
- Various cleanups of exception handling
- Fixes for panel sometimes hanging on login
-* Thu Aug 17 2006 jhargadon(a)suse.de
+* Fri Aug 18 2006 jhargadon(a)suse.de
- update to version 2.15.2
- Warning and build fixes
- New and updated translations
@@ -256,7 +259,7 @@
* Add support for GOption argument parsing in libgnome (Pawel Sliwowski, chpe) [#307312]
* Merge cleanups from stable (Kjartan)
* Translation updates
-* Wed May 17 2006 gekker(a)suse.de
+* Thu May 18 2006 gekker(a)suse.de
- Fix file descriptor leak (#176555)
* Tue Mar 07 2006 jpr(a)suse.de
- Prevent re-entrancy crash (#149735)
@@ -280,7 +283,7 @@
- Fixed devel requirements (#72282).
* Mon Apr 11 2005 sbrabec(a)suse.cz
- Fixed Requires of doc subpackage.
-* Wed Feb 09 2005 gekker(a)suse.de
+* Thu Feb 10 2005 gekker(a)suse.de
- Update to 2.8.1
- Update neededforbuild, so that it will build docs
* Mon Jan 31 2005 meissner(a)suse.de
++++++ libbonobo-2.20.3.tar.bz2 -> libbonobo-2.21.90.tar.bz2 ++++++
++++ 37053 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 control-center2
checked in at Thu Jan 31 01:20:36 CET 2008.
--------
--- GNOME/control-center2/control-center2.changes 2008-01-29 14:14:51.000000000 +0100
+++ control-center2/control-center2.changes 2008-01-30 22:01:18.591228000 +0100
@@ -1,0 +2,6 @@
+Wed Jan 30 22:02:40 CET 2008 - maw(a)suse.de
+
+- Revert last change -- nautilus owns
+ %{_libdir}/nautilus/extensions-2.0 now.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ control-center2.spec ++++++
--- /var/tmp/diff_new_pack.I24399/_old 2008-01-31 01:15:07.000000000 +0100
+++ /var/tmp/diff_new_pack.I24399/_new 2008-01-31 01:15:07.000000000 +0100
@@ -18,7 +18,7 @@
Obsoletes: fontilus themus acme
Provides: fontilus themus acme
Version: 2.21.5
-Release: 2
+Release: 3
Summary: The GNOME Control Center for the GNOME 2.x Desktop
Source: gnome-%{_name}-%{version}.tar.bz2
Source1: control-center-art.tar.bz2
@@ -191,7 +191,6 @@
%{_datadir}/gnome-control-center/pixmaps/*.png
%{_libdir}/*.so.*
%{_libdir}/gnome-vfs-2.0/modules/*.so
-%dir %{_libdir}/nautilus/extensions-2.0
%{_libdir}/nautilus/extensions-2.0/*.so
%dir %{_libdir}/window-manager-settings
%{_libdir}/window-manager-settings/*.so
@@ -214,6 +213,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Wed Jan 30 2008 maw(a)suse.de
+- Revert last change -- nautilus owns
+ %%{_libdir}/nautilus/extensions-2.0 now.
* Tue Jan 29 2008 thoenig(a)suse.de
- Fix build: Add %%dir %%{_libdir}/nautilus/extensions-2.0
* Tue Jan 29 2008 rodrigo(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 avr-libc
checked in at Thu Jan 31 01:14:55 CET 2008.
--------
--- avr-libc/avr-libc.changes 2007-10-13 16:30:45.000000000 +0200
+++ avr-libc/avr-libc.changes 2008-01-30 22:07:55.178241000 +0100
@@ -1,0 +2,10 @@
+Wed Jan 30 22:05:17 CET 2008 - jw(a)suse.de
+
+- update to 1.6.1
+ * The fplib/math library is completely rewritten.
+ * Functions of numbers to ascii conversion are completely rewritten.
+ * Test suite is added to the Avr-libc project.
+ * A few new util's headers: util/atomic.h, util/setbaud.h.
+ * Many new devices added, many revised.
+
+-------------------------------------------------------------------
Old:
----
avr-libc-1.4.6.tar.bz2
avr-libc-manpages-1.4.6.tar.bz2
avr-libc-user-manual-1.4.6.tar.bz2
New:
----
avr_common.mk
avr_isp.pl
avr-libc-1.6.1.tar.bz2
avr-libc-manpages-1.6.1.tar.bz2
avr-libc-user-manual-1.6.1.tar.bz2
contrib-examples.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ avr-libc.spec ++++++
--- /var/tmp/diff_new_pack.u22821/_old 2008-01-31 01:14:33.000000000 +0100
+++ /var/tmp/diff_new_pack.u22821/_new 2008-01-31 01:14:33.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package avr-libc (Version 1.4.6)
+# spec file for package avr-libc (Version 1.6.1)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,7 +12,7 @@
Name: avr-libc
BuildRequires: cross-avr-binutils cross-avr-gcc doxygen findutils
-Version: 1.4.6
+Version: 1.6.1
Release: 1
Url: http://savannah.nongnu.org/projects/avr-libc
Group: Development/Libraries/C and C++
@@ -22,6 +22,9 @@
Source1: http://savannah.nongnu.org/download/%{name}/%{name}-user-manual-%{version}.…
Source2: http://savannah.nongnu.org/download/%{name}/%{name}-manpages-%{version}.tar…
Source3: logicp-1.01.tgz
+Source4: avr_isp.pl
+Source5: avr_common.mk
+Patch: contrib-examples.diff
AutoReqProv: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: cross-avr-binutils cross-avr-gcc avr-programmer
@@ -40,6 +43,7 @@
%prep
%setup -b 3
+%patch -p1
# %ifarch x86_64 ia64 ppc64
# # avr-64bit datatypes fail on 64bit host architectures.
# # it is a bug, isn't it? 2007-01-08, jw
@@ -67,6 +71,7 @@
%install
export PREFIX=/opt/cross
+cp %{S:4} %{S:5} doc/examples
# ./domake DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT install
tar jxvf %{S:1}
@@ -95,8 +100,16 @@
%doc /usr/share/doc/packages/%{name}
/opt/*
# %doc /usr/share/man/man?/*.*
+
%changelog
-* Sat Oct 13 2007 - bwalle(a)suse.de
+* Wed Jan 30 2008 jw(a)suse.de
+- update to 1.6.1
+ * The fplib/math library is completely rewritten.
+ * Functions of numbers to ascii conversion are completely rewritten.
+ * Test suite is added to the Avr-libc project.
+ * A few new util's headers: util/atomic.h, util/setbaud.h.
+ * Many new devices added, many revised.
+* Sat Oct 13 2007 bwalle(a)suse.de
- update to 1.4.6
o Exclude 64-bit types for -mint8 (obsoletes no64bit_int.patch)
o varios bugfixes (upstream #18115, #18385, #18509, #18662,
@@ -115,13 +128,13 @@
strsep_P, strspn, strspn_P)
o Optimized functions (atoi, atol, strchr, strcmp, strcmp_P,
strlwr, strrev, strsep, strstr, strstr_P, strupr)
-* Thu Apr 05 2007 - jw(a)suse.de
+* Thu Apr 05 2007 jw(a)suse.de
- gzipped manpages to make rpmlint happy.
user-manual moved *into* /usr/share/doc/packages/avr-libc.
-* Mon Jan 15 2007 - jw(a)suse.de
+* Mon Jan 15 2007 jw(a)suse.de
- 64bit datatypes on 64bit hosts only fail with -mint8
Now properly ifdefed.
-* Tue Jan 09 2007 - jw(a)suse.de
+* Tue Jan 09 2007 jw(a)suse.de
- update to 1.4.5
ATmega165P/169P support. Fixes to the HD44780 driver.
Power Management API. New "asmdemo" example.
@@ -131,26 +144,26 @@
Bugs fixed: 15512 16125 16411 16434 16441
16868 17068 17470 17551 17591 17608
- make test now tests 3 CPUs
-* Tue Jan 09 2007 - jw(a)suse.de
+* Tue Jan 09 2007 jw(a)suse.de
- compiling and linking my logicp application
as a simple selftest.
- avr-64bit datatypes fail on 64bit hosts.
-* Tue May 30 2006 - jw(a)suse.de
+* Tue May 30 2006 jw(a)suse.de
- update to 1.4.4
added /opt/cross/share/man/man3/* and /opt/cross/share/doc symlink
-* Wed Jan 25 2006 - mls(a)suse.de
+* Wed Jan 25 2006 mls(a)suse.de
- converted neededforbuild to BuildRequires
-* Tue Jan 10 2006 - jw(a)suse.de
+* Tue Jan 10 2006 jw(a)suse.de
- update to 1.4.2
-* Wed Nov 23 2005 - jw(a)suse.de
+* Wed Nov 23 2005 jw(a)suse.de
- upstreamed patches removed.
- update to 1.4.0
-* Wed Oct 05 2005 - dmueller(a)suse.de
+* Wed Oct 05 2005 dmueller(a)suse.de
- add norootforbuild
-* Wed Aug 17 2005 - jw(a)suse.de
+* Wed Aug 17 2005 jw(a)suse.de
- update to 1.2.5, fixes many things for atmega48
e.g. [#105226].
-* Tue May 17 2005 - jw(a)suse.de
+* Tue May 17 2005 jw(a)suse.de
- removed dependency on uisp.
-* Wed May 11 2005 - jw(a)suse.de
+* Wed May 11 2005 jw(a)suse.de
- initial version: avr-libc-1.2.3
++++++ avr-libc-1.4.6.tar.bz2 -> avr-libc-1.6.1.tar.bz2 ++++++
++++ 71099 lines of diff (skipped)
++++++ avr-libc-manpages-1.4.6.tar.bz2 -> avr-libc-manpages-1.6.1.tar.bz2 ++++++
++++ 7856 lines of diff (skipped)
++++++ avr-libc-user-manual-1.4.6.tar.bz2 -> avr-libc-user-manual-1.6.1.tar.bz2 ++++++
++++ 16436 lines of diff (skipped)
++++++ contrib-examples.diff ++++++
--- avr-libc-1.6.1/doc/examples/Makefile.in.orig 2007-12-21 21:55:28.000000000 +0100
+++ avr-libc-1.6.1/doc/examples/Makefile.in 2008-01-30 22:30:31.588478000 +0100
@@ -400,6 +400,8 @@
target_alias = @target_alias@
MAINTAINERCLEANFILES = Makefile.in
DEMO_SRCS = \
+ avr_isp.pl \
+ avr_common.mk \
asmdemo/Makefile \
asmdemo/asmdemo.c \
asmdemo/isrs.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 nautilus
checked in at Wed Jan 30 22:16:50 CET 2008.
--------
--- GNOME/nautilus/nautilus.changes 2008-01-18 20:30:24.000000000 +0100
+++ nautilus/nautilus.changes 2008-01-30 20:46:40.374628000 +0100
@@ -1,0 +2,38 @@
+Wed Jan 30 20:48:24 CET 2008 - maw(a)suse.de
+
+- Add extensions-2.0 directory.
+
+-------------------------------------------------------------------
+Tue Jan 29 11:41:50 CST 2008 - maw(a)suse.de
+
+- Update to version 2.21.90:
+ + Regenerate thumbnails when files change
+ + Fix crashes
+ + New autorun and automount support
+ + Allow unmount of current location if its a mountpoint
+ + Use thousand separators in all numbers (if used by locale)
+ + Fix leaks
+ + Performance improvements
+ + Update to latest glib APIs
+ + Fix bug that lost metadata from older versions
+ + Fix crashes
+ + Enable paste into folder for desktop icons
+ + Better finding of autorun files on case sensitive media
+- Remove libtool archives.
+
+-------------------------------------------------------------------
+Fri Jan 25 12:30:38 CST 2008 - maw(a)suse.de
+
+- Update to version 2.21.5:
+ + Totally replaced gnome-vfs use with gio
+ + New implementation of file operations like copy/move with
+ a shared progress dialog
+ + Update pkg-config files with new extensions dir
+ + Handle dnd of desktop icons
+ + Implement some missing unmount/eject operations
+ + Add autorun/automount feature
+ + Better handling of sensitivity of delete menu items
+ + Better handling of mount/unmount/eject in many places
+ + Fix for extensions with submenus.
+
+-------------------------------------------------------------------
@@ -9 +47 @@
-
+
Old:
----
nautilus-2.20.0.tar.bz2
New:
----
nautilus-2.21.90.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nautilus.spec ++++++
--- /var/tmp/diff_new_pack.I23727/_old 2008-01-30 22:15:22.000000000 +0100
+++ /var/tmp/diff_new_pack.I23727/_new 2008-01-30 22:15:22.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package nautilus (Version 2.20.0)
+# spec file for package nautilus (Version 2.21.90)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,29 +14,38 @@
BuildRequires: cdparanoia eel-devel fdupes gnome-common gnome-icon-theme gnome-patch-translation intltool libbeagle-devel libexif-devel libgnomeui-devel libidl librsvg-devel perl-XML-Parser update-desktop-files
License: GPL v2 or later
Group: Productivity/File utilities
-Version: 2.20.0
-Release: 51
+Version: 2.21.90
+Release: 1
Summary: The GNOME 2.x Desktop File Manager
Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.…
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch1: nautilus-config-defaults.patch
+# FIXME: This patch needs to be reevaluated and, if necessary, fixed up.
Patch2: nautilus-name-length.patch
Patch3: nautilus-onlyshowin.patch
Patch4: nautilus-search-desktop.patch
+# PATCH-NEEDS-REBASE nautilus-icon.patch
Patch5: nautilus-icon.patch
Patch6: nautilus-docpath.patch
Patch7: nautilus-disable-zoom-control-and-view-as-option-menu.patch
+# FIXME: This patch needs to be fixed up.
Patch8: nautilus-default-thumbnail-size.diff
Patch9: nautilus-146947-rename-bad-parameters-message.diff
+# PATCH-NEEDS-REBASE nautilus-mime.patch
Patch10: nautilus-mime.patch
+# FIXME: This patch needs to be reevaluated and, if necessary, fixed up.
Patch11: nautilus-158158-ignore-foreign-desktop-files.diff
Patch12: nautilus-212649-search-bar-visibility.patch
+# FIXME: This patch needs to be reevaluated and, if necessary, fixed up.
Patch13: nautilus-6014-network-servers-in-places-sidebar.diff
+# FIXME: This patch needs to be reevaluated and, if necessary, fixed up.
Patch15: nautilus-drives-and-volumes-on-desktop.diff
Patch17: nautilus-181941-i18n.patch
+# FIXME: This patch needs to be reevaluated and, if necessary, fixed up.
Patch18: nautilus-330298-297983-fix-overlapping-desktop-icons.diff
Patch19: desktop-icon.patch
+#Patch19: nautilus-desktop-icon.patch
Requires: gnome-icon-theme
Requires: %{name}-lang = %{version}
Provides: nautilus2
@@ -69,23 +78,23 @@
%setup -q
gnome-patch-translation-prepare
%patch1 -p1
-%patch2 -p0
+#%patch2 -p0
%patch3 -p1
%if ! %sles_version
%patch4
%endif
-%patch5 -p1
+### %patch5 -p1
%patch6 -p0
%patch7
-%patch8 -p1
+### %patch8 -p1
%patch9 -p0
-%patch10
-%patch11 -p1
+### %patch10
+### %patch11 -p1
%patch12
-%patch13 -p1
-%patch15 -p1
+### %patch13 -p1
+### %patch15 -p1
%patch17 -p1
-%patch18 -p1
+### %patch18 -p1
%patch19 -p1
gnome-patch-translation-update
@@ -102,10 +111,12 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT/%{_libdir}/*.*a
rm docs/Makefile*
ln -s ../icons/gnome/24x24/devices/gnome-fs-client.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
ln -s ../icons/gnome/24x24/places/gnome-fs-home.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
ln -s ../icons/gnome/24x24/actions/system-search.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+ln -s ../icons/gnome/24x24/places/user-home.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
%suse_update_desktop_file -N "Nautilus" -G "File Browser" -D "user-guide/user-guide.xml?gosnautilus-1" nautilus System FileManager
%suse_update_desktop_file -D "user-guide/user-guide.xml?gosnautilus-1" nautilus-computer System FileManager
%suse_update_desktop_file -D "user-guide/user-guide.xml?gosnautilus-1" nautilus-file-management-properties System FileManager X-SuSE-ControlCenter-LookAndFeel
@@ -116,6 +127,7 @@
%endif
%suse_update_desktop_file -G "File Browser" -D "user-guide/user-guide.xml?gosnautilus-1" network-scheme System Network
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0
%find_lang %{name}
%find_gconf_schemas
cat %{name}.schemas_list >%{name}.lst
@@ -127,7 +139,7 @@
%pre -f %{name}.schemas_pre
%post
-%run_ldconfig
+/sbin/ldconfig
if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
@@ -136,7 +148,7 @@
%preun -f %{name}.schemas_preun
%postun
-%run_ldconfig
+/sbin/ldconfig
if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
@@ -155,17 +167,46 @@
%{_libdir}/bonobo/servers/*.server
%dir %{_libdir}/nautilus
%dir %{_libdir}/nautilus/extensions-1.0
+%dir %{_libdir}/nautilus/extensions-2.0
%files lang -f %{name}.lang
%files devel
%defattr(-,root,root)
%{_libdir}/*.so
-%{_libdir}/*.*a
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%changelog
+* Wed Jan 30 2008 maw(a)suse.de
+- Add extensions-2.0 directory.
+* Tue Jan 29 2008 maw(a)suse.de
+- Update to version 2.21.90:
+ + Regenerate thumbnails when files change
+ + Fix crashes
+ + New autorun and automount support
+ + Allow unmount of current location if its a mountpoint
+ + Use thousand separators in all numbers (if used by locale)
+ + Fix leaks
+ + Performance improvements
+ + Update to latest glib APIs
+ + Fix bug that lost metadata from older versions
+ + Fix crashes
+ + Enable paste into folder for desktop icons
+ + Better finding of autorun files on case sensitive media
+- Remove libtool archives.
+* Fri Jan 25 2008 maw(a)suse.de
+- Update to version 2.21.5:
+ + Totally replaced gnome-vfs use with gio
+ + New implementation of file operations like copy/move with
+ a shared progress dialog
+ + Update pkg-config files with new extensions dir
+ + Handle dnd of desktop icons
+ + Implement some missing unmount/eject operations
+ + Add autorun/automount feature
+ + Better handling of sensitivity of delete menu items
+ + Better handling of mount/unmount/eject in many places
+ + Fix for extensions with submenus.
* Fri Jan 18 2008 jpr(a)suse.de
- Updated nautilus-drives-and-volumes-on-desktop.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=335411 - Nautilus
@@ -183,7 +224,7 @@
* Wed Sep 05 2007 maw(a)suse.de
- Don't require gnome2-user-docs, which now supplements
nautilus (#297833).
-* Wed Aug 29 2007 maw(a)suse.de
+* Thu Aug 30 2007 maw(a)suse.de
- Update to version 2.19.91:
* Be more robust against broken extensions
* Set current working directory right on desktop when running scripts
@@ -200,7 +241,7 @@
CD and re-mounting the CD, Nautilus uses 100%% CPU. This simply
includes the last patch from
https://bugzilla.novell.com/show_bug.cgi?id=276193#c42
-* Fri Aug 10 2007 federico(a)novell.com
+* Sat Aug 11 2007 federico(a)novell.com
- Added nautilus-330298-297983-fix-overlapping-desktop-icons.diff to
fix https://bugzilla.novell.com/show_bug.cgi?id=297983 - desktop
icons would overlap when inserting removable media, if the
@@ -251,7 +292,7 @@
[#374623], #382207, #376952, #384078, #383840, #45953, #350579,
[#318373], #132326, #372550, #338353, #372471, #330298, #155337,
[#174766], #122688, #321175, #349840, #356124, #351713, #348161.
-* Tue Feb 27 2007 dmueller(a)suse.de
+* Wed Feb 28 2007 dmueller(a)suse.de
- adjust BuildRequires: libexif->libexif-devel
* Mon Feb 05 2007 sbrabec(a)suse.cz
- Fixed Categories (#242053).
@@ -445,7 +486,7 @@
https://bugzilla.novell.com/show_bug.cgi?id=176123. The
"OnlyShowIn" key in desktop files can contain multiple items. Also
pay attention to the "NotShowIn" key.
-* Mon May 15 2006 federico(a)novell.com
+* Tue May 16 2006 federico(a)novell.com
- Added nautilus-158279-add-location-toggle-button.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=158279. This adds a
toggle button to the left of path bar in navigation windows.
@@ -455,7 +496,7 @@
- Updated nautilus-155010-desktop-volume-policy.diff; this fixes
https://bugzilla.novell.com/show_bug.cgi?id=175076. This fixes a
crash when dragging a volume to the trash.
-* Wed May 10 2006 joeshaw(a)suse.de
+* Thu May 11 2006 joeshaw(a)suse.de
- Update search patch to remove annoying "queuing <whatever>"
debug spew.
* Wed May 10 2006 federico(a)novell.com
@@ -530,7 +571,7 @@
- Reduce BuildRequires.
* Sat Feb 18 2006 gekker(a)suse.de
- ficup .desktop files for UI team
-* Mon Feb 13 2006 federico(a)novell.com
+* Tue Feb 14 2006 federico(a)novell.com
- Added nautilus-130796-bad-icon-placement.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=130796. This makes
desktop icons with very wide labels be placed correctly, instead of
@@ -556,7 +597,7 @@
* Tue Dec 06 2005 sbrabec(a)suse.cz
- Do not require beagle on ppc64.
- Enabled parallel build.
-* Mon Dec 05 2005 federico(a)novell.com
+* Tue Dec 06 2005 federico(a)novell.com
- Removed nautilus-136167-no-default-window.diff. This is not the right fix, as external
apps rely on being to call just "nautilus" without command-line arguments, so that
Nautilus will open a window showing your Home directory. Moreover, there's no way for
@@ -571,9 +612,9 @@
- Added nautilus-136167-no-default-window.diff to fix bug #136167.
When restarted abnormally, Nautilus will no longer open a window for
your home directory.
-* Wed Nov 30 2005 gekker(a)suse.de
+* Thu Dec 01 2005 gekker(a)suse.de
- Update to version 2.12.2
-* Mon Nov 28 2005 gekker(a)suse.de
+* Tue Nov 29 2005 gekker(a)suse.de
- Enable nauilus sidebar by default (#132383).
* Thu Nov 17 2005 federico(a)novell.com
- Added nautilus-default-thumbnail-size.diff. This makes the default size for
@@ -590,7 +631,7 @@
* Wed Nov 02 2005 federico(a)novell.com
- Updated nautilus-submount.patch to fix bug #127509. With this, the
"Unmount volume" command will appear again for network volumes.
-* Thu Oct 13 2005 gekker(a)suse.de
+* Fri Oct 14 2005 gekker(a)suse.de
- Update to version 2.12.1
- Remove upstreamed patch
- Re-diff some patches so that they apply to new version
@@ -610,7 +651,7 @@
GtkFileChooser.
* Thu Sep 22 2005 clahey(a)suse.de
- Turn off computer icon by default.
-* Thu Sep 15 2005 clahey(a)suse.de
+* Fri Sep 16 2005 clahey(a)suse.de
- Added nautilus-icon.patch to change main icon. bug #117333
* Thu Sep 08 2005 federico(a)novell.com
- Added nautilus-114914-trash-unmount-removable-volume.diff to fix bug
++++++ nautilus-146947-rename-bad-parameters-message.diff ++++++
--- /var/tmp/diff_new_pack.I23727/_old 2008-01-30 22:15:23.000000000 +0100
+++ /var/tmp/diff_new_pack.I23727/_new 2008-01-30 22:15:23.000000000 +0100
@@ -6,17 +6,19 @@
characters, like '\'. Display a more useful error message than
"generic error" in that case.
---- src/file-manager/fm-error-reporting.c.orig 2006-01-16 13:20:30.000000000 -0600
-+++ src/file-manager/fm-error-reporting.c 2006-01-31 13:00:05.000000000 -0600
-@@ -133,6 +133,11 @@
- message = g_strdup_printf (_("Couldn't change the name of \"%s\" because it is on a read-only disk"),
- original_name_truncated);
- break;
+Index: src/file-manager/fm-error-reporting.c
+===================================================================
+--- src/file-manager/fm-error-reporting.c.orig
++++ src/file-manager/fm-error-reporting.c
+@@ -124,6 +124,11 @@ fm_report_error_renaming_file (NautilusF
+ new_name_truncated);
+ }
+ break;
+ case GNOME_VFS_ERROR_BAD_PARAMETERS:
+ message = g_strdup_printf (_("Couldn't rename \"%s\" to \"%s\". Please make sure the new name has "
+ "only valid characters in it."),
+ original_name_truncated, new_name_truncated);
+ break;
- default:
- /* We should invent decent error messages for every case we actually experience. */
- g_warning ("Hit unhandled case %d (%s) in fm_report_error_renaming_file",
+ default:
+ break;
+ }
++++++ nautilus-2.20.0.tar.bz2 -> nautilus-2.21.90.tar.bz2 ++++++
++++ 298335 lines of diff (skipped)
++++++ nautilus-icon.patch ++++++
--- /var/tmp/diff_new_pack.I23727/_old 2008-01-30 22:15:35.000000000 +0100
+++ /var/tmp/diff_new_pack.I23727/_new 2008-01-30 22:15:35.000000000 +0100
@@ -5,20 +5,24 @@
Use "gnome-fs-directory" instead of "file-manager" as an icon. A
folder is more recognizable than a filing cabinet.
---- nautilus-2.15.4/nautilus-file-management-properties.desktop.in.in
-+++ nautilus-2.15.4/nautilus-file-management-properties.desktop.in.in
-@@ -3,7 +3,7 @@
+Index: nautilus-2.21.5/nautilus-file-management-properties.desktop.in.in
+===================================================================
+--- nautilus-2.21.5.orig/nautilus-file-management-properties.desktop.in.in
++++ nautilus-2.21.5/nautilus-file-management-properties.desktop.in.in
+@@ -3,7 +3,7 @@ Encoding=UTF-8
_Name=File Management
- _Comment=Change how files are managed
+ _Comment=Change the behaviour and appearance of file manager windows
Exec=nautilus-file-management-properties
-Icon=file-manager
+Icon=gnome-fs-directory
Terminal=false
Type=Application
StartupNotify=true
---- nautilus-2.15.4/nautilus.desktop.in.in
-+++ nautilus-2.15.4/nautilus.desktop.in.in
-@@ -4,7 +4,7 @@
+Index: nautilus-2.21.5/nautilus.desktop.in.in
+===================================================================
+--- nautilus-2.21.5.orig/nautilus.desktop.in.in
++++ nautilus-2.21.5/nautilus.desktop.in.in
+@@ -4,7 +4,7 @@ _Name=File Browser
_Comment=Browse the file system with the file manager
TryExec=nautilus
Exec=nautilus --no-desktop --browser %U
@@ -27,9 +31,11 @@
Terminal=false
StartupNotify=true
Type=Application
---- nautilus-2.15.4/src/nautilus-file-management-properties.c
-+++ nautilus-2.15.4/src/nautilus-file-management-properties.c
-@@ -632,7 +632,7 @@
+Index: nautilus-2.21.5/src/nautilus-file-management-properties.c
+===================================================================
+--- nautilus-2.21.5.orig/src/nautilus-file-management-properties.c
++++ nautilus-2.21.5/src/nautilus-file-management-properties.c
+@@ -667,7 +667,7 @@ nautilus_file_management_properties_dial
G_CALLBACK (nautilus_file_management_properties_dialog_response_cb),
xml_dialog);
@@ -38,14 +44,16 @@
if (window) {
gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window));
---- nautilus-2.15.4/src/nautilus-navigation-window.c
-+++ nautilus-2.15.4/src/nautilus-navigation-window.c
-@@ -851,7 +851,7 @@
- static char *
- real_get_icon_name (NautilusWindow *window)
+Index: nautilus-2.21.5/src/nautilus-navigation-window.c
+===================================================================
+--- nautilus-2.21.5.orig/src/nautilus-navigation-window.c
++++ nautilus-2.21.5/src/nautilus-navigation-window.c
+@@ -949,7 +949,7 @@ real_set_title (NautilusWindow *window,
+ static NautilusIconInfo *
+ real_get_icon (NautilusWindow *window)
{
-- return g_strdup ("file-manager");
-+ return g_strdup ("gnome-fs-directory");
+- return nautilus_icon_info_lookup_from_name ("file-manager", 48);
++ return nautilus_icon_info_lookup_from_name ("gnome-fs-directory", 48);
}
static void
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-storage
checked in at Wed Jan 30 22:13:48 CET 2008.
--------
--- yast2-storage/yast2-storage.changes 2008-01-10 17:56:59.000000000 +0100
+++ yast2-storage/yast2-storage.changes 2008-01-30 22:13:17.586578000 +0100
@@ -1,0 +2,23 @@
+Wed Jan 30 14:28:39 CET 2008 - fehr(a)suse.de
+
+- do disk partitionig in separate setp before proposal screen
+- version 2.16.9
+
+-------------------------------------------------------------------
+Thu Jan 17 12:17:53 CET 2008 - fehr(a)suse.de
+
+- fix handling of sun disk label (#353546)
+
+-------------------------------------------------------------------
+Wed Jan 16 13:13:33 CET 2008 - fehr(a)suse.de
+
+- make sure NFS entries in fstab get zero passno field
+
+-------------------------------------------------------------------
+Tue Jan 15 15:41:36 CET 2008 - fehr(a)suse.de
+
+- adapt size restrictions of disk label to parted (#352484)
+- use gpt as default disk label for disks larger 2TB
+- merge proofread texts back into ycp
+
+-------------------------------------------------------------------
@@ -168 +191 @@
-- do not autodetect NFS mount in instsys (#308618)
+- do not autodetect NFS mounts in instsys (#308618)
@@ -349 +372 @@
-Mon Jul 02 18:09:18 CEST 2007 - aschnell(a)suse.de
+Mon Jul 02 18:07:18 CEST 2007 - aschnell(a)suse.de
@@ -1370 +1393 @@
-Thu Mar 9 16:20:12 MST 2006 - cgao(a)novell.com
+Thu Mar 11 16:20:12 MST 2006 - cgao(a)novell.com
Old:
----
yast2-storage-2.16.8.tar.bz2
New:
----
yast2-storage-2.16.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.F20215/_old 2008-01-30 22:13:29.000000000 +0100
+++ /var/tmp/diff_new_pack.F20215/_new 2008-01-30 22:13:29.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.16.8)
+# spec file for package yast2-storage (Version 2.16.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-storage
-Version: 2.16.8
+Version: 2.16.9
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.16.8.tar.bz2
+Source0: yast2-storage-2.16.9.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms evms-devel gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: parted yast2-storage-lib yast2-perl-bindings mdadm lvm2 dmraid kpartx cryptsetup
@@ -45,7 +45,7 @@
%prep
-%setup -n yast2-storage-2.16.8
+%setup -n yast2-storage-2.16.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -87,7 +87,7 @@
/usr/share/YaST2/clients/inst_lvm_pv.ycp
/usr/share/YaST2/clients/inst_target_part.ycp
/usr/share/YaST2/clients/inst_do_resize.ycp
-/usr/share/YaST2/clients/inst_part_proposal.ycp
+/usr/share/YaST2/clients/inst_disk_proposal.ycp
/usr/share/YaST2/clients/inst_target_selection.ycp
/usr/share/YaST2/clients/inst_prepdisk.ycp
/usr/share/YaST2/clients/storage_finish.ycp
@@ -170,3 +170,4 @@
%doc %{prefix}/share/doc/packages/yast2-storage/examples
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
+
++++++ yast2-storage-2.16.8.tar.bz2 -> yast2-storage-2.16.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/libstorage/src/Disk.cc new/yast2-storage-2.16.9/libstorage/src/Disk.cc
--- old/yast2-storage-2.16.8/libstorage/src/Disk.cc 2007-12-19 11:13:20.000000000 +0100
+++ new/yast2-storage-2.16.9/libstorage/src/Disk.cc 2008-01-17 12:13:46.000000000 +0100
@@ -439,7 +439,7 @@
if( detected_label.empty() )
detected_label = dlabel;
if( dlabel.empty() )
- dlabel = defaultLabel();
+ dlabel = defaultLabel(size_k);
setLabelData( dlabel );
if (label == "unsupported")
@@ -1016,7 +1016,11 @@
return( ret );
}
-string Disk::defaultLabel()
+#define TB (1024ULL * 1024ULL * 1024ULL)
+#define EB (1024ULL * 1024ULL * 1024ULL * 1024ULL)
+#define PB (1024ULL * 1024ULL * 1024ULL * 1024ULL * 1024ULL)
+
+string Disk::defaultLabel( unsigned long long size_k )
{
string ret = "msdos";
if( Storage::arch()=="ia64" )
@@ -1027,14 +1031,12 @@
ret = "mac";
else if( Storage::arch()=="ppc" && Storage::isPPCPegasos() )
ret = "amiga";
- y2milestone( "ret:%s", ret.c_str() );
+ if( size_k>2*TB )
+ ret = "gpt";
+ y2milestone( "size_k:%llu ret:%s", size_k, ret.c_str() );
return( ret );
}
-#define TB (1024ULL * 1024ULL * 1024ULL)
-#define EB (1024ULL * 1024ULL * 1024ULL * 1024ULL)
-#define PB (1024ULL * 1024ULL * 1024ULL * 1024ULL * 1024ULL)
-
Disk::label_info Disk::labels[] = {
{ "msdos", true, 4, 63, 2*TB },
{ "gpt", false, 128, 0, 16*PB },
@@ -1157,6 +1159,8 @@
{
if( i->nr()==start )
start++;
+ if( label=="sun" && start==3 )
+ start++;
++i;
}
if( start<=max_primary )
@@ -1363,6 +1367,8 @@
}
if( ret==0 )
{
+ if( label=="sun" && start==0 )
+ start=1;
Partition * p = new Partition( *this, number, cylinderToKb(len), start,
len, type );
PartPair pp = partPair();
@@ -1951,7 +1957,7 @@
ret = DISK_SET_TYPE_PARTED_FAILED;
}
}
- if( ret==0 )
+ if( ret==0 && (label!="sun"))
{
cmd_line.str( start_cmd );
cmd_line.seekp(0, ios_base::end );
@@ -2136,20 +2142,23 @@
if( ret==0 )
{
cmd_line << PARTEDCMD << device() << " unit cyl mkpart ";
- switch( p->type() )
+ if( label != "sun" )
{
- case LOGICAL:
- cmd_line << "logical ";
- break;
- case PRIMARY:
- cmd_line << "primary ";
- break;
- case EXTENDED:
- cmd_line << "extended ";
- break;
- default:
- ret = DISK_CREATE_PARTITION_INVALID_TYPE;
- break;
+ switch( p->type() )
+ {
+ case LOGICAL:
+ cmd_line << "logical ";
+ break;
+ case PRIMARY:
+ cmd_line << "primary ";
+ break;
+ case EXTENDED:
+ cmd_line << "extended ";
+ break;
+ default:
+ ret = DISK_CREATE_PARTITION_INVALID_TYPE;
+ break;
+ }
}
}
if( ret==0 && p->type()!=EXTENDED )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/libstorage/src/Disk.h new/yast2-storage-2.16.9/libstorage/src/Disk.h
--- old/yast2-storage-2.16.8/libstorage/src/Disk.h 2007-10-04 10:55:05.000000000 +0200
+++ new/yast2-storage-2.16.9/libstorage/src/Disk.h 2008-01-15 16:38:25.000000000 +0100
@@ -203,7 +203,7 @@
bool haveBsdPart( const std::list<Partition*>& pl) const;
void setLabelData( const string& );
- static string defaultLabel();
+ static string defaultLabel( unsigned long long size_k );
static label_info labels[];
static string p_disks[];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/libstorage/src/Storage.cc new/yast2-storage-2.16.9/libstorage/src/Storage.cc
--- old/yast2-storage-2.16.8/libstorage/src/Storage.cc 2008-01-10 13:16:51.000000000 +0100
+++ new/yast2-storage-2.16.9/libstorage/src/Storage.cc 2008-01-30 12:14:30.000000000 +0100
@@ -1790,7 +1790,13 @@
string
Storage::defaultDiskLabel() const
{
- return( Disk::defaultLabel() );
+ return( Disk::defaultLabel(0) );
+ }
+
+string
+Storage::defaultDiskLabelSize( unsigned long long size_k ) const
+ {
+ return( Disk::defaultLabel(size_k) );
}
unsigned long long
@@ -6091,11 +6097,11 @@
return( ret );
}
-struct equal_name
+struct equal_co
{
- equal_name( const string& n ) : val(n) {};
- bool operator()(const Container* c) { return( c->name()==val ); }
- const string& val;
+ equal_co( const Container* const co ) : c(co) {};
+ bool operator()(const Container* co) { return( *co==*c ); }
+ const Container* const c;
};
bool
@@ -6130,7 +6136,7 @@
CCIter j;
while( (ret||verbose_log) && i!=l->end() )
{
- j = find_if( r->begin(), r->end(), equal_name( (*i)->name()) );
+ j = find_if( r->begin(), r->end(), equal_co( *i ) );
if( j!=r->end() )
ret = (*i)->compareContainer( *j, verbose_log ) && ret;
else
@@ -6144,7 +6150,7 @@
i=r->begin();
while( (ret||verbose_log) && i!=r->end() )
{
- j = find_if( l->begin(), l->end(), equal_name( (*i)->name()) );
+ j = find_if( l->begin(), l->end(), equal_co( *i ) );
if( j==r->end() )
{
ret = false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/libstorage/src/Storage.h new/yast2-storage-2.16.9/libstorage/src/Storage.h
--- old/yast2-storage-2.16.8/libstorage/src/Storage.h 2007-12-18 13:53:19.000000000 +0100
+++ new/yast2-storage-2.16.9/libstorage/src/Storage.h 2008-01-15 16:34:31.000000000 +0100
@@ -317,6 +317,7 @@
int destroyPartitionTable( const string& disk, const string& label );
int initializeDisk( const string& disk, bool value );
string defaultDiskLabel() const;
+ string defaultDiskLabelSize( unsigned long long size_k ) const;
unsigned long long maxSizeLabelK( const string& label ) const;
int changeFormatVolume( const string& device, bool format,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/libstorage/src/StorageInterface.h new/yast2-storage-2.16.9/libstorage/src/StorageInterface.h
--- old/yast2-storage-2.16.8/libstorage/src/StorageInterface.h 2007-12-18 13:51:56.000000000 +0100
+++ new/yast2-storage-2.16.9/libstorage/src/StorageInterface.h 2008-01-15 16:36:24.000000000 +0100
@@ -1069,6 +1069,17 @@
virtual string defaultDiskLabel() const = 0;
/**
+ * Query the default disk label of the architecture of the
+ * machine (e.g. msdos for ix86, gpt for ia64, ...) for a disk
+ * with certain size
+ *
+ * @param size_k size of disk in kilobyte
+ *
+ * @return default disk label of the disk
+ */
+ virtual string defaultDiskLabelSize( unsigned long long size_k ) const = 0;
+
+ /**
* Query the maximal allowed size the given disk label supports.
*
* @return maximal supported size of disk label
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/libstorage/src/Volume.cc new/yast2-storage-2.16.9/libstorage/src/Volume.cc
--- old/yast2-storage-2.16.8/libstorage/src/Volume.cc 2007-10-10 17:28:02.000000000 +0200
+++ new/yast2-storage-2.16.9/libstorage/src/Volume.cc 2008-01-16 13:08:16.000000000 +0100
@@ -2463,8 +2463,8 @@
che.fs = fs_names[fs];
getFstabOpts( che.opts );
che.mount = mp;
- if( fs != SWAP && fs != FSUNKNOWN && fs != NTFS && fs != VFAT &&
- !is_loop && !dmcrypt() && !optNoauto() )
+ if( fs != NFS && fs != SWAP && fs != FSUNKNOWN && fs != NTFS &&
+ fs != VFAT && !is_loop && !dmcrypt() && !optNoauto() )
{
che.freq = 1;
che.passno = (mp=="/") ? 1 : 2;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/storage/src/include/auto_part_prepare.ycp new/yast2-storage-2.16.9/storage/src/include/auto_part_prepare.ycp
--- old/yast2-storage-2.16.8/storage/src/include/auto_part_prepare.ycp 2007-11-19 12:51:52.000000000 +0100
+++ new/yast2-storage-2.16.9/storage/src/include/auto_part_prepare.ycp 2008-01-30 14:30:39.000000000 +0100
@@ -8,7 +8,7 @@
* cover the whole disk, including unpartitioned
* areas as 'dummy' partitions.
*
- * $Id: auto_part_prepare.ycp 42158 2007-11-19 11:51:52Z fehr $
+ * $Id: auto_part_prepare.ycp 44009 2008-01-30 13:30:38Z fehr $
*
*/
{
@@ -108,6 +108,9 @@
integer last_end = 0;
integer free_nr = 0;
+ if( target["label"]:"" == "sun" )
+ last_end = 1;
+
// first the mid-disk holes
partitions = flatten( maplist( map pentry, partitions,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/storage/src/include/auto_part_ui.ycp new/yast2-storage-2.16.9/storage/src/include/auto_part_ui.ycp
--- old/yast2-storage-2.16.8/storage/src/include/auto_part_ui.ycp 2007-05-23 12:45:16.000000000 +0200
+++ new/yast2-storage-2.16.9/storage/src/include/auto_part_ui.ycp 2008-01-15 18:25:46.000000000 +0100
@@ -9,7 +9,7 @@
*
*
*
- * $Id: auto_part_ui.ycp 37909 2007-05-10 13:50:48Z fehr $
+ * $Id: auto_part_ui.ycp 43636 2008-01-15 17:25:46Z fehr $
*
* used globals:
*
@@ -271,7 +271,7 @@
vb = add (vb,
`Left(`HBox(`HSpacing(3), `CheckBox( `id(`home),
// Label text
- _("Propose Separate &Home Partition" ),
+ _("Propose Separate &Home Partition"),
cfg["home"]:false ))));
vb = add (vb, `VSpacing(1) );
vb = add( vb,
@@ -285,7 +285,7 @@
_("Create &EVMS Based Proposal"),
cfg["prop_evms"]:false ))));
vbox = add (vbox, `VSpacing(1.5) );
- term frame = `HVCenter(`Frame( _( "Proposal type" ), `HVCenter(vb) ));
+ term frame = `HVCenter(`Frame( _("Proposal type"), `HVCenter(vb) ));
vbox = add (vbox, frame );
return( vbox );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.16.9/storage/src/include/custom_part_dialogs.ycp
--- old/yast2-storage-2.16.8/storage/src/include/custom_part_dialogs.ycp 2008-01-10 17:56:46.000000000 +0100
+++ new/yast2-storage-2.16.9/storage/src/include/custom_part_dialogs.ycp 2008-01-15 18:25:46.000000000 +0100
@@ -16,7 +16,7 @@
*
*************************************************************
- $Id: custom_part_dialogs.ycp 43539 2008-01-10 16:56:46Z fehr $
+ $Id: custom_part_dialogs.ycp 43636 2008-01-15 17:25:46Z fehr $
*/
{
@@ -484,8 +484,8 @@
// help text, richtext format
helptext = helptext + _("<p><b>Volume Label:</b>
-The name entered in this field is used as the volume label. This normally only
-makes sense when you activate the option for mounting by volume label.
+The name entered in this field is used as the volume label. This usually makes sense only
+when you activate the option for mounting by volume label.
A volume label cannot contain the / character or spaces.
");
@@ -1575,7 +1575,7 @@
-define boolean DDZeroPartitionTable( string del_dev )
+define boolean DDZeroPartitionTable( string del_dev, integer size_k )
``{
// popup text
if( Popup::YesNo(sformat(_("CAUTION
@@ -1585,7 +1585,7 @@
Really do this?
"), del_dev)))
{
- Storage::DeletePartitionTable(del_dev);
+ Storage::DeletePartitionTable(del_dev,size_k);
return true;
}
return false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/storage/src/include/do_proposal_flexible.ycp new/yast2-storage-2.16.9/storage/src/include/do_proposal_flexible.ycp
--- old/yast2-storage-2.16.8/storage/src/include/do_proposal_flexible.ycp 2007-12-19 16:57:19.000000000 +0100
+++ new/yast2-storage-2.16.9/storage/src/include/do_proposal_flexible.ycp 2008-01-30 14:30:39.000000000 +0100
@@ -14,7 +14,7 @@
*
*************************************************************
- $Id: do_proposal_flexible.ycp 43190 2007-12-19 15:57:19Z fehr $
+ $Id: do_proposal_flexible.ycp 44009 2008-01-30 13:30:38Z fehr $
*/
{
@@ -1667,7 +1667,7 @@
}
integer max_prim = Partitions::MaxPrimary(disk["label"]:"msdos");
boolean has_ext = Partitions::HasExtended( disk["label"]:"msdos" );
- integer max_pos_cyl = Storage::MaxCylLabel( disk );
+ integer max_pos_cyl = Storage::MaxCylLabel( disk, 0 );
integer end = 0;
if( has_ext )
{
@@ -1678,8 +1678,8 @@
if( size(ext)>0 )
{
end = ext["region",0]:0 + ext["region",1]:1-1;
- if( end > max_pos_cyl )
- end = max_pos_cyl;
+ if( end > ext["region",0]:0 + max_pos_cyl )
+ end = ext["region",0]:0 + max_pos_cyl;
gap = get_gaps( ext["region",0]:0, end,
filter( map p, plist, ``(p["nr"]:0>max_prim)),
add_exist_linux );
@@ -1698,8 +1698,10 @@
end = disk["cyl_count"]:1-1;
if( end > max_pos_cyl )
end = max_pos_cyl;
- gap = (list<map>)union( gap, get_gaps( 0, end, plist, add_exist_linux ));
- gap = filter( map g, gap, ``(g["end"]:0<=max_pos_cyl) );
+ integer start = 0;
+ if( disk["label"]:"" == "sun" )
+ start = 1;
+ gap = (list<map>)union( gap, get_gaps( start, end, plist, add_exist_linux ));
integer av_size = 0;
gap = maplist( map e, gap,
``{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/storage/src/inst_custom_part.ycp new/yast2-storage-2.16.9/storage/src/inst_custom_part.ycp
--- old/yast2-storage-2.16.8/storage/src/inst_custom_part.ycp 2007-12-11 12:52:35.000000000 +0100
+++ new/yast2-storage-2.16.9/storage/src/inst_custom_part.ycp 2008-01-15 18:25:46.000000000 +0100
@@ -26,7 +26,7 @@
*
*************************************************************
- $Id: inst_custom_part.ycp 42953 2007-12-11 11:52:35Z fehr $
+ $Id: inst_custom_part.ycp 43636 2008-01-15 17:25:46Z fehr $
*/
{
@@ -1256,7 +1256,7 @@
{
////////////////////// STEP D /////////////////////
- integer max_cyl = Storage::MaxCylLabel(disk);
+ integer max_cyl = Storage::MaxCylLabel(disk,int_start_cyl);
int_end_cyl = int_start_cyl +
ToEndRegion( str_start_cyl, str_end_part,
cyl_size ) - 1;
@@ -1297,10 +1297,10 @@
The value of the end cylinder %1 was not valid.
The used disk label %2 does not support partitions above
the size of %3.
-Therefore the cylinder value must be below %4.
+Therefore, the cylinder value must be below %4.
Use the maximum allowed value
-or select No and enter a correct value yourself.
+or select <b>No</b> and enter a correct value yourself.
Use the maximum allowed value?
"),
@@ -3365,7 +3365,7 @@
// not cancel
if( ddev != nil )
{
- DDZeroPartitionTable(ddev);
+ DDZeroPartitionTable( ddev, tg[ddev,"size_k"]:0 );
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/storage/src/inst_disk_proposal.ycp new/yast2-storage-2.16.9/storage/src/inst_disk_proposal.ycp
--- old/yast2-storage-2.16.8/storage/src/inst_disk_proposal.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.16.9/storage/src/inst_disk_proposal.ycp 2008-01-30 13:29:23.000000000 +0100
@@ -0,0 +1,387 @@
+/*
+ *************************************************************
+ *
+ * YaST2 SuSE Labs -o)
+ * -------------------- /\\
+ * _\_v
+ * www.suse.de / www.suse.com
+ * ----------------------------------------------------------
+ *
+ * Author: Michael Hager <mike(a)suse.de>
+ *
+ * Description: Create a proposal for partitioning
+ *
+ *
+ *
+ *
+ *
+ *************************************************************
+
+ $Id: inst_part_proposal.ycp 43636 2008-01-15 17:25:46Z fehr $
+
+*/
+
+{
+ textdomain "storage";
+ import "Arch";
+ import "Wizard";
+ import "Mode";
+ import "Popup";
+ import "Storage";
+
+ include "wizard/sequencer.ycp";
+ include "partitioning/custom_part_check_generated.ycp";
+ include "partitioning/do_proposal_flexible.ycp";
+
+define void HandlePackages()
+ ``{
+ Pkg::DoRemove( ["lvm2"] );
+ list<string> pack = Storage::AddPackageList();
+ if( size(pack)>0 )
+ {
+ Pkg::DoProvide( pack );
+ }
+ if( Stage::initial() )
+ {
+ Storage::SaveUsedFs();
+ }
+ }
+
+define boolean AskOverwriteChanges()
+ ``{
+ boolean ret = true;
+ string target_is = Storage::GetPartMode();
+ y2milestone( "AskOverwriteChanges target_is %1", target_is );
+ if( target_is=="USE_DISK" || target_is=="CUSTOM" ||
+ target_is=="PROP_MODIFY" )
+ {
+ ret = Popup::YesNo(
+_("Computing this proposal will overwrite manual changes
+done so far. Continue with computing proposal?"));
+ }
+ y2milestone( "AskOverwriteChanges ret:%1", ret );
+ return( ret );
+ }
+
+define void execSubscreens( boolean detailed )
+ ``{
+ y2milestone( "execSubscreens detailed %1", detailed );
+ map aliases =
+ $[ "disk" :
+ ``(WFM::CallFunction("inst_disk", [true, true])),
+ "target_sel" :
+ ``(WFM::CallFunction("inst_target_selection", [true, true])),
+ "target_part" :
+ ``(WFM::CallFunction("inst_target_part", [true, true])),
+ "resize_ui" :
+ ``(WFM::CallFunction("inst_resize_ui", [true, true])),
+ ];
+ map seq = $[];
+ seq["disk"] = $[ `abort : `abort, `cancel: `cancel, `next: `next ];
+ if( Arch::s390() || Mode::autoinst() )
+ {
+ Storage::SetPartMode("PROP_MODIFY");
+ seq["ws_start"] = "disk";
+ }
+ else
+ {
+ y2milestone( "ProposalActive %1 ProposalMode %2 PartMode %3",
+ Storage::GetPartProposalActive(),
+ Storage::GetPartProposalMode(), Storage::GetPartMode() );
+ seq["target_sel"] = $[ `abort : `abort, `cancel: `cancel,
+ `next : "target_part" ];
+ seq["target_part"] = $[ `abort : `abort, `cancel: `cancel,
+ `next : "disk" ];
+ if( Arch::i386() )
+ {
+ seq["resize_ui"] = $[ `abort : `abort, `cancel: `cancel,
+ `next : "disk" ];
+ seq["target_part",`next] = "resize_ui";
+ }
+ seq["disk"] = $[ `abort : `abort, `cancel: `cancel, `next : `next ];
+ y2milestone( "execSubscreens GetPartMode %1", Storage::GetPartMode() );
+ if( detailed && Storage::GetPartMode()!="CUSTOM" )
+ seq["ws_start"] = "target_sel";
+ else
+ seq["ws_start"] = "disk";
+ if( Storage::CheckBackupState("disk"))
+ Storage::DisposeTargetBackup("disk");
+ y2milestone( "execSubscreens sequence %1", seq );
+ Wizard::OpenNextBackDialog();
+ symbol result = WizardSequencer(aliases, seq);
+ Wizard::CloseDialog();
+ HandlePackages();
+ }
+ }
+
+map<string,map> targetMap = Storage::GetTargetMap();
+
+if( Mode::test() && size(targetMap)==0 )
+ {
+ y2warning("***** Demo mode active - using fake demo values *****");
+ targetMap = (map<string,map>)SCR::Read(.target.yast2, "demo_target_map.ycp");
+ Storage::SetTargetMap( targetMap );
+ }
+
+
+//////////////////////////////////////////////////////
+// This module is only for i386 fdisk-label
+
+if( Arch::s390() )
+ {
+ return Storage::GetExitKey();
+ }
+
+string title = "";
+string modify_str = "";
+string detailed_str = "";
+string lvm_str = "";
+string evms_str = "";
+string part_str = "";
+
+// Title for dialogue
+title = _("Suggested Partitioning");
+// Radiobutton for partition dialog
+modify_str = _("&Edit Partition Setup...");
+// Radiobutton for partition dialog
+detailed_str = _("&Create Partition Setup...");
+// Radiobutton for partition dialog
+part_str = _("&Partition Based");
+// Radiobutton for partition dialog
+lvm_str = _("&LVM Based");
+// Radiobutton for partition dialog
+evms_str = _("&EVMS Based");
+
+string target_is = "";
+
+string changes = "";
+if( Storage::GetPartProposalFirst() )
+ {
+ map prop = get_inst_prop( Storage::GetTargetMap() );
+ y2milestone( "prop ok:%1", prop["ok"]:false );
+ if( prop["ok"]:false )
+ {
+ map save = targetMap;
+ Storage::SetTargetMap( prop["target"]:$[] );
+ targetMap = prop["target"]:$[];
+ Storage::SetPartProposalMode( "accept" );
+ changes = Storage::ChangeText();
+ HandlePackages();
+ target_is = "SUGGESTION";
+ Storage::SetPartMode( target_is );
+ Storage::SetPartProposalFirst( false );
+ Storage::SetPartProposalActive( true );
+ }
+ else
+ {
+ Storage::SetPartProposalMode( "impossible" );
+ }
+ }
+else
+ changes = Storage::ChangeText();
+
+if( Storage::GetPartProposalMode() == "impossible" )
+ {
+ changes = "<font color=red>";
+ changes = changes + _("No automatic proposal possible.
+Specify mount points manually in the 'Partitioner' dialog.");
+ changes = changes + "</font>";
+ }
+
+y2milestone( "current proposal: %1", changes );
+
+map cfg = Storage::GetControlCfg();
+
+term rframe =
+ `HBox(
+ `HSpacing(3),
+ `MinWidth(20,`Left( `RadioButton( `id(`part), `opt(`notify), part_str,
+ !Storage::ProposalEvms() &&
+ !Storage::ProposalLvm() ))),
+ `HSpacing(3),
+ `MinWidth(20,`Left( `RadioButton( `id(`lvm), `opt(`notify), lvm_str,
+ Storage::ProposalLvm() ))),
+ `HSpacing(3)
+ );
+
+if( cfg["evms_config"]:false && false ) // No EVMS proposal for SLES10!!
+ {
+ boolean v = Storage::ProposalEvms() && !Storage::ProposalLvm();
+ rframe = add( rframe, `HStretch() );
+ rframe = add( rframe,
+ `MinWidth(20,`Left( `RadioButton( `id(`evms), evms_str, v ))) );
+ rframe = add( rframe, `HSpacing(3) );
+ }
+
+term bframe =
+ `HBox(
+ `PushButton( `id(`modify), modify_str ),
+ `HSpacing(5),
+ `PushButton( `id(`detailed), detailed_str ),
+ `HSpacing(5)
+ );
+
+
+// Frame description in suggested partition for mode accept modify ..
+//bframe = `HCenter( `Frame( _("Partitioning"), `HVSquash( bframe ) ));
+
+term contents =
+ `VBox(
+ `VSpacing(0.5),
+ `HBox(
+ `HSpacing(2),
+ `VBox(
+ `MinHeight( 7, `RichText( `id("richtext"), changes )),
+ `VSpacing(1),
+ `RadioButtonGroup( `id("prop_mode"), rframe ),
+ `VSpacing(4),
+ bframe,
+ `VStretch()
+ ),
+ `HSpacing(2)
+ ),
+ `VSpacing(2) );
+
+
+// help on suggested partitioning
+string help_text = _("<p>
+Your hard disks have been checked. The partition setup
+displayed is proposed for your hard drive.</p>");
+
+// help text continued
+// %1 is replaced by button text
+help_text = help_text + sformat(_("<p>
+To make only small adjustments to the proposed
+setup (like e.g. changing filesystem types), choose
+<b>%1</b> and do these modification in the expert
+partioner dialog.</p>
+"), deletechars(modify_str,"&"));
+
+// help text continued
+help_text = help_text + sformat(_("<p>
+If the suggestion does not fit your needs, create
+your own partition setup starting with the partitions as
+currently present on the disks. For this, select
+<b>%1</b>.
+This is also the option to choose for
+advanced options like RAID and encryption.</p>
+"), deletechars(detailed_str,"&"));
+
+if( cfg["evms_config"]:false && false ) // No EVMS proposal for SLES10!!
+ // help text continued
+ // %1 is replaced by button text
+ help_text = help_text + _("<p>
+To create an LVM or EVMS based proposal, choose the corresponding button.</p>
+");
+else
+ // help text continued
+ // %1 is replaced by button text
+ help_text = help_text + _("<p>
+To create an LVM based proposal, choose the corresponding button.</p>
+");
+
+
+symbol ret = nil;
+
+if( !Storage::GetTestsuite() )
+ {
+ map enab = (map)WFM::Args(0);
+ Wizard::SetContents( title, contents, help_text,
+ enab["enable_back"]:false, enab["enable_next"]:false );
+ if( Stage::initial () )
+ Wizard::SetTitleIcon( "yast-partitioning" );
+
+ any r = nil;
+
+ repeat
+ {
+ symbol old_mode = (symbol)UI::QueryWidget( `id("prop_mode"),
+ `CurrentButton );
+ y2milestone( "old_mode %1", old_mode );
+ Wizard::SetFocusToNextButton();
+ ret = (symbol)Wizard::UserInput();
+ y2milestone( "USERINPUT %1", ret );
+
+ if( ret == `abort && Popup::ReallyAbort(true) )
+ return `abort;
+
+ if( contains( [ `lvm, `evms, `part ], ret ) )
+ {
+ if( AskOverwriteChanges() )
+ {
+ target_is = "SUGGESTION";
+ if( ret==`lvm )
+ Storage::SetProposalLvm(true);
+ else if( ret==`evms )
+ Storage::SetProposalEvms(true);
+ else
+ {
+ Storage::SetProposalLvm(false);
+ Storage::SetProposalEvms(false);
+ }
+ Storage::ResetOndiskTarget();
+ Storage::AddMountPointsForWin(Storage::GetTargetMap());
+ map prop = get_inst_prop( Storage::GetTargetMap());
+ if( !prop["ok"]:false )
+ {
+ Popup::Error( _("Impossible to create the requested proposal.") );
+ Storage::SetPartProposalMode( "impossible" );
+ }
+ else
+ {
+ targetMap = prop["target"]:$[];
+ Storage::SetPartProposalMode( "accept" );
+ Storage::SetPartProposalActive( true );
+ }
+ Storage::SetPartMode( target_is );
+ Storage::SetTargetMap( targetMap );
+ changes = Storage::ChangeText();
+ UI::ChangeWidget( `id("richtext"), `Value, changes );
+ }
+ else
+ {
+ UI::ChangeWidget( `id("prop_mode"), `CurrentButton, old_mode );
+ }
+ }
+ else if( ret==`modify || ret==`detailed )
+ {
+ Storage::SetPartProposalFirst( false );
+ Storage::SetPartProposalActive( false );
+ if( ret==`modify )
+ {
+ target_is = "PROP_MODIFY";
+ Storage::SetPartProposalMode( "modify" );
+ }
+ else
+ {
+ if( Storage::GetPartMode()!="CUSTOM" )
+ {
+ target_is = "NORMAL";
+ }
+ else
+ {
+ target_is = "CUSTOM";
+ }
+ Storage::SetPartDisk( "" );
+ Storage::SetPartProposalMode( "detailed" );
+ }
+ Storage::SetPartMode( target_is );
+ execSubscreens( ret==`detailed );
+ changes = Storage::ChangeText();
+ UI::ChangeWidget( `id("richtext"), `Value, changes );
+ if( ret==`detailed )
+ {
+ if( Storage::ProposalLvm() )
+ UI::ChangeWidget( `id("prop_mode"), `CurrentButton, `lvm );
+ else if( Storage::ProposalEvms() )
+ UI::ChangeWidget( `id("prop_mode"), `CurrentButton, `evms );
+ else
+ UI::ChangeWidget( `id("prop_mode"), `CurrentButton, `part );
+ }
+ }
+ } until ( ret == `next || ret == `back || ret == `cancel );
+ }
+Storage::SaveExitKey( ret );
+
+return ret;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/storage/src/inst_part_proposal.ycp new/yast2-storage-2.16.9/storage/src/inst_part_proposal.ycp
--- old/yast2-storage-2.16.8/storage/src/inst_part_proposal.ycp 2007-06-26 10:28:53.000000000 +0200
+++ new/yast2-storage-2.16.9/storage/src/inst_part_proposal.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,291 +0,0 @@
-/*
- *************************************************************
- *
- * YaST2 SuSE Labs -o)
- * -------------------- /\\
- * _\_v
- * www.suse.de / www.suse.com
- * ----------------------------------------------------------
- *
- * Author: Michael Hager <mike(a)suse.de>
- *
- * Description: Create a proposal for partitioning
- *
- *
- *
- *
- *
- *************************************************************
-
- $Id: inst_part_proposal.ycp 38103 2007-05-23 11:03:11Z fehr $
-
-*/
-
-{
- textdomain "storage";
- import "Arch";
- import "Wizard";
- import "Mode";
- import "Popup";
- import "Storage";
-
- include "partitioning/custom_part_check_generated.ycp";
- include "partitioning/do_proposal_flexible.ycp";
-
- boolean test_mode = Mode::test ();
- boolean demo_mode = Mode::test ();
- string part_proposal_mode = Storage::GetPartProposalMode();
-
- map<string,map> targetMap = Storage::GetTargetMap();
- boolean run_in_testsuite = Storage::GetTestsuite();
-
- boolean proposal_firsttime = Storage::GetPartProposalFirst();
- boolean orig_proposal_firsttime = proposal_firsttime;
- boolean no_suggestion_possible = true;
-
- if ( test_mode && (size(targetMap) == 0) )
- {
- if ( demo_mode ) {
- y2warning("***** Demo mode active - using fake demo values *****");
- targetMap = (map<string,map>)SCR::Read(.target.yast2, "demo_target_map.ycp");
- }
- else {// ! demo_mode
- y2warning("***** Test mode active - using fake values *****");
- targetMap = (map<string,map>)SCR::Read(.target.yast2, "test_target_map.ycp");
- }
- Storage::SetTargetMap( targetMap );
- }
-
-
- //////////////////////////////////////////////////////
- // This module is only for i386 fdisk-label
-
- if ( Arch::s390 () )
- {
- return Storage::GetExitKey();
- }
-
-
- string title = "";
- string accept_str = "";
- string modify_str = "";
- string detailed_str = "";
- string lvm_str = "";
- string evms_str = "";
-
- // Title for dialogue
- title = _("Suggested Partitioning");
- // Radiobutton for partition dialog
- accept_str = _("&Accept Proposal");
- // Radiobutton for partition dialog
- modify_str = _("Ba&se Partition Setup on This Proposal");
- // Radiobutton for partition dialog
- detailed_str = _("&Create Custom Partition Setup");
- // Radiobutton for partition dialog
- lvm_str = _("Create &LVM Based Proposal");
- // Radiobutton for partition dialog
- evms_str = _("Create &EVMS Based Proposal");
-
- string changes = Storage::ChangeText();
- y2milestone( "current proposal: %1", changes );
- if( size(changes) == 0 )
- {
- changes = "<p></p>" +
- // popup text, richtext format
- _("<p>You rejected the proposal. Use one of the options to continue partitioning.</p>");
- }
-
- map cfg = Storage::GetControlCfg();
-
- term bframe =
- `VBox(
- `VSpacing (0.2),
- `Left( `RadioButton (`id ("accept"), accept_str, part_proposal_mode=="accept")),
- `VSpacing (0.2),
- `Left( `RadioButton (`id ("modify"), modify_str, part_proposal_mode=="modify")),
- `VSpacing (0.2),
- `Left( `RadioButton (`id ("detailed"), detailed_str, part_proposal_mode=="detailed")),
- `VSpacing (0.2),
- `Left( `RadioButton (`id ("lvm"), lvm_str, false ))
- );
-
- if( cfg["evms_config"]:false && false ) // No EVMS proposal for SLES10!!
- {
- bframe = add( bframe, `VSpacing (0.2) );
- bframe = add( bframe,
- `Left( `RadioButton (`id ("evms"), evms_str, false )) );
- }
-
- // Frame description in suggested partition for mode accept modify ..
- bframe = `HCenter( `Frame( _("Partitioning"), `HVSquash( bframe ) ));
-
- term contents =
- `VBox (
- `VSpacing (0.5),
- `HBox (
- `HSpacing (2),
- `RadioButtonGroup (`id ("part_option"),
- `VBox (
- `MinHeight( 7, `RichText (`id ("richtext"), changes)),
- `VSpacing(1),
- bframe,
- `VStretch()
- )),
- `HSpacing (2)
- ),
- `VSpacing(2) );
-
-
- // help on suggested partitioning
- string help_text = _("<p>
-Your hard disks have been checked. The partition setup
-displayed is proposed for your hard drive.</p>");
-
- // help text continued
- // %1 is replaced by button text
- help_text = help_text + sformat(_("<p>
-To accept these suggestions and continue, select
-<b>%1</b>.</p>
-"), deletechars(accept_str,"&"));
-
- // help text continued
- // %1 is replaced by button text
- help_text = help_text + sformat(_("<p>
-If you want to do only small adjustments to the proposed
-setup (like e.g. changing filesystem types) choose
-<b>%1</b> and do these modification in expert
-partioner dialog.</p>
-"), deletechars(modify_str,"&"));
-
- // help text continued
- help_text = help_text + sformat(_("<p>
-If the suggestion does not fit your needs, create
-your own partition setup starting with the partitions as
-currently present on the disks. For this, select
-<b>%1</b>.
-This is also the option to choose for
-advanced options like RAID and encryption.</p>
-"), deletechars(detailed_str,"&"));
-
- if( cfg["evms_config"]:false && false ) // No EVMS proposal for SLES10!!
- // help text continued
- // %1 is replaced by button text
- help_text = help_text + _("<p>
-To create a LVM or EVMS based proposal choose the corresponding button.</p>");
- else
- // help text continued
- // %1 is replaced by button text
- help_text = help_text + _("<p>
-To create a LVM based proposal choose the corresponding button.</p>");
-
- if( proposal_firsttime )
- {
- map prop = get_inst_prop( Storage::GetTargetMap() );
- proposal_firsttime = false;
- no_suggestion_possible = !prop["ok"]:false;
- if( !no_suggestion_possible )
- {
- targetMap = prop["target"]:$[];
- }
- }
-
-
- symbol ret = nil;
-
- if( !run_in_testsuite )
- {
- /////////////////////////////////////////////////////////////////////
- // next step to visualize the hit the new target map from hit
-
- if( no_suggestion_possible && orig_proposal_firsttime )
- {
- y2milestone( "Could not create a proposal %1 %2 ",
- no_suggestion_possible, orig_proposal_firsttime );
-
- return( Storage::GetExitKey() );
- }
- else
- {
- Wizard::SetContents( title, contents, help_text,
- (boolean)WFM::Args(0), (boolean)WFM::Args(1) );
- if ( Stage::initial () )
- Wizard::SetTitleIcon( "yast-partitioning" );
- }
-
- repeat
- {
- Wizard::SetFocusToNextButton();
- ret = (symbol)Wizard::UserInput();
- y2milestone( "USERINPUT %1", ret );
-
- string part_proposal_mode =
- (string) UI::QueryWidget(`id("part_option"), `CurrentButton);
-
- if( ret == `abort && Popup::ReallyAbort(true) )
- return `abort;
-
- if( ret != `back )
- {
- Storage::SetPartProposalFirst( false );
-
- string target_is = "";
-
- Storage::SetPartProposalMode( part_proposal_mode );
-
- if( part_proposal_mode == "accept" )
- {
- target_is = "SUGGESTION";
- }
- else if( part_proposal_mode == "lvm" ||
- part_proposal_mode == "evms" )
- {
- target_is = "SUGGESTION";
- if( part_proposal_mode=="lvm" )
- Storage::SetProposalLvm(true);
- else
- Storage::SetProposalEvms(true);
- Storage::ResetOndiskTarget();
- Storage::AddMountPointsForWin(Storage::GetTargetMap());
- map prop = get_inst_prop( Storage::GetTargetMap());
- if( !prop["ok"]:false )
- {
- Popup::Error( _("Impossible to create the requested proposal.") );
- ret = `doagain;
- }
- else
- {
- targetMap = prop["target"]:$[];
- Storage::SetPartProposalMode( "accept" );
- Storage::SetPartProposalActive( true );
- }
- Storage::SetProposalDefault();
- }
- else if( part_proposal_mode == "modify" )
- {
- target_is = "PROP_MODIFY";
- }
- else if( part_proposal_mode == "detailed" )
- {
- if( Storage::GetPartMode()!="CUSTOM" )
- {
- target_is = "NORMAL";
- }
- else
- {
- target_is = "CUSTOM";
- }
- Storage::SetPartDisk( "" );
- }
- y2milestone( "target_is %1", target_is );
- if( ret != `doagain )
- {
- Storage::SetPartMode( target_is );
- Storage::SetTargetMap( targetMap );
- }
- }
- } until ( ret == `next || ret == `back || ret == `cancel );
- }
- Storage::SaveExitKey( ret );
-
- return ret;
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/storage/src/inst_target_part.ycp new/yast2-storage-2.16.9/storage/src/inst_target_part.ycp
--- old/yast2-storage-2.16.8/storage/src/inst_target_part.ycp 2007-06-25 17:48:14.000000000 +0200
+++ new/yast2-storage-2.16.9/storage/src/inst_target_part.ycp 2008-01-30 14:30:39.000000000 +0100
@@ -9,7 +9,7 @@
* -Ask the user which partition to use.
* -Check the input and return error-messages.
*
- * $Id: inst_target_part.ycp 39013 2007-06-25 15:48:13Z fehr $
+ * $Id: inst_target_part.ycp 44009 2008-01-30 13:30:38Z fehr $
*/
{
textdomain "storage";
@@ -419,7 +419,7 @@
Storage::SetProposalLvm(false);
}
ok = create_partitions( targetMap, target, partitions );
- Storage::SetProposalDefault();
+ Storage::SetProposalDefault(true);
if( !ok )
{
reason = _("Too few partitions are marked for removal
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/storage/src/inst_target_selection.ycp new/yast2-storage-2.16.9/storage/src/inst_target_selection.ycp
--- old/yast2-storage-2.16.8/storage/src/inst_target_selection.ycp 2007-05-23 12:45:16.000000000 +0200
+++ new/yast2-storage-2.16.9/storage/src/inst_target_selection.ycp 2008-01-30 14:30:39.000000000 +0100
@@ -12,7 +12,7 @@
* "target_is":<devicename> (key to "targets" map)
* if custom, set "target_is":"CUSTOM"
*
- * $Id: inst_target_selection.ycp 33576 2006-10-23 13:25:11Z fehr $
+ * $Id: inst_target_selection.ycp 44009 2008-01-30 13:30:38Z fehr $
*/
{
textdomain "storage";
@@ -32,8 +32,7 @@
y2milestone( "GetPartMode %1", Storage::GetPartMode() );
- if( Storage::GetPartMode() == "PROP_MODIFY" ||
- Storage::GetPartMode() == "SUGGESTION" )
+ if( Storage::GetPartMode() == "PROP_MODIFY" )
return Storage::GetExitKey();
@@ -253,7 +252,8 @@
Storage::SetPartMode( "USE_DISK" );
y2milestone( "PartMode Disk old %1 name %2",
Storage::GetPartDisk(), option );
- Storage::DisposeTargetBackup("disk");
+ if( Storage::CheckBackupState("disk"))
+ Storage::DisposeTargetBackup("disk");
Storage::CreateTargetBackup("disk");
Storage::ResetOndiskTarget();
Storage::SetPartDisk( (string)option );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/storage/src/Makefile.am new/yast2-storage-2.16.9/storage/src/Makefile.am
--- old/yast2-storage-2.16.8/storage/src/Makefile.am 2007-05-23 12:45:16.000000000 +0200
+++ new/yast2-storage-2.16.9/storage/src/Makefile.am 2008-01-30 14:38:47.000000000 +0100
@@ -1,7 +1,7 @@
#
# Makefile.am for storage/src
#
-# $Id: Makefile.am 37852 2007-05-07 11:57:22Z fehr $
+# $Id: Makefile.am 44013 2008-01-30 13:38:47Z fehr $
#
SUBDIRS = include modules proposal
@@ -13,7 +13,7 @@
inst_lvm_lv.ycp \
inst_lvm_pv.ycp \
inst_evms.ycp \
- inst_part_proposal.ycp \
+ inst_disk_proposal.ycp \
inst_prepdisk.ycp \
inst_resize_ui.ycp \
inst_target_part.ycp \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/storage/src/Makefile.in new/yast2-storage-2.16.9/storage/src/Makefile.in
--- old/yast2-storage-2.16.8/storage/src/Makefile.in 2007-08-28 15:51:33.000000000 +0200
+++ new/yast2-storage-2.16.9/storage/src/Makefile.in 2008-01-30 14:40:08.000000000 +0100
@@ -17,7 +17,7 @@
#
# Makefile.am for storage/src
#
-# $Id: Makefile.am 37852 2007-05-07 11:57:22Z fehr $
+# $Id: Makefile.am 44013 2008-01-30 13:38:47Z fehr $
#
# Makefile.am.common -*- Makefile -*-
@@ -236,7 +236,7 @@
inst_lvm_lv.ycp \
inst_lvm_pv.ycp \
inst_evms.ycp \
- inst_part_proposal.ycp \
+ inst_disk_proposal.ycp \
inst_prepdisk.ycp \
inst_resize_ui.ycp \
inst_target_part.ycp \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/storage/src/modules/Storage.ycp new/yast2-storage-2.16.9/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.16.8/storage/src/modules/Storage.ycp 2008-01-10 13:36:11.000000000 +0100
+++ new/yast2-storage-2.16.9/storage/src/modules/Storage.ycp 2008-01-30 14:30:39.000000000 +0100
@@ -19,7 +19,7 @@
* wurde versucht "intelligent" zu gestallten und ist im einzelen bei den
* entspechenden Funktionen n�her erkl�rt.
*
- * $Id: Storage.ycp 43525 2008-01-10 12:36:10Z fehr $
+ * $Id: Storage.ycp 44009 2008-01-30 13:30:38Z fehr $
*/
{
@@ -2399,11 +2399,11 @@
integer ret = 0;
string tmp = disk["label"]:"";
ret = LibStorage::StorageInterface::maxSizeLabelK( sint, tmp );
- y2milestone( "MaxSizeLabel %1 is %2", disk["label"]:"", ret );
+ y2milestone( "MaxSizeLabelK %1 is %2", disk["label"]:"", ret );
return( ret );
}
-global integer MaxCylLabel( map disk )
+global integer MaxCylLabel( map disk, integer start_cyl )
{
integer ret = MaxSizeLabelK(disk);
y2milestone( "MaxCylLabel val_k:%1 cyl_size:%2", ret, disk["cyl_size"]:1 );
@@ -2412,6 +2412,8 @@
cylk2 = 2;
y2milestone( "MaxCylLabel val_k:%1 cylk2:%2", ret, cylk2 );
ret = ret*2 / cylk2 - 1;
+ ret = ret + start_cyl;
+ y2milestone( "MaxCylLabel ret:%1", ret );
return( ret );
}
@@ -3258,10 +3260,11 @@
* @param string the disk to deleted the partition table from
* @return boolean
*/
-global define boolean DeletePartitionTable(string disk)
+global define boolean DeletePartitionTable(string disk, integer size_k)
``{
- y2milestone( "DeletePartitionTable %1", disk );
- string label = LibStorage::StorageInterface::defaultDiskLabel( sint );
+ y2milestone( "DeletePartitionTable %1 size_k:%2", disk, size_k );
+ string label =
+ LibStorage::StorageInterface::defaultDiskLabelSize( sint, size_k );
y2milestone( "DeletePartitionTable label:%1", label );
integer ret =
LibStorage::StorageInterface::destroyPartitionTable( sint, disk,
@@ -3737,14 +3740,14 @@
else if( target[k,"type"]:`CT_UNKNOWN==`CT_EVMS )
DeleteEvmsCo( target[k,"name"]:"" );
else if( target[k,"type"]:`CT_UNKNOWN==`CT_DISK )
- DeletePartitionTable( k );
+ DeletePartitionTable( k, target[k,"size_k"]:0 );
else if( target[k,"type"]:`CT_UNKNOWN==`CT_DMRAID )
DeleteDmraid( k );
}
if( target[k,"del_ptable"]:false &&
IsPartType( target[k,"type"]:`CT_UNKNOWN ) )
{
- DeletePartitionTable( k );
+ DeletePartitionTable( k, target[k,"size_k"]:0 );
}
});
keys = maplist( string k, any e, target, ``(k));
@@ -6552,7 +6555,7 @@
input = filterchars(input, "0123456789kKmMgGtTbBoO.");
- if( findfirstnotof( input, "0123456789.") != nil )
+ if( size(input)>0 && findfirstnotof( input, "0123456789.") != nil )
{
// check whether the last char is in "kKmM" or "bB"
string last_char = substring( input, size(input)-1, 1);
@@ -6597,6 +6600,10 @@
number = 0;
}
}
+ else if( size(input)==0 )
+ {
+ number = 0;
+ }
else
{
number = tointeger( input );
@@ -6650,24 +6657,27 @@
return( proposal_lvm );
}
-global void SetProposalDefault()
+global void SetProposalDefault( boolean home_only )
{
SetProposalHome( cfg_xml["home"]:false );
- if( cfg_xml["prop_evms"]:false )
- {
- SetProposalEvms(true);
- }
- else if( cfg_xml["prop_lvm"]:false )
- {
- SetProposalLvm(true);
- }
- else
+ if( !home_only )
{
- SetProposalLvm(false);
- SetProposalEvms(false);
+ if( cfg_xml["prop_evms"]:false )
+ {
+ SetProposalEvms(true);
+ }
+ else if( cfg_xml["prop_lvm"]:false )
+ {
+ SetProposalLvm(true);
+ }
+ else
+ {
+ SetProposalLvm(false);
+ SetProposalEvms(false);
+ }
}
- y2milestone( "SetProposalDefault lvm:%1 evms:%2 home:%3",
- proposal_lvm, proposal_evms, proposal_home );
+ y2milestone( "SetProposalDefault ho:%4 lvm:%1 evms:%2 home:%3",
+ proposal_lvm, proposal_evms, proposal_home, home_only );
}
global map GetControlCfg()
@@ -6719,7 +6729,7 @@
bt = ProductFeatures::GetBooleanFeature( "partitioning",
"evms_boot" );
cfg_xml["evms_boot"] = bt?true:false;
- SetProposalDefault();
+ SetProposalDefault(false);
y2milestone( "GetControlCfg cfg_xml %1", cfg_xml );
}
return( cfg_xml );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/storage/src/proposal/partitions_proposal.ycp new/yast2-storage-2.16.9/storage/src/proposal/partitions_proposal.ycp
--- old/yast2-storage-2.16.8/storage/src/proposal/partitions_proposal.ycp 2007-05-23 12:45:16.000000000 +0200
+++ new/yast2-storage-2.16.9/storage/src/proposal/partitions_proposal.ycp 2008-01-30 14:30:39.000000000 +0100
@@ -1,7 +1,7 @@
/**
* Module: proposal_partitions.ycp
*
- * $Id: partitions_proposal.ycp 36352 2007-02-21 15:53:38Z fehr $
+ * $Id: partitions_proposal.ycp 44009 2008-01-30 13:30:38Z fehr $
*
* Author: Klaus Kaempf <kkaempf(a)suse.de>
*
@@ -106,9 +106,7 @@
"target_part" :
``(WFM::CallFunction("inst_target_part", [true, true])),
"resize_ui" :
- ``(WFM::CallFunction("inst_resize_ui", [true, true])),
- "part_proposal" :
- ``(WFM::CallFunction("inst_part_proposal", [true, true]))
+ ``(WFM::CallFunction("inst_resize_ui", [true, true]))
];
map seq = $[];
@@ -124,12 +122,12 @@
seq["disk"] = $[ `abort : `abort, `cancel: `cancel, `next: `next ];
- if( Arch::s390 ())
+ if( Arch::s390() )
{
Storage::SetPartMode("PROP_MODIFY");
seq["ws_start"] = "disk";
}
- else if (Mode::autoinst ())
+ else if( Mode::autoinst() )
{
Storage::SetPartMode("PROP_MODIFY");
seq["ws_start"] = "disk";
@@ -154,9 +152,7 @@
if( Storage::GetPartProposalMode() != "impossible" &&
Storage::GetPartProposalActive() )
{
- seq["part_proposal"] = $[ `abort : `abort, `cancel: `cancel,
- `next : "target_sel" ];
- seq["ws_start"] = "part_proposal";
+ seq["ws_start"] = "target_sel";
}
else if( Storage::GetPartMode()=="USE_DISK" )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.8/VERSION new/yast2-storage-2.16.9/VERSION
--- old/yast2-storage-2.16.8/VERSION 2008-01-10 17:57:03.000000000 +0100
+++ new/yast2-storage-2.16.9/VERSION 2008-01-30 14:30:08.000000000 +0100
@@ -1 +1 @@
-2.16.8
+2.16.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 amarok
checked in at Wed Jan 30 22:07:17 CET 2008.
--------
--- KDE/amarok/amarok.changes 2008-01-16 11:01:43.000000000 +0100
+++ amarok/amarok.changes 2008-01-30 21:36:32.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Jan 30 21:36:20 CET 2008 - schwab(a)suse.de
+
+- Fix dependencies.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.pC5566/_old 2008-01-30 22:07:08.000000000 +0100
+++ /var/tmp/diff_new_pack.pC5566/_new 2008-01-30 22:07:08.000000000 +0100
@@ -30,13 +30,13 @@
%endif
Url: http://amarok.kde.org
License: GPL v2 or later
-Requires: kdelibs3 >= %(rpm -q --queryformat '%{VERSION}' kdelibs3)
-Requires: amarok_engine >= %version
-Requires: ruby
Group: Productivity/Multimedia/Sound/Players
Summary: Media Player for KDE
Version: 1.4.8
-Release: 13
+Release: 18
+Requires: kdelibs3 >= %(rpm -q --queryformat '%{VERSION}' kdelibs3)
+Requires: amarok_engine >= %version
+Requires: ruby
%if %suse_version > 1020
Requires: amarok-lang = %{version}
Recommends: libvisual-plugins
@@ -301,6 +301,8 @@
%endif
%changelog
+* Wed Jan 30 2008 schwab(a)suse.de
+- Fix dependencies.
* Wed Jan 16 2008 stbinner(a)suse.de
- add possible crash fix
* Mon Jan 07 2008 dmueller(a)suse.de
@@ -462,7 +464,7 @@
- only give amarok http urls, it has no KIO support (#174512)
* Wed Aug 23 2006 stbinner(a)suse.de
- enable MTP support for Factory
-* Mon Aug 21 2006 stbinner(a)suse.de
+* Tue Aug 22 2006 stbinner(a)suse.de
- update to version 1.4.2
* Handle itpc:// and pcast:// urls for adding podcast feeds
* Synchronize playlists to media devices.
@@ -1222,7 +1224,7 @@
* Tue Jun 01 2004 adrian(a)suse.de
- update to version 1.0 beta 4
- update translations
-* Tue May 11 2004 adrian(a)suse.de
+* Wed May 12 2004 adrian(a)suse.de
- add translations
* Mon May 10 2004 adrian(a)suse.de
- add missing %%defattr
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
checked in at Wed Jan 30 22:05:00 CET 2008.
--------
--- arch/i386/kiwi/kiwi.changes 2008-01-28 01:43:34.000000000 +0100
+++ kiwi/kiwi.changes 2008-01-30 17:56:47.415816000 +0100
@@ -1,0 +2,16 @@
+Wed Jan 30 14:30:09 CET 2008 - ms(a)suse.de
+
+- v2.16
+- don't remove file utility from diskless netboot profile
+
+-------------------------------------------------------------------
+Sun Jan 27 11:44:33 CET 2008 - ms(a)suse.de
+
+- v2.15
+- fixed cleanup function call when iso:// type is used (#356928)
+- fixed git installed check and ignore list in KIWIConfig.sh
+- change XML schema to allow user defined order of elements
+- make /var/log/boot.kiwi available in system image
+- fixed oemboot for compressed images on small disks
+
+-------------------------------------------------------------------
@@ -1497,0 +1514,6 @@
+Tue Apr 4 17:14:05 CEST 2007 - ms(a)suse.de
+
+- v1.24
+- split image code from image descriptions
+
+-------------------------------------------------------------------
@@ -1509,6 +1530,0 @@
-Tue Apr 3 17:14:05 CEST 2007 - ms(a)suse.de
-
-- v1.24
-- split image code from image descriptions
-
--------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.O30638/_old 2008-01-30 22:04:05.000000000 +0100
+++ /var/tmp/diff_new_pack.O30638/_new 2008-01-30 22:04:05.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kiwi (Version 2.14)
+# spec file for package kiwi (Version 2.16)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -23,7 +23,7 @@
Summary: OpenSuSE - KIWI Image System
Provides: kiwi = %version
Obsoletes: kiwi2 <= 2.14
-Version: 2.14
+Version: 2.16
Release: 1
Group: System/Management
License: GPL v2 or later
@@ -395,6 +395,16 @@
%{_datadir}/kiwi/image/oemboot/suse*
%changelog
+* Wed Jan 30 2008 ms(a)suse.de
+- v2.16
+- don't remove file utility from diskless netboot profile
+* Sun Jan 27 2008 ms(a)suse.de
+- v2.15
+- fixed cleanup function call when iso:// type is used (#356928)
+- fixed git installed check and ignore list in KIWIConfig.sh
+- change XML schema to allow user defined order of elements
+- make /var/log/boot.kiwi available in system image
+- fixed oemboot for compressed images on small disks
* Thu Jan 24 2008 ms(a)suse.de
- v2.14
- fixed usb hub detection (#348362)
@@ -1526,6 +1536,9 @@
filesystem type. Currently unionfs and aufs are possible
- added magic files to be used for filesystem detection in
netboot/xennetboot and usbboot
+* Wed Apr 04 2007 ms(a)suse.de
+- v1.24
+- split image code from image descriptions
* Tue Apr 03 2007 ms(a)suse.de
- v1.23
- added support for squashfs on USB stick images
@@ -1534,9 +1547,6 @@
- removed config.sh from the boot descriptions. The only action
was to copy linuxrc to init which is done in the KIWIRoot module
now
-* Tue Apr 03 2007 ms(a)suse.de
-- v1.24
-- split image code from image descriptions
* Fri Mar 30 2007 ms(a)suse.de
- allow use of recommended pattern entries by setting up
the option <packages> attribute patternType. Default type
++++++ kiwi.tar.bz2 ++++++
arch/i386/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 hal
checked in at Wed Jan 30 22:03:46 CET 2008.
--------
--- hal/hal.changes 2008-01-26 14:02:09.000000000 +0100
+++ hal/hal.changes 2008-01-29 23:57:52.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Jan 29 23:55:09 CET 2008 - dkukawka(a)suse.de
+
+- updated hal and hal-info to git master from 20080128:
+ - HAL use now the sysfs battery interface in the power_supply
+ subsystem instead of the proc battery interface. There are
+ maybe bugs in the kernel interface and/or HAL left.
+ - for other changes see the Changelogs
+- removed upstream gone patches:
+ - hal-fix-configure-parted.diff
+
+-------------------------------------------------------------------
hal-doc.changes: same change
Old:
----
hal-0.5.10_git20071212.tar.bz2
hal-fix-configure-parted.diff
hal-info-20071212.tar.bz2
New:
----
hal-0.5.10_git20080129.tar.bz2
hal-info-20080128.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.J27407/_old 2008-01-30 22:03:03.000000000 +0100
+++ /var/tmp/diff_new_pack.J27407/_new 2008-01-30 22:03:03.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package hal-doc (Version 0.5.10_git20071212 )
+# spec file for package hal-doc (Version 0.5.10_git20080129 )
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,15 +18,15 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20071212
+%define hal_info_version 20080128
Url: http://freedesktop.org/Software/hal
License: Other uncritical OpenSource License
Group: System/Daemons
-Version: 0.5.10_git20071212
-Release: 17
+Version: 0.5.10_git20080129
+Release: 1
AutoReqProv: on
Requires: pm-utils
-BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
+BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
%ifarch %ix86 x86_64
BuildRequires: libsmbios-libs >= 0.13.12
BuildRequires: libsmbios-devel >= 0.13.12
@@ -72,7 +72,6 @@
Patch10: hal-add-standby-support.diff
# submitted (or planed to do in next time) upstream patches
Patch100: hal-acpi_high_rate_calculate_on_time.diff
-Patch101: hal-fix-configure-parted.diff
# backports from git master:
#Patch200: hal-master.diff
# revert from HEAD:
@@ -156,13 +155,12 @@
%setup -n hal-%{version} -a1
chmod 644 tools/hal-functions
# patch hal package if needed
-%patch101 -p1
%patch0 -p1
%patch1 -p0
%patch2 -p1
%patch3 -p0
-%patch100 -p1
%patch10 -p0
+%patch100 -p1
#%patch200 -p1
#%patch300 -p1
#%patch1000 -p1
@@ -278,7 +276,9 @@
/usr/sbin/useradd -r -g haldaemon -c "User for haldaemon" \
-d /var/run/hal -o haldaemon 2>/dev/null || :
fi
+%if 0%{?suse_version} > 1030
/usr/bin/polkit-auth --user haldaemon --grant org.freedesktop.policykit.read >& /dev/null || :
+%endif
%preun
%{stop_on_removal haldaemon}
@@ -327,6 +327,14 @@
%endif
%changelog
+* Wed Jan 30 2008 dkukawka(a)suse.de
+- updated hal and hal-info to git master from 20080128:
+ - HAL use now the sysfs battery interface in the power_supply
+ subsystem instead of the proc battery interface. There are
+ maybe bugs in the kernel interface and/or HAL left.
+ - for other changes see the Changelogs
+- removed upstream gone patches:
+ - hal-fix-configure-parted.diff
* Sat Jan 26 2008 aj(a)suse.de
- Remove doxygen from build requires since hal does not use it anymore.
- Remove docbook from build requires since xmlto is now used.
@@ -848,7 +856,7 @@
- added patches:
- hal-add-alsa_hw-specific_devices.diff: to show hardware
specific sound devices in HAL. (see b.n.c #208695)
-* Mon Nov 06 2006 dkukawka(a)suse.de
+* Tue Nov 07 2006 dkukawka(a)suse.de
- added patch:
- hal-fix-dbus_error_is_set.diff: since dbus_error_is_set(NULL)
crash the library, added fix and check if error == NULL
@@ -1201,7 +1209,7 @@
scsi.vendor and scsi.model (hal-add-scsi-type.diff)
* Thu Jan 19 2006 meissner(a)suse.de
- use -fstack-protector.
-* Mon Jan 16 2006 dkukawka(a)suse.de
+* Tue Jan 17 2006 dkukawka(a)suse.de
* updated to new release 0.5.6, for changes see Changelog of the
package (note: this is the same as the upcomming official
release excluding the NEWS file)
@@ -1305,7 +1313,7 @@
* fixed bug #132279: add policy keys to handle USB floppy drives
(hal-make-cdroms_USBFloppy-mountable.diff)
* removed selinux support, because we don't need this atm
-* Tue Oct 25 2005 dkukawka(a)suse.de
+* Wed Oct 26 2005 dkukawka(a)suse.de
* updated to new cvs version (0.5.5_CVS_20051025) and changed
version format to VERSION_CVS_YYYYMMDD --> should prevent
conflicts with other versions
@@ -1515,7 +1523,7 @@
* Wed Jul 27 2005 dkukawka(a)suse.de
- changed OSS devices from alsa.* keys to oss.* keys and fixed
sound_compute_udi() to generate udi's also for OSS devices
-* Mon Jul 25 2005 dkukawka(a)suse.de
+* Tue Jul 26 2005 dkukawka(a)suse.de
- added patch from David Zeuthen to add alsa.device_file for alsa
and oss devices and merged this with patch for 'ALSA OSS Device
detection'
@@ -1639,7 +1647,7 @@
hfsplus now.
* Thu Mar 10 2005 dkukawka(a)suse.de
- added ipod fdi file see bug #71986
-* Wed Mar 09 2005 danny(a)suse.de
+* Thu Mar 10 2005 danny(a)suse.de
- fixed bug #71880, added specs to doc section of hal.rpm
* Wed Mar 09 2005 dkukawka(a)suse.de
- moved docfiles from /usr/share/doc/packages/hal-%%{VERSION}/ to
@@ -1691,7 +1699,7 @@
- load kernelmodule 'capability' at start in boot.hal
- added fix for errormessage if 'capability' isn't available in
the kernel
-* Fri Jan 21 2005 dkukawka(a)suse.de
+* Sat Jan 22 2005 dkukawka(a)suse.de
- update to new stable version [0.4.6]
changelog:
- Fix strange crasher in libsysfs on certain ppc platforms
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.J27407/_old 2008-01-30 22:03:03.000000000 +0100
+++ /var/tmp/diff_new_pack.J27407/_new 2008-01-30 22:03:03.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package hal (Version 0.5.10_git20071212 )
+# spec file for package hal (Version 0.5.10_git20080129 )
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,12 +18,12 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20071212
+%define hal_info_version 20080128
Url: http://freedesktop.org/Software/hal
License: GPL v2 or later; AFL
Group: System/Daemons
-Version: 0.5.10_git20071212
-Release: 17
+Version: 0.5.10_git20080129
+Release: 1
AutoReqProv: on
Requires: pm-utils
BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
@@ -72,7 +72,6 @@
Patch10: hal-add-standby-support.diff
# submitted (or planed to do in next time) upstream patches
Patch100: hal-acpi_high_rate_calculate_on_time.diff
-Patch101: hal-fix-configure-parted.diff
# backports from git master:
#Patch200: hal-master.diff
# revert from HEAD:
@@ -156,13 +155,12 @@
%setup -n hal-%{version} -a1
chmod 644 tools/hal-functions
# patch hal package if needed
-%patch101 -p1
%patch0 -p1
%patch1 -p0
%patch2 -p1
%patch3 -p0
-%patch100 -p1
%patch10 -p0
+%patch100 -p1
#%patch200 -p1
#%patch300 -p1
#%patch1000 -p1
@@ -278,7 +276,9 @@
/usr/sbin/useradd -r -g haldaemon -c "User for haldaemon" \
-d /var/run/hal -o haldaemon 2>/dev/null || :
fi
+%if 0%{?suse_version} > 1030
/usr/bin/polkit-auth --user haldaemon --grant org.freedesktop.policykit.read >& /dev/null || :
+%endif
%preun
%{stop_on_removal haldaemon}
@@ -327,6 +327,14 @@
%endif
%changelog
+* Wed Jan 30 2008 dkukawka(a)suse.de
+- updated hal and hal-info to git master from 20080128:
+ - HAL use now the sysfs battery interface in the power_supply
+ subsystem instead of the proc battery interface. There are
+ maybe bugs in the kernel interface and/or HAL left.
+ - for other changes see the Changelogs
+- removed upstream gone patches:
+ - hal-fix-configure-parted.diff
* Sat Jan 26 2008 aj(a)suse.de
- Remove doxygen from build requires since hal does not use it anymore.
- Remove docbook from build requires since xmlto is now used.
@@ -848,7 +856,7 @@
- added patches:
- hal-add-alsa_hw-specific_devices.diff: to show hardware
specific sound devices in HAL. (see b.n.c #208695)
-* Mon Nov 06 2006 dkukawka(a)suse.de
+* Tue Nov 07 2006 dkukawka(a)suse.de
- added patch:
- hal-fix-dbus_error_is_set.diff: since dbus_error_is_set(NULL)
crash the library, added fix and check if error == NULL
@@ -1201,7 +1209,7 @@
scsi.vendor and scsi.model (hal-add-scsi-type.diff)
* Thu Jan 19 2006 meissner(a)suse.de
- use -fstack-protector.
-* Mon Jan 16 2006 dkukawka(a)suse.de
+* Tue Jan 17 2006 dkukawka(a)suse.de
* updated to new release 0.5.6, for changes see Changelog of the
package (note: this is the same as the upcomming official
release excluding the NEWS file)
@@ -1305,7 +1313,7 @@
* fixed bug #132279: add policy keys to handle USB floppy drives
(hal-make-cdroms_USBFloppy-mountable.diff)
* removed selinux support, because we don't need this atm
-* Tue Oct 25 2005 dkukawka(a)suse.de
+* Wed Oct 26 2005 dkukawka(a)suse.de
* updated to new cvs version (0.5.5_CVS_20051025) and changed
version format to VERSION_CVS_YYYYMMDD --> should prevent
conflicts with other versions
@@ -1515,7 +1523,7 @@
* Wed Jul 27 2005 dkukawka(a)suse.de
- changed OSS devices from alsa.* keys to oss.* keys and fixed
sound_compute_udi() to generate udi's also for OSS devices
-* Mon Jul 25 2005 dkukawka(a)suse.de
+* Tue Jul 26 2005 dkukawka(a)suse.de
- added patch from David Zeuthen to add alsa.device_file for alsa
and oss devices and merged this with patch for 'ALSA OSS Device
detection'
@@ -1639,7 +1647,7 @@
hfsplus now.
* Thu Mar 10 2005 dkukawka(a)suse.de
- added ipod fdi file see bug #71986
-* Wed Mar 09 2005 danny(a)suse.de
+* Thu Mar 10 2005 danny(a)suse.de
- fixed bug #71880, added specs to doc section of hal.rpm
* Wed Mar 09 2005 dkukawka(a)suse.de
- moved docfiles from /usr/share/doc/packages/hal-%%{VERSION}/ to
@@ -1691,7 +1699,7 @@
- load kernelmodule 'capability' at start in boot.hal
- added fix for errormessage if 'capability' isn't available in
the kernel
-* Fri Jan 21 2005 dkukawka(a)suse.de
+* Sat Jan 22 2005 dkukawka(a)suse.de
- update to new stable version [0.4.6]
changelog:
- Fix strange crasher in libsysfs on certain ppc platforms
++++++ hal-0.5.10_git20071212.tar.bz2 -> hal-0.5.10_git20080129.tar.bz2 ++++++
++++ 7174 lines of diff (skipped)
++++++ hal-info-20071212.tar.bz2 -> hal-info-20080128.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/ChangeLog new/hal-info-20080128/ChangeLog
--- old/hal-info-20071212/ChangeLog 2007-12-12 18:52:45.000000000 +0100
+++ new/hal-info-20080128/ChangeLog 2008-01-28 22:36:40.000000000 +0100
@@ -1,3 +1,384 @@
+commit 20c4444dbaf0a908b81f069b9c7487f191c6edaa
+Author: Oldrich Jedlicka <oldium.pro(a)seznam.cz>
+Date: Mon Jan 28 15:08:26 2008 +0100
+
+ added keymap for Acer TravelMate 4500
+
+ Added keymap for Acer TravelMate 4500.
+
+ fdi/information/10freedesktop/30-keymap-acer.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit db19a56835bafd6bfb955993c963ae78075c8fe7
+Author: Danny Kukawka <danny.kukawka(a)web.de>
+Date: Fri Jan 25 17:26:25 2008 +0100
+
+ fixed Dell WWAN fdi file to add device only if dcdbas loaded
+
+ Fixed Dell WWAN fdi file to add device only if the needed dcdbas
+ kernel module is loaded.
+
+ .../10freedesktop/10-dell-rfkill-switch-wwan.fdi | 13 ++++++++-----
+ 1 files changed, 8 insertions(+), 5 deletions(-)
+
+commit f3b25228416d65345ae75e9f7a0b0f059da7939f
+Author: Faidon Liambotis <paravoid(a)debian.org>
+Date: Fri Jan 25 17:23:10 2008 +0100
+
+ add a WWAN (Wireless WAN/Cellular) killswitch for Dell laptops
+
+ Add Dell's WWAN killswitch (HAL 0.5.11) to the FDI.
+
+ configure.in | 7 +++++
+ .../10freedesktop/10-dell-rfkill-switch-wwan.fdi | 26
+ ++++++++++++++++++++
+ fdi/information/10freedesktop/Makefile.am | 4 +++
+ 3 files changed, 37 insertions(+), 0 deletions(-)
+
+commit 7168ba19ebee612baf7c33ef79821895668c6439
+Author: Danny Kukawka <danny.kukawka(a)web.de>
+Date: Fri Jan 25 16:33:36 2008 +0100
+
+ added keymap for a HP zd7000
+
+ Applied adopted version of a patch from Bernard Johnson
+ <bjohnson(a)symetrix.com>
+ to add keymap for a HP zd7000. Changed it to fit into the already
+ existing
+ entries of HP machines.
+
+ fdi/information/10freedesktop/30-keymap-hp.fdi | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit d5ffcb960c8062214858c250a3d9c6ec90a83a5b
+Author: Danny Kukawka <danny.kukawka(a)web.de>
+Date: Fri Jan 25 16:28:48 2008 +0100
+
+ fixed keymap of HP Compaq nx5000
+
+ fixed keymap of HP Compaq nx5000, it's not screenlock, but Fn+Esc.
+
+ fdi/information/10freedesktop/30-keymap-hp.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8dd51823d1e425dadc80a76971ef8f68cd82447a
+Author: Paul Menzel <pm.debian(a)googlemail.com>
+Date: Fri Jan 25 16:21:30 2008 +0100
+
+ hal-info keyboard support for BenQ R22e
+
+ Added new keymap quirks to support a BenQ R22e. For the whole
+ discussion see:
+ http://thread.gmane.org/gmane.comp.freedesktop.hal/9265
+
+ fdi/information/10freedesktop/30-keymap-misc.fdi | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 612de5d67ada5760188f4150103eb0aede3854ed
+Author: Frederic Crozat <fcrozat(a)mandriva.com>
+Date: Fri Jan 25 16:01:41 2008 +0100
+
+ fix hal-info check
+
+ This fixes make check for hal-info when some part of a fdi file are
+ commented. It strips commented parts of fdi before they are checked.
+
+ tools/keymap-check.sh | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 761a55cfdbddeeba57358109c2bd16f15ef30105
+Author: Jelle Geerts <jellegeerts(a)gmail.com>
+Date: Fri Jan 25 15:21:05 2008 +0100
+
+ added Acer 5633WLMi suspend quirk
+
+ On my laptop (Acer 5633WLMi), suspend/resume didn't work. I've been
+ able to
+ create a patch for it, please check the attachments in this e-mail
+ for it.
+
+ I have verified this on both X and console.
+
+ .../10freedesktop/20-video-quirk-pm-acer.fdi | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 2fa885bebd6b621cb8c3beca240686438498ea10
+Author: Lubomir Kundrak <lkundrak(a)redhat.com>
+Date: Fri Jan 25 15:09:32 2008 +0100
+
+ added another Lenovo R61i
+
+ Added another Lenovo R61i suspend quirk:
+
+ system.hardware.primary_video.product = 10754 (0x2a02) (int)
+ system.hardware.primary_video.vendor = 32902 (0x8086) (int)
+ system.hardware.product = '8932AEG' (string)
+ system.hardware.vendor = 'LENOVO' (string)
+ system.hardware.version = 'ThinkPad R61' (string)
+
+ on the above system, the following worked well (tested in 64bit mode):
+
+ .../10freedesktop/20-video-quirk-pm-lenovo.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit bb1a76d089a650405984ab0f75ea0f4a5198e9ff
+Author: Lubomir Kundrak <lkundrak(a)redhat.com>
+Date: Fri Jan 25 15:07:31 2008 +0100
+
+ fix typo in R61i support
+
+ Use a semicolon instead of a comma.
+
+ .../10freedesktop/20-video-quirk-pm-lenovo.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 09804c209808e64344ca1d37bde7f5e59ab1bd95
+Author: Frederic Crozat <fcrozat(a)mandriva.com>
+Date: Fri Jan 25 15:05:18 2008 +0100
+
+ add keymap database to tarball and add some missing keycodes
+
+ The keymap database (tools/hal-setup-keymap-keys.txt) is missing
+ in the
+ tarball (preventing to run make check).
+
+ Moreover, this database is missing some keycode.
+
+ Attached patch fixes both issues.
+
+ tools/Makefile.am | 3 ++-
+ tools/hal-setup-keymap-keys.txt | 4 ++++
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit eb416ec08d76ddf9146ed91d7895ca3e229dafbe
+Author: Danny Kukawka <danny.kukawka(a)web.de>
+Date: Fri Jan 25 15:01:03 2008 +0100
+
+ changed suspend quirk for Lenovo X61t to match more models
+
+ Changed existing entry for a Lenovo X61t to match all 7767* models
+ since Daniel Alonso i Alemany <dani(a)niunpamde.net> reported that
+ the existing entry work also for his machine.
+
+ .../10freedesktop/20-video-quirk-pm-lenovo.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d0b116b531abcf2c3d0e7cacfe08e5cf326002a5
+Author: Danny Kukawka <danny.kukawka(a)web.de>
+Date: Fri Jan 25 14:56:04 2008 +0100
+
+ added suspend quirk for BenQ Joybook R23
+
+ Added adopted patch from Seb Brown <sillyseb(a)hotmail.com> for suspend
+ quirks of a BenQ Joybook R23.
+
+ .../10freedesktop/20-video-quirk-pm-misc.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fc716dae2f3b8089fbd4cda8ea1437e3f53c3fc9
+Author: Danny Kukawka <danny.kukawka(a)web.de>
+Date: Thu Jan 24 14:47:14 2008 +0100
+
+ fixed detection of Dell as vendor for rfkill-switch-wlan
+
+ Fixed detection of Dell as vendor for rfkill-switch-wlan, use prefix
+ instead of string as match.
+
+ .../10freedesktop/10-dell-rfkill-switch-wlan.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 3a629a7b755253e38c746dbd7bdb636bc30fd8f2
+Author: Sjoerd Simons <sjoerd(a)luon.net>
+Date: Mon Jan 21 14:32:50 2008 +0100
+
+ added video quirks for HP 2510p
+
+ Added video quirks for HP 2510p. As reported by Robert McQueen.
+
+ .../10freedesktop/20-video-quirk-pm-hp.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f49a05ab56a589873932521ca2aa5f8f4123cf3c
+Author: Ben Liblit <liblit(a)cs.wisc.edu>
+Date: Thu Jan 17 15:43:50 2008 +0100
+
+ suspend video quirk for ThinkPad X61
+
+ My ThinkPad X61 leaves the backlight off after resuming from suspend.
+ The S3 BIOS quirk reliably fixes the problem. Please apply the
+ attached
+ patch.
+
+ My complete system.hardware.product is "7673CTO", but existing rules
+ match only the prefix digits, so I've retained that style in the
+ patch.
+
+ .../10freedesktop/20-video-quirk-pm-lenovo.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 920a42f8265a8accf0a493ac7607568b08ea477a
+Author: Danny Kukawka <danny.kukawka(a)web.de>
+Date: Thu Jan 17 15:32:58 2008 +0100
+
+ added keymapping for HP 6710b
+
+ Added adopted patch from Ville Skyttä <ville.skytta(a)iki.fi> to add
+ keymap for a HP 6710b.
+
+ fdi/information/10freedesktop/30-keymap-hp.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c0241d64f2e6859358d694eddf63c9289c85f37a
+Author: Danny Kukawka <danny.kukawka(a)web.de>
+Date: Thu Jan 17 15:30:30 2008 +0100
+
+ fixed keymapping for HP machines (added before by myself)
+
+ Fixed keymapping for some HP machines I added. Replaced mapping to
+ tv key with korrect presentation key and replaced www mapping with
+ info key since this is what the key really is.
+
+ fdi/information/10freedesktop/30-keymap-hp.fdi | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 70d66956c9ebc40edde5dccb53ab00f9fc9d326b
+Author: Danny Kukawka <danny.kukawka(a)web.de>
+Date: Thu Jan 17 15:04:00 2008 +0100
+
+ added suspend quirk for LG W1
+
+ Added adopted version of a patch reported by Nils Winkler
+ <nils(a)nilswinkler.com> to add suspend quirk for LG W1 Laptop.
+
+ .../10freedesktop/20-video-quirk-pm-misc.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 81112860baf50e11a602d8b30fea43eb86a3da6a
+Author: Danny Kukawka <danny.kukawka(a)web.de>
+Date: Thu Jan 17 14:47:51 2008 +0100
+
+ suspend quirk for Fujitsu Siemens Lifebook P7120
+
+ Applied adopted patch, reported by Fabian Fagerholm <fabbe(a)paniq.net>
+ for a Fujitsu Siemens Lifebook P7120
+
+ .../10freedesktop/20-video-quirk-pm-fujitsu.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a9e8a544da78e9c0bb9cdab3e7e4f76ce6e90c14
+Author: Francisco Neto <frc_neto(a)yahoo.com.br>
+Date: Thu Jan 17 14:44:54 2008 +0100
+
+ added CLEVO M5X0JE suspend quirks
+
+ Command used in the testings (in the X and in the console mode):
+ pm-suspend --quirk-s3-bios
+
+ .../10freedesktop/20-video-quirk-pm-misc.fdi | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 628b6c1941f3834e2ae846aae16b08a71a0b9056
+Author: Jarod Wilson <jarod(a)wilsonet.com>
+Date: Thu Jan 17 14:42:11 2008 +0100
+
+ Quirk addition for new T61 model 6465CTO
+
+ Just got a new Lenovo ThinkPad T61, model 6465CTO. To get the
+ display back
+ after suspending w/o fiddling, just added 6465 next to 6464 and
+ everything is
+ peachy. git diff attached.
+
+ .../10freedesktop/20-video-quirk-pm-lenovo.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e9f99847dac2ab99fa2ee2ff30ceb87cc3ef4d3a
+Author: Jeff Mitchell <kde-dev(a)emailgoeshere.com>
+Date: Fri Jan 11 11:51:41 2008 -0500
+
+ Screwed up whitespacing somehow with my last commit...fix it.
+
+ .../10freedesktop/10-usb-music-players.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9fd07aedb5e26adf75b3a9130e55eef368b1220c
+Author: Jeff Mitchell <kde-dev(a)emailgoeshere.com>
+Date: Fri Jan 11 11:45:59 2008 -0500
+
+ D'oh, I forgot to get this in before 0.5.10 was released. Oh well.
+ Fix the Rio Karma entry to expose the access protocol. Karmas are
+ not simply generic
+ devices, they require a lot of special love and special access.
+
+ .../10freedesktop/10-usb-music-players.fdi | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 1a5f2e3d62415ac363e27fe46919782f421d5f8a
+Author: Danny Kukawka <danny.kukawka(a)web.de>
+Date: Wed Dec 26 11:20:58 2007 +0100
+
+ added keymap for Acer TravelMate 5720
+
+ Added keymap for Acer TravelMate 5720.
+
+ fdi/information/10freedesktop/30-keymap-acer.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a17d14b781a227257d564100f5443a3ed462919d
+Author: Carlos Corbacho <carlos(a)strangeworlds.co.uk>
+Date: Wed Dec 26 11:05:48 2007 +0100
+
+ add keymap for Acer Ferrari 5000 series
+
+ Added keymap for Acer Ferrari 5000 series.
+
+ fdi/information/10freedesktop/30-keymap-acer.fdi | 20
+ ++++++++++++++++++++
+ 1 files changed, 20 insertions(+), 0 deletions(-)
+
+commit 3a633485043a20f2e14273617ff05c3ea83d8de1
+Author: Danny Kukawka <danny.kukawka(a)web.de>
+Date: Wed Dec 26 11:04:17 2007 +0100
+
+ Revert "the Ferrari 5000 has the same key mapping stuff as the
+ Ferrari 1000 and 4000"
+
+ This reverts commit 5e845a702defd73b634203c625bfbe6d52510c2f.
+ Reverted patch, since this is not correct. It does not include all
+ keys of
+ the Ferrari 5000. They are not the same as the 1000 and 4000.
+
+ fdi/information/10freedesktop/30-keymap-acer.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d5a5624ca79a19262e4adcb28d96f32bdab1e402
+Author: Sjoerd Simons <sjoerd(a)luon.net>
+Date: Sat Dec 22 18:22:38 2007 +0100
+
+ comment the MPIO HD300 detection. It gives too many false-positives
+
+ The usb controller in the MPIO HD300 is a generic usb IDE adapater,
+ which is
+ also used in various ide HD enclosures. Afaik there is no way to
+ destinguish
+ between the music player and generic external drivers :(
+
+ .../10freedesktop/10-usb-music-players.fdi | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 5e845a702defd73b634203c625bfbe6d52510c2f
+Author: Richard Hughes <richard(a)hughsie.com>
+Date: Fri Dec 21 17:37:49 2007 +0000
+
+ the Ferrari 5000 has the same key mapping stuff as the Ferrari 1000
+ and 4000
+
+ The Ferrari 5000 has the same key mapping stuff as the Ferrari 1000
+ and 4000
+
+ fdi/information/10freedesktop/30-keymap-acer.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
commit d7d381f02438c26461d3325e66fd8d9acb33dd93
Author: Danny Kukawka <danny.kukawka(a)web.de>
Date: Wed Dec 12 17:59:48 2007 +0100
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/configure new/hal-info-20080128/configure
--- old/hal-info-20071212/configure 2007-12-12 18:51:26.000000000 +0100
+++ new/hal-info-20080128/configure 2008-01-28 22:35:54.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for hal-info 20071212.
+# Generated by GNU Autoconf 2.60 for hal-info 20080128.
#
# Report bugs to <hal(a)lists.freedesktop.org>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='hal-info'
PACKAGE_TARNAME='hal-info'
-PACKAGE_VERSION='20071212'
-PACKAGE_STRING='hal-info 20071212'
+PACKAGE_VERSION='20080128'
+PACKAGE_STRING='hal-info 20080128'
PACKAGE_BUGREPORT='hal(a)lists.freedesktop.org'
ac_subst_vars='SHELL
@@ -649,6 +649,8 @@
BUILD_KILLSWITCH_DELL_WLAN_FALSE
BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE
BUILD_KILLSWITCH_DELL_BLUETOOTH_FALSE
+BUILD_KILLSWITCH_DELL_WWAN_TRUE
+BUILD_KILLSWITCH_DELL_WWAN_FALSE
BUILD_KILLSWITCH_SONY_BLUETOOTH_TRUE
BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE
BUILD_KILLSWITCH_IPW_WLAN_TRUE
@@ -1166,7 +1168,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 hal-info 20071212 to adapt to many kinds of systems.
+\`configure' configures hal-info 20080128 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1232,7 +1234,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of hal-info 20071212:";;
+ short | recursive ) echo "Configuration of hal-info 20080128:";;
esac
cat <<\_ACEOF
@@ -1246,6 +1248,7 @@
--enable-keymaps include key mapping data
--enable-killswitch-dell-wlan Include support for WLAN killswitch
--enable-killswitch-dell-bluetooth Include support for Bluetooth killswitch
+ --enable-killswitch-dell-wwan Include support for WWAN killswitch (requires hal >= 0.5.11)
--enable-killswitch-sony-bluetooth Include support for Bluetooth killswitch
--enable-killswitch-ipw-wlan Include support for WLAN killswitch (requires hal >= 0.5.10)
@@ -1322,7 +1325,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-hal-info configure 20071212
+hal-info configure 20080128
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1336,7 +1339,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by hal-info $as_me 20071212, which was
+It was created by hal-info $as_me 20080128, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2006,7 +2009,7 @@
# Define the identity of the package.
PACKAGE=hal-info
- VERSION=20071212
+ VERSION=20080128
cat >>confdefs.h <<_ACEOF
@@ -3560,6 +3563,24 @@
fi
+# Check whether --enable-killswitch_dell_wwan was given.
+if test "${enable_killswitch_dell_wwan+set}" = set; then
+ enableval=$enable_killswitch_dell_wwan; enable_killswitch_dell_wwan=$enableval
+else
+ enable_killswitch_dell_wwan=yes
+fi
+
+
+
+if test x$enable_killswitch_dell_wwan == xyes; then
+ BUILD_KILLSWITCH_DELL_WWAN_TRUE=
+ BUILD_KILLSWITCH_DELL_WWAN_FALSE='#'
+else
+ BUILD_KILLSWITCH_DELL_WWAN_TRUE='#'
+ BUILD_KILLSWITCH_DELL_WWAN_FALSE=
+fi
+
+
# Check whether --enable-killswitch_sony_bluetooth was given.
if test "${enable_killswitch_sony_bluetooth+set}" = set; then
enableval=$enable_killswitch_sony_bluetooth; enable_killswitch_sony_bluetooth=$enableval
@@ -3743,6 +3764,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${BUILD_KILLSWITCH_DELL_WWAN_TRUE}" && test -z "${BUILD_KILLSWITCH_DELL_WWAN_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BUILD_KILLSWITCH_DELL_WWAN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_KILLSWITCH_DELL_WWAN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${BUILD_KILLSWITCH_SONY_BLUETOOTH_TRUE}" && test -z "${BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"BUILD_KILLSWITCH_SONY_BLUETOOTH\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -4044,7 +4072,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by hal-info $as_me 20071212, which was
+This file was extended by hal-info $as_me 20080128, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4097,7 +4125,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-hal-info config.status 20071212
+hal-info config.status 20080128
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -4369,6 +4397,8 @@
BUILD_KILLSWITCH_DELL_WLAN_FALSE!$BUILD_KILLSWITCH_DELL_WLAN_FALSE$ac_delim
BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE!$BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE$ac_delim
BUILD_KILLSWITCH_DELL_BLUETOOTH_FALSE!$BUILD_KILLSWITCH_DELL_BLUETOOTH_FALSE$ac_delim
+BUILD_KILLSWITCH_DELL_WWAN_TRUE!$BUILD_KILLSWITCH_DELL_WWAN_TRUE$ac_delim
+BUILD_KILLSWITCH_DELL_WWAN_FALSE!$BUILD_KILLSWITCH_DELL_WWAN_FALSE$ac_delim
BUILD_KILLSWITCH_SONY_BLUETOOTH_TRUE!$BUILD_KILLSWITCH_SONY_BLUETOOTH_TRUE$ac_delim
BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE!$BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE$ac_delim
BUILD_KILLSWITCH_IPW_WLAN_TRUE!$BUILD_KILLSWITCH_IPW_WLAN_TRUE$ac_delim
@@ -4377,7 +4407,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -4988,6 +5018,7 @@
video suspend data: ${enable_video}
killswitch support for Dell wlan: ${enable_killswitch_dell_wlan}
killswitch support for Dell Bluetooth: ${enable_killswitch_dell_bluetooth}
+ killswitch support for Dell wwan: ${enable_killswitch_dell_wwan} (requires hal >= 0.5.11)
killswitch support for Sony Bluetooth: ${enable_killswitch_sony_bluetooth}
killswitch support for IPW wlan: ${enable_killswitch_ipw_wlan} (requires hal >= 0.5.10)
"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/configure.in new/hal-info-20080128/configure.in
--- old/hal-info-20071212/configure.in 2007-12-12 18:50:42.000000000 +0100
+++ new/hal-info-20080128/configure.in 2008-01-28 22:35:45.000000000 +0100
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT(hal-info, esyscmd([tr -d '\n' < VERSION]), hal(a)lists.freedesktop.org)
+AC_INIT(hal-info, 20080128, hal(a)lists.freedesktop.org)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
@@ -47,6 +47,12 @@
AM_CONDITIONAL(BUILD_KILLSWITCH_DELL_BLUETOOTH, test x$enable_killswitch_dell_bluetooth == xyes)
dnl ---------------------------------------------------------------------------
+dnl - Should we enable WWAN killswitch support for Dell laptops?
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(killswitch_dell_wwan, [ --enable-killswitch-dell-wwan Include support for WWAN killswitch (requires hal >= 0.5.11)],enable_killswitch_dell_wwan=$enableval,enable_killswitch_dell_wwan=yes)
+AM_CONDITIONAL(BUILD_KILLSWITCH_DELL_WWAN, test x$enable_killswitch_dell_wwan == xyes)
+
+dnl ---------------------------------------------------------------------------
dnl - Should we enable Bluetooth killswitch support for Sony laptops?
dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(killswitch_sony_bluetooth, [ --enable-killswitch-sony-bluetooth Include support for Bluetooth killswitch],enable_killswitch_sony_bluetooth=$enableval,enable_killswitch_sony_bluetooth=yes)
@@ -90,6 +96,7 @@
video suspend data: ${enable_video}
killswitch support for Dell wlan: ${enable_killswitch_dell_wlan}
killswitch support for Dell Bluetooth: ${enable_killswitch_dell_bluetooth}
+ killswitch support for Dell wwan: ${enable_killswitch_dell_wwan} (requires hal >= 0.5.11)
killswitch support for Sony Bluetooth: ${enable_killswitch_sony_bluetooth}
killswitch support for IPW wlan: ${enable_killswitch_ipw_wlan} (requires hal >= 0.5.10)
"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi new/hal-info-20080128/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
--- old/hal-info-20071212/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi 2007-12-12 18:50:42.000000000 +0100
+++ new/hal-info-20080128/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi 2008-01-28 15:05:23.000000000 +0100
@@ -6,7 +6,7 @@
<match key="info.bus" string="platform">
<match key="platform.id" string="dcdbas">
<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="Dell ">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell ">
<match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
<spawn udi="/org/freedesktop/Hal/devices/dell_wlan_switch"/>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi new/hal-info-20080128/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
--- old/hal-info-20071212/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi 1970-01-01 01:00:00.000000000 +0100
+++ new/hal-info-20080128/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi 2008-01-28 15:05:23.000000000 +0100
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+ <device>
+ <match key="info.bus" string="platform">
+ <match key="platform.id" string="dcdbas">
+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell ">
+ <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
+ <spawn udi="/org/freedesktop/Hal/devices/dell_wwan_switch"/>
+ </match>
+ </match>
+ </match>
+ </match>
+ </match>
+ </device>
+
+ <device>
+ <match key="info.udi" string="/org/freedesktop/Hal/devices/dell_wwan_switch">
+ <append key="info.capabilities" type="strlist">killswitch</append>
+ <merge key="info.product" type="string">Dell WWAN Switch</merge>
+ <merge key="info.category" type="string">killswitch</merge>
+ <merge key="killswitch.type" type="string">wwan</merge>
+ <merge key="killswitch.access_method" type="string">dell</merge>
+ </match>
+ </device>
+
+</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-20080128/fdi/information/10freedesktop/10-usb-music-players.fdi
--- old/hal-info-20071212/fdi/information/10freedesktop/10-usb-music-players.fdi 2007-12-12 18:50:42.000000000 +0100
+++ new/hal-info-20080128/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-01-28 15:05:23.000000000 +0100
@@ -88,6 +88,8 @@
</match>
<!-- MPIO HD300 Player -->
+ <!-- The usb controller in the HD300 is the same as is used in various
+ usb ide drives. With no obvious way to determine the difference
<match key="@storage.originating_device:usb.vendor_id" int="0x05e3">
<match key="@storage.originating_device:usb.product_id" int="0x0702">
<merge key="portable_audio_player.type" type="string">generic</merge>
@@ -98,6 +100,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
</match>
+ -->
<!-- SONICblue -->
<match key="@storage.originating_device:usb.vendor_id" int="0x045a">
@@ -116,6 +119,7 @@
<match key="@storage.originating_device:usb.product_id" int="0x5210">
<merge key="portable_audio_player.type" type="string">generic</merge>
<merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">karma</addset>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi new/hal-info-20080128/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
--- old/hal-info-20071212/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi 2007-12-12 18:50:42.000000000 +0100
+++ new/hal-info-20080128/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi 2008-01-28 15:05:23.000000000 +0100
@@ -58,6 +58,9 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" contains="5630">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ </match>
<match key="system.hardware.product" contains_outof="3610;3620;3690">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi new/hal-info-20080128/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
--- old/hal-info-20071212/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi 2007-12-12 18:50:42.000000000 +0100
+++ new/hal-info-20080128/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi 2008-01-28 15:05:23.000000000 +0100
@@ -48,7 +48,7 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.reset_brightness" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains="E4010">
+ <match key="system.hardware.product" contains_outof="E4010;P7120">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="E8020">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi new/hal-info-20080128/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
--- old/hal-info-20071212/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2007-12-12 18:50:42.000000000 +0100
+++ new/hal-info-20080128/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2008-01-28 15:05:23.000000000 +0100
@@ -67,7 +67,7 @@
<merge key="power_management.quirk.dpms_on" type="bool">true</merge>
</match>
</match>
- <match key="system.hardware.product" contains_outof="OmniBook XE3 G;R3200;nx5000;nx7000;nc6120;nx6325;6510b">
+ <match key="system.hardware.product" contains_outof="OmniBook XE3 G;R3200;nx5000;nx7000;nc6120;nx6325;6510b;2510p">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi new/hal-info-20080128/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
--- old/hal-info-20071212/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi 2007-12-12 18:50:42.000000000 +0100
+++ new/hal-info-20080128/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi 2008-01-28 15:05:23.000000000 +0100
@@ -5,12 +5,12 @@
<!-- ThinkPads -->
<!-- X60 / X60s / T61 / R61 / X61 Tablet -->
- <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;7658;8919;7767C3U;7768;7661W1P">
+ <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;7658;8919;7767;7768;7661W1P">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <!-- X61* Tablet, R61i (7732) -->
- <match key="system.hardware.product" prefix_outof="7669;7764;7675,7732">
+ <!-- X61* Tablet, R61i (7732,8932) -->
+ <match key="system.hardware.product" prefix_outof="7669;7764;7673;7675;7732;8932">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="63664DU">
@@ -47,7 +47,7 @@
</match>
<!-- T61 (8895), intel card 32bit works with S3_MODE, but 64bit needs VBE_MODE
T61p (6460), does not work with the NVidia driver-->
- <match key="system.hardware.product" prefix_outof="8895;6460;6464">
+ <match key="system.hardware.product" prefix_outof="8895;6460;6464;6465">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi new/hal-info-20080128/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
--- old/hal-info-20071212/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi 2007-12-12 18:50:42.000000000 +0100
+++ new/hal-info-20080128/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi 2008-01-28 15:05:23.000000000 +0100
@@ -17,7 +17,7 @@
</device>
<device>
<match key="system.hardware.vendor" prefix="LG">
- <match key="system.hardware.product" string="M1-3DGBG">
+ <match key="system.hardware.product" string_outof="M1-3DGBG;W1-JDGBG">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -74,7 +74,7 @@
<device>
<match key="system.hardware.vendor" prefix="BenQ">
- <match key="system.hardware.product" string_outof="Joybook R22;JoyBook 7000">
+ <match key="system.hardware.product" string_outof="Joybook R22;Joybook R23;JoyBook 7000">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -216,6 +216,9 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" string="M5X0JE">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ </match>
</match>
</device>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/10freedesktop/30-keymap-acer.fdi new/hal-info-20080128/fdi/information/10freedesktop/30-keymap-acer.fdi
--- old/hal-info-20071212/fdi/information/10freedesktop/30-keymap-acer.fdi 2007-12-12 18:50:42.000000000 +0100
+++ new/hal-info-20080128/fdi/information/10freedesktop/30-keymap-acer.fdi 2008-01-28 15:06:42.000000000 +0100
@@ -131,7 +131,7 @@
<append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="5210;5220;5610;5620">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="5210;5220;5610;5620;5720">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
<append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
<append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
@@ -172,6 +172,26 @@
<append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 1) -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5000">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e06e:brightnessup</append> <!-- Fn+Right Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e06f:brightnessdown</append> <!-- Fn+Left Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="TravelMate">
<!-- TravelMate C300 -->
@@ -203,7 +223,7 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 1) -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2300;2400;2480;3200;3210;3220;3260;4000">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2300;2400;2480;3200;3210;3220;3260;4000;4500">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
<append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
<append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/10freedesktop/30-keymap-hp.fdi new/hal-info-20080128/fdi/information/10freedesktop/30-keymap-hp.fdi
--- old/hal-info-20071212/fdi/information/10freedesktop/30-keymap-hp.fdi 2007-12-12 18:50:42.000000000 +0100
+++ new/hal-info-20080128/fdi/information/10freedesktop/30-keymap-hp.fdi 2008-01-28 15:05:23.000000000 +0100
@@ -25,14 +25,14 @@
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc2400">
<append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
- <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo/Presentation -->
+ <append key="input.keymap.data" type="strlist">e008:presentation</append> <!-- Presentation -->
<append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
<append key="input.keymap.data" type="strlist">e00a:f22</append> <!-- FnF6 -->
- <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="input.keymap.data" type="strlist">e059:info</append> <!-- I key -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx5000">
- <append key="input.keymap.data" type="strlist">e001:screenlock</append> <!-- FnEsc -->
+ <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
<append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo/Presentation -->
<append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
<append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- Lock -->
@@ -47,18 +47,18 @@
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6400;nx6125">
<append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
- <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="input.keymap.data" type="strlist">e008:presentation</append> <!-- presentation -->
<append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
- <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="input.keymap.data" type="strlist">e059:info</append> <!-- I key -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6230;nw8440;nx6325">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6230;nw8440;nx6325;6710b">
<append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
- <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="input.keymap.data" type="strlist">e008:presentation</append> <!-- presentation -->
<append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
<append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 Lock -->
<append key="input.keymap.data" type="strlist">e033:f22</append> <!-- FIXME: Auto brightness -->
- <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="input.keymap.data" type="strlist">e059:info</append> <!-- I key -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nx7300;nx7400">
@@ -74,6 +74,13 @@
<append key="input.keymap.data" type="strlist">e031:help</append> <!-- FnF1 (help) -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="zd7000">
+ <append key="input.keymap.data" type="strlist">e008:player</append> <!-- multi-media -->
+ <append key="input.keymap.data" type="strlist">e00a:screenlock</append><!-- Fn+lock -->
+ <append key="input.keymap.data" type="strlist">e00b:camera</append> <!-- camera -->
+ <append key="input.keymap.data" type="strlist">e031:help</append> <!-- Fn+F1 (help) -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
</match>
</device>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/10freedesktop/30-keymap-misc.fdi new/hal-info-20080128/fdi/information/10freedesktop/30-keymap-misc.fdi
--- old/hal-info-20071212/fdi/information/10freedesktop/30-keymap-misc.fdi 2007-12-12 18:50:42.000000000 +0100
+++ new/hal-info-20080128/fdi/information/10freedesktop/30-keymap-misc.fdi 2008-01-28 15:05:23.000000000 +0100
@@ -6,6 +6,15 @@
<!-- These are raw scancodes produced by the atkbd driver -->
<match key="@input.originating_device:info.linux.driver" string="atkbd">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains="BenQ">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="Joybook R22">
+ <append key="input.keymap.data" type="strlist">6e:wlan</append> <!-- Fn + F1 wireless network radio on and off. -->
+ <!-- <append key="input.keymap.data" type="strlist">6d:brightnessdown</append> (Fn + F6 brightness down.) -->
+ <!-- <append key="input.keymap.data" type="strlist">6d:brightnessup</append> (Fn + F7 brightness. up) -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
+
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="MEDION">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="FID2060">
<append key="input.keymap.data" type="strlist">6b:channeldown</append> <!-- Thottle Down -->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/10freedesktop/Makefile.am new/hal-info-20080128/fdi/information/10freedesktop/Makefile.am
--- old/hal-info-20071212/fdi/information/10freedesktop/Makefile.am 2007-12-12 18:50:42.000000000 +0100
+++ new/hal-info-20080128/fdi/information/10freedesktop/Makefile.am 2008-01-28 15:05:23.000000000 +0100
@@ -18,6 +18,10 @@
dist_fdi_DATA += 10-dell-rfkill-switch-bluetooth.fdi
endif
+if BUILD_KILLSWITCH_DELL_WWAN
+dist_fdi_DATA += 10-dell-rfkill-switch-wwan.fdi
+endif
+
if BUILD_KILLSWITCH_SONY_BLUETOOTH
dist_fdi_DATA += 10-sony-bluetooth-switch.fdi
endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/10freedesktop/Makefile.in new/hal-info-20080128/fdi/information/10freedesktop/Makefile.in
--- old/hal-info-20071212/fdi/information/10freedesktop/Makefile.in 2007-12-12 18:51:24.000000000 +0100
+++ new/hal-info-20080128/fdi/information/10freedesktop/Makefile.in 2008-01-28 22:35:52.000000000 +0100
@@ -36,9 +36,10 @@
POST_UNINSTALL = :
@BUILD_KILLSWITCH_DELL_WLAN_TRUE@am__append_1 = 10-dell-rfkill-switch-wlan.fdi
@BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE@am__append_2 = 10-dell-rfkill-switch-bluetooth.fdi
-@BUILD_KILLSWITCH_SONY_BLUETOOTH_TRUE@am__append_3 = 10-sony-bluetooth-switch.fdi
-@BUILD_KILLSWITCH_IPW_WLAN_TRUE@am__append_4 = 10-ipw-rfkill-switch.fdi
-@BUILD_RECALL_TRUE@am__append_5 = \
+@BUILD_KILLSWITCH_DELL_WWAN_TRUE@am__append_3 = 10-dell-rfkill-switch-wwan.fdi
+@BUILD_KILLSWITCH_SONY_BLUETOOTH_TRUE@am__append_4 = 10-sony-bluetooth-switch.fdi
+@BUILD_KILLSWITCH_IPW_WLAN_TRUE@am__append_5 = 10-ipw-rfkill-switch.fdi
+@BUILD_RECALL_TRUE@am__append_6 = \
@BUILD_RECALL_TRUE@ 10-recall-battery-dell.fdi \
@BUILD_RECALL_TRUE@ 10-recall-battery-ibm.fdi \
@BUILD_RECALL_TRUE@ 10-recall-battery-lenovo.fdi \
@@ -46,7 +47,7 @@
@BUILD_RECALL_TRUE@ 10-recall-battery-gateway.fdi \
@BUILD_RECALL_TRUE@ 10-recall-battery-toshiba.fdi
-@BUILD_VIDEO_TRUE@am__append_6 = \
+@BUILD_VIDEO_TRUE@am__append_7 = \
@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-acer.fdi \
@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-apple.fdi \
@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-asus.fdi \
@@ -60,7 +61,7 @@
@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-sony.fdi \
@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-toshiba.fdi
-@BUILD_KEYMAPS_TRUE@am__append_7 = \
+@BUILD_KEYMAPS_TRUE@am__append_8 = \
@BUILD_KEYMAPS_TRUE@ 30-keymap-module-sony-laptop.fdi \
@BUILD_KEYMAPS_TRUE@ 30-keymap-module-thinkpad-acpi.fdi \
@BUILD_KEYMAPS_TRUE@ 30-keymap-misc.fdi \
@@ -90,17 +91,17 @@
10-laptop-panel-hardware.fdi 10-cd-dvd-burner.fdi \
10-dell-rfkill-switch-wlan.fdi \
10-dell-rfkill-switch-bluetooth.fdi \
- 10-sony-bluetooth-switch.fdi 10-ipw-rfkill-switch.fdi \
- 10-recall-battery-dell.fdi 10-recall-battery-ibm.fdi \
- 10-recall-battery-lenovo.fdi 10-recall-battery-fujitsu.fdi \
- 10-recall-battery-gateway.fdi 10-recall-battery-toshiba.fdi \
- 20-video-quirk-pm-acer.fdi 20-video-quirk-pm-apple.fdi \
- 20-video-quirk-pm-asus.fdi 20-video-quirk-pm-dell.fdi \
- 20-video-quirk-pm-fujitsu.fdi 20-video-quirk-pm-hp.fdi \
- 20-video-quirk-pm-ibm.fdi 20-video-quirk-pm-lenovo.fdi \
- 20-video-quirk-pm-misc.fdi 20-video-quirk-pm-samsung.fdi \
- 20-video-quirk-pm-sony.fdi 20-video-quirk-pm-toshiba.fdi \
- 30-keymap-module-sony-laptop.fdi \
+ 10-dell-rfkill-switch-wwan.fdi 10-sony-bluetooth-switch.fdi \
+ 10-ipw-rfkill-switch.fdi 10-recall-battery-dell.fdi \
+ 10-recall-battery-ibm.fdi 10-recall-battery-lenovo.fdi \
+ 10-recall-battery-fujitsu.fdi 10-recall-battery-gateway.fdi \
+ 10-recall-battery-toshiba.fdi 20-video-quirk-pm-acer.fdi \
+ 20-video-quirk-pm-apple.fdi 20-video-quirk-pm-asus.fdi \
+ 20-video-quirk-pm-dell.fdi 20-video-quirk-pm-fujitsu.fdi \
+ 20-video-quirk-pm-hp.fdi 20-video-quirk-pm-ibm.fdi \
+ 20-video-quirk-pm-lenovo.fdi 20-video-quirk-pm-misc.fdi \
+ 20-video-quirk-pm-samsung.fdi 20-video-quirk-pm-sony.fdi \
+ 20-video-quirk-pm-toshiba.fdi 30-keymap-module-sony-laptop.fdi \
30-keymap-module-thinkpad-acpi.fdi 30-keymap-misc.fdi \
30-keymap-hp.fdi 30-keymap-compaq.fdi 30-keymap-lenovo.fdi \
30-keymap-dell.fdi 30-keymap-acer.fdi \
@@ -129,6 +130,8 @@
BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE = @BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE@
BUILD_KILLSWITCH_DELL_WLAN_FALSE = @BUILD_KILLSWITCH_DELL_WLAN_FALSE@
BUILD_KILLSWITCH_DELL_WLAN_TRUE = @BUILD_KILLSWITCH_DELL_WLAN_TRUE@
+BUILD_KILLSWITCH_DELL_WWAN_FALSE = @BUILD_KILLSWITCH_DELL_WWAN_FALSE@
+BUILD_KILLSWITCH_DELL_WWAN_TRUE = @BUILD_KILLSWITCH_DELL_WWAN_TRUE@
BUILD_KILLSWITCH_IPW_WLAN_FALSE = @BUILD_KILLSWITCH_IPW_WLAN_FALSE@
BUILD_KILLSWITCH_IPW_WLAN_TRUE = @BUILD_KILLSWITCH_IPW_WLAN_TRUE@
BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE = @BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE@
@@ -212,7 +215,7 @@
10-usbcsr-mice.fdi 10-laptop-panel-hardware.fdi \
10-cd-dvd-burner.fdi $(am__append_1) $(am__append_2) \
$(am__append_3) $(am__append_4) $(am__append_5) \
- $(am__append_6) $(am__append_7)
+ $(am__append_6) $(am__append_7) $(am__append_8)
all: all-am
.SUFFIXES:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/20thirdparty/Makefile.in new/hal-info-20080128/fdi/information/20thirdparty/Makefile.in
--- old/hal-info-20071212/fdi/information/20thirdparty/Makefile.in 2007-12-12 18:51:24.000000000 +0100
+++ new/hal-info-20080128/fdi/information/20thirdparty/Makefile.in 2008-01-28 22:35:52.000000000 +0100
@@ -71,6 +71,8 @@
BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE = @BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE@
BUILD_KILLSWITCH_DELL_WLAN_FALSE = @BUILD_KILLSWITCH_DELL_WLAN_FALSE@
BUILD_KILLSWITCH_DELL_WLAN_TRUE = @BUILD_KILLSWITCH_DELL_WLAN_TRUE@
+BUILD_KILLSWITCH_DELL_WWAN_FALSE = @BUILD_KILLSWITCH_DELL_WWAN_FALSE@
+BUILD_KILLSWITCH_DELL_WWAN_TRUE = @BUILD_KILLSWITCH_DELL_WWAN_TRUE@
BUILD_KILLSWITCH_IPW_WLAN_FALSE = @BUILD_KILLSWITCH_IPW_WLAN_FALSE@
BUILD_KILLSWITCH_IPW_WLAN_TRUE = @BUILD_KILLSWITCH_IPW_WLAN_TRUE@
BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE = @BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/information/Makefile.in new/hal-info-20080128/fdi/information/Makefile.in
--- old/hal-info-20071212/fdi/information/Makefile.in 2007-12-12 18:51:24.000000000 +0100
+++ new/hal-info-20080128/fdi/information/Makefile.in 2008-01-28 22:35:52.000000000 +0100
@@ -69,6 +69,8 @@
BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE = @BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE@
BUILD_KILLSWITCH_DELL_WLAN_FALSE = @BUILD_KILLSWITCH_DELL_WLAN_FALSE@
BUILD_KILLSWITCH_DELL_WLAN_TRUE = @BUILD_KILLSWITCH_DELL_WLAN_TRUE@
+BUILD_KILLSWITCH_DELL_WWAN_FALSE = @BUILD_KILLSWITCH_DELL_WWAN_FALSE@
+BUILD_KILLSWITCH_DELL_WWAN_TRUE = @BUILD_KILLSWITCH_DELL_WWAN_TRUE@
BUILD_KILLSWITCH_IPW_WLAN_FALSE = @BUILD_KILLSWITCH_IPW_WLAN_FALSE@
BUILD_KILLSWITCH_IPW_WLAN_TRUE = @BUILD_KILLSWITCH_IPW_WLAN_TRUE@
BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE = @BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/Makefile.in new/hal-info-20080128/fdi/Makefile.in
--- old/hal-info-20071212/fdi/Makefile.in 2007-12-12 18:51:24.000000000 +0100
+++ new/hal-info-20080128/fdi/Makefile.in 2008-01-28 22:35:52.000000000 +0100
@@ -69,6 +69,8 @@
BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE = @BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE@
BUILD_KILLSWITCH_DELL_WLAN_FALSE = @BUILD_KILLSWITCH_DELL_WLAN_FALSE@
BUILD_KILLSWITCH_DELL_WLAN_TRUE = @BUILD_KILLSWITCH_DELL_WLAN_TRUE@
+BUILD_KILLSWITCH_DELL_WWAN_FALSE = @BUILD_KILLSWITCH_DELL_WWAN_FALSE@
+BUILD_KILLSWITCH_DELL_WWAN_TRUE = @BUILD_KILLSWITCH_DELL_WWAN_TRUE@
BUILD_KILLSWITCH_IPW_WLAN_FALSE = @BUILD_KILLSWITCH_IPW_WLAN_FALSE@
BUILD_KILLSWITCH_IPW_WLAN_TRUE = @BUILD_KILLSWITCH_IPW_WLAN_TRUE@
BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE = @BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/preprobe/10osvendor/Makefile.in new/hal-info-20080128/fdi/preprobe/10osvendor/Makefile.in
--- old/hal-info-20071212/fdi/preprobe/10osvendor/Makefile.in 2007-12-12 18:51:24.000000000 +0100
+++ new/hal-info-20080128/fdi/preprobe/10osvendor/Makefile.in 2008-01-28 22:35:53.000000000 +0100
@@ -71,6 +71,8 @@
BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE = @BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE@
BUILD_KILLSWITCH_DELL_WLAN_FALSE = @BUILD_KILLSWITCH_DELL_WLAN_FALSE@
BUILD_KILLSWITCH_DELL_WLAN_TRUE = @BUILD_KILLSWITCH_DELL_WLAN_TRUE@
+BUILD_KILLSWITCH_DELL_WWAN_FALSE = @BUILD_KILLSWITCH_DELL_WWAN_FALSE@
+BUILD_KILLSWITCH_DELL_WWAN_TRUE = @BUILD_KILLSWITCH_DELL_WWAN_TRUE@
BUILD_KILLSWITCH_IPW_WLAN_FALSE = @BUILD_KILLSWITCH_IPW_WLAN_FALSE@
BUILD_KILLSWITCH_IPW_WLAN_TRUE = @BUILD_KILLSWITCH_IPW_WLAN_TRUE@
BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE = @BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/preprobe/20thirdparty/Makefile.in new/hal-info-20080128/fdi/preprobe/20thirdparty/Makefile.in
--- old/hal-info-20071212/fdi/preprobe/20thirdparty/Makefile.in 2007-12-12 18:51:25.000000000 +0100
+++ new/hal-info-20080128/fdi/preprobe/20thirdparty/Makefile.in 2008-01-28 22:35:53.000000000 +0100
@@ -71,6 +71,8 @@
BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE = @BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE@
BUILD_KILLSWITCH_DELL_WLAN_FALSE = @BUILD_KILLSWITCH_DELL_WLAN_FALSE@
BUILD_KILLSWITCH_DELL_WLAN_TRUE = @BUILD_KILLSWITCH_DELL_WLAN_TRUE@
+BUILD_KILLSWITCH_DELL_WWAN_FALSE = @BUILD_KILLSWITCH_DELL_WWAN_FALSE@
+BUILD_KILLSWITCH_DELL_WWAN_TRUE = @BUILD_KILLSWITCH_DELL_WWAN_TRUE@
BUILD_KILLSWITCH_IPW_WLAN_FALSE = @BUILD_KILLSWITCH_IPW_WLAN_FALSE@
BUILD_KILLSWITCH_IPW_WLAN_TRUE = @BUILD_KILLSWITCH_IPW_WLAN_TRUE@
BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE = @BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/fdi/preprobe/Makefile.in new/hal-info-20080128/fdi/preprobe/Makefile.in
--- old/hal-info-20071212/fdi/preprobe/Makefile.in 2007-12-12 18:51:25.000000000 +0100
+++ new/hal-info-20080128/fdi/preprobe/Makefile.in 2008-01-28 22:35:53.000000000 +0100
@@ -69,6 +69,8 @@
BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE = @BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE@
BUILD_KILLSWITCH_DELL_WLAN_FALSE = @BUILD_KILLSWITCH_DELL_WLAN_FALSE@
BUILD_KILLSWITCH_DELL_WLAN_TRUE = @BUILD_KILLSWITCH_DELL_WLAN_TRUE@
+BUILD_KILLSWITCH_DELL_WWAN_FALSE = @BUILD_KILLSWITCH_DELL_WWAN_FALSE@
+BUILD_KILLSWITCH_DELL_WWAN_TRUE = @BUILD_KILLSWITCH_DELL_WWAN_TRUE@
BUILD_KILLSWITCH_IPW_WLAN_FALSE = @BUILD_KILLSWITCH_IPW_WLAN_FALSE@
BUILD_KILLSWITCH_IPW_WLAN_TRUE = @BUILD_KILLSWITCH_IPW_WLAN_TRUE@
BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE = @BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/Makefile.in new/hal-info-20080128/Makefile.in
--- old/hal-info-20071212/Makefile.in 2007-12-12 18:51:25.000000000 +0100
+++ new/hal-info-20080128/Makefile.in 2008-01-28 22:35:53.000000000 +0100
@@ -84,6 +84,8 @@
BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE = @BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE@
BUILD_KILLSWITCH_DELL_WLAN_FALSE = @BUILD_KILLSWITCH_DELL_WLAN_FALSE@
BUILD_KILLSWITCH_DELL_WLAN_TRUE = @BUILD_KILLSWITCH_DELL_WLAN_TRUE@
+BUILD_KILLSWITCH_DELL_WWAN_FALSE = @BUILD_KILLSWITCH_DELL_WWAN_FALSE@
+BUILD_KILLSWITCH_DELL_WWAN_TRUE = @BUILD_KILLSWITCH_DELL_WWAN_TRUE@
BUILD_KILLSWITCH_IPW_WLAN_FALSE = @BUILD_KILLSWITCH_IPW_WLAN_FALSE@
BUILD_KILLSWITCH_IPW_WLAN_TRUE = @BUILD_KILLSWITCH_IPW_WLAN_TRUE@
BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE = @BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/tools/hal-setup-keymap-keys.txt new/hal-info-20080128/tools/hal-setup-keymap-keys.txt
--- old/hal-info-20071212/tools/hal-setup-keymap-keys.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/hal-info-20080128/tools/hal-setup-keymap-keys.txt 2008-01-28 15:05:23.000000000 +0100
@@ -0,0 +1,352 @@
+RESERVED
+ESC
+1
+2
+3
+4
+5
+6
+7
+8
+9
+0
+MINUS
+EQUAL
+BACKSPACE
+TAB
+Q
+W
+E
+R
+T
+Y
+U
+I
+O
+P
+LEFTBRACE
+RIGHTBRACE
+ENTER
+LEFTCTRL
+A
+S
+D
+F
+G
+H
+J
+K
+L
+SEMICOLON
+APOSTROPHE
+GRAVE
+LEFTSHIFT
+BACKSLASH
+Z
+X
+C
+V
+B
+N
+M
+COMMA
+DOT
+SLASH
+RIGHTSHIFT
+KPASTERISK
+LEFTALT
+SPACE
+CAPSLOCK
+F1
+F2
+F3
+F4
+F5
+F6
+F7
+F8
+F9
+F10
+NUMLOCK
+SCROLLLOCK
+KP7
+KP8
+KP9
+KPMINUS
+KP4
+KP5
+KP6
+KPPLUS
+KP1
+KP2
+KP3
+KP0
+KPDOT
+ZENKAKUHANKAKU
+102ND
+F11
+F12
+RO
+KATAKANA
+HIRAGANA
+HENKAN
+KATAKANAHIRAGANA
+MUHENKAN
+KPJPCOMMA
+KPENTER
+RIGHTCTRL
+KPSLASH
+SYSRQ
+RIGHTALT
+LINEFEED
+HOME
+UP
+PAGEUP
+LEFT
+RIGHT
+END
+DOWN
+PAGEDOWN
+INSERT
+DELETE
+MACRO
+MUTE
+VOLUMEDOWN
+VOLUMEUP
+POWER
+KPEQUAL
+KPPLUSMINUS
+PAUSE
+KPCOMMA
+HANGEUL
+HANGUEL
+HANJA
+YEN
+LEFTMETA
+RIGHTMETA
+COMPOSE
+STOP
+AGAIN
+PROPS
+UNDO
+FRONT
+COPY
+OPEN
+PASTE
+FIND
+CUT
+HELP
+MENU
+CALC
+SETUP
+SLEEP
+WAKEUP
+FILE
+SENDFILE
+DELETEFILE
+XFER
+PROG1
+PROG2
+WWW
+MSDOS
+COFFEE
+SCREENLOCK
+DIRECTION
+CYCLEWINDOWS
+MAIL
+BOOKMARKS
+COMPUTER
+BACK
+FORWARD
+CLOSECD
+EJECTCD
+EJECTCLOSECD
+NEXTSONG
+PLAYPAUSE
+PREVIOUSSONG
+STOPCD
+RECORD
+REWIND
+PHONE
+ISO
+CONFIG
+HOMEPAGE
+REFRESH
+EXIT
+MOVE
+EDIT
+SCROLLUP
+SCROLLDOWN
+KPLEFTPAREN
+KPRIGHTPAREN
+NEW
+REDO
+F13
+F14
+F15
+F16
+F17
+F18
+F19
+F20
+F21
+F22
+F23
+F24
+PLAYCD
+PAUSECD
+PROG3
+PROG4
+SUSPEND
+CLOSE
+PLAY
+FASTFORWARD
+BASSBOOST
+PRINT
+HP
+CAMERA
+SOUND
+QUESTION
+EMAIL
+CHAT
+SEARCH
+CONNECT
+FINANCE
+SPORT
+SHOP
+ALTERASE
+CANCEL
+BRIGHTNESSDOWN
+BRIGHTNESSUP
+MEDIA
+SWITCHVIDEOMODE
+KBDILLUMTOGGLE
+KBDILLUMDOWN
+KBDILLUMUP
+SEND
+REPLY
+FORWARDMAIL
+SAVE
+DOCUMENTS
+BATTERY
+BLUETOOTH
+WLAN
+UNKNOWN
+OK
+SELECT
+GOTO
+CLEAR
+POWER2
+OPTION
+INFO
+TIME
+VENDOR
+ARCHIVE
+PROGRAM
+CHANNEL
+FAVORITES
+EPG
+PVR
+MHP
+LANGUAGE
+TITLE
+SUBTITLE
+ANGLE
+ZOOM
+MODE
+KEYBOARD
+SCREEN
+PC
+TV
+TV2
+VCR
+VCR2
+SAT
+SAT2
+CD
+TAPE
+RADIO
+TUNER
+PLAYER
+TEXT
+DVD
+AUX
+MP3
+AUDIO
+VIDEO
+DIRECTORY
+LIST
+MEMO
+CALENDAR
+RED
+GREEN
+YELLOW
+BLUE
+CHANNELUP
+CHANNELDOWN
+FIRST
+LAST
+AB
+NEXT
+RESTART
+SLOW
+SHUFFLE
+BREAK
+PREVIOUS
+DIGITS
+TEEN
+TWEN
+VIDEOPHONE
+GAMES
+ZOOMIN
+ZOOMOUT
+ZOOMRESET
+WORDPROCESSOR
+EDITOR
+SPREADSHEET
+GRAPHICSEDITOR
+PRESENTATION
+DATABASE
+NEWS
+VOICEMAIL
+ADDRESSBOOK
+MESSENGER
+DISPLAYTOGGLE
+DEL_EOL
+DEL_EOS
+INS_LINE
+DEL_LINE
+FN
+FN_ESC
+FN_F1
+FN_F2
+FN_F3
+FN_F4
+FN_F5
+FN_F6
+FN_F7
+FN_F8
+FN_F9
+FN_F10
+FN_F11
+FN_F12
+FN_1
+FN_2
+FN_D
+FN_E
+FN_F
+FN_S
+FN_B
+BRL_DOT1
+BRL_DOT2
+BRL_DOT3
+BRL_DOT4
+BRL_DOT5
+BRL_DOT6
+BRL_DOT7
+BRL_DOT8
+MIN_INTERESTING
+EURO
+DOLLAR
+LOCK
+SYNC
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/tools/keymap-check.sh new/hal-info-20080128/tools/keymap-check.sh
--- old/hal-info-20071212/tools/keymap-check.sh 2007-12-12 18:50:42.000000000 +0100
+++ new/hal-info-20080128/tools/keymap-check.sh 2008-01-28 15:05:23.000000000 +0100
@@ -17,7 +17,7 @@
# processes each line of the fdi file
get_line ()
{
- cat "$1" | grep "input.keymap.data" | while read line
+ cat "$1" | sed -ne '/<!--/ { :c; /-->/! { N; b c; }; /-->/s/<!--.*-->//g }; /^ *$/!p;' | grep "input.keymap.data" | while read line
do
data=`echo "${line}" | cut -d":" -f2 | cut -d"<" -f1`
found=`isin $data`
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/tools/Makefile.am new/hal-info-20080128/tools/Makefile.am
--- old/hal-info-20071212/tools/Makefile.am 2007-12-12 18:50:42.000000000 +0100
+++ new/hal-info-20080128/tools/Makefile.am 2008-01-28 15:05:23.000000000 +0100
@@ -5,5 +5,6 @@
rm -f *~
EXTRA_DIST = \
- keymap-check.sh
+ keymap-check.sh \
+ hal-setup-keymap-keys.txt
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20071212/tools/Makefile.in new/hal-info-20080128/tools/Makefile.in
--- old/hal-info-20071212/tools/Makefile.in 2007-12-12 18:51:25.000000000 +0100
+++ new/hal-info-20080128/tools/Makefile.in 2008-01-28 22:35:53.000000000 +0100
@@ -60,6 +60,8 @@
BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE = @BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE@
BUILD_KILLSWITCH_DELL_WLAN_FALSE = @BUILD_KILLSWITCH_DELL_WLAN_FALSE@
BUILD_KILLSWITCH_DELL_WLAN_TRUE = @BUILD_KILLSWITCH_DELL_WLAN_TRUE@
+BUILD_KILLSWITCH_DELL_WWAN_FALSE = @BUILD_KILLSWITCH_DELL_WWAN_FALSE@
+BUILD_KILLSWITCH_DELL_WWAN_TRUE = @BUILD_KILLSWITCH_DELL_WWAN_TRUE@
BUILD_KILLSWITCH_IPW_WLAN_FALSE = @BUILD_KILLSWITCH_IPW_WLAN_FALSE@
BUILD_KILLSWITCH_IPW_WLAN_TRUE = @BUILD_KILLSWITCH_IPW_WLAN_TRUE@
BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE = @BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE@
@@ -138,7 +140,8 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
EXTRA_DIST = \
- keymap-check.sh
+ keymap-check.sh \
+ hal-setup-keymap-keys.txt
all: all-am
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 asciidoc
checked in at Wed Jan 30 22:02:02 CET 2008.
--------
--- asciidoc/asciidoc.changes 2008-01-25 11:26:16.000000000 +0100
+++ asciidoc/asciidoc.changes 2008-01-30 22:00:37.815064000 +0100
@@ -1,0 +2,5 @@
+Wed Jan 30 18:01:42 CET 2008 - tiwai(a)suse.de
+
+- fix fop.extensions in a2x pdf creation (bnc#353527)
+
+-------------------------------------------------------------------
New:
----
asciidoc-fop-extensions-fix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ asciidoc.spec ++++++
--- /var/tmp/diff_new_pack.R23094/_old 2008-01-30 22:00:47.000000000 +0100
+++ /var/tmp/diff_new_pack.R23094/_new 2008-01-30 22:00:47.000000000 +0100
@@ -13,7 +13,7 @@
Name: asciidoc
Summary: Text-Based Document Generation
Version: 8.2.5
-Release: 8
+Release: 10
License: GPL v2 or later
Group: Development/Tools/Doc Generators
Requires: python >= 2.3, fop
@@ -22,6 +22,7 @@
Source0: %{name}-%{version}.tar.bz2
Patch: asciidoc-a2x-fop-fix.diff
Patch1: asciidoc-vim-fix.diff
+Patch2: asciidoc-fop-extensions-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -54,6 +55,7 @@
%setup -q
%patch
%patch1
+%patch2 -p1
%build
@@ -93,6 +95,8 @@
%doc doc examples
%changelog
+* Wed Jan 30 2008 tiwai(a)suse.de
+- fix fop.extensions in a2x pdf creation (bnc#353527)
* Fri Jan 25 2008 tiwai(a)suse.de
- fix a build error about vim directory
* Thu Jan 24 2008 tiwai(a)suse.de
++++++ asciidoc-fop-extensions-fix.diff ++++++
diff -Naur ../asciidoc-8.2.5.orig/docbook-xsl/fo.xsl ./docbook-xsl/fo.xsl
--- ../asciidoc-8.2.5.orig/docbook-xsl/fo.xsl 2007-10-29 04:50:53.000000000 +0100
+++ ./docbook-xsl/fo.xsl 2008-01-30 17:21:18.000000000 +0100
@@ -14,7 +14,7 @@
<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>
<xsl:import href="common.xsl"/>
-<xsl:param name="fop.extensions" select="1" />
+<xsl:param name="fop1.extensions" select="1" />
<xsl:param name="variablelist.as.blocks" select="1" />
<xsl:param name="paper.type" select="'A4'"/>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 gnome-icon-theme
checked in at Wed Jan 30 22:00:26 CET 2008.
--------
--- GNOME/gnome-icon-theme/gnome-icon-theme.changes 2007-09-18 17:44:36.000000000 +0200
+++ gnome-icon-theme/gnome-icon-theme.changes 2008-01-30 19:02:25.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Jan 30 11:58:32 CST 2008 - maw(a)suse.de
+
+- Update to version 2.21.4:
+ + New icons.
+
+-------------------------------------------------------------------
Old:
----
gnome-icon-theme-2.20.0.tar.bz2
New:
----
gnome-icon-theme-2.21.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-icon-theme.spec ++++++
--- /var/tmp/diff_new_pack.q20063/_old 2008-01-30 21:59:57.000000000 +0100
+++ /var/tmp/diff_new_pack.q20063/_new 2008-01-30 21:59:57.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package gnome-icon-theme (Version 2.20.0)
+# spec file for package gnome-icon-theme (Version 2.21.4)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -16,7 +16,7 @@
Group: System/GUI/GNOME
AutoReqProv: on
Provides: %{name}-devel = %{version}-%{release}
-Version: 2.20.0
+Version: 2.21.4
Release: 1
Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.20/%{name}-%{version}.tar.b…
Source1: system-search.png
@@ -57,42 +57,45 @@
%{_datadir}/pkgconfig/*.pc
%changelog
-* Tue Sep 18 2007 - sbrabec(a)suse.cz
+* Wed Jan 30 2008 maw(a)suse.de
+- Update to version 2.21.4:
+ + New icons.
+* Tue Sep 18 2007 sbrabec(a)suse.cz
- Update to version 2.20.0:
* remove gnome-logout file as it is replaced by system-log-out
* add missing directories for emotes
* fix emblem anchors to match the ones folder.icon
-* Fri Aug 31 2007 - maw(a)suse.de
+* Fri Aug 31 2007 maw(a)suse.de
- Add a system-search.png icon sized 48x48.
-* Wed Aug 29 2007 - maw(a)suse.de
+* Wed Aug 29 2007 maw(a)suse.de
- Update to version 2.19.91
- Bugs (bugzilla.gnome.org) fixed: #470260, #470391, #470249,
[#468035], #361158, #467814, #370032, and #453611
- Use %%fdupes.
-* Fri May 04 2007 - pgajdos(a)suse.cz
+* Fri May 04 2007 pgajdos(a)suse.cz
- removed hicolor-icon-theme from BuildRequires [#247450]
-* Thu Mar 22 2007 - dobey(a)suse.de
+* Thu Mar 22 2007 dobey(a)suse.de
- Update version to 2.18.0
- Remove the old-style gnome-dev-ethernet icons
- Remove the unneeded hicolor_dirs variable in make install
-* Mon Feb 26 2007 - stbinner(a)suse.de
+* Mon Feb 26 2007 stbinner(a)suse.de
- Require hicolor-icon-theme to fix several apps build
-* Wed Feb 21 2007 - dobey(a)suse.de
+* Wed Feb 21 2007 dobey(a)suse.de
- Split out hicolor-icon-theme to its own package
Remove unused realplay.png
-* Mon Feb 19 2007 - maw(a)suse.de
+* Mon Feb 19 2007 maw(a)suse.de
- Updat to version 2.17.91.
-* Wed Jan 03 2007 - sbrabec(a)suse.cz
+* Wed Jan 03 2007 sbrabec(a)suse.cz
- More spec file cleanups.
-* Thu Dec 14 2006 - maw(a)suse.de
+* Thu Dec 14 2006 maw(a)suse.de
- Move to /usr
- Some specfile cleanup.
-* Tue Oct 17 2006 - jhargadon(a)suse.de
+* Tue Oct 17 2006 jhargadon(a)suse.de
- update to version 2.16.0.1
- Updated system-lock-screen icon to fill all sizes - bug #354257
- Updated accessories-text-editor icon to fill all sizes - bug #354256
- Updated 24x24 utilities-terminal icon from 22x22 icon - bug #354279
-* Thu Sep 14 2006 - jhargadon(a)suse.de
+* Wed Sep 13 2006 jhargadon(a)suse.de
- update to version 2.16.0
- Add gtk-edit icon at 16x16, 22x22, and 24x24 sizes
- Install 24x24 video-display icon
@@ -108,7 +111,7 @@
- Add missing 32x32 mimetypes directory to index.theme.in
- Updated network status icons
- New translations [mg, mr]
-* Fri Aug 25 2006 - jhargadon(a)suse.de
+* Thu Aug 24 2006 jhargadon(a)suse.de
- update to version 2.15.92
- Add x-office-drawing icon
- Add 32x32 mime type icons
@@ -122,7 +125,7 @@
- Updated style weather status icons
- 32x32 and scalable applications-development icons
- Updated translations
-* Mon Aug 21 2006 - jhargadon(a)suse.de
+* Mon Aug 21 2006 jhargadon(a)suse.de
- update to version 2.15.90
- Moved stock_* fullscreen icons to view-* action names
- Many new icons
@@ -133,97 +136,97 @@
- Add in spinner animations to replace gnome-spinner images
- Update scalable folders to match the pixmaps better
- Replace gnome-fs-regular with text-x-preview
-* Mon Apr 10 2006 - dobey(a)suse.de
+* Mon Apr 10 2006 dobey(a)suse.de
- Add patch to make the sizes for scalable icons more sane
Mostly fixes https://bugzilla.novell.com/show_bug.cgi?id=162222
-* Mon Apr 03 2006 - dobey(a)suse.de
+* Mon Apr 03 2006 dobey(a)suse.de
- Update hicolor-icon-theme tarball to 0.9 for multiple bug fixes
-* Sat Mar 04 2006 - aj(a)suse.de
+* Sat Mar 04 2006 aj(a)suse.de
- Fix typo in last change.
-* Fri Mar 03 2006 - dobey(a)suse.de
+* Thu Mar 02 2006 dobey(a)suse.de
- Remove gaim icon from gnome-icon-theme
Fixes part of https://bugzilla.novell.com/show_bug.cgi?id=153748
-* Tue Feb 28 2006 - dobey(a)suse.de
+* Tue Feb 28 2006 dobey(a)suse.de
- Remove extra hicolor-icons.tar.bz2 per request from coolo
-* Wed Feb 15 2006 - dobey(a)suse.de
+* Wed Feb 15 2006 dobey(a)suse.de
- Create 24x24/apps and 24x24/mimetypes directories in hicolor
These directories are needed for some apps to install icons to
-* Wed Jan 25 2006 - mls(a)suse.de
+* Wed Jan 25 2006 mls(a)suse.de
- converted neededforbuild to BuildRequires
-* Thu Oct 13 2005 - sbrabec(a)suse.cz
+* Thu Oct 13 2005 sbrabec(a)suse.cz
- Minimized neededforbuild.
-* Tue Oct 11 2005 - gekker(a)suse.de
+* Tue Oct 11 2005 gekker(a)suse.de
- Update to version 2.12.1
- Fixes configuration problem (#91387)
- Remove upstreamed patches
-* Fri Sep 16 2005 - sbrabec(a)suse.cz
+* Fri Sep 16 2005 sbrabec(a)suse.cz
- Call aclocal to build properly in PLUS.
-* Tue Sep 13 2005 - sbrabec(a)suse.cz
+* Tue Sep 13 2005 sbrabec(a)suse.cz
- Build as NoArch.
-* Tue Sep 13 2005 - sbrabec(a)suse.cz
+* Tue Sep 13 2005 sbrabec(a)suse.cz
- Reset executable flag for icons (#116346).
-* Mon Sep 05 2005 - rodrigo(a)suse.de
+* Mon Sep 05 2005 rodrigo(a)suse.de
- Update to version 2.12.0
-* Tue Aug 23 2005 - gekker(a)suse.de
+* Mon Aug 22 2005 gekker(a)suse.de
- Update to version 2.11.92
-* Thu Aug 11 2005 - gekker(a)suse.de
+* Thu Aug 11 2005 gekker(a)suse.de
- Update to version 2.11.91
-* Tue Aug 02 2005 - gekker(a)suse.de
+* Mon Aug 01 2005 gekker(a)suse.de
- Update to version 2.11.90
-* Fri Jul 22 2005 - gekker(a)suse.de
+* Fri Jul 22 2005 gekker(a)suse.de
- Update to version 2.11.5
-* Wed Mar 23 2005 - clahey(a)suse.de
+* Wed Mar 23 2005 clahey(a)suse.de
- Updated to version 2.10.1. Adds Open Document icons. Fixes 73536.
-* Sat Mar 19 2005 - clahey(a)suse.de
+* Sat Mar 19 2005 clahey(a)suse.de
- Add icons for word docs and realplayer supported types.
-* Wed Mar 16 2005 - clahey(a)suse.de
+* Wed Mar 16 2005 clahey(a)suse.de
- Use the gnome-dev-ethernet from netapplet.
-* Tue Mar 08 2005 - gekker(a)suse.de
+* Tue Mar 08 2005 gekker(a)suse.de
- Update to version 2.10.0 (GNOME 2.10).
-* Thu Mar 03 2005 - gekker(a)suse.de
+* Thu Mar 03 2005 gekker(a)suse.de
- Update to version 2.9.92
-* Fri Feb 11 2005 - gekker(a)suse.de
+* Thu Feb 10 2005 gekker(a)suse.de
- Update to version 2.9.91
-* Sun Feb 06 2005 - gekker(a)suse.de
+* Sat Feb 05 2005 gekker(a)suse.de
- Update to version 2.9.90
-* Wed Jan 19 2005 - clahey(a)suse.de
+* Wed Jan 19 2005 clahey(a)suse.de
- Updated to version 2.9.3.
-* Thu Dec 16 2004 - gekker(a)suse.de
+* Thu Dec 16 2004 gekker(a)suse.de
- Update to version 2.9.2
-* Tue Nov 23 2004 - gekker(a)suse.de
+* Tue Nov 23 2004 gekker(a)suse.de
- Update version to 2.9.1
Remove wordperfect file / artwork as it was already upstream.
-* Wed Sep 29 2004 - hhetter(a)suse.de
+* Wed Sep 29 2004 hhetter(a)suse.de
- added essential icons for drives:/ operation to hicolor
-* Mon Sep 27 2004 - mmichael(a)suse.de
+* Mon Sep 27 2004 mmichael(a)suse.de
- Add wordperfect file / artwork.
-* Mon Sep 27 2004 - sbrabec(a)suse.cz
+* Mon Sep 27 2004 sbrabec(a)suse.cz
- Removed old RealPlayer branding.
http://bugzilla.gnome.org/show_bug.cgi?id=153677
-* Wed Jul 28 2004 - dobey(a)suse.de
+* Wed Jul 28 2004 dobey(a)suse.de
- Updated to version 1.2.3
-* Fri Apr 23 2004 - sbrabec(a)suse.cz
+* Fri Apr 23 2004 sbrabec(a)suse.cz
- Updated to version 1.2.1 (GNOME 2.6).
- Added hicolor-icon-theme version 0.5.
-* Wed Oct 29 2003 - sbrabec(a)suse.cz
+* Wed Oct 29 2003 sbrabec(a)suse.cz
- Updated to version 1.1.0.
-* Tue Sep 09 2003 - sbrabec(a)suse.cz
+* Tue Sep 09 2003 sbrabec(a)suse.cz
- Updated to version 1.0.9.
-* Mon Sep 08 2003 - sbrabec(a)suse.cz
+* Mon Sep 08 2003 sbrabec(a)suse.cz
- Updated to version 1.0.8.
-* Wed Aug 27 2003 - sbrabec(a)suse.cz
+* Wed Aug 27 2003 sbrabec(a)suse.cz
- Updated to version 1.0.7.
-* Mon Aug 18 2003 - sbrabec(a)suse.cz
+* Mon Aug 18 2003 sbrabec(a)suse.cz
- Updated to version 1.0.6.
-* Mon Jul 14 2003 - sbrabec(a)suse.cz
+* Mon Jul 14 2003 sbrabec(a)suse.cz
- GNOME prefix change to /opt/gnome.
-* Wed Jul 09 2003 - sbrabec(a)suse.cz
+* Wed Jul 09 2003 sbrabec(a)suse.cz
- Updated to version 1.0.5.
-* Mon Jun 23 2003 - ro(a)suse.de
+* Sun Jun 22 2003 ro(a)suse.de
- added gnome-filesystem to neededforbuild
-* Fri Jan 31 2003 - hhetter(a)suse.de
+* Fri Jan 31 2003 hhetter(a)suse.de
- updated to version 1.0.0
-* Thu Jan 16 2003 - sbrabec(a)suse.cz
+* Thu Jan 16 2003 sbrabec(a)suse.cz
- Fixed %%prefix to /opt/gnome2.
-* Wed Jan 15 2003 - sbrabec(a)suse.cz
+* Wed Jan 15 2003 sbrabec(a)suse.cz
- Added new package.
++++++ gnome-icon-theme-2.20.0.tar.bz2 -> gnome-icon-theme-2.21.4.tar.bz2 ++++++
++++ 8012 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