openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
May 2006
- 1 participants
- 1219 discussions
Hello community,
here is the log from the commit of package docbook-dsssl-stylesheets
checked in at Mon May 29 18:29:32 CEST 2006.
--------
--- docbook-dsssl-stylesheets/docbook-dsssl-stylesheets.changes 2006-01-25 21:46:09.000000000 +0100
+++ docbook-dsssl-stylesheets/docbook-dsssl-stylesheets.changes 2006-05-29 16:42:10.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 29 16:41:22 CEST 2006 - ke(a)suse.de
+
+- Use %postun instead of %preun and check for the update case; reported
+ by Marcus Meissner.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docbook-dsssl-stylesheets.spec ++++++
--- /var/tmp/diff_new_pack.A4G280/_old 2006-05-29 18:29:24.000000000 +0200
+++ /var/tmp/diff_new_pack.A4G280/_new 2006-05-29 18:29:24.000000000 +0200
@@ -1,11 +1,11 @@
#
# spec file for package docbook-dsssl-stylesheets (Version 1.79)
#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 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.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
@@ -20,7 +20,7 @@
BuildArchitectures: noarch
Summary: DSSSL Stylesheets for the DocBook DTD
Version: 1.79
-Release: 6
+Release: 18
URL: http://sourceforge.net/projects/docbook/
Source0: http://belnet.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-%{versio…
Source1: http://belnet.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-doc-%{ve…
@@ -44,7 +44,7 @@
other formats. "Print" (TeX and RTF) and "online" (HTML) output formats
are available.
-The stylesheets are customizable, and within limits it is possible to
+The stylesheets are customizable and, within limits, it is possible to
adapt them for your own needs. Numerous native languages are supported.
@@ -159,8 +159,8 @@
fi
exit 0
-%preun
-if [ -x %{regcat} ]; then
+%postun
+if [ "$1" = "0" -a -x %{regcat} ]; then
for c in %{name}; do
%{regcat} -r %{sgml_dir}/CATALOG.$c >/dev/null 2>&1
done
@@ -184,6 +184,9 @@
%{_defaultdocdir}/%{name}
%changelog -n docbook-dsssl-stylesheets
+* Mon May 29 2006 - ke(a)suse.de
+- Use %%postun instead of %%preun and check for the update case; reported
+ by Marcus Meissner.
* Wed Jan 25 2006 - mls(a)suse.de
- converted neededforbuild to BuildRequires
* Wed Dec 21 2005 - aj(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package madwifi
checked in at Mon May 29 18:24:36 CEST 2006.
--------
--- arch/i386/madwifi/madwifi.changes 2006-05-25 00:01:02.000000000 +0200
+++ madwifi/madwifi.changes 2006-05-29 10:50:34.000000000 +0200
@@ -1,0 +2,5 @@
+Sat May 27 13:56:15 CEST 2006 - jg(a)suse.de
+
+- fixed net80211/Makefile
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ madwifi.spec ++++++
--- /var/tmp/diff_new_pack.SAdlRI/_old 2006-05-29 18:23:58.000000000 +0200
+++ /var/tmp/diff_new_pack.SAdlRI/_new 2006-05-29 18:23:58.000000000 +0200
@@ -15,7 +15,7 @@
%define madwifi_version 0.9.0
Summary: Tools for configuring atheros cards
Version: 0.9.0
-Release: 1
+Release: 2
Group: Hardware/Other
License: BSD
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -118,6 +118,8 @@
%{_includedir}/%{name}-%{version}
%changelog -n madwifi
+* Sat May 27 2006 - jg(a)suse.de
+- fixed net80211/Makefile
* Wed May 24 2006 - jg(a)suse.de
- disabled scanning when associated (bug 153733)
- update to version 0.9.0, changes (shortened):
++++++ madwifi.dif ++++++
--- /var/tmp/diff_new_pack.SAdlRI/_old 2006-05-29 18:23:59.000000000 +0200
+++ /var/tmp/diff_new_pack.SAdlRI/_new 2006-05-29 18:23:59.000000000 +0200
@@ -1,8 +1,8 @@
-Index: madwifi-ng-0.9.0/net80211/Makefile
+Index: madwifi-0.9.0/net80211/Makefile
===================================================================
---- madwifi-ng-0.9.0.orig/net80211/Makefile
-+++ madwifi-ng-0.9.0/net80211/Makefile
-@@ -1,71 +1,6 @@
+--- madwifi-0.9.0.orig/net80211/Makefile
++++ madwifi-0.9.0/net80211/Makefile
+@@ -1,71 +1,9 @@
-#
-# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
-# All rights reserved.
@@ -48,7 +48,8 @@
-ifeq ($(obj),)
-obj= .
-endif
--
++-include $(ROOT)/Makefile.inc
+
-DEPTH= ..
-#
-# There are two authenticator mechanisms: an in-kernel implementation
@@ -72,11 +73,12 @@
- $(MOD_AUTH) $(MOD_SCAN)
-
-obj-m += $(MOD_INSTALL)
-+-include $(ROOT)/Makefile.inc
++obj-m := wlan_xauth.o wlan_scan_sta.o wlan_scan_ap.o wlan.o \
++ wlan_wep.o wlan_tkip.o wlan_ccmp.o wlan_acl.o
wlan-objs := if_media.o \
ieee80211.o ieee80211_beacon.o ieee80211_crypto.o \
-@@ -80,45 +15,3 @@ wlan_acl-objs := ieee80211_acl.o
+@@ -80,45 +18,3 @@ wlan_acl-objs := ieee80211_acl.o
wlan_xauth-objs := ieee80211_xauth.o
wlan_scan_sta-objs :=ieee80211_scan_sta.o
wlan_scan_ap-objs := ieee80211_scan_ap.o
@@ -122,10 +124,10 @@
- -rm -f *~ *.o *.ko *.mod.c
- -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
- -rm -rf .tmp_versions
-Index: madwifi-ng-0.9.0/ath_rate/onoe/Makefile
+Index: madwifi-0.9.0/ath_rate/onoe/Makefile
===================================================================
---- madwifi-ng-0.9.0.orig/ath_rate/onoe/Makefile
-+++ madwifi-ng-0.9.0/ath_rate/onoe/Makefile
+--- madwifi-0.9.0.orig/ath_rate/onoe/Makefile
++++ madwifi-0.9.0/ath_rate/onoe/Makefile
@@ -1,75 +1,6 @@
-#
-# Copyright (c) 2004 Sam Leffler, Errno Consulting
@@ -204,10 +206,10 @@
-
-ath_rate_onoe.o: ${ath_rate_onoe-objs}
- $(LD) $(LDOPTS) -o ath_rate_onoe.$(KMODSUF) -r $(ath_rate_onoe-objs)
-Index: madwifi-ng-0.9.0/ath_rate/amrr/Makefile
+Index: madwifi-0.9.0/ath_rate/amrr/Makefile
===================================================================
---- madwifi-ng-0.9.0.orig/ath_rate/amrr/Makefile
-+++ madwifi-ng-0.9.0/ath_rate/amrr/Makefile
+--- madwifi-0.9.0.orig/ath_rate/amrr/Makefile
++++ madwifi-0.9.0/ath_rate/amrr/Makefile
@@ -1,75 +1,6 @@
-#
-# Copyright (c) 2004 Sam Leffler, Errno Consulting
@@ -286,10 +288,10 @@
-
-ath_rate_amrr.o: ${ath_rate_amrr-objs}
- $(LD) $(LDOPTS) -o ath_rate_amrr.$(KMODSUF) -r $(ath_rate_amrr-objs)
-Index: madwifi-ng-0.9.0/ath_hal/Makefile
+Index: madwifi-0.9.0/ath_hal/Makefile
===================================================================
---- madwifi-ng-0.9.0.orig/ath_hal/Makefile
-+++ madwifi-ng-0.9.0/ath_hal/Makefile
+--- madwifi-0.9.0.orig/ath_hal/Makefile
++++ madwifi-0.9.0/ath_hal/Makefile
@@ -1,87 +1,17 @@
-# $Id: //depot/sw/linuxsrc/src/802_11/madwifi/madwifi/ath_hal/Makefile#9 $
-#
@@ -386,10 +388,10 @@
-ath_hal.o: ${ath_hal-objs}
- $(LD) $(LDOPTS) -o ath_hal.$(KMODSUF) -r $(ath_hal-objs)
-Index: madwifi-ng-0.9.0/tools/Makefile
+Index: madwifi-0.9.0/tools/Makefile
===================================================================
---- madwifi-ng-0.9.0.orig/tools/Makefile
-+++ madwifi-ng-0.9.0/tools/Makefile
+--- madwifi-0.9.0.orig/tools/Makefile
++++ madwifi-0.9.0/tools/Makefile
@@ -32,19 +32,7 @@ DEPTH= ..
# it's a more traditional name.
TOOLPREFIX ?= $(CROSS_COMPILE)
@@ -430,10 +432,10 @@
done
install -d ${DESTDIR}${MANDIR}/man8
install -m 0644 man/*.8 ${DESTDIR}${MANDIR}/man8
-Index: madwifi-ng-0.9.0/ath/Makefile
+Index: madwifi-0.9.0/ath/Makefile
===================================================================
---- madwifi-ng-0.9.0.orig/ath/Makefile
-+++ madwifi-ng-0.9.0/ath/Makefile
+--- madwifi-0.9.0.orig/ath/Makefile
++++ madwifi-0.9.0/ath/Makefile
@@ -1,83 +1,7 @@
-#
-# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -522,10 +524,10 @@
-
-ath_${BUSNAME}.o: ${ath_${BUSNAME}-objs}
- $(LD) $(LDOPTS) -o ath_${BUSNAME}.$(KMODSUF) -r $(ath_${BUSNAME}-objs)
-Index: madwifi-ng-0.9.0/Makefile
+Index: madwifi-0.9.0/Makefile
===================================================================
---- madwifi-ng-0.9.0.orig/Makefile
-+++ madwifi-ng-0.9.0/Makefile
+--- madwifi-0.9.0.orig/Makefile
++++ madwifi-0.9.0/Makefile
@@ -1,175 +1,7 @@
-#
-# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -706,10 +708,10 @@
- fi
-
- @echo "ok."
-Index: madwifi-ng-0.9.0/Makefile.inc
+Index: madwifi-0.9.0/Makefile.inc
===================================================================
---- madwifi-ng-0.9.0.orig/Makefile.inc
-+++ madwifi-ng-0.9.0/Makefile.inc
+--- madwifi-0.9.0.orig/Makefile.inc
++++ madwifi-0.9.0/Makefile.inc
@@ -1,217 +1,14 @@
-#
-# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -936,10 +938,10 @@
# The following variables will affect developers only, and are used in the
-Index: madwifi-ng-0.9.0/ath_rate/sample/Makefile
+Index: madwifi-0.9.0/ath_rate/sample/Makefile
===================================================================
---- madwifi-ng-0.9.0.orig/ath_rate/sample/Makefile
-+++ madwifi-ng-0.9.0/ath_rate/sample/Makefile
+--- madwifi-0.9.0.orig/ath_rate/sample/Makefile
++++ madwifi-0.9.0/ath_rate/sample/Makefile
@@ -1,73 +1,6 @@
-#
-# Copyright (c) 2004 Sam Leffler, Errno Consulting
@@ -1016,10 +1018,10 @@
-
-ath_rate_sample.o: ${ath_rate_sample-objs}
- $(LD) $(LDOPTS) -o ath_rate_sample.$(KMODSUF) -r $(ath_rate_sample-objs)
-Index: madwifi-ng-0.9.0/hal/public/x86_64-elf.inc
+Index: madwifi-0.9.0/hal/public/x86_64-elf.inc
===================================================================
---- madwifi-ng-0.9.0.orig/hal/public/x86_64-elf.inc
-+++ madwifi-ng-0.9.0/hal/public/x86_64-elf.inc
+--- madwifi-0.9.0.orig/hal/public/x86_64-elf.inc
++++ madwifi-0.9.0/hal/public/x86_64-elf.inc
@@ -41,10 +41,6 @@
#
@@ -1031,10 +1033,10 @@
CC= ${TOOLPREFIX}gcc
LD= ${TOOLPREFIX}ld
STRIP= ${TOOLPREFIX}strip
-Index: madwifi-ng-0.9.0/hal/public/powerpc-be-elf.inc
+Index: madwifi-0.9.0/hal/public/powerpc-be-elf.inc
===================================================================
---- madwifi-ng-0.9.0.orig/hal/public/powerpc-be-elf.inc
-+++ madwifi-ng-0.9.0/hal/public/powerpc-be-elf.inc
+--- madwifi-0.9.0.orig/hal/public/powerpc-be-elf.inc
++++ madwifi-0.9.0/hal/public/powerpc-be-elf.inc
@@ -51,10 +51,6 @@
# --enable-languages=c --with-gnu-as --with-gnu-ld \
# --with-newlib --with-gxx-include-dir=${PREFIX}/$target/include
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package beagle
checked in at Mon May 29 18:21:37 CEST 2006.
--------
--- GNOME/beagle/beagle.changes 2006-05-26 23:32:39.000000000 +0200
+++ beagle/beagle.changes 2006-05-29 18:14:12.000000000 +0200
@@ -1,0 +2,5 @@
+Mon May 29 18:13:54 CEST 2006 - joeshaw(a)suse.de
+
+- Update zh_CN translation. (bnc #179555)
+
+-------------------------------------------------------------------
New:
----
beagle-zh_CN.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ beagle.spec ++++++
--- /var/tmp/diff_new_pack.ZCl9iy/_old 2006-05-29 18:21:19.000000000 +0200
+++ /var/tmp/diff_new_pack.ZCl9iy/_new 2006-05-29 18:21:19.000000000 +0200
@@ -18,7 +18,7 @@
Group: Productivity/Other
Autoreqprov: on
Version: 0.2.3
-Release: 46
+Release: 48
Summary: Desktop Search Application
URL: http://www.gnome.org/projects/beagle/
Source: %{name}-%{version}.tar.gz
@@ -54,6 +54,7 @@
Patch26: beagle-check-for-mmap.patch
Patch27: beagle-xdgmime-crash.patch
Patch28: beagle-terminal-lockdown.patch
+Patch29: beagle-zh_CN.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Prereq: /usr/sbin/groupadd /usr/sbin/useradd
Requires: mono-core >= 1.1.13.5
@@ -324,6 +325,7 @@
%patch26
%patch27
%patch28
+%patch29
%build
rm po/no.*
@@ -481,6 +483,8 @@
%{prefix}/%_lib/pkgconfig/*.pc
%changelog -n beagle
+* Mon May 29 2006 - joeshaw(a)suse.de
+- Update zh_CN translation. (bnc #179555)
* Fri May 26 2006 - joeshaw(a)suse.de
- Add a patch to remove terminal entries from beagle-search
results when command-line lockdown is enabled. (bnc #179333)
++++++ beagle-zh_CN.patch ++++++
++++ 1236 lines (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package alsa
checked in at Mon May 29 18:20:29 CEST 2006.
--------
--- alsa/alsa.changes 2006-05-17 15:06:17.000000000 +0200
+++ alsa/alsa.changes 2006-05-29 17:35:29.000000000 +0200
@@ -1,0 +2,9 @@
+Mon May 29 17:33:02 CEST 2006 - tiwai(a)suse.de
+
+- added the support of delay callback in alsa external I/O
+ plugin (for new polypaudio support)
+- fix the return value of snd_hctl_wait()
+- fix surround40 PCM configuration for ens1370 cards
+- added infile option for alsa-lib pcm file plugin
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa.spec ++++++
--- /var/tmp/diff_new_pack.BSrhjJ/_old 2006-05-29 18:20:11.000000000 +0200
+++ /var/tmp/diff_new_pack.BSrhjJ/_new 2006-05-29 18:20:11.000000000 +0200
@@ -21,7 +21,7 @@
Autoreqprov: on
Summary: Advanced Linux Sound Architecture
Version: 1.0.11
-Release: 33
+Release: 34
Source1: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
Source2: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2
Source5: ftp://ftp.alsa-project.org/pub/oss/alsa-oss-%{package_version}.tar.bz2
@@ -377,6 +377,12 @@
%doc alsa-lib*/doc/doxygen/html/*
%changelog -n alsa
+* Mon May 29 2006 - tiwai(a)suse.de
+- added the support of delay callback in alsa external I/O
+ plugin (for new polypaudio support)
+- fix the return value of snd_hctl_wait()
+- fix surround40 PCM configuration for ens1370 cards
+- added infile option for alsa-lib pcm file plugin
* Wed May 17 2006 - tiwai(a)suse.de
- fix endless loop bug in arecord, also code clean-up.
* Mon May 15 2006 - tiwai(a)suse.de
++++++ alsa-lib-hg-fixes.diff ++++++
--- /var/tmp/diff_new_pack.BSrhjJ/_old 2006-05-29 18:20:12.000000000 +0200
+++ /var/tmp/diff_new_pack.BSrhjJ/_new 2006-05-29 18:20:12.000000000 +0200
@@ -1,6 +1,6 @@
diff -r ae6753322b63 INSTALL
--- a/INSTALL Wed Apr 19 12:29:46 2006 +0200
-+++ b/INSTALL Mon May 15 12:41:49 2006 +0200
++++ b/INSTALL Mon May 29 17:08:22 2006 +0200
@@ -11,11 +11,11 @@ For installation you can use these comma
make install
@@ -25,21 +25,32 @@
Note: Some automake packages have missing aclocal program. Use newer version
in the case.
-diff -r ae6753322b63 Makefile.am
---- a/Makefile.am Wed Apr 19 12:29:46 2006 +0200
-+++ b/Makefile.am Mon May 15 12:41:49 2006 +0200
-@@ -6,7 +6,7 @@ SUBDIRS += alsalisp
- SUBDIRS += alsalisp
- endif
- SUBDIRS += test utils
--EXTRA_DIST=ChangeLog INSTALL TODO NOTES configure cvscompile libtool depcomp version MEMORY-LEAK
-+EXTRA_DIST=ChangeLog INSTALL TODO NOTES configure hgcompile libtool depcomp version MEMORY-LEAK
- AUTOMAKE_OPTIONS=foreign
+diff -r ae6753322b63 include/pcm_ioplug.h
+--- a/include/pcm_ioplug.h Wed Apr 19 12:29:46 2006 +0200
++++ b/include/pcm_ioplug.h Mon May 29 17:08:22 2006 +0200
+@@ -65,7 +65,7 @@ typedef struct snd_pcm_ioplug_callback s
+ */
+ #define SND_PCM_IOPLUG_VERSION_MAJOR 1 /**< Protocol major version */
+ #define SND_PCM_IOPLUG_VERSION_MINOR 0 /**< Protocol minor version */
+-#define SND_PCM_IOPLUG_VERSION_TINY 0 /**< Protocol tiny version */
++#define SND_PCM_IOPLUG_VERSION_TINY 1 /**< Protocol tiny version */
+ /**
+ * IO-plugin protocol version
+ */
+@@ -184,6 +184,10 @@ struct snd_pcm_ioplug_callback {
+ * dump; optional
+ */
+ void (*dump)(snd_pcm_ioplug_t *io, snd_output_t *out);
++ /**
++ * get the delay for the running PCM; optional
++ */
++ int (*delay)(snd_pcm_ioplug_t *io, snd_pcm_sframes_t *delayp);
+ };
+
- INCLUDES=-I$(top_srcdir)/include
diff -r ae6753322b63 include/seq.h
--- a/include/seq.h Wed Apr 19 12:29:46 2006 +0200
-+++ b/include/seq.h Mon May 15 12:41:49 2006 +0200
++++ b/include/seq.h Mon May 29 17:08:22 2006 +0200
@@ -225,17 +225,41 @@ typedef struct _snd_seq_port_info snd_se
#define SND_SEQ_PORT_CAP_SUBS_WRITE (1<<6) /**< allow write subscription */
#define SND_SEQ_PORT_CAP_NO_EXPORT (1<<7) /**< routing not allowed */
@@ -95,7 +106,7 @@
size_t snd_seq_port_info_sizeof(void);
diff -r ae6753322b63 include/sound/asequencer.h
--- a/include/sound/asequencer.h Wed Apr 19 12:29:46 2006 +0200
-+++ b/include/sound/asequencer.h Mon May 15 12:41:49 2006 +0200
++++ b/include/sound/asequencer.h Mon May 29 17:08:22 2006 +0200
@@ -317,7 +317,7 @@ struct sndrv_seq_ev_sample_control {
struct sndrv_seq_ev_sample sample;
struct sndrv_seq_ev_cluster cluster;
@@ -127,7 +138,7 @@
/* misc. conditioning flags */
diff -r ae6753322b63 include/sound/asound.h
--- a/include/sound/asound.h Wed Apr 19 12:29:46 2006 +0200
-+++ b/include/sound/asound.h Mon May 15 12:41:49 2006 +0200
++++ b/include/sound/asound.h Mon May 29 17:08:22 2006 +0200
@@ -122,7 +122,7 @@ struct sndrv_hwdep_info {
int card; /* R: card number */
unsigned char id[64]; /* ID (user selectable) */
@@ -268,7 +279,7 @@
unsigned int mask;
diff -r ae6753322b63 include/sound/emu10k1.h
--- a/include/sound/emu10k1.h Wed Apr 19 12:29:46 2006 +0200
-+++ b/include/sound/emu10k1.h Mon May 15 12:41:49 2006 +0200
++++ b/include/sound/emu10k1.h Mon May 29 17:08:22 2006 +0200
@@ -264,7 +264,7 @@ enum emu10k1_ctl_elem_iface {
typedef struct {
@@ -280,7 +291,7 @@
unsigned char name[44]; /* ASCII name of item */
diff -r ae6753322b63 src/conf.c
--- a/src/conf.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/conf.c Mon May 15 12:41:49 2006 +0200
++++ b/src/conf.c Mon May 29 17:08:22 2006 +0200
@@ -3963,7 +3963,7 @@ int snd_config_expand(snd_config_t *conf
* \param name Key suffix.
* \param result The function puts the handle to the expanded found node at
@@ -290,9 +301,20 @@
*
* First the key is tried, then, if nothing is found, base.key is tried.
* If the value found is a string, this is recursively tried in the
+diff -r ae6753322b63 src/conf/cards/ENS1370.conf
+--- a/src/conf/cards/ENS1370.conf Wed Apr 19 12:29:46 2006 +0200
++++ b/src/conf/cards/ENS1370.conf Mon May 29 17:08:22 2006 +0200
+@@ -54,6 +54,7 @@ ENS1370.pcm.rear.0 {
+ type ctl_elems
+ hook_args [
+ {
++ interface CARD
+ name "PCM 0 Output also on Line-In Jack"
+ preserve true
+ lock true
diff -r ae6753322b63 src/conf/cards/ICH4.conf
--- a/src/conf/cards/ICH4.conf Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/conf/cards/ICH4.conf Mon May 15 12:41:49 2006 +0200
++++ b/src/conf/cards/ICH4.conf Mon May 29 17:08:22 2006 +0200
@@ -194,6 +194,7 @@ ICH4.pcm.iec958.0 {
hook_args [
{
@@ -316,9 +338,76 @@
lock true
preserve true
value true
+diff -r ae6753322b63 src/control/hcontrol.c
+--- a/src/control/hcontrol.c Wed Apr 19 12:29:46 2006 +0200
++++ b/src/control/hcontrol.c Mon May 29 17:08:22 2006 +0200
+@@ -657,22 +657,52 @@ unsigned int snd_hctl_get_count(snd_hctl
+ * \brief Wait for a HCTL to become ready (i.e. at least one event pending)
+ * \param hctl HCTL handle
+ * \param timeout maximum time in milliseconds to wait
+- * \return 0 otherwise a negative error code on failure
++ * \return a positive value on success otherwise a negative error code
++ * \retval 0 timeout occurred
++ * \retval 1 an event is pending
+ */
+ int snd_hctl_wait(snd_hctl_t *hctl, int timeout)
+ {
+- struct pollfd pfd;
+- int err;
+- err = snd_hctl_poll_descriptors(hctl, &pfd, 1);
++ struct pollfd *pfd;
++ unsigned short *revents;
++ int i, npfds, pollio, err, err_poll;
++
++ npfds = snd_hctl_poll_descriptors_count(hctl);
++ if (npfds <= 0 || npfds >= 16) {
++ SNDERR("Invalid poll_fds %d\n", npfds);
++ return -EIO;
++ }
++ pfd = alloca(sizeof(*pfd) * npfds);
++ revents = alloca(sizeof(*revents) * npfds);
++ err = snd_hctl_poll_descriptors(hctl, pfd, npfds);
+ if (err < 0)
+ return err;
+- if (! err)
+- return 0;
+- assert(err == 1);
+- err = poll(&pfd, 1, timeout);
+- if (err < 0)
+- return -errno;
+- return 0;
++ if (err != npfds) {
++ SNDMSG("invalid poll descriptors %d\n", err);
++ return -EIO;
++ }
++ do {
++ pollio = 0;
++ err_poll = poll(pfd, npfds, timeout);
++ if (err_poll < 0) {
++ if (errno == EINTR)
++ continue;
++ return -errno;
++ }
++ if (! err_poll)
++ break;
++ err = snd_hctl_poll_descriptors_revents(hctl, pfd, npfds, revents);
++ if (err < 0)
++ return err;
++ for (i = 0; i < npfds; i++) {
++ if (revents[i] & (POLLERR | POLLNVAL))
++ return -EIO;
++ if ((revents[i] & (POLLIN | POLLOUT)) == 0)
++ continue;
++ pollio++;
++ }
++ } while (! pollio);
++ return err_poll > 0 ? 1 : 0;
+ }
+
+ /**
diff -r ae6753322b63 src/hwdep/hwdep.c
--- a/src/hwdep/hwdep.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/hwdep/hwdep.c Mon May 15 12:41:49 2006 +0200
++++ b/src/hwdep/hwdep.c Mon May 29 17:08:22 2006 +0200
@@ -207,6 +207,8 @@ int snd_hwdep_close(snd_hwdep_t *hwdep)
int err;
assert(hwdep);
@@ -330,7 +419,7 @@
return err;
diff -r ae6753322b63 src/pcm/pcm_direct.c
--- a/src/pcm/pcm_direct.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/pcm/pcm_direct.c Mon May 15 12:41:49 2006 +0200
++++ b/src/pcm/pcm_direct.c Mon May 29 17:08:22 2006 +0200
@@ -82,6 +82,8 @@ int snd_pcm_direct_semaphore_create_or_c
return 0;
}
@@ -474,7 +563,7 @@
}
diff -r ae6753322b63 src/pcm/pcm_direct.h
--- a/src/pcm/pcm_direct.h Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/pcm/pcm_direct.h Mon May 15 12:41:49 2006 +0200
++++ b/src/pcm/pcm_direct.h Mon May 29 17:08:22 2006 +0200
@@ -51,8 +51,10 @@ struct slave_params {
};
@@ -502,7 +591,7 @@
int snd_pcm_direct_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents);
diff -r ae6753322b63 src/pcm/pcm_dmix.c
--- a/src/pcm/pcm_dmix.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/pcm/pcm_dmix.c Mon May 15 12:41:49 2006 +0200
++++ b/src/pcm/pcm_dmix.c Mon May 29 17:08:22 2006 +0200
@@ -650,8 +650,10 @@ static int snd_pcm_dmix_close(snd_pcm_t
if (dmix->client)
snd_pcm_direct_client_discard(dmix);
@@ -598,7 +687,7 @@
diff -r ae6753322b63 src/pcm/pcm_dshare.c
--- a/src/pcm/pcm_dshare.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/pcm/pcm_dshare.c Mon May 15 12:41:49 2006 +0200
++++ b/src/pcm/pcm_dshare.c Mon May 29 17:08:22 2006 +0200
@@ -464,8 +464,10 @@ static int snd_pcm_dshare_close(snd_pcm_
snd_pcm_direct_server_discard(dshare);
if (dshare->client)
@@ -693,7 +782,7 @@
diff -r ae6753322b63 src/pcm/pcm_dsnoop.c
--- a/src/pcm/pcm_dsnoop.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/pcm/pcm_dsnoop.c Mon May 15 12:41:49 2006 +0200
++++ b/src/pcm/pcm_dsnoop.c Mon May 29 17:08:22 2006 +0200
@@ -360,8 +360,10 @@ static int snd_pcm_dsnoop_close(snd_pcm_
snd_pcm_direct_server_discard(dsnoop);
if (dsnoop->client)
@@ -788,7 +877,7 @@
diff -r ae6753322b63 src/pcm/pcm_extplug.c
--- a/src/pcm/pcm_extplug.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/pcm/pcm_extplug.c Mon May 15 12:41:49 2006 +0200
++++ b/src/pcm/pcm_extplug.c Mon May 29 17:08:22 2006 +0200
@@ -30,6 +30,11 @@
#include "pcm_plugin.h"
#include "pcm_extplug.h"
@@ -803,19 +892,207 @@
diff -r ae6753322b63 src/pcm/pcm_file.c
--- a/src/pcm/pcm_file.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/pcm/pcm_file.c Mon May 15 12:41:49 2006 +0200
-@@ -234,7 +234,7 @@ static snd_pcm_sframes_t snd_pcm_file_re
++++ b/src/pcm/pcm_file.c Mon May 29 17:08:22 2006 +0200
+@@ -46,6 +46,8 @@ typedef struct {
+ snd_pcm_generic_t gen;
+ char *fname;
+ int fd;
++ char *ifname;
++ int ifd;
+ int format;
+ snd_pcm_uframes_t appl_ptr;
+ snd_pcm_uframes_t file_ptr_bytes;
+@@ -53,6 +55,9 @@ typedef struct {
+ size_t wbuf_size_bytes;
+ size_t wbuf_used_bytes;
+ char *wbuf;
++ size_t rbuf_size_bytes;
++ size_t rbuf_used_bytes;
++ char *rbuf;
+ snd_pcm_channel_area_t *wbuf_areas;
+ size_t buffer_bytes;
+ } snd_pcm_file_t;
+@@ -120,6 +125,10 @@ static int snd_pcm_file_close(snd_pcm_t
+ free((void *)file->fname);
+ close(file->fd);
+ }
++ if (file->ifname) {
++ free((void *)file->ifname);
++ close(file->ifd);
++ }
+ return snd_pcm_generic_close(pcm);
+ }
+
+@@ -222,10 +231,20 @@ static snd_pcm_sframes_t snd_pcm_file_re
+ {
+ snd_pcm_file_t *file = pcm->private_data;
+ snd_pcm_channel_area_t areas[pcm->channels];
+- snd_pcm_sframes_t n = snd_pcm_readi(file->gen.slave, buffer, size);
+- if (n > 0) {
+- snd_pcm_areas_from_buf(pcm, areas, buffer);
+- snd_pcm_file_add_frames(pcm, areas, 0, n);
++ snd_pcm_sframes_t n /* , bytesn */;
++
++ if (file->ifd >= 0) {
++ n = /* bytesn = */ read(file->ifd, buffer, size * pcm->frame_bits / 8);
++ if (n > 0)
++ n = n * 8 / pcm->frame_bits;
++ /* SNDERR("DEBUG: channels = %d, sample_bits = %d, frame_bits = %d, bytes = %d, frames = %d",
++ pcm->channels, pcm->sample_bits, pcm->frame_bits, bytesn, n); */
++ } else {
++ n = snd_pcm_readi(file->gen.slave, buffer, size);
++ if (n > 0) {
++ snd_pcm_areas_from_buf(pcm, areas, buffer);
++ snd_pcm_file_add_frames(pcm, areas, 0, n);
++ }
+ }
+ return n;
+ }
+@@ -234,7 +253,14 @@ static snd_pcm_sframes_t snd_pcm_file_re
{
snd_pcm_file_t *file = pcm->private_data;
snd_pcm_channel_area_t areas[pcm->channels];
- snd_pcm_sframes_t n = snd_pcm_writen(file->gen.slave, bufs, size);
-+ snd_pcm_sframes_t n = snd_pcm_readn(file->gen.slave, bufs, size);
++ snd_pcm_sframes_t n;
++
++ if (file->ifd >= 0) {
++ SNDERR("DEBUG: Noninterleaved read not yet implemented.\n");
++ return 0; /* TODO: Noninterleaved read */
++ }
++
++ n = snd_pcm_readn(file->gen.slave, bufs, size);
if (n > 0) {
snd_pcm_areas_from_bufs(pcm, areas, bufs);
snd_pcm_file_add_frames(pcm, areas, 0, n);
+@@ -365,8 +391,11 @@ static snd_pcm_fast_ops_t snd_pcm_file_f
+ * \brief Creates a new File PCM
+ * \param pcmp Returns created PCM handle
+ * \param name Name of PCM
+- * \param fname Filename (or NULL if file descriptor is available)
+- * \param fd File descriptor
++ * \param fname Output filename (or NULL if file descriptor fd is available)
++ * \param fd Output file descriptor
++ * \param ifname Input filename (or NULL if file descriptor ifd is available)
++ * \param ifd Input file descriptor (if (ifd < 0) && (ifname == NULL), no input
++ * redirection will be performed)
+ * \param fmt File format ("raw" is supported only)
+ * \param perm File permission
+ * \param slave Slave PCM handle
+@@ -377,8 +406,8 @@ static snd_pcm_fast_ops_t snd_pcm_file_f
+ * changed in future.
+ */
+ int snd_pcm_file_open(snd_pcm_t **pcmp, const char *name,
+- const char *fname, int fd, const char *fmt, int perm,
+- snd_pcm_t *slave, int close_slave)
++ const char *fname, int fd, const char *ifname, int ifd,
++ const char *fmt, int perm, snd_pcm_t *slave, int close_slave)
+ {
+ snd_pcm_t *pcm;
+ snd_pcm_file_t *file;
+@@ -395,7 +424,7 @@ int snd_pcm_file_open(snd_pcm_t **pcmp,
+ if (fname) {
+ fd = open(fname, O_WRONLY|O_CREAT, perm);
+ if (fd < 0) {
+- SYSERR("open %s failed", fname);
++ SYSERR("open %s for writing failed", fname);
+ return -errno;
+ }
+ }
+@@ -405,10 +434,23 @@ int snd_pcm_file_open(snd_pcm_t **pcmp,
+ close(fd);
+ return -ENOMEM;
+ }
+-
++
++ if (ifname) {
++ ifd = open(ifname, O_RDONLY); /* TODO: mind blocking mode */
++ if (ifd < 0) {
++ SYSERR("open %s for reading failed", ifname);
++ if (fname)
++ close(fd);
++ return -errno;
++ }
++ }
++
+ if (fname)
+ file->fname = strdup(fname);
++ if (ifname)
++ file->ifname = strdup(ifname);
+ file->fd = fd;
++ file->ifd = ifd;
+ file->format = format;
+ file->gen.slave = slave;
+ file->gen.close_slave = close_slave;
+@@ -436,7 +478,8 @@ int snd_pcm_file_open(snd_pcm_t **pcmp,
+
+ \section pcm_plugins_file Plugin: File
+
+-This plugin stores contents of a PCM stream to file.
++This plugin stores contents of a PCM stream to file, and optionally
++uses an existing file as an input data source (i.e., "virtual mic")
+
+ \code
+ pcm.name {
+@@ -448,11 +491,14 @@ pcm.name {
+ # or
+ pcm { } # Slave PCM definition
+ }
+- file STR # Filename
++ file STR # Output filename
+ or
+- file INT # File descriptor number
++ file INT # Output file descriptor number
++ infile STR # Input filename
++ or
++ infile INT # Input file descriptor number
+ [format STR] # File format (only "raw" at the moment)
+- [perm INT] # File permission (octal, default 0600)
++ [perm INT] # Output file permission (octal, def. 0600)
+ }
+ \endcode
+
+@@ -486,9 +532,9 @@ int _snd_pcm_file_open(snd_pcm_t **pcmp,
+ int err;
+ snd_pcm_t *spcm;
+ snd_config_t *slave = NULL, *sconf;
+- const char *fname = NULL;
++ const char *fname = NULL, *ifname = NULL;
+ const char *format = NULL;
+- long fd = -1;
++ long fd = -1, ifd = -1;
+ int perm = 0600;
+ snd_config_for_each(i, next, conf) {
+ snd_config_t *n = snd_config_iterator_entry(i);
+@@ -513,6 +559,17 @@ int _snd_pcm_file_open(snd_pcm_t **pcmp,
+ err = snd_config_get_string(n, &fname);
+ if (err < 0) {
+ err = snd_config_get_integer(n, &fd);
++ if (err < 0) {
++ SNDERR("Invalid type for %s", id);
++ return -EINVAL;
++ }
++ }
++ continue;
++ }
++ if (strcmp(id, "infile") == 0) {
++ err = snd_config_get_string(n, &ifname);
++ if (err < 0) {
++ err = snd_config_get_integer(n, &ifd);
+ if (err < 0) {
+ SNDERR("Invalid type for %s", id);
+ return -EINVAL;
+@@ -556,7 +613,7 @@ int _snd_pcm_file_open(snd_pcm_t **pcmp,
+ snd_config_delete(sconf);
+ if (err < 0)
+ return err;
+- err = snd_pcm_file_open(pcmp, name, fname, fd, format, perm, spcm, 1);
++ err = snd_pcm_file_open(pcmp, name, fname, fd, ifname, ifd, format, perm, spcm, 1);
+ if (err < 0)
+ snd_pcm_close(spcm);
+ return err;
diff -r ae6753322b63 src/pcm/pcm_hooks.c
--- a/src/pcm/pcm_hooks.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/pcm/pcm_hooks.c Mon May 15 12:41:49 2006 +0200
++++ b/src/pcm/pcm_hooks.c Mon May 29 17:08:22 2006 +0200
@@ -397,16 +397,18 @@ static int snd_pcm_hook_add_conf(snd_pcm
_err:
if (type)
@@ -846,7 +1123,7 @@
return 0;
diff -r ae6753322b63 src/pcm/pcm_hw.c
--- a/src/pcm/pcm_hw.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/pcm/pcm_hw.c Mon May 15 12:41:49 2006 +0200
++++ b/src/pcm/pcm_hw.c Mon May 29 17:08:22 2006 +0200
@@ -1240,6 +1240,8 @@ int snd_pcm_hw_open(snd_pcm_t **pcmp, co
fmode |= O_NONBLOCK;
if (mode & SND_PCM_ASYNC)
@@ -858,7 +1135,7 @@
ret = -errno;
diff -r ae6753322b63 src/pcm/pcm_ioplug.c
--- a/src/pcm/pcm_ioplug.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/pcm/pcm_ioplug.c Mon May 15 12:41:49 2006 +0200
++++ b/src/pcm/pcm_ioplug.c Mon May 29 17:08:22 2006 +0200
@@ -29,6 +29,11 @@
#include "pcm_local.h"
#include "pcm_ioplug.h"
@@ -871,9 +1148,38 @@
#ifndef DOC_HIDDEN
+@@ -106,8 +111,15 @@ static int snd_pcm_ioplug_hwsync(snd_pcm
+
+ static int snd_pcm_ioplug_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp)
+ {
+- snd_pcm_ioplug_hw_ptr_update(pcm);
+- *delayp = snd_pcm_mmap_hw_avail(pcm);
++ ioplug_priv_t *io = pcm->private_data;
++
++ if (io->data->version >= 0x010001 &&
++ io->data->callback->delay)
++ return io->data->callback->delay(io->data, delayp);
++ else {
++ snd_pcm_ioplug_hw_ptr_update(pcm);
++ *delayp = snd_pcm_mmap_hw_avail(pcm);
++ }
+ return 0;
+ }
+
+@@ -872,7 +884,9 @@ int snd_pcm_ioplug_create(snd_pcm_ioplug
+ ioplug->callback->stop &&
+ ioplug->callback->pointer);
+
+- if (ioplug->version != SND_PCM_IOPLUG_VERSION) {
++ /* We support 1.0.0 to current */
++ if (ioplug->version < 0x010000 ||
++ ioplug->version > SND_PCM_IOPLUG_VERSION) {
+ SNDERR("ioplug: Plugin version mismatch\n");
+ return -ENXIO;
+ }
diff -r ae6753322b63 src/pcm/pcm_local.h
--- a/src/pcm/pcm_local.h Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/pcm/pcm_local.h Mon May 15 12:41:49 2006 +0200
++++ b/src/pcm/pcm_local.h Mon May 29 17:08:22 2006 +0200
@@ -746,6 +746,8 @@ int snd_pcm_slave_conf(snd_config_t *roo
int snd_pcm_slave_conf(snd_config_t *root, snd_config_t *conf,
snd_config_t **pcm_conf, unsigned int count, ...);
@@ -885,7 +1191,7 @@
int mode, snd_config_t *parent_conf);
diff -r ae6753322b63 src/pcm/pcm_meter.c
--- a/src/pcm/pcm_meter.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/pcm/pcm_meter.c Mon May 15 12:41:49 2006 +0200
++++ b/src/pcm/pcm_meter.c Mon May 29 17:08:22 2006 +0200
@@ -67,6 +67,7 @@ typedef struct _snd_pcm_meter {
pthread_mutex_t running_mutex;
pthread_cond_t running_cond;
@@ -932,7 +1238,7 @@
/*! \page pcm_plugins
diff -r ae6753322b63 src/pcm/pcm_rate.c
--- a/src/pcm/pcm_rate.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/pcm/pcm_rate.c Mon May 15 12:41:49 2006 +0200
++++ b/src/pcm/pcm_rate.c Mon May 29 17:08:22 2006 +0200
@@ -68,6 +68,8 @@ struct _snd_pcm_rate {
unsigned int put_idx;
int16_t *src_buf;
@@ -1063,7 +1369,7 @@
SND_PCM_HW_PARAM_RATE, SCONF_MANDATORY, &srate);
diff -r ae6753322b63 src/seq/seq.c
--- a/src/seq/seq.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/seq/seq.c Mon May 15 12:41:49 2006 +0200
++++ b/src/seq/seq.c Mon May 29 17:08:22 2006 +0200
@@ -915,7 +915,14 @@ static int snd_seq_open_conf(snd_seq_t *
_err:
if (type_conf)
@@ -1119,7 +1425,7 @@
* A port may contain specific midi channels, midi voices and synth voices.
diff -r ae6753322b63 src/seq/seq_local.h
--- a/src/seq/seq_local.h Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/seq/seq_local.h Mon May 15 12:41:49 2006 +0200
++++ b/src/seq/seq_local.h Mon May 29 17:08:22 2006 +0200
@@ -76,6 +76,7 @@ struct _snd_seq {
int streams;
int mode;
@@ -1130,7 +1436,7 @@
int client; /* client number */
diff -r ae6753322b63 src/timer/timer.c
--- a/src/timer/timer.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/timer/timer.c Mon May 15 12:41:49 2006 +0200
++++ b/src/timer/timer.c Mon May 29 17:08:22 2006 +0200
@@ -171,7 +171,14 @@ static int snd_timer_open_conf(snd_timer
_err:
if (type_conf)
@@ -1158,7 +1464,7 @@
return err;
diff -r ae6753322b63 src/timer/timer_local.h
--- a/src/timer/timer_local.h Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/timer/timer_local.h Mon May 15 12:41:49 2006 +0200
++++ b/src/timer/timer_local.h Mon May 29 17:08:22 2006 +0200
@@ -40,6 +40,7 @@ typedef struct {
struct _snd_timer {
@@ -1177,7 +1483,7 @@
int mode;
diff -r ae6753322b63 src/timer/timer_query.c
--- a/src/timer/timer_query.c Wed Apr 19 12:29:46 2006 +0200
-+++ b/src/timer/timer_query.c Mon May 15 12:41:49 2006 +0200
++++ b/src/timer/timer_query.c Mon May 29 17:08:22 2006 +0200
@@ -129,7 +129,14 @@ static int snd_timer_query_open_conf(snd
_err:
if (type_conf)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package NetworkManager
checked in at Mon May 29 18:20:00 CEST 2006.
--------
--- NetworkManager/NetworkManager.changes 2006-05-29 16:35:13.000000000 +0200
+++ NetworkManager/NetworkManager.changes 2006-05-29 17:35:16.000000000 +0200
@@ -1,0 +2,5 @@
+Mon May 29 17:34:16 CEST 2006 - sbrabec(a)suse.cz
+
+- Merged upstream translations from GNOME CVS (#169096#c37).
+
+-------------------------------------------------------------------
New:
----
NetworkManager-po-update.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.sqKrup/_old 2006-05-29 18:19:11.000000000 +0200
+++ /var/tmp/diff_new_pack.sqKrup/_new 2006-05-29 18:19:11.000000000 +0200
@@ -31,7 +31,7 @@
URL: http://www.gnome.org/projects/NetworkManager/
Autoreqprov: on
Version: 0.6.2
-Release: 41
+Release: 42
Summary: Network Link Manager and User Applications
Source0: NetworkManager-%{version}.tar.gz
Source1: nm-icons.tar.gz
@@ -46,6 +46,7 @@
Patch6: nm-debug-wpa-less-rml.patch
Patch7: nm-resolv-conf-header-rml.patch
Patch8: nm-fix-adhoc-icon-rml.patch
+Patch9: NetworkManager-po-update.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: sysconfig >= %{sysconfig_version}
Requires: %{name}-client
@@ -142,6 +143,7 @@
%prep
%setup -b 1
+%patch9
gnome-patch-translation-prepare
%patch0 -p1
%patch1 -p0
@@ -265,6 +267,8 @@
%changelog -n NetworkManager
* Mon May 29 2006 - sbrabec(a)suse.cz
+- Merged upstream translations from GNOME CVS (#169096#c37).
+* Mon May 29 2006 - sbrabec(a)suse.cz
- Use translation compendium gnome-patch-translation (#169096).
* Fri May 26 2006 - rml(a)suse.de
- Make sure we require and correctly build with gcrypt support
++++++ NetworkManager-po-update.patch ++++++
++++ 15059 lines (skipped)
++++++ nm-0.6-branch.patch ++++++
--- /var/tmp/diff_new_pack.sqKrup/_old 2006-05-29 18:19:12.000000000 +0200
+++ /var/tmp/diff_new_pack.sqKrup/_new 2006-05-29 18:19:12.000000000 +0200
@@ -2575,383 +2575,7 @@
* POTFILES.in: Add two missing files.
diff -urN NetworkManager-0.6.2/po/hu.po NetworkManager/po/hu.po
---- NetworkManager-0.6.2/po/hu.po 2006-02-27 01:53:33.000000000 -0500
-+++ NetworkManager/po/hu.po 2006-05-18 16:07:57.000000000 -0400
-@@ -7,16 +7,17 @@
- "Project-Id-Version: NetworkManager.HEAD.hu\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-01-28 20:28+0100\n"
--"PO-Revision-Date: 2006-01-06 19:36+0100\n"
--"Last-Translator: Gabor Kelemen <kelemeng(a)gnome.hu>\n"
-+"PO-Revision-Date: 2006-05-08 23:42+0100\n"
-+"Last-Translator: Szabolcs Varga <shirokuma(a)shirokuma.hu>\n"
- "Language-Team: Hungarian <gnome(a)gnome.hu>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Plural-Forms: nplurals=1; plural=0;\n"
-+"Plural-Forms: nplurals=1; plural=0;\n"
- "X-Generator: KBabel 1.11.1\n"
-
--#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
-+#: ../gnome/applet/applet-compat.c:171
-+#: ../gnome/applet/applet-dbus-info.c:923
- #, c-format
- msgid "Passphrase for wireless network %s"
- msgstr "Jelmondat a(z) %s vezeték nélküli hálózathoz"
-@@ -52,21 +53,23 @@
- msgid "Wireless Ethernet (%s)"
- msgstr "Vezeték nélküli Ethernet (%s)"
-
--#: ../gnome/applet/applet.c:321 ../gnome/applet/applet.c:346
-+#: ../gnome/applet/applet.c:321
-+#: ../gnome/applet/applet.c:346
- msgid "NetworkManager Applet"
- msgstr "NetworkManager kisalkalmazás"
-
--#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
-+#: ../gnome/applet/applet.c:323
-+#: ../gnome/applet/applet.c:348
- msgid "Copyright © 2004-2005 Red Hat, Inc."
- msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
-
--#: ../gnome/applet/applet.c:324 ../gnome/applet/applet.c:349
-+#: ../gnome/applet/applet.c:324
-+#: ../gnome/applet/applet.c:349
- msgid "Notification area applet for managing your network devices and connections."
--msgstr ""
--"Értesítésiterület-kisalkalmazás a hálózati eszközök és kapcsolatok "
--"kezelésére."
-+msgstr "Értesítésiterület-kisalkalmazás a hálózati eszközök és kapcsolatok kezelésére."
-
--#: ../gnome/applet/applet.c:327 ../gnome/applet/applet.c:354
-+#: ../gnome/applet/applet.c:327
-+#: ../gnome/applet/applet.c:354
- msgid "translator-credits"
- msgstr "Kelemen Gábor <kelemeng(a)gnome.hu>"
-
-@@ -89,14 +92,11 @@
-
- #: ../gnome/applet/applet.c:449
- #, c-format
--msgid ""
--"Could not start the VPN connection '%s' due to a failure launching the VPN "
--"program."
--msgstr ""
--"Nem sikerült elindítani \"%s\" VPN kapcsolatot a VPN program indításakor "
--"fellépett hiba miatt."
-+msgid "Could not start the VPN connection '%s' due to a failure launching the VPN program."
-+msgstr "Nem sikerült elindítani \"%s\" VPN kapcsolatot a VPN program indításakor fellépett hiba miatt."
-
--#: ../gnome/applet/applet.c:453 ../gnome/applet/applet.c:463
-+#: ../gnome/applet/applet.c:453
-+#: ../gnome/applet/applet.c:463
- msgid "VPN Connect Failure"
- msgstr "VPN kapcsolódási hiba"
-
-@@ -116,12 +116,8 @@
-
- #: ../gnome/applet/applet.c:464
- #, c-format
--msgid ""
--"Could not start the VPN connection '%s' because the VPN server did not "
--"return an adequate network configuration."
--msgstr ""
--"Nem sikerült elindítani \"%s\" VPN kapcsolatot, mivel a VPN-kiszolgáló nem "
--"adott vissza megfelelő hálózati beállításokat."
-+msgid "Could not start the VPN connection '%s' because the VPN server did not return an adequate network configuration."
-+msgstr "Nem sikerült elindítani \"%s\" VPN kapcsolatot, mivel a VPN-kiszolgáló nem adott vissza megfelelő hálózati beállításokat."
-
- #: ../gnome/applet/applet.c:472
- #, c-format
-@@ -137,12 +133,11 @@
- msgid "VPN Login Message"
- msgstr "VPN bejelentkezési üzenet"
-
--#: ../gnome/applet/applet.c:760 ../gnome/applet/applet.c:2514
-+#: ../gnome/applet/applet.c:760
-+#: ../gnome/applet/applet.c:2514
- #: ../gnome/applet/other-network-dialog.c:453
- #: ../gnome/applet/passphrase-dialog.c:206
--msgid ""
--"The NetworkManager Applet could not find some required resources (the glade "
--"file was not found)."
-+msgid "The NetworkManager Applet could not find some required resources (the glade file was not found)."
- msgstr "A NetworkManager kisalkalmazás nem talál néhány szükséges glade fájlt."
-
- #: ../gnome/applet/applet.c:772
-@@ -180,11 +175,13 @@
- msgid "Waiting for Network Key for the wireless network '%s'..."
- msgstr "Várakozás \"%s\" vezeték nélküli hálózat hálózati kulcsára..."
-
--#: ../gnome/applet/applet.c:955 ../gnome/applet/applet.c:965
-+#: ../gnome/applet/applet.c:955
-+#: ../gnome/applet/applet.c:965
- msgid "Requesting a network address from the wired network..."
- msgstr "Hálózati cím kérése a vezetékes hálózattól..."
-
--#: ../gnome/applet/applet.c:957 ../gnome/applet/applet.c:967
-+#: ../gnome/applet/applet.c:957
-+#: ../gnome/applet/applet.c:967
- #, c-format
- msgid "Requesting a network address from the wireless network '%s'..."
- msgstr "Hálózati cím kérése \"%s\" vezeték nélküli hálózattól..."
-@@ -202,7 +199,8 @@
- msgid "NetworkManager is not running"
- msgstr "A NetworkManager nem fut"
-
--#: ../gnome/applet/applet.c:1107 ../gnome/applet/applet.c:1841
-+#: ../gnome/applet/applet.c:1107
-+#: ../gnome/applet/applet.c:1841
- msgid "Networking disabled"
- msgstr "Hálózat letiltva"
-
-@@ -302,12 +300,8 @@
- msgstr "_Névjegy"
-
- #: ../gnome/applet/applet.c:2633
--msgid ""
--"The NetworkManager applet could not find some required resources. It cannot "
--"continue.\n"
--msgstr ""
--"A NetworkManager kisalkalmazás nem talál néhány szükséges erőforrást, ezért "
--"a futása nem folytatódhat.\n"
-+msgid "The NetworkManager applet could not find some required resources. It cannot continue.\n"
-+msgstr "A NetworkManager kisalkalmazás nem talál néhány szükséges erőforrást, ezért a futása nem folytatódhat.\n"
-
- #: ../gnome/applet/wireless-security-option.c:157
- msgid "Open System"
-@@ -377,9 +371,7 @@
-
- #: ../gnome/applet/other-network-dialog.c:352
- #, c-format
--msgid ""
--"By default, the wireless network's name is set to your computer's name, %s, "
--"with no encryption enabled"
-+msgid "By default, the wireless network's name is set to your computer's name, %s, with no encryption enabled"
- msgstr "Alapértelmezésben a vezeték nélküli hálózat neve a számítógépe neve, (%s) kikapcsolt titkosítással"
-
- #: ../gnome/applet/other-network-dialog.c:358
-@@ -387,9 +379,7 @@
- msgstr "Új vezeték nélküli hálózat létrehozása"
-
- #: ../gnome/applet/other-network-dialog.c:359
--msgid ""
--"Enter the name and security settings of the wireless network you wish to "
--"create."
-+msgid "Enter the name and security settings of the wireless network you wish to create."
- msgstr "Adja meg a létrehozandó vezeték nélküli hálózat nevét és biztonsági beállításait."
-
- #: ../gnome/applet/other-network-dialog.c:363
-@@ -416,21 +406,13 @@
-
- #: ../gnome/applet/vpn-password-dialog.c:155
- #, c-format
--msgid ""
--"Could not find the authentication dialog for VPN connection type '%s'. "
--"Contact your system administrator."
--msgstr ""
--"Nem található a hitelesítési párbeszédablak a(z) \"%s\" típusú VPN "
--"kapcsolathoz. Lépjen kapcsolatba a rendszergazdával."
-+msgid "Could not find the authentication dialog for VPN connection type '%s'. Contact your system administrator."
-+msgstr "Nem található a hitelesítési párbeszédablak a(z) \"%s\" típusú VPN kapcsolathoz. Lépjen kapcsolatba a rendszergazdával."
-
- #: ../gnome/applet/vpn-password-dialog.c:192
- #, c-format
--msgid ""
--"There was a problem launching the authentication dialog for VPN connection "
--"type '%s'. Contact your system administrator."
--msgstr ""
--"Hiba lépett fel a(z) \"%s\" típusú VPN kapcsolathoz tartozó párbeszédablak "
--"elindítása közben. Lépjen kapcsolatba a rendszergazdával."
-+msgid "There was a problem launching the authentication dialog for VPN connection type '%s'. Contact your system administrator."
-+msgstr "Hiba lépett fel a(z) \"%s\" típusú VPN kapcsolathoz tartozó párbeszédablak elindítása közben. Lépjen kapcsolatba a rendszergazdával."
-
- #: ../gnome/applet/applet.glade.h:1
- msgid " "
-@@ -443,17 +425,13 @@
- #: ../gnome/applet/applet.glade.h:4
- #, no-c-format
- msgid ""
--"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
--"Network</span>\n"
-+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless Network</span>\n"
- "\n"
--"A passphrase or encryption key is required to access the wireless network '%"
--"s'."
-+"A passphrase or encryption key is required to access the wireless network '%s'."
- msgstr ""
--"<span weight=\"bold\" size=\"larger\">A vezeték nélküli hálózat jelszót "
--"igényel</span>\n"
-+"<span weight=\"bold\" size=\"larger\">A vezeték nélküli hálózat jelszót igényel</span>\n"
- "\n"
--"A(z) %s vezeték nélküli hálózathoz való hozzáféréshez jelszó vagy "
--"titkosítási kulcs szükséges."
-+"A(z) %s vezeték nélküli hálózathoz való hozzáféréshez jelszó vagy titkosítási kulcs szükséges."
-
- #: ../gnome/applet/applet.glade.h:8
- #, no-c-format
-@@ -462,28 +440,20 @@
- "\n"
- "%s It will not be completely functional."
- msgstr ""
--"<span weight=\"bold\" size=\"larger\">Csökkentett működőképességű hálózat</"
--"span>\n"
-+"<span weight=\"bold\" size=\"larger\">Csökkentett működőképességű hálózat</span>\n"
- "\n"
- "%s nem lesz teljesen működőképes."
-
- #: ../gnome/applet/applet.glade.h:12
- #, no-c-format
- msgid ""
--"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
--"span>\n"
-+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</span>\n"
- "\n"
--"You have chosen to log in to the wireless network '%s'. If you are sure "
--"that this wireless network is secure, click the checkbox below and "
--"NetworkManager will not require confirmation on subsequent log ins."
-+"You have chosen to log in to the wireless network '%s'. If you are sure that this wireless network is secure, click the checkbox below and NetworkManager will not require confirmation on subsequent log ins."
- msgstr ""
--"<span weight=\"bold\" size=\"larger\">Vezeték nélküli hálózatba "
--"bejelentkezés megerősítése</span>\n"
-+"<span weight=\"bold\" size=\"larger\">Vezeték nélküli hálózatba bejelentkezés megerősítése</span>\n"
- "\n"
--"A(z) \"%s\" vezeték nélküli hálózatba való bejelentkezést választotta. Ha "
--"biztos abban, hogy ez a vezeték nélküli hálózat biztonságos, kattintson az "
--"alábbi jelölőnégyzetre és a NetworkManager nem fog megerősítést kérni, ha a "
--"későbbiekben kapcsolódik hozzá."
-+"A(z) \"%s\" vezeték nélküli hálózatba való bejelentkezést választotta. Ha biztos abban, hogy ez a vezeték nélküli hálózat biztonságos, kattintson az alábbi jelölőnégyzetre és a NetworkManager nem fog megerősítést kérni, ha a későbbiekben kapcsolódik hozzá."
-
- #: ../gnome/applet/applet.glade.h:15
- msgid "Authentication:"
-@@ -607,19 +577,19 @@
-
- #: ../gnome/applet/applet.glade.h:47
- msgid "leap_subwindow"
--msgstr ""
-+msgstr "leap_subwindow"
-
- #: ../gnome/applet/applet.glade.h:48
- msgid "wep_key_subwindow"
--msgstr ""
-+msgstr "wep_key_subwindow"
-
- #: ../gnome/applet/applet.glade.h:49
- msgid "wep_passphrase_subwindow"
--msgstr ""
-+msgstr "wep_passphrase_subwindow"
-
- #: ../gnome/applet/applet.glade.h:50
- msgid "wpa_psk_subwindow"
--msgstr ""
-+msgstr "wpa_psk_subwindow"
-
- #: ../gnome/applet/wso-wpa-psk.c:168
- msgid "WPA2 Personal"
-@@ -634,12 +604,8 @@
- msgstr "Nem lehet VPN kapcsolatot hozzáadni"
-
- #: ../gnome/vpn-properties/nm-vpn-properties.c:360
--msgid ""
--"No suitable VPN software was found on your system. Contact your system "
--"administrator."
--msgstr ""
--"Nem található megfelelő VPN szoftver a rendszerén. Lépjen kapcsolatba a "
--"rendszergazdával."
-+msgid "No suitable VPN software was found on your system. Contact your system administrator."
-+msgstr "Nem található megfelelő VPN szoftver a rendszerén. Lépjen kapcsolatba a rendszergazdával."
-
- #: ../gnome/vpn-properties/nm-vpn-properties.c:412
- msgid "Cannot import VPN connection"
-@@ -647,12 +613,8 @@
-
- #: ../gnome/vpn-properties/nm-vpn-properties.c:414
- #, c-format
--msgid ""
--"Cannot find suitable software for VPN connection type '%s' to import the "
--"file '%s'. Contact your system administrator."
--msgstr ""
--"Nem található a(z) \"%s\" kapcsolattípusnak megfelelő VPN szoftver a(z) \"%s"
--"\" fájl importálásához. Lépjen kapcsolatba a rendszergazdával."
-+msgid "Cannot find suitable software for VPN connection type '%s' to import the file '%s'. Contact your system administrator."
-+msgstr "Nem található a(z) \"%s\" kapcsolattípusnak megfelelő VPN szoftver a(z) \"%s\" fájl importálásához. Lépjen kapcsolatba a rendszergazdával."
-
- #: ../gnome/vpn-properties/nm-vpn-properties.c:554
- #, c-format
-@@ -661,12 +623,8 @@
-
- #: ../gnome/vpn-properties/nm-vpn-properties.c:557
- #, c-format
--msgid ""
--"Could not find the UI files for VPN connection type '%s'. Contact your "
--"system administrator."
--msgstr ""
--"Nem találhatóak a(z) \"%s\" VPN kapcsolathoz tartozó felhasználóifelület-"
--"fájlok. Lépjen kapcsolatba a rendszergazdával."
-+msgid "Could not find the UI files for VPN connection type '%s'. Contact your system administrator."
-+msgstr "Nem találhatóak a(z) \"%s\" VPN kapcsolathoz tartozó felhasználóifelület-fájlok. Lépjen kapcsolatba a rendszergazdával."
-
- #: ../gnome/vpn-properties/nm-vpn-properties.c:717
- #, c-format
-@@ -675,14 +633,8 @@
-
- #: ../gnome/vpn-properties/nm-vpn-properties.c:720
- #, c-format
--msgid ""
--"All information about the VPN connection \"%s\" will be lost and you may "
--"need your system administrator to provide information to create a new "
--"connection."
--msgstr ""
--"Minden információ a(z) \"%s\" VPN kapcsolatról el fog veszni és egy új "
--"kapcsolat létrehozásához szükséges információkért lehetséges, hogy a "
--"rendszergazdára is szüksége lesz."
-+msgid "All information about the VPN connection \"%s\" will be lost and you may need your system administrator to provide information to create a new connection."
-+msgstr "Minden információ a(z) \"%s\" VPN kapcsolatról el fog veszni és egy új kapcsolat létrehozásához szükséges információkért lehetséges, hogy a rendszergazdára is szüksége lesz."
-
- #: ../gnome/vpn-properties/nm-vpn-properties.c:926
- msgid "Unable to load"
-@@ -751,17 +703,13 @@
-
- #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
- msgid ""
--"This assistant will guide you through the creation of a connection to a "
--"Virtual Private Network (VPN).\n"
-+"This assistant will guide you through the creation of a connection to a Virtual Private Network (VPN).\n"
- "\n"
--"It will require some information, such as IP addresses and secrets. Please "
--"see your system administrator to obtain this information."
-+"It will require some information, such as IP addresses and secrets. Please see your system administrator to obtain this information."
- msgstr ""
--"Ez az asszisztens végigvezeti Önt egy magánhálózathoz tartozó új Virtuális "
--"magánhálózati (VPN) kapcsolat létrehozásán.\n"
-+"Ez az asszisztens végigvezeti Önt egy magánhálózathoz tartozó új Virtuális magánhálózati (VPN) kapcsolat létrehozásán.\n"
- "\n"
--"Ehhez szükség lesz néhány információra, például IP-címekre és titkokra, ezen "
--"információkért keresse fel a rendszergazdát."
-+"Ehhez szükség lesz néhány információra, például IP-címekre és titkokra, ezen információkért keresse fel a rendszergazdát."
-
- #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
- msgid "VPN Connections"
-@@ -798,16 +746,12 @@
- #: ../src/nm-netlink-monitor.c:154
- #, c-format
- msgid "unable to create netlink socket for monitoring wired ethernet devices - %s"
--msgstr ""
--"nem lehet netlink foglalatot létrehozni a vezetékes ethernet kártyák "
--"megfigyelésére - %s"
-+msgstr "nem lehet netlink foglalatot létrehozni a vezetékes ethernet kártyák megfigyelésére - %s"
-
- #: ../src/nm-netlink-monitor.c:172
- #, c-format
- msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
--msgstr ""
--"nem lehet kapcsolódni a netlink foglalathoz a vezetékes ethernet kártyák "
--"megfigyelésére - %s"
-+msgstr "nem lehet kapcsolódni a netlink foglalathoz a vezetékes ethernet kártyák megfigyelésére - %s"
-
- #: ../src/nm-netlink-monitor.c:405
- msgid "operation took too long"
+NetworkManager-po-update.patch
diff -urN NetworkManager-0.6.2/src/backends/interface_parser.c NetworkManager/src/backends/interface_parser.c
--- NetworkManager-0.6.2/src/backends/interface_parser.c 2005-10-24 11:04:28.000000000 -0400
+++ NetworkManager/src/backends/interface_parser.c 2006-05-11 11:39:52.000000000 -0400
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-update
checked in at Mon May 29 18:16:29 CEST 2006.
--------
--- yast2-update/yast2-update.changes 2006-05-25 13:34:37.000000000 +0200
+++ yast2-update/yast2-update.changes 2006-05-29 13:24:57.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 29 12:50:46 CEST 2006 - jsrain(a)suse.cz
+
+- display all products to update in proposal (#170233)
+- 2.13.30
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.13.29.tar.bz2
New:
----
yast2-update-2.13.30.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.pn1HtN/_old 2006-05-29 18:16:05.000000000 +0200
+++ /var/tmp/diff_new_pack.pn1HtN/_new 2006-05-29 18:16:05.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.13.29)
+# spec file for package yast2-update (Version 2.13.30)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-update
-Version: 2.13.29
+Version: 2.13.30
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.13.29.tar.bz2
+Source0: yast2-update-2.13.30.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-mouse yast2-packager yast2-testsuite yast2-xml
Requires: yast2 yast2-installation yast2-storage yast2-packager
@@ -39,7 +39,7 @@
Arvin Schnell <arvin(a)suse.de>
%prep
-%setup -n yast2-update-2.13.29
+%setup -n yast2-update-2.13.30
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,9 @@
%doc %{prefix}/share/doc/packages/yast2-update
%changelog -n yast2-update
+* Mon May 29 2006 - jsrain(a)suse.cz
+- display all products to update in proposal (#170233)
+- 2.13.30
* Thu May 25 2006 - jsrain(a)suse.cz
- fixed keeping locked packages during upgrade (#177469)
- 2.13.29
++++++ yast2-update-2.13.29.tar.bz2 -> yast2-update-2.13.30.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.29/VERSION new/yast2-update-2.13.30/VERSION
--- old/yast2-update-2.13.29/VERSION 2006-05-25 13:20:20.000000000 +0200
+++ new/yast2-update-2.13.30/VERSION 2006-05-29 12:52:31.000000000 +0200
@@ -1 +1 @@
-2.13.29
+2.13.30
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.29/configure new/yast2-update-2.13.30/configure
--- old/yast2-update-2.13.29/configure 2006-05-25 13:33:24.000000000 +0200
+++ new/yast2-update-2.13.30/configure 2006-05-29 13:23:53.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-update 2.13.29.
+# Generated by GNU Autoconf 2.59 for yast2-update 2.13.30.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-update'
PACKAGE_TARNAME='yast2-update'
-PACKAGE_VERSION='2.13.29'
-PACKAGE_STRING='yast2-update 2.13.29'
+PACKAGE_VERSION='2.13.30'
+PACKAGE_STRING='yast2-update 2.13.30'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-update 2.13.29 to adapt to many kinds of systems.
+\`configure' configures yast2-update 2.13.30 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-update 2.13.29:";;
+ short | recursive ) echo "Configuration of yast2-update 2.13.30:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-update configure 2.13.29
+yast2-update configure 2.13.30
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-update $as_me 2.13.29, which was
+It was created by yast2-update $as_me 2.13.30, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-update'
- VERSION='2.13.29'
+ VERSION='2.13.30'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.29"
+VERSION="2.13.30"
RPMNAME="yast2-update"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
@@ -2695,7 +2695,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-update $as_me 2.13.29, which was
+This file was extended by yast2-update $as_me 2.13.30, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2750,7 +2750,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-update config.status 2.13.29
+yast2-update config.status 2.13.30
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.29/configure.in new/yast2-update-2.13.30/configure.in
--- old/yast2-update-2.13.29/configure.in 2006-05-25 13:33:06.000000000 +0200
+++ new/yast2-update-2.13.30/configure.in 2006-05-29 13:23:47.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-update, 2.13.29, http://bugs.opensuse.org/, yast2-update)
+AC_INIT(yast2-update, 2.13.30, http://bugs.opensuse.org/, yast2-update)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.29"
+VERSION="2.13.30"
RPMNAME="yast2-update"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.29/kernel-update-tool.pot new/yast2-update-2.13.30/kernel-update-tool.pot
--- old/yast2-update-2.13.29/kernel-update-tool.pot 2006-05-12 12:36:43.000000000 +0200
+++ new/yast2-update-2.13.30/kernel-update-tool.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 12:36+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/clients/kernel-update.ycp:188
-msgid "Warning"
-msgstr ""
-
-#: src/clients/kernel-update.ycp:189
-msgid "Abort the kernel upgrade?"
-msgstr ""
-
-#: src/clients/kernel-update.ycp:246
-msgid "Alternate Download Location"
-msgstr ""
-
-#: src/clients/kernel-update.ycp:509
-msgid "Kernel Update Status Log"
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.29/src/clients/update_proposal.ycp new/yast2-update-2.13.30/src/clients/update_proposal.ycp
--- old/yast2-update-2.13.29/src/clients/update_proposal.ycp 2006-05-25 12:46:33.000000000 +0200
+++ new/yast2-update-2.13.30/src/clients/update_proposal.ycp 2006-05-29 12:36:02.000000000 +0200
@@ -92,7 +92,15 @@
Packages::using_patterns = true;
}
+ list<string> restore = [];
+ list<map<string,any> > selected = Pkg::ResolvableProperties ("", `product, "");
+ foreach (map<string,any> s, selected, {
+ restore = add (restore, s["name"]:"");
+ });
Pkg::PkgApplReset ();
+ foreach (string res, restore, {
+ Pkg::ResolvableInstall (res, `product);
+ });
if (! Update::onlyUpdateInstalled)
{
if (Packages::using_patterns)
@@ -273,8 +281,9 @@
list<string> tmp = [];
+ tmp = Update::SelectedProducts ();
// summary text (%1 is package selection)
- tmp = add (tmp, sformat (_("Update to %1"), Update::updateVersion["nameandversion"]:"?"));
+// tmp = add (tmp, sformat (_("Update to %1"), Update::updateVersion["nameandversion"]:"?"));
if (Update::onlyUpdateInstalled)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.29/src/modules/Update.ycp new/yast2-update-2.13.30/src/modules/Update.ycp
--- old/yast2-update-2.13.29/src/modules/Update.ycp 2006-05-03 07:25:49.000000000 +0200
+++ new/yast2-update-2.13.30/src/modules/Update.ycp 2006-05-29 12:51:14.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Update module
*
- * $Id: Update.ycp 29212 2006-03-21 12:55:09Z mvidner $
+ * $Id: Update.ycp 31167 2006-05-29 10:51:09Z jsrain $
*/
{
module "Update";
@@ -100,6 +100,16 @@
* GLOBAL FUNCTIONS
*-----------------------------------------------------------------------*/
+global list<string> SelectedProducts () {
+ list<map<string,any> > selected
+ = Pkg::ResolvableProperties ("", `product, "");
+ selected = filter (map<string,any> p, selected, {
+ return p["status"]:nil == `selected;
+ });
+ return maplist (map<string,any> p, selected, {
+ return p["summary"]:"";
+ });
+}
/**
* Check if installed product and product to upgrade to are compatible
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.29/update.pot new/yast2-update-2.13.30/update.pot
--- old/yast2-update-2.13.29/update.pot 2006-05-12 12:36:43.000000000 +0200
+++ new/yast2-update-2.13.30/update.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,659 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 12:36+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Proposal for backup during update
-#: src/clients/backup_proposal.ycp:42
-#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:42
-msgid "Create Backup of Modified Files"
-msgstr ""
-
-#. Proposal for backup during update
-#: src/clients/backup_proposal.ycp:47
-#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:47
-msgid "Create Backup of /etc/sysconfig Directory"
-msgstr ""
-
-#. Proposal for backup during update
-#: src/clients/backup_proposal.ycp:52
-#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:52
-msgid "Do Not Create Backups"
-msgstr ""
-
-#. Proposal for backup during update
-#: src/clients/backup_proposal.ycp:57
-#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:57
-msgid "Remove Backups from Previous Updates"
-msgstr ""
-
-#. this is a heading
-#: src/clients/backup_proposal.ycp:88
-#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:88
-msgid "Backup"
-msgstr ""
-
-#. this is a menu entry
-#: src/clients/backup_proposal.ycp:90
-#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:90
-msgid "&Backup"
-msgstr ""
-
-#. error popup, user did not enter a valid directory specification
-#: src/clients/inst_backup.ycp:38
-#: yast2-update-2.13.25/src/clients/inst_backup.ycp:38
-msgid "Invalid backup path."
-msgstr ""
-
-#. there is not enough space for the backup during update
-#. inform the user about this (MB==megabytes)
-#: src/clients/inst_backup.ycp:78
-#: yast2-update-2.13.25/src/clients/inst_backup.ycp:78
-#, ycp-format
-msgid "Minimum disk space of %1 MB required."
-msgstr ""
-
-#. screen title for software selection
-#: src/clients/inst_backup.ycp:90
-#: yast2-update-2.13.25/src/clients/inst_backup.ycp:90
-msgid "Backup System Before Update"
-msgstr ""
-
-#. checkbox label if user wants to backup modified files
-#: src/clients/inst_backup.ycp:100
-#: yast2-update-2.13.25/src/clients/inst_backup.ycp:100
-msgid "Create &Backup of Modified Files"
-msgstr ""
-
-#. checkbox label if user wants to backup /etc/sysconfig
-#: src/clients/inst_backup.ycp:103
-#: yast2-update-2.13.25/src/clients/inst_backup.ycp:103
-msgid "Create a &Complete Backup of /etc/sysconfig"
-msgstr ""
-
-#. checkbox label if user wants remove old backup stuff
-#: src/clients/inst_backup.ycp:107
-#: yast2-update-2.13.25/src/clients/inst_backup.ycp:107
-msgid "Remove &Old Backups from the Backup Directory"
-msgstr ""
-
-#. help text for backup dialog during update 1/7
-#: src/clients/inst_backup.ycp:112
-#: yast2-update-2.13.25/src/clients/inst_backup.ycp:112
-msgid ""
-"<p>To avoid any loss of information during update,\n"
-"it is possible to create a <b>backup</b> prior to updating.</p>\n"
-msgstr ""
-
-#. help text for backup dialog during update 2/7
-#: src/clients/inst_backup.ycp:117
-#: yast2-update-2.13.25/src/clients/inst_backup.ycp:117
-msgid ""
-"<p><b>Warning:</b> This will not be a complete\n"
-"backup. Only modified files will be saved.</p>\n"
-msgstr ""
-
-#. help text for backup dialog during update 3/7
-#: src/clients/inst_backup.ycp:122
-#: yast2-update-2.13.25/src/clients/inst_backup.ycp:122
-msgid "<p>Select the desired options.</p>\n"
-msgstr ""
-
-#. help text for backup dialog during update 4/7
-#: src/clients/inst_backup.ycp:126
-#: yast2-update-2.13.25/src/clients/inst_backup.ycp:126
-msgid ""
-"<p><b>Create a Backup of Modified Files:</b>\n"
-"Stores those modified files that are replaced during update.</p>\n"
-msgstr ""
-
-#. help text for backup dialog during update 5/7
-#: src/clients/inst_backup.ycp:131
-#: yast2-update-2.13.25/src/clients/inst_backup.ycp:131
-msgid ""
-"<p><b>Create a Complete Backup of\n"
-"/etc/sysconfig:</b> This covers all configuration files that are part of the\n"
-"sysconfig mechanism, even those that are not replaced.</p>\n"
-msgstr ""
-
-#. help text for backup dialog during update 6/7
-#: src/clients/inst_backup.ycp:137
-#: yast2-update-2.13.25/src/clients/inst_backup.ycp:137
-msgid ""
-"<p><b>Remove Old Backups from the Backup\n"
-"Directory:</b> If your current system already is the result of an earlier\n"
-"update, there may be old configuration file backups. Select this option to\n"
-"remove them.</p>\n"
-msgstr ""
-
-#. help text for backup dialog during update 7/7
-#: src/clients/inst_backup.ycp:144
-#: yast2-update-2.13.25/src/clients/inst_backup.ycp:144
-#, ycp-format
-msgid "<p>All backups are placed in %1.</p>"
-msgstr ""
-
-#. screen title for update options
-#. this is a heading
-#. screen title for update options
-#. this is a heading
-#: src/clients/inst_update.ycp:27 src/clients/update_proposal.ycp:357
-#: yast2-update-2.13.25/src/clients/inst_update.ycp:27
-#: yast2-update-2.13.25/src/clients/update_proposal.ycp:346
-msgid "Update Options"
-msgstr ""
-
-#: src/clients/inst_update.ycp:39
-#: yast2-update-2.13.25/src/clients/inst_update.ycp:39
-msgid "Select Patterns"
-msgstr ""
-
-#. Display warning message
-#: src/clients/inst_update.ycp:66
-#: yast2-update-2.13.25/src/clients/inst_update.ycp:66
-msgid ""
-"You have already chosen software from \"Detailed selection\".\n"
-"You will lose that selection if you change the basic selection."
-msgstr ""
-
-#. Unkown for unknown system
-#. label for an unknown installed system
-#. Unkown for unknown system
-#. label for an unknown installed system
-#: src/clients/inst_update.ycp:74 src/include/rootpart.ycp:30
-#: src/include/rootpart.ycp:33 src/modules/RootPart.ycp:94
-#: src/modules/RootPart.ycp:1014
-#: yast2-update-2.13.25/src/clients/inst_update.ycp:74
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:94
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:1014
-msgid "Unknown"
-msgstr ""
-
-#. label showing from what version to what version we are updating
-#: src/clients/inst_update.ycp:79
-#: yast2-update-2.13.25/src/clients/inst_update.ycp:79
-#, ycp-format
-msgid "Update from %1 to %2"
-msgstr ""
-
-#. frame title for update selection
-#: src/clients/inst_update.ycp:82
-#: yast2-update-2.13.25/src/clients/inst_update.ycp:82
-msgid "Update Mode"
-msgstr ""
-
-#. radio button label for update including new packages
-#: src/clients/inst_update.ycp:89
-#: yast2-update-2.13.25/src/clients/inst_update.ycp:89
-msgid ""
-"&Update with Installation of New Software and Features\n"
-"Based on the Selection:\n"
-msgstr ""
-
-#. radio button label for update of already installed packages only
-#: src/clients/inst_update.ycp:100
-#: yast2-update-2.13.25/src/clients/inst_update.ycp:100
-msgid "Only U&pdate Installed Packages"
-msgstr ""
-
-#. check box label
-#. translator: add a & shortcut
-#: src/clients/inst_update.ycp:110
-#: yast2-update-2.13.25/src/clients/inst_update.ycp:110
-msgid "&Delete Unmaintained Packages"
-msgstr ""
-
-#. help text for dialog "update options" 1/4
-#: src/clients/inst_update.ycp:118
-#: yast2-update-2.13.25/src/clients/inst_update.ycp:118
-msgid ""
-"<p>The update option differs between two modes. In\n"
-"either case, it is recommended to make a backup of your personal data.</p>\n"
-msgstr ""
-
-#. help text for dialog "update options" 2/4
-#: src/clients/inst_update.ycp:123
-#: yast2-update-2.13.25/src/clients/inst_update.ycp:123
-msgid ""
-"<p><b>With New Software:</b> This default setting\n"
-"updates the existing software and installs all new features and benefits of\n"
-"the new &product; version. The selection is based on the former predefined\n"
-"software selection.</p>\n"
-msgstr ""
-
-#. help text for dialog "update options" 3/4
-#: src/clients/inst_update.ycp:130
-#: yast2-update-2.13.25/src/clients/inst_update.ycp:130
-msgid ""
-"<p><b>Only Installed Packages:</b> This selection\n"
-"only updates the packages already installed on your system. <i>Note:</i>\n"
-"New software in the predefined software selection, such as new YaST modules, is\n"
-"not available after the update. You might miss advertised features.</p>\n"
-msgstr ""
-
-#. help text for dialog "update options" 4/4
-#: src/clients/inst_update.ycp:137
-#: yast2-update-2.13.25/src/clients/inst_update.ycp:137
-msgid ""
-"<p>After the update, some software might not\n"
-"function anymore. Activate <b>Delete Unmaintained Packages</b> to delete those\n"
-"packages during the update.</p>\n"
-msgstr ""
-
-#. yes/no question
-#: src/clients/inst_update.ycp:216
-#: yast2-update-2.13.25/src/clients/inst_update.ycp:216
-msgid ""
-"Do you really want\n"
-"to reset your detailed selection?"
-msgstr ""
-
-#. proposal for packages during update, %1 is count of packages
-#: src/clients/packages_proposal.ycp:75
-#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:75
-#, ycp-format
-msgid "Packages to Update: %1"
-msgstr ""
-
-#. proposal for packages during update, %1 is count of packages
-#: src/clients/packages_proposal.ycp:78
-#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:78
-#, ycp-format
-msgid "New Packages to Install: %1"
-msgstr ""
-
-#. proposal for packages during update, %1 is count of packages
-#: src/clients/packages_proposal.ycp:81
-#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:81
-#, ycp-format
-msgid "Packages to Remove: %1"
-msgstr ""
-
-#. part of summary, %1 is size of packages (in MB or GB)
-#: src/clients/packages_proposal.ycp:84
-#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:84
-#, ycp-format
-msgid "Total Size of Packages to Update: %1"
-msgstr ""
-
-#. warning text
-#: src/clients/packages_proposal.ycp:92
-#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:92
-msgid "Cannot solve all conflicts. Manual intervention is required."
-msgstr ""
-
-#. this is a heading
-#: src/clients/packages_proposal.ycp:139
-#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:139
-msgid "Packages"
-msgstr ""
-
-#. this is a menu entry
-#: src/clients/packages_proposal.ycp:141
-#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:141
-msgid "&Packages"
-msgstr ""
-
-#. Proposal for system to update
-#: src/clients/rootpart_proposal.ycp:50
-#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:50
-msgid "No root partition found"
-msgstr ""
-
-#. Proposal for system to update
-#: src/clients/rootpart_proposal.ycp:85
-#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:85
-#, ycp-format
-msgid "%1 on root partition %2"
-msgstr ""
-
-#. inform user in the proposal about the failed mount
-#. error report
-#. inform user in the proposal about the failed mount
-#: src/clients/rootpart_proposal.ycp:94 src/include/rootpart.ycp:226
-#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:94
-msgid "Failed to mount target system"
-msgstr ""
-
-#. this is a heading
-#: src/clients/rootpart_proposal.ycp:138
-#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:138
-msgid "Selected for Update"
-msgstr ""
-
-#. this is a menu entry
-#: src/clients/rootpart_proposal.ycp:140
-#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:140
-msgid "&Selected for Update"
-msgstr ""
-
-#. intermediate popup while initializing internal packagemanagement
-#: src/clients/update_proposal.ycp:67
-#: yast2-update-2.13.25/src/clients/update_proposal.ycp:65
-msgid "Reading package information. One moment please..."
-msgstr ""
-
-#. continue-cancel popup
-#: src/clients/update_proposal.ycp:172
-#: yast2-update-2.13.25/src/clients/update_proposal.ycp:161
-msgid ""
-"The installed product is not compatible with the product\n"
-"on the installation media. If you try to update using the\n"
-"current installation media, the system may not start or\n"
-"some applications may not run properly."
-msgstr ""
-
-#. error message in proposal
-#: src/clients/update_proposal.ycp:249
-#: yast2-update-2.13.25/src/clients/update_proposal.ycp:238
-msgid "The installed product is not compatible with the product on the installatin media."
-msgstr ""
-
-#. Can't find any software data, probably a installation media error
-#. error message
-#: src/clients/update_proposal.ycp:263
-#: yast2-update-2.13.25/src/clients/update_proposal.ycp:252
-msgid "Cannot read package data from installation media. Media error?"
-msgstr ""
-
-#. proposal error
-#: src/clients/update_proposal.ycp:274
-#: yast2-update-2.13.25/src/clients/update_proposal.ycp:263
-msgid "Updating to another version is not supported from the running system."
-msgstr ""
-
-#. summary text (%1 is package selection)
-#: src/clients/update_proposal.ycp:283
-#: yast2-update-2.13.25/src/clients/update_proposal.ycp:272
-#, ycp-format
-msgid "Update to %1"
-msgstr ""
-
-#. Proposal for backup during update
-#: src/clients/update_proposal.ycp:288
-#: yast2-update-2.13.25/src/clients/update_proposal.ycp:277
-msgid "Only Update Installed Packages"
-msgstr ""
-
-#. proposal string
-#: src/clients/update_proposal.ycp:299
-#: yast2-update-2.13.25/src/clients/update_proposal.ycp:288
-msgid "Update Based on Patterns"
-msgstr ""
-
-#. Proposal for selection during update
-#: src/clients/update_proposal.ycp:310
-#: yast2-update-2.13.25/src/clients/update_proposal.ycp:299
-#, ycp-format
-msgid "Update Based on Selection \"%1\""
-msgstr ""
-
-#. Proposal for backup during update
-#: src/clients/update_proposal.ycp:321
-#: yast2-update-2.13.25/src/clients/update_proposal.ycp:310
-msgid "Delete Old Packages"
-msgstr ""
-
-#. this is a menu entry
-#: src/clients/update_proposal.ycp:359
-#: yast2-update-2.13.25/src/clients/update_proposal.ycp:348
-msgid "&Update Options"
-msgstr ""
-
-#: src/config/update.glade:15 src/config/update.glade:38
-msgid "Update Settings"
-msgstr ""
-
-#: src/config/update.glade:30
-msgid "Update"
-msgstr ""
-
-#: src/config/update.glade:44 src/config/update.glade:48
-msgid "Perform Update"
-msgstr ""
-
-#: src/config/update.glade:59
-msgid "Clean Up"
-msgstr ""
-
-#: src/config/update.glade:63
-msgid "Update System Configuration"
-msgstr ""
-
-#: src/config/update.glade:71
-msgid "Update Configuration"
-msgstr ""
-
-#. label for selection of root partition (for boot)
-#: src/include/rootpart.ycp:58
-msgid "Partition or System to Boot:"
-msgstr ""
-
-#. help text for root partition dialog (for boot)
-#: src/include/rootpart.ycp:61
-msgid ""
-"<p>\n"
-"Select the partition or system to boot.\n"
-"</p>\n"
-msgstr ""
-
-#. label for selection of root partition (for update)
-#: src/include/rootpart.ycp:69
-msgid "Partition or System to Update:"
-msgstr ""
-
-#. help text for root partition dialog (for update)
-#: src/include/rootpart.ycp:72
-msgid ""
-"<p>\n"
-"Select the partition or system to update.\n"
-"</p>\n"
-msgstr ""
-
-#. headline for dialog "Select for update"
-#: src/include/rootpart.ycp:80
-msgid "Select for Update"
-msgstr ""
-
-#. help text for root partition dialog (general part)
-#: src/include/rootpart.ycp:85
-msgid ""
-"<p>\n"
-"<b>Show All Partitions</b> expands the list to a\n"
-"general overview of your system's partitions.\n"
-"</p>\n"
-msgstr ""
-
-#. table header
-#: src/include/rootpart.ycp:100
-msgid "System"
-msgstr ""
-
-#. table header
-#: src/include/rootpart.ycp:102
-msgid "Partition"
-msgstr ""
-
-#. table header
-#: src/include/rootpart.ycp:104
-msgid "Architecture"
-msgstr ""
-
-#. table header
-#: src/include/rootpart.ycp:106
-msgid "Label"
-msgstr ""
-
-#. check box
-#: src/include/rootpart.ycp:110
-msgid "&Show All Partitions"
-msgstr ""
-
-#. pushbutton to (rightaway) boot the system selected above
-#: src/include/rootpart.ycp:135
-msgid "&Boot"
-msgstr ""
-
-#. continue-cancel popup
-#: src/include/rootpart.ycp:200
-msgid ""
-"No installed system that can be upgraded with this product was found\n"
-"on the selected partition."
-msgstr ""
-
-#. continue-cancel popup
-#: src/include/rootpart.ycp:207
-msgid ""
-"The architecture of the system installed in the selected partition\n"
-"is different than the one of this product."
-msgstr ""
-
-#. *
-#. * Link to SDB article concerning renaming of devices.
-#.
-#: src/modules/RootPart.ycp:83
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:83
-#, ycp-format
-msgid ""
-"See the SBD article at %1 for details\n"
-"about how to solve this problem."
-msgstr ""
-
-#. error report, %1 is device (eg. /dev/hda1)
-#: src/modules/RootPart.ycp:176
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:176
-#, ycp-format
-msgid ""
-"Cannot unmount partition %1.\n"
-"\n"
-"It is currently in use. If the partition stays mounted,\n"
-"the data may be lost. Unmount the partition manually\n"
-"or restart your computer.\n"
-msgstr ""
-
-#. label, %1 is partition
-#: src/modules/RootPart.ycp:240
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:240
-#, ycp-format
-msgid "Checking partition %1"
-msgstr ""
-
-#. yes-no popup
-#: src/modules/RootPart.ycp:517
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:517
-msgid "Incorrect password. Try again?"
-msgstr ""
-
-#. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command
-#: src/modules/RootPart.ycp:635
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:635
-#, ycp-format
-msgid ""
-"The partition %1 could not be mounted.\n"
-"\n"
-"%2\n"
-"\n"
-"If you are sure that the partition is not necessary for the\n"
-"update (it is not any system partition), click Continue.\n"
-"To check or fix the mount options, click Specify Mount Options.\n"
-"To abort update, click Cancel."
-msgstr ""
-
-#. push button
-#: src/modules/RootPart.ycp:649
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:649
-msgid "&Specify Mount Options"
-msgstr ""
-
-#. popup heading
-#: src/modules/RootPart.ycp:668
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:668
-msgid "Mount Options"
-msgstr ""
-
-#. text entry label
-#: src/modules/RootPart.ycp:671
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:671
-msgid "&Mount Point"
-msgstr ""
-
-#. tex entry label
-#: src/modules/RootPart.ycp:674
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:674
-msgid "&Device"
-msgstr ""
-
-#. text entry label
-#: src/modules/RootPart.ycp:677
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:677
-msgid ""
-"&File System\n"
-"(empty for autodetection)"
-msgstr ""
-
-#. error message
-#: src/modules/RootPart.ycp:747
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:747
-#, ycp-format
-msgid "The /var partition %1 could not be mounted.\n"
-msgstr ""
-
-#. error message
-#: src/modules/RootPart.ycp:792
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:792
-msgid "Unable to mount /var partition with this disk configuration.\n"
-msgstr ""
-
-#. popup message, %1 will be replace with the name of the logfile
-#: src/modules/RootPart.ycp:817
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:817
-#, ycp-format
-msgid ""
-"Partitions could not be mounted.\n"
-"\n"
-"Check the log file %1."
-msgstr ""
-
-#. error message
-#: src/modules/RootPart.ycp:855
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:855
-msgid "No fstab found."
-msgstr ""
-
-#. message part 1
-#: src/modules/RootPart.ycp:881
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:881
-msgid "The root partition in /etc/fstab has an invalid root device.\n"
-msgstr ""
-
-#. message part 2
-#: src/modules/RootPart.ycp:883
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:883
-#, ycp-format
-msgid "It is currently mounted as %1 but listed as %2.\n"
-msgstr ""
-
-#. intermediate popup while mounting partitions
-#: src/modules/RootPart.ycp:1112
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:1112
-msgid "Mounting partitions. One moment please..."
-msgstr ""
-
-#. label
-#: src/modules/RootPart.ycp:1127
-#: yast2-update-2.13.25/src/modules/RootPart.ycp:1127
-msgid "Evaluating root partition. One moment please..."
-msgstr ""
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-network
checked in at Mon May 29 18:15:57 CEST 2006.
--------
--- yast2-network/yast2-network.changes 2006-05-22 13:43:48.000000000 +0200
+++ yast2-network/yast2-network.changes 2006-05-29 17:29:19.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 29 17:27:48 CEST 2006 - mvidner(a)suse.cz
+
+- Disable editing interfaces if we see a Xen bridge (#178848).
+- 2.13.52
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.13.51.tar.bz2
New:
----
yast2-network-2.13.52.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.U65MYR/_old 2006-05-29 18:15:23.000000000 +0200
+++ /var/tmp/diff_new_pack.U65MYR/_new 2006-05-29 18:15:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.13.51)
+# spec file for package yast2-network (Version 2.13.52)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-network
-Version: 2.13.51
+Version: 2.13.52
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.13.51.tar.bz2
+Source0: yast2-network-2.13.52.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -49,7 +49,7 @@
Michal Svec <msvec(a)suse.cz>
%prep
-%setup -n yast2-network-2.13.51
+%setup -n yast2-network-2.13.52
%build
%{prefix}/bin/y2tool y2autoconf
@@ -103,6 +103,9 @@
/usr/share/YaST2/schema/autoyast/rnc/networking.rnc
%changelog -n yast2-network
+* Mon May 29 2006 - mvidner(a)suse.cz
+- Disable editing interfaces if we see a Xen bridge (#178848).
+- 2.13.52
* Mon May 22 2006 - mvidner(a)suse.cz
- Set STARTMODE=nfsroot for proposed interface if on iSCSI root (#176804).
- 2.13.51
++++++ yast2-network-2.13.51.tar.bz2 -> yast2-network-2.13.52.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.51/VERSION new/yast2-network-2.13.52/VERSION
--- old/yast2-network-2.13.51/VERSION 2006-05-22 13:42:49.000000000 +0200
+++ new/yast2-network-2.13.52/VERSION 2006-05-29 17:27:08.000000000 +0200
@@ -1 +1 @@
-2.13.51
+2.13.52
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.51/configure new/yast2-network-2.13.52/configure
--- old/yast2-network-2.13.51/configure 2006-05-22 13:45:39.000000000 +0200
+++ new/yast2-network-2.13.52/configure 2006-05-29 17:30:26.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-network 2.13.51.
+# Generated by GNU Autoconf 2.59 for yast2-network 2.13.52.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.13.51'
-PACKAGE_STRING='yast2-network 2.13.51'
+PACKAGE_VERSION='2.13.52'
+PACKAGE_STRING='yast2-network 2.13.52'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-network 2.13.51 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.13.52 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.13.51:";;
+ short | recursive ) echo "Configuration of yast2-network 2.13.52:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.13.51
+yast2-network configure 2.13.52
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-network $as_me 2.13.51, which was
+It was created by yast2-network $as_me 2.13.52, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.13.51'
+ VERSION='2.13.52'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.51"
+VERSION="2.13.52"
RPMNAME="yast2-network"
MAINTAINER="Martin Vidner <mvidner(a)suse.cz>"
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-network $as_me 2.13.51, which was
+This file was extended by yast2-network $as_me 2.13.52, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.13.51
+yast2-network config.status 2.13.52
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.51/configure.in new/yast2-network-2.13.52/configure.in
--- old/yast2-network-2.13.51/configure.in 2006-05-22 13:45:29.000000000 +0200
+++ new/yast2-network-2.13.52/configure.in 2006-05-29 17:30:15.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.13.51, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.13.52, http://bugs.opensuse.org/, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.51"
+VERSION="2.13.52"
RPMNAME="yast2-network"
MAINTAINER="Martin Vidner <mvidner(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.51/src/lan/complex.ycp new/yast2-network-2.13.52/src/lan/complex.ycp
--- old/yast2-network-2.13.51/src/lan/complex.ycp 2006-02-07 20:28:06.000000000 +0100
+++ new/yast2-network-2.13.52/src/lan/complex.ycp 2006-05-29 17:29:31.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec <msvec(a)suse.cz>
*
- * $Id: complex.ycp 27719 2006-02-07 19:28:05Z mvidner $
+ * $Id: complex.ycp 31174 2006-05-29 15:29:23Z mvidner $
*/
{
@@ -75,6 +75,23 @@
Wizard::RestoreHelp(help);
Lan::AbortFunction = ``{return PollAbort();};
boolean ret = Lan::Read (`cache);
+
+ boolean xenbr = Lan::HaveXenBridge ();
+ if (xenbr)
+ {
+ if (! Popup::ContinueCancel (
+ sformat (
+ // continue-cancel popup, #178848
+ // %1 is a (long) path to a README file
+_("A Xen network bridge was detected.
+Due to the renaming of network interfaces by the bridge script,
+network interfaces should not be configured or restarted.
+See %1 for details."), "/usr/share/doc/packages/xen/README.SuSE")))
+ {
+ ret = false;
+ }
+ }
+
return ret ? `next : `abort;
}
@@ -266,6 +283,7 @@
, [] );
Wizard::EnableBackButton (); // ManagedDialog
+ boolean xenbr = Lan::HaveXenBridge ();
boolean repaint = true;
map ret = nil;
while(true) {
@@ -275,6 +293,14 @@
overview = overview + Lan::Unconfigured ();
y2debug("overview=%1",overview);
WizardHW::SetContents (overview);
+ if (xenbr)
+ {
+ // #178848
+ foreach (symbol b, [`add, `edit, `delete], {
+ UI::ChangeWidget (`id (b), `Enabled, false);
+ });
+ }
+
repaint = false;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.51/src/modules/Lan.ycp new/yast2-network-2.13.52/src/modules/Lan.ycp
--- old/yast2-network-2.13.51/src/modules/Lan.ycp 2006-05-22 13:44:06.000000000 +0200
+++ new/yast2-network-2.13.52/src/modules/Lan.ycp 2006-05-29 17:29:31.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec <msvec(a)suse.cz>
*
- * $Id: Lan.ycp 31089 2006-05-22 11:43:52Z mvidner $
+ * $Id: Lan.ycp 31174 2006-05-29 15:29:23Z mvidner $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -1873,5 +1873,16 @@
modified = false;
}
+/**
+ * Xen bridging confuses us (#178848)
+ * @return whether xenbr* exists
+ */
+global define boolean HaveXenBridge () {
+ string cmd = "brctl show | grep '^xenbr'";
+ boolean have_br = SCR::Execute (.target.bash, cmd) == 0;
+ y2milestone ("Have Xen bridge: %1", have_br);
+ return have_br;
+}
+
/* EOF */
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package xorg-x11
checked in at Mon May 29 18:15:12 CEST 2006.
--------
--- xorg-x11/xorg-x11.changes 2006-05-25 20:56:49.000000000 +0200
+++ xorg-x11/xorg-x11.changes 2006-05-29 14:05:19.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 29 14:04:09 CEST 2006 - sndirsch(a)suse.de
+
+- p_xlib_skip_select_substructure_redirect.diff:
+ * fool java swing apps that no WM is running (Bug #151836)
+
+-------------------------------------------------------------------
New:
----
p_xlib_skip_select_substructure_redirect.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.HzNxOU/_old 2006-05-29 18:14:36.000000000 +0200
+++ /var/tmp/diff_new_pack.HzNxOU/_new 2006-05-29 18:14:36.000000000 +0200
@@ -40,7 +40,7 @@
%endif
Autoreqprov: on
Version: 6.9.0
-Release: 53
+Release: 54
Summary: The basic X Window System package
Source: xorg-6.9.0.tar.bz2
Source1: xdm.tar.gz
@@ -124,6 +124,7 @@
Patch365: p_xorg-fbcompose-radek2.diff
Patch366: pc_xf86-pci.diff
Patch367: p_xlib_skip_ext_env.diff
+Patch368: p_xlib_skip_select_substructure_redirect.diff
Patch400: p_bug96328.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -1563,6 +1564,7 @@
popd
pushd lib/X11
%patch367 -p0
+%patch368 -p0
popd
#
UTS_RELEASE=`uname -r`
@@ -2716,6 +2718,9 @@
%clean
%changelog -n xorg-x11
+* Mon May 29 2006 - sndirsch(a)suse.de
+- p_xlib_skip_select_substructure_redirect.diff:
+ * fool java swing apps that no WM is running (Bug #151836)
* Mon May 22 2006 - sndirsch(a)suse.de
- p_xlib_skip_ext_env.diff:
* added support for disabling extensions through environment
++++++ FILES ++++++
--- xorg-x11/FILES 2006-05-22 23:24:27.000000000 +0200
+++ xorg-x11/FILES 2006-05-29 14:05:34.000000000 +0200
@@ -177,3 +177,5 @@
p_xlib_skip_ext_env.diff [KEEP?]
- added support for disabling extensions through environment
variables (Bug #167317)
+p_xlib_skip_select_substructure_redirect.diff [KEEP?]
+- fool java swing apps that no WM is running (Bug #151836)
++++++ p_xlib_skip_select_substructure_redirect.diff ++++++
--- ChWAttrs.c 2006-05-12 20:46:51.000000000 +0200
+++ ChWAttrs.c 2006-05-26 19:40:57.000000000 +0200
@@ -46,6 +46,16 @@
{
register xChangeWindowAttributesReq *req;
+ if (valuemask == CWEventMask &&
+ attributes->event_mask == SubstructureRedirectMask)
+ {
+ const char *release;
+
+ release = getenv ("XLIB_SKIP_SELECT_SUBSTRUCTURE_REDIRECT");
+ if (release && atoi (release) == dpy->release)
+ return 1;
+ }
+
LockDisplay(dpy);
GetReq(ChangeWindowAttributes,req);
req->window = w;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package xmms-jack
checked in at Mon May 29 18:14:04 CEST 2006.
--------
--- xmms-jack/xmms-jack.changes 2006-01-25 21:43:16.000000000 +0100
+++ xmms-jack/xmms-jack.changes 2006-05-29 15:34:50.000000000 +0200
@@ -1,0 +2,5 @@
+Mon May 29 15:34:42 CEST 2006 - schwab(a)suse.de
+
+- Use RPM_OPT_FLAGS.
+
+-------------------------------------------------------------------
New:
----
xmms-jack-0.15.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmms-jack.spec ++++++
--- /var/tmp/diff_new_pack.cSDaQw/_old 2006-05-29 18:13:51.000000000 +0200
+++ /var/tmp/diff_new_pack.cSDaQw/_new 2006-05-29 18:13:51.000000000 +0200
@@ -1,11 +1,11 @@
#
# spec file for package xmms-jack (Version 0.15)
#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 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.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
@@ -16,8 +16,9 @@
Group: Productivity/Multimedia/Sound/Players
Autoreqprov: on
Version: 0.15
-Release: 1
+Release: 13
Source0: %{name}-%{version}.tar.bz2
+Patch: %{name}-%{version}.diff
URL: http://xmms-jack.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Jack Audio Output Plug-In for XMMS
@@ -34,6 +35,7 @@
%prep
%setup -n xmms-jack
+%patch
%build
%{?suse_update_config:%{suse_update_config}}
@@ -50,7 +52,6 @@
make
%install
-test "%{buildroot}" != "/" -a -d %{buildroot} && rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
rm %{buildroot}%{xmms_output_dir}/libjackout.la
@@ -63,6 +64,8 @@
%{xmms_output_dir}/libjackout.so
%changelog -n xmms-jack
+* Mon May 29 2006 - schwab(a)suse.de
+- Use RPM_OPT_FLAGS.
* Wed Jan 25 2006 - mls(a)suse.de
- converted neededforbuild to BuildRequires
* Tue Nov 08 2005 - sbrabec(a)suse.cz
++++++ xmms-jack-0.15.diff ++++++
--- configure.in
+++ configure.in
@@ -38,8 +38,6 @@
AC_SUBST(PTHREAD_LIBS)
dnl Checks for typedefs, structures, and compiler characteristics.
-CFLAGS="$SAVE_CFLAGS"
-LIBS="$SAVE_LIBS"
AC_MSG_CHECKING(for constructor attribute)
AC_TRY_RUN([
void ctor() __attribute__((constructor));
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package spamassassin
checked in at Mon May 29 18:13:45 CEST 2006.
--------
--- spamassassin/spamassassin.changes 2006-03-17 23:49:14.000000000 +0100
+++ spamassassin/spamassassin.changes 2006-05-29 16:11:55.000000000 +0200
@@ -1,0 +2,37 @@
+Mon May 29 16:10:33 CEST 2006 - dmueller(a)suse.de
+
+- update to version 3.1.2:
+ * bug 4802: implement DKIM plugin, including whitelist_from_dkim support
+ * bug 3838: work around Perl bug causing captured RE variables to become
+ tainted -- thanks to Mark Martinec for pointing out the bug with
+ Perl itself
+ * bug 4850: re-enable the Razor2 plugin by default due to a service
+ policy change
+ * bug 4826: Razor2 plugin needs to load Mail::SpamAssassin::Timeout module
+ * bug 4827: M::SA::first_existing_path() would return the last array
+ entry passed in if none of the paths were found. Now return undef
+ instead and handle the error when it happens.
+ * bug 4813: generally open RE causes sendmail received header get read
+ in as qmail in error
+ * bug 4839: Logger.pm converts control chars including tab into
+ underscores which confuses a bunch of users when checking debug output.
+ Convert tab into space instead, etc.
+ * bug 4884: if a null message is passed in, there are several variables
+ which end up undefined causing warnings. fake an empty message if no
+ input is given.
+ * bug 4793: when replacing tags in a message (_TAG_), leave the tags
+ that don't exist alone instead of just removing them
+ * bug 4861, 4760: handle dccifd and dccproc failover properly, backport
+ relays_internal and relays_external code, backport bug 4760 fix so
+ that it's not possible to be in internal_networks without being in
+ trusted_networks as well
+ * bug 4901: deal more properly with failures in bgsend(). also, use
+ the proper variable to show when errors occur.
+ * bug 4867: fetchmail changed header formats at some point making Received
+ parsing fail in certain conditions
+ * bug 4699: use M::SA::Timeout for spamd copy_config call and allow
+ for empty $@ values
+ * bug 3754: if there's a problem opening a file via sa-learn or
+ spamassassin, return an error exit value.
+
+-------------------------------------------------------------------
Old:
----
Mail-SpamAssassin-3.1.1.tar.bz2
New:
----
Mail-SpamAssassin-3.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spamassassin.spec ++++++
--- /var/tmp/diff_new_pack.O2LR23/_old 2006-05-29 18:12:58.000000000 +0200
+++ /var/tmp/diff_new_pack.O2LR23/_new 2006-05-29 18:12:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package spamassassin (Version 3.1.1)
+# spec file for package spamassassin (Version 3.1.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,8 +16,8 @@
Group: Productivity/Networking/Email/Utilities
Provides: spamassassin
URL: http://spamassassin.org/
-Version: 3.1.1
-Release: 2
+Version: 3.1.2
+Release: 1
Requires: perl-spamassassin = %version
Autoreqprov: on
PreReq: %insserv_prereq %fillup_prereq
@@ -154,6 +154,40 @@
rm -rf $RPM_BUILD_ROOT
%changelog -n spamassassin
+* Mon May 29 2006 - dmueller(a)suse.de
+- update to version 3.1.2:
+ * bug 4802: implement DKIM plugin, including whitelist_from_dkim support
+ * bug 3838: work around Perl bug causing captured RE variables to become
+ tainted -- thanks to Mark Martinec for pointing out the bug with
+ Perl itself
+ * bug 4850: re-enable the Razor2 plugin by default due to a service
+ policy change
+ * bug 4826: Razor2 plugin needs to load Mail::SpamAssassin::Timeout module
+ * bug 4827: M::SA::first_existing_path() would return the last array
+ entry passed in if none of the paths were found. Now return undef
+ instead and handle the error when it happens.
+ * bug 4813: generally open RE causes sendmail received header get read
+ in as qmail in error
+ * bug 4839: Logger.pm converts control chars including tab into
+ underscores which confuses a bunch of users when checking debug output.
+ Convert tab into space instead, etc.
+ * bug 4884: if a null message is passed in, there are several variables
+ which end up undefined causing warnings. fake an empty message if no
+ input is given.
+ * bug 4793: when replacing tags in a message (_TAG_), leave the tags
+ that don't exist alone instead of just removing them
+ * bug 4861, 4760: handle dccifd and dccproc failover properly, backport
+ relays_internal and relays_external code, backport bug 4760 fix so
+ that it's not possible to be in internal_networks without being in
+ trusted_networks as well
+ * bug 4901: deal more properly with failures in bgsend(). also, use
+ the proper variable to show when errors occur.
+ * bug 4867: fetchmail changed header formats at some point making Received
+ parsing fail in certain conditions
+ * bug 4699: use M::SA::Timeout for spamd copy_config call and allow
+ for empty $@ values
+ * bug 3754: if there's a problem opening a file via sa-learn or
+ spamassassin, return an error exit value.
* Fri Mar 17 2006 - dmueller(a)suse.de
- Adjust BuildRequires
* Tue Mar 14 2006 - dmueller(a)suse.de
++++++ Mail-SpamAssassin-3.1.1.tar.bz2 -> Mail-SpamAssassin-3.1.2.tar.bz2 ++++++
++++ 3088 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0