May 2008 - openSUSE Commits - openSUSE Mailing Lists

commit perl-Bootloader
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package perl-Bootloader checked in at Sat May 31 12:26:41 CEST 2008. -------- --- perl-Bootloader/perl-Bootloader.changes 2008-05-26 17:09:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2008-05-29 11:51:51.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 29 11:51:02 CEST 2008 - aosthof(a)suse.de + +- Corrected naming scheme for pae kernels (bnc#395085) +- Version bump to 0.4.62 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.4.61.tar.bz2 New: ---- perl-Bootloader-0.4.62.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.e32120/_old 2008-05-31 12:26:28.000000000 +0200 +++ /var/tmp/diff_new_pack.e32120/_new 2008-05-31 12:26:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.4.61) +# spec file for package perl-Bootloader (Version 0.4.62) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: perl-Bootloader -Version: 0.4.61 +Version: 0.4.62 Release: 1 Requires: perl >= %{perl_version} Requires: perl-gettext @@ -67,6 +67,9 @@ /usr/lib/bootloader %changelog +* Thu May 29 2008 aosthof(a)suse.de +- Corrected naming scheme for pae kernels (bnc#395085) +- Version bump to 0.4.62 * Mon May 26 2008 aosthof(a)suse.de - Create failsafe sections also for pae kernels (former bigsmp) (bnc#372168) ++++++ perl-Bootloader-0.4.61.tar.bz2 -> perl-Bootloader-0.4.62.tar.bz2 ++++++ ++++++ update-bootloader ++++++ --- perl-Bootloader/update-bootloader 2008-05-26 17:07:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/update-bootloader 2008-05-29 11:50:45.000000000 +0200 @@ -284,10 +284,11 @@ } } - # Naming scheme for default, smp and bigsmp kernels + # Naming scheme for default, smp, bigsmp and pae kernels if (($opt_name =~ /-default/) || ($opt_name =~ /-smp/) || - ($opt_name =~ /-bigsmp/)) { + ($opt_name =~ /-bigsmp/) || + ($opt_name =~ /-pae/)) { if ($loader eq "grub") { $opt_name =~ s/-[^-]*$//; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit padevchooser
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package padevchooser checked in at Sat May 31 12:26:19 CEST 2008. -------- --- padevchooser/padevchooser.changes 2008-04-28 17:54:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/padevchooser/padevchooser.changes 2008-05-29 17:30:53.478036000 +0200 @@ -1,0 +2,6 @@ +Thu May 29 17:36:48 CEST 2008 - rodrigo(a)suse.de + +- Don't autostart padevchooser anymore, we now default to the good + old volume applet, which uses the PA tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ padevchooser.spec ++++++ --- /var/tmp/diff_new_pack.b24555/_old 2008-05-31 12:25:34.000000000 +0200 +++ /var/tmp/diff_new_pack.b24555/_new 2008-05-31 12:25:34.000000000 +0200 @@ -13,7 +13,7 @@ Name: padevchooser Version: 0.9.4 -Release: 57 +Release: 72 Summary: PulseAudio Device Chooser Group: Productivity/Multimedia/Sound/Utilities License: GPL v2 or later @@ -62,10 +62,10 @@ make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/ -cp $RPM_BUILD_ROOT%{_datadir}/applications/padevchooser.desktop $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/padevchooser-autostart.desktop +#mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/ +#cp $RPM_BUILD_ROOT%{_datadir}/applications/padevchooser.desktop $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/padevchooser-autostart.desktop %suse_update_desktop_file -r padevchooser AudioVideo Audio Tuner -%suse_update_desktop_file -r $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/padevchooser-autostart.desktop AudioVideo Audio Tuner +#suse_update_desktop_file -r $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/padevchooser-autostart.desktop AudioVideo Audio Tuner %clean rm -rf $RPM_BUILD_ROOT @@ -77,9 +77,12 @@ %{_datadir}/applications/padevchooser.desktop %{_datadir}/pixmaps/padevchooser.png %{_datadir}/padevchooser -%{_datadir}/gnome/autostart/padevchooser-autostart.desktop +#%{_datadir}/gnome/autostart/padevchooser-autostart.desktop %changelog +* Thu May 29 2008 rodrigo(a)suse.de +- Don't autostart padevchooser anymore, we now default to the good + old volume applet, which uses the PA tools * Mon Apr 28 2008 rodrigo(a)suse.de - Autostart padevchooser only on GNOME (bnc#373193) * Mon Apr 28 2008 rodrigo(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openvpn
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package openvpn checked in at Sat May 31 12:25:21 CEST 2008. -------- --- openvpn/openvpn.changes 2008-05-26 07:55:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/openvpn/openvpn.changes 2008-05-29 15:24:36.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 29 15:16:03 CEST 2008 - mt(a)suse.de + +- Added $time $named to Should-Start in the init script to avoid + time related certificate errors and name resolving problems. +- Added iproute2 to BuildRequires to avoid openvpn rely on PATH. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvpn.spec ++++++ --- /var/tmp/diff_new_pack.i16333/_old 2008-05-31 12:24:58.000000000 +0200 +++ /var/tmp/diff_new_pack.i16333/_new 2008-05-31 12:24:58.000000000 +0200 @@ -20,7 +20,7 @@ PreReq: %insserv_prereq %fillup_prereq %endif Version: 2.0.9 -Release: 91 +Release: 93 Summary: Full-featured SSL VPN solution using a TUN/TAP Interface Source: http://openvpn.net/release/openvpn-%{version}.tar.gz Source1: http://openvpn.net/signatures/openvpn-%{version}.tar.gz.asc @@ -30,7 +30,7 @@ Patch2: %{name}-%{version}-plugin-build.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: lzo-devel openssl-devel -BuildRequires: pam-devel +BuildRequires: iproute2 pam-devel %define plugin_dir %{_libdir}/%{name}/plugin %define plugin_libdir %{plugin_dir}/lib @@ -215,6 +215,10 @@ %{plugin_libdir}/openvpn-auth-pam.so %changelog +* Thu May 29 2008 mt(a)suse.de +- Added $time $named to Should-Start in the init script to avoid + time related certificate errors and name resolving problems. +- Added iproute2 to BuildRequires to avoid openvpn rely on PATH. * Mon May 26 2008 mt(a)suse.de - Reverted init script changes adding startproc, since they break user auth query and multiple tunnels (bnc#394360, bnc#394353). ++++++ openvpn.init ++++++ --- openvpn/openvpn.init 2008-05-26 07:53:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/openvpn/openvpn.init 2008-05-29 15:20:09.000000000 +0200 @@ -12,10 +12,10 @@ # ### BEGIN INIT INFO # Provides: openvpn -# Required-Start: $local_fs $remote_fs $network -# Should-Start: $syslog +# Required-Start: $local_fs $remote_fs $network +# Should-Start: $syslog $time $named # Required-Stop: $local_fs $remote_fs $network -# Should-Stop: $syslog +# Should-Stop: $syslog $time $named # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: OpenVPN tunnel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nagios
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package nagios checked in at Sat May 31 12:24:22 CEST 2008. -------- --- nagios/nagios.changes 2008-04-24 16:16:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/nagios/nagios.changes 2008-05-29 11:16:02.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 29 11:15:34 CEST 2008 - olh(a)suse.de + +- fix missing return value in run_async_service_check (bnc#395203) + +------------------------------------------------------------------- New: ---- nagios.run_async_service_check.return.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.N10002/_old 2008-05-31 12:23:26.000000000 +0200 +++ /var/tmp/diff_new_pack.N10002/_new 2008-05-31 12:23:26.000000000 +0200 @@ -14,7 +14,7 @@ Name: nagios Summary: The Nagios Network Monitor Version: 3.0.1 -Release: 5 +Release: 16 Url: http://www.nagios.org/ License: GPL v2 or later Group: System/Monitoring @@ -67,6 +67,7 @@ Source3: %name.sysconfig Source4: suse.de-nagios Source10: %name-README.SuSE +Patch1: nagios.run_async_service_check.return.patch Patch10: nagios-p1.pl-location.patch %description @@ -143,6 +144,7 @@ %prep %setup -q -n %realname-%version +%patch1 -p1 %patch10 find -name ".cvsignore" | xargs rm find -name ".gitignore" | xargs rm @@ -455,6 +457,8 @@ %_includedir/%realname/* %changelog +* Thu May 29 2008 olh(a)suse.de +- fix missing return value in run_async_service_check (bnc#395203) * Thu Apr 24 2008 olh(a)suse.de - require mailx (bnc#383209) * Tue Apr 22 2008 olh(a)suse.de ++++++ nagios.run_async_service_check.return.patch ++++++ https://bugzilla.novell.com/show_bug.cgi?id=395203 --- base/checks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/base/checks.c +++ b/base/checks.c @@ -597,7 +597,7 @@ int run_async_service_check(service *svc /* free check result memory */ free_check_result(&check_result_info); - return; + return ERROR; } else{ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit linuxrc
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package linuxrc checked in at Sat May 31 12:22:47 CEST 2008. -------- --- linuxrc/linuxrc.changes 2008-05-27 15:56:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2008-05-29 15:13:01.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 29 14:34:23 CEST 2008 - snwint(a)suse.de + +- find proper place for media check (bnc #395157) + +------------------------------------------------------------------- Old: ---- linuxrc-3.1.31.tar.bz2 New: ---- linuxrc-3.1.32.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.hp7105/_old 2008-05-31 12:22:36.000000000 +0200 +++ /var/tmp/diff_new_pack.hp7105/_new 2008-05-31 12:22:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.1.31) +# spec file for package linuxrc (Version 3.1.32) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,9 +17,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.1.31 +Version: 3.1.32 Release: 1 -Source: linuxrc-3.1.31.tar.bz2 +Source: linuxrc-3.1.32.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,6 +54,8 @@ %doc linuxrc.html %changelog +* Thu May 29 2008 snwint(a)suse.de +- find proper place for media check (bnc #395157) * Tue May 27 2008 snwint(a)suse.de - try connected network cards first (bnc #394618) - use dhcpcd --noipv4ll to avoid local link addresses (bnc #394618) ++++++ linuxrc-3.1.31.tar.bz2 -> linuxrc-3.1.32.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.31/auto2.c new/linuxrc-3.1.32/auto2.c --- old/linuxrc-3.1.31/auto2.c 2008-05-27 15:15:57.000000000 +0200 +++ new/linuxrc-3.1.32/auto2.c 2008-05-29 12:50:10.000000000 +0200 @@ -32,6 +32,7 @@ #include "auto2.h" #include "settings.h" #include "url.h" +#include "checkmd5.h" static void auto2_user_netconfig(void); static int driver_is_active(hd_t *hd); @@ -58,15 +59,23 @@ util_splash_bar(40, SPLASH_40); + win_old = config.win; + if(config.update.ask && !config.update.shown) { - if(!(win_old = config.win)) util_disp_init(); + if(!config.win) util_disp_init(); if(config.update.name_list) { dia_show_lines2("Driver Updates added", config.update.name_list, 64); } while(!inst_update_cd()); - if(!win_old) util_disp_done(); } + if(config.mediacheck) { + if(!config.win) util_disp_init(); + md5_verify(); + } + + if(config.win && !win_old) util_disp_done(); + ok = auto2_find_repo(); util_splash_bar(50, SPLASH_50); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.31/Changelog new/linuxrc-3.1.32/Changelog --- old/linuxrc-3.1.31/Changelog 2008-05-27 15:17:46.000000000 +0200 +++ new/linuxrc-3.1.32/Changelog 2008-05-29 12:47:56.000000000 +0200 @@ -1,3 +1,6 @@ +29/5/2008: v3.1.32 + - find proper place for media check (bnc #395157) + 27/5/2008: v3.1.31 - try connected network cards first (bnc #394618) - use dhcpcd --noipv4ll to avoid local link addresses (bnc #394618) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.31/linuxrc.c new/linuxrc-3.1.32/linuxrc.c --- old/linuxrc-3.1.31/linuxrc.c 2008-05-19 17:53:08.000000000 +0200 +++ new/linuxrc-3.1.32/linuxrc.c 2008-05-29 12:44:23.000000000 +0200 @@ -1005,15 +1005,6 @@ if(config.braille.check) run_braille(); - if( config.mediacheck ) { - int win_old; - - fprintf(stderr, "In mediacheck\n"); - if(!(win_old = config.win)) util_disp_init(); - md5_verify(); - if(!win_old) util_disp_done(); - } - if(!config.manual && !auto2_init()) { fprintf(stderr, "Automatic setup not possible.\n"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.31/VERSION new/linuxrc-3.1.32/VERSION --- old/linuxrc-3.1.31/VERSION 2008-05-27 11:32:18.000000000 +0200 +++ new/linuxrc-3.1.32/VERSION 2008-05-29 12:47:16.000000000 +0200 @@ -1 +1 @@ -3.1.31 +3.1.32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_7_0-icedtea
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package java-1_7_0-icedtea checked in at Sat May 31 12:22:23 CEST 2008. -------- --- arch/i386/java-1_7_0-icedtea/java-1_7_0-icedtea.changes 2008-05-26 16:47:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/java-1_7_0-icedtea/java-1_7_0-icedtea.changes 2008-05-29 16:06:00.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 29 16:00:27 CEST 2008 - bk(a)suse.de + +- Raise ulimit for x86_64 to and add a second make attempt (handling + races in the unstable icedtea JVM) to increase build yield for rpms + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-icedtea.spec ++++++ --- /var/tmp/diff_new_pack.F32303/_old 2008-05-31 12:21:27.000000000 +0200 +++ /var/tmp/diff_new_pack.F32303/_new 2008-05-31 12:21:27.000000000 +0200 @@ -15,7 +15,7 @@ %define openjdkver b24 %define origin icedtea Version: %{icedteaver}_%{openjdkver} -Release: 8 +Release: 9 Summary: Java runtime environment preview based on OpenJDK 7 Group: Development/Libraries/Java License: GPL v2 only; - with the OpenJDK Assembly Exception and the GNU Classpath Exception @@ -82,7 +82,7 @@ ## Build-time and script-time only definitions: # # the Java VM of the icedtea bootstrap JDK needs a HUGE amount of virtual memory: -%define do_ulimit if [ %_arch = x86_64 ];then ulimit -v 4400000;else ulimit -v 3072000;fi +%define do_ulimit if [ %_arch = x86_64 ];then ulimit -v 5120000;else ulimit -v 3072000;fi # # Standard JPackage directories and symbolic links: # @@ -137,17 +137,11 @@ outright removal between now and the time that the Java SE 7 Platform Specification is finalized. -For developing Java applications, it is therefore recommended to use -Java Environment which providing a Java Specification such as an Java -Environment based on OpenJDK 6 or java-1_6_0-sun (Sun Java 6). OpenJDK -6 packages for openSUSE can be found at: - - -_ALL&p=1&q_ - +For developing Java applications, it is therefore recommended to use a +Java Environment providing a released Java Specification such as Java +SE 6 which is provided by OpenJDK 6 or java-1_6_0-sun (Sun Java 6). For information regarding Java on openSUSE, see: - http://en.opensuse.org/Java @@ -310,7 +304,8 @@ patch_openjdk -p0 # hack for binutils/linker issue sed -i -e "s@-ljpeg@/%{_libdir}/libjpeg.so@" openjdk/jdk/make/sun/jpeg/Makefile -make +# Bootstrap icedtea fails sometimes claiming having not enough memory, retry once: +make || make pushd java-access-bridge-%{accessver} export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image export PATH=$JAVA_HOME/bin:$PATH @@ -746,6 +741,9 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Thu May 29 2008 bk(a)suse.de +- Raise ulimit for x86_64 to and add a second make attempt (handling + races in the unstable icedtea JVM) to increase build yield for rpms * Mon May 26 2008 bk(a)suse.de - Fix typo in the %%{jvmjarlink} update (also needed to fix the build) - Fix %%pre script for updating from older packages with wrong jvmjardir ++++++ check-build.sh ++++++ --- arch/i386/java-1_7_0-icedtea/check-build.sh 2008-05-26 18:38:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/java-1_7_0-icedtea/check-build.sh 2008-05-29 15:23:04.000000000 +0200 @@ -16,11 +16,11 @@ case $BUILD_BASENAME in *x86_64) # - # 3MB is enough most times, but strangely sometimes needs more, - # it may depend on the number of CPUs for example: - # On janacek at least it seems to need >4GB sometimes: + # 3MB ulimit -v is enough on non-x86_64, but strangely x86_64 + # fails sometimes with various out-of-memory errors (example + # error is appended at the end of this script): # - VIRTUAL_SPACE_NEEDED=9120000 + VIRTUAL_SPACE_NEEDED=10240000 esac # The JVM needs LOTS of virtual memory when compiling the big stuff: @@ -41,3 +41,162 @@ exit 0 +======================================================================== + +Failed attempt in x86_64: + +Limit Virtual Memory to 9140628 (ulimit -v) +xenakis started 'build --clean arch/x86_64/java-1_7_0-icedtea/java-1_7_0-icedtea.spec' at Tue May 27 16:45:50 CEST 2008. + +Building for x86_64 +... ++ make +mkdir -p bootstrap +rm -f bootstrap/jdk1.6.0 +ln -sf /etc/alternatives/java_sdk_icedtea bootstrap/jdk1.6.0; \ + if ! bootstrap/jdk1.6.0/bin/java -version ; \ + then \ + echo "bootstrap/jdk1.6.0/bin/java" \ + "cannot be found or is corrupted." ; \ + exit 1; \ + fi +java version "1.7.0" +IcedTea Runtime Environment (build 1.7.0-b24) +IcedTea 64-Bit Server VM (build 1.7.0-b24, mixed mode) +mkdir -p stamps +touch stamps/bootstrap-directory-symlink.stamp +for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \ + do \ + mkdir -p hotspot-tools/$copy_dir ; \ + cp -pPRf openjdk/jdk/src/share/classes/$copy_dir/* \ + hotspot-tools/$copy_dir ; \ + done +for copy_dir in `cat tools-copy/tools-langtools-copy-files.txt` ; \ + do \ + mkdir -p hotspot-tools/$copy_dir ; \ + cp -pPRf openjdk/langtools/src/share/classes/$copy_dir/* \ + hotspot-tools/$copy_dir ; \ + done +for copy_dir in `cat tools-copy/tools-corba-copy-files.txt` ; \ + do \ + mkdir -p hotspot-tools/$copy_dir ; \ + cp -pPRf openjdk/corba/src/share/classes/$copy_dir/* \ + hotspot-tools/$copy_dir ; \ + done +for copy_dir in `cat tools-copy/tools-jaxws-copy-files.txt` ; \ + do \ + mkdir -p hotspot-tools/$copy_dir ; \ + cp -pPRf openjdk/jaxws/src/share/classes/$copy_dir/* \ + hotspot-tools/$copy_dir ; \ + done +mkdir -p stamps +touch stamps/hotspot-tools-copy-source-files.stamp +find hotspot-tools -name '*.java' | sort > hotspot-tools-source-files.txt +mkdir -p lib/hotspot-tools +if ! test -f stamps/icedtea-ecj.stamp ; \ + then \ + /etc/alternatives/java_sdk_icedtea/bin/javac -J-Xmx512m -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \ + -sourcepath 'rt:hotspot-tools:openjdk/jdk/src/share/classes:openjdk/jdk/src/solaris/classes:openjdk/langtools/src/share/classes:openjdk/jaxp/src/share/classes:openjdk/corba/src/share/classes:openjdk/jaxws/src/share/classes:generated' \ + @hotspot-tools-source-files.txt ; \ + else \ + /usr/src/packages/BUILD/icedtea-1.5/bootstrap/jdk1.6.0/bin/javac -J-Xmx512m -g -d lib/hotspot-tools \ + -bootclasspath '' -source 1.6 \ + -sourcepath 'rt:hotspot-tools:openjdk/jdk/src/share/classes:openjdk/jdk/src/solaris/classes:openjdk/langtools/src/share/classes:openjdk/jaxp/src/share/classes:openjdk/corba/src/share/classes:openjdk/jaxws/src/share/classes:generated' \ + @hotspot-tools-source-files.txt ; \ + fi +Exception in thread "main" java.lang.OutOfMemoryError: GC overhead limit exceeded + at java.util.zip.ZipFile.getEntry(ZipFile.java:168) + at java.util.jar.JarFile.getEntry(JarFile.java:223) + at java.util.jar.JarFile.getJarEntry(JarFile.java:206) + at sun.misc.URLClassPath$JarLoader.getResource(URLClassPath.java:774) + at sun.misc.URLClassPath.getResource(URLClassPath.java:188) + at java.net.URLClassLoader$1.run(URLClassLoader.java:212) + at java.security.AccessController.doPrivileged(Native Method) + at java.net.URLClassLoader.findClass(URLClassLoader.java:208) + at java.lang.ClassLoader.loadClass(ClassLoader.java:323) + at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:294) + at java.lang.ClassLoader.loadClass(ClassLoader.java:268) + at java.util.ResourceBundle$Control.newBundle(ResourceBundle.java:2401) + at java.util.ResourceBundle.loadBundle(ResourceBundle.java:1424) + at java.util.ResourceBundle.findBundle(ResourceBundle.java:1383) + at java.util.ResourceBundle.findBundle(ResourceBundle.java:1310) + at java.util.ResourceBundle.findBundle(ResourceBundle.java:1310) + at java.util.ResourceBundle.getBundleImpl(ResourceBundle.java:1252) + at java.util.ResourceBundle.getBundle(ResourceBundle.java:733) + at com.sun.tools.javac.util.Messages.add(Messages.java:80) + at com.sun.tools.javac.util.Messages.<init>(Messages.java:66) + at com.sun.tools.javac.main.Main.getLocalizedString(Main.java:480) + at com.sun.tools.javac.main.Main.resourceMessage(Main.java:454) + at com.sun.tools.javac.main.Main.compile(Main.java:397) + at com.sun.tools.javac.main.Main.compile(Main.java:312) + at com.sun.tools.javac.main.Main.compile(Main.java:303) + at com.sun.tools.javac.Main.compile(Main.java:82) + at com.sun.tools.javac.Main.main(Main.java:67) +make: *** [stamps/hotspot-tools-class-files.stamp] Error 1 +error: Bad exit status from /var/tmp/rpm-tmp.16932 (%build) + + +RPM build errors: + Bad exit status from /var/tmp/rpm-tmp.16932 (%build) + +======================================================================== + +Failed attempt in beta-x86_64 on xenakis: + +mkdir -p stamps +touch stamps/hotspot-tools-class-files.stamp +mkdir -p bootstrap/jdk1.7.0/jre/lib/ +if ! test -f stamps/icedtea-ecj.stamp ; \ + then \ + /etc/alternatives/java_sdk_icedtea/bin/jar cf bootstrap/jdk1.7.0/jre/lib/tools.jar -C lib/hotspot-tools com -C lib/hotspot-tools sun \ + -C lib/hotspot-tools org -C lib/hotspot-tools gnu -C lib/hotspot-tools java \ + -C lib/hotspot-tools javax ; \ + else \ + /usr/src/packages/BUILD/icedtea-1.5/bootstrap/jdk1.6.0/bin/jar cf bootstrap/jdk1.7.0/jre/lib/tools.jar -C lib/hotspot-tools com -C lib/hotspot-tools sun \ + -C lib/hotspot-tools org -C lib/hotspot-tools gnu -C lib/hotspot-tools java \ + -C lib/hotspot-tools javax ; \ + fi +# +# An unexpected error has been detected by Java Runtime Environment: +# +# java.lang.OutOfMemoryError: requested 32744 bytes for ChunkPool::allocate. Out of swap space? +# +# Internal Error (allocation.cpp:117), pid=13068, tid=1083214160 +# Error: ChunkPool::allocate +# +# Java VM: IcedTea 64-Bit Server VM (1.7.0-b24 mixed mode linux-amd64) +# An error report file with more information is saved as: +# /usr/src/packages/BUILD/icedtea-1.5/hs_err_pid13068.log +# +# If you would like to submit a bug report, please visit: +# http://icedtea.classpath.org/bugzilla +# The crash happened outside the Java Virtual Machine in native code. +# See problematic frame for where to report the bug. +# +/bin/sh: line 9: 13068 Aborted /etc/alternatives/java_sdk_icedtea/bin/jar cf bootstrap/jdk1.7.0/jre/lib/tools.jar -C lib/hotspot-tools com -C lib/hotspot-tools sun -C lib/hotspot-tools org -C lib/hotspot-tools gnu -C lib/hotspot-tools java -C lib/hotspot-tools javax + +===================================================================== + +On s390x, build sometimes fails with: + +build-classes-javah: + [pcompile] Generating 8 resource files to /usr/src/packages/BUILD/icedtea-1.5/openjdk/build/linux-s390x/langtools/build/gensrc + [javac] Compiling 8 source files to /usr/src/packages/BUILD/icedtea-1.5/openjdk/build/linux-s390x/langtools/build/classes + [javac] Compiling 8 source files to /usr/src/packages/BUILD/icedtea-1.5/openjdk/build/linux-s390x/langtools/build/classes + [javac] Note: Some input files use unchecked or unsafe operations. + [javac] Note: Recompile with -Xlint:unchecked for details. + [javac] # + [javac] # An unexpected error has been detected by Java Runtime Environment: + [javac] # + [javac] # Internal Error (os_linux_zero.cpp:144), pid=9586, tid=2199861680464 + [javac] # Error: caught unhandled signal 11 + [javac] # + [javac] # Java VM: IcedTea 64-Bit Core VM (1.7.0-b24 interpreted mode linux-s390) + [javac] # An error report file with more information is saved as: + [javac] # /usr/src/packages/BUILD/icedtea-1.5/openjdk/langtools/hs_err_pid9586.log + [javac] # + [javac] # If you would like to submit a bug report, please visit: + [javac] # http://icedtea.classpath.org/bugzilla + [javac] # + + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package kdepim4 checked in at Sat May 31 12:22:08 CEST 2008. -------- --- KDE/kdepim4/kdepim4.changes 2008-05-26 14:34:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepim4/kdepim4.changes 2008-05-29 19:21:50.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 29 19:21:24 CEST 2008 - wstephenson(a)suse.de + +- Move Kontact plugins' desktop files to subpackages (bnc#389141) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.Nvp818/_old 2008-05-31 12:21:39.000000000 +0200 +++ /var/tmp/diff_new_pack.Nvp818/_new 2008-05-31 12:21:39.000000000 +0200 @@ -29,7 +29,7 @@ Summary: Base package of kdepim Url: http://www.kde.org Version: 4.0.80 -Release: 2 +Release: 5 Source0: kdepim-%version.tar.bz2 #Patch: 4_1_BRANCH.diff Patch1: akregator-useragent.diff @@ -148,6 +148,33 @@ cat filelists/akonadi.devel | while read line; do echo "%exclude $line";done >>filelists/devel %endif cd .. + #remove kontact plugins' desktop files that are in subpackages from the kontact list + akregatorplugins="/usr/share/kde4/services/kontact/akregatorplugin.desktop /usr/share/kde4/services/kontact/akregatorplugin3.2.desktop" + korganizerplugins="/usr/share/kde4/services/kontact/korganizerplugin.desktop /usr/share/kde4/services/kontact/journalplugin.desktop /usr/share/kde4/services/kontact/todoplugin.desktop" + kaddressbookplugin="/usr/share/kde4/services/kontact/kaddressbookplugin.desktop" + karmplugin="/usr/share/kde4/services/kontact/karmplugin.desktop" + kmailplugin="/usr/share/kde4/services/kontact/kmailplugin.desktop" + kmobiletoolsplugin="/usr/share/kde4/services/kontact/kmobiletools.desktop" + knodeplugin="/usr/share/kde4/services/kontact/knodeplugin.desktop" + knotesplugin="/usr/share/kde4/services/kontact/knotesplugin.desktop" + for i in $akregatorplugins $korganizerplugins $kaddressbookplugin $karmplugin $kmailplugin $kmobiletoolsplugin $knodeplugin $knotesplugin + do + sed -ri s,$i,, filelists/kontact + done + for i in $akregatorplugins + do + echo $i >> filelists/akregator + done + for i in $korganizerplugins + do + echo $i >> filelists/korganizer + done + echo $kaddressbookplugin >> filelists/kaddressbook + echo $karmplugin >> filelists/ktimetracker + echo $kmailplugin >> filelists/kmail + echo $kmobiletoolsplugin >> filelists/kmobiletools + echo $knodeplugin >> filelists/knode + echo $knotesplugin >> filelists/knotes cat filelists/libkdepim.devel | while read line; do echo "%exclude $line";done >>filelists/devel grep "/usr/lib" filelists/libkdepim | grep -v "/kde4/" >filelists/libkdepim.libs cat filelists/libkdepim.libs | while read line; do echo "%exclude $line";done >>filelists/libkdepim @@ -706,6 +733,8 @@ /usr/share/icons/hicolor/*/apps/office-address-book.* %changelog +* Thu May 29 2008 wstephenson(a)suse.de +- Move Kontact plugins' desktop files to subpackages (bnc#389141) * Mon May 26 2008 wstephenson(a)suse.de - Add versioning to libkleopatra libraries (bnc#391350) * Thu May 22 2008 wstephenson(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-openSUSE
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package kdebase4-openSUSE checked in at Sat May 31 12:21:29 CEST 2008. -------- --- KDE/kdebase4-openSUSE/kdebase4-openSUSE.changes 2008-05-27 23:43:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-openSUSE/kdebase4-openSUSE.changes 2008-05-29 15:31:58.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 29 15:31:52 CEST 2008 - dmueller(a)suse.de + +- translation updates + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.x31790/_old 2008-05-31 12:21:10.000000000 +0200 +++ /var/tmp/diff_new_pack.x31790/_new 2008-05-31 12:21:10.000000000 +0200 @@ -19,7 +19,7 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 11.0 -Release: 67 +Release: 69 Source0: kdebase4-openSUSE-%{version}.tar.bz2 Requires: kdebase4-workspace Provides: kdebase4-SuSE = 11.0 @@ -264,6 +264,8 @@ /usr/share/kde4/apps/kdm/pics %changelog +* Thu May 29 2008 dmueller(a)suse.de +- translation updates * Wed May 28 2008 dmueller(a)suse.de - opt-in kde3->kde4 config migration (bnc#372170) * Tue May 27 2008 dmueller(a)suse.de ++++++ kdebase4-openSUSE-11.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase4-openSUSE/po/nl/kde4-plasmoids.po new/kdebase4-openSUSE/po/nl/kde4-plasmoids.po --- old/kdebase4-openSUSE/po/nl/kde4-plasmoids.po 2008-05-26 22:36:25.000000000 +0200 +++ new/kdebase4-openSUSE/po/nl/kde4-plasmoids.po 2008-05-29 15:31:35.000000000 +0200 @@ -5,19 +5,20 @@ # This file is distributed under the same license as @PACKAGE@ package. FIRST # # Freek de Kruijf <f.de.kruijf(a)hetnet.nl>, 2008. +# Rinse de Vries <rinsedevries(a)kde.nl>, 2008. msgid "" msgstr "" "Project-Id-Version: kde4-plasmoids\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-07-27 16:23+0200\n" -"PO-Revision-Date: 2008-05-19 11:45+0200\n" -"Last-Translator: Freek de Kruijf <f.de.kruijf(a)hetnet.nl>\n" -"Language-Team: Dutch <vertaling(a)vrijschrift.org>\n" +"PO-Revision-Date: 2008-05-27 23:39+0200\n" +"Last-Translator: Rinse de Vries <rinsedevries(a)kde.nl>\n" +"Language-Team: Dutch <nl(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" #: calculator.cpp:241 msgid "ERROR" @@ -29,7 +30,7 @@ #: news.cpp:146 msgid "Configure News" -msgstr "Nieuws configureren" +msgstr "Nieuws instellen" #: news.cpp:322 #, kde-format diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase4-openSUSE/po/nl/kfiledialog.po new/kdebase4-openSUSE/po/nl/kfiledialog.po --- old/kdebase4-openSUSE/po/nl/kfiledialog.po 2007-05-09 14:45:32.000000000 +0200 +++ new/kdebase4-openSUSE/po/nl/kfiledialog.po 2008-05-29 15:31:35.000000000 +0200 @@ -2,20 +2,20 @@ # This file is put in the public domain. # # Arthur & Ettie Kerkmeester <a.s.kerkmeester(a)hccnet.nl>, 2005. -# Rinse de Vries <rinsedevries(a)kde.nl>, 2005, 2006. +# Rinse de Vries <rinsedevries(a)kde.nl>, 2005, 2006, 2008. msgid "" msgstr "" "Project-Id-Version: kfiledialog\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-09-14 17:19+0200\n" -"PO-Revision-Date: 2006-01-28 00:45+0100\n" +"PO-Revision-Date: 2008-05-28 00:07+0200\n" "Last-Translator: Rinse de Vries <rinsedevries(a)kde.nl>\n" -"Language-Team: Dutch <kde-i18n-nl(a)kde.org>\n" +"Language-Team: Dutch <nl(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.1\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" #: main.cpp:18 msgid "Front-end for the KDE file dialog" @@ -31,7 +31,7 @@ #: main.cpp:26 msgid "Set dialog mode to directory" -msgstr "Dialoogmodus op directory zetten" +msgstr "Dialoogmodus op map zetten" #: main.cpp:27 msgid "Print selected files" @@ -43,7 +43,7 @@ #: main.cpp:29 msgid "Set initial directory" -msgstr "Initiële directory instellen" +msgstr "Initiële map instellen" #: main.cpp:30 msgid "Set filter" @@ -52,3 +52,4 @@ #: main.cpp:55 msgid "kfiledialog" msgstr "kfiledialog" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase4-openSUSE/po/nl/krpmview.po new/kdebase4-openSUSE/po/nl/krpmview.po --- old/kdebase4-openSUSE/po/nl/krpmview.po 2007-08-24 18:53:02.000000000 +0200 +++ new/kdebase4-openSUSE/po/nl/krpmview.po 2008-05-29 15:31:35.000000000 +0200 @@ -1,21 +1,21 @@ -# translation of krpmview.po to Nederlands +# translation of krpmview.po to Dutch # This file is put in the public domain. # # Arthur & Ettie Kerkmeester <a.s.kerkmeester(a)hccnet.nl>, 2005. -# Rinse de Vries <rinsedevries(a)kde.nl>, 2005, 2007. +# Rinse de Vries <rinsedevries(a)kde.nl>, 2005, 2007, 2008. msgid "" msgstr "" "Project-Id-Version: krpmview\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-07-20 11:57+0200\n" -"PO-Revision-Date: 2007-07-29 22:51+0200\n" +"PO-Revision-Date: 2008-05-27 23:44+0200\n" "Last-Translator: Rinse de Vries <rinsedevries(a)kde.nl>\n" -"Language-Team: Nederlands <kde-i18n-nl(a)kde.org>\n" +"Language-Team: Dutch <nl(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" #: krpmview.cpp:56 msgid "Install Package with YaST" @@ -23,7 +23,7 @@ #: krpmview.cpp:62 msgid "Use Directory as Source with YaST" -msgstr "Directory als YaST-bron gebruiken" +msgstr "Map als YaST-bron gebruiken" #: krpmview.cpp:83 msgid "Description" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase4-openSUSE/po/nl/suseplugger.po new/kdebase4-openSUSE/po/nl/suseplugger.po --- old/kdebase4-openSUSE/po/nl/suseplugger.po 2007-08-01 12:06:26.000000000 +0200 +++ new/kdebase4-openSUSE/po/nl/suseplugger.po 2008-05-29 15:31:35.000000000 +0200 @@ -14,21 +14,21 @@ # Martin Lohner <ml(a)suse.de>, 2000. # Arthur & Ettie Kerkmeester <a.s.kerkmeester(a)hccnet.nl>, 1999-2004, 2005. # Arthur & Ettie Kerkmeester <a.s.kerkmeester(a)hccnet.nl>, 2003, 2004, 2005. -# Rinse de Vries <rinsedevries(a)kde.nl>, 2005, 2006. +# Rinse de Vries <rinsedevries(a)kde.nl>, 2005, 2006, 2008. msgid "" msgstr "" "Project-Id-Version: suseplugger\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-07-20 11:57+0200\n" -"PO-Revision-Date: 2006-01-28 00:46+0100\n" +"PO-Revision-Date: 2008-05-27 23:39+0200\n" "Last-Translator: Rinse de Vries <rinsedevries(a)kde.nl>\n" -"Language-Team: Dutch <kde-i18n-nl(a)kde.org>\n" +"Language-Team: Dutch <nl(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "#-#-#-#-# libsusehwhelper.po (libsusehwhelper) #-#-#-#-#\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.1\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: KBabel 1.11.4\n" "#-#-#-#-# suseplugger.po (suseplugger) #-#-#-#-#\n" "X-Generator: KBabel 1.11.1\n" @@ -74,7 +74,7 @@ #: rc.cpp:18 #, no-c-format msgid "Configure scanner?" -msgstr "Scanner configureren?" +msgstr "Scanner instellen?" #. i18n: file susehwpopup.ui line 230 #: rc.cpp:21 @@ -150,11 +150,11 @@ #: susehwitem.cpp:344 msgid "Configure the %1?" -msgstr "%1 configureren?" +msgstr "%1 instellen?" #: susehwitem.cpp:346 msgid "Configure the %1 \"%2\"?" -msgstr "%1 \"%2\" configureren?" +msgstr "%1 \"%2\" instellen?" #: susehwitemhandler.cpp:198 msgid "" @@ -162,13 +162,5 @@ "Configure your monitor geometry manually?" msgstr "" "Uw monitor heeft zijn X- en Y-afmetingen niet gerapporteerd. Dit kan resulteren in weergaveproblemen zoals onleesbare lettertekens.\n" -"Wilt u de monitorgeometrie handmatig configureren?" - -#~ msgid "Bluetooth" -#~ msgstr "Bluetooth" - -#~ msgid "The corresponding YaST2 module for %1 does not seem to be installed. Installing it first..." -#~ msgstr "De bijhorende YaST2 module voor %1 blijkt niet geïnstalleerd te zijn. Deze wordt nu eerst geïnstalleerd..." +"Wilt u de monitorgeometrie handmatig instellen?" -#~ msgid "An error occured while checking for the installed YaST2 module. Aborting." -#~ msgstr "Er is een fout opgetreden tijdens het controleren op geïnstalleerde YaST2-modules. Gestopt." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase4-openSUSE/po/pt/kde4-openSUSE.po new/kdebase4-openSUSE/po/pt/kde4-openSUSE.po --- old/kdebase4-openSUSE/po/pt/kde4-openSUSE.po 2008-05-26 22:36:44.000000000 +0200 +++ new/kdebase4-openSUSE/po/pt/kde4-openSUSE.po 2008-05-29 15:31:36.000000000 +0200 @@ -10,9 +10,10 @@ "Project-Id-Version: kde4-openSUSE.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-08-18 14:46+0200\n" -"PO-Revision-Date: 2008-05-20 21:59+0100\n" +"PO-Revision-Date: 2008-05-27 23:01+0100\n" "Last-Translator: Antonio Cardoso Martins <digiplan.pt(a)gmail.com>\n" -"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n" +"Language-Team: Portuguese <opensuse-pt(a)opensuse.org" +">\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -108,7 +109,7 @@ #: oxygen/oxygenclient.cpp:87 msgid "Ozone" -msgstr "" +msgstr "Ozone" #: backgrounddialog.cpp:639 msgid "Enable shadow" @@ -338,21 +339,19 @@ #: kdeui/sonnet/dialog.cpp:157 msgid "Spell check stopped." -msgstr "" +msgstr "Verificação ortográfica parada." #: kdeui/sonnet/dialog.cpp:165 -#, fuzzy msgid "Spell check canceled." -msgstr "falhou a verificação applydeltarpm." +msgstr "Verificação ortográfica cancelada." #: kdeui/sonnet/dialog.cpp:300 msgid "Spell check complete." -msgstr "" +msgstr "Verificação ortográfica completa." #: kdeui/widgets/ktextedit.cpp:447 -#, fuzzy msgid "Nothing to spell check." -msgstr "Nada para fazer." +msgstr "Não há verificação ortográfica para fazer." #: kio/kfileitem.cpp:927 #, kde-format @@ -374,6 +373,8 @@ "Kopete was not able to send the last message sent on account '%1'.\n" "If possible, please send the console output from Kopete to <wstephenson(a)novell.com> for analysis." msgstr "" +"O Kopete não conseguiu enviar a última mensagem enviada na conta '%1'.\n" +"Se possível, por favor envie a saída da consola do Kopete para <wstephenson(a)novell.com> para análise." # ############################################################################### # Old yast2-agents.po @@ -384,104 +385,100 @@ # Karl Eichwalder <ke(a)suse.de>, 1999. # Ralf Lanz <rlanz(a)genix.com.br>, 1999. #: protocols/groupwise/gwaccount.cpp:375 -#, fuzzy, kde-format +#, kde-format msgctxt "message sending failed using the named local account" msgid "Unable to Send Message on Account '%1'" -msgstr "Não foi possível abrir o script de inicialização '%1'" +msgstr "Não foi Possível Enviar a Mensagem da conta '%1'" #: authdialog.cpp:96 msgid "An application is attempting to perform an action that requires privileges. Authentication as the super user is required to perform this action." -msgstr "" +msgstr "Uma aplicação está a tentar realizar uma acção que requer privilégios. É necessária autenticação como super-utilizador para realizar esta acção." #: authdialog.cpp:100 msgid "An application is attempting to perform an action that requires privileges. Authentication is required to perform this action." -msgstr "" +msgstr "Uma aplicação está a tentar realizar uma acção que requer privilégios. É necessária autenticação para realizar esta acção." #: authdialog.cpp:121 -#, fuzzy msgid "Password for root" -msgstr "Palavra Passe: " +msgstr "Palavra passe de root" #: authdialog.cpp:123 #, kde-format msgid "Password for user(%1)" -msgstr "" +msgstr "Palavra passe do utilizador (%1)" # password dialog title #: authdialog.cpp:125 msgid "Password" -msgstr "Palavra Passe" +msgstr "Palavra passe" #: main.cpp:34 main.cpp:35 msgid "PolicyKit-kde" -msgstr "" +msgstr "PolicyKit-kde" #: main.cpp:36 msgid "(c) 2005-2007, TUBITAK - UEKAE" -msgstr "" +msgstr "(c) 2005-2007, TUBITAK - UEKAE" #: main.cpp:37 msgid "Gökçen Eraslan" -msgstr "" +msgstr "Gökçen Eraslan" #: main.cpp:37 msgid "KDE 3 Code" -msgstr "" +msgstr "Código KDE 3" #: main.cpp:38 msgid "Dirk Müller" -msgstr "" +msgstr "Dirk Müller" #: main.cpp:38 -#, fuzzy msgid "Author" -msgstr "Autor:" +msgstr "Autor" #. i18n: tag string #. i18n: file authdialogui.ui line 13 #: rc.cpp:3 -#, fuzzy msgid "Authentication Required" -msgstr "Autenticação requerida para '%s'" +msgstr "Autenticação Necessária" #. i18n: tag string #. i18n: file authdialogui.ui line 24 #: rc.cpp:6 -#, fuzzy msgid "Lock Icon Here" -msgstr "Trancar o Ecrã" +msgstr "Trancar Aqui o Ícone" #. i18n: tag string #. i18n: file authdialogui.ui line 54 #: rc.cpp:9 msgid "<h3><b>Header is here! </b></h3>" -msgstr "" +msgstr "<h3><b>O cabeçalho é aqui! </b></h3>" #. i18n: tag string #. i18n: file authdialogui.ui line 84 #: rc.cpp:15 msgid "Remember authorization" -msgstr "" +msgstr "Recordar autorização" #. i18n: tag string #. i18n: file authdialogui.ui line 112 #: rc.cpp:18 msgid "For this session only" -msgstr "" +msgstr "Apenas para esta sessão" #. i18n: tag string #. i18n: file authdialogui.ui line 123 #: rc.cpp:21 -#, fuzzy msgid "Select a user..." -msgstr "Seleccionar o idioma." +msgstr "Escolher um utilizador..." #. i18n: tag string #. i18n: file authdialogui.ui line 127 #: rc.cpp:24 msgid "Select User..." -msgstr "" +msgstr "Escolher Utilizador..." #: systemmodel.cpp:271 msgid "System Information" msgstr "Informação do Sistema" + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-settings-daemon
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package gnome-settings-daemon checked in at Sat May 31 12:21:01 CEST 2008. -------- --- GNOME/gnome-settings-daemon/gnome-settings-daemon.changes 2008-05-26 17:05:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-settings-daemon/gnome-settings-daemon.changes 2008-05-29 20:33:17.004683000 +0200 @@ -1,0 +2,5 @@ +Thu May 29 20:39:30 CEST 2008 - federico(a)novell.com + +- Updated gnome-settings-daemon-randr-1.2.diff with the latest fixes from upstream. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-settings-daemon.spec ++++++ --- /var/tmp/diff_new_pack.R29323/_old 2008-05-31 12:20:42.000000000 +0200 +++ /var/tmp/diff_new_pack.R29323/_new 2008-05-31 12:20:42.000000000 +0200 @@ -17,7 +17,7 @@ License: GPL v2 or later Group: System/GUI/GNOME Version: 2.22.1 -Release: 19 +Release: 21 Summary: Settings daemon for the GNOME desktop Source: %{_name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.patch @@ -133,6 +133,8 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu May 29 2008 federico(a)novell.com +- Updated gnome-settings-daemon-randr-1.2.diff with the latest fixes from upstream. * Mon May 26 2008 vuntz(a)suse.de - Add gnome-settings-daemon-bnc369263-broken-xkb-layout.patch to unbreak corrupted keymaps on automatic login. This is only a ++++++ gnome-settings-daemon-randr-1.2.diff ++++++ --- /var/tmp/diff_new_pack.R29323/_old 2008-05-31 12:20:43.000000000 +0200 +++ /var/tmp/diff_new_pack.R29323/_new 2008-05-31 12:20:43.000000000 +0200 @@ -1,22 +1,79 @@ diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c -index 620d783..02d2764 100644 +index 620d783..baf8f97 100644 --- a/plugins/xrandr/gsd-xrandr-manager.c +++ b/plugins/xrandr/gsd-xrandr-manager.c -@@ -35,7 +35,10 @@ +@@ -44,6 +44,10 @@ + #include "gnome-settings-profile.h" + #include "gsd-xrandr-manager.h" + ++#ifndef HOST_NAME_MAX ++#define HOST_NAME_MAX 255 ++#endif ++ + static void gsd_xrandr_manager_class_init (GsdXrandrManagerClass *klass); + static void gsd_xrandr_manager_init (GsdXrandrManager *xrandr_manager); + static void gsd_xrandr_manager_finalize (GObject *object); +@@ -186,11 +190,7 @@ apply_settings (GsdXrandrManager *manager) + int height; + int rate; + int rotation; +-#ifdef HOST_NAME_MAX + char hostname[HOST_NAME_MAX + 1]; +-#else +- char hostname[256]; +-#endif + char *specific_path; + char *keys[3]; + int i; +@@ -381,7 +381,7 @@ gsd_xrandr_manager_dispose (GObject *object) + static void + gsd_xrandr_manager_class_init (GsdXrandrManagerClass *klass) + { +- GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->get_property = gsd_xrandr_manager_get_property; + object_class->set_property = gsd_xrandr_manager_set_property; +diff --git a/plugins/background/gsd-background-manager.c b/plugins/background/gsd-background-manager.c +index cf5119d..774bc66 100644 +--- a/plugins/background/gsd-background-manager.c ++++ b/plugins/background/gsd-background-manager.c +@@ -2,6 +2,7 @@ + * + * Copyright © 2001 Ximian, Inc. + * Copyright (C) 2007 William Jon McCann <mccann(a)jhu.edu> ++ * Copyright 2007 Red Hat, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c +index baf8f97..e1340c4 100644 +--- a/plugins/xrandr/gsd-xrandr-manager.c ++++ b/plugins/xrandr/gsd-xrandr-manager.c +@@ -1,6 +1,7 @@ + /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * + * Copyright (C) 2007 William Jon McCann <mccann(a)jhu.edu> ++ * Copyright (C) 2007, 2008 Red Hat, Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -35,7 +36,11 @@ #include <gdk/gdk.h> #include <gdk/gdkx.h> #include <gtk/gtk.h> -#include <gconf/gconf-client.h> + -+#define I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA ++#define GNOME_DESKTOP_USE_UNSTABLE_API ++ +#include <libgnomeui/monitor-db.h> +#include <libgnomeui/randrwrap.h> #ifdef HAVE_RANDR #include <X11/extensions/Xrandr.h> -@@ -44,6 +47,22 @@ - #include "gnome-settings-profile.h" - #include "gsd-xrandr-manager.h" +@@ -48,6 +53,22 @@ + #define HOST_NAME_MAX 255 + #endif +#define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate)) + @@ -37,7 +94,7 @@ static void gsd_xrandr_manager_class_init (GsdXrandrManagerClass *klass); static void gsd_xrandr_manager_init (GsdXrandrManager *xrandr_manager); static void gsd_xrandr_manager_finalize (GObject *object); -@@ -52,252 +71,74 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xrandr_manager, G_TYPE_OBJECT) +@@ -56,248 +77,75 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xrandr_manager, G_TYPE_OBJECT) static gpointer manager_object = NULL; @@ -46,9 +103,7 @@ -get_rotation (GConfClient *client, - char *display, - int screen) -+static GdkAtom -+gnome_randr_atom (void) - { +-{ - char *key; - int val; - GError *error; @@ -61,10 +116,13 @@ - if (error == NULL) { - return val; - } -- + - g_error_free (error); - - return 0; ++static GdkAtom ++gnome_randr_atom (void) ++{ + return gdk_atom_intern ("_GNOME_RANDR_ATOM", FALSE); } @@ -220,11 +278,7 @@ - int height; - int rate; - int rotation; --#ifdef HOST_NAME_MAX - char hostname[HOST_NAME_MAX + 1]; --#else -- char hostname[256]; --#endif - char *specific_path; - char *keys[3]; - int i; @@ -315,10 +369,10 @@ - XRRFreeScreenConfigInfo (config); - } - } +- +- g_free (specific_path); + GsdXrandrManager *manager = data; -- g_free (specific_path); -- - /* We need to make sure we process the screen resize event. */ - gdk_display_sync (display); - @@ -340,7 +394,7 @@ } gboolean -@@ -306,8 +147,30 @@ gsd_xrandr_manager_start (GsdXrandrManager *manager, +@@ -306,8 +154,30 @@ gsd_xrandr_manager_start (GsdXrandrManager *manager, { g_debug ("Starting xrandr manager"); @@ -373,7 +427,7 @@ return TRUE; } -@@ -315,6 +178,16 @@ void +@@ -315,6 +185,16 @@ void gsd_xrandr_manager_stop (GsdXrandrManager *manager) { g_debug ("Stopping xrandr manager"); @@ -390,7 +444,7 @@ } static void -@@ -388,11 +261,22 @@ gsd_xrandr_manager_class_init (GsdXrandrManagerClass *klass) +@@ -388,11 +268,22 @@ gsd_xrandr_manager_class_init (GsdXrandrManagerClass *klass) object_class->constructor = gsd_xrandr_manager_constructor; object_class->dispose = gsd_xrandr_manager_dispose; object_class->finalize = gsd_xrandr_manager_finalize; @@ -413,7 +467,7 @@ } static void -@@ -405,6 +289,8 @@ gsd_xrandr_manager_finalize (GObject *object) +@@ -405,6 +296,8 @@ gsd_xrandr_manager_finalize (GObject *object) xrandr_manager = GSD_XRANDR_MANAGER (object); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-docker
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package gnome-docker checked in at Sat May 31 12:20:53 CEST 2008. -------- --- GNOME/gnome-docker/gnome-docker.changes 2008-05-14 15:33:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-docker/gnome-docker.changes 2008-05-29 12:45:53.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 29 12:20:43 CEST 2008 - hmacht(a)suse.de + +- add preliminary tray icon (bnc#395362) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-docker.spec ++++++ --- /var/tmp/diff_new_pack.b26071/_old 2008-05-31 12:20:00.000000000 +0200 +++ /var/tmp/diff_new_pack.b26071/_new 2008-05-31 12:20:00.000000000 +0200 @@ -14,7 +14,7 @@ Name: gnome-docker BuildRequires: gnome-common intltool libgnomeui-devel liblazy-devel libnotify-devel update-desktop-files Version: 0.1 -Release: 29 +Release: 33 Url: Stilllookingforurl Group: System/GUI/GNOME License: GPL v2 only @@ -57,8 +57,12 @@ %dir %_datadir/gnome/autostart %_datadir/gnome/autostart/gnome-docker.desktop %_datadir/applications/gnome-docker.desktop +%_datadir/applications/gnome-docker.desktop +%_datadir/gnome-docker %changelog +* Thu May 29 2008 hmacht(a)suse.de +- add preliminary tray icon (bnc#395362) * Wed May 14 2008 hmacht(a)suse.de - fix .desktop file - add tooltip ++++++ gnome-docker-0.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-docker-0.1/configure new/gnome-docker-0.1/configure --- old/gnome-docker-0.1/configure 2008-05-09 11:00:37.000000000 +0200 +++ new/gnome-docker-0.1/configure 2008-05-29 12:17:46.000000000 +0200 @@ -24330,7 +24330,7 @@ < $srcdir/po/POTFILES.in > po/POTFILES -ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile po/Makefile.in" +ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/icons/Makefile po/Makefile.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -24933,6 +24933,7 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; + "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-docker-0.1/configure.in new/gnome-docker-0.1/configure.in --- old/gnome-docker-0.1/configure.in 2008-05-09 10:53:29.000000000 +0200 +++ new/gnome-docker-0.1/configure.in 2008-05-29 12:17:29.000000000 +0200 @@ -108,6 +108,7 @@ Makefile src/Makefile data/Makefile +data/icons/Makefile po/Makefile.in ]) Files old/gnome-docker-0.1/data/icons/gnome-docker.png and new/gnome-docker-0.1/data/icons/gnome-docker.png differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-docker-0.1/data/icons/Makefile.am new/gnome-docker-0.1/data/icons/Makefile.am --- old/gnome-docker-0.1/data/icons/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-docker-0.1/data/icons/Makefile.am 2008-05-29 12:17:19.000000000 +0200 @@ -0,0 +1,5 @@ +iconsdir = $(datadir)/gnome-docker + +icons_DATA = gnome-docker.png + +EXTRA_DIST = $(icons_DATA) \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-docker-0.1/data/icons/Makefile.in new/gnome-docker-0.1/data/icons/Makefile.in --- old/gnome-docker-0.1/data/icons/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-docker-0.1/data/icons/Makefile.in 2008-05-29 12:17:48.000000000 +0200 @@ -0,0 +1,424 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = data/icons +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(iconsdir)" +iconsDATA_INSTALL = $(INSTALL_DATA) +DATA = $(icons_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BINDIR = @BINDIR@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIR = @DATADIR@ +DATADIRNAME = @DATADIRNAME@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_LIBS = @DBUS_LIBS@ +DBUS_REQUIRED = @DBUS_REQUIRED@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_REQUIRED = @GLIB_REQUIRED@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GNOME_CFLAGS = @GNOME_CFLAGS@ +GNOME_LIBS = @GNOME_LIBS@ +GREP = @GREP@ +GTK_REQUIRED = @GTK_REQUIRED@ +HAL_CFLAGS = @HAL_CFLAGS@ +HAL_LIBS = @HAL_LIBS@ +HAL_REQUIRED = @HAL_REQUIRED@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ +INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ +INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ +INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ +INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ +INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ +INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ +INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ +INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ +INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ +INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ +INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ +LDFLAGS = @LDFLAGS@ +LIBGNOMEUI_REQUIRED = @LIBGNOMEUI_REQUIRED@ +LIBGNOME_REQUIRED = @LIBGNOME_REQUIRED@ +LIBLAZY_CFLAGS = @LIBLAZY_CFLAGS@ +LIBLAZY_LIBS = @LIBLAZY_LIBS@ +LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ +LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBNOTIFY_REQUIRED = @LIBNOTIFY_REQUIRED@ +LIBOBJS = @LIBOBJS@ +LIBPANEL_REQUIRED = @LIBPANEL_REQUIRED@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SBINDIR = @SBINDIR@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SYSCONFDIR = @SYSCONFDIR@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +gnomedockerlocaledir = @gnomedockerlocaledir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +iconsdir = $(datadir)/gnome-docker +icons_DATA = gnome-docker.png +EXTRA_DIST = $(icons_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/icons/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-iconsDATA: $(icons_DATA) + @$(NORMAL_INSTALL) + test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" + @list='$(icons_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \ + $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \ + done + +uninstall-iconsDATA: + @$(NORMAL_UNINSTALL) + @list='$(icons_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \ + rm -f "$(DESTDIR)$(iconsdir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(iconsdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-iconsDATA + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-iconsDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-iconsDATA install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-iconsDATA + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-docker-0.1/data/Makefile.am new/gnome-docker-0.1/data/Makefile.am --- old/gnome-docker-0.1/data/Makefile.am 2008-05-09 10:19:38.000000000 +0200 +++ new/gnome-docker-0.1/data/Makefile.am 2008-05-29 12:17:13.000000000 +0200 @@ -1,3 +1,5 @@ +SUBDIRS = icons + desktopdir = $(datadir)/applications desktop_in_files = gnome-docker.desktop.in desktop_DATA = gnome-docker.desktop @@ -6,4 +8,4 @@ autostartdir = $(datadir)/gnome/autostart autostart_DATA = gnome-docker.desktop -EXTRA_DIST = gnome-docker.desktop \ No newline at end of file +EXTRA_DIST = gnome-docker.desktop diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-docker-0.1/data/Makefile.in new/gnome-docker-0.1/data/Makefile.in --- old/gnome-docker-0.1/data/Makefile.in 2008-05-09 11:00:37.000000000 +0200 +++ new/gnome-docker-0.1/data/Makefile.in 2008-05-29 12:17:48.000000000 +0200 @@ -43,6 +43,13 @@ CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -54,6 +61,11 @@ autostartDATA_INSTALL = $(INSTALL_DATA) desktopDATA_INSTALL = $(INSTALL_DATA) DATA = $(autostart_DATA) $(desktop_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -231,13 +243,14 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +SUBDIRS = icons desktopdir = $(datadir)/applications desktop_in_files = gnome-docker.desktop.in desktop_DATA = gnome-docker.desktop autostartdir = $(datadir)/gnome/autostart autostart_DATA = gnome-docker.desktop EXTRA_DIST = gnome-docker.desktop -all: all-am +all: all-recursive .SUFFIXES: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @@ -309,12 +322,136 @@ echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique tags: TAGS -TAGS: +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS -CTAGS: +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -342,22 +479,40 @@ || exit 1; \ fi; \ done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done check-am: all-am -check: check-am +check: check-recursive all-am: Makefile $(DATA) -installdirs: +installdirs: installdirs-recursive +installdirs-am: for dir in "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -373,73 +528,76 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-am +clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic +distclean-am: clean-am distclean-generic distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -html: html-am +html: html-recursive -info: info-am +info: info-recursive info-am: install-data-am: install-autostartDATA install-desktopDATA -install-dvi: install-dvi-am +install-dvi: install-dvi-recursive install-exec-am: -install-html: install-html-am +install-html: install-html-recursive -install-info: install-info-am +install-info: install-info-recursive install-man: -install-pdf: install-pdf-am +install-pdf: install-pdf-recursive -install-ps: install-ps-am +install-ps: install-ps-recursive installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic mostlyclean-libtool -pdf: pdf-am +pdf: pdf-recursive pdf-am: -ps: ps-am +ps: ps-recursive ps-am: uninstall-am: uninstall-autostartDATA uninstall-desktopDATA -.MAKE: install-am install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-autostartDATA install-data install-data-am \ - install-desktopDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-autostartDATA \ + install-data install-data-am install-desktopDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall-autostartDATA uninstall-desktopDATA @INTLTOOL_DESKTOP_RULE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-docker-0.1/po/POTFILES.in new/gnome-docker-0.1/po/POTFILES.in --- old/gnome-docker-0.1/po/POTFILES.in 2008-05-14 15:33:09.000000000 +0200 +++ new/gnome-docker-0.1/po/POTFILES.in 2008-05-29 12:13:05.000000000 +0200 @@ -1,4 +1,4 @@ src/gd-dbus.c src/gd-input.c src/gd-tray.c -data/gnome-docker.desktop.in +data/gnome-docker.desktop diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-docker-0.1/src/gd-tray.c new/gnome-docker-0.1/src/gd-tray.c --- old/gnome-docker-0.1/src/gd-tray.c 2008-05-14 15:37:43.000000000 +0200 +++ new/gnome-docker-0.1/src/gd-tray.c 2008-05-29 12:29:06.000000000 +0200 @@ -63,7 +63,7 @@ "version", "0.1", "copyright", "Copyright 2008 Holger Macht", "license", license_trans, - "comments", "description", + "comments", "GNOME dock station applet", "authors", authors, "documenters", NULL, "artists", NULL, @@ -121,8 +121,13 @@ gboolean gd_tray_icon_init(const char *udi) { int docked; + gchar *icon_path; - icon = gtk_status_icon_new_from_stock(GTK_STOCK_OPEN); + icon = gtk_status_icon_new(); + + icon_path = g_strdup_printf("%s/%s/gnome-docker.png", DATADIR, PACKAGE_NAME); + gtk_status_icon_set_from_file(icon, icon_path); + g_free(icon_path); if (liblazy_hal_get_property_bool(udi, "info.docked", &docked)) { gd_error("Cannot get docking status"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0