February 2009 - openSUSE Commits - openSUSE Mailing Lists

commit check for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package check for openSUSE:Factory checked in at Fri Feb 6 21:40:58 CET 2009. -------- --- check/check.changes 2008-04-10 12:57:11.000000000 +0200 +++ check/check.changes 2009-01-01 08:11:32.000000000 +0100 @@ -1,0 +2,18 @@ +Thu Jan 1 12:12:12 IST 2009 - msuman(a)suse.de + +- Updated to version 0.9.6: + * add call to AC_REPLACE_FUNCS([strsignal]) + * add CK_FORK_GETENV to enum fork_status and delete CK_FORK_UNSPECIFIED + * add CK_CTX_INVALID to ck_result_ctx and don't use -1 anymore + * rename signal to _signal in _tcase_add_test to avoid a + symbol clash with /usr/include/sys/signal.h on OS X. + * define rpl_malloc and rpl_realloc for platforms where + !malloc(0) and !realloc(0,0), such as AIX, because configure + goes and redefines malloc/realloc in this case... + * Added new Check fail API. Implemented on top of fail_unless. Future + versions will reverse this so fail_unless is implemented on top of the + ck_assert API. This API is not documented yet, will probably not be fully + released until 0.9.8, when it will be possible to choose API. + * More fixes and changes. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- check-0.9.5.tar.bz2 New: ---- check-0.9.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ check.spec ++++++ --- /var/tmp/diff_new_pack.TY9260/_old 2009-02-06 21:40:07.000000000 +0100 +++ /var/tmp/diff_new_pack.TY9260/_new 2009-02-06 21:40:07.000000000 +0100 @@ -1,10 +1,17 @@ # -# spec file for package check (Version 0.9.5) +# spec file for package check (Version 0.9.6) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,8 +19,8 @@ Name: check -Version: 0.9.5 -Release: 63 +Version: 0.9.6 +Release: 1 Url: http://check.sourceforge.net/ Group: Development/Libraries/C and C++ License: LGPL v2.1 or later @@ -63,24 +70,25 @@ %setup -q %build +export CFLAGS="$RPM_OPT_FLAGS -std=gnu99" +export CXXFLAGS="$RPM_OPT_FLAGS -std=gnu99" +export FFLAGS="$RPM_OPT_FLAGS -std=gnu99" %configure -make %{?jobs:-j%jobs} docdir=%{_docdir}/%{name} +%{__make} %{?jobs:-j%jobs} docdir=%{_docdir}/%{name} %install %makeinstall docdir=%{_docdir}/%{name} -cp -a AUTHORS COPYING THANKS TODO $RPM_BUILD_ROOT%{_docdir}/%{name} +%{__cp} -a AUTHORS COPYING.LESSER THANKS TODO $RPM_BUILD_ROOT%{_docdir}/%{name} %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT -%post -%run_ldconfig +%post -p /sbin/ldconfig %post devel %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %postun devel %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -102,6 +110,21 @@ %doc %{_docdir}/%{name}/example %changelog +* Wed Dec 31 2008 msuman(a)suse.de +- Updated to version 0.9.6: + * add call to AC_REPLACE_FUNCS([strsignal]) + * add CK_FORK_GETENV to enum fork_status and delete CK_FORK_UNSPECIFIED + * add CK_CTX_INVALID to ck_result_ctx and don't use -1 anymore + * rename signal to _signal in _tcase_add_test to avoid a + symbol clash with /usr/include/sys/signal.h on OS X. + * define rpl_malloc and rpl_realloc for platforms where + !malloc(0) and !realloc(0,0), such as AIX, because configure + goes and redefines malloc/realloc in this case... + * Added new Check fail API. Implemented on top of fail_unless. Future + versions will reverse this so fail_unless is implemented on top of the + ck_assert API. This API is not documented yet, will probably not be fully + released until 0.9.8, when it will be possible to choose API. + * More fixes and changes. * Thu Apr 10 2008 ro(a)suse.de - added baselibs.conf file to build xxbit packages for multilib support ++++++ check-0.9.5.tar.bz2 -> check-0.9.6.tar.bz2 ++++++ ++++ 36646 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cairo for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package cairo for openSUSE:Factory checked in at Fri Feb 6 21:32:44 CET 2009. -------- --- GNOME/cairo/cairo.changes 2009-01-13 21:22:12.000000000 +0100 +++ cairo/cairo.changes 2009-01-21 10:01:36.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 21 14:23:25 IST 2009 - msuman(a)suse.de + +- Continue to provide the "la" files for SUSE releases <= 11.1 + +------------------------------------------------------------------- @@ -6,0 +12,6 @@ +Sat Dec 20 09:10:35 EST 2008 - mboman(a)suse.de + +- Update to version 1.8.6: + + Many API changes, fixes and other updates. See NEWS for full details + +------------------------------------------------------------------- @@ -12,0 +24,6 @@ +Mon Dec 8 12:20:35 EST 2008 - mboman(a)suse.de + +- Update to version 1.8.4: + + Many API changes, fixes and other updates. See NEWS for full details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cairo-1.8.0.tar.bz2 New: ---- cairo-1.8.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cairo.spec ++++++ --- /var/tmp/diff_new_pack.P17401/_old 2009-02-06 21:21:13.000000000 +0100 +++ /var/tmp/diff_new_pack.P17401/_new 2009-02-06 21:21:13.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cairo (Version 1.8.0) +# spec file for package cairo (Version 1.8.6) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,8 @@ Name: cairo +BuildRequires: freetype2-devel gtk-doc libpng-devel pkg-config xorg-x11-devel xorg-x11-libxcb-devel # Use rpmbuild -D 'DIRECTFB_SUPPORT 1' to build wíth DirectFB support. -BuildRequires: freetype2-devel libpng-devel pkg-config xorg-x11-devel -%if %suse_version > 1020 -BuildRequires: xorg-x11-libxcb-devel -%endif %if 0%{?DIRECTFB_SUPPORT} BuildRequires: DirectFB-devel %endif @@ -34,8 +31,8 @@ Group: Development/Libraries/X11 Summary: Vector Graphics Library with Cross-Device Output Support Url: http://cairographics.org/ -Version: 1.8.0 -Release: 6 +Version: 1.8.6 +Release: 1 Source: %{name}-%{version}.tar.bz2 Patch1: cairo-ac.patch # PATCH-NEEDS-REBASE bugzilla-104365.patch bnc104365 -- it needs a rename too! @@ -69,17 +66,10 @@ License: LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Summary: Development environment for cairo Group: Development/Libraries/X11 -Requires: %{name} = %{version} freetype2-devel fontconfig-devel xorg-x11-devel -Requires: libpng-devel +Requires: %{name} = %{version} freetype2-devel fontconfig-devel libpng-devel xorg-x11-devel xorg-x11-libXrender-devel xorg-x11-libX11-devel xorg-x11-libxcb-devel %if 0%{?DIRECTFB_SUPPORT} Requires: DirectFB-devel %endif -### %if %(rpm -q --queryformat=%%{version} xorg-x11-devel | sed 's/\..*$//') >= 7 -Requires: xorg-x11-libXrender-devel xorg-x11-libX11-devel -%if %suse_version > 1020 -Requires: xorg-x11-libxcb-devel -%endif -### %endif # Last present in SuSE Linux 10.0 (and NLD9): Obsoletes: libpixman-devel <= 0.1.1 Provides: libpixman-devel <= 0.1.1 @@ -122,36 +112,33 @@ %build autoreconf -f -i -%if %suse_version > 1000 -export CFLAGS="$RPM_OPT_FLAGS -fstack-protector" -%endif -# xcb-renderutil is not yet available in openSUSE 10.2 # Only for tests: --enable-pdf --enable-svg -%configure --disable-static --with-pic\ +%configure \ + --with-pic \ %if 0%{?DIRECTFB_SUPPORT} --enable-directfb \ %endif --enable-ps \ -%if %suse_version > 1020 --enable-xcb \ -%endif - --disable-gtk-doc -make %{?jobs:-j %jobs} + --disable-gtk-doc \ + --disable-static +%{__make} %{?jobs:-j %jobs} %install %makeinstall -%{__rm} -f %{buildroot}%{_libdir}/*.la +%if 0%{?suse_version} > 1110 +%{__rm} %{buildroot}/%{_libdir}/*.la +%endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean -rm -rf ${RPM_BUILD_ROOT} +%{__rm} -rf ${RPM_BUILD_ROOT} %files %defattr(-, root, root) -# %doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README ROADMAP TODO %doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README %{_libdir}/libcairo.so.* @@ -161,19 +148,28 @@ %{_includedir}/cairo %{_libdir}/libcairo.so %{_libdir}/pkgconfig/*.pc +%if 0%{?suse_version} <= 1110 +%{_libdir}/*.la +%endif %files doc %defattr(-, root, root) -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/* %changelog +* Tue Jan 20 2009 msuman(a)suse.de +- Continue to provide the "la" files for SUSE releases <= 11.1 * Tue Jan 13 2009 crrodriguez(a)suse.de - remove static libraries and "la" files +* Sat Dec 20 2008 mboman(a)suse.de +- Update to version 1.8.6: + + Many API changes, fixes and other updates. See NEWS for full details * Wed Dec 10 2008 olh(a)suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) +* Mon Dec 08 2008 mboman(a)suse.de +- Update to version 1.8.4: + + Many API changes, fixes and other updates. See NEWS for full details * Tue Nov 11 2008 ro(a)suse.de - SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf * Tue Nov 04 2008 maw(a)suse.de ++++++ cairo-1.8.0.tar.bz2 -> cairo-1.8.6.tar.bz2 ++++++ ++++ 159162 lines of diff (skipped) ++++++ cairo-ac.patch ++++++ --- /var/tmp/diff_new_pack.P17401/_old 2009-02-06 21:21:19.000000000 +0100 +++ /var/tmp/diff_new_pack.P17401/_new 2009-02-06 21:21:19.000000000 +0100 @@ -5,7 +5,7 @@ @@ -8,6 +8,8 @@ AC_CONFIG_HEADERS(config.h) AC_CONFIG_AUX_DIR(build) AC_CONFIG_MACRO_DIR(build) - AM_INIT_AUTOMAKE([1.8 gnu -Wall no-define]) + AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define]) +m4_pattern_allow([^LT_(CURRENT|REVISION|AGE)$])dnl +AC_PROG_CC_C_O AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bug-buddy for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package bug-buddy for openSUSE:Factory checked in at Fri Feb 6 21:20:27 CET 2009. -------- --- GNOME/bug-buddy/bug-buddy.changes 2008-11-25 17:54:50.000000000 +0100 +++ bug-buddy/bug-buddy.changes 2009-01-26 14:44:34.000000000 +0100 @@ -1,0 +2,23 @@ +Mon Jan 26 14:39:27 CET 2009 - vuntz(a)novell.com + +- Remove bug-buddy-hardcode-dump-path.patch: it was added a while + ago, because of a mis-backported patch. + +------------------------------------------------------------------- +Sun Dec 14 10:39:21 EST 2008 - mboman(a)suse.de + +- Update to version 2.25.2: + + Fix a segfault + + Don't free uninitialized memory. + + Drop libgnome and libgnomeui dependencies. + + Make google-breakpad support optional (but enabled by default). + + Obtain the real path of the crashed process by looking in /proc. + + Add an option to delete the included file after bug-buddy has + processed it. + + Implement a logger for pasting critical and fatal warnings in the + stacktraces. + + Include the loaded GTK+ modules in the stacktraces sent to bugzilla. + + Update google-breakpad to SVN r290. + + Compile with all the GLib/GTK+ deprecation flags. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bug-buddy-2.24.1.tar.bz2 bug-buddy-hardcode-dump-path.patch New: ---- bug-buddy-2.25.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bug-buddy.spec ++++++ --- /var/tmp/diff_new_pack.E13229/_old 2009-02-06 21:19:36.000000000 +0100 +++ /var/tmp/diff_new_pack.E13229/_new 2009-02-06 21:19:36.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package bug-buddy (Version 2.24.1) +# spec file for package bug-buddy (Version 2.25.2) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,21 +28,17 @@ BuildRequires: gtk2-devel >= 2.14.2 BuildRequires: intltool BuildRequires: libelf-devel -BuildRequires: libgnomeui-devel BuildRequires: libgtop-devel BuildRequires: libsoup-devel -BuildRequires: perl-XML-Parser BuildRequires: scrollkeeper BuildRequires: update-desktop-files License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.24.1 -Release: 2 +Version: 2.25.2 +Release: 1 Requires: %{name}-lang = %{version} Summary: The GNOME Desktop Bug Reporting Tool Source: ftp://ftp.gnome.org/pub/gnome/sources/bug-buddy/2.23/%{name}-%{version}.tar… -# PATCH-FIX-OPENSUSE bug-buddy-hardcode-dump-path.patch bnc307860 -Patch7: bug-buddy-hardcode-dump-path.patch # PATCH-FIX-UPSTREAM bug-buddy-breakpad-vg-fix.patch bnc374803 Patch8: bug-buddy-breakpad-vg-fix.patch Url: http://www.gnome.org/ @@ -64,7 +60,6 @@ %lang_package %prep %setup -q -%patch7 -p0 %patch8 %build @@ -116,6 +111,23 @@ %files lang -f %{name}.lang %changelog +* Mon Jan 26 2009 vuntz(a)novell.com +- Remove bug-buddy-hardcode-dump-path.patch: it was added a while + ago, because of a mis-backported patch. +* Sun Dec 14 2008 mboman(a)suse.de +- Update to version 2.25.2: + + Fix a segfault + + Don't free uninitialized memory. + + Drop libgnome and libgnomeui dependencies. + + Make google-breakpad support optional (but enabled by default). + + Obtain the real path of the crashed process by looking in /proc. + + Add an option to delete the included file after bug-buddy has + processed it. + + Implement a logger for pasting critical and fatal warnings in the + stacktraces. + + Include the loaded GTK+ modules in the stacktraces sent to bugzilla. + + Update google-breakpad to SVN r290. + + Compile with all the GLib/GTK+ deprecation flags. * Tue Nov 25 2008 sbrabec(a)suse.cz - Supplement gtk2-32bit/gtk2-64bit in baselibs.conf (bnc#354164). * Mon Oct 20 2008 mboman(a)suse.de ++++++ bug-buddy-2.24.1.tar.bz2 -> bug-buddy-2.25.2.tar.bz2 ++++++ ++++ 26799 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bluez-gnome for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package bluez-gnome for openSUSE:Factory checked in at Fri Feb 6 21:18:59 CET 2009. -------- --- GNOME/bluez-gnome/bluez-gnome.changes 2008-12-01 02:47:30.000000000 +0100 +++ bluez-gnome/bluez-gnome.changes 2009-02-04 04:51:10.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 4 04:49:25 CET 2009 - vuntz(a)novell.com + +- Add bluez-gnome-wizard-custom-pin.patch: allow the user to enter + a custom PIN code, so that it's possible to pair devices with no + keyboard/screen that are unknown to bluez-gnome. Fix bnc#445821. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bluez-gnome-wizard-custom-pin.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-gnome.spec ++++++ --- /var/tmp/diff_new_pack.j10305/_old 2009-02-06 21:17:29.000000000 +0100 +++ /var/tmp/diff_new_pack.j10305/_new 2009-02-06 21:17:29.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bluez-gnome (Version 1.8) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,11 +35,13 @@ Group: System/GUI/GNOME AutoReqProv: on Version: 1.8 -Release: 2 +Release: 4 Summary: Bluetooth helpers for GNOME Source: %{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM bluez-gnome-fix-sendto.patch bnc441677 vuntz(a)novell.com -- Patch taken from Fedora (patch already committed upstream) Patch0: bluez-gnome-fix-sendto.patch +# PATCH-FEATURE-UPSTREAM bluez-gnome-wizard-custom-pin.patch bnc445821 bgo570457 vuntz(a)novell.com -- Allow the user to enter a custom PIN +Patch1: bluez-gnome-wizard-custom-pin.patch Url: http://www.bluez.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -64,6 +66,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure \ @@ -122,6 +125,10 @@ %files lang -f bluetooth-manager.lang %changelog +* Wed Feb 04 2009 vuntz(a)novell.com +- Add bluez-gnome-wizard-custom-pin.patch: allow the user to enter + a custom PIN code, so that it's possible to pair devices with no + keyboard/screen that are unknown to bluez-gnome. Fix bnc#445821. * Mon Dec 01 2008 vuntz(a)novell.com - Add bluez-gnome-fix-sendto.patch to have sending to device working. Fix bnc#441677. ++++++ bluez-gnome-wizard-custom-pin.patch ++++++ Index: bluez-gnome-1.8/wizard/main.c =================================================================== --- bluez-gnome-1.8.orig/wizard/main.c +++ bluez-gnome-1.8/wizard/main.c @@ -27,6 +27,7 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> +#include <gdk/gdkkeysyms.h> #include <dbus/dbus-glib.h> @@ -47,6 +48,11 @@ static gchar *target_pincode = NULL; static guint target_type = BLUETOOTH_TYPE_ANY; static gboolean target_ssp = FALSE; +/* NULL means automatic, anything else is a pincode specified by the user */ +static const gchar *user_pincode = NULL; +static const gchar *last_fixed_pincode = "0000"; + +static GtkWidget *window_assistant = NULL; static GtkWidget *page_search = NULL; static GtkWidget *page_setup = NULL; static GtkWidget *page_summary = NULL; @@ -72,6 +78,9 @@ static gboolean pincode_callback(DBusGMe target_type == BLUETOOTH_TYPE_HEADPHONE) pincode = "0000"; + if (user_pincode != NULL && strlen(user_pincode) == 4) + pincode = user_pincode; + text = g_strdup_printf(_("Please enter the following PIN code: %s"), pincode); gtk_label_set_markup(GTK_LABEL(label_passkey), text); @@ -337,6 +346,19 @@ static void create_type(GtkWidget *assis } #endif +static void set_page_search_complete(void) +{ + int selected; + gboolean complete; + + selected = gtk_tree_selection_count_selected_rows (search_selection); + complete = (selected != 0 && + (user_pincode == NULL || strlen(user_pincode) == 4)); + + gtk_assistant_set_page_complete(GTK_ASSISTANT (window_assistant), + page_search, complete); +} + static void select_callback(GtkTreeSelection *selection, gpointer user_data) { GtkAssistant *assistant = user_data; @@ -368,7 +390,7 @@ static void select_callback(GtkTreeSelec target_type = type; } - gtk_assistant_set_page_complete(assistant, page_search, selected); + set_page_search_complete(); } static gboolean device_filter(GtkTreeModel *model, @@ -381,6 +403,54 @@ static gboolean device_filter(GtkTreeMod return (paired == TRUE) ? FALSE : TRUE; } +static gboolean entry_custom_event(GtkWidget *entry, + GdkEventKey *event, GtkWidget *box) +{ + if (event->length == 0) + return FALSE; + + if ((event->keyval >= GDK_0 && event->keyval <= GDK_9) || + (event->keyval >= GDK_KP_0 && event->keyval <= GDK_KP_9)) + return FALSE; + + return TRUE; +} + +static void entry_custom_changed(GtkWidget *entry, gpointer user_data) +{ + user_pincode = gtk_entry_get_text(GTK_ENTRY(entry)); + set_page_search_complete(); +} + +static void toggle_set_sensitive(GtkWidget *button, GtkWidget *widget) +{ + gboolean active; + + active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)); + gtk_widget_set_sensitive(widget, active); +} + +static void set_user_pincode(GtkWidget *button, const gchar *pincode) +{ + if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) + return; + + if (pincode == NULL && user_pincode != NULL) + last_fixed_pincode = user_pincode; + + user_pincode = pincode; + set_page_search_complete(); +} + +static void set_from_last_fixed_pincode(GtkWidget *button, gpointer user_data) +{ + if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) + return; + + user_pincode = last_fixed_pincode; + set_page_search_complete(); +} + static void create_search(GtkWidget *assistant) { GtkWidget *vbox; @@ -389,6 +459,16 @@ static void create_search(GtkWidget *ass GtkTreeModel *model; GtkTreeModel *sorted; GtkTreeSelection *selection; + GtkWidget *radio_auto; + GtkWidget *radio_fixed; + GtkWidget *align_fixed; + GtkWidget *vbox_fixed; + GtkWidget *radio_0000; + GtkWidget *radio_1111; + GtkWidget *radio_1234; + GtkWidget *hbox_custom; + GtkWidget *radio_custom; + GtkWidget *entry_custom; vbox = create_vbox(assistant, GTK_ASSISTANT_PAGE_CONTENT, _("Device search"), @@ -418,6 +498,62 @@ static void create_search(GtkWidget *ass gtk_container_add(GTK_CONTAINER(scrolled), tree); + radio_auto = gtk_radio_button_new_with_mnemonic(NULL, + _("_Automatic PIN code selection")); + gtk_container_add(GTK_CONTAINER(vbox), radio_auto); + + radio_fixed = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio_auto), _("Use _fixed PIN code:")); + gtk_container_add(GTK_CONTAINER(vbox), radio_fixed); + + align_fixed = gtk_alignment_new(0, 0, 1, 1); + gtk_alignment_set_padding(GTK_ALIGNMENT(align_fixed), 0, 0, 24, 0); + gtk_container_add(GTK_CONTAINER(vbox), align_fixed); + vbox_fixed = gtk_vbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER(align_fixed), vbox_fixed); + + radio_0000 = gtk_radio_button_new_with_label(NULL, _("'0000' (most headsets, mice and GPS devices)")); + gtk_container_add(GTK_CONTAINER(vbox_fixed), radio_0000); + + radio_1111 = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio_0000), _("'1111'")); + gtk_container_add(GTK_CONTAINER(vbox_fixed), radio_1111); + + radio_1234 = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio_0000), _("'1234'")); + gtk_container_add(GTK_CONTAINER(vbox_fixed), radio_1234); + + hbox_custom = gtk_hbox_new(FALSE, 6); + radio_custom = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio_0000), _("Custom PIN code:")); + entry_custom = gtk_entry_new_with_max_length(4); + gtk_entry_set_width_chars(GTK_ENTRY(entry_custom), 4); + g_signal_connect (entry_custom, "key-press-event", + G_CALLBACK (entry_custom_event), NULL); + g_signal_connect (entry_custom, "changed", + G_CALLBACK (entry_custom_changed), NULL); + gtk_box_pack_start(GTK_BOX(hbox_custom), radio_custom, + FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox_custom), entry_custom, + FALSE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(vbox_fixed), hbox_custom); + + toggle_set_sensitive(radio_fixed, vbox_fixed); + g_signal_connect(radio_fixed, "toggled", + G_CALLBACK(toggle_set_sensitive), vbox_fixed); + toggle_set_sensitive(radio_custom, entry_custom); + g_signal_connect(radio_custom, "toggled", + G_CALLBACK(toggle_set_sensitive), entry_custom); + + g_signal_connect(radio_auto, "toggled", + G_CALLBACK(set_user_pincode), NULL); + g_signal_connect(radio_fixed, "toggled", + G_CALLBACK(set_from_last_fixed_pincode), NULL); + g_signal_connect(radio_0000, "toggled", + G_CALLBACK(set_user_pincode), "0000"); + g_signal_connect(radio_1111, "toggled", + G_CALLBACK(set_user_pincode), "1111"); + g_signal_connect(radio_1234, "toggled", + G_CALLBACK(set_user_pincode), "1234"); + g_signal_connect_swapped (radio_custom, "toggled", + G_CALLBACK (entry_custom_changed), entry_custom); + page_search = vbox; } @@ -529,6 +665,7 @@ int main(int argc, char *argv[]) bluetooth_agent_setup(agent, AGENT_PATH); window = create_wizard(); + window_assistant = window; bluetooth_instance_set_window(instance, GTK_WINDOW(window)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bigboard for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package bigboard for openSUSE:Factory checked in at Fri Feb 6 21:17:21 CET 2009. -------- --- GNOME/bigboard/bigboard.changes 2008-09-30 22:46:12.000000000 +0200 +++ bigboard/bigboard.changes 2008-12-29 02:45:43.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 29 12:44:20 EST 2008 - mboman(a)suse.de + +- Update to version 0.6.4: + + No NEWS file supplied + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bigboard-0.6.2.tar.bz2 New: ---- bigboard-0.6.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bigboard.spec ++++++ --- /var/tmp/diff_new_pack.gN9321/_old 2009-02-06 21:16:26.000000000 +0100 +++ /var/tmp/diff_new_pack.gN9321/_new 2009-02-06 21:16:26.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package bigboard (Version 0.6.2) +# spec file for package bigboard (Version 0.6.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,7 +41,7 @@ Requires: python-gdata Requires: python-gnome Requires: python-hippo-canvas -Version: 0.6.2 +Version: 0.6.4 Release: 1 Summary: An experimental new sidebar for the Online Desktop Group: System/GUI/GNOME @@ -92,6 +92,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Mon Dec 29 2008 mboman(a)suse.de +- Update to version 0.6.4: + + No NEWS file supplied * Fri Sep 12 2008 maw(a)suse.de - Update to version 0.6.2: + Autodetect whether shutdown icon is called gnome-shutdown or ++++++ bigboard-0.6.2.tar.bz2 -> bigboard-0.6.4.tar.bz2 ++++++ ++++ 29842 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/bigboard/google.py new/bigboard-0.6.4/bigboard/google.py --- old/bigboard-0.6.2/bigboard/google.py 2008-09-02 23:07:28.000000000 +0200 +++ new/bigboard-0.6.4/bigboard/google.py 2008-10-28 15:49:55.000000000 +0100 @@ -578,6 +578,13 @@ except dbus.DBusException, e: _logger.error("onlineaccounts DBus service not available, can't refresh googles") return + + try: + __onlineaccounts_proxy.EnsureAccountType("google", "Google", "Gmail or Google Apps for Your Domain email", "http://gmail.com") + except dbus.DBusException, e: + _logger.error(e.message) + return + gaccount_paths = __onlineaccounts_proxy.GetEnabledAccountsWithTypes(['google']) new_googles = {} for g_path in gaccount_paths: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/bigboard/google_stock.py new/bigboard-0.6.4/bigboard/google_stock.py --- old/bigboard-0.6.2/bigboard/google_stock.py 2008-09-02 23:07:28.000000000 +0200 +++ new/bigboard-0.6.4/bigboard/google_stock.py 2008-10-28 15:49:55.000000000 +0100 @@ -43,6 +43,12 @@ _logger.error("onlineaccounts DBus service not available, can't get google accounts") return + try: + self.__onlineaccounts_proxy.EnsureAccountType("google", "Google", "Gmail or Google Apps for Your Domain email", "http://gmail.com") + except dbus.DBusException, e: + _logger.error(e.message) + return + all_google_account_paths = self.__onlineaccounts_proxy.GetEnabledAccountsWithTypes(["google"]) for a_path in all_google_account_paths: self.__on_account_added(a_path) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/bigboard/stocks/self/portfoliomanager.py new/bigboard-0.6.4/bigboard/stocks/self/portfoliomanager.py --- old/bigboard-0.6.2/bigboard/stocks/self/portfoliomanager.py 2008-09-02 23:07:28.000000000 +0200 +++ new/bigboard-0.6.4/bigboard/stocks/self/portfoliomanager.py 2008-10-28 15:49:54.000000000 +0100 @@ -293,9 +293,14 @@ def __on_open_accounts_dialog(self): try: onlineaccounts_proxy = dbus.SessionBus().get_object('org.gnome.OnlineAccounts', '/onlineaccounts') - onlineaccounts_proxy.OpenAccountsDialog(gtk.get_current_event_time()) except dbus.DBusException, e: _logger.error("onlineaccounts DBus service not available, can't open accounts dialog") + + try: + onlineaccounts_proxy.OpenAccountsDialog(gtk.get_current_event_time()) + except dbus.DBusException, e: + _logger.error(e.message) + self.__hide_reset() def __on_google_gadget_add(self, but): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/bigboard/stocks/self/SelfStock.py new/bigboard-0.6.4/bigboard/stocks/self/SelfStock.py --- old/bigboard-0.6.2/bigboard/stocks/self/SelfStock.py 2008-09-03 18:23:03.000000000 +0200 +++ new/bigboard-0.6.4/bigboard/stocks/self/SelfStock.py 2008-10-28 21:39:49.000000000 +0100 @@ -57,6 +57,7 @@ self.connect("activated", lambda s2: self.__launch_browser()) self.set_clickable(True) self.set_acct(acct) + self.set_property("tooltip", self.__acct.link) def set_acct(self, acct): if self.__acct: @@ -399,7 +400,7 @@ def __do_logout(self): self._panel.action_taken() - self.__get_session_manager().Logout(0) + self.__get_session_manager().Logout(dbus.UInt32(0)) def __do_shutdown(self): self._panel.action_taken() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/bigboard/stocks/twitter/TwitterStock.py new/bigboard-0.6.4/bigboard/stocks/twitter/TwitterStock.py --- old/bigboard-0.6.2/bigboard/stocks/twitter/TwitterStock.py 2008-09-02 23:07:28.000000000 +0200 +++ new/bigboard-0.6.4/bigboard/stocks/twitter/TwitterStock.py 2008-10-28 15:49:55.000000000 +0100 @@ -110,6 +110,12 @@ except dbus.DBusException, e: _logger.error("onlineaccounts DBus service not available, can't get twitter accounts") return + + try: + self.__onlineaccounts_proxy.EnsureAccountType(TYPE_TWITTER, "Twitter", "Twitter username", "http://twitter.com") + except dbus.DBusException, e: + _logger.error(e.message) + return all_twitter_account_paths = self.__onlineaccounts_proxy.GetEnabledAccountsWithTypes([TYPE_TWITTER]) for a_path in all_twitter_account_paths: @@ -123,8 +129,7 @@ self.__connections.add(self.__onlineaccounts_proxy, id) def _on_delisted(self): - if self.__twitter_account: - self.__on_account_removed(self.__twitter_account.GetObjectPath()) + self.__remove_current_account() self.__connections.disconnect_all() def get_content(self, size): @@ -144,8 +149,7 @@ _logger.debug("in __on_account_added for %s %s" % (str(acct), acct.GetUsername())) - if self.__twitter_account: - self.__on_account_removed(self.__twitter_account.GetObjectPath()) + self.__remove_current_account() self.__twitter_account = acct self.__twitter_account_changed_signal_match = \ @@ -153,10 +157,9 @@ self.__on_twitter_account_changed() @log_except(_logger) - def __on_account_removed(self, acct_path): - _logger.debug("in __on_account_removed") - if self.__twitter_account and self.__twitter_account.GetObjectPath() == acct_path: - _logger.debug("in __on_account_removed for %s", acct_path) + def __remove_current_account(self): + if self.__twitter_account: + _logger.debug("in __remove_current_account for %s", self.__twitter_account.GetObjectPath()) self.__twitter_account_changed_signal_match.remove() self.__twitter_account_changed_signal_match = None self.__twitter_account = None @@ -165,6 +168,18 @@ self.__box.append(self.__login_button) @log_except(_logger) + def __on_account_removed(self, acct_path): + _logger.debug("in __on_account_removed") + if self.__twitter_account and self.__twitter_account.GetObjectPath() == acct_path: + self.__remove_current_account() + + # try getting some other Twitter account in case there is another one out there + # that is enabled + all_twitter_account_paths = self.__onlineaccounts_proxy.GetEnabledAccountsWithTypes([TYPE_TWITTER]) + for a_path in all_twitter_account_paths: + self.__on_account_added(a_path) + + @log_except(_logger) def __on_twitter_account_changed(self): _logger.debug("will change stuff") username = self.__twitter_account.GetUsername() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/configure.ac new/bigboard-0.6.4/configure.ac --- old/bigboard-0.6.2/configure.ac 2008-09-09 00:09:53.000000000 +0200 +++ new/bigboard-0.6.4/configure.ac 2008-10-28 23:05:56.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT(bigboard, 0.6.2, feedback(a)mugshot.org) +AC_INIT(bigboard, 0.6.4, feedback(a)mugshot.org) AC_CONFIG_SRCDIR(main.py) AC_CONFIG_MACRO_DIR([m4]) @@ -165,7 +165,7 @@ AC_SUBST(BIGBOARD_APPLET_LIBS) AC_SUBST(BIGBOARD_APPLET_CFLAGS) -PKG_CHECK_MODULES(EMPATHY, libmissioncontrol libempathy libempathy-gtk pygobject-2.0) +PKG_CHECK_MODULES(EMPATHY, libmissioncontrol libempathy libempathy-gtk pygobject-2.0 gtk+-2.0 libxml-2.0) AC_PATH_PROG(GCONFTOOL, gconftool-2) AM_GCONF_SOURCE_2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/m4/intltool.m4 new/bigboard-0.6.4/m4/intltool.m4 --- old/bigboard-0.6.2/m4/intltool.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/bigboard-0.6.4/m4/intltool.m4 2008-10-28 16:24:22.000000000 +0100 @@ -0,0 +1,200 @@ +## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- +## Copyright (C) 2001 Eazel, Inc. +## Author: Maciej Stachowiak <mjs(a)noisehavoc.org> +## Kenneth Christiansen <kenneth(a)gnu.org> +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## As a special exception to the GNU General Public License, if you +## distribute this file as part of a program that contains a +## configuration script generated by Autoconf, you may include it under +## the same distribution terms that you use for the rest of that program. + +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 40 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl + +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; +esac + +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $1]) + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + ] + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +fi + +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) +fi + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + +AC_SUBST(INTLTOOL_DESKTOP_RULE) +AC_SUBST(INTLTOOL_DIRECTORY_RULE) +AC_SUBST(INTLTOOL_KEYS_RULE) +AC_SUBST(INTLTOOL_PROP_RULE) +AC_SUBST(INTLTOOL_OAF_RULE) +AC_SUBST(INTLTOOL_PONG_RULE) +AC_SUBST(INTLTOOL_SERVER_RULE) +AC_SUBST(INTLTOOL_SHEET_RULE) +AC_SUBST(INTLTOOL_SOUNDLIST_RULE) +AC_SUBST(INTLTOOL_UI_RULE) +AC_SUBST(INTLTOOL_XAM_RULE) +AC_SUBST(INTLTOOL_KBD_RULE) +AC_SUBST(INTLTOOL_XML_RULE) +AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) +AC_SUBST(INTLTOOL_CAVES_RULE) +AC_SUBST(INTLTOOL_SCHEMAS_RULE) +AC_SUBST(INTLTOOL_THEME_RULE) +AC_SUBST(INTLTOOL_SERVICE_RULE) +AC_SUBST(INTLTOOL_POLICY_RULE) + +# Check the gettext tools to make sure they are GNU +AC_PATH_PROG(XGETTEXT, xgettext) +AC_PATH_PROG(MSGMERGE, msgmerge) +AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi + +AC_PATH_PROG(INTLTOOL_PERL, [perl]) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found; required for intltool]) +fi +if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then + AC_MSG_ERROR([perl 5.x required for intltool]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi +fi + +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) + +# Set DATADIRNAME correctly if it is not set yet +# (copied from glib-gettext.m4) +if test -z "$DATADIRNAME"; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], + [[extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr]])], + [DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share + dnl in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [DATADIRNAME=share], [DATADIRNAME=lib]) + ;; + *) + [DATADIRNAME=lib] + ;; + esac]) +fi +AC_SUBST(DATADIRNAME) + +IT_PO_SUBDIR([po]) + +]) + + +# IT_PO_SUBDIR(DIRNAME) +# --------------------- +# All po subdirs have to be declared with this macro; the subdir "po" is +# declared by IT_PROG_INTLTOOL. +# +AC_DEFUN([IT_PO_SUBDIR], +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. +dnl +dnl The following CONFIG_COMMANDS should be exetuted at the very end +dnl of config.status. +AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) + fi + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d + s/^[[].*] *// + /^[ ]*$/d + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } + ' "$1/Makefile.in" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" + ]) +])dnl +]) + +# deprecated macros +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +# A hint is needed for aclocal from Automake <= 1.9.4: +# AC_DEFUN([AC_PROG_INTLTOOL], ...) + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/main.py new/bigboard-0.6.4/main.py --- old/bigboard-0.6.2/main.py 2008-06-28 01:59:19.000000000 +0200 +++ new/bigboard-0.6.4/main.py 2008-10-28 16:07:17.000000000 +0100 @@ -37,6 +37,7 @@ # TODO: figure out an algorithm for removing pixbufs from the cache _surfacecache = {} +_emptysurface = None _mtimecache = {} def _get_mtime(filename): try: @@ -62,19 +63,33 @@ try: if img_name.find(os.sep) >= 0: pixbuf = gtk.gdk.pixbuf_new_from_file(img_name) - _logger.debug("loaded from file '%s': %s" % (img_name,pixbuf)) + _logger.debug("loaded from file '%s': %s", img_name, pixbuf) if pixbuf: _mtimecache[img_name] = _get_mtime(img_name) else: theme = gtk.icon_theme_get_default() pixbuf = theme.load_icon(img_name, 60, gtk.ICON_LOOKUP_USE_BUILTIN) - _logger.debug("loaded from icon theme '%s': %s" % (img_name,pixbuf)) - except gobject.GError: - return None - - surface = hippo.cairo_surface_from_gdk_pixbuf(pixbuf) + _logger.debug("loaded from icon theme '%s': %s", img_name,pixbuf) + except gobject.GError, e: + _logger.error("Failed to load icon: '%s'", e.message) + pixbuf = None + + if pixbuf: + surface = hippo.cairo_surface_from_gdk_pixbuf(pixbuf) + _surfacecache[img_name] = surface + + if not surface: + # Returning None will cause a crash, return a 1x1 transparent pixmap + global _emptysurface + if not _emptysurface: + _emptysurface = cairo.ImageSurface(cairo.FORMAT_ARGB32, 1, 1) + cr = cairo.Context(_emptysurface) + cr.set_operator(cairo.OPERATOR_CLEAR) + cr.paint() + surface = _emptysurface + # Cache negative result _surfacecache[img_name] = surface - + return surface def on_name_lost(*args): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/po/Makefile.in.in new/bigboard-0.6.4/po/Makefile.in.in --- old/bigboard-0.6.2/po/Makefile.in.in 2008-06-21 20:04:54.000000000 +0200 +++ new/bigboard-0.6.4/po/Makefile.in.in 2008-10-28 16:24:22.000000000 +0100 @@ -54,16 +54,16 @@ ALL_LINGUAS = @ALL_LINGUAS@ -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) +PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) -USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) +USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) -POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) +POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) -EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS +DISTFILES = Makefile.in.in POTFILES.in $(POFILES) +EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS POTFILES = \ # This comment gets stripped out @@ -101,7 +101,6 @@ install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(itlocaledir) linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 beagle for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package beagle for openSUSE:Factory checked in at Fri Feb 6 21:16:18 CET 2009. -------- --- GNOME/beagle/beagle.changes 2008-12-22 13:59:57.000000000 +0100 +++ beagle/beagle.changes 2009-02-01 23:59:53.000000000 +0100 @@ -1,0 +2,37 @@ +Sat Jan 31 08:53:18 EST 2009 - mboman(a)suse.de + +- Update to version 0.3.9: + + Fix a problem of undeleted tmpfiles when running under mono-2. + + Fix build problems with Gnome.Vfs.MimeApplication + + Fix bgo#543635. Handle quoted queries like + artist:abcd"1234 578". + + Ignore non-http URLs in the firefox extension - fixes the ugly + javascript error popup. + + Fix bgo#547641 - don't crash while minimizing search groups. + + Fix bgo#549549 - don't crash while opening a mimetype without + associated application. + + Fix bgo#546871 - synchronize serialization with libbeagle. + + Fix bgo#551898 - make sure hotkey changes via beagle-settings + is immediately picked up by beagle-search. + + Fix bgo#553159 - use system sys/inotify.h. + + Fix bgo#561429 - add support for Kopete KDE4. + + Fix bgo#556002 - make beagle-status FreeBSD compatible. + + Fix bgo#560812 - add translator-credit tab in the About + dialog. + + Fix bgo#544607 - deal with .desktop files which have empty + lines before the [Desktop Entry] group. + + Do now show duplicate tasks in the list of cancelled tasks. + + Use BEAGLE_DEBUG environment variable to enable/disable debug + at runtime for specific classes. + + Fix bgo#564460 - clean up GLib and GTK+ includes. + + Translation updates +- Remove beagle-fix-toggle-crash.patch. Fixed upstream +- Change sr@Latn to sr@latin +- Update beagle-epiphany-version.patch to support epiphany 2.25 + +------------------------------------------------------------------- +Mon Jan 12 15:25:27 EST 2009 - mauro(a)suse.de + +- Translations update. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- beagle-0.3.8.tar.bz2 beagle-fix-toggle-crash.patch New: ---- beagle-0.3.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beagle.spec ++++++ --- /var/tmp/diff_new_pack.TD5046/_old 2009-02-06 21:14:29.000000000 +0100 +++ /var/tmp/diff_new_pack.TD5046/_new 2009-02-06 21:14:29.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package beagle (Version 0.3.8) +# spec file for package beagle (Version 0.3.9) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ License: The Apache Software License; X11/MIT Group: Productivity/Other AutoReqProv: on -Version: 0.3.8 -Release: 49 +Version: 0.3.9 +Release: 1 Summary: Desktop Search Application Url: http://beagle-project.org Source: %{name}-%{version}.tar.bz2 @@ -49,8 +49,6 @@ Patch11: beagle-epiphany-version.patch # PATCH-FEATURE-UPSTREAM beagle-banshee-support.patch abockover(a)novell.com -- Add BansheeQueryable support for indexing the Banshee collection Patch12: beagle-banshee-support.patch -# PATCH-FIX-UPSTREAM beagle-fix-toggle-crash.patch crivera(a)novell.com -- This is already fixed upstream -Patch13: beagle-fix-toggle-crash.patch Patch14: beagle-fix-scale-results.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /usr/sbin/groupadd /usr/sbin/useradd /bin/rm @@ -441,7 +439,6 @@ %ifnarch s390 s390x %patch12 %endif -%patch13 %patch14 -p1 %build @@ -472,6 +469,8 @@ # This is highly gross. mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ cp %{S:1} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/beagle-system-search.png +# Change sr@Latn to sr@latin +mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin %find_lang %{name} rm $RPM_BUILD_ROOT%{sysconfdir}/xdg/autostart/beagle-search-autostart.desktop #rm $RPM_BUILD_ROOT%{prefix}/%{_lib}/epiphany/*/extensions/*.*a @@ -612,12 +611,43 @@ %{prefix}/lib/monodoc/sources/beagle-docs.* %changelog +* Sat Jan 31 2009 mboman(a)suse.de +- Update to version 0.3.9: + + Fix a problem of undeleted tmpfiles when running under mono-2. + + Fix build problems with Gnome.Vfs.MimeApplication + + Fix bgo#543635. Handle quoted queries like + artist:abcd"1234 578". + + Ignore non-http URLs in the firefox extension - fixes the ugly + javascript error popup. + + Fix bgo#547641 - don't crash while minimizing search groups. + + Fix bgo#549549 - don't crash while opening a mimetype without + associated application. + + Fix bgo#546871 - synchronize serialization with libbeagle. + + Fix bgo#551898 - make sure hotkey changes via beagle-settings + is immediately picked up by beagle-search. + + Fix bgo#553159 - use system sys/inotify.h. + + Fix bgo#561429 - add support for Kopete KDE4. + + Fix bgo#556002 - make beagle-status FreeBSD compatible. + + Fix bgo#560812 - add translator-credit tab in the About + dialog. + + Fix bgo#544607 - deal with .desktop files which have empty + lines before the [Desktop Entry] group. + + Do now show duplicate tasks in the list of cancelled tasks. + + Use BEAGLE_DEBUG environment variable to enable/disable debug + at runtime for specific classes. + + Fix bgo#564460 - clean up GLib and GTK+ includes. + + Translation updates +- Remove beagle-fix-toggle-crash.patch. Fixed upstream +- Change sr@Latn to sr@latin +- Update beagle-epiphany-version.patch to support epiphany 2.25 +* Mon Jan 12 2009 mauro(a)suse.de +- Translations update. * Mon Dec 22 2008 ro(a)suse.de - fix build on s390 s390x (no banshee there) * Wed Dec 10 2008 pwu(a)suse.de - Fixes a bug introduced by beagle-scale-results.patch. Add a new patch beagle-fix-scale-results.patch. (bnc#457882) -* Sat Dec 06 2008 mauro(a)suse.de +* Fri Dec 05 2008 mauro(a)suse.de - Added updated translations. * Thu Oct 16 2008 crivera(a)suse.de - Add beagle-fix-toggle-crash.patch. This fixes bnc#433205. @@ -728,7 +758,7 @@ category based on the window size. * Sun Apr 13 2008 aj(a)suse.de - Fix typo in requires for beagle-epiphany. -* Fri Apr 04 2008 jpr(a)suse.de +* Thu Apr 03 2008 jpr(a)suse.de - Update to 0.3.5 * Fix build with recent NDesk-DBus. * Fix building of Epiphany extension and add support for Epiphany 2.22 @@ -793,9 +823,9 @@ - Fix build requirements. * Mon Mar 17 2008 jpr(a)suse.de - Fix upgrade of package from broken icon installation (#365854) -* Wed Mar 05 2008 jpr(a)suse.de +* Tue Mar 04 2008 jpr(a)suse.de - Fix icon installation (#365854) -* Fri Feb 22 2008 ro(a)suse.de +* Thu Feb 21 2008 ro(a)suse.de - accept epiphany versions 2.21 and 2.22 in configure * Mon Feb 11 2008 jpr(a)suse.de - Update to 0.3.3 @@ -1093,7 +1123,7 @@ still running even after it has finished. - Work around a SharpZipLib bug that could cause beagle to loop infinitely on some archive files. (bgo #402280) -* Fri Jan 26 2007 joeshaw(a)suse.de +* Thu Jan 25 2007 joeshaw(a)suse.de - Update to 0.2.15.1: - Large memory reduction on Evo IMAP folders - Uses SCHED_BATCH scheduler policy @@ -1162,7 +1192,7 @@ - Add %%py_requires to libbeagle. Fixes bnc #207921 * Tue Sep 19 2006 stbinner(a)suse.de - fix build for 10.1 -* Tue Sep 19 2006 joeshaw(a)suse.de +* Mon Sep 18 2006 joeshaw(a)suse.de - Update package to 0.2.10. Fixes bgo #354161, #354776, #351913, [#355239], #348139, and probably most seriously #355932. Also fixes a handful of other small bugs. @@ -1174,7 +1204,7 @@ - added a patch to fix an error with a function that could return random data in beagle-scheduler-information.c and beagle-queryable-status.c -* Sun Sep 03 2006 aj(a)suse.de +* Sat Sep 02 2006 aj(a)suse.de - Cleanup BuildRequires. - Fix build - do not package epiphany until beagle works with epiphany 2.16. @@ -1184,7 +1214,7 @@ thunderbird backend. * Thu Aug 17 2006 cthiel(a)suse.de - buildrequire python-gtk-devel instead of python-gobject2-devel -* Wed Aug 16 2006 ro(a)suse.de +* Tue Aug 15 2006 ro(a)suse.de - added python-gobject2-devel to BuildRequires * Tue Jul 11 2006 stbinner(a)suse.de - Add upstream patch to fix libbeagle socket path for NFS @@ -1248,7 +1278,7 @@ * Thu May 11 2006 danw(a)suse.de - Update calendar tile patch to only show the first line of events with very long descriptions. #174398 -* Wed May 03 2006 joeshaw(a)suse.de +* Tue May 02 2006 joeshaw(a)suse.de - Add a patch to detect audio/x-vorbis+ogg as a valid music mime type. (Beagle equivalent of bnc #169616) * Tue May 02 2006 joeshaw(a)suse.de @@ -1361,7 +1391,7 @@ * Mon Feb 06 2006 joeshaw(a)suse.de - Query for the screensaver extension before trying to use it. (bnc #148219) -* Mon Feb 06 2006 ro(a)suse.de +* Sun Feb 05 2006 ro(a)suse.de - fix build for < 10.1 * Sun Feb 05 2006 aj(a)suse.de - Package /etc/beagle to make it build again. @@ -1378,7 +1408,7 @@ - Update packae to version 0.2.1 - Split out GUI parts into beagle-gui, which should reduce deps on core beagle package -* Fri Jan 27 2006 gekker(a)suse.de +* Thu Jan 26 2006 gekker(a)suse.de - Drop gnome-icon-theme from requires, not needed - Drop gtk-sharp-complete and specify the needed subpackages * Thu Jan 26 2006 joeshaw(a)suse.de @@ -1403,7 +1433,7 @@ - Remove an unnecessary warning patch. - Update lib64 patch to apply cleanly to 0.1.4 - add -fno-strict-aliasing to the python wrapper -* Thu Dec 22 2005 joeshaw(a)suse.de +* Wed Dec 21 2005 joeshaw(a)suse.de - Update package to version 0.1.4 - Disable building of best, since we're now shipping holmes, and it'll soon be integrated into the beagle tarball. @@ -1441,11 +1471,11 @@ - Enabled epiphany plugin. - Fixed syntax error in Czech translation. - Fixed scriptlets. -* Fri Oct 21 2005 ro(a)suse.de +* Thu Oct 20 2005 ro(a)suse.de - rename gecko-sharp-2_0 to gecko-sharp2 in nfb * Mon Oct 17 2005 gekker(a)suse.de - Add a fixed best.png for the icon file. -* Wed Oct 12 2005 ro(a)suse.de +* Tue Oct 11 2005 ro(a)suse.de - use mozilla-devel-packages in nfb - try xulrunner if nothing else is found * Tue Oct 04 2005 gekker(a)suse.de @@ -1547,7 +1577,7 @@ - Remove gtk-sharp-gapi from Requires. * Sat Mar 19 2005 gekker(a)suse.de - Add beagle-uri-xml.patch, change best.desktop exec -* Sat Mar 19 2005 gekker(a)suse.de +* Fri Mar 18 2005 gekker(a)suse.de - Update to version 0.0.8 * Fri Mar 18 2005 gekker(a)suse.de - Update to verison 0.0.7.600 @@ -1559,7 +1589,7 @@ * Mon Mar 14 2005 gekker(a)suse.de - Update to version 0.0.7.200 - Add mono-data-sqlite to Requires (72161). -* Tue Mar 08 2005 gekker(a)suse.de +* Mon Mar 07 2005 gekker(a)suse.de - Remove wsdl-crash.patch, no longer need to work around crash in mcs * Mon Mar 07 2005 gekker(a)suse.de - Update to version 0.0.7.100 @@ -1567,13 +1597,13 @@ - removed dbus-1-devel from Requires (not needed) * Mon Feb 28 2005 clahey(a)suse.de - New version 0.0.6.200. -* Sat Feb 26 2005 gekker(a)suse.de +* Fri Feb 25 2005 gekker(a)suse.de - add mono-web and dbus-1-devel to Requires * Mon Feb 21 2005 gekker(a)suse.de - Update to version 0.0.6.100 - This is the first version that works without inotify - Add wsdl-crash.diff -* Fri Feb 18 2005 gekker(a)suse.de +* Thu Feb 17 2005 gekker(a)suse.de - Update to version 0.0.6.1 (supports dbus-1-0.23.1). * Fri Feb 04 2005 gekker(a)suse.de - Initial import of beagle version 0.0.5 ++++++ beagle-0.3.8.tar.bz2 -> beagle-0.3.9.tar.bz2 ++++++ ++++ 31662 lines of diff (skipped) ++++++ beagle-epiphany-version.patch ++++++ --- /var/tmp/diff_new_pack.TD5046/_old 2009-02-06 21:14:33.000000000 +0100 +++ /var/tmp/diff_new_pack.TD5046/_new 2009-02-06 21:14:33.000000000 +0100 @@ -7,7 +7,7 @@ dnl need to see the handling of the epiphany_version variable in the dnl epiphany extension code - VALID_EPIPHANY_VERSIONS="2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6" -+ VALID_EPIPHANY_VERSIONS="2.24 2.23 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6" ++ VALID_EPIPHANY_VERSIONS="2.25 2.24 2.23 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6" for v in $VALID_EPIPHANY_VERSIONS; do AC_MSG_CHECKING([for Epiphany $v]) ++++++ beagle-log-level-warn.patch ++++++ --- /var/tmp/diff_new_pack.TD5046/_old 2009-02-06 21:14:34.000000000 +0100 +++ /var/tmp/diff_new_pack.TD5046/_new 2009-02-06 21:14:34.000000000 +0100 @@ -11,26 +11,3 @@ Log.Always ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version); Log.Always ("Running on {0}", SystemInformation.MonoRuntimeVersion); Log.Always ("Command Line: {0}", -Index: beagled/IndexHelper/IndexHelper.cs -=================================================================== ---- beagled/IndexHelper/IndexHelper.cs.orig -+++ beagled/IndexHelper/IndexHelper.cs -@@ -90,16 +90,13 @@ namespace Beagle.IndexHelper { - else - disable_textcache = false; - -- // FIXME: We always turn on full debugging output! We are still -- // debugging this code, after all... -- //bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null); -+ bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null); - - last_activity = DateTime.Now; - - Log.Initialize (PathFinder.LogDir, - "IndexHelper", -- //debug ? LogLevel.Debug : LogLevel.Warn, -- LogLevel.Debug, -+ debug ? LogLevel.Debug : LogLevel.Warn, - run_by_hand || log_in_fg); - - Log.Always ("Starting Index Helper process (version {0})", ExternalStringsHack.Version); ++++++ beagle-po.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/ar.po new/po/ar.po --- old/po/ar.po 2008-12-05 22:08:10.000000000 +0100 +++ new/po/ar.po 2009-01-08 18:57:02.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-12-04 12:23\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2009-01-08 15:35\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -957,7 +957,7 @@ #: ../tools/Settings.cs:774 ../tools/Settings.cs:863 ../tools/Settings.cs:944 #: ../tools/Settings.cs:1049 ../tools/Settings.cs:1771 msgid "Name" -msgstr "اسم" +msgstr "الاسم" #: ../tools/Settings.cs:857 msgid "Type" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/cs.po new/po/cs.po --- old/po/cs.po 2008-12-05 22:08:14.000000000 +0100 +++ new/po/cs.po 2009-01-12 19:58:14.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-12-03 13:47\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2009-01-09 10:52\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/de.po new/po/de.po --- old/po/de.po 2008-12-05 22:06:17.000000000 +0100 +++ new/po/de.po 2009-01-08 18:55:18.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-12-04 10:07\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2009-01-08 15:19\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/es.po new/po/es.po --- old/po/es.po 2008-12-05 22:08:22.000000000 +0100 +++ new/po/es.po 2009-01-08 18:58:14.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-12-03 09:42\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2009-01-06 09:41\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/fr.po new/po/fr.po --- old/po/fr.po 2008-12-05 22:08:26.000000000 +0100 +++ new/po/fr.po 2009-01-08 18:58:35.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-12-02 15:53\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2009-01-07 15:47\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/it.po new/po/it.po --- old/po/it.po 2008-12-05 22:08:50.000000000 +0100 +++ new/po/it.po 2009-01-12 19:58:18.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-12-04 17:48\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2009-01-08 18:41\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/ja.po new/po/ja.po --- old/po/ja.po 2008-12-05 22:07:54.000000000 +0100 +++ new/po/ja.po 2009-01-08 18:55:59.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-12-03 10:48\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2009-01-05 14:06\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/ko.po new/po/ko.po --- old/po/ko.po 2008-12-05 22:08:32.000000000 +0100 +++ new/po/ko.po 2009-01-08 18:58:50.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-12-03 11:59\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2009-01-08 13:45\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/nl.po new/po/nl.po --- old/po/nl.po 2008-12-05 22:08:35.000000000 +0100 +++ new/po/nl.po 2009-01-08 18:59:05.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-12-03 10:33\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2009-01-08 15:48\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -795,7 +795,7 @@ #: ../search/Beagle.Search/UIManager.cs:94 msgid "Index information" -msgstr "Indexinformatie" +msgstr "Indexgegevens" #: ../search/Beagle.Search/UIManager.cs:97 msgid "_Contents" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/pl.po new/po/pl.po --- old/po/pl.po 2008-12-05 22:08:39.000000000 +0100 +++ new/po/pl.po 2008-12-19 17:16:25.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-12-05 01:26\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2008-12-19 00:45\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -156,11 +156,11 @@ #: ../epiphany-extension/beagle.py.in:239 msgid "Index Link" -msgstr "Indeksuj łącze" +msgstr "Indeksuj odnośnik" #: ../epiphany-extension/beagle.py.in:246 msgid "Reload Config File" -msgstr "Załaduj ponownie plik konfiguracyjny" +msgstr "Wczytaj ponownie plik konfiguracyjny" #: ../epiphany-extension/beagle.py.in:255 msgid "Auto Index" @@ -168,7 +168,7 @@ #: ../epiphany-extension/beagle.py.in:262 msgid "Prompt key words when index on demand" -msgstr "Pytanie o słowa kluczowe podczas indeksowania na żądanie" +msgstr "Monit o słowa kluczowe podczas indeksowania na żądanie" #: ../epiphany-extension/beagle.py.in:289 msgid "Extra keywords to index" @@ -197,7 +197,7 @@ #: ../search/Beagle.Search.Pages/NoMatch.cs:24 msgid "You can select \"Find in: All\" to search everywhere." -msgstr "Można wybrać \"Wyszukiwanie w: wszystkie\", aby szukać wszęd" +msgstr "Można wybrać \"Wyszukiwanie w: wszystkie\", aby szukać wszędzie." #: ../search/Beagle.Search.Pages/NoMatch.cs:26 msgid "You should check the spelling of your search words to see if you accidentally misspelled any words." @@ -238,7 +238,7 @@ #: ../search/Beagle.Search.Pages/RootUser.cs:14 msgid "For security reasons, Beagle cannot be run as root. You should restart as a regular user." -msgstr "Z powodów bezpieczeństwa Beagle nie może zostać uruchomiony przez użytkownika root. Proszę uruchomić ponownie jako zwykły użytkownik." +msgstr "Z powodów bezpieczeństwa program Beagle nie może zostać uruchomiony przez użytkownika root. Proszę uruchomić ponownie jako zwykły użytkownik." #: ../search/Beagle.Search.Pages/StartDaemon.cs:17 msgid "Search service not running" @@ -246,7 +246,7 @@ #: ../search/Beagle.Search.Pages/StartDaemon.cs:19 msgid "The search service does not appear to be running. You can start it by clicking the button below." -msgstr "Usługa wyszukiwania nie wydaje się być uruchomiona. Można ją uruchomić klikając przycisk poniżej." +msgstr "Usługa wyszukiwania nie wydaje się być uruchomiona. Można ją uruchomić, klikając przycisk poniżej." #: ../search/Beagle.Search.Pages/StartDaemon.cs:22 msgid "Start search service" @@ -531,7 +531,7 @@ #: ../search/Beagle.Search.Tiles/Utils.cs:41 msgid "Conversations" -msgstr "Rozmowy / Wiadomości E-Mail" +msgstr "Rozmowy" #: ../search/Beagle.Search.Tiles/Utils.cs:43 #: ../search/Beagle.Search/SearchWindow.cs:91 @@ -667,15 +667,15 @@ #. Default search scope. Should be at the first #: ../search/Beagle.Search/SearchWindow.cs:82 msgid "My Files" -msgstr "Pliki użytkownika" +msgstr "Moje pliki" #: ../search/Beagle.Search/SearchWindow.cs:85 msgid "Pictures" -msgstr "Obrazki" +msgstr "Obrazy" #: ../search/Beagle.Search/SearchWindow.cs:86 msgid "Media" -msgstr "media" +msgstr "Media" #: ../search/Beagle.Search/SearchWindow.cs:87 msgid "Source Code" @@ -732,7 +732,7 @@ #: ../search/Beagle.Search/SearchWindow.cs:530 msgid "Service is already running!" -msgstr "Usługa jest już uruchomiona." +msgstr "Usługa jest już uruchomiona!" #: ../search/Beagle.Search/SearchWindow.cs:545 msgid "Stopping service failed" @@ -740,7 +740,7 @@ #: ../search/Beagle.Search/SearchWindow.cs:546 msgid "Service was not running!" -msgstr "Usługa nie była uruchomiona." +msgstr "Usługa nie była uruchomiona!" #: ../search/Beagle.Search/SearchWindow.cs:560 msgid "Search service stopped" @@ -810,7 +810,7 @@ #: ../search/Beagle.Search/UIManager.cs:94 msgid "Index information" -msgstr "Informacje o indeksie" +msgstr "Indeksuj informacje" #: ../search/Beagle.Search/UIManager.cs:97 msgid "_Contents" @@ -907,11 +907,11 @@ #: ../tools/Settings.cs:363 msgid "Reload configuration" -msgstr "Załaduj ponownie konfigurację" +msgstr "Wczytajj ponownie konfigurację" #: ../tools/Settings.cs:364 msgid "The configuration file has been modified by another application. Do you wish to discard the currently displayed values and reload configuration from disk?" -msgstr "Plik konfiguracyjny został zmieniony przez inną aplikację. Czy odrzucić obecnie wyświetlane wyniki i załadować ponownie konfigurację z dysku?" +msgstr "Plik konfiguracyjny został zmieniony przez inny program. Czy odrzucić obecnie wyświetlane wyniki i wczytać ponownie konfigurację z dysku?" #: ../tools/Settings.cs:498 msgid "Select Path" @@ -963,7 +963,7 @@ #: ../tools/Settings.cs:670 msgid "Remove host" -msgstr "Usuń host" +msgstr "Usuń hosta" #: ../tools/Settings.cs:671 msgid "Are you sure you wish to remove this host from the list?" @@ -988,7 +988,7 @@ #: ../tools/Settings.cs:916 msgid "Mail folder:" -msgstr "Folder e-mail:" +msgstr "Katalog e-mail:" #: ../tools/Settings.cs:951 msgid "Address" @@ -996,7 +996,7 @@ #: ../tools/Settings.cs:1296 msgid "Select Folder" -msgstr "Wybierz folder" +msgstr "Wybierz katalog" #: ../tools/Settings.cs:1322 ../tools/settings.glade.h:36 msgid "P_ath:" @@ -1004,7 +1004,7 @@ #: ../tools/Settings.cs:1327 msgid "M_ail folder:" -msgstr "F_older e-mail:" +msgstr "Kat_alog poczty:" #: ../tools/Settings.cs:1332 msgid "P_attern:" @@ -1045,7 +1045,7 @@ #: ../tools/Settings.cs:1736 msgid "Files and folders on the local file system." -msgstr "Pliki i foldery w lokalnym systemie plików." +msgstr "Pliki i katalogi w lokalnym systemie plików." #: ../tools/Settings.cs:1737 msgid "Mail messages from KMail." @@ -1190,7 +1190,7 @@ #: ../tools/settings.glade.h:9 msgid "Select Mail Folder" -msgstr "Wybierz folder e-mail" +msgstr "Zaznacz katalog poczty" #: ../tools/settings.glade.h:10 msgid "User Interface" @@ -1306,7 +1306,7 @@ #: ../tools/settings.glade.h:40 msgid "Please select the mail folder you wish to exclude from indexing. " -msgstr "Folder e-mail który nie będzie indeksowany" +msgstr "Katalog e-mail, który nie będzie indeksowany" #: ../tools/settings.glade.h:41 msgid "Require a password to search this computer remotely" @@ -1322,11 +1322,11 @@ #: ../tools/settings.glade.h:44 msgid "Select Mail Folder" -msgstr "Folder e-mail" +msgstr "Zaznacz katalog poczty" #: ../tools/settings.glade.h:45 msgid "Specify any resources, such as paths, patterns, mail folders or type of objects you wish to exclude from indexing." -msgstr "Wszelkie zasoby, takie jak ścieżki, wzory, foldery poczty lub typ obiektów które mają być indeksowane." +msgstr "Wszelkie zasoby, takie jak ścieżki, wzory, katalogi poczty lub typ obiektów, które mają być indeksowane." #: ../tools/settings.glade.h:46 msgid "Type:" @@ -1346,7 +1346,7 @@ #: ../tools/settings.glade.h:50 msgid "_Folder path" -msgstr "Ś_cieżka folderu" +msgstr "Ś_cieżka katalogu" #: ../tools/settings.glade.h:51 msgid "_Hostname:" @@ -1354,7 +1354,7 @@ #: ../tools/settings.glade.h:52 msgid "_Mail folder" -msgstr "_Folder e-mail" +msgstr "_Katalog poczty" #: ../tools/settings.glade.h:53 msgid "_Password:" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/pt_BR.po new/po/pt_BR.po --- old/po/pt_BR.po 2008-12-05 22:08:18.000000000 +0100 +++ new/po/pt_BR.po 2009-01-08 18:57:49.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-12-04 13:53\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2009-01-05 15:10\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -795,7 +795,7 @@ #: ../search/Beagle.Search/UIManager.cs:94 msgid "Index information" -msgstr "Informações de índice" +msgstr "Informações de Índice" #: ../search/Beagle.Search/UIManager.cs:97 msgid "_Contents" @@ -871,7 +871,7 @@ #: ../search/Beagle.Search/UIManager.cs:276 msgid "Couldn't launch web browser" -msgstr "Não foi possível iniciar o navegador web" +msgstr "Não foi possível iniciar o browser da Web" #: ../search/beagle-search.desktop.in.in.h:1 msgid "Search" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/ru.po new/po/ru.po --- old/po/ru.po 2008-12-05 22:06:11.000000000 +0100 +++ new/po/ru.po 2009-01-08 18:54:41.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-11-17 16:09\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2009-01-05 16:57\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -89,9 +89,9 @@ #, csharp-format msgid "{0} day ago, {1}" msgid_plural "{0} days ago, {1}" -msgstr[0] "{0} день тому назад, {1}" -msgstr[1] "{0} дня тому назад, {1}" -msgstr[2] "{0} дней тому назад, {1}" +msgstr[0] "{0} дн. тому назад, в {1}" +msgstr[1] "{0} дн. тому назад, в {1}" +msgstr[2] "{0} дн. тому назад, в {1}" #. Translators: Example output: January 3, 3:45 PM #: ../Util/StringFu.cs:173 @@ -197,7 +197,7 @@ #: ../search/Beagle.Search.Pages/NoMatch.cs:24 msgid "You can select \"Find in: All\" to search everywhere." -msgstr "Для глобального поиска можно выбрать \"Поиск в: Везде\"." +msgstr "Для глобального поиска можно выбрать \"Поиск в: \"Везде\"\"." #: ../search/Beagle.Search.Pages/NoMatch.cs:26 msgid "You should check the spelling of your search words to see if you accidentally misspelled any words." @@ -238,7 +238,7 @@ #: ../search/Beagle.Search.Pages/RootUser.cs:14 msgid "For security reasons, Beagle cannot be run as root. You should restart as a regular user." -msgstr "Из соображений безопасности Beagle не может быть запущен от имени пользователя root. Перезапустите программу как обычный пользователь." +msgstr "Из соображений безопасности Beagle не может быть запущен от имени суперпользователя. Перезапустите программу как обычный пользователь." #: ../search/Beagle.Search.Pages/StartDaemon.cs:17 msgid "Search service not running" @@ -470,7 +470,7 @@ #: ../search/Beagle.Search.Tiles/RSSFeed.cs:60 msgid "Site:" -msgstr "Сайт:" +msgstr "Веб-сайт:" #: ../search/Beagle.Search.Tiles/RSSFeed.cs:61 msgid "Date Viewed:" @@ -636,9 +636,9 @@ #, csharp-format msgid "{0} result" msgid_plural "{0} results" -msgstr[0] "{0} байт" -msgstr[1] "{0} байта" -msgstr[2] "{0} байтов" +msgstr[0] "{0} вариант" +msgstr[1] "{0} варианта" +msgstr[2] "{0} вариантов" #: ../search/Beagle.Search/Category.cs:129 #, csharp-format @@ -651,7 +651,7 @@ #: ../search/Beagle.Search/Driver.cs:136 msgid "Cannot run with parameter '--icon' when session D-Bus is not accessible." -msgstr "При недоступном сеансе D-Bus запуск с параметром '--icon' невозможен." +msgstr "При недоступном сеансе D-Bus запуск с параметром \"--icon\" невозможен." #: ../search/Beagle.Search/NotificationArea.cs:63 msgid "Hide" @@ -720,7 +720,7 @@ #: ../search/Beagle.Search/SearchWindow.cs:486 msgid "You can select to search other computers from the \"Search\" menu." -msgstr "Поиск других компьютеров можно выбрать в меню \"Поиск\" menu." +msgstr "Поиск других компьютеров можно выбрать в меню \"Поиск\" ." #: ../search/Beagle.Search/SearchWindow.cs:518 msgid "Search service started" @@ -826,7 +826,7 @@ #: ../search/Beagle.Search/UIManager.cs:125 msgid "Sort by Date _Modified" -msgstr "Сортировать по _дате изменения" +msgstr "_По дате изменения" #: ../search/Beagle.Search/UIManager.cs:126 msgid "Sort the most-recently-modified matches first" @@ -834,7 +834,7 @@ #: ../search/Beagle.Search/UIManager.cs:129 msgid "Sort by _Name" -msgstr "Сортировать по _имени" +msgstr "_По имени" #: ../search/Beagle.Search/UIManager.cs:130 msgid "Sort matches by name" @@ -842,7 +842,7 @@ #: ../search/Beagle.Search/UIManager.cs:133 msgid "Sort by _Relevance" -msgstr "По _значимости" +msgstr "_По значимости" #: ../search/Beagle.Search/UIManager.cs:134 msgid "Sort the best matches first" @@ -907,7 +907,7 @@ #: ../tools/Settings.cs:363 msgid "Reload configuration" -msgstr "Перечитать конфигурацию" +msgstr "Перезагрузить конфигурацию" #: ../tools/Settings.cs:364 msgid "The configuration file has been modified by another application. Do you wish to discard the currently displayed values and reload configuration from disk?" @@ -1093,7 +1093,7 @@ #: ../tools/Settings.cs:1748 msgid "Search other search services in the network (EXPERIMENTAL)" -msgstr "Поиск других служб поиска в сети (ЭКСПЕРИМЕНТАЛЬНАЯ ВЕРСИЯ)" +msgstr "Поиск других служб поиска в сети (экспериментальная версия)" #: ../tools/Settings.cs:1749 msgid "Opera's bookmarks and browsing history." @@ -1138,7 +1138,7 @@ #: ../tools/beagle-settings.desktop.in.in.h:1 msgid "Configure Desktop Search" -msgstr "Настроить поиск на рабочем столе" +msgstr "Настроить поисковую систему" #: ../tools/beagle-settings.desktop.in.in.h:2 msgid "Search & Indexing" @@ -1198,7 +1198,7 @@ #: ../tools/settings.glade.h:11 msgid "Changes will take effect only after daemon restart." -msgstr "Изменения вступят в действие после перезагрузки демона." +msgstr "Изменения вступят в действие после перезагрузки." #: ../tools/settings.glade.h:12 msgid "This setting does not apply while on battery power." @@ -1222,7 +1222,7 @@ #: ../tools/settings.glade.h:17 msgid "Add any remote search-enabled hosts you wish to network with." -msgstr "Добавьте любые удаленные хосты с поддержкой поиска, с которыми нужна связь по сети." +msgstr "Добавьте любые удаленные хосты с поддержкой поиска, к которым необходимо подключиться." #: ../tools/settings.glade.h:18 msgid "Adjust which types of results should be visible, and in what order they should be presented when grouped by type." @@ -1230,7 +1230,7 @@ #: ../tools/settings.glade.h:19 msgid "Allow external access to local search services (EXPERIMENTAL)" -msgstr "Разрешить внешний доступ к локальным службам поиска (ЭКСПЕРИМЕНТАЛЬНАЯ ВЕРСИЯ)" +msgstr "Разрешить внешний доступ к локальным службам поиска (экспериментальная версия)" #: ../tools/settings.glade.h:20 msgid "Automatically s_tart searching after the user has stopped typing" @@ -1250,11 +1250,11 @@ #: ../tools/settings.glade.h:24 msgid "Enable the data sources that you want to index and search." -msgstr "Включите источники данных для индексации и поиска." +msgstr "Включить источники данных для индексации и поиска." #: ../tools/settings.glade.h:25 msgid "Enable web interface for local search service" -msgstr "Включить Веб-интерфейс для локальной службы поиска" +msgstr "Включить веб-интерфейс для локальной службы поиска" #: ../tools/settings.glade.h:26 msgid "Exclude Resource" @@ -1290,7 +1290,7 @@ #: ../tools/settings.glade.h:35 msgid "Network options" -msgstr "параметры сети" +msgstr "Параметры сети" #: ../tools/settings.glade.h:37 msgid "Password for {0}" @@ -1298,7 +1298,7 @@ #: ../tools/settings.glade.h:38 msgid "Password:" -msgstr "Па&роль:" +msgstr "Пароль:" #: ../tools/settings.glade.h:39 msgid "Please select a resource you wish to exclude from indexing." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/sv.po new/po/sv.po --- old/po/sv.po 2008-12-05 22:06:23.000000000 +0100 +++ new/po/sv.po 2009-01-08 18:55:35.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-12-02 15:52\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2009-01-08 11:46\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/zh_CN.po new/po/zh_CN.po --- old/po/zh_CN.po 2008-12-05 22:08:06.000000000 +0100 +++ new/po/zh_CN.po 2009-01-08 18:56:37.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-12-04 14:59\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2009-01-05 08:04\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/zh_TW.po new/po/zh_TW.po --- old/po/zh_TW.po 2008-12-05 22:08:00.000000000 +0100 +++ new/po/zh_TW.po 2009-01-08 18:56:20.000000000 +0100 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: beagle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 20:19-0400\n" -"PO-Revision-Date: 2008-12-05 09:02\n" +"POT-Creation-Date: 2008-11-11 00:21-0500\n" +"PO-Revision-Date: 2009-01-06 10:47\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 banshee-1 for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package banshee-1 for openSUSE:Factory checked in at Fri Feb 6 21:14:11 CET 2009. -------- --- GNOME/banshee-1/banshee-1.changes 2009-01-21 01:23:30.000000000 +0100 +++ banshee-1/banshee-1.changes 2009-02-04 19:14:21.000000000 +0100 @@ -1,0 +2,26 @@ +Wed Feb 4 12:09:54 CST 2009 - gburt(a)suse.de + +- Patch fixing playlists not being saved to DAPs (bnc#472526) +- Patch fixing adding files to MTP devices (bnc#472524) +- Patch renaming sr@Latn translation to sr@latin (bnc#472522) + +------------------------------------------------------------------- +Thu Jan 30 13:58:14 CST 2009 - gburt(a)suse.de + +- Patch fixing freeze on DAP load (bnc#465214) +- Patch fixing crash on delete from File System Queue (bnc#467377) +- Patch fixing crash on MTP device load (bnc#470722) +- Patch fixing hang while loading streams (bnc#376532) + +------------------------------------------------------------------- +Wed Jan 21 18:56:25 EST 2009 - abockover(a)novell.com + +- Patch to fix RPMLINT warning about trailing ; on MimeType field + in .desktop files +- Remove some legacy hacks for dealing with openSUSE < 10.3 +- Add logic to bundle certain assemblies when we are building from + the upstream/devel OBS project (Banshee) and not openSUSE or SLE + to allow us to do safe intermediate upgrades of packages outside + of the distro + +------------------------------------------------------------------- @@ -7,0 +34,5 @@ +Mon Jan 12 15:25:27 EST 2009 - mauro(a)suse.de + +- Translations update. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bnc376532-fix-radio-hang-lack-of-feedback.patch bnc465214-freeze-on-dap-load.patch bnc467377-crash-on-delete-from-fsq.patch bnc470722-fix-mtp-device-crash.patch bnc472522-sr-latn-translation-breaks-build.patch bnc472524-adding-files-to-mtp-device-fails.patch bnc472526-dap-playlists-not-saved.patch bundleize-pkg-config.awk desktop-file-trailing-semicolon.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ banshee-1.spec ++++++ --- /var/tmp/diff_new_pack.y22887/_old 2009-02-06 21:02:09.000000000 +0100 +++ /var/tmp/diff_new_pack.y22887/_new 2009-02-06 21:02:09.000000000 +0100 @@ -20,13 +20,22 @@ Name: banshee-1 Version: 1.4.2 -Release: 1 +Release: 2 License: X11/MIT Summary: A music playback and management application Group: Productivity/Multimedia/Sound/Players Url: http://banshee-project.org/ Source0: %{name}-%{version}.tar.bz2 -Source1: banshee-po.tar.bz2 +Source1: bundleize-pkg-config.awk +Source2: banshee-po.tar.bz2 +Patch0: desktop-file-trailing-semicolon.patch +Patch1: bnc465214-freeze-on-dap-load.patch +Patch2: bnc467377-crash-on-delete-from-fsq.patch +Patch3: bnc470722-fix-mtp-device-crash.patch +Patch4: bnc376532-fix-radio-hang-lack-of-feedback.patch +Patch5: bnc472526-dap-playlists-not-saved.patch +Patch6: bnc472524-adding-files-to-mtp-device-fails.patch +Patch7: bnc472522-sr-latn-translation-breaks-build.patch AutoReqProv: on PreReq: filesystem gconf2 ExcludeArch: s390 s390x @@ -34,16 +43,15 @@ BuildRequires: intltool perl-XML-Parser update-desktop-files BuildRequires: gnome-desktop-devel gnome-vfs2-devel gstreamer010-plugins-base-devel sqlite-devel >= 3.4 BuildRequires: gconf-sharp2 glade-sharp2 gtk-sharp2 -BuildRequires: mono-addins mono-data-sqlite mono-devel taglib-sharp +BuildRequires: mono-data-sqlite mono-devel mono-zeroconf BuildRequires: ndesk-dbus ndesk-dbus-glib-devel BuildRequires: ipod-sharp >= 0.8.1 libmtp-devel -BuildRequires: mono-zeroconf %if %suse_version > 1100 %define have_boo 1 BuildRequires: boo-devel >= 0.8.1 %endif Requires: mono-core gstreamer010-plugins-good -Requires: mono-addins >= 0.3 taglib-sharp >= 2.0 ndesk-dbus >= 0.5 ndesk-dbus-glib >= 0.3 +Requires: ndesk-dbus >= 0.5 ndesk-dbus-glib >= 0.3 Requires: %{name}-lang = %{version} Requires: %{name}-backend-engine-gstreamer = %{version} Requires: %{name}-backend-platform-unix = %{version} @@ -51,21 +59,14 @@ Recommends: %{name}-extensions-default = %{version} Obsoletes: banshee helix-banshee Provides: banshee = %{version} helix-banshee = %{version} -# Defines so we can run on older SUSE versions -%if %suse_version < 1030 -%define sysconfdirprivate etc/opt/gnome -%define gnomeprefixprivate opt/gnome -%else -%define sysconfdirprivate etc -%define gnomeprefixprivate usr +%define upstream_project 0 +%if %(echo '%distribution' | grep -Ec '^home:.+:Banshee.*/|^Banshee') +%define upstream_project 1 %endif -%define sysconfdir /%{sysconfdirprivate} -%define gnomeprefix /%{gnomeprefixprivate} -# Hopefully we can get rid of this soon... currently not -# needing it, but we have before, and we may again :-/ -%define autobuild 0 -%if ! %(echo '%distribution' | grep -c '^Banshee') -%define autobuild 1 +%if %upstream_project == 1 +BuildRequires: mono-addins >= 0.4 taglib-sharp >= 2.0.3.1 +%else +BuildRequires: mono-addins taglib-sharp %endif %description @@ -90,8 +91,11 @@ AutoReqProv: on Requires: %{name} = %{version} Requires: gstreamer010-devel gstreamer010-plugins-base-devel gnome-vfs2-devel gtk2-devel -Requires: gtk-sharp2 gconf-sharp2 -Requires: taglib-sharp ndesk-dbus ndesk-dbus-glib-devel mono-addins glib-sharp2 +Requires: glib-sharp2 gtk-sharp2 gconf-sharp2 +Requires: ndesk-dbus ndesk-dbus-glib-devel +%if %upstream_project == 0 +Requires: taglib-sharp mono-addins +%endif %description devel Users who wish to extend Banshee should install this package. It @@ -200,27 +204,54 @@ %lang_package %prep -%setup -q -a1 +%setup -q -a2 +%patch0 +%patch1 +%patch2 +%patch3 +%patch4 +%patch5 +%patch6 +%patch7 +# update pkg-config files for the -devel package since we internalize +# some BuildRequires in cases where we will upgrade a package that +# might also be provided by the distro (e.g. taglib-sharp) +%if %upstream_project == 1 +pushd $RPM_BUILD_DIR/%{name}-%{version}/build/pkg-config +for pkg_config in *.pc.in; do + awk -f %{S:1} < $pkg_config > ${pkg_config}.in + mv ${pkg_config}.in $pkg_config +done +popd +%endif %build %{?env_options} %configure \ - --prefix=%{_prefix} \ - --libdir=%{_prefix}/%{_lib} \ - --sysconfdir=%{sysconfdir} \ --with-vendor-build-id="%distribution" \ %if !0%{?have_boo} --disable-boo \ %endif --disable-docs -make +%{__make} %{?jobs:-j%jobs} %install %makeinstall %find_lang %{name} -chmod -x $RPM_BUILD_ROOT%{_prefix}/%{_lib}/banshee-1/*.config -chmod -x $RPM_BUILD_ROOT%{_prefix}/%{_lib}/banshee-1/*/*.config +chmod -x $RPM_BUILD_ROOT%{_libdir}/banshee-1/*.config +chmod -x $RPM_BUILD_ROOT%{_libdir}/banshee-1/*/*.config %suse_update_desktop_file -N "Banshee" -G "Media Player" %{name} +%suse_update_desktop_file %{name}-audiocd +%suse_update_desktop_file %{name}-media-player +# If we are building for upstream, we want to bundle libraries that +# we might want to differ from the downstream distribution +%if %upstream_project == 1 +for package in taglib-sharp mono-addins; do + for assembly in $(find %{_prefix}/lib/mono/${package}/ -name \*.dll); do + cp $(dirname $(readlink -e $assembly))/* $RPM_BUILD_ROOT%{_libdir}/banshee-1 + done +done +%endif %clean rm -rf "$RPM_BUILD_ROOT" @@ -228,10 +259,10 @@ %files %defattr(-,root,root) %doc NEWS COPYING AUTHORS README -%dir %{_prefix}/%{_lib}/banshee-1 -%dir %{_prefix}/%{_lib}/banshee-1/Extensions -%dir %{_prefix}/%{_lib}/banshee-1/Backends -%dir %{_prefix}/%{_lib}/banshee-1/gstreamer-0.10 +%dir %{_libdir}/banshee-1 +%dir %{_libdir}/banshee-1/Extensions +%dir %{_libdir}/banshee-1/Backends +%dir %{_libdir}/banshee-1/gstreamer-0.10 %dir %{_datadir}/banshee-1 %dir %{_datadir}/banshee-1/audio-profiles %dir %{_datadir}/banshee-1/icons @@ -239,26 +270,26 @@ %dir %{_datadir}/banshee-1/icons/hicolor/* %dir %{_datadir}/banshee-1/icons/hicolor/*/* %{_prefix}/bin/banshee-1 -%{_prefix}/%{_lib}/banshee-1/libbanshee.so -%{_prefix}/%{_lib}/banshee-1/gstreamer-0.10/libgstequalizer.so -%{_prefix}/%{_lib}/banshee-1/Hyena.dll* -%{_prefix}/%{_lib}/banshee-1/Hyena.Gui.dll* -%{_prefix}/%{_lib}/banshee-1/Migo.dll* -%{_prefix}/%{_lib}/banshee-1/MusicBrainz.dll* -%{_prefix}/%{_lib}/banshee-1/Mono.Media.dll* -%{_prefix}/%{_lib}/banshee-1/Lastfm.dll* -%{_prefix}/%{_lib}/banshee-1/Lastfm.Gui.dll* -%{_prefix}/%{_lib}/banshee-1/Banshee.Core.dll* -%{_prefix}/%{_lib}/banshee-1/Banshee.Services.dll* -%{_prefix}/%{_lib}/banshee-1/Banshee.Services.addins -%{_prefix}/%{_lib}/banshee-1/Banshee.Widgets.dll* -%{_prefix}/%{_lib}/banshee-1/Banshee.ThickClient.dll* -%{_prefix}/%{_lib}/banshee-1/Banshee.CollectionIndexer.dll* -%{_prefix}/%{_lib}/banshee-1/Banshee.exe* -%{_prefix}/%{_lib}/banshee-1/Nereid.exe* -%{_prefix}/%{_lib}/banshee-1/Halie.exe* -%{_prefix}/%{_lib}/banshee-1/Beroe.exe* -%{_prefix}/%{_lib}/banshee-1/Muinshee.exe* +%{_libdir}/banshee-1/libbanshee.so +%{_libdir}/banshee-1/gstreamer-0.10/libgstequalizer.so +%{_libdir}/banshee-1/Hyena.dll* +%{_libdir}/banshee-1/Hyena.Gui.dll* +%{_libdir}/banshee-1/Migo.dll* +%{_libdir}/banshee-1/MusicBrainz.dll* +%{_libdir}/banshee-1/Mono.Media.dll* +%{_libdir}/banshee-1/Lastfm.dll* +%{_libdir}/banshee-1/Lastfm.Gui.dll* +%{_libdir}/banshee-1/Banshee.Core.dll* +%{_libdir}/banshee-1/Banshee.Services.dll* +%{_libdir}/banshee-1/Banshee.Services.addins +%{_libdir}/banshee-1/Banshee.Widgets.dll* +%{_libdir}/banshee-1/Banshee.ThickClient.dll* +%{_libdir}/banshee-1/Banshee.CollectionIndexer.dll* +%{_libdir}/banshee-1/Banshee.exe* +%{_libdir}/banshee-1/Nereid.exe* +%{_libdir}/banshee-1/Halie.exe* +%{_libdir}/banshee-1/Beroe.exe* +%{_libdir}/banshee-1/Muinshee.exe* %{_datadir}/dbus-1/services/org.bansheeproject.Banshee.service %{_datadir}/dbus-1/services/org.bansheeproject.CollectionIndexer.service %{_datadir}/banshee-1/audio-profiles/*.xml @@ -269,63 +300,67 @@ %{_datadir}/banshee-1/icons/hicolor/*/actions/media-repeat-single.png %{_datadir}/banshee-1/icons/hicolor/*/actions/encode.png %{_datadir}/applications/banshee-1*.desktop -%{gnomeprefix}/share/icons/hicolor/16x16/apps/media-player-banshee.png -%{gnomeprefix}/share/icons/hicolor/22x22/apps/media-player-banshee.png -%{gnomeprefix}/share/icons/hicolor/24x24/apps/media-player-banshee.png -%{gnomeprefix}/share/icons/hicolor/32x32/apps/media-player-banshee.png -%{gnomeprefix}/share/icons/hicolor/48x48/apps/media-player-banshee.png -%{gnomeprefix}/share/icons/hicolor/192x192/apps/media-player-banshee.png +%{_datadir}/icons/hicolor/16x16/apps/media-player-banshee.png +%{_datadir}/icons/hicolor/22x22/apps/media-player-banshee.png +%{_datadir}/icons/hicolor/24x24/apps/media-player-banshee.png +%{_datadir}/icons/hicolor/32x32/apps/media-player-banshee.png +%{_datadir}/icons/hicolor/48x48/apps/media-player-banshee.png +%{_datadir}/icons/hicolor/192x192/apps/media-player-banshee.png +%if %upstream_project == 1 +%{_libdir}/banshee-1/taglib-sharp.dll* +%{_libdir}/banshee-1/Mono.Addins*.dll* +%endif %files lang -f %{name}.lang %files devel %defattr(-,root,root) -%{_prefix}/%{_lib}/banshee-1/gconf-schema-extractor.exe -%{_prefix}/%{_lib}/pkgconfig/banshee-1-*.pc -%exclude %{_prefix}/%{_lib}/banshee-1/libbanshee.*a -%exclude %{_prefix}/%{_lib}/banshee-1/gstreamer-0.10/libgstequalizer.*a +%{_libdir}/banshee-1/gconf-schema-extractor.exe +%{_libdir}/pkgconfig/banshee-1-*.pc +%exclude %{_libdir}/banshee-1/libbanshee.*a +%exclude %{_libdir}/banshee-1/gstreamer-0.10/libgstequalizer.*a %files backend-engine-gstreamer %defattr(-,root,root) -%{_prefix}/%{_lib}/banshee-1/Backends/Banshee.GStreamer.dll* +%{_libdir}/banshee-1/Backends/Banshee.GStreamer.dll* %files backend-platform-unix %defattr(-,root,root) -%{_prefix}/%{_lib}/banshee-1/Backends/Banshee.Unix.dll* -%{_prefix}/%{_lib}/banshee-1/Backends/Banshee.Hal.dll* +%{_libdir}/banshee-1/Backends/Banshee.Unix.dll* +%{_libdir}/banshee-1/Backends/Banshee.Hal.dll* %files backend-platform-gnome %defattr(-,root,root) -%{_prefix}/%{_lib}/banshee-1/Backends/Banshee.Gnome.dll* -%{_prefix}/%{_lib}/banshee-1/Backends/Banshee.NowPlaying.X11.dll* -%{_prefix}/%{_lib}/banshee-1/Backends/libbnpx11.so +%{_libdir}/banshee-1/Backends/Banshee.Gnome.dll* +%{_libdir}/banshee-1/Backends/Banshee.NowPlaying.X11.dll* +%{_libdir}/banshee-1/Backends/libbnpx11.so %{_datadir}/banshee-1/icons/hicolor/*/actions/media-write-cd.png -%exclude %{_prefix}/%{_lib}/banshee-1/Backends/libbnpx11.*a +%exclude %{_libdir}/banshee-1/Backends/libbnpx11.*a %files extensions-default %defattr(-,root,root) -%{_prefix}/%{_lib}/banshee-1/Mtp.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.InternetRadio.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.Daap.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.Bookmarks.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.CoverArt.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.FileSystemQueue.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.Lastfm.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.MultimediaKeys.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.NotificationArea.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.PlayQueue.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.NowPlaying.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.AudioCd.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.Podcasting.dll* +%{_libdir}/banshee-1/Mtp.dll* +%{_libdir}/banshee-1/Extensions/Banshee.InternetRadio.dll* +%{_libdir}/banshee-1/Extensions/Banshee.Daap.dll* +%{_libdir}/banshee-1/Extensions/Banshee.Bookmarks.dll* +%{_libdir}/banshee-1/Extensions/Banshee.CoverArt.dll* +%{_libdir}/banshee-1/Extensions/Banshee.FileSystemQueue.dll* +%{_libdir}/banshee-1/Extensions/Banshee.Lastfm.dll* +%{_libdir}/banshee-1/Extensions/Banshee.MultimediaKeys.dll* +%{_libdir}/banshee-1/Extensions/Banshee.NotificationArea.dll* +%{_libdir}/banshee-1/Extensions/Banshee.PlayQueue.dll* +%{_libdir}/banshee-1/Extensions/Banshee.NowPlaying.dll* +%{_libdir}/banshee-1/Extensions/Banshee.AudioCd.dll* +%{_libdir}/banshee-1/Extensions/Banshee.Podcasting.dll* %if 0%{?have_boo} -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.BooScript.dll* +%{_libdir}/banshee-1/Extensions/Banshee.BooScript.dll* %endif -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.MiniMode.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.Dap.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.Dap.Mtp.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.Dap.MassStorage.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/Banshee.Dap.Ipod.dll* -%{_prefix}/%{_lib}/banshee-1/Extensions/ipod-sharp*dll* +%{_libdir}/banshee-1/Extensions/Banshee.MiniMode.dll* +%{_libdir}/banshee-1/Extensions/Banshee.Dap.dll* +%{_libdir}/banshee-1/Extensions/Banshee.Dap.Mtp.dll* +%{_libdir}/banshee-1/Extensions/Banshee.Dap.MassStorage.dll* +%{_libdir}/banshee-1/Extensions/Banshee.Dap.Ipod.dll* +%{_libdir}/banshee-1/Extensions/ipod-sharp*dll* %{_datadir}/banshee-1/icons/hicolor/*/categories/lastfm-*.png %{_datadir}/banshee-1/icons/hicolor/*/categories/podcast*.png %{_datadir}/banshee-1/icons/hicolor/*/categories/radio.* @@ -336,9 +371,28 @@ %{_datadir}/banshee-1/icons/hicolor/*/devices/phone-* %changelog +* Wed Feb 04 2009 gburt(a)suse.de +- Patch fixing playlists not being saved to DAPs (bnc#472526) +- Patch fixing adding files to MTP devices (bnc#472524) +- Patch renaming sr@Latn translation to sr@latin (bnc#472522) +* Fri Jan 30 2009 gburt(a)suse.de +- Patch fixing freeze on DAP load (bnc#465214) +- Patch fixing crash on delete from File System Queue (bnc#467377) +- Patch fixing crash on MTP device load (bnc#470722) +- Patch fixing hang while loading streams (bnc#376532) +* Wed Jan 21 2009 abockover(a)novell.com +- Patch to fix RPMLINT warning about trailing ; on MimeType field + in .desktop files +- Remove some legacy hacks for dealing with openSUSE < 10.3 +- Add logic to bundle certain assemblies when we are building from + the upstream/devel OBS project (Banshee) and not openSUSE or SLE + to allow us to do safe intermediate upgrades of packages outside + of the distro * Tue Jan 20 2009 abockover(a)novell.com - Update to 1.4.2 - Bug fix only release that includes all previous patches to 1.4.1 +* Mon Jan 12 2009 mauro(a)suse.de +- Translations update. * Sun Jan 11 2009 gburt(a)suse.de - Patch to fix support for itms podcast subscription inks (bnc#465149) - Patch to fix freeze caused by submitting Last.fm now playing (bnc#465215) @@ -352,7 +406,7 @@ * Sat Jan 10 2009 abockover(a)novell.com - Fix up desktop files (bnc#456120, bnc#459993, bnc#440615, bnc#461677) - Fix primary desktop file to -N "Banshee" -G "Media Player" (bnc#433594) -* Sat Jan 10 2009 abockover(a)novell.com +* Fri Jan 09 2009 abockover(a)novell.com - Patch to set the mimetype for ripped tracks (bnc#464889) - Patch to handle spaces in command line arguments (bnc#440883) - Patch to make xx_YY langs work from xml:lang, fixes zh_CN et al (bnc#449788) ++++++ banshee-po.tar.bz2 ++++++ ++++ 79194 lines of diff (skipped) ++++++ bnc376532-fix-radio-hang-lack-of-feedback.patch ++++++ Index: src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs =================================================================== --- src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs (revision 4986) +++ src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs (working copy) @@ -143,8 +143,10 @@ switch (args.Current) { case PlayerState.Contacting: + case PlayerState.Loading: + case PlayerState.Loaded: case PlayerState.Playing: - ShowPlayAction (); + ShowStopAction (); break; case PlayerState.Paused: ShowPlay (); @@ -169,10 +171,13 @@ this["RestartSongAction"].Sensitive = false; this["SeekToAction"].Sensitive = false; } + + // Disable all actions while NotReady + Sensitive = args.Current != PlayerState.NotReady; } - private void ShowPlayAction () - { + private void ShowStopAction () + { if (ServiceManager.PlayerEngine.CanPause) { ShowPause (); } else { Index: src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs =================================================================== --- src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs (revision 4986) +++ src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs (working copy) @@ -128,33 +128,41 @@ OnPlayerEngineTick (); break; case PlayerEvent.StartOfStream: - stream_position_label.IsBuffering = false; - seek_slider.CanSeek = true; + stream_position_label.StreamState = StreamLabelState.Playing; + seek_slider.CanSeek = ServiceManager.PlayerEngine.CanSeek; break; case PlayerEvent.Buffering: PlayerEventBufferingArgs buffering = (PlayerEventBufferingArgs)args; if (buffering.Progress >= 1.0) { - stream_position_label.IsBuffering = false; + stream_position_label.StreamState = StreamLabelState.Playing; break; } - stream_position_label.IsBuffering = true; + stream_position_label.StreamState = StreamLabelState.Buffering; stream_position_label.BufferingProgress = buffering.Progress; seek_slider.SetIdle (); break; case PlayerEvent.StateChange: switch (((PlayerEventStateChangeArgs)args).Current) { case PlayerState.Contacting: - stream_position_label.IsContacting = true; + transitioning = false; + stream_position_label.StreamState = StreamLabelState.Contacting; seek_slider.SetIdle (); break; + case PlayerState.Loading: + transitioning = false; + if (((PlayerEventStateChangeArgs)args).Previous == PlayerState.Contacting) { + stream_position_label.StreamState = StreamLabelState.Loading; + seek_slider.SetIdle (); + } + break; case PlayerState.Idle: seek_slider.CanSeek = false; if (!transitioning) { + stream_position_label.StreamState = StreamLabelState.Idle; seek_slider.Duration = 0; seek_slider.SeekValue = 0; seek_slider.SetIdle (); - stream_position_label.IsContacting = false; } break; default: @@ -171,12 +179,13 @@ return; } - uint stream_length = ServiceManager.PlayerEngine.Length; - uint stream_position = ServiceManager.PlayerEngine.Position; - stream_position_label.IsContacting = false; + stream_position_label.StreamState = StreamLabelState.Playing; + Banshee.Collection.TrackInfo track = ServiceManager.PlayerEngine.CurrentTrack; + stream_position_label.IsLive = track == null ? false : track.IsLive; + stream_position_label.StreamState = StreamLabelState.Playing; + seek_slider.Duration = ServiceManager.PlayerEngine.Length; + seek_slider.SeekValue = ServiceManager.PlayerEngine.Position; seek_slider.CanSeek = ServiceManager.PlayerEngine.CanSeek; - seek_slider.Duration = stream_length; - seek_slider.SeekValue = stream_position; } private void OnSeekRequested (object o, EventArgs args) Index: src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs =================================================================== --- src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs (revision 4986) +++ src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs (working copy) @@ -37,6 +37,8 @@ using Banshee.Base; using Banshee.Collection; using Banshee.ServiceStack; +using Banshee.MediaEngine; +using Banshee.PlaybackController; using Banshee.Playlists.Formats; namespace Banshee.Streaming @@ -75,11 +77,13 @@ try { RadioTrackInfo radio_track = new RadioTrackInfo (uri); radio_track.ParsingPlaylistEvent += delegate { - if (radio_track.PlaybackError != StreamPlaybackError.None) { - Log.Error (Catalog.GetString ("Error opening stream"), - Catalog.GetString ("Could not open stream or playlist"), true); - radio_track = null; - } + ThreadAssist.ProxyToMain (delegate { + if (radio_track.PlaybackError != StreamPlaybackError.None) { + Log.Error (Catalog.GetString ("Error opening stream"), + Catalog.GetString ("Could not open stream or playlist"), true); + radio_track = null; + } + }); }; return radio_track; @@ -98,6 +102,7 @@ private int stream_index = 0; private bool loaded = false; private bool parsing_playlist = false; + private bool trying_to_play; private TrackInfo parent_track; public TrackInfo ParentTrack { @@ -135,14 +140,67 @@ public void Play() { - if(!loaded) { - OnParsingPlaylistStarted(); - ThreadPool.QueueUserWorkItem(delegate { - LoadStreamUris(); - }); + if (trying_to_play) { return; } - + + trying_to_play = true; + + if (loaded) { + PlayCore (); + } else { + // Stop playing until we load this radio station and play it + ServiceManager.PlayerEngine.Close (); + + ServiceManager.PlayerEngine.TrackIntercept += OnTrackIntercept; + + // Tell the seek slider that we're connecting + // TODO move all this playlist-downloading/parsing logic into PlayerEngine? + ServiceManager.PlayerEngine.StartSynthesizeContacting (this); + + OnParsingPlaylistStarted (); + ThreadPool.QueueUserWorkItem (delegate { + try { + LoadStreamUris (); + } catch (Exception e) { + trying_to_play = false; + Log.Exception (this.ToString (), e); + SavePlaybackError (StreamPlaybackError.Unknown); + OnParsingPlaylistFinished (); + ServiceManager.PlayerEngine.Close (); + } + }); + } + } + + public override StreamPlaybackError PlaybackError { + get { return ParentTrack == null ? base.PlaybackError : ParentTrack.PlaybackError; } + set { + if (value != StreamPlaybackError.None) { + ServiceManager.PlayerEngine.EndSynthesizeContacting (this, true); + } + + if (ParentTrack == null) { + base.PlaybackError = value; + } else { + ParentTrack.PlaybackError = value; + } + } + } + + public new void SavePlaybackError (StreamPlaybackError value) + { + PlaybackError = value; + Save (); + if (ParentTrack != null) { + ParentTrack.Save (); + } + } + + private void PlayCore () + { + ServiceManager.PlayerEngine.EndSynthesizeContacting (this, false); + if(track != null) { TrackTitle = track.Title; ArtistName = track.Creator; @@ -158,6 +216,8 @@ ServiceManager.PlayerEngine.OpenPlay(this); } } + + trying_to_play = false; } public bool PlayNextStream() @@ -167,6 +227,7 @@ Play(); return true; } + ServiceManager.PlaybackController.StopWhenFinished = true; return false; } @@ -177,9 +238,10 @@ Play(); return true; } + ServiceManager.PlaybackController.StopWhenFinished = true; return false; } - + private void LoadStreamUris() { lock(stream_uris) { @@ -193,19 +255,31 @@ loaded = true; } - - ThreadAssist.ProxyToMain(delegate { - OnParsingPlaylistFinished(); - Play(); - }); + + ServiceManager.PlayerEngine.TrackIntercept -= OnTrackIntercept; + OnParsingPlaylistFinished(); + + if (ServiceManager.PlayerEngine.CurrentTrack == this) { + PlayCore(); + } else { + trying_to_play = false; + } } + + private bool OnTrackIntercept (TrackInfo track) + { + if (track != this && track != ParentTrack) { + ServiceManager.PlayerEngine.EndSynthesizeContacting (this, false); + ServiceManager.PlayerEngine.TrackIntercept -= OnTrackIntercept; + } + return false; + } private void LoadStreamUri(string uri) { try { - Log.Debug("Attempting to parse radio playlist", uri); PlaylistParser parser = new PlaylistParser(); - if(parser.Parse(new SafeUri(uri))) { + if (parser.Parse(new SafeUri(uri))) { foreach(Dictionary<string, object> element in parser.Elements) { if(element.ContainsKey("uri")) { stream_uris.Add(new SafeUri(((Uri)element["uri"]).AbsoluteUri)); @@ -214,12 +288,14 @@ } else { stream_uris.Add(new SafeUri(uri)); } - } catch(System.Net.WebException) { + Log.DebugFormat ("Parsed {0} URIs out of {1}", stream_uris.Count, this); + } catch (System.Net.WebException e) { + Hyena.Log.Exception (this.ToString (), e); SavePlaybackError (StreamPlaybackError.ResourceNotFound); - } catch(Exception e) { - Console.WriteLine(e); - SavePlaybackError (StreamPlaybackError.ResourceNotFound); - } + } catch (Exception e) { + Hyena.Log.Exception (this.ToString (), e); + SavePlaybackError (StreamPlaybackError.Unknown); + } } private void OnParsingPlaylistStarted() Index: src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs =================================================================== --- src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs (revision 4986) +++ src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs (working copy) @@ -90,7 +90,7 @@ private void HandleOpen (SafeUri uri) { - if (current_state != PlayerState.Idle && current_state != PlayerState.NotReady) { + if (current_state != PlayerState.Idle && current_state != PlayerState.NotReady && current_state != PlayerState.Contacting) { Close (false); } Index: src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs =================================================================== --- src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs (revision 4986) +++ src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs (working copy) @@ -55,6 +55,7 @@ private PlayerEngine pending_engine; private object pending_playback_for_not_ready; private bool pending_playback_for_not_ready_play; + private TrackInfo synthesized_contacting_track; private string preferred_engine_id = null; @@ -339,9 +340,9 @@ // If we're at least 50% done playing a song, mark it as played, otherwise as skipped // If the Length <= 0, assume the song was finished and increment its play count if (active_engine.Length <= 0 || active_engine.Position >= active_engine.Length / 2) { - active_engine.CurrentTrack.IncrementPlayCount (); + CurrentTrack.IncrementPlayCount (); } else { - active_engine.CurrentTrack.IncrementSkipCount (); + CurrentTrack.IncrementSkipCount (); } incremented_last_played = true; } @@ -406,12 +407,32 @@ active_engine.Pause (); } } + + // For use by RadioTrackInfo + // TODO remove this method once RadioTrackInfo playlist downloading/parsing logic moved here? + internal void StartSynthesizeContacting (TrackInfo track) + { + //OnStateChanged (PlayerState.Contacting); + RaiseEvent (new PlayerEventStateChangeArgs (CurrentState, PlayerState.Contacting)); + synthesized_contacting_track = track; + } + + internal void EndSynthesizeContacting (TrackInfo track, bool idle) + { + if (track == synthesized_contacting_track) { + synthesized_contacting_track = null; + + if (idle) { + RaiseEvent (new PlayerEventStateChangeArgs (PlayerState.Contacting, PlayerState.Idle)); + } + } + } public void TogglePlaying () { - if (CurrentState == PlayerState.Playing) { + if (IsPlaying () && CurrentState != PlayerState.Paused) { Pause (); - } else { + } else if (CurrentState != PlayerState.NotReady) { Play (); } } @@ -440,7 +461,9 @@ { return CurrentState == PlayerState.Playing || CurrentState == PlayerState.Paused || - CurrentState == PlayerState.Loaded; + CurrentState == PlayerState.Loaded || + CurrentState == PlayerState.Loading || + CurrentState == PlayerState.Contacting; } private void CheckPending () @@ -456,7 +479,7 @@ } public TrackInfo CurrentTrack { - get { return active_engine.CurrentTrack; } + get { return active_engine.CurrentTrack ?? synthesized_contacting_track; } } private Dictionary<string, object> dbus_sucks; @@ -482,7 +505,7 @@ } public PlayerState CurrentState { - get { return active_engine.CurrentState; } + get { return synthesized_contacting_track != null ? PlayerState.Contacting : active_engine.CurrentState; } } string IPlayerEngineService.CurrentState { @@ -532,11 +555,11 @@ uint length = active_engine.Length; if (length > 0) { return length; - } else if (active_engine.CurrentTrack == null) { + } else if (CurrentTrack == null) { return 0; } - return (uint) active_engine.CurrentTrack.Duration.TotalSeconds; + return (uint) CurrentTrack.Duration.TotalSeconds; } } Index: src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs =================================================================== --- src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs (revision 4986) +++ src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs (working copy) @@ -32,14 +32,22 @@ namespace Banshee.Widgets { + public enum StreamLabelState { + Idle, + Contacting, + Loading, + Buffering, + Playing + } + public class StreamPositionLabel : Alignment { private double buffering_progress; - private bool is_buffering; - private bool is_contacting; + private bool is_live; private SeekSlider seekRange; private string format_string = "{0}"; private Pango.Layout layout; + private StreamLabelState state; public StreamPositionLabel (SeekSlider seekRange) : base (0.0f, 0.0f, 1.0f, 1.0f) { @@ -101,7 +109,7 @@ int bar_width = (int)((double)Allocation.Width * buffering_progress); bool render_bar = false; - if (bar_width > 0 && is_buffering) { + if (bar_width > 0 && IsBuffering) { bar_width -= 2 * Style.XThickness; render_bar = true; @@ -146,15 +154,20 @@ return; } - if (is_buffering) { + if (IsBuffering) { double progress = buffering_progress * 100.0; UpdateLabel (String.Format ("{0}: {1}%", Catalog.GetString("Buffering"), progress.ToString ("0.0"))); - } else if (is_contacting) { + } else if (IsContacting) { UpdateLabel (contacting); - } else if (seekRange.Value == 0 && seekRange.Duration == 0) { + } else if (IsLoading) { + // TODO replace w/ "Loading..." after string freeze + UpdateLabel (contacting); + } else if (IsIdle) { UpdateLabel (idle); - } else if (seekRange.Value == seekRange.Duration) { + } else if (seekRange.Duration == Int64.MaxValue) { UpdateLabel (FormatDuration ((long)seekRange.Value)); + } else if (seekRange.Value == 0 && seekRange.Duration == 0) { + // nop } else { UpdateLabel (String.Format (Catalog.GetString ("{0} of {1}"), FormatDuration ((long)seekRange.Value), FormatDuration ((long)seekRange.Adjustment.Upper))); @@ -193,22 +206,38 @@ } } + public bool IsIdle { + get { return StreamState == StreamLabelState.Idle; } + } + public bool IsBuffering { - get { return is_buffering; } + get { return StreamState == StreamLabelState.Buffering; } + } + + public bool IsContacting { + get { return StreamState == StreamLabelState.Contacting; } + } + + public bool IsLoading { + get { return StreamState == StreamLabelState.Loading; } + } + + public StreamLabelState StreamState { + get { return state; } set { - if (is_buffering != value) { - is_buffering = value; + if (state != value) { + state = value; UpdateLabel (); QueueDraw (); } } } - - public bool IsContacting { - get { return is_contacting; } + + public bool IsLive { + get { return is_live; } set { - if (is_contacting != value) { - is_contacting = value; + if (is_live != value) { + is_live = value; UpdateLabel (); QueueDraw (); } Index: src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs =================================================================== --- src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs (revision 4986) +++ src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs (working copy) @@ -107,10 +107,12 @@ raise_seek_requested = false; if(value > Duration) { - Duration = value; + Duration = Int64.MaxValue; + Value = value; + } else { + Value = value; } - - Value = value; + raise_seek_requested = true; } } ++++++ bnc465214-freeze-on-dap-load.patch ++++++ Index: src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs =================================================================== --- src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs (revision 4943) +++ src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs (revision 4944) @@ -154,9 +154,7 @@ private void MapDevice (IDevice device) { - lock (sync) { - Scheduler.Schedule (new MapDeviceJob (this, device)); - } + Scheduler.Schedule (new MapDeviceJob (this, device)); } private class MapDeviceJob : IJob ++++++ bnc467377-crash-on-delete-from-fsq.patch ++++++ Index: src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs =================================================================== --- src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs (revision 4982) +++ src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs (revision 4984) @@ -58,7 +58,7 @@ Catalog.GetString ("File System Queue"), "file-system-queue", 30) { TypeUniqueId = "file-system-queue"; - Properties.SetString ("Icon.Name", "system-file-manager"); + Properties.SetStringList ("Icon.Name", "system-file-manager"); Properties.Set<bool> ("AutoAddSource", false); IsLocal = true; @@ -195,6 +195,11 @@ } } } + + // until we implement DeleteTrack, at least + public override bool CanDeleteTracks { + get { return false; } + } public override void Dispose () { ++++++ bnc470722-fix-mtp-device-crash.patch ++++++ Index: src/Libraries/Mtp/Mtp/Playlist.cs =================================================================== --- src/Libraries/Mtp/Mtp/Playlist.cs (revision 4986) +++ src/Libraries/Mtp/Mtp/Playlist.cs (working copy) @@ -67,7 +67,12 @@ protected override int Create () { // TODO replace 0 w/ the folder id of the playlists folder? +#if LIBMTP8 + playlist.parent_id = Device.PlaylistFolder.FolderId; + return LIBMTP_Create_New_Playlist (Device.Handle, ref playlist); +#else return LIBMTP_Create_New_Playlist (Device.Handle, ref playlist, Device.PlaylistFolder.FolderId); +#endif } protected override int Update () @@ -81,29 +86,32 @@ } // Playlist Management - [DllImport("libmtp.dll")] - internal static extern IntPtr LIBMTP_new_playlist_t (); // LIBMTP_playlist_t* - [DllImport("libmtp.dll")] - internal static extern void LIBMTP_destroy_playlist_t (ref PlaylistStruct playlist); + //[DllImport("libmtp.dll")] + //private static extern void LIBMTP_destroy_playlist_t (ref PlaylistStruct playlist); [DllImport("libmtp.dll")] internal static extern IntPtr LIBMTP_Get_Playlist_List (MtpDeviceHandle handle); // LIBMTP_playlist_t* [DllImport("libmtp.dll")] - internal static extern IntPtr LIBMTP_Get_Playlist (MtpDeviceHandle handle, uint playlistId); // LIBMTP_playlist_t* +#if LIBMTP8 + private static extern int LIBMTP_Create_New_Playlist (MtpDeviceHandle handle, ref PlaylistStruct metadata); +#else + private static extern int LIBMTP_Create_New_Playlist (MtpDeviceHandle handle, ref PlaylistStruct metadata, uint parentHandle); +#endif [DllImport("libmtp.dll")] - internal static extern int LIBMTP_Create_New_Playlist (MtpDeviceHandle handle, ref PlaylistStruct metadata, uint parentHandle); - - [DllImport("libmtp.dll")] - internal static extern int LIBMTP_Update_Playlist (MtpDeviceHandle handle, ref PlaylistStruct playlist); + private static extern int LIBMTP_Update_Playlist (MtpDeviceHandle handle, ref PlaylistStruct playlist); } [StructLayout(LayoutKind.Sequential)] internal struct PlaylistStruct { public uint playlist_id; +#if LIBMTP8 + public uint parent_id; + public uint storage_id; +#endif [MarshalAs(UnmanagedType.LPStr)] public string Name; Index: src/Libraries/Mtp/Mtp/Track.cs =================================================================== --- src/Libraries/Mtp/Mtp/Track.cs (revision 4986) +++ src/Libraries/Mtp/Mtp/Track.cs (working copy) @@ -217,6 +217,7 @@ internal static void SendTrack (MtpDeviceHandle handle, string path, ref TrackStruct metadata, ProgressFunction callback, IntPtr data, uint parent) { #if LIBMTP8 + metadata.parent_id = parent; if (LIBMTP_Send_Track_From_File (handle, path, ref metadata, callback, data) != 0) #else if (LIBMTP_Send_Track_From_File (handle, path, ref metadata, callback, data, parent) != 0) ++++++ bnc472522-sr-latn-translation-breaks-build.patch ++++++ ++++ 8552 lines (skipped) ++++++ bnc472524-adding-files-to-mtp-device-fails.patch ++++++ Index: src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs =================================================================== --- src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs (revision 5004) +++ src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs (revision 5005) @@ -61,7 +61,7 @@ private Dictionary<string, Album> album_cache = new Dictionary<string, Album> (); private bool supports_jpegs = false; - private bool can_sync = NeverSyncAlbumArtSchema.Get () == false; + private bool can_sync_albumart = NeverSyncAlbumArtSchema.Get () == false; private int thumb_width = AlbumArtWidthSchema.Get (); public override void DeviceInitialize (IDevice device) @@ -150,13 +150,16 @@ { track_map = new Dictionary<int, Track> (); try { - List<Track> files = mtp_device.GetAllTracks (delegate (ulong current, ulong total, IntPtr data) { - //user_event.Progress = (double)current / total; - // Translators: {0} is the name of the MTP audio device (eg Gabe's Zen Player), {1} is the - // track currently being loaded, and {2} is the total # of tracks that will be loaded. - SetStatus (String.Format (Catalog.GetString ("Loading {0} - {1} of {2}"), Name, current, total), false); - return 0; - }); + List<Track> files = null; + lock (mtp_device) { + files = mtp_device.GetAllTracks (delegate (ulong current, ulong total, IntPtr data) { + //user_event.Progress = (double)current / total; + // Translators: {0} is the name of the MTP audio device (eg Gabe's Zen Player), {1} is the + // track currently being loaded, and {2} is the total # of tracks that will be loaded. + SetStatus (String.Format (Catalog.GetString ("Loading {0} - {1} of {2}"), Name, current, total), false); + return 0; + }); + } /*if (user_event.IsCancelRequested) { return; @@ -178,15 +181,18 @@ Hyena.Data.Sqlite.HyenaSqliteCommand insert_cmd = new Hyena.Data.Sqlite.HyenaSqliteCommand ( @"INSERT INTO CorePlaylistEntries (PlaylistID, TrackID) SELECT ?, TrackID FROM CoreTracks WHERE PrimarySourceID = ? AND ExternalID = ?"); - foreach (MTP.Playlist playlist in mtp_device.GetPlaylists ()) { - PlaylistSource pl_src = new PlaylistSource (playlist.Name, this); - pl_src.Save (); - // TODO a transaction would make sense here (when the threading issue is fixed) - foreach (int id in playlist.TrackIds) { - ServiceManager.DbConnection.Execute (insert_cmd, pl_src.DbId, this.DbId, id); + + lock (mtp_device) { + foreach (MTP.Playlist playlist in mtp_device.GetPlaylists ()) { + PlaylistSource pl_src = new PlaylistSource (playlist.Name, this); + pl_src.Save (); + // TODO a transaction would make sense here (when the threading issue is fixed) + foreach (int id in playlist.TrackIds) { + ServiceManager.DbConnection.Execute (insert_cmd, pl_src.DbId, this.DbId, id); + } + pl_src.UpdateCounts (); + AddChildSource (pl_src); } - pl_src.UpdateCounts (); - AddChildSource (pl_src); } } catch (Exception e) { @@ -272,27 +278,31 @@ } } + private long bytes_used; public override long BytesUsed { get { - long count = 0; - lock (mtp_device) { + if (Monitor.TryEnter (mtp_device)) { + bytes_used = 0; foreach (DeviceStorage s in mtp_device.GetStorage ()) { - count += (long) s.MaxCapacity - (long) s.FreeSpaceInBytes; + bytes_used += (long) s.MaxCapacity - (long) s.FreeSpaceInBytes; } + Monitor.Exit (mtp_device); } - return count; + return bytes_used; } } + private long bytes_capacity; public override long BytesCapacity { get { - long count = 0; - lock (mtp_device) { + if (Monitor.TryEnter (mtp_device)) { + bytes_capacity = 0; foreach (DeviceStorage s in mtp_device.GetStorage ()) { - count += (long) s.MaxCapacity; + bytes_capacity += (long) s.MaxCapacity; } + Monitor.Exit (mtp_device); } - return count; + return bytes_capacity; } } @@ -305,43 +315,43 @@ if (track.PrimarySourceId == DbId) return; - Track mtp_track = TrackInfoToMtpTrack (track, fromUri); - bool video = (track.MediaAttributes & TrackMediaAttributes.VideoStream) != 0; lock (mtp_device) { + Track mtp_track = TrackInfoToMtpTrack (track, fromUri); + bool video = track.HasAttribute (TrackMediaAttributes.VideoStream); mtp_device.UploadTrack (fromUri.LocalPath, mtp_track, GetFolderForTrack (track), OnUploadProgress); - } - // Add/update album art - if (!video) { - string key = MakeAlbumKey (track.ArtistName, track.AlbumTitle); - if (!album_cache.ContainsKey (key)) { - Album album = new Album (mtp_device, track.AlbumTitle, track.ArtistName, track.Genre); - album.AddTrack (mtp_track); + // Add/update album art + if (!video) { + string key = MakeAlbumKey (track.ArtistName, track.AlbumTitle); + if (!album_cache.ContainsKey (key)) { + Album album = new Album (mtp_device, track.AlbumTitle, track.ArtistName, track.Genre); + album.AddTrack (mtp_track); - if (supports_jpegs && can_sync) { - try { - Gdk.Pixbuf pic = ServiceManager.Get<Banshee.Collection.Gui.ArtworkManager> ().LookupScalePixbuf ( - track.ArtworkId, thumb_width - ); - if (pic != null) { - byte [] bytes = pic.SaveToBuffer ("jpeg"); - album.Save (bytes, (uint)pic.Width, (uint)pic.Height); - Banshee.Collection.Gui.ArtworkManager.DisposePixbuf (pic); - } - album_cache[key] = album; - } catch {} + if (supports_jpegs && can_sync_albumart) { + try { + Gdk.Pixbuf pic = ServiceManager.Get<Banshee.Collection.Gui.ArtworkManager> ().LookupScalePixbuf ( + track.ArtworkId, thumb_width + ); + if (pic != null) { + byte [] bytes = pic.SaveToBuffer ("jpeg"); + album.Save (bytes, (uint)pic.Width, (uint)pic.Height); + Banshee.Collection.Gui.ArtworkManager.DisposePixbuf (pic); + } + album_cache[key] = album; + } catch {} + } + } else { + Album album = album_cache[key]; + album.AddTrack (mtp_track); + album.Save (); } - } else { - Album album = album_cache[key]; - album.AddTrack (mtp_track); - album.Save (); } + + MtpTrackInfo new_track = new MtpTrackInfo (mtp_device, mtp_track); + new_track.PrimarySource = this; + new_track.Save (false); + track_map[new_track.TrackId] = mtp_track; } - - MtpTrackInfo new_track = new MtpTrackInfo (mtp_device, mtp_track); - new_track.PrimarySource = this; - new_track.Save (false); - track_map[new_track.TrackId] = mtp_track; } private Folder GetFolderForTrack (TrackInfo track) Index: src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpTrackInfo.cs =================================================================== --- src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpTrackInfo.cs (revision 5004) +++ src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpTrackInfo.cs (revision 5005) @@ -97,13 +97,11 @@ f.Artist = track.ArtistName; f.Duration = (uint)track.Duration.TotalMilliseconds; f.Genre = track.Genre; + f.UseCount = (uint)track.PlayCount; f.Rating = (ushort)(track.Rating * 20); f.Title = track.TrackTitle; f.TrackNumber = (ushort)track.TrackNumber; - f.UseCount = (uint)track.PlayCount; f.Year = track.Year; - //f.Bitrate = (uint)track.BitRate; - f.FileSize = (ulong)track.FileSize; } } } Index: src/Libraries/Mtp/Mtp/Track.cs =================================================================== --- src/Libraries/Mtp/Mtp/Track.cs (revision 5004) +++ src/Libraries/Mtp/Mtp/Track.cs (revision 5005) @@ -185,8 +185,8 @@ if (ext.Length > 0) ext = ext.Substring (1, ext.Length - 1); - // this is a hack - if (ext == "m4v" || ext == "M4V") + // this is a hack; catch all m4(a|b|v|p) + if (ext != null && ext.ToLower ().StartsWith ("m4")) ext = "mp4"; FileType type = (FileType) Enum.Parse (typeof(FileType), ext, true); Index: src/Libraries/Mtp/Mtp/Error.cs =================================================================== --- src/Libraries/Mtp/Mtp/Error.cs (revision 5004) +++ src/Libraries/Mtp/Mtp/Error.cs (revision 5005) @@ -55,8 +55,7 @@ return; LibMtpException ex = null; - while (ptr != IntPtr.Zero) - { + while (ptr != IntPtr.Zero) { Error e = (Error)Marshal.PtrToStructure (ptr, typeof(Error)); ex = new LibMtpException (e.errornumber, e.error_text, ex); ptr = e.next; ++++++ bnc472526-dap-playlists-not-saved.patch ++++++ Index: src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs =================================================================== --- src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs (revision 5002) +++ src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs (revision 5003) @@ -285,12 +285,29 @@ private void RateLimitedSync () { syncing = true; + + bool sync_playlists = false; + if (dap.SupportsPlaylists) { + foreach (DapLibrarySync library_sync in library_syncs) { + if (library_sync.Library.SupportsPlaylists) { + sync_playlists = true; + break; + } + } + } + if (sync_playlists) { + dap.RemovePlaylists (); + } + foreach (DapLibrarySync library_sync in library_syncs) { library_sync.Sync (); } - dap.SyncPlaylists (); + if (sync_playlists) { + dap.SyncPlaylists (); + } + syncing = false; } Index: src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs =================================================================== --- src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs (revision 5002) +++ src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs (revision 5003) @@ -204,9 +204,8 @@ } if (library.SupportsPlaylists && sync.Dap.SupportsPlaylists) { - sync.Dap.RemovePlaylists (); - - // Then create the playlists, taking snapshots of smart playlists and saving them + + // Now create the playlists, taking snapshots of smart playlists and saving them // as normal playlists IList<AbstractPlaylistSource> playlists = GetSyncPlaylists (); foreach (AbstractPlaylistSource from in playlists) { ++++++ bundleize-pkg-config.awk ++++++ { if ($0 ~ /^Requires:/) { if (sub(/taglib-sharp/, "", $0)) { local_libs = (local_libs " -r:${bansheedir}/taglib-sharp.dll"); } if (sub(/mono-addins/, "", $0)) { local_libs = (local_libs " -r:${bansheedir}/Mono.Addins.dll"); } } else if ($0 ~ /^Libs:/) { sub(/^Libs:/, "Libs:" local_libs, $0); } gsub(/[ ]+/, " ", $0); print } ++++++ desktop-file-trailing-semicolon.patch ++++++ Index: data/desktop-files/update-desktop-file.sh =================================================================== --- data/desktop-files/update-desktop-file.sh (revision 4923) +++ data/desktop-files/update-desktop-file.sh (working copy) @@ -17,7 +17,7 @@ awk '{printf $1 ";"}' | sed 's,;$,,' ) - echo "MimeType=$MIMETYPES" + echo "MimeType=$MIMETYPES;" if [[ "$UPDATE_MIME_FILE" == "yes" ]]; then (grep -E '^[[:space:]]*#' "$MIMETYPES_FILE"; Index: data/desktop-files/banshee-1-audiocd.desktop.in.in =================================================================== --- data/desktop-files/banshee-1-audiocd.desktop.in.in (revision 4923) +++ data/desktop-files/banshee-1-audiocd.desktop.in.in (working copy) @@ -1,3 +1,3 @@ Exec=banshee-1 --redirect-log --device-activate-play=%u NoDisplay=true -MimeType=x-content/audio-cdda +MimeType=x-content/audio-cdda; Index: data/desktop-files/banshee-1-media-player.desktop.in.in =================================================================== --- data/desktop-files/banshee-1-media-player.desktop.in.in (revision 4923) +++ data/desktop-files/banshee-1-media-player.desktop.in.in (working copy) @@ -1,3 +1,3 @@ Exec=banshee-1 --redirect-log --device-activate=%u NoDisplay=true -MimeType=x-content/audio-player +MimeType=x-content/audio-player; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bakefile for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package bakefile for openSUSE:Factory checked in at Fri Feb 6 21:02:00 CET 2009. -------- --- bakefile/bakefile.changes 2008-08-06 00:42:16.000000000 +0200 +++ bakefile/bakefile.changes 2008-12-19 23:29:54.000000000 +0100 @@ -1,0 +2,35 @@ +Sat Dec 20 09:08:03 EST 2008 - mboman(a)suse.de + +- Update to version 0.2.5: + + msvs200xprj: if "-o foo.vcproj" is specified on the command line, only + generate foo.vcproj and not foo.sln + + autoconf: fixes for non-default BUILDDIR + + msvs2005prj: fixed _WIN32_WCE define for PocketPC 2003 platform + + put user- or configure-provided LDFLAGS and LIBS to the end of linker + + command line to avoid conflicts of local libraries with system-wide + + xcode2: fixed <ldflags> to not delete previously specified flags + + xcode2: fixed <cxxflags> and <cppflags> for C++ files + + xcode2: fixed <library> handling + + added <depends-on-file> to all formats, with warnings if it's not + + implemented + + mingw, gnu: avoid "No rule to make target ..." errors in generated + makefiles when dependency header is removed + + msvs2003prj, msvs2005prj: don't use /RTC1 flag in release builds with + debug information enabled + + msvs2003prj, msvs2005prj: enable functions inlining iff optimization is + enabled instead of doing it unconditionally + + xcode2: added support for <headers> + + msvs2003prj, msvs2005prj: improvements to make generated projects more + similar to natively created projects + + fixes for running on Solaris + + xcode2: fixed naming of <dll> targets + + check for incorrect used of conditional <set> + + added support for multiple source files with the same name + + msvs2003prj, msvs2005prj: fixed to generate correct precompiled headers + setting for auto vs. manual PCH creation + + fixed incorrect dependencies of the "install" target + + added support for Visual Studio 2008 + + bakefile_gen --clean removes directories created by Bakefile + + fixed <subproject>'s <target> tag to work with all formats + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bakefile-0.2.3.tar.gz New: ---- bakefile-0.2.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bakefile.spec ++++++ --- /var/tmp/diff_new_pack.h18410/_old 2009-02-06 20:59:18.000000000 +0100 +++ /var/tmp/diff_new_pack.h18410/_new 2009-02-06 20:59:18.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package bakefile (Version 0.2.3) +# spec file for package bakefile (Version 0.2.5) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,9 +24,9 @@ License: X11/MIT Group: Development/Libraries/C and C++ Summary: Tool required to build WebKit -Version: 0.2.3 +Version: 0.2.5 Release: 1 -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.bakefile.org Requires: python @@ -64,8 +64,41 @@ %{_datadir}/aclocal/bakefile.m4 %{_datadir}/aclocal/bakefile-dllar.m4 %{_datadir}/man/man1/bakefil* + %changelog -* Wed Aug 06 2008 mauro(a)suse.de +* Sat Dec 20 2008 mboman(a)suse.de +- Update to version 0.2.5: + + msvs200xprj: if "-o foo.vcproj" is specified on the command line, only + generate foo.vcproj and not foo.sln + + autoconf: fixes for non-default BUILDDIR + + msvs2005prj: fixed _WIN32_WCE define for PocketPC 2003 platform + + put user- or configure-provided LDFLAGS and LIBS to the end of linker + + command line to avoid conflicts of local libraries with system-wide + + xcode2: fixed <ldflags> to not delete previously specified flags + + xcode2: fixed <cxxflags> and <cppflags> for C++ files + + xcode2: fixed <library> handling + + added <depends-on-file> to all formats, with warnings if it's not + + implemented + + mingw, gnu: avoid "No rule to make target ..." errors in generated + makefiles when dependency header is removed + + msvs2003prj, msvs2005prj: don't use /RTC1 flag in release builds with + debug information enabled + + msvs2003prj, msvs2005prj: enable functions inlining iff optimization is + enabled instead of doing it unconditionally + + xcode2: added support for <headers> + + msvs2003prj, msvs2005prj: improvements to make generated projects more + similar to natively created projects + + fixes for running on Solaris + + xcode2: fixed naming of <dll> targets + + check for incorrect used of conditional <set> + + added support for multiple source files with the same name + + msvs2003prj, msvs2005prj: fixed to generate correct precompiled headers + setting for auto vs. manual PCH creation + + fixed incorrect dependencies of the "install" target + + added support for Visual Studio 2008 + + bakefile_gen --clean removes directories created by Bakefile + + fixed <subproject>'s <target> tag to work with all formats +* Tue Aug 05 2008 mauro(a)suse.de - Updated to version 0.2.3 - removed support for C++ Builder X, it no longer exists and the format wasn't used by anyone in practice ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 autofs for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package autofs for openSUSE:Factory checked in at Fri Feb 6 20:58:15 CET 2009. -------- --- autofs/autofs.changes 2009-01-27 18:15:12.000000000 +0100 +++ autofs/autofs.changes 2009-02-05 12:07:18.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Feb 4 15:31:19 CET 2009 - mkoenig(a)suse.de + +- update to version 5.0.4 (just version bump, since all 5.0.3 + upstream patches had been already applied) +- update 5.0.4 upstream patches to 20090122: + * fix dumb libxml2 check + * fix nested submount expire deadlock. + * fix negative caching for non-existent map keys. + * use CLOEXEC flag. + * fix select(2) fd limit. + * make hash table scale to thousands of entries (Paul Wankadia, + Valerie Aurora Henson). + * clear the quoted flag after each character from program map input. +- remove patch + autofs-5.0.1-mount_xdr_no_strict_aliasing.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- autofs-5.0.1-mount_xdr_no_strict_aliasing.patch autofs-5.0.3-link_kerberos.patch autofs-5.0.3.tar.bz2 autofs-5.0.3-upstream-patches-20081103.bz2 New: ---- autofs-5.0.4-link_kerberos.patch autofs-5.0.4.tar.bz2 autofs-5.0.4-upstream-patches-20090122.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.z12411/_old 2009-02-06 20:56:39.000000000 +0100 +++ /var/tmp/diff_new_pack.z12411/_new 2009-02-06 20:56:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package autofs (Version 5.0.3) +# spec file for package autofs (Version 5.0.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,8 +24,8 @@ License: GPL v2 or later Group: System/Daemons AutoReqProv: on -Version: 5.0.3 -Release: 88 +Version: 5.0.4 +Release: 1 Summary: A Kernel-Based Automounter BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.bz2 @@ -34,17 +34,14 @@ Source4: README.SuSE.ldap Source5: README.SuSE Source7: NetworkManager-autofs -%define patchdate 20081103 -Patch0: autofs-5.0.3-upstream-patches-%{patchdate}.bz2 +%define patchdate 20090122 +Patch0: autofs-%{version}-upstream-patches-%{patchdate}.bz2 Patch10: autofs-suse-auto_master_default.patch Patch11: autofs-suse-autofs_init.patch -Patch12: autofs-5.0.1-mount_xdr_no_strict_aliasing.patch Patch13: autofs-5.0.2-use_local_cflags.patch -Patch15: autofs-5.0.3-link_kerberos.patch +Patch15: autofs-5.0.4-link_kerberos.patch PreReq: %fillup_prereq %insserv_prereq aaa_base -%if %suse_version > 1020 Recommends: nfs-client -%endif %description Autofs is a kernel-based automounter for Linux. It is still under @@ -69,7 +66,6 @@ %patch0 -p1 %patch10 -p1 %patch11 -p1 -%patch12 -p1 %patch13 -p1 %patch15 -p1 @@ -77,6 +73,7 @@ autoconf -f ./configure %{_target_cpu}-suse-linux \ --libdir=%{_libdir} --mandir=%{_mandir} \ + --with-confdir=/etc/sysconfig \ --disable-mount-locking \ --enable-forced-shutdown \ --enable-ignore-busy \ @@ -85,18 +82,13 @@ make all DONTSTRIP=1 LOCAL_CFLAGS="$RPM_OPT_FLAGS %(getconf LFS_CFLAGS)" %install -mkdir -p $RPM_BUILD_ROOT/etc -mkdir -p $RPM_BUILD_ROOT/etc/init.d -mkdir -p $RPM_BUILD_ROOT/usr/sbin -mkdir -p $RPM_BUILD_ROOT/usr/lib/autofs -mkdir -p $RPM_BUILD_ROOT/%{_libdir}/autofs -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man5,man8} -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -mkdir -p $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d make install INSTALLROOT=$RPM_BUILD_ROOT ln -s ../../etc/init.d/autofs $RPM_BUILD_ROOT/usr/sbin/rcautofs +mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.autofs +mkdir -p $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d install -m 755 %{S:7} $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/autofs +# will be installed by fillup scripts rm -f $RPM_BUILD_ROOT/etc/sysconfig/autofs %clean @@ -127,8 +119,9 @@ %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/autofs /usr/sbin/rcautofs -%doc COPYRIGHT README README.changer README.smbfs README.SuSE -%doc autofs.schema README.SuSE.ldap README.v5.release +%doc COPYRIGHT README README.changer README.ncpfs README.replicated-server +%doc README.smbfs README.v5.release autofs.schema +%doc README.SuSE README.SuSE.ldap %dir %{_libdir}/autofs/ %{_libdir}/autofs/lookup_file.so %{_libdir}/autofs/lookup_files.so @@ -156,6 +149,20 @@ /usr/sbin/automount %changelog +* Wed Feb 04 2009 mkoenig(a)suse.de +- update to version 5.0.4 (just version bump, since all 5.0.3 + upstream patches had been already applied) +- update 5.0.4 upstream patches to 20090122: + * fix dumb libxml2 check + * fix nested submount expire deadlock. + * fix negative caching for non-existent map keys. + * use CLOEXEC flag. + * fix select(2) fd limit. + * make hash table scale to thousands of entries (Paul Wankadia, + Valerie Aurora Henson). + * clear the quoted flag after each character from program map input. +- remove patch + autofs-5.0.1-mount_xdr_no_strict_aliasing.patch * Tue Jan 27 2009 kukuk(a)suse.de - Add aaa_base to PreReq. * Fri Jan 23 2009 coolo(a)suse.de ++++++ autofs-5.0.3-link_kerberos.patch -> autofs-5.0.4-link_kerberos.patch ++++++ --- autofs/autofs-5.0.3-link_kerberos.patch 2008-01-30 17:56:04.000000000 +0100 +++ autofs/autofs-5.0.4-link_kerberos.patch 2009-02-04 17:30:06.000000000 +0100 @@ -1,13 +1,19 @@ -Index: autofs-5.0.3/configure.in +Index: autofs-5.0.4/configure.in =================================================================== ---- autofs-5.0.3.orig/configure.in -+++ autofs-5.0.3/configure.in -@@ -239,7 +239,7 @@ AC_ARG_WITH(sasl, +--- autofs-5.0.4.orig/configure.in 2008-11-04 02:36:48.000000000 +0100 ++++ autofs-5.0.4/configure.in 2009-02-04 17:30:01.000000000 +0100 +@@ -256,8 +256,13 @@ AC_ARG_WITH(sasl, if test -z "$HAVE_SASL" -o "$HAVE_SASL" != "0" -a "$HAVE_LIBXML" == "1" then HAVE_SASL=0 - AC_CHECK_LIB(sasl2, sasl_client_start, HAVE_SASL=1 LIBSASL="$LIBSASL -lsasl2", , -lsasl2 $LIBS) -+ AC_CHECK_LIB(sasl2, sasl_client_start, HAVE_SASL=1 LIBSASL="$LIBSASL -lsasl2 -lkrb5", , -lsasl2 $LIBS) ++ HAVE_KRB5=0 ++ AC_CHECK_LIB(sasl2, sasl_client_start, HAVE_SASL=1,, -lsasl2 $LIBS) ++ AC_CHECK_LIB(krb5, krb5_mk_req_extended, HAVE_KRB5=1,, $LIBS) if test "$HAVE_SASL" == "1"; then ++ test "$HAVE_KRB5" != "1" && \ ++ AC_MSG_FAILURE([You need krb5 libs to build with SASL support]) ++ LIBSASL="$LIBSASL -lsasl2 -lkrb5" AC_DEFINE(WITH_SASL,1, [Define if using SASL authentication with the LDAP module]) + fi ++++++ autofs-5.0.3.tar.bz2 -> autofs-5.0.4.tar.bz2 ++++++ ++++ 96192 lines of diff (skipped) ++++++ autofs-suse-autofs_init.patch ++++++ --- /var/tmp/diff_new_pack.z12411/_old 2009-02-06 20:56:41.000000000 +0100 +++ /var/tmp/diff_new_pack.z12411/_new 2009-02-06 20:56:41.000000000 +0100 @@ -1,8 +1,8 @@ -Index: autofs-5.0.3/samples/rc.autofs.in +Index: autofs-5.0.4/samples/rc.autofs.in =================================================================== ---- autofs-5.0.3.orig/samples/rc.autofs.in 2009-01-22 14:23:42.000000000 +0100 -+++ autofs-5.0.3/samples/rc.autofs.in 2009-01-22 14:25:10.000000000 +0100 -@@ -1,24 +1,49 @@ +--- autofs-5.0.4.orig/samples/rc.autofs.in 2008-11-04 02:36:48.000000000 +0100 ++++ autofs-5.0.4/samples/rc.autofs.in 2009-02-05 11:19:48.000000000 +0100 +@@ -1,10 +1,32 @@ #!/bin/bash +# Copyright (C) 2008 SUSE Linux Products GmbH, Nuernberg, Germany. # @@ -40,13 +40,10 @@ # # Location of the automount daemon and the init directory - # --DAEMON=@@sbindir@@/automount -+DAEMON=/usr/sbin/automount - prog=`basename $DAEMON` +@@ -14,12 +36,15 @@ prog=`basename $DAEMON` MODULE="autofs4" --confdir=@@autofsconfdir@@ -+confdir=/etc/sysconfig + DEVICE="autofs" + confdir=@@autofsconfdir@@ +PIDFILE=/var/run/automount.pid -test -e $DAEMON || exit 0 @@ -60,12 +57,17 @@ # # load customized configuation settings # -@@ -27,91 +52,164 @@ if [ -r $confdir/autofs ]; then +@@ -27,110 +52,188 @@ if [ -r $confdir/autofs ]; then + . $confdir/autofs fi - function start() { +-function start() { - echo -n "Starting $prog: " -- ++# autofs misc driver not yet supported in our kernel ++# so don't allow this for now ++USE_MISC_DEVICE='' + ++function start() { # Make sure autofs4 module is loaded - if ! grep -q autofs /proc/filesystems - then @@ -82,6 +84,24 @@ - echo - echo "Error: autofs kernel module is loaded, autofs4 required" - return 1 +- fi +- +- # Check misc device +- if [ -n "$USE_MISC_DEVICE" -a "x$USE_MISC_DEVICE" = "xyes" ]; then +- sleep 1 +- if [ -e "/proc/misc" ]; then +- MINOR=`awk "/$DEVICE/ {print \\$1}" /proc/misc` +- if [ -n "$MINOR" -a ! -c "/dev/$DEVICE" ]; then +- mknod -m 0600 /dev/$DEVICE c 10 $MINOR +- fi +- fi +- if [ -x /sbin/restorecon ]; then +- /sbin/restorecon /dev/$DEVICE +- fi +- else +- if [ -c /dev/$DEVICE ]; then +- rm /dev/$DEVICE +- fi + if ! grep -q autofs /proc/filesystems; then + # Try load the autofs4 module fail if we can't + modprobe -q $MODULE >/dev/null 2>&1 @@ -96,6 +116,24 @@ + return 1 + fi + ++ # Check misc device ++ if [ -n "$USE_MISC_DEVICE" -a "$USE_MISC_DEVICE" = "yes" ]; then ++ sleep 1 ++ if [ -e "/proc/misc" ]; then ++ MINOR=`awk "/$DEVICE/ {print \\$1}" /proc/misc` ++ if [ -n "$MINOR" -a ! -c "/dev/$DEVICE" ]; then ++ mknod -m 0600 /dev/$DEVICE c 10 $MINOR ++ fi ++ fi ++ if [ -x /sbin/restorecon ]; then ++ /sbin/restorecon /dev/$DEVICE ++ fi ++ else ++ if [ -c /dev/$DEVICE ]; then ++ rm /dev/$DEVICE ++ fi ++ fi ++ + if [ "$LOCAL_OPTIONS" ]; then + AUTOFS_OPTIONS="-O $LOCAL_OPTIONS $AUTOFS_OPTIONS" + fi @@ -214,8 +252,6 @@ - exit 1; - ;; -esac -- --exit $? + start) + echo -n "Starting $prog " + # Check if already running @@ -223,6 +259,7 @@ + start + fi +-exit $? + rc_status -v + ;; + stop) @@ -299,3 +336,4 @@ + ;; +esac +rc_exit + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 at-spi for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package at-spi for openSUSE:Factory checked in at Fri Feb 6 20:56:29 CET 2009. -------- --- GNOME/at-spi/at-spi.changes 2009-01-08 20:45:19.000000000 +0100 +++ at-spi/at-spi.changes 2009-01-30 22:51:05.000000000 +0100 @@ -1,0 +2,17 @@ +Sat Jan 31 08:49:50 EST 2009 - mboman(a)suse.de + +- Update to version 1.25.5: + + Bugs fixed: bgo#566999, bgo#566998, bgo#567706 + +------------------------------------------------------------------- +Sun Jan 25 14:43:24 CET 2009 - vuntz(a)novell.com + +- Use sr@latin instead of sr@Latn since it's what glibc upstream + uses. + +------------------------------------------------------------------- +Thu Jan 8 12:44:27 MST 2009 - mboman(a)novell.com + +- Remove at-spi_a11y.patch. Fixed upstream + +------------------------------------------------------------------- @@ -6,0 +24,14 @@ +Tue Jan 6 16:35:35 EST 2009 - mboman(a)suse.de + +- Update to version 1.25.4: + + Bugs fixed: bgo#563806, bgo#563943, bgo#564880 + +------------------------------------------------------------------- +Sat Dec 20 08:59:23 EST 2008 - mboman(a)suse.de + +- Update to version 1.25.2: + + Bugs fixed: bgo#540183, bgo#560563, bgo#553306, bgo#561408, bgo#446574, + bgo#532907, bgo#554953, bgo#552469, bgo#547943, bgo#525519, bgo#527585. + + Translation updates + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- at-spi-1.24.0.tar.bz2 at-spi_a11y.patch New: ---- at-spi-1.25.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at-spi.spec ++++++ --- /var/tmp/diff_new_pack.Wn8009/_old 2009-02-06 20:53:57.000000000 +0100 +++ /var/tmp/diff_new_pack.Wn8009/_new 2009-02-06 20:53:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package at-spi (Version 1.24.0) +# spec file for package at-spi (Version 1.25.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -34,13 +34,11 @@ License: GPL v2 or later; LGPL v2.1 or later Group: Development/Libraries/GNOME AutoReqProv: on -Version: 1.24.0 -Release: 3 +Version: 1.25.5 +Release: 1 Requires: %{name}-lang = %{version} Summary: Assistive Technology Service Provider Interface Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM at-spi_a11y.patch bnc#460890 bgo#563943 -Patch: at-spi_a11y.patch Url: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -93,7 +91,6 @@ %prep #' %setup -q -%patch %build %configure\ @@ -103,7 +100,6 @@ %install make install referencetopdir=%{_docdir}/%{name}/reference DESTDIR=$RPM_BUILD_ROOT %find_gconf_schemas -mv $RPM_BUILD_ROOT/%{_datadir}/locale/sr@latin $RPM_BUILD_ROOT/%{_datadir}/locale/sr@Latn cp AUTHORS COPYING ChangeLog NEWS README $RPM_BUILD_ROOT%{_docdir}/%{name} %find_lang %{name} rm $RPM_BUILD_ROOT%{_libdir}/*/*.*a $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a @@ -154,8 +150,24 @@ %doc %{_docdir}/%{name}/reference %changelog +* Sat Jan 31 2009 mboman(a)suse.de +- Update to version 1.25.5: + + Bugs fixed: bgo#566999, bgo#566998, bgo#567706 +* Sun Jan 25 2009 vuntz(a)novell.com +- Use sr@latin instead of sr@Latn since it's what glibc upstream + uses. +* Thu Jan 08 2009 mboman(a)novell.com +- Remove at-spi_a11y.patch. Fixed upstream * Thu Jan 08 2009 sshaw(a)decriptor.com - Allow gail to be disabled via an env variable (bnc#460890). +* Tue Jan 06 2009 mboman(a)suse.de +- Update to version 1.25.4: + + Bugs fixed: bgo#563806, bgo#563943, bgo#564880 +* Sat Dec 20 2008 mboman(a)suse.de +- Update to version 1.25.2: + + Bugs fixed: bgo#540183, bgo#560563, bgo#553306, bgo#561408, bgo#446574, + bgo#532907, bgo#554953, bgo#552469, bgo#547943, bgo#525519, bgo#527585. + + Translation updates * Tue Nov 25 2008 sbrabec(a)suse.cz - Supplement gtk2-32bit/gtk2-64bit in baselibs.conf (bnc#354164). * Thu Oct 09 2008 sbrabec(a)suse.cz ++++++ at-spi-1.24.0.tar.bz2 -> at-spi-1.25.5.tar.bz2 ++++++ ++++ 10430 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0