May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit kmobiletools
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package kmobiletools checked in at Wed May 17 18:58:29 CEST 2006. -------- --- KDE/kmobiletools/kmobiletools.changes 2006-04-12 10:49:19.000000000 +0200 +++ kmobiletools/kmobiletools.changes 2006-05-17 14:24:44.000000000 +0200 @@ -1,0 +2,13 @@ +Wed May 17 14:23:46 CEST 2006 - stbinner(a)suse.de + +- update to version 0.4.3.3 + * Fixing again compilation on FreeBSD + * Fixing eventsrc + * Fixing makefiles + + KMobileTools 0.4.3.2 + * Fixing compilation with gcc 4 + * Fixing compilation on freebsd + * Change .desktop entry to be compliant with freedesktop.org standard + +------------------------------------------------------------------- Old: ---- FIXME.diff kmobiletools-0.4.3.1.tar.bz2 kmobiletools-fix-eventsrc.diff New: ---- kmobiletools-0.4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmobiletools.spec ++++++ --- /var/tmp/diff_new_pack.PvDZCe/_old 2006-05-17 18:58:14.000000000 +0200 +++ /var/tmp/diff_new_pack.PvDZCe/_new 2006-05-17 18:58:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kmobiletools (Version 0.4.3.1) +# spec file for package kmobiletools (Version 0.4.3.3) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,12 +16,10 @@ License: GPL Group: Productivity/Networking/Other Summary: Mobile Phone Management -Version: 0.4.3.1 -Release: 14 +Version: 0.4.3.3 +Release: 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 -Patch1: FIXME.diff -Patch2: kmobiletools-fix-eventsrc.diff %description A tool for using your mobile phone: * trigger calls via numbers in @@ -39,8 +37,6 @@ %prep %setup -q -%patch1 -%patch2 . /etc/opt/kde3/common_options update_admin @@ -53,12 +49,11 @@ . /etc/opt/kde3/common_options make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET %suse_update_desktop_file -G "Mobile Phone Tool" -C "" %name Utility Telephony -%find_lang %name %clean rm -rf $RPM_BUILD_ROOT -%files -f %name.lang +%files %defattr(-,root,root) /opt/kde3/bin/kmobiletools /opt/kde3/share/apps/kmobiletools @@ -68,6 +63,15 @@ /opt/kde3/share/icons/*/*/apps/kmobiletools.png %changelog -n kmobiletools +* Wed May 17 2006 - stbinner(a)suse.de +- update to version 0.4.3.3 + * Fixing again compilation on FreeBSD + * Fixing eventsrc + * Fixing makefiles + KMobileTools 0.4.3.2 + * Fixing compilation with gcc 4 + * Fixing compilation on freebsd + * Change .desktop entry to be compliant with freedesktop.org standard * Wed Apr 12 2006 - dkukawka(a)suse.de - fixed eventsrc (bug #165491) * Wed Feb 15 2006 - stbinner(a)suse.de ++++++ kmobiletools-0.4.3.1.tar.bz2 -> kmobiletools-0.4.3.3.tar.bz2 ++++++ ++++ 51241 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kdelibs3
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package kdelibs3 checked in at Wed May 17 18:58:09 CEST 2006. -------- --- KDE/kdelibs3/kdelibs3.changes 2006-05-15 11:18:15.000000000 +0200 +++ kdelibs3/kdelibs3.changes 2006-05-17 17:31:52.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 17:31:40 CEST 2006 - dmueller(a)suse.de + +- fix kerberos handling in kprinter (#154334) + +------------------------------------------------------------------- New: ---- fix-kerberos-printing.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.R6PyR4/_old 2006-05-17 18:57:03.000000000 +0200 +++ /var/tmp/diff_new_pack.R6PyR4/_new 2006-05-17 18:57:03.000000000 +0200 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation Version: 3.5.1 -Release: 49 +Release: 50 %define kdelibs_patch_level b BuildArch: noarch Requires: kdelibs3 qt3-devel-doc ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.R6PyR4/_old 2006-05-17 18:57:03.000000000 +0200 +++ /var/tmp/diff_new_pack.R6PyR4/_new 2006-05-17 18:57:03.000000000 +0200 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Base Libraries Version: 3.5.1 -Release: 49 +Release: 50 %define kdelibs_patch_level a Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons Provides: kups keramik kdelibs3-cups kdelibs3-33addons @@ -104,6 +104,7 @@ Patch106: use-mediamanager.diff Patch107: 3_5_BRANCH-r536436.diff Patch108: patch-mimetype-iconnames.diff +Patch109: fix-kerberos-printing.diff %description This package contains kdelibs, one of the basic packages of the K @@ -273,6 +274,7 @@ %patch106 %patch107 %patch108 +%patch109 tar xfvj %SOURCE12 # # define KDE version exactly @@ -753,6 +755,8 @@ /opt/kde3/%_lib/libkwalletclient.so %changelog -n kdelibs3 +* Wed May 17 2006 - dmueller(a)suse.de +- fix kerberos handling in kprinter (#154334) * Mon May 15 2006 - stbinner(a)suse.de - complete OpenDocument mime type icons (#166917) * Tue May 02 2006 - coolo(a)suse.de ++++++ testkhtml.spec ++++++ --- /var/tmp/diff_new_pack.R6PyR4/_old 2006-05-17 18:57:03.000000000 +0200 +++ /var/tmp/diff_new_pack.R6PyR4/_new 2006-05-17 18:57:03.000000000 +0200 @@ -16,7 +16,7 @@ License: Other License(s), see package, BSD Group: System/GUI/KDE Version: 3.5.1 -Release: 49 +Release: 50 Summary: Internal: regression testing for konqueror renderer BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: kdelibs-%{version}.tar.bz2 ++++++ fix-kerberos-printing.diff ++++++ --- kdeprint/management/smbview.cpp 2005-05-23 14:17:05.000000000 +0200 +++ kdeprint/management/smbview.cpp 2005-09-28 15:33:16.000000000 +0200 @@ -147,13 +173,26 @@ } else if (item->depth() == 1) { // opening server + char *krb5ccname = getenv ("KRB5CCNAME"); m_current = item; - *m_proc << "smbclient -N -L "; - *m_proc << KProcess::quote(item->text(0)); - *m_proc << " -W "; - *m_proc << KProcess::quote(item->parent()->text(0)); - *m_proc << " -A "; - *m_proc << KProcess::quote(m_passwdFile->name()); + if (krb5ccname) + { + *m_proc << "smbclient -k -N -L "; + } + else + { + *m_proc << "smbclient -N -L "; + } + *m_proc << KProcess::quote (item->text (0)); + *m_proc << " -W "; + *m_proc << KProcess::quote (item->parent ()-> + text (0)); + if (!krb5ccname) + { + *m_proc << " -A "; + *m_proc << KProcess:: + quote (m_passwdFile->name ()); + } startProcess(ShareListing); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kdebluetooth
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package kdebluetooth checked in at Wed May 17 18:58:01 CEST 2006. -------- --- KDE/kdebluetooth/kdebluetooth.changes 2006-04-13 13:58:25.000000000 +0200 +++ kdebluetooth/kdebluetooth.changes 2006-05-17 14:41:12.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 14:41:07 CEST 2006 - dmueller(a)suse.de + +- fix build against openobex 1.2 + +------------------------------------------------------------------- New: ---- fix-openobex-check.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebluetooth.spec ++++++ --- /var/tmp/diff_new_pack.OkfrV2/_old 2006-05-17 18:56:53.000000000 +0200 +++ /var/tmp/diff_new_pack.OkfrV2/_new 2006-05-17 18:56:53.000000000 +0200 @@ -17,7 +17,7 @@ Group: Hardware/Other Summary: Bluetooth Support for KDE Version: 0.0.svn20060413 -Release: 1 +Release: 8 BuildRoot: %{_tmppath}/%{name}-%{version}-build # createPackage.sh -ab trunk/extragear/pim -a kdebluetooth -is extragear-pim -av 0.0.svn20061413 --package bzip2 --pofiles kbluelock kbluepin kbluetoothdcm kbluetoothd kbthandsfree kbtobexclient kbtsearch kbtserialchat khciconfig kioclient libkbluetooth Source0: %name-%version.tar.bz2 @@ -27,6 +27,7 @@ Patch3: kdebluetooth-newkdepim.diff Patch5: kcm-no-dcop-error.diff Patch6: kcm-btpaired-fix.diff +Patch7: fix-openobex-check.diff %description To exchange files and data easily via Bluetooth. @@ -54,6 +55,7 @@ %patch3 %patch5 %patch6 +%patch7 rm -rf doc/da . /etc/opt/kde3/common_options update_admin # --no-unsermake @@ -111,6 +113,8 @@ /opt/kde3/share/locale %changelog -n kdebluetooth +* Wed May 17 2006 - dmueller(a)suse.de +- fix build against openobex 1.2 * Thu Apr 13 2006 - stbinner(a)suse.de - update from SVN to include previously missing translations (no code changes except one upstream committed patch) ++++++ fix-openobex-check.diff ++++++ Index: kdebluetooth/configure.in.in ================================================================================ --- kdebluetooth/configure.in.bot +++ kdebluetooth/configure.in.bot @@ -18,7 +18,7 @@ fi -if test "$OPENOBEX_CONFIG" = "no" ; then +if test "$OPENOBEX_LIBS" = "no" -o "$OPENOBEX_CFLAGS" = "no"; then echo "" echo "You're missing openobex." echo "Kdebluetooth won't be compiled without it, so you should" @@ -26,16 +26,6 @@ echo "" fi -if test "$obex_config_version_ok" != "yes" ; then - echo "" - echo "The installed openobex library version is too old: ($obex_config_version)" - echo "Kdebluetooth won't be compiled without a newer version, so you should" - echo "consider updating it." - echo "" -fi - - - --- kdebluetooth/configure.in.in +++ kdebluetooth/configure.in.in @@ -125,80 +125,18 @@ DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth" fi +PKG_CHECK_MODULES(OPENOBEX, openobex >= 1.0.0,have_openobex=yes, have_openobex=no) - - -dnl Check for openobex library -# Modified by Simone Gotti for kde-bluetooth on 2003-10-04 - -AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no) - -if test "$OPENOBEX_CONFIG" = "no" ; then - AC_MSG_WARN(openobex-config not found. Pehaps openobex is not installed.) - DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth" - OPENOBEX_CONFIG="false" -fi - -OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags` -openobex_inc_dir=`echo $OPENOBEX_CFLAGS | cut -dI -f2` -if test -f "$openobex_inc_dir/obex.h" ; then - : -else - if test -f "$openobex_inc_dir/openobex/obex.h" ; then - OPENOBEX_CFLAGS="$OPENOBEX_CFLAGS/openobex" - else - DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth" - fi -fi -OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs` - -min_obex_version=1.0.0 -AC_MSG_CHECKING(for openobex - version >= $min_obex_version) -obex_config_version=`$OPENOBEX_CONFIG --version` - -obex_config_major_version=`$OPENOBEX_CONFIG --version | \ - sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'` -obex_config_minor_version=`$OPENOBEX_CONFIG --version | \ - sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'` -obex_config_micro_version=`$OPENOBEX_CONFIG --version | \ - sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'` - -obex_req_major_version=`echo $min_obex_version | \ - sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'` -obex_req_minor_version=`echo $min_obex_version | \ - sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'` -obex_req_micro_version=`echo $min_obex_version | \ - sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'` - -if test -n "$obex_req_major_version" && test -n "$obex_config_minor_version" ; then - if test $obex_req_major_version -lt $obex_config_major_version ; then - obex_config_version_ok="yes" - fi - if test $obex_req_major_version -eq $obex_config_major_version ; then - if test $obex_req_minor_version -lt $obex_config_minor_version ; then - obex_config_version_ok="yes" - fi - if test $obex_req_minor_version -eq $obex_config_minor_version ; then - if test $obex_req_micro_version -le $obex_config_micro_version ; then - obex_config_version_ok="yes" - fi - fi - fi -fi - -if test "$obex_config_version_ok" != "yes" ; then - AC_MSG_WARN(Installed openobex library too old ($obex_config_version)) - DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth" +if test x$have_openobex = xno; then + DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth" fi AC_SUBST(OPENOBEX_CFLAGS) AC_SUBST(OPENOBEX_LIBS) -AC_MSG_RESULT(yes) CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" - # Configure flag and test for enabling the irmcsync konnector. It works only for kitchensync (from kdepim) >= 3.4 . Default: enabled. AC_ARG_ENABLE(irmcsynckonnector, AC_HELP_STRING([--enable-irmcsynckonnector],[enable the irMCSync Kitchensync(Multisynk) konnector]),[enable_irmcsynckonnector=$enableval], enable_irmcsynckonnector=yes) --- kdebluetooth/libkobex/kobex.h +++ kdebluetooth/libkobex/kobex.h @@ -30,7 +30,7 @@ { #include <sys/socket.h> #include <bluetooth/bluetooth.h> -#include <obex.h> +#include <openobex/obex.h> } extern "C" void Obex_handleEvent(obex_t *, obex_object_t *, int, int, int, int); --- kdebluetooth/libkobex/kobexheader.h +++ kdebluetooth/libkobex/kobexheader.h @@ -20,7 +20,7 @@ #define KOBEXHEADER_H extern "C" { - #include <obex.h> + #include <openobex/obex.h> } class ObexObject; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kchmviewer
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package kchmviewer checked in at Wed May 17 18:56:48 CEST 2006. -------- --- KDE/kchmviewer/kchmviewer.changes 2006-02-15 11:26:36.000000000 +0100 +++ kchmviewer/kchmviewer.changes 2006-05-17 13:12:58.000000000 +0200 @@ -1,0 +2,36 @@ +Wed May 17 13:09:28 CEST 2006 - stbinner(a)suse.de + +- update to version 2.5: + * Application icon should now be correctly installed. + * Fixed handling of mailto: urls. + * 'Locate in content' button now opens a Contents tab, if hidden. + * Version 2.5 release. + * A tooltip is now shows the full text in all the tree and list views if truncated on screen. + * Fixed content tree parser, now the content table should be parsed correctly. + * Fixed crash after the encoding is changed, if any tree item is clicked. + * Added a bookmark menu. Ctrl-B is a shortcut to add a bookmark. + * Added tab browsing. Use right-click and 'Open in new tab'. + - Added right-click content menu to open pages in a new tab. + - Control-click on link or table of contents opens a page in a new tab in background. + - Shift-click on link or table of contents opens a page in a new tab in foreground. + * 'Setup' menu renamed to 'Settings' + * Fixed various navigation errors when 'Locate' button didn't locate the appropriate topic. + * Fixed forward navigation, and saved scroll position. + * Navigation history rewritten, now it stores text position too. + * Added 'Extract CHM content' menu item to extract the whole CHM file into a directory. + * Added i18n calls for complete internationalization. pot file created. + * Switched to a new, correct automake file structure. + * Fixed autotest. + * Now kchmviewer uses system libchm if found, and no --with-builtin-chmlib configure switch defined. + * Made configure more compatible with newest autoconf and Debian - thanks to Jose Luis Tallon. + * Added an application icon - thanks to Jose Luis Tallon. + * Fixed index parser for PHP manual - thanks to Dmitry Bakshaev. + * In full screen mode the menu bar and status bar are now hidden. + * Added 'locate in content window' button to open currently opened topic in the content window. + * Fixed compilation with gcc 4.1 - thanks to Jan Jitse Venselaar. + * The algorithm to detect the valid root offset in contents page is changed. Now there should be less + "CHMFile::ParseAndFillTopicsTree: child entry 1 with no root entry!" errors. + * Pages with images only are now shown correctly. + * Fixed kqrunprocess.h compilation bug on some platforms. + +------------------------------------------------------------------- Old: ---- kchmviewer-1.3.tar.gz New: ---- gcc41.diff kchmviewer-2.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kchmviewer.spec ++++++ --- /var/tmp/diff_new_pack.0vBeM4/_old 2006-05-17 18:56:36.000000000 +0200 +++ /var/tmp/diff_new_pack.0vBeM4/_new 2006-05-17 18:56:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kchmviewer (Version 1.3) +# spec file for package kchmviewer (Version 2.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,12 +15,13 @@ License: GPL Group: Productivity/Office/Other Summary: KDE chm Viewer (MS Windows Compressed HTML Documents) -Version: 1.3 -Release: 4 +Version: 2.5 +Release: 2 URL: http://kchmviewer.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.gz Patch: %name.diff +Patch1: gcc41.diff %description This is a viewer for the chm files known from the MS Windows world. It @@ -36,6 +37,7 @@ %prep %setup -q %patch +%patch1 . /etc/opt/kde3/common_options update_admin --no-unsermake @@ -58,9 +60,43 @@ /opt/kde3/bin/* /opt/kde3/%_lib/* /opt/kde3/share/appl*/*/*.desktop +/opt/kde3/share/icons/*/*/*/kchmviewer.* /opt/kde3/share/services/msits.protocol %changelog -n kchmviewer +* Wed May 17 2006 - stbinner(a)suse.de +- update to version 2.5: + * Application icon should now be correctly installed. + * Fixed handling of mailto: urls. + * 'Locate in content' button now opens a Contents tab, if hidden. + * Version 2.5 release. + * A tooltip is now shows the full text in all the tree and list views if truncated on screen. + * Fixed content tree parser, now the content table should be parsed correctly. + * Fixed crash after the encoding is changed, if any tree item is clicked. + * Added a bookmark menu. Ctrl-B is a shortcut to add a bookmark. + * Added tab browsing. Use right-click and 'Open in new tab'. +- Added right-click content menu to open pages in a new tab. +- Control-click on link or table of contents opens a page in a new tab in background. +- Shift-click on link or table of contents opens a page in a new tab in foreground. + * 'Setup' menu renamed to 'Settings' + * Fixed various navigation errors when 'Locate' button didn't locate the appropriate topic. + * Fixed forward navigation, and saved scroll position. + * Navigation history rewritten, now it stores text position too. + * Added 'Extract CHM content' menu item to extract the whole CHM file into a directory. + * Added i18n calls for complete internationalization. pot file created. + * Switched to a new, correct automake file structure. + * Fixed autotest. + * Now kchmviewer uses system libchm if found, and no --with-builtin-chmlib configure switch defined. + * Made configure more compatible with newest autoconf and Debian - thanks to Jose Luis Tallon. + * Added an application icon - thanks to Jose Luis Tallon. + * Fixed index parser for PHP manual - thanks to Dmitry Bakshaev. + * In full screen mode the menu bar and status bar are now hidden. + * Added 'locate in content window' button to open currently opened topic in the content window. + * Fixed compilation with gcc 4.1 - thanks to Jan Jitse Venselaar. + * The algorithm to detect the valid root offset in contents page is changed. Now there should be less + "CHMFile::ParseAndFillTopicsTree: child entry 1 with no root entry!" errors. + * Pages with images only are now shown correctly. + * Fixed kqrunprocess.h compilation bug on some platforms. * Wed Feb 15 2006 - stbinner(a)suse.de - add GenericName to .desktop file * Wed Jan 25 2006 - mls(a)suse.de ++++++ gcc41.diff ++++++ --- src/iconstorage.h 2006/04/05 11:39:35 1.1 +++ src/iconstorage.h 2006/04/05 11:39:50 @@ -57,7 +57,7 @@ const QPixmap * getBookIconPixmap (unsigned int id); const QPixmap * getToolbarPixmap (pixmap_index_t pix); const QPixmap * getApplicationIcon(); - const QPixmap * KCHMIconStorage::getCloseWindowIcon(); + const QPixmap * getCloseWindowIcon(); private: const QPixmap * returnOrLoadImage (unsigned int id, const png_memory_image_t * image); ++++++ kchmviewer-1.3.tar.gz -> kchmviewer-2.5.tar.gz ++++++ ++++ 10830 lines of diff (skipped) ++++++ kchmviewer.diff ++++++ --- /var/tmp/diff_new_pack.0vBeM4/_old 2006-05-17 18:56:38.000000000 +0200 +++ /var/tmp/diff_new_pack.0vBeM4/_new 2006-05-17 18:56:38.000000000 +0200 @@ -9,27 +9,6 @@ typedef unsigned char UChar; typedef short Int16; typedef unsigned short UInt16; ---- configure.ac -+++ configure.ac -@@ -23,6 +23,10 @@ - AC_MSG_ERROR(You need to have the X11 libraries and headers installed) - fi - -+if test "x$with_kde" = "xyes"; then -+KDE_SET_PREFIX -+fi -+ - KDE_PROG_LIBTOOL - AC_ENABLE_SHARED(yes) - AC_ENABLE_STATIC(no) -@@ -36,7 +40,6 @@ - AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde],[enable KDE support])) - - if test "x$with_kde" = "xyes"; then -- KDE_SET_PREFIX - AC_PATH_KDE - AM_KDE_WITH_NLS - AC_DEFINE(USE_KDE, 1, [use KDE support]) --- kio-msits/kchmviewer.desktop +++ kio-msits/kchmviewer.desktop @@ -3,7 +3,6 @@ @@ -40,14 +19,3 @@ Comment= Terminal=0 Name=KchmViewer ---- src/xchmfile.h -+++ src/xchmfile.h -@@ -291,7 +291,7 @@ - } - - //! Helper. Translates from Win32 encodings to generic wxWidgets ones. -- const char * CHMFile::GetFontEncFromCharSet (const QString& font) const; -+ const char * GetFontEncFromCharSet (const QString& font) const; - - //! Helper. Returns the $FIftiMain offset of leaf node or 0. - u_int32_t GetLeafNodeOffset(const QString& text, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit john
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package john checked in at Wed May 17 18:56:33 CEST 2006. -------- --- john/john.changes 2006-03-27 13:37:31.000000000 +0200 +++ john/john.changes 2006-05-17 14:23:22.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 17 14:23:08 CEST 2006 - schwab(a)suse.de + +- Use RPM_OPT_FLAGS. +- Don't strip binaries. +- Fix last change. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ john.spec ++++++ --- /var/tmp/diff_new_pack.7Fqik5/_old 2006-05-17 18:55:23.000000000 +0200 +++ /var/tmp/diff_new_pack.7Fqik5/_new 2006-05-17 18:55:23.000000000 +0200 @@ -16,7 +16,7 @@ Group: Productivity/Security Autoreqprov: on Version: 1.7.0.2 -Release: 8 +Release: 9 Summary: Detects Weak Passwords Source: %{name}-%{version}.tar.bz2 Source2: %{name}.8.gz @@ -41,7 +41,7 @@ Patch19: %{name}-rawMD5_fmt.c.diff Patch20: %{name}-undrop.c.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define cflags CFLAGS="-c -Wall -O2 -fomit-frame-pointer -DJOHN_SYSTEMWIDE=1 -JOHN_SYSTEMWIDE_HOME=usr/share/john -JOHN_SYSTEMWIDE_EXEC=usr/sbin/john" +%define cflags CFLAGS="-c -Wall $RPM_OPT_FLAGS -DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_HOME='\\\"/usr/share/john\\\"' -DJOHN_SYSTEMWIDE_EXEC='\\\"/usr/sbin/john\\\"'" LDFLAGS= %description John the Ripper is a fast password cracker (password security auditing @@ -148,6 +148,10 @@ %doc %{_mandir}/man8/john.8.gz %changelog -n john +* Wed May 17 2006 - schwab(a)suse.de +- Use RPM_OPT_FLAGS. +- Don't strip binaries. +- Fix last change. * Mon Mar 27 2006 - lrupp(a)suse.de - use CFLAGS instead of params.h.patch * Fri Mar 24 2006 - lrupp(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit gnome-cups-manager
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package gnome-cups-manager checked in at Wed May 17 18:55:15 CEST 2006. -------- --- GNOME/gnome-cups-manager/gnome-cups-manager.changes 2006-05-15 16:07:49.000000000 +0200 +++ gnome-cups-manager/gnome-cups-manager.changes 2006-05-17 15:58:12.000000000 +0200 @@ -22,6 +22,6 @@ - fact that CUPS is a piece of crap and doesn't detect newly - plugged-in usb printers without a restart of the daemon. This - patch is needed so that available usb printers appear in the - gnome-cups-add printer list (since we are dropping hal because - yast2's printer wizard breaks if the user configures some - printers via yast2 and some via GNOME). + fact that CUPS is broken and doesn't detect newly plugged-in usb + printers without a restart of the daemon. This patch is needed so + that available usb printers appear in the gnome-cups-add printer + list (since we are dropping hal because yast2's printer wizard + breaks if the user configures some printers via yast2 and some + via GNOME). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-cups-manager.spec ++++++ --- /var/tmp/diff_new_pack.tcdxwo/_old 2006-05-17 18:54:40.000000000 +0200 +++ /var/tmp/diff_new_pack.tcdxwo/_new 2006-05-17 18:54:40.000000000 +0200 @@ -13,7 +13,7 @@ Name: gnome-cups-manager BuildRequires: cups cups-devel gcc-c++ gnome-common gnutls-devel intltool krb5-devel libglade2-devel libgnomecups-devel libgnomeprintui-devel libgnomeui-devel libsmbclient libsmbclient-devel libwnck-devel mDNSResponder-devel perl-XML-Parser update-desktop-files Version: 0.32cvs20060120 -Release: 33 +Release: 34 URL: http://www.gnome.org/ Group: System/GUI/GNOME License: GPL @@ -114,12 +114,12 @@ - Remove cups-backends from Requires:, no longer needed * Thu Apr 06 2006 - fejj(a)suse.de - Added autodetect-usb-printers.patch - needed to work around the - fact that CUPS is a piece of crap and doesn't detect newly - plugged-in usb printers without a restart of the daemon. This - patch is needed so that available usb printers appear in the - gnome-cups-add printer list (since we are dropping hal because - yast2's printer wizard breaks if the user configures some - printers via yast2 and some via GNOME). + fact that CUPS is broken and doesn't detect newly plugged-in usb + printers without a restart of the daemon. This patch is needed so + that available usb printers appear in the gnome-cups-add printer + list (since we are dropping hal because yast2's printer wizard + breaks if the user configures some printers via yast2 and some + via GNOME). * Mon Apr 03 2006 - joeshaw(a)suse.de - Fix "quarter" typo in the US letter test page. (bnc #9535) * Thu Mar 30 2006 - fejj(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit banshee
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package banshee checked in at Wed May 17 18:54:36 CEST 2006. -------- --- GNOME/banshee/banshee.changes 2006-05-11 19:25:26.000000000 +0200 +++ banshee/banshee.changes 2006-05-17 18:44:55.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 18:43:03 CEST 2006 - gekker(a)suse.de + +- Add translations for de and hu (#173507) + +------------------------------------------------------------------- New: ---- banshee-i18n.patch banshee-po.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ banshee.spec ++++++ --- /var/tmp/diff_new_pack.LFjqjB/_old 2006-05-17 18:53:26.000000000 +0200 +++ /var/tmp/diff_new_pack.LFjqjB/_new 2006-05-17 18:53:26.000000000 +0200 @@ -23,9 +23,10 @@ PreReq: filesystem gconf2 Requires: mono-core Version: 0.10.9 -Release: 26 +Release: 27 Source0: banshee-%{version}.tar.gz Source1: gstreamer-xing-0.10.0.tar.gz +Source2: banshee-po.tar.bz2 Patch0: %{name}-libaoss-preload.patch Patch1: %{name}.exe.config.in.patch Patch2: %{name}-configure.patch @@ -34,6 +35,7 @@ Patch6: %{name}-sled-cuml-10.diff Patch7: %{name}-networkmanager-reconnect.diff Patch8: %{name}-desktop-ogg-support.patch +Patch9: %{name}-i18n.patch URL: http://banshee-project.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Music Player Based on Mono and GStreamer @@ -141,7 +143,11 @@ Aaron Bockover <aaron(a)aaronbock.net> %prep -%setup -b1 +%setup -b1 -a2 +if %version != 0.10.9 ; then +echo "Please remove Source2 and Source3 and verify, that translations work." +exit 1 +fi %patch0 %patch1 %patch2 @@ -150,6 +156,7 @@ %patch6 %patch7 %patch8 +%patch9 %build autoreconf -f -i @@ -276,6 +283,8 @@ %{prefix}/%{_lib}/banshee/Banshee.Plugins/Daap.dll* %changelog -n banshee +* Wed May 17 2006 - gekker(a)suse.de +- Add translations for de and hu (#173507) * Thu May 11 2006 - rml(a)suse.de - Add requires on dbus-1-x11, as we use the session bus (Novell bug #174865) ++++++ banshee-i18n.patch ++++++ --- configure.ac +++ configure.ac @@ -358,8 +358,7 @@ AC_DEFINE_UNQUOTED([HELIX_LIBRARY_PATH], ["${HELIX_LIBRARY_PATH}"], [Helix Library Path]) dnl Intl - -ALL_LINGUAS="bg ca cs da en_CA en_GB es fi fr it ja lt nb nl pt_BR sv th zh_CN" +ALL_LINGUAS="bg ca cs da de en_CA en_GB es fi fr hu it ja lt nb nl pt_BR sv th zh_CN" GETTEXT_PACKAGE=banshee AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit autofs
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package autofs checked in at Wed May 17 18:53:19 CEST 2006. -------- --- autofs/autofs.changes 2006-02-28 15:32:03.000000000 +0100 +++ autofs/autofs.changes 2006-05-17 18:48:52.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 18:47:56 CEST 2006 - seife(a)suse.de + +- Add README.NetworkManager [#175935] + +------------------------------------------------------------------- New: ---- README.NetworkManager ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.FDhL0j/_old 2006-05-17 18:52:47.000000000 +0200 +++ /var/tmp/diff_new_pack.FDhL0j/_new 2006-05-17 18:52:47.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Requires: sed grep Version: 4.1.4 -Release: 13 +Release: 23 Summary: A Kernel-Based Automounter BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-%{version}.tar.bz2 @@ -27,6 +27,7 @@ Source3: autofs.schema Source4: README.SuSE.ldap Source5: README.SuSE +Source6: README.NetworkManager Patch1: autofs-4.1.0-hesiod-bind.patch Patch2: autofs-4.1.0-auto-master.patch Patch3: autofs4-init.diff @@ -55,6 +56,7 @@ cp %{SOURCE3} . cp %{SOURCE4} . cp %{SOURCE5} . +cp %{SOURCE6} . %patch1 -p1 -b .hesiod-bind %patch2 -p1 -b .auto-master %patch3 @@ -113,7 +115,7 @@ %config /etc/init.d/autofs /usr/sbin/rcautofs %doc COPYING COPYRIGHT README README.changer README.options README.smbfs -%doc autofs.schema README.SuSE.ldap README.SuSE +%doc autofs.schema README.SuSE.ldap README.SuSE README.NetworkManager %{_libdir}/autofs/ %if "%_libdir" == "/usr/lib64" /usr/lib/autofs @@ -123,6 +125,8 @@ /usr/sbin/automount %changelog -n autofs +* Wed May 17 2006 - seife(a)suse.de +- Add README.NetworkManager [#175935] * Tue Feb 28 2006 - cthiel(a)suse.de - fix post script * Wed Feb 01 2006 - rhafer(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit flex
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package flex checked in at Wed May 17 18:52:20 CEST 2006. -------- --- flex/flex.changes 2006-05-16 10:20:46.000000000 +0200 +++ flex/flex.changes 2006-05-17 16:16:42.000000000 +0200 @@ -1,0 +2,13 @@ +Wed May 17 15:59:20 CEST 2006 - mmarek(a)suse.cz + +- update to 2.5.33 + * bugfix release + * obsoleted patches: + - YY_DECL.patch + - array-yymore.patch + - double-free.patch + - keep-macros.patch + - overflow.patch + * kept fPIC.patch, yylineno.patch and doc-fix.diff + +------------------------------------------------------------------- Old: ---- flex-2.5.31-YY_DECL.patch flex-2.5.31-array-yymore.patch flex-2.5.31-doc-fix.diff flex-2.5.31-double-free.patch flex-2.5.31-fPIC.patch flex-2.5.31-keep-macros.patch flex-2.5.31-overflow.patch flex-2.5.31-yylineno.patch flex-2.5.31.tar.bz2 New: ---- flex-2.5.33-doc-fix.diff flex-2.5.33-fPIC.patch flex-2.5.33-yylineno.patch flex-2.5.33.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flex.spec ++++++ --- /var/tmp/diff_new_pack.kPdS4n/_old 2006-05-17 18:51:34.000000000 +0200 +++ /var/tmp/diff_new_pack.kPdS4n/_new 2006-05-17 18:51:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package flex (Version 2.5.31) +# spec file for package flex (Version 2.5.33) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,19 +18,14 @@ Requires: m4 PreReq: %install_info_prereq Autoreqprov: on -Version: 2.5.31 -Release: 18 +Version: 2.5.33 +Release: 2 Summary: Fast Lexical Analyzer Generator Source: %{name}-%{version}.tar.bz2 Source1: lex-wrapper.sh Source2: README.SUSE Patch1: %{name}-%{version}-fPIC.patch -Patch2: %{name}-%{version}-keep-macros.patch -Patch3: %{name}-%{version}-double-free.patch -Patch4: %{name}-%{version}-array-yymore.patch -Patch5: %{name}-%{version}-YY_DECL.patch Patch6: %{name}-%{version}-yylineno.patch -Patch7: %{name}-%{version}-overflow.patch Patch8: %{name}-%{version}-doc-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,12 +44,7 @@ %prep %setup -q %patch1 -%patch2 -%patch3 -%patch4 -%patch5 %patch6 -%patch7 %patch8 cp %{S:2} . @@ -94,6 +84,16 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %changelog -n flex +* Wed May 17 2006 - mmarek(a)suse.cz +- update to 2.5.33 + * bugfix release + * obsoleted patches: +- YY_DECL.patch +- array-yymore.patch +- double-free.patch +- keep-macros.patch +- overflow.patch + * kept fPIC.patch, yylineno.patch and doc-fix.diff * Tue May 16 2006 - agruen(a)suse.de - A minor fix in the documentation. * Thu Mar 09 2006 - mmarek(a)suse.cz ++++++ flex-2.5.31-doc-fix.diff -> flex-2.5.33-doc-fix.diff ++++++ --- flex/flex-2.5.31-doc-fix.diff 2006-05-16 10:19:31.000000000 +0200 +++ flex/flex-2.5.33-doc-fix.diff 2006-05-17 16:15:49.000000000 +0200 @@ -3,11 +3,9 @@ Andreas Gruenbacher <agruen(a)suse.de> -Index: doc/flex.info-4 -=================================================================== ---- doc/flex.info-4.orig +--- doc/flex.info-4 +++ doc/flex.info-4 -@@ -267,8 +267,8 @@ indexed by name, as described below. The +@@ -267,8 +267,8 @@ +-------------------------------+ Table 1 | uint16 td_id; | | uint16 td_flags; | @@ -17,7 +15,7 @@ | void td_data[]; | | uint8 td_pad64[]; | +-------------------------------+ -@@ -399,12 +399,6 @@ Fields of a table: +@@ -399,12 +399,6 @@ elements or between structs. The type of each member is determined by the `YYTD_DATA*' bits. @@ -30,7 +28,7 @@ `td_hilen' If `td_hilen' is non-zero, then the data is a two-dimensional array. Otherwise, the data is a one-dimensional array. `td_hilen' -@@ -420,11 +414,17 @@ Fields of a table: +@@ -420,11 +414,17 @@ simply skipped. Flex does not currently generate tables of zero length. @@ -49,11 +47,9 @@ `td_pad64[]' Zero or more NULL bytes, padding the entire table to the next -Index: flex-2.5.31/doc/flex.texi -=================================================================== ---- doc/flex.texi.orig +--- doc/flex.texi +++ doc/flex.texi -@@ -4972,8 +4972,8 @@ indexed by name, as described below. The +@@ -4984,8 +4984,8 @@ +-------------------------------+ Table 1 | uint16 td_id; | | uint16 td_flags; | @@ -63,7 +59,7 @@ | void td_data[]; | | uint8 td_pad64[]; | +-------------------------------+ -@@ -5092,11 +5092,6 @@ two integers. There is no padding betwee +@@ -5104,11 +5104,6 @@ The type of each member is determined by the @code{YYTD_DATA*} bits. @end table @@ -75,7 +71,7 @@ @item td_hilen If @code{td_hilen} is non-zero, then the data is a two-dimensional array. Otherwise, the data is a one-dimensional array. @code{td_hilen} contains the -@@ -5110,11 +5105,16 @@ by the @code{td_flags} field. It is pos +@@ -5122,11 +5117,16 @@ array, and no data is loaded, i.e., this table is simply skipped. Flex does not currently generate tables of zero length. ++++++ flex-2.5.31-fPIC.patch -> flex-2.5.33-fPIC.patch ++++++ ++++++ flex-2.5.31-yylineno.patch -> flex-2.5.33-yylineno.patch ++++++ --- flex/flex-2.5.31-yylineno.patch 2005-12-05 13:23:03.000000000 +0100 +++ flex/flex-2.5.33-yylineno.patch 2006-05-17 16:15:49.000000000 +0200 @@ -1,6 +1,6 @@ --- main.c +++ main.c -@@ -1610,9 +1610,11 @@ +@@ -1633,9 +1633,11 @@ if (!C_plus_plus && !reentrant) { outn ("extern int yylineno;"); @@ -17,7 +17,7 @@ if (C_plus_plus) { --- flex.skl +++ flex.skl -@@ -76,6 +76,16 @@ +@@ -80,6 +80,16 @@ m4preproc_define(`M4_GEN_PREFIX', ``m4_define(yy[[$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') @@ -33,4 +33,4 @@ + %if-c++-only /* The c++ scanner is a mess. The FlexLexer.h header file relies on the - * following macro. + * following macro. This is required in order to pass the c++-multiple-scanners ++++++ flex-2.5.31.tar.bz2 -> flex-2.5.33.tar.bz2 ++++++ ++++ 35843 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit f-spot
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package f-spot checked in at Wed May 17 18:51:28 CEST 2006. -------- --- GNOME/f-spot/f-spot.changes 2006-05-16 20:26:29.000000000 +0200 +++ f-spot/f-spot.changes 2006-05-17 07:52:08.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 07:51:36 CEST 2006 - lewing(a)suse.de + +- Start import immediately if path is passed on the command line. Fixes 171034. + +------------------------------------------------------------------- New: ---- f-spot-idleimport.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ f-spot.spec ++++++ --- /var/tmp/diff_new_pack.KVDwB0/_old 2006-05-17 18:50:51.000000000 +0200 +++ /var/tmp/diff_new_pack.KVDwB0/_new 2006-05-17 18:50:51.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Suggests: dcraw Version: 0.1.11 -Release: 19 +Release: 20 Summary: GNOME Photo Management Application URL: http://www.gnome.org/projects/f-spot/ Source: %{name}-%{version}.tar.bz2 @@ -39,6 +39,7 @@ Patch12: %{name}-newtagimport.patch Patch13: %{name}-iconselection.patch Patch14: %{name}-syncmetadata.patch +Patch15: %{name}-idleimport.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mono-core nautilus-cd-burner dbus-1-x11 @@ -75,6 +76,7 @@ %patch12 %patch13 %patch14 +%patch15 %build rename no nb po/no.* @@ -133,6 +135,8 @@ %endif %changelog -n f-spot +* Wed May 17 2006 - lewing(a)suse.de +- Start import immediately if path is passed on the command line. Fixes 171034. * Tue May 16 2006 - lewing(a)suse.de - Trap errors when syncing metadata to file in changed handler. Fixes 175505, 173687. * Tue May 16 2006 - lewing(a)suse.de ++++++ f-spot-idleimport.patch ++++++ Index: src/ImportCommand.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/ImportCommand.cs,v retrieving revision 1.59 diff -u -p -r1.59 ImportCommand.cs --- src/ImportCommand.cs 13 Mar 2006 05:51:18 -0000 1.59 +++ src/ImportCommand.cs 17 May 2006 05:11:02 -0000 @@ -319,6 +319,8 @@ public class ImportCommand : FSpot.Glade ImportBackend importer; IconView tray; + FSpot.Delay idle_start; + string loading_string; string import_path; @@ -371,6 +373,7 @@ public class ImportCommand : FSpot.Glade { main_window = mw; step = new FSpot.Delay (10, new GLib.IdleHandler (Step)); + idle_start = new FSpot.Delay (new IdleHandler (Start)); loading_string = Catalog.GetString ("Loading {0} of {1}"); } @@ -543,13 +546,12 @@ public class ImportCommand : FSpot.Glade //tag_label.Text = t.Name; } - private void HandleRecurseToggled (object sender, System.EventArgs args) { this.Cancel (); this.Dialog.Sensitive = false; - Idle.Add (new IdleHandler (Start)); + idle_start.Start (); } public int ImportFromFile (PhotoStore store, string path) @@ -615,6 +617,7 @@ public class ImportCommand : FSpot.Glade SetImportPath (path); source_option_menu.SetHistory (0); } + idle_start.Start (); } ResponseType response = (ResponseType) this.Dialog.Run (); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit eric
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package eric checked in at Wed May 17 18:50:44 CEST 2006. -------- --- KDE/eric/eric.changes 2006-01-25 21:32:54.000000000 +0100 +++ eric/eric.changes 2006-05-17 13:07:19.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 17 13:06:27 CEST 2006 - stbinner(a)suse.de + +- update to version 3.9 + * a bunch of bug fixes + * a few usability enhancements + * support for Qt4 and PyQt4 + * support for functions new to subversion >= 1.2.0 + +------------------------------------------------------------------- Old: ---- eric-3.8.1.tar.gz eric-i18n-de-3.8.1.tar.gz eric-i18n-fr-3.8.1.tar.gz eric-i18n-ru-3.8.1.tar.gz New: ---- eric-3.9.0.tar.gz eric-i18n-de-3.9.0.tar.gz eric-i18n-fr-3.9.0.tar.gz eric-i18n-ru-3.9.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eric.spec ++++++ --- /var/tmp/diff_new_pack.0JQN5D/_old 2006-05-17 18:49:47.000000000 +0200 +++ /var/tmp/diff_new_pack.0JQN5D/_new 2006-05-17 18:49:47.000000000 +0200 @@ -1,11 +1,11 @@ # -# spec file for package eric (Version 3.8.1) +# spec file for package eric (Version 3.9.0) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -17,12 +17,12 @@ License: GPL Group: Development/Tools/IDE Summary: Python IDE -Requires: python-qt, python >= %py_ver, python < %{py_ver}.99, python-doc +Requires: PyQt, python >= %py_ver, python < %{py_ver}.99, python-doc %if %suse_version > 900 Requires: python-xml %endif -Version: 3.8.1 -Release: 3 +Version: 3.9.0 +Release: 2 Source0: %name-%version.tar.gz Source1: %name.desktop Source2: APIs.tar.bz2 @@ -65,6 +65,12 @@ /%python_site/* %changelog -n eric +* Wed May 17 2006 - stbinner(a)suse.de +- update to version 3.9 + * a bunch of bug fixes + * a few usability enhancements + * support for Qt4 and PyQt4 + * support for functions new to subversion >= 1.2.0 * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Dec 22 2005 - ro(a)suse.de ++++++ eric-3.8.1.tar.gz -> eric-3.9.0.tar.gz ++++++ ++++ 67218 lines of diff (skipped) ++++++ eric-i18n-de-3.8.1.tar.gz -> eric-i18n-de-3.9.0.tar.gz ++++++ Binary files old/eric-3.8.1/eric/i18n/eric3_de.qm and new/eric-3.9.0/eric/i18n/eric3_de.qm differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric-3.8.1/eric/i18n/eric3_de.ts new/eric-3.9.0/eric/i18n/eric3_de.ts --- old/eric-3.8.1/eric/i18n/eric3_de.ts 2005-11-07 12:29:16.000000000 +0100 +++ new/eric-3.9.0/eric/i18n/eric3_de.ts 2006-04-02 19:07:53.000000000 +0200 @@ -1905,6 +1905,30 @@ <source>Templates</source> <translation>Vorlagen</translation> </message> + <message> + <source>Programs</source> + <translation>Programme</translation> + </message> + <message> + <source>Python Module</source> + <translation>Python Modul</translation> + </message> + <message> + <source>(not configured)</source> + <translation>(nicht konfiguriert)</translation> + </message> + <message> + <source>(not found)</source> + <translation>(nicht gefunden)</translation> + </message> + <message> + <source>Select Qt4 Directory</source> + <translation>WÃ€hle das Qt4 Verzeichnis</translation> + </message> + <message> + <source>Select Qt4 documentation directory</source> + <translation>WÃ€hle Qt4 Dokumentationsverzeichnis</translation> + </message> </context> <context> <name>ConfigurationForm</name> @@ -3159,14 +3183,6 @@ <translation>AnwÃ€hlen, wenn geÃ€nderte Formulare bei einer Start Aktion automatisch ÃŒbersetzt werden sollen</translation> </message> <message> - <source>Remote Autocompletion Enabled</source> - <translation>Autom. VervollstÃ€ndigung (entfernt) aktiv</translation> - </message> - <message> - <source>Select this to enable remote autocompletion</source> - <translation>WÃ€hle dies, um die autom. VervollstÃ€ndigung (entfernt) zu aktivieren</translation> - </message> - <message> <source>Word Wrap Enabled</source> <translation>Zeilenumbruch aktivieren</translation> </message> @@ -3773,6 +3789,74 @@ <source>Filename Pattern:</source> <translation>Dateinamenmuster:</translation> </message> + <message> + <source>Path</source> + <translation>Pfad</translation> + </message> + <message> + <source>Version</source> + <translation>Version</translation> + </message> + <message> + <source>Show Programs</source> + <translation>Programme anzeigen</translation> + </message> + <message> + <source>Search</source> + <translation>Suchen</translation> + </message> + <message> + <source>Press to search for programs</source> + <translation>DrÃŒcke, um nach Programmen zu suchen</translation> + </message> + <message> + <source>Enter the number of history entries allowed</source> + <translation>Gib die maximale Zahl an History EintrÃ€gen an</translation> + </message> + <message> + <source>max. History Entries:</source> + <translation>max. Anzahl History-EintrÃ€ge:</translation> + </message> + <message> + <source>Qt4 Documentation</source> + <translation>Qt4 Dokumentation</translation> + </message> + <message> + <source>Enter the Qt4 documentation directory</source> + <translation>Gib das Qt4 Dokumentationsverzeichnis ein</translation> + </message> + <message> + <source>Press to select the Qt4 documentation directory via a dialog</source> + <translation>Das Qt4 Dokumentationsverzeichnis mittels eines Verzeichnisauswahldialoges wÃ€hlen</translation> + </message> + <message> + <source>Note: Leave empty to use the QT4DOCDIR environment variable, if set.</source> + <translation>Hinweis: Leer lassen, um die Umgebungsvariable QT4DOCDIR zu verwenden, wenn sie gesetzt ist.</translation> + </message> + <message> + <source>Qt4 Directory</source> + <translation>Qt4 Verzeichnis</translation> + </message> + <message> + <source>Enter the path of the Qt4 directory.</source> + <translation>Gib den Pfad des Qt4 Verzeichnisses ein.</translation> + </message> + <message> + <source>Press to select the Qt4 directory via a directory selection dialog</source> + <translation>Das Qt4 Verzeichnis mittels eines Verzeichnisauswahldialoges wÃ€hlen</translation> + </message> + <message> + <source>Export Qt4 Directory entered above</source> + <translation>obiges Qt4 Verzeichnis exportieren</translation> + </message> + <message> + <source>Select, whether the Qt4 Directory entered should be exported to the environment</source> + <translation>AuswÃ€hlen, um das eingegebene Qt4 Verzeichnis als Umgebungsvariable zu exportieren</translation> + </message> + <message> + <source>Note: Leave this entry empty to use the QT4DIR environment variable.</source> + <translation>Hinweis: Lassen Sie diesen Eintrag leer, um die Umgebungsvariable QT4DIR zu verwenden.</translation> + </message> </context> <context> <name>CopyForm</name> @@ -5507,6 +5591,14 @@ <source>The program has terminated with an exit status of %1.</source> <translation>Das Programm wurde mit dem Status %1 beendet.</translation> </message> + <message> + <source>Breakpoint Condition Error</source> + <translation>Fehler in Haltepunkt Bedingung</translation> + </message> + <message> + <source>The condition of the breakpoint %1, %2 contains a syntax error.</source> + <translation>Die Bedingung des Haltepunktes %1, %2 enthÃ€lt einen Syntaxfehler.</translation> + </message> </context> <context> <name>DebuggerPropertiesDialog</name> @@ -7240,6 +7332,38 @@ <source>Select to create a 'Save File' dialog</source> <translation>AuswÃ€hlen, um einen 'Datei sichern' Dialog zu erzeugen</translation> </message> + <message> + <source>Qt Version</source> + <translation>Qt Version</translation> + </message> + <message> + <source>Qt 3</source> + <translation>Qt 3</translation> + </message> + <message> + <source>Select to generate code for Qt 3</source> + <translation>AuswÃ€hlen, um Quelltext fÃŒr Qt 3 zu erzeugen</translation> + </message> + <message> + <source>Qt 4</source> + <translation>Qt 4</translation> + </message> + <message> + <source>Select to generate code for Qt 4</source> + <translation>AuswÃ€hlen, um Quelltext fÃŒr Qt 4 zu erzeugen</translation> + </message> + <message> + <source>Show overwrite confirmation</source> + <translation>Ãberschreiben Warnung anzeigen</translation> + </message> + <message> + <source>Select to show an overwrite confirmation dialog</source> + <translation>AuswÃ€hlen, um eine Ãberschreiben Warnung anzuzeigen</translation> + </message> + <message> + <source>Alt+T</source> + <translation>Alt+T</translation> + </message> </context> <context> <name>FiletypeAssociationDialog</name> @@ -9415,6 +9539,26 @@ <source>&Test</source> <translation>&Test</translation> </message> + <message> + <source>Qt Version</source> + <translation>Qt Version</translation> + </message> + <message> + <source>Qt 3</source> + <translation>Qt 3</translation> + </message> + <message> + <source>Select to generate code for Qt 3</source> + <translation>AuswÃ€hlen, um Quelltext fÃŒr Qt 3 zu erzeugen</translation> + </message> + <message> + <source>Qt 4</source> + <translation>Qt 4</translation> + </message> + <message> + <source>Select to generate code for Qt 4</source> + <translation>AuswÃ€hlen, um Quelltext fÃŒr Qt 4 zu erzeugen</translation> + </message> </context> <context> <name>KFileDialog</name> @@ -10061,6 +10205,38 @@ <source>Generate a Critical QMessageBox</source> <translation>Erzeuge eine QMessageBox vom Typ Kritischer Fehler</translation> </message> + <message> + <source>Qt Version</source> + <translation>Qt Version</translation> + </message> + <message> + <source>Qt 3</source> + <translation>Qt 3</translation> + </message> + <message> + <source>Select to generate code for Qt 3</source> + <translation>AuswÃ€hlen, um Quelltext fÃŒr Qt 3 zu erzeugen</translation> + </message> + <message> + <source>Qt 4</source> + <translation>Qt 4</translation> + </message> + <message> + <source>Select to generate code for Qt 4</source> + <translation>AuswÃ€hlen, um Quelltext fÃŒr Qt 4 zu erzeugen</translation> + </message> + <message> + <source>Alt+O</source> + <translation>Alt+O</translation> + </message> + <message> + <source>Alt+C</source> + <translation>Alt+A</translation> + </message> + <message> + <source>Alt+T</source> + <translation>Alt+T</translation> + </message> </context> <context> <name>PBrowser</name> @@ -11069,10 +11245,6 @@ <translation>Sicherheitsproblem</translation> </message> <message> - <source>The %1 entry of the project file contains a security problem. Resetting it.</source> - <translation>Der Eintrag %1 der Projektdatei beinhaltet ein Sicherheitsproblem. Setze ihn zurÃŒck.</translation> - </message> - <message> <source>Add files to project</source> <translation>Dateien zum Projekt hinzufÃŒgen</translation> </message> @@ -11088,6 +11260,14 @@ <source>Add files...This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</source> <translation>Dateien hinzufÃŒgen...Dies Ã¶ffnet einen Dialog, mit dem Dateien zum aktuellen Projekt hinzugefÃŒgt werden kann. Der Ort, an dem sie eingefÃŒgt werden, wird durch die Dateinamenerweiterung bestimmt.</translation> </message> + <message> + <source>The %1 entry of the project file contains a security problem.</source> + <translation>Der Eintrag %1 der Projektdatei beinhaltet ein Sicherheitsproblem.</translation> + </message> + <message> + <source>Qt4</source> + <translation>Qt 4</translation> + </message> </context> <context> <name>ProjectBrowserDirectory</name> @@ -11302,6 +11482,18 @@ <source>Add forms...</source> <translation>Formulare hinzufÃŒgen...</translation> </message> + <message> + <source>Main Window</source> + <translation>Hauptfenster</translation> + </message> + <message> + <source>Dialog with Buttons (Bottom-Center)</source> + <translation>Dialog mit KnÃ¶pfen (unten Mitte)</translation> + </message> + <message> + <source>Subclass generation is not supported for Qt4.</source> + <translation>Erzeugen einer abgeleiteten Klasse wird fÃŒr Qt4 nicht unterstÃŒtzt.</translation> + </message> </context> <context> <name>ProjectInterfacesBrowser</name> @@ -12517,7 +12709,7 @@ </message> <message> <source>Warning</source> - <translation>WarnungWarnung</translation> + <translation>Warnung</translation> </message> <message> <source>Error</source> @@ -13554,6 +13746,26 @@ <source>Group</source> <translation>Gruppierung</translation> </message> + <message> + <source>Qt Version</source> + <translation>Qt Version</translation> + </message> + <message> + <source>Qt 3</source> + <translation>Qt 3</translation> + </message> + <message> + <source>Select to generate code for Qt 3</source> + <translation>AuswÃ€hlen, um Quelltext fÃŒr Qt 3 zu erzeugen</translation> + </message> + <message> + <source>Qt 4</source> + <translation>Qt 4</translation> + </message> + <message> + <source>Select to generate code for Qt 4</source> + <translation>AuswÃ€hlen, um Quelltext fÃŒr Qt 4 zu erzeugen</translation> + </message> </context> <context> <name>QRegExpWizardRepeatDialog</name> @@ -14248,22 +14460,10 @@ <translation>Nr.</translation> </message> <message> - <source>Shell Error</source> - <translation>Fehler in Shell</translation> - </message> - <message> - <source>Only single lines may be pasted into the shell.</source> - <translation>Nur Einzelzeilen kÃ¶nnen in die Shell eingefÃŒgt werden.</translation> - </message> - <message> <source>%1 is not a file.</source> <translation>%1 ist keine Datei.</translation> </message> <message> - <source>The Shell WindowThis is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys.The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by either 'Python' or 'Ruby'. These commands are available through the context menu as well.Pressing the Tab key after some text has been entered will show a list of possible commandline completions. The relevant entry may be selected from this list. If only one entr y is available, this will inserted automatically.In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</source> - <translation>Das Shell-FensterDies ist ein Interpreter ihres Systems. Es ist derjenige der benutzt wird, um das zu untersuchende Programm auszufÃŒhren. Dies bedeutet, dass sie jedes Python Kommando ausfÃŒhrend kÃ¶nnen, auch wÃ€hrend ihr Programm lÃ€uft.Benutzen sie die Cursortasten wÃ€hrend der Eingabe von Befehlen. Es existiert auch eine History-Funktion, die mit der Cursortasten hoch und runter bedient wird.Die Shell hat einige spezielle Kommandos. 'reset' beendet den Interpreter und startet einen neuen. 'clear' lÃ¶scht die Anzeige des Shell Fensters. 'start' wird benutzt, um die Sprache der Shell umzuschalten, und muÃ von 'Python' oder 'Ruby' gefolgt werden. Diese Befehle sind auch ÃŒber das Kontextmenu verfÃŒgbar.Nachdem Text eingegeben wurde, kann durch DrÃŒcken der Tab-Taste eine Liste mÃ¶glicher KommandozeilenvervollstÃ€ndigun gen angezeigt werden. Der gewÃŒnschte Eintrag kann aus dieser Liste ausgewÃ€hlt werden. Ist nur ein Eintrag vorhanden, so wird dieser automatisch eingefÃŒgt.Im passiven Debugmodus ist die Shell nur dann verfÃŒgbar, wenn das zu debuggende Skript mit der IDE verbunden ist. Dies wird durch einen anderen Prompt und eine Anzeige im Fensterkopf dargestellt.</translation> - </message> - <message> <source>Python</source> <translation>Python</translation> </message> @@ -14279,6 +14479,10 @@ <source>%1 on %2, %3</source> <translation>%1 auf %2, %3</translation> </message> + <message> + <source>The Shell WindowThis is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys. Pressing the up or down key after some text has been entered will start an incremental search.The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by either 'Python' or 'Ruby'. These commands are available through the context menu as well.Pressing the Tab key after some text has been entered will show a list of possib le commandline completions. The relevant entry may be selected from this list. If only one entry is available, this will inserted automatically.In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</source> + <translation>Das Shell-FensterDies ist ein Interpreter ihres Systems. Es ist derjenige der benutzt wird, um das zu untersuchende Programm auszufÃŒhren. Dies bedeutet, dass sie jedes Python Kommando ausfÃŒhrend kÃ¶nnen, auch wÃ€hrend ihr Programm lÃ€uft.Benutzen sie die Cursortasten wÃ€hrend der Eingabe von Befehlen. Es existiert auch eine History-Funktion, die mit der Cursortasten hoch und runter bedient wird. Eine inkrementelle Suche wird gestartet, indem die Cursortasten hoch und runter nach Eingabe von Text gedrÃŒckt werden.Die Shell hat einige spezielle Kommandos. 'reset' beendet den Interpreter und startet einen neuen. 'clear' lÃ¶scht die Anzeige des Shell Fensters. 'start' wird benutzt, um die Sprache der Shell umzuschalten, und muÃ von 'Python' oder 'Ruby' gefolgt werden. Diese Befehle sind auch ÃŒber das Kontextmenu verfÃŒgbar.<p&g t;Nachdem Text eingegeben wurde, kann durch DrÃŒcken der Tab-Taste eine Liste mÃ¶glicher KommandozeilenvervollstÃ€ndigungen angezeigt werden. Der gewÃŒnschte Eintrag kann aus dieser Liste ausgewÃ€hlt werden. Ist nur ein Eintrag vorhanden, so wird dieser automatisch eingefÃŒgt.Im passiven Debugmodus ist die Shell nur dann verfÃŒgbar, wenn das zu debuggende Skript mit der IDE verbunden ist. Dies wird durch einen anderen Prompt und eine Anzeige im Fensterkopf dargestellt.</translation> + </message> </context> <context> <name>ShortcutForm</name> @@ -14436,12 +14640,6 @@ <translation>Diese Liste zeigt alle Tastaturkurzbefehle.</translation> </message> <message> - <source>Keyboard Shortcuts List -This list shows all keyboard shortcuts defined in the application. Double click an entry in order to change the respective shortcut.</source> - <translation>Tastaturkurzbefehl -Diese Liste zeigt alle in der Applikation festgelegten Tastaturkurzbefehle. Doppelklicke einen Eintrag, um ihn zu bearbeiten.</translation> - </message> - <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -14469,6 +14667,12 @@ <source>name</source> <translation>Name</translation> </message> + <message> + <source>Keyboard Shortcuts List +This list shows all keyboard shortcuts defined in the application. Double click an entry in order to change the respective shortcut. Alternatively, the shortcut might be changed by editing the key sequence in the respective column.</source> + <translation>Tastaturkurzbefehl +Diese Liste zeigt alle in der Applikation festgelegten Tastaturkurzbefehle. Doppelklicke einen Eintrag, um ihn zu bearbeiten. Alternativ kann ein Tastaturkurzbefehl durch Eingabe der Tastenfolge in der entsprechenden Spalte geÃ€ndert werden.</translation> + </message> </context> <context> <name>StartDialog</name> @@ -14694,7 +14898,7 @@ </message> <message> <source>Locked</source> - <translation>Verriegelt</translation> + <translation>Gesperrt</translation> </message> <message> <source>History</source> @@ -14820,6 +15024,10 @@ <source>Alt+O</source> <translation>Alt+O</translation> </message> + <message> + <source>Lock Info</source> + <translation>Sperreninfo</translation> + </message> </context> <context> <name>Subversion</name> @@ -14963,6 +15171,22 @@ <source>The project could not be checked out of the repository. Restoring the original contents.</source> <translation>Das Projekt konnte nicht aus dem Repository geladen werden. Stelle das Original wieder her.</translation> </message> + <message> + <source>Subversion Log</source> + <translation>Subversion Log</translation> + </message> + <message> + <source>Select number of entries to show.</source> + <translation>WÃ€hle Anzahl der anzuzeigenden EintrÃ€ge.</translation> + </message> + <message> + <source>Locking in the Subversion repository</source> + <translation>Sperren im Subversion Repository</translation> + </message> + <message> + <source>Unlocking in the Subversion repository</source> + <translation>Entsperren im Subversion Repository</translation> + </message> </context> <context> <name>SvnCommandDialog</name> @@ -15462,6 +15686,26 @@ <source>Select all versioned directory entries</source> <translation>Alle versionierten VerzeichniseintrÃ€ge auswÃ€hlen</translation> </message> + <message> + <source>Show limited log</source> + <translation>Beschreibungen limitiert anzeigen</translation> + </message> + <message> + <source>Lock</source> + <translation>Sperren</translation> + </message> + <message> + <source>Unlock</source> + <translation>Entsperren</translation> + </message> + <message> + <source>Break Lock</source> + <translation>Sperre brechen</translation> + </message> + <message> + <source>Steal Lock</source> + <translation>Sperre stehlen</translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -15845,6 +16089,18 @@ <source>Delete PropertyThis deletes a property for the project files.</source> <translation>Eigenschaft lÃ¶schenDies lÃ¶scht eine Eigenschaft fÃŒr alle Projektdateien.</translation> </message> + <message> + <source>Show limited log</source> + <translation>Beschreibungen limitiert anzeigen</translation> + </message> + <message> + <source>Show a limited log of the local project</source> + <translation>Zeigt eine begrenzte Anzahl an Beschreibungen fÃŒr das aktuelle Projekt</translation> + </message> + <message> + <source>Show limited logThis shows the log of the local project limited to a selectable number of entries.</source> + <translation>Beschreibungen limitiert anzeigenDies zeigt die Beschreibungen des lokalen Projektes limitiert auf eine auswÃ€hlbare Anzahl von EintrÃ€gen.</translation> + </message> </context> <context> <name>SvnPropListDialog</name> @@ -15941,6 +16197,62 @@ <source>There are no uncommitted changes available/selected.</source> <translation>Es sind keine nicht eingepflegten Ãnderungen vorhanden/ausgewÃ€hlt.</translation> </message> + <message> + <source>Lock</source> + <translation>Sperren</translation> + </message> + <message> + <source>Unlock</source> + <translation>Entsperren</translation> + </message> + <message> + <source>Break lock</source> + <translation>Sperre brechen</translation> + </message> + <message> + <source>Steal lock</source> + <translation>Sperre stehlen</translation> + </message> + <message> + <source>locked</source> + <translation>gesperrt</translation> + </message> + <message> + <source>other lock</source> + <translation>fremdgesperrt</translation> + </message> + <message> + <source>stolen lock</source> + <translation>Sperre gestohlen</translation> + </message> + <message> + <source>broken lock</source> + <translation>Sperre gebrochen</translation> + </message> + <message> + <source>not locked</source> + <translation>nicht gesperrt</translation> + </message> + <message> + <source>replaced</source> + <translation>ersetzt</translation> + </message> + <message> + <source>There are no unlocked files available/selected.</source> + <translation>Es sind keine ungesperrten Dateien vorhanden/ausgewÃ€hlt.</translation> + </message> + <message> + <source>There are no locked files available/selected.</source> + <translation>Es sind keine gesperrten Dateien vorhanden/ausgewÃ€hlt.</translation> + </message> + <message> + <source>Break Lock</source> + <translation>Sperre brechen</translation> + </message> + <message> + <source>Steal Lock</source> + <translation>Sperre stehlen</translation> + </message> </context> <context> <name>SvnSwitchDialog</name> @@ -16494,22 +16806,6 @@ <source>Untitled %1</source> <translation>Unbenannt %1</translation> </message> - <message> - <source>Show next tab</source> - <translation>Zeige nÃ€chsten Editor</translation> - </message> - <message> - <source>Ctrl+Alt+Tab</source> - <translation>Ctrl+Alt+Tab</translation> - </message> - <message> - <source>Show previous tab</source> - <translation>Zeige vorherigen Editor</translation> - </message> - <message> - <source>Shift+Ctrl+Alt+Tab</source> - <translation>Shift+Ctrl+Alt+Tab</translation> - </message> </context> <context> <name>TagBranchListForm</name> @@ -17014,6 +17310,26 @@ <source>To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.Example template: This is a $VAR$When you use this template you will be prompted for a value for the variable $VAR$. Any occurences of $VAR$ will then be replaced with whatever you've entered.If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.If you want a variables contents to be treated specially, the variablename must be followed by a ':' and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:<table><tr><td>ml</td><td>Specifies a multiline formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.</td></tr></table>If you want to change the default delimiter to anything different, please use the configuration dialog to do so.</source> <translation>Um Variablen in einer Vorlage zu verwenden, muÃ der Variablenname mit einem $-Zeichen umschlossen werden. Wenn die Vorlage angewandt wird, wird nach einem Wert fÃŒr diese Variable gefragt.Beispiel: Dies ist eine $Variable$Wenn diese Vorlage angewandt wird, wird nach einem Wert fÃŒr die Variable $Variable$ gefragt. Jedes Vorkommen von $Variable$ wird dann durch den eingegebenen Text ersetzt.Wird in der Vorlage ein einzelnes $-Zeichen, das keine Variable umschlieÃt, benÃ¶tigt, so muÃ dies als $$ (zwei Dollar Zeichen) geschrieben werden. Bei der Anwendung der Vorlage wird dies automatisch zu einem $-Zeichen.Soll der Wert einer Variablen speziell behandelt werden, so muÃ dem Variablennamen ein ':' und eine Formatangabe folgen (z.B. $Variable:ml$). Die unterstÃŒtzten Formatangaben sind:<table><tr><td>ml</td><td>Gibt ein mehrzeiliges Format an. Jeder Zeile des Variablenwertes wird die Zeichenkette vor der Variablen der gleichen Zeile in der Vorlage vorangestellt.</td></tr></table>Soll das einen Variablennamen umschlieÃende Zeichen geÃ€ndert werden, so kann dies im Konfigurationsdialog geschehen.</translation> </message> + <message> + <source>Bash</source> + <translation>Bash</translation> + </message> + <message> + <source>Batch</source> + <translation>Batch</translation> + </message> + <message> + <source>Makefile</source> + <translation>Makefile</translation> + </message> + <message> + <source>Properties</source> + <translation>Einstellungen</translation> + </message> + <message> + <source>TeX</source> + <translation>TeX</translation> + </message> </context> <context> <name>TemplatePropertiesForm</name> @@ -19153,6 +19469,134 @@ <source>The templates file %1 has an unsupported format.</source> <translation>Die Vorlagendatei %1 hat ein nicht unterstÃŒtztes Format.</translation> </message> + <message> + <source>Activate Project-Browser</source> + <translation>Aktiviere Projekt-Browser</translation> + </message> + <message> + <source>Alt+Shift+P</source> + <translation>Alt+Shift+P</translation> + </message> + <message> + <source>Activate Debug-Browser</source> + <translation>Aktiviere Debug-Browser</translation> + </message> + <message> + <source>Alt+Shift+D</source> + <translation>Alt+Shift+D</translation> + </message> + <message> + <source>Activate Shell</source> + <translation>Aktiviere Shell</translation> + </message> + <message> + <source>Alt+Shift+S</source> + <translation>Alt+Shift+S</translation> + </message> + <message> + <source>Activate File-Browser</source> + <translation>Aktiviere Datei-Browser</translation> + </message> + <message> + <source>Alt+Shift+F</source> + <translation>Alt+Shift+F</translation> + </message> + <message> + <source>Activate Log-Viewer</source> + <translation>Aktiviere Ausgabefenster</translation> + </message> + <message> + <source>Activate Task-Viewer</source> + <translation>Aktiviere Aufgabenanzeige</translation> + </message> + <message> + <source>Alt+Shift+T</source> + <translation>Alt+Shift+T</translation> + </message> + <message> + <source>Activate Template-Viewer</source> + <translation>Aktiviere Vorlagen</translation> + </message> + <message> + <source>Alt+Shift+M</source> + <translation>Alt+Shift+M</translation> + </message> + <message> + <source>Activate current editor</source> + <translation>Aktiviere aktuellen Editor</translation> + </message> + <message> + <source>Alt+Shift+E</source> + <translation>Alt+Shift+E</translation> + </message> + <message> + <source>Show next tab</source> + <translation>Zeige nÃ€chste Seite</translation> + </message> + <message> + <source>Ctrl+Alt+Tab</source> + <translation>Ctrl+Alt+Tab</translation> + </message> + <message> + <source>Show previous tab</source> + <translation>Zeige vorherige Seite</translation> + </message> + <message> + <source>Shift+Ctrl+Alt+Tab</source> + <translation>Shift+Ctrl+Alt+Tab</translation> + </message> + <message> + <source>Alt+Shift+G</source> + <translation>Alt+Shift+G</translation> + </message> + <message> + <source>Qt-Designer 4</source> + <translation>Qt-Designer 4</translation> + </message> + <message> + <source>Designer 4...</source> + <translation>Designer 4...</translation> + </message> + <message> + <source>Start Qt-Designer 4</source> + <translation>Starte Qt-Designer 4</translation> + </message> + <message> + <source>Qt-Designer 4Start Qt-Designer 4.</source> + <translation>Qt-Designer 4Starte Qt-Designer 4.</translation> + </message> + <message> + <source>Qt-Linguist 4</source> + <translation>Qt-Linguist 4</translation> + </message> + <message> + <source>Linguist 4...</source> + <translation>Linguist 4...</translation> + </message> + <message> + <source>Start Qt-Linguist 4</source> + <translation>Starte Qt-Linguist 4</translation> + </message> + <message> + <source>Qt-Linguist 4Start Qt-Linguist 4.</source> + <translation>Qt-Linguist 4Starte Qt-Linguist 4 (Ãbersetzungsprogramm).</translation> + </message> + <message> + <source>Qt4 Documentation</source> + <translation>Qt4 Dokumentation</translation> + </message> + <message> + <source>Qt&4 Documentation</source> + <translation>Qt&4 Dokumentation</translation> + </message> + <message> + <source>Open Qt4 Documentation</source> + <translation>Ãffne die Qt4 Dokumentation</translation> + </message> + <message> + <source>Qt4 DocumentationDisplay the Qt4 Documentation with Qt Assistant. </source> + <translation>Qt4 DokumentationZeige die Qt4 Dokumentation Qt Assistant an.</translation> + </message> </context> <context> <name>Utilities</name> @@ -19342,13 +19786,6 @@ </message> </context> <context> - <name>VariablesFilterDialog</name> - <message> - <source>%1 - Variables Filter</source> - <translation>%1 - Variablenfilter</translation> - </message> -</context> -<context> <name>VariablesFilterForm</name> <message> <source><h2>Filter Dialog</h2> @@ -21256,10 +21693,6 @@ <translation>Shift+Backspace</translation> </message> <message> - <source>Shift+Return</source> - <translation>Shift+Return</translation> - </message> - <message> <source>CTRL+SHIFT+Z</source> <comment>Edit|Redo</comment> <translation>Ctrl+Shift+Z</translation> @@ -21357,6 +21790,88 @@ <source>Python Files (*.py);;Pyrex Files (*.pyx);;Quixote Template Files (*.ptl);;Ruby Files (*.rb);;IDL Files (*.idl);;C Files (*.h *.c);;C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc);;C# Files (*.cs);;HTML Files (*.html *.htm *.asp *.shtml);;CSS Files (*.css);;PHP Files (*.php *.php3 *.php4 *.php5 *.phtml);;XML Files (*.xml *.xsl *.xslt *.dtd);;Java Files (*.java);;JavaScript Files (*.js);;SQL Files (*.sql);;Docbook Files (*.docbook);;Perl Files (*.pl *.pm *.ph);;Lua Files (*.lua);;Tex Files (*.tex *.sty *.aux *.toc *.idx);;Shell Files (*.sh);;Batch Files (*.bat *.cmd);;Diff Files (*.diff *.patch);;Makefiles (*.mak);;Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc);;All Files (*)</source> <translation>Python Dateien (*.py);;Pyrex Dateien (*.pyx);;Quixote Schablonen (*.ptl);;Ruby Dateien (*.rb);;IDL Dateien (*.idl);;C Dateien (*.h *.c);;C++ Dateien (*.h *.hpp *.hh *.cxx *.cpp *.cc);;C# Dateien (*.cs);;HTML Dateien (*.html *.htm *.asp *.shtml);;CSS Dateien (*.css);;PHP Dateien (*.php *.php3 *.php4 *.php5 *.phtml);;XML Dateien (*.xml *.xsl *.xslt *.dtd);;Java Dateien (*.java);;JavaScript Dateien (*.js);;SQL Dateien (*.sql);;Docbook Dateien (*.docbook);;Perl Dateien (*.pl *.pm *.ph);;Lua Dateien (*.lua);;TeX Dateien (*.tex *.sty *.aux *.toc *.idx);;Shell Dateien (*.sh);;Batch Dateien (*.bat *.cmd);;Diff Dateien (*.diff *.patch);;Make Dateien (*.mak);;Einstellungen Dateien (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc);;Alle Dateien (*)</translation> </message> + <message> + <source>Smart indent</source> + <translation>Ãberwachte EinrÃŒckung</translation> + </message> + <message> + <source>CTRL+ALT+I</source> + <comment>Edit|Smart indent</comment> + <translation>CTRL+ALT+I</translation> + </message> + <message> + <source>Smart indent Line or Selection</source> + <translation>RÃŒckt eine Zeile oder Auswahl mit Ãberwachung ein</translation> + </message> + <message> + <source>Smart indentIndents the current line or the lines of the current selection smartly.</source> + <translation>Ãberwachte EinrÃŒckungDies rÃŒckt die aktuelle Zeile oder die Zeilen der aktuellen Auswahl ein, wobei nur sinnvolle EinrÃŒckungstiefen erlaubt sind.</translation> + </message> + <message> + <source>CTRL++</source> + <comment>View|Zoom in</comment> + <translation>CTRL++</translation> + </message> + <message> + <source>CTRL+-</source> + <comment>View|Zoom out</comment> + <translation>CTRL+-</translation> + </message> + <message> + <source>Next split</source> + <translation>NÃ€chste Ansichte</translation> + </message> + <message> + <source>&Next split</source> + <translation>&NÃ€chste Ansicht</translation> + </message> + <message> + <source>CTRL+Alt+N</source> + <comment>View|Next split</comment> + <translation>CTRL+Alt+N</translation> + </message> + <message> + <source>Move to the next split</source> + <translation>Gehe zur nÃ€chsten Ansicht</translation> + </message> + <message> + <source>Next splitMove to the next split.</source> + <translation>NÃ€chste AnsichtGehe zur nÃ€chsten Ansicht.</translation> + </message> + <message> + <source>Previous split</source> + <translation>Vorherige Ansicht</translation> + </message> + <message> + <source>&Previous split</source> + <translation>&Vorherige Ansicht</translation> + </message> + <message> + <source>CTRL+Alt+P</source> + <comment>View|Previous split</comment> + <translation>Ctrl+Alt+V</translation> + </message> + <message> + <source>Move to the previous split</source> + <translation>Gehe zur vorherigen Ansicht</translation> + </message> + <message> + <source>Previous splitMove to the previous split.</source> + <translation>Vorherige AnsichtGehe zur vorherigen Ansicht.</translation> + </message> + <message> + <source>Ctrl+U</source> + <translation>Ctrl+U</translation> + </message> + <message> + <source>F3</source> + <comment>Search|Search</comment> + <translation>F3</translation> + </message> + <message> + <source>Enter</source> + <translation>Eingabe</translation> + </message> </context> <context> <name>ViewProfileDialog</name> @@ -21547,6 +22062,14 @@ <source>A watchpoint with the condition '%1' for the variable %2 already exists.</source> <translation>Ein Beobachtungspunkt mit der Bedingung '%1' fÃŒr die Variable %2 existiert bereits.</translation> </message> + <message> + <source>Watchpoint Condition Error</source> + <translation>Fehler in Beobachtungspunkt Bedingung</translation> + </message> + <message> + <source>The watchpoint condition %1 contains a syntax error.</source> + <translation>Die Bedingung des Beobachtungspunktes %1 enthÃ€lt einen Syntaxfehler.</translation> + </message> </context> <context> <name>WidgetView</name> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric-3.8.1/install-i18n.py new/eric-3.9.0/install-i18n.py --- old/eric-3.8.1/install-i18n.py 2005-12-18 15:26:25.000000000 +0100 +++ new/eric-3.9.0/install-i18n.py 2006-04-30 12:52:44.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2005 Detlev Offenbach <detlev(a)die-offenbachs.de> +# Copyright (c) 2004 - 2006 Detlev Offenbach <detlev(a)die-offenbachs.de> # # This is the install script for eric3's translation files. ++++++ eric-i18n-fr-3.8.1.tar.gz -> eric-i18n-fr-3.9.0.tar.gz ++++++ Binary files old/eric-3.8.1/eric/i18n/eric3_fr.qm and new/eric-3.9.0/eric/i18n/eric3_fr.qm differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric-3.8.1/eric/i18n/eric3_fr.ts new/eric-3.9.0/eric/i18n/eric3_fr.ts --- old/eric-3.8.1/eric/i18n/eric3_fr.ts 2005-11-07 12:29:16.000000000 +0100 +++ new/eric-3.9.0/eric/i18n/eric3_fr.ts 2006-04-02 19:07:54.000000000 +0200 @@ -1903,6 +1903,30 @@ <source>Templates</source> <translation>Gabarits</translation> </message> + <message> + <source>Programs</source> + <translation>Programmes</translation> + </message> + <message> + <source>Python Module</source> + <translation>Module Python</translation> + </message> + <message> + <source>(not configured)</source> + <translation>(non configurÃ©)</translation> + </message> + <message> + <source>(not found)</source> + <translation>(non trouvÃ©)</translation> + </message> + <message> + <source>Select Qt4 Directory</source> + <translation>Selection du rrÃ©pertoire Qt4</translation> + </message> + <message> + <source>Select Qt4 documentation directory</source> + <translation>SÃ©lection du rÃ©pertoire de documentation Qt4</translation> + </message> </context> <context> <name>ConfigurationForm</name> @@ -3151,14 +3175,6 @@ <translation>Cocher si les les navigateurs doivent d'abord lister les rÃ©pertoires</translation> </message> <message> - <source>Remote Autocompletion Enabled</source> - <translation>AutocomplÃ©tion Ã distance activÃ©e</translation> - </message> - <message> - <source>Select this to enable remote autocompletion</source> - <translation>Cocher pour activer l'autocomplÃ©tion Ã distance</translation> - </message> - <message> <source>Word Wrap Enabled</source> <translation>Retour Ã la ligne automatique</translation> </message> @@ -3782,6 +3798,74 @@ <source>Filename Pattern:</source> <translation>Type de fichier :</translation> </message> + <message> + <source>Path</source> + <translation>Chemin</translation> + </message> + <message> + <source>Version</source> + <translation>Version</translation> + </message> + <message> + <source>Show Programs</source> + <translation>Afficher les programmes</translation> + </message> + <message> + <source>Search</source> + <translation>Rechercher</translation> + </message> + <message> + <source>Press to search for programs</source> + <translation>Cliquer pour chercher des programmes</translation> + </message> + <message> + <source>Enter the number of history entries allowed</source> + <translation>Entrer le nombre d'entrÃ©es maximum pour l'historique</translation> + </message> + <message> + <source>max. History Entries:</source> + <translation>Max. Historique:</translation> + </message> + <message> + <source>Qt4 Documentation</source> + <translation>Documentation Qt4</translation> + </message> + <message> + <source>Enter the Qt4 documentation directory</source> + <translation>Entrer le rÃ©pertoire de documentation Qt4</translation> + </message> + <message> + <source>Press to select the Qt4 documentation directory via a dialog</source> + <translation>Cliquer pour sÃ©lectionner le rÃ©pertoire de documentation Qt4</translation> + </message> + <message> + <source>Note: Leave empty to use the QT4DOCDIR environment variable, if set.</source> + <translation>Note: Laisser vide pour utiliser la variable d'environnement QT4DOCDIR, si elle existe.</translation> + </message> + <message> + <source>Qt4 Directory</source> + <translation>RÃ©pertoire Qt4</translation> + </message> + <message> + <source>Enter the path of the Qt4 directory.</source> + <translation>Entrer le chemin du rÃ©pertoire Qt4.</translation> + </message> + <message> + <source>Press to select the Qt4 directory via a directory selection dialog</source> + <translation>Cliquer pour choisir manuellement le rÃ©pertoire Qt4</translation> + </message> + <message> + <source>Export Qt4 Directory entered above</source> + <translation>Exporter le rÃ©pertoire Qt4 indiquÃ© ci-dessous</translation> + </message> + <message> + <source>Select, whether the Qt4 Directory entered should be exported to the environment</source> + <translation>Selectionner si rÃ©pertoire Qt4 saisi doit Ãªtre exportÃ© de l'environnement</translation> + </message> + <message> + <source>Note: Leave this entry empty to use the QT4DIR environment variable.</source> + <translation>Note: Laisser ce champ vide pour utiliser la variable d'environnement QT4DIR.</translation> + </message> </context> <context> <name>CopyForm</name> @@ -5515,6 +5599,14 @@ <source>The program has terminated with an exit status of %1.</source> <translation>Le programme s'est terminÃ© avec le code de sortie %1.</translation> </message> + <message> + <source>Breakpoint Condition Error</source> + <translation>Erreur de condition pour le point d'arrÃªt</translation> + </message> + <message> + <source>The condition of the breakpoint %1, %2 contains a syntax error.</source> + <translation>Erreur de syntaxe dans la condition du point d'arrÃªt %1 :%2.</translation> + </message> </context> <context> <name>DebuggerPropertiesDialog</name> @@ -7248,6 +7340,38 @@ <source>&Test</source> <translation>&Test</translation> </message> + <message> + <source>Qt Version</source> + <translation>Version Qt</translation> + </message> + <message> + <source>Qt 3</source> + <translation>Qt 3</translation> + </message> + <message> + <source>Select to generate code for Qt 3</source> + <translation>SÃ©lectionner pour gÃ©nÃ©rer du code pour Qt3</translation> + </message> + <message> + <source>Qt 4</source> + <translation>Qt 4</translation> + </message> + <message> + <source>Select to generate code for Qt 4</source> + <translation>SÃ©lectionner pour gÃ©nÃ©rer du code pour Qt4</translation> + </message> + <message> + <source>Show overwrite confirmation</source> + <translation>Afficher une confirmation pour l'Ã©crasement</translation> + </message> + <message> + <source>Select to show an overwrite confirmation dialog</source> + <translation>Cocher pour que la confirmation d'Ã©crasement de fichier soit effectuÃ©e</translation> + </message> + <message> + <source>Alt+T</source> + <translation>Alt+T</translation> + </message> </context> <context> <name>FiletypeAssociationDialog</name> @@ -7470,7 +7594,7 @@ </message> <message> <source>&Both</source> - <translation>DÃ©but et Fin</translation> + <translation>les &deux</translation> </message> <message> <source>Alt+B</source> @@ -9422,6 +9546,26 @@ <source>&Test</source> <translation>&Test</translation> </message> + <message> + <source>Qt Version</source> + <translation>Version Qt</translation> + </message> + <message> + <source>Qt 3</source> + <translation>Qt 3</translation> + </message> + <message> + <source>Select to generate code for Qt 3</source> + <translation>SÃ©lectionner pour gÃ©nÃ©rer du code pour Qt3</translation> + </message> + <message> + <source>Qt 4</source> + <translation>Qt 4</translation> + </message> + <message> + <source>Select to generate code for Qt 4</source> + <translation>SÃ©lectionner pour gÃ©nÃ©rer du code pour Qt4</translation> + </message> </context> <context> <name>KFileDialog</name> @@ -10066,6 +10210,38 @@ <source>&Test</source> <translation>&Test</translation> </message> + <message> + <source>Qt Version</source> + <translation>Version Qt</translation> + </message> + <message> + <source>Qt 3</source> + <translation>Qt 3</translation> + </message> + <message> + <source>Select to generate code for Qt 3</source> + <translation>SÃ©lectionner pour gÃ©nÃ©rer du code pour Qt3</translation> + </message> + <message> + <source>Qt 4</source> + <translation>Qt 4</translation> + </message> + <message> + <source>Select to generate code for Qt 4</source> + <translation>SÃ©lectionner pour gÃ©nÃ©rer du code pour Qt4</translation> + </message> + <message> + <source>Alt+O</source> + <translation>Alt+O</translation> + </message> + <message> + <source>Alt+C</source> + <translation>Alt+A</translation> + </message> + <message> + <source>Alt+T</source> + <translation>Alt+T</translation> + </message> </context> <context> <name>PBrowser</name> @@ -11074,10 +11250,6 @@ <translation>ProblÃšme de sÃ©curitÃ©</translation> </message> <message> - <source>The %1 entry of the project file contains a security problem. Resetting it.</source> - <translation>L'entrÃ©e %1 du fichier projet contient un problÃšme de sÃ©curitÃ©. RÃ©initialisation de l'entrÃ©e.</translation> - </message> - <message> <source>Add files to project</source> <translation>Ajouter des fichiers au projet</translation> </message> @@ -11093,6 +11265,14 @@ <source>Add files...This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</source> <translation>Ajouter des fichiers...Ouvre une boite de dialogue pour ajouter des fichiers au projet courant. La position pour l'insertion est dÃ©terminÃ©e par l'extension du fichier.</translation> </message> + <message> + <source>The %1 entry of the project file contains a security problem.</source> + <translation>L'entrÃ©e %1 du fichier projet contient un problÃšme de sÃ©curitÃ©.</translation> + </message> + <message> + <source>Qt4</source> + <translation>Qt4</translation> + </message> </context> <context> <name>ProjectBrowserDirectory</name> @@ -11307,6 +11487,18 @@ <source>Add forms...</source> <translation>Ajouter des feuilles...</translation> </message> + <message> + <source>Main Window</source> + <translation>FenÃªtre principale</translation> + </message> + <message> + <source>Dialog with Buttons (Bottom-Center)</source> + <translation>Boite de dialogue avec boutons (Bas-Centre)</translation> + </message> + <message> + <source>Subclass generation is not supported for Qt4.</source> + <translation>La gÃ©nÃ©ration de sous-classes n'est pas supportÃ©e par Qt4.</translation> + </message> </context> <context> <name>ProjectInterfacesBrowser</name> @@ -13560,6 +13752,26 @@ <source>Copy the regular expression to the clipboard</source> <translation>Copie l'expression rÃ©guliÃšre dans le presse-papier</translation> </message> + <message> + <source>Qt Version</source> + <translation>Version Qt</translation> + </message> + <message> + <source>Qt 3</source> + <translation>Qt 3</translation> + </message> + <message> + <source>Select to generate code for Qt 3</source> + <translation>SÃ©lectionner pour gÃ©nÃ©rer du code pour Qt3</translation> + </message> + <message> + <source>Qt 4</source> + <translation>Qt 4</translation> + </message> + <message> + <source>Select to generate code for Qt 4</source> + <translation>SÃ©lectionner pour gÃ©nÃ©rer du code pour Qt4</translation> + </message> </context> <context> <name>QRegExpWizardRepeatDialog</name> @@ -14250,22 +14462,10 @@ <translation>Non.</translation> </message> <message> - <source>Shell Error</source> - <translation>Erreur Shell</translation> - </message> - <message> - <source>Only single lines may be pasted into the shell.</source> - <translation>Une seule ligne peut etre collÃ©e Ã la fois.</translation> - </message> - <message> <source>%1 is not a file.</source> <translation>%1 n'st pas un fichier.</translation> </message> <message> - <source>The Shell WindowThis is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys.The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by either 'Python' or 'Ruby'. These commands are available through the context menu as well.Pressing the Tab key after some text has been entered will show a list of possible commandline completions. The relevant entry may be selected from this list. If only one entr y is available, this will inserted automatically.In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</source> - <translation>FenÃªtre ShellIl s'agit simplement d'un interprÃ©teur Python lancÃ© dans une fenÃªtre. L'interprÃ©teur est le mÃªme que celui utilisÃ© pour lancer un programme dÃ©boguÃ©. Cela signifie que vous pouvez executer une commande Python lorsque le programme est dÃ©boguÃ©.Vous pouvez utiliser les flÃªches haut/bas pour rappeler des commandes grÃ¢ce Ã l'historique des commandes.Le shell possÃšde deux commandes spÃ©ciales. 'reset' tue le shell Python et en dÃ©marre un nouveau. 'clear' efface juste l'affichage de la fenÃªtre shell. Ces commandes sont aussi accessibles par le menu contextuel (click droit sur la fenÃªtre).En appuyant sur 'Tab' aprÃšs un dÃ©but de commande, on affiche la liste des complÃ©tions possibles. La plus proche sera sÃ©lectionnÃ©e dans la liste, et s'il n'y a qu'une seule proposition possible, elle sera automatiquement insÃ©rÃ©e.En mode dÃ©bogage passif, le shell n'est disponible que lorsque le programme dÃ©boguÃ© rend la main Ã l'IDE. Cela est indiquÃ© par un prompt diffÃ©rent et une indication dans le titre de la fenÃªtre.</translation> - </message> - <message> <source>Python</source> <translation>Python</translation> </message> @@ -14275,12 +14475,16 @@ </message> <message> <source>Start</source> - <translation>DÃ©but</translation> + <translation>Lancer...</translation> </message> <message> <source>%1 on %2, %3</source> <translation>%1 sur %2, %3</translation> </message> + <message> + <source>The Shell WindowThis is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys. Pressing the up or down key after some text has been entered will start an incremental search.The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by either 'Python' or 'Ruby'. These commands are available through the context menu as well.Pressing the Tab key after some text has been entered will show a list of possib le commandline completions. The relevant entry may be selected from this list. If only one entry is available, this will inserted automatically.In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</source> + <translation>La fenÃªtre ShellIl s'agit simplement d'un interpreteur Python affichÃ© dans une fenÃªtre. L'interprÃ©teur affichÃ© est celui utilisÃ© pour le dÃ©bogage du programme en cours .Cela signifie qu'on peut executer n'importe quelle commande durant le dÃ©bogage, en utilisant l'environnement de dÃ©bug en cours.On peut utiliser les flÃšches pour rappeler les commandes enregistrÃ©es dans l'historique. En appuyant sur les flÃšches du haut et du bas, on peut aussi rappeler les commandes qui commencent par le dÃ©but du mot tapÃ©..Le shell possÃšde des commandes spÃ©ciales. 'RÃ©initialiser' tue le shell en cours et en redÃ©marre un nouveau. 'Effacer' efface l'affichage, et 'Lancer...' est utilisÃ© pour basculer d'un langage shell Ã l'autre ('Python' ou 'Ruby'). Ces commandes sont aussi disponibles via l e menu contextuel du shell.En appuyant sur la touche Tab aprÃšs avoir saisi du texte, on affiche la liste des complÃ©tions possibles. L'entrÃ©e voulue peut Ãªtre sÃ©lectionnÃ©e dans la liste. Si une seule entrÃ©e est disponible, elle sera sÃ©lectionnÃ©e automatiquement.En mode dÃ©bogage passif, le shell est disponible uniquement aprÃšs que le programme dÃ©boguÃ© connectÃ© Ã l'IDE a Ã©tÃ© terminÃ©. Ceci est indiquÃ© par une invite de commande diffÃ©rente et par une indication dans le titre de la fenÃªtre.</translation> + </message> </context> <context> <name>ShortcutForm</name> @@ -14438,12 +14642,6 @@ <translation>Cette liste affiche tous les raccourcis clavier.</translation> </message> <message> - <source>Keyboard Shortcuts List -This list shows all keyboard shortcuts defined in the application. Double click an entry in order to change the respective shortcut.</source> - <translation>Liste des raccourcis clavier -Cette liste affiche la liste de tous les raccourcis clavier. Double-cliquer sur une entrÃ©e pour modifier un raccourci.</translation> - </message> - <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -14471,6 +14669,12 @@ <source>name</source> <translation>nom</translation> </message> + <message> + <source>Keyboard Shortcuts List +This list shows all keyboard shortcuts defined in the application. Double click an entry in order to change the respective shortcut. Alternatively, the shortcut might be changed by editing the key sequence in the respective column.</source> + <translation>Liste des raccourcis clavier +Cette liste contient tous les raccourcis claviers dÃ©finis dans l'application. Double-cliquer sur une entrÃ©e pour modifier un raccourci. Le raccourci peut aussi Ãªtre modifiÃ© en Ã©ditant la sÃ©quence de touches dans la colonne concernÃ©e.</translation> + </message> </context> <context> <name>StartDialog</name> @@ -14824,6 +15028,10 @@ <source>Alt+O</source> <translation>Alt+O</translation> </message> + <message> + <source>Lock Info</source> + <translation>Info vÃ©rouillage</translation> + </message> </context> <context> <name>Subversion</name> @@ -14967,6 +15175,22 @@ <source>The project could not be checked out of the repository. Restoring the original contents.</source> <translation>Le projet n'a pu Ãªtre mis Ã jour Ã partir du rÃ©fÃ©rentiel. Restauration du contenu initial.</translation> </message> + <message> + <source>Subversion Log</source> + <translation>Log Subversion</translation> + </message> + <message> + <source>Select number of entries to show.</source> + <translation>SÃ©lectionner plusieurs entrÃ©es Ã afficher.</translation> + </message> + <message> + <source>Locking in the Subversion repository</source> + <translation>VÃ©rouillage dans le rÃ©fÃ©rentiel Subversion</translation> + </message> + <message> + <source>Unlocking in the Subversion repository</source> + <translation>DÃ©vÃ©rouillage dans le rÃ©fÃ©rentiel Subversion</translation> + </message> </context> <context> <name>SvnCommandDialog</name> @@ -15465,6 +15689,26 @@ <source>Select all versioned directory entries</source> <translation>SÃ©lection de tous les rÃ©pertoires ayant une version</translation> </message> + <message> + <source>Show limited log</source> + <translation>Afficher un log limitÃ©</translation> + </message> + <message> + <source>Lock</source> + <translation>VÃ©rouillage</translation> + </message> + <message> + <source>Unlock</source> + <translation>DÃ©vÃ©rouillage</translation> + </message> + <message> + <source>Break Lock</source> + <translation>Casser le vÃ©rouillage d'un autre utilisateur</translation> + </message> + <message> + <source>Steal Lock</source> + <translation>Voler le verou</translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -15848,6 +16092,18 @@ <source>Delete PropertyThis deletes a property for the project files.</source> <translation>Supprimer une propriÃ©tÃ©Supprime une propriÃ©tÃ© des fichiers projets.</translation> </message> + <message> + <source>Show limited log</source> + <translation>Afficher un log limitÃ©</translation> + </message> + <message> + <source>Show a limited log of the local project</source> + <translation>Afficher un log limitÃ© du projet local</translation> + </message> + <message> + <source>Show limited logThis shows the log of the local project limited to a selectable number of entries.</source> + <translation>Afficher un log limitÃ©Affiche le log du projet limitÃ© aux entrÃ©es sÃ©lectionnÃ©es</translation> + </message> </context> <context> <name>SvnPropListDialog</name> @@ -15944,6 +16200,62 @@ <source>There are no uncommitted changes available/selected.</source> <translation>Il n'y a pas de modification non commitÃ©e disponible/sÃ©lectionnÃ©e.</translation> </message> + <message> + <source>Lock</source> + <translation>VÃ©rouillage</translation> + </message> + <message> + <source>Unlock</source> + <translation>DÃ©vÃ©rouillage</translation> + </message> + <message> + <source>Break lock</source> + <translation>Casser le vÃ©rouillage d'un autre utilisateur</translation> + </message> + <message> + <source>Steal lock</source> + <translation>RevÃ©rouiller Ã son nom</translation> + </message> + <message> + <source>locked</source> + <translation>vÃ©rouillÃ©</translation> + </message> + <message> + <source>other lock</source> + <translation>autre verrou</translation> + </message> + <message> + <source>stolen lock</source> + <translation>verrou volÃ©</translation> + </message> + <message> + <source>broken lock</source> + <translation>verrou cassÃ©</translation> + </message> + <message> + <source>not locked</source> + <translation>non verrouilÃ©</translation> + </message> + <message> + <source>replaced</source> + <translation>remplacÃ©</translation> + </message> + <message> + <source>There are no unlocked files available/selected.</source> + <translation>Il n'y a aucun fichier dÃ©verrouilÃ© disponible/sÃ©lectionnÃ©.</translation> + </message> + <message> + <source>There are no locked files available/selected.</source> + <translation>Il n'y a aucun fichier verrouilÃ© disponible/sÃ©lectionnÃ©.</translation> + </message> + <message> + <source>Break Lock</source> + <translation>Casser le vÃ©rouillage d'un autre utilisateur</translation> + </message> + <message> + <source>Steal Lock</source> + <translation>Voler le verou</translation> + </message> </context> <context> <name>SvnSwitchDialog</name> @@ -16489,22 +16801,6 @@ <context> <name>Tabview</name> <message> - <source>Show next tab</source> - <translation>Affiche la tabulation suivante</translation> - </message> - <message> - <source>Ctrl+Alt+Tab</source> - <translation>Ctrl+Alt+Tab</translation> - </message> - <message> - <source>Show previous tab</source> - <translation>Affiche la tabulation prÃ©cÃ©dente</translation> - </message> - <message> - <source>Shift+Ctrl+Alt+Tab</source> - <translation>Shift+Ctrl+Alt+Tab</translation> - </message> - <message> <source>Untitled %1</source> <translation>SansTitre %1</translation> </message> @@ -17012,6 +17308,26 @@ <source>To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.Example template: This is a $VAR$When you use this template you will be prompted for a value for the variable $VAR$. Any occurences of $VAR$ will then be replaced with whatever you've entered.If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.If you want a variables contents to be treated specially, the variablename must be followed by a ':' and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:<table><tr><td>ml</td><td>Specifies a multiline formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.</td></tr></table>If you want to change the default delimiter to anything different, please use the configuration dialog to do so.</source> <translation>Pour utiliser les variables dans un gabarit, vous avez juste Ã placer le nom de la variable entre deux caractÃšres "$". Lors de l'utilisation du gabarit, il vous sera demandÃ© de saisir une valeur pour cette variable.Exemple de gabarit: Ceci est $VAR$Lors de l'utilisation du gabarit, la saisie de la variable $VAR$ vous sera proposÃ©e. Toutes les occurences de $VAR$ seront alors remplacÃ©es par le contenu que vous aurez saisi.Si vous avez besoin d'entrer explicitement un charactÃšre "$" dans le gabarit, entrez "$$" (deux dollars au lieu d'un). Il seront automatiquement remplacÃ©s par un seul caractÃšre $ lors de l'utilisation du gabarit.Si vous souhaitez que le contenu des variables soit traitÃ© d'une maniÃšre spÃ©ciale (cf. plus bas), le nom de la variable doit Ãªtre suivi du caractÃšre ":" et d' un spÃ©cificateur de format (par ex : . $VAR:ml$). Les spÃ©cificateurs supportÃ©s sont :<table><tr><td>ml</td><td>Indique un formattage sur plusieurs lignes. Chaque ligne du contenu de la variable est prÃ©fixÃ© du mÃªme dÃ©but de ligne, Ã savoir le dÃ©but de ligne situÃ© avant le nom de la variable dans le gabarit.</td></tr></table>Vous pouvez modifier le dÃ©limiteur par dÃ©faut via la fenÃªtre de configuration gÃ©nÃ©rale.</translation> </message> + <message> + <source>Bash</source> + <translation>Bash</translation> + </message> + <message> + <source>Batch</source> + <translation>Batch</translation> + </message> + <message> + <source>Makefile</source> + <translation>Makefile</translation> + </message> + <message> + <source>Properties</source> + <translation>PropriÃ©tÃ©s</translation> + </message> + <message> + <source>TeX</source> + <translation>TeX</translation> + </message> </context> <context> <name>TemplatePropertiesForm</name> @@ -19042,7 +19358,7 @@ </message> <message> <source>T&ask-Viewer</source> - <translation>Visualiseur de T&aches</translation> + <translation>Gestionnaire de T&aches</translation> </message> <message> <source>Toggle the Task-Viewer window</source> @@ -19086,7 +19402,7 @@ </message> <message> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> - <translation>Aucun visualiseur personalisÃ© n'est sÃ©lectionnÃ©. PriÃšre dans spÃ©cifier un dans les prÃ©fÃ©rences.</translation> + <translation>Aucun visualiseur personalisÃ© n'est sÃ©lectionnÃ©. PriÃšre d'en spÃ©cifier un dans les prÃ©fÃ©rences.</translation> </message> <message> <source>Could not start custom viewer. Ensure that it is available as %1.</source> @@ -19110,11 +19426,11 @@ </message> <message> <source>Template-Viewer</source> - <translation>Visualiseur de Gabarits</translation> + <translation>Gestionnaire de Gabarits</translation> </message> <message> <source>Te&mplate-Viewer</source> - <translation>Visualiseur de &Gabarits</translation> + <translation>Gestionnaire de &Gabarits</translation> </message> <message> <source>Toggle the Template-Viewer window</source> @@ -19144,6 +19460,134 @@ <source>The templates file %1 has an unsupported format.</source> <translation>Le format du fichier gabarit %1 n'est pas supportÃ©.</translation> </message> + <message> + <source>Activate Project-Browser</source> + <translation>Activer le Navigateur de Projet</translation> + </message> + <message> + <source>Alt+Shift+P</source> + <translation>Alt+Maj+P</translation> + </message> + <message> + <source>Activate Debug-Browser</source> + <translation>Activer le Navigateur de DÃ©bogage</translation> + </message> + <message> + <source>Alt+Shift+D</source> + <translation>Alt+Maj+D</translation> + </message> + <message> + <source>Activate Shell</source> + <translation>Activer le Shell</translation> + </message> + <message> + <source>Alt+Shift+S</source> + <translation>Alt+Maj+S</translation> + </message> + <message> + <source>Activate File-Browser</source> + <translation>Activer le Navigateur de Fichiers</translation> + </message> + <message> + <source>Alt+Shift+F</source> + <translation>Alt+Maj+F</translation> + </message> + <message> + <source>Activate Log-Viewer</source> + <translation>Activer le Gestionnaire de Log</translation> + </message> + <message> + <source>Activate Task-Viewer</source> + <translation>Activer le Gestionnaire de Taches</translation> + </message> + <message> + <source>Alt+Shift+T</source> + <translation>Alt+Maj+T</translation> + </message> + <message> + <source>Activate Template-Viewer</source> + <translation>Activer le Getsionnaire de Gabarits</translation> + </message> + <message> + <source>Alt+Shift+M</source> + <translation>Alt+Maj+M</translation> + </message> + <message> + <source>Activate current editor</source> + <translation>Activer l'Ã©diteur courant</translation> + </message> + <message> + <source>Alt+Shift+E</source> + <translation>Alt+Maj+E</translation> + </message> + <message> + <source>Show next tab</source> + <translation>Afficher la tabulation suivante</translation> + </message> + <message> + <source>Ctrl+Alt+Tab</source> + <translation>Ctrl+Alt+Tab</translation> + </message> + <message> + <source>Show previous tab</source> + <translation>Afficher la tabulation prÃ©cÃ©dente</translation> + </message> + <message> + <source>Shift+Ctrl+Alt+Tab</source> + <translation>Shift+Ctrl+Alt+Tab</translation> + </message> + <message> + <source>Alt+Shift+G</source> + <translation>Alt+Maj+G</translation> + </message> + <message> + <source>Qt-Designer 4</source> + <translation>Qt-Designer 4</translation> + </message> + <message> + <source>Designer 4...</source> + <translation>Designer 4...</translation> + </message> + <message> + <source>Qt-Linguist 4</source> + <translation>Qt-Linguist 4</translation> + </message> + <message> + <source>Linguist 4...</source> + <translation>Linguist 4...</translation> + </message> + <message> + <source>Start Qt-Designer 4</source> + <translation>Lancer Qt-Designer 4</translation> + </message> + <message> + <source>Qt-Designer 4Start Qt-Designer 4.</source> + <translation>Qt-Designer 4Lancer Qt-Designer 4.</translation> + </message> + <message> + <source>Start Qt-Linguist 4</source> + <translation>Lancer Qt-Linguist 4</translation> + </message> + <message> + <source>Qt-Linguist 4Start Qt-Linguist 4.</source> + <translation>Qt-Linguist 4Lance Qt-Linguist 4.</translation> + </message> + <message> + <source>Qt4 Documentation</source> + <translation>Documentation Qt4</translation> + </message> + <message> + <source>Qt&4 Documentation</source> + <translation>Documentation Qt&4</translation> + </message> + <message> + <source>Open Qt4 Documentation</source> + <translation>Lance la Documentation Qt4</translation> + </message> + <message> + <source>Qt4 DocumentationDisplay the Qt4 Documentation with Qt Assistant. </source> + <translation>Documentation Qt4Affiche la documentation Qt4 avec Qt Assistant. </translation> + </message> </context> <context> <name>Utilities</name> @@ -19333,13 +19777,6 @@ </message> </context> <context> - <name>VariablesFilterDialog</name> - <message> - <source>%1 - Variables Filter</source> - <translation>%1 - Filtre pour Variables</translation> - </message> -</context> -<context> <name>VariablesFilterForm</name> <message> <source><h2>Filter Dialog</h2> @@ -21234,10 +21671,6 @@ <translation>Shift+Backspace</translation> </message> <message> - <source>Shift+Return</source> - <translation>Maj+EntrÃ©e</translation> - </message> - <message> <source>Next uncovered line</source> <translation>Ligne non executÃ©e suivante</translation> </message> @@ -21359,6 +21792,88 @@ <source>Python Files (*.py);;Pyrex Files (*.pyx);;Quixote Template Files (*.ptl);;Ruby Files (*.rb);;IDL Files (*.idl);;C Files (*.h *.c);;C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc);;C# Files (*.cs);;HTML Files (*.html *.htm *.asp *.shtml);;CSS Files (*.css);;PHP Files (*.php *.php3 *.php4 *.php5 *.phtml);;XML Files (*.xml *.xsl *.xslt *.dtd);;Java Files (*.java);;JavaScript Files (*.js);;SQL Files (*.sql);;Docbook Files (*.docbook);;Perl Files (*.pl *.pm *.ph);;Lua Files (*.lua);;Tex Files (*.tex *.sty *.aux *.toc *.idx);;Shell Files (*.sh);;Batch Files (*.bat *.cmd);;Diff Files (*.diff *.patch);;Makefiles (*.mak);;Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc);;All Files (*)</source> <translation>Fichiers Python(*.py);;Fichiers Pyrex (*.pyx);;Fichiers Gabarits Quixote (*.ptl);;Fichiers Ruby (*.rb);;Fichiers IDL (*.idl);;Fichiers C (*.h *.c);;Fichiers C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc);;Fichiers C# Files (*.cs);;Fichiers HTML (*.html *.htm *.asp *.shtml);;Fichiers CSS (*.css);;Fichiers PHP (*.php *.php3 *.php4 *.php5 *.phtml);;Fichiers XML (*.xml *.xsl *.xslt *.dtd);;Fichiers Java (*.java);;Fichiers JavaScript (*.js);;Fichiers SQL (*.sql);;Fichiers Docbook (*.docbook);;Fichiers Perl (*.pl *.pm *.ph);;Fichiers Lua (*.lua);;Fichiers Tex (*.tex *.sty *.aux *.toc *.idx);;Fichiers Shell (*.sh);;Fichiers Batch (*.bat *.cmd);;Fichiers Diff (*.diff *.patch);;Fichiers Makefiles (*.mak);;Fichiers de PropriÃ©tÃ©s (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc);;Tous les fichiers (*)</translation> </message> + <message> + <source>Smart indent</source> + <translation>Indentation intelligente</translation> + </message> + <message> + <source>CTRL+ALT+I</source> + <comment>Edit|Smart indent</comment> + <translation>CTRL+ALT+I</translation> + </message> + <message> + <source>Smart indent Line or Selection</source> + <translation>Indentation intelligente de la ligne ou de la sÃ©lection</translation> + </message> + <message> + <source>Smart indentIndents the current line or the lines of the current selection smartly.</source> + <translation>Indentation intelligenteIndente intelligemment la ou les lignes sÃ©lectionnÃ©es.</translation> + </message> + <message> + <source>CTRL++</source> + <comment>View|Zoom in</comment> + <translation>CTRL++</translation> + </message> + <message> + <source>CTRL+-</source> + <comment>View|Zoom out</comment> + <translation>CTRL+-</translation> + </message> + <message> + <source>Next split</source> + <translation>Onglet suivant</translation> + </message> + <message> + <source>&Next split</source> + <translation>O&nglet suivant</translation> + </message> + <message> + <source>CTRL+Alt+N</source> + <comment>View|Next split</comment> + <translation>CTRL+Alt+N</translation> + </message> + <message> + <source>Move to the next split</source> + <translation>Basculer vers l'onglet suivant</translation> + </message> + <message> + <source>Next splitMove to the next split.</source> + <translation>Onglet suivantBasculer vers l'onglet suivant.</translation> + </message> + <message> + <source>Previous split</source> + <translation>Onglet prÃ©cÃ©dent</translation> + </message> + <message> + <source>&Previous split</source> + <translation>Onglet &prÃ©cÃ©dent</translation> + </message> + <message> + <source>CTRL+Alt+P</source> + <comment>View|Previous split</comment> + <translation>CTRL+Alt+P</translation> + </message> + <message> + <source>Move to the previous split</source> + <translation>Basculer vers l'onglet prÃ©cÃ©dent</translation> + </message> + <message> + <source>Previous splitMove to the previous split.</source> + <translation>Onglet prÃ©cÃ©dentBasculer vers l'onglet prÃ©cÃ©dent.</translation> + </message> + <message> + <source>Ctrl+U</source> + <translation>Ctrl+U</translation> + </message> + <message> + <source>F3</source> + <comment>Search|Search</comment> + <translation>F3</translation> + </message> + <message> + <source>Enter</source> + <translation>EntrÃ©e</translation> + </message> </context> <context> <name>ViewProfileDialog</name> @@ -21423,11 +21938,11 @@ </message> <message> <source>Task-Viewer</source> - <translation>Visualiseur de taches</translation> + <translation>Gestionnaire de Taches</translation> </message> <message> <source>Templates-Viewer</source> - <translation>Visualiseur de Gabarits</translation> + <translation>Gestionnaire de Gabarits</translation> </message> </context> <context> @@ -21549,6 +22064,14 @@ <source>A watchpoint with the condition '%1' for the variable %2 already exists.</source> <translation>Un watchpoint avec la condition '%1' pour la variable %2 existe dÃ©jÃ .</translation> </message> + <message> + <source>Watchpoint Condition Error</source> + <translation>Erreur de condition watchpoint</translation> + </message> + <message> + <source>The watchpoint condition %1 contains a syntax error.</source> + <translation>La condition %1 contient une erreur de syntaxe.</translation> + </message> </context> <context> <name>WidgetView</name> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric-3.8.1/install-i18n.py new/eric-3.9.0/install-i18n.py --- old/eric-3.8.1/install-i18n.py 2005-12-18 15:26:25.000000000 +0100 +++ new/eric-3.9.0/install-i18n.py 2006-04-30 12:52:44.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2005 Detlev Offenbach <detlev(a)die-offenbachs.de> +# Copyright (c) 2004 - 2006 Detlev Offenbach <detlev(a)die-offenbachs.de> # # This is the install script for eric3's translation files. ++++++ eric-i18n-ru-3.8.1.tar.gz -> eric-i18n-ru-3.9.0.tar.gz ++++++ Binary files old/eric-3.8.1/eric/i18n/eric3_ru.qm and new/eric-3.9.0/eric/i18n/eric3_ru.qm differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric-3.8.1/eric/i18n/eric3_ru.ts new/eric-3.9.0/eric/i18n/eric3_ru.ts --- old/eric-3.8.1/eric/i18n/eric3_ru.ts 2005-11-07 12:29:16.000000000 +0100 +++ new/eric-3.9.0/eric/i18n/eric3_ru.ts 2006-04-02 19:07:53.000000000 +0200 @@ -1915,6 +1915,30 @@ <source>Templates</source> <translation>ÐšÐ°Ð±Ð»ÐŸÐœÑ</translation> </message> + <message> + <source>Programs</source> + <translation>ÐÑÐŸÐ³ÑÐ°ÐŒÐŒÑ</translation> + </message> + <message> + <source>Python Module</source> + <translation>ÐÐŸÐŽÑÐ»Ñ Python</translation> + </message> + <message> + <source>(not configured)</source> + <translation>(ÐœÐµ ÐœÐ°ÑÑÑÐŸÐµÐœÐŸ)</translation> + </message> + <message> + <source>(not found)</source> + <translation>(ÐœÐµ ÐœÐ°Ð¹ÐŽÐµÐœÐŸ)</translation> + </message> + <message> + <source>Select Qt4 Directory</source> + <translation>ÐÑÐ±ÐµÑÐžÑÐµ ÐºÐ°ÑÐ°Ð»ÐŸÐ³ Qt4</translation> + </message> + <message> + <source>Select Qt4 documentation directory</source> + <translation>ÐÑÐ±ÐµÑÐžÑÐµ ÐºÐ°ÑÐ°Ð»ÐŸÐ³ ÐŽÐŸÐºÑÐŒÐµÐœÑÐ°ÑÐžÐž Qt4</translation> + </message> </context> <context> <name>ConfigurationForm</name> @@ -3169,14 +3193,6 @@ <translation>ÐÐŸÐŽÐžÑÐžÑÐžÑÐŸÐ²Ð°ÐœÐœÑÐµ ÑÐŸÑÐŒÑ Ð±ÑÐŽÑÑ Ð°Ð²ÑÐŸÐŒÐ°ÑÐžÑÐµÑÐºÐž ÐºÐŸÐŒÐ¿ÐžÐ»ÐžÑÐŸÐ²Ð°ÑÑÑÑ Ð¿ÑÐž Ð·Ð°Ð¿ÑÑÐºÐµ</translation> </message> <message> - <source>Remote Autocompletion Enabled</source> - <translation>Ð Ð°Ð·ÑÐµÑÐžÑÑ ÑÐŽÐ°Ð»ÑÐœÐœÐŸÐµ Ð°Ð²ÑÐŸÐ·Ð°Ð²ÐµÑÑÐµÐœÐžÐµ</translation> - </message> - <message> - <source>Select this to enable remote autocompletion</source> - <translation>Ð Ð°Ð·ÑÐµÑÐžÑÑ ÑÐŽÐ°Ð»ÑÐœÐœÐŸÐµ Ð°Ð²ÑÐŸÐ·Ð°Ð²ÐµÑÑÐµÐœÐžÐµ</translation> - </message> - <message> <source>Word Wrap Enabled</source> <translation>Ð Ð°Ð·ÑÐµÑÐžÑÑ Ð¿ÐµÑÐµÐœÐŸÑ Ð¿ÐŸ ÑÐ»ÐŸÐ²Ð°ÐŒ</translation> </message> @@ -3784,6 +3800,74 @@ <source>Filename Pattern:</source> <translation>ÐšÐ°Ð±Ð»ÐŸÐœ ÐžÐŒÐµÐœÐž ÑÐ°Ð¹Ð»Ð°:</translation> </message> + <message> + <source>Path</source> + <translation>ÐÑÑÑ</translation> + </message> + <message> + <source>Version</source> + <translation>ÐÐµÑÑÐžÑ</translation> + </message> + <message> + <source>Show Programs</source> + <translation>ÐÐŸÐºÐ°Ð·Ð°ÑÑ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÑ</translation> + </message> + <message> + <source>Search</source> + <translation>ÐÐŸÐžÑÐº</translation> + </message> + <message> + <source>Press to search for programs</source> + <translation>ÐÑÐºÐ°ÑÑ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÑ</translation> + </message> + <message> + <source>Enter the number of history entries allowed</source> + <translation>ÐÐ°ÐŽÐ°Ð¹ÑÐµ ÐºÐŸÐ»ÐžÑÐµÑÑÐ²ÐŸ ÐŽÐŸÐ¿ÑÑÑÐžÐŒÑÑ ÑÑÑÐŸÐº ÐžÑÑÐŸÑÐžÐž</translation> + </message> + <message> + <source>max. History Entries:</source> + <translation>ÐŒÐ°ÐºÑ. ÐºÐŸÐ»-Ð²ÐŸ ÑÑÑÐŸÐº ÐžÑÑÐŸÑÐžÐž:</translation> + </message> + <message> + <source>Qt4 Documentation</source> + <translation>ÐÐŸÐºÑÐŒÐµÐœÑÐ°ÑÐžÑ Qt4</translation> + </message> + <message> + <source>Enter the Qt4 documentation directory</source> + <translation>ÐÐ°ÐŽÐ°Ð¹ÑÐµ ÐºÐ°ÑÐ°Ð»ÐŸÐ³ ÐŽÐŸÐºÑÐŒÐµÐœÑÐ°ÑÐžÐž Qt4</translation> + </message> + <message> + <source>Press to select the Qt4 documentation directory via a dialog</source> + <translation>ÐÑÐ±ÑÐ°ÑÑ ÐºÐ°ÑÐ°Ð»ÐŸÐ³ ÐŽÐŸÐºÑÐŒÐµÐœÑÐ°ÑÐžÐž Qt4 Ñ Ð¿ÐŸÐŒÐŸÑÑÑ ÐŽÐžÐ°Ð»ÐŸÐ³Ð°</translation> + </message> + <message> + <source>Note: Leave empty to use the QT4DOCDIR environment variable, if set.</source> + <translation>ÐÑÐžÐŒÐµÑÐ°ÐœÐžÐµ: ÐÑÑÐ°Ð²ÑÑÐµ Ð¿ÐŸÐ»Ðµ Ð¿ÑÑÑÑÐŒ, ÑÑÐŸÐ±Ñ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÑ Ð¿ÐµÑÐµÐŒÐµÐœÐœÑÑ ÐŸÐºÑÑÐ¶ÐµÐœÐžÑ QT4DOCDIR.</translation> + </message> + <message> + <source>Qt4 Directory</source> + <translation>ÐÐ°ÑÐ°Ð»ÐŸÐ³ Qt4</translation> + </message> + <message> + <source>Enter the path of the Qt4 directory.</source> + <translation>ÐÐ°ÐŽÐ°Ð¹ÑÐµ Ð¿ÑÑÑ Ðº ÐºÐ°ÑÐ°Ð»ÐŸÐ³Ñ Qt4.</translation> + </message> + <message> + <source>Press to select the Qt4 directory via a directory selection dialog</source> + <translation>ÐÑÐ±ÐµÑÐžÑÐµ Ð¿ÑÑÑ Ðº ÐºÐ°ÑÐ°Ð»ÐŸÐ³Ñ Qt4 Ñ Ð¿ÐŸÐŒÐŸÑÑÑ ÐŽÐžÐ°Ð»ÐŸÐ³Ð° Ð²ÑÐ±ÐŸÑÐ° ÐºÐ°ÑÐ°Ð»ÐŸÐ³Ð°</translation> + </message> + <message> + <source>Export Qt4 Directory entered above</source> + <translation>ÐÐºÑÐ¿ÐŸÑÑÐžÑÐŸÐ²Ð°ÑÑ Ð²Ð²ÐµÐŽÑÐœÐœÑÐ¹ Ð²ÑÑÐµ ÐºÐ°ÑÐ°Ð»ÐŸÐ³ Qt4</translation> + </message> + <message> + <source>Select, whether the Qt4 Directory entered should be exported to the environment</source> + <translation>ÐÐºÑÐ¿ÐŸÑÑÐžÑÐŸÐ²Ð°ÑÑ ÐºÐ°ÑÐ°Ð»ÐŸÐ³ Qt4 Ð² Ð¿ÐµÑÐµÐŒÐµÐœÐœÑÐµ ÐŸÐºÑÑÐ¶ÐµÐœÐžÑ</translation> + </message> + <message> + <source>Note: Leave this entry empty to use the QT4DIR environment variable.</source> + <translation>ÐÐœÐžÐŒÐ°ÐœÐžÐµ:Ð§ÑÐŸÐ±Ñ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÑ Ð¿ÐµÑÐµÐŒÐµÐœÐœÑÑ ÐŸÐºÑÑÐ¶ÐµÐœÐžÑ QT4DIR, ÐŸÑÑÐ°Ð²ÑÑÐµ ÑÑÐŸ Ð¿ÐŸÐ»Ðµ Ð¿ÑÑÑÑÐŒ.</translation> + </message> </context> <context> <name>CopyForm</name> @@ -5546,6 +5630,14 @@ <source>The program has terminated with an exit status of %1.</source> <translation>ÐÑÐŸÐ³ÑÐ°ÐŒÐŒÐ° Ð·Ð°Ð²ÐµÑÑÐžÐ»Ð°ÑÑ Ñ ÐºÐŸÐŽÐŸÐŒ Ð²ÑÑÐŸÐŽÐ° %1.</translation> </message> + <message> + <source>Breakpoint Condition Error</source> + <translation>ÐÑÐžÐ±ÐºÐ° Ð² ÑÑÐ»ÐŸÐ²ÐžÑÑ ÑÐŸÑÐºÐž ÐŸÑÑÐ°ÐœÐŸÐ²Ð°</translation> + </message> + <message> + <source>The condition of the breakpoint %1, %2 contains a syntax error.</source> + <translation>Ð£ÑÐ»ÐŸÐ²ÐžÐµ ÑÐŸÑÐºÐž ÐŸÑÑÐ°ÐœÐŸÐ²Ð° %1, %2 ÑÐŸÐŽÐµÑÐ¶ÐžÑ ÑÐžÐœÑÐ°ÐºÑÐžÑÐµÑÐºÑÑ ÐŸÑÐžÐ±ÐºÑ.</translation> + </message> </context> <context> <name>DebuggerPropertiesDialog</name> @@ -7285,6 +7377,38 @@ <source>&Test</source> <translation>&Ð¢ÐµÑÑ</translation> </message> + <message> + <source>Qt Version</source> + <translation>ÐÐµÑÑÐžÑ Qt</translation> + </message> + <message> + <source>Qt 3</source> + <translation>Qt 3</translation> + </message> + <message> + <source>Select to generate code for Qt 3</source> + <translation>ÐÐµÐœÐµÑÐžÑÐŸÐ²Ð°ÑÑ ÐºÐŸÐŽ ÐŽÐ»Ñ Qt 3</translation> + </message> + <message> + <source>Qt 4</source> + <translation>Qt 4</translation> + </message> + <message> + <source>Select to generate code for Qt 4</source> + <translation>ÐÐµÐœÐµÑÐžÑÐŸÐ²Ð°ÑÑ ÐºÐŸÐŽ ÐŽÐ»Ñ Qt 4</translation> + </message> + <message> + <source>Show overwrite confirmation</source> + <translation>ÐÐ°Ð¿ÑÐ°ÑÐžÐ²Ð°ÑÑ Ð¿ÐŸÐŽÑÐ²ÐµÑÐ¶ÐŽÐµÐœÐžÐµ ÐœÐ° Ð¿ÐµÑÐµÐ·Ð°Ð¿ÐžÑÑ</translation> + </message> + <message> + <source>Select to show an overwrite confirmation dialog</source> + <translation>ÐÐŸÐºÐ°Ð·ÑÐ²Ð°ÑÑ ÐŽÐžÐ°Ð»ÐŸÐ³ Ñ Ð¿ÐŸÐŽÑÐ²ÐµÑÐ¶ÐŽÐµÐœÐžÐµÐŒ ÐœÐ° Ð¿ÐµÑÐµÐ·Ð°Ð¿ÐžÑÑ</translation> + </message> + <message> + <source>Alt+T</source> + <translation>Alt+T</translation> + </message> </context> <context> <name>FiletypeAssociationDialog</name> @@ -9474,6 +9598,26 @@ <source>&Test</source> <translation>&Ð¢ÐµÑÑ</translation> </message> + <message> + <source>Qt Version</source> + <translation>ÐÐµÑÑÐžÑ Qt</translation> + </message> + <message> + <source>Qt 3</source> + <translation>Qt 3</translation> + </message> + <message> + <source>Select to generate code for Qt 3</source> + <translation>ÐÐµÐœÐµÑÐžÑÐŸÐ²Ð°ÑÑ ÐºÐŸÐŽ ÐŽÐ»Ñ Qt 3</translation> + </message> + <message> + <source>Qt 4</source> + <translation>Qt 4</translation> + </message> + <message> + <source>Select to generate code for Qt 4</source> + <translation>ÐÐµÐœÐµÑÐžÑÐŸÐ²Ð°ÑÑ ÐºÐŸÐŽ ÐŽÐ»Ñ Qt 4</translation> + </message> </context> <context> <name>KFileDialog</name> @@ -10130,6 +10274,38 @@ <source>Generate a Critical QMessageBox</source> <translation>Ð¡ÐŸÐ·ÐŽÐ°ÑÑ ÐŸÑÐžÐ±ÐºÑ Ð² QMessageBox</translation> </message> + <message> + <source>Qt Version</source> + <translation>ÐÐµÑÑÐžÑ Qt</translation> + </message> + <message> + <source>Qt 3</source> + <translation>Qt 3</translation> + </message> + <message> + <source>Select to generate code for Qt 3</source> + <translation>ÐÐµÐœÐµÑÐžÑÐŸÐ²Ð°ÑÑ ÐºÐŸÐŽ ÐŽÐ»Ñ Qt 3</translation> + </message> + <message> + <source>Qt 4</source> + <translation>Qt 4</translation> + </message> + <message> + <source>Select to generate code for Qt 4</source> + <translation>ÐÐµÐœÐµÑÐžÑÐŸÐ²Ð°ÑÑ ÐºÐŸÐŽ ÐŽÐ»Ñ Qt 4</translation> + </message> + <message> + <source>Alt+O</source> + <translation>Alt+O</translation> + </message> + <message> + <source>Alt+C</source> + <translation>Alt+C</translation> + </message> + <message> + <source>Alt+T</source> + <translation>Alt+T</translation> + </message> </context> <context> <name>PBrowser</name> @@ -11157,10 +11333,6 @@ <translation>ÐÑÐŸÐ±Ð»ÐµÐŒÐ° Ñ Ð±ÐµÐ·ÐŸÐ¿Ð°ÑÐœÐŸÑÑÑÑ</translation> </message> <message> - <source>The %1 entry of the project file contains a security problem. Resetting it.</source> - <translation>ÐÐ»ÐµÐŒÐµÐœÑ Ð¿ÑÐŸÐµÐºÑÐ°%1 ÑÐŸÐŽÐµÑÐ¶ÐžÑ Ð¿ÑÐŸÐ±Ð»ÐµÐŒÑ Ð±ÐµÐ·ÐŸÐ¿Ð°ÑÐœÐŸÑÑÐž. Ð¡Ð±ÑÐ°ÑÑÐ²Ð°Ñ ÐµÐ³ÐŸ.</translation> - </message> - <message> <source>Add files to project</source> <translation>ÐÐŸÐ±Ð°Ð²ÐžÑÑ ÑÐ°Ð¹Ð»Ñ Ð² Ð¿ÑÐŸÐµÐºÑ</translation> </message> @@ -11177,6 +11349,14 @@ <translation>ÐÐŸÐ±Ð°Ð²ÐžÑÑ ÑÐ°Ð¹Ð»Ñ ÐÑÐºÑÑÐ²Ð°ÐµÑ ÐŽÐžÐ°Ð»ÐŸÐ³ ÐŽÐ»Ñ ÐŽÐŸÐ±Ð°Ð²Ð»ÐµÐœÐžÑ ÑÐ°Ð¹Ð»ÐŸÐ² Ð² ÑÐµÐºÑÑÐžÐ¹ Ð¿ÑÐŸÐµÐºÑ. ÐÐµÑÑÐŸ ÐŽÐŸÐ±Ð°Ð²Ð»ÐµÐœÐžÑ ÐŸÐ¿ÑÐµÐŽÐµÐ»ÑÐµÑÑÑ ÑÐ°ÑÑÐžÑÐµÐœÐžÐµÐŒ ÑÐ°Ð¹Ð»Ð°.</translation> </message> + <message> + <source>The %1 entry of the project file contains a security problem.</source> + <translation>ÐÑÐŸÐ¶ÐŽÐµÐœÐžÐµ Ð¿ÑÐŸÐµÐºÑÐ° %1 ÑÐŸÐŽÐµÑÐ¶ÐžÑ Ð¿ÑÐŸÐ±Ð»ÐµÐŒÑ Ð±ÐµÐ·ÐŸÐ¿Ð°ÑÐœÐŸÑÑÐž.</translation> + </message> + <message> + <source>Qt4</source> + <translation>Qt4</translation> + </message> </context> <context> <name>ProjectBrowserDirectory</name> @@ -11391,6 +11571,18 @@ <source>Add forms...</source> <translation>ÐÐŸÐ±Ð°Ð²ÐžÑÑ ÑÐŸÑÐŒÑ...</translation> </message> + <message> + <source>Main Window</source> + <translation>ÐÐ»Ð°Ð²ÐœÐŸÐµ ÐŸÐºÐœÐŸ</translation> + </message> + <message> + <source>Dialog with Buttons (Bottom-Center)</source> + <translation>ÐÐžÐ°Ð»ÐŸÐ³ Ñ ÐºÐœÐŸÐ¿ÐºÐ°ÐŒÐž (ÑÐœÐžÐ·Ñ Ð² ÑÐµÐœÑÑÐµ)</translation> + </message> + <message> + <source>Subclass generation is not supported for Qt4.</source> + <translation>ÐÐµÐœÐµÑÐ°ÑÐžÑ Ð¿ÑÐŸÐžÐ·Ð²ÐŸÐŽÐœÑÑ ÐºÐ»Ð°ÑÑÐŸÐ² ÐŽÐ»Ñ Qt4 ÐœÐµ Ð¿ÐŸÐŽÐŽÐµÑÐ¶ÐžÐ²Ð°ÐµÑÑÑ.</translation> + </message> </context> <context> <name>ProjectInterfacesBrowser</name> @@ -13645,6 +13837,26 @@ <source>Copy the regular expression to the clipboard</source> <translation>Ð¡ÐºÐŸÐ¿ÐžÑÐŸÐ²Ð°ÑÑ ÑÐµÐ³ÑÐ»ÑÑÐœÐŸÐµ Ð²ÑÑÐ°Ð¶ÐµÐœÐžÐµ Ð² Ð±ÑÑÐµÑ ÐŸÐ±ÐŒÐµÐœÐ°</translation> </message> + <message> + <source>Qt Version</source> + <translation>ÐÐµÑÑÐžÑ Qt</translation> + </message> + <message> + <source>Qt 3</source> + <translation>Qt 3</translation> + </message> + <message> + <source>Select to generate code for Qt 3</source> + <translation>ÐÐµÐœÐµÑÐžÑÐŸÐ²Ð°ÑÑ ÐºÐŸÐŽ ÐŽÐ»Ñ Qt 3</translation> + </message> + <message> + <source>Qt 4</source> + <translation>Qt 4</translation> + </message> + <message> + <source>Select to generate code for Qt 4</source> + <translation>ÐÐµÐœÐµÑÐžÑÐŸÐ²Ð°ÑÑ ÐºÐŸÐŽ ÐŽÐ»Ñ Qt 4</translation> + </message> </context> <context> <name>QRegExpWizardRepeatDialog</name> @@ -14342,26 +14554,10 @@ <translation>ÐÐµÑ.</translation> </message> <message> - <source>Shell Error</source> - <translation>ÐÑÐžÐ±ÐºÐ° ÐŸÐ±ÐŸÐ»ÐŸÑÐºÐž</translation> - </message> - <message> - <source>Only single lines may be pasted into the shell.</source> - <translation>Ð ÐŸÐ±ÐŸÐ»ÐŸÑÐºÑ ÐŒÐŸÐ¶ÐœÐŸ Ð²ÑÑÐ°Ð²Ð»ÑÑÑ ÑÐŸÐ»ÑÐºÐŸ ÐŸÐŽÐœÑ ÑÑÑÐŸÐºÑ.</translation> - </message> - <message> <source>%1 is not a file.</source> <translation>%1 ÐœÐµ ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°Ð¹Ð»ÐŸÐŒ</translation> </message> <message> - <source>The Shell WindowThis is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys.The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by either 'Python' or 'Ruby'. These commands are available through the context menu as well.Pressing the Tab key after some text has been entered will show a list of possible commandline completions. The relevant entry may be selected from this list. If only one entr y is available, this will inserted automatically.In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</source> - <translation>ÐÐºÐœÐŸ ÐŸÐ±ÐŸÐ»ÐŸÑÐºÐžÐÑÐŸ Ð¿ÑÐŸÑÑÐŸ ÐžÐœÑÐµÑÐ¿ÑÐµÑÐ°ÑÐŸÑ, Ð·Ð°Ð¿ÑÑÐµÐœÐœÑÐ¹ Ð² ÐŸÐ±ÐŸÐ»ÐŸÑÐºÐµ. Ð¢ÐŸÑ Ð¶Ðµ, ÑÑÐŸ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑÑÑ ÐŽÐ»Ñ ÐŸÑÐ»Ð°ÐŽÐºÐž Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÑ. ÐÑÐŸ ÐŸÐ·ÐœÐ°ÑÐ°ÐµÑ, ÑÑÐŸ ÐÑ ÐŒÐŸÐ¶ÐµÑÐµ Ð²ÑÐ¿ÐŸÐ»ÐœÑÑÑ Ð»ÑÐ±ÑÐµ ÐºÐŸÐŒÐ°ÐœÐŽÑ, Ð¿ÐŸÐºÐ° ÑÐ°Ð±ÐŸÑÐ°ÐµÑ ÐŸÑÐ»Ð°Ð¶ÐžÐ²Ð°ÐµÐŒÐ°Ñ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐ°. -ÐÑ ÐŒÐŸÐ¶ÐµÑÐµ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÑ ÐºÑÑÑÐŸÑÐœÑÐµ ÐºÐ»Ð°Ð²ÐžÑÐž Ð²ÐŸ Ð²ÑÐµÐŒÑ Ð²Ð²ÐŸÐŽÐ° ÐºÐŸÐŒÐ°ÐœÐŽ. Ð¢Ð°ÐºÐ¶Ðµ ÐµÑÑÑ ÐžÑÑÐŸÑÐžÑ, ÐºÐŸÑÐŸÑÐ°Ñ ÐŒÐŸÐ¶ÐµÑ Ð¿ÑÐŸÐºÑÑÑÐžÐ²Ð°ÑÑÑÑ Ñ Ð¿ÐŸÐŒÐŸÑÑÑ ÐºÑÑÑÐŸÑÐ° "Ð²Ð²ÐµÑÐ·" Ðž "Ð²ÐœÐžÐ·". -ÐÐ±ÐŸÐ»ÐŸÑÐºÐ° ÐŽÐŸÐ¿ÐŸÐ»ÐœÐµÐœÐ° ÐœÐµÑÐºÐŸÐ»ÑÐºÐžÐŒÐž ÐŽÐŸÐ¿ÐŸÐ»ÐœÐžÑÐµÐ»ÑÐœÑÐŒÐž ÐºÐŸÐŒÐ°ÐœÐŽÐ°ÐŒÐž. 'reset' ÑÐ±ÐžÐ²Ð°ÐµÑ ÑÐµÑÑÐžÑ Ðž ÑÐŸÐ·ÐŽÐ°ÑÑ ÐœÐŸÐ²ÑÑ. 'clear' ÑÑÐžÑÐ°ÐµÑ ÐžÐœÑÐŸÑÐŒÐ°ÑÐžÑ Ð² ÐŸÐºÐœÐµ ÐŸÐ±ÐŸÐ»ÐŸÑÐºÐž. 'start' ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑÑÑ ÐŽÐ»Ñ Ð¿ÐµÑÐµÐºÐ»ÑÑÐµÐœÐžÑ ÑÐ·ÑÐºÐ° Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐžÑÐŸÐ²Ð°ÐœÐžÑ Ðž ÐŽÐŸÐ»Ð¶ÐœÐ° Ð±ÑÑÑ Ð¿ÑÐŸÐŽÐŸÐ»Ð¶ÐµÐœÐ° Ð»ÐžÐ±ÐŸ ÑÐ»ÐŸÐ²ÐŸÐŒ 'Python', Ð»ÐžÐ±ÐŸ 'Ruby'. ÐÑÐž ÐºÐŸÐŒÐ°ÐœÐŽÑ ÑÐ°ÐºÐ¶Ðµ ÐŽÐŸÑÑÑÐ¿ÐœÑ ÑÐµÑÐµÐ· ÐºÐŸÐœÑÐµÐºÑÑÐœÐŸÐµ ÐŒÐµÐœÑ. -ÐÐ°Ð¶Ð°ÑÐžÐµÐŒ ÐºÐ»Ð°Ð²ÐžÑÐž Tab Ð¿ÐŸÑÐ»Ðµ Ð²Ð²ÐµÐŽÑÐœÐœÐŸÐ³ÐŸ ÐºÑÑÐºÐ° ÑÐµÐºÑÑÐ° ÐŒÐŸÐ¶ÐœÐŸ Ð¿ÑÐŸÑÐŒÐŸÑÑÐµÑÑ ÑÐ¿ÐžÑÐŸÐº Ð²ÐŸÐ·ÐŒÐŸÐ¶ÐœÑÑ ÐŽÐŸÐ¿ÐŸÐ»ÐœÐµÐœÐžÐ¹. ÐÐ· ÑÑÐŸÐ³ÐŸ ÑÐ¿ÐžÑÐºÐ° ÐŒÐŸÐ¶ÐœÐŸ Ð²ÑÐ±ÑÐ°ÑÑ Ð¿ÐŸÐŽÑÐŸÐŽÑÑÐµÐµ ÐŽÐŸÐ¿ÐŸÐ»ÐœÐµÐœÐžÐµ. ÐÑÐ»Ðž ÐŽÐŸÑÑÑÐ¿ÐœÐŸ ÑÐŸÐ»ÑÐºÐŸ ÐŸÐŽÐœÐŸ ÐŽÐŸÐ¿ÐŸÐ»ÐœÐµÐœÐžÐµ, ÐŸÐœÐŸ Ð±ÑÐŽÐµÑ Ð²ÑÑÐ°Ð²Ð»ÐµÐœÐŸ Ð°Ð²ÑÐŸÐŒÐ°ÑÐžÑÐµÑÐºÐž. -Ð ÑÐµÐ¶ÐžÐŒÐµ Ð¿Ð°ÑÑÐžÐ²ÐœÐŸÐ¹ ÐŸÑÐ»Ð°ÐŽÐºÐž ÐŸÐ±ÐŸÐ»ÐŸÑÐºÐ° ÐŽÐŸÑÑÑÐ¿ÐœÐ° ÑÐŸÐ»ÑÐºÐŸ Ð¿ÐŸÑÐ»Ðµ ÑÐŸÐ³ÐŸ, ÐºÐ°Ðº ÐŸÑÐ»Ð°Ð¶ÐžÐ²Ð°ÐµÐŒÐ°Ñ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐ° Ð¿ÐŸÐŽÐºÐ»ÑÑÐžÑÑÑ Ðº IDE Ðž ÐŽÐŸ ÐµÑ Ð·Ð°Ð²ÐµÑÑÐµÐœÐžÑ. ÐÑÐŸ ÐŸÑÐŸÐ±ÑÐ°Ð¶Ð°ÐµÑÑÑ ÐžÐœÑÐŒ Ð¿ÑÐžÐ³Ð»Ð°ÑÐµÐœÐžÐµÐŒ Ðž ÐŽÑÑÐ³ÐžÐŒ Ð·Ð°Ð³ÐŸÐ»ÐŸÐ²ÐºÐŸÐŒ ÐŸÐºÐœÐ°.</translation> - </message> - <message> <source>Python</source> <translation>Python</translation> </message> @@ -14377,6 +14573,14 @@ <source>%1 on %2, %3</source> <translation>%1 Ð² %2, %3</translation> </message> + <message> + <source>The Shell WindowThis is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys. Pressing the up or down key after some text has been entered will start an incremental search.The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by either 'Python' or 'Ruby'. These commands are available through the context menu as well.Pressing the Tab key after some text has been entered will show a list of possib le commandline completions. The relevant entry may be selected from this list. If only one entry is available, this will inserted automatically.In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</source> + <translation>ÐÐºÐœÐŸ ÐŸÐ±ÐŸÐ»ÐŸÑÐºÐžÐÑÐŸ Ð¿ÑÐŸÑÑÐŸ ÐžÐœÑÐµÑÐ¿ÑÐµÑÐ°ÑÐŸÑ, Ð·Ð°Ð¿ÑÑÐµÐœÐœÑÐ¹ Ð² ÐŸÐ±ÐŸÐ»ÐŸÑÐºÐµ. Ð¢ÐŸÑ Ð¶Ðµ, ÑÑÐŸ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑÑÑ ÐŽÐ»Ñ ÐŸÑÐ»Ð°ÐŽÐºÐž Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÑ. ÐÑÐŸ ÐŸÐ·ÐœÐ°ÑÐ°ÐµÑ, ÑÑÐŸ ÐÑ ÐŒÐŸÐ¶ÐµÑÐµ Ð²ÑÐ¿ÐŸÐ»ÐœÑÑÑ Ð»ÑÐ±ÑÐµ ÐºÐŸÐŒÐ°ÐœÐŽÑ, Ð¿ÐŸÐºÐ° ÑÐ°Ð±ÐŸÑÐ°ÐµÑ ÐŸÑÐ»Ð°Ð¶ÐžÐ²Ð°ÐµÐŒÐ°Ñ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐ°. +ÐÑ ÐŒÐŸÐ¶ÐµÑÐµ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÑ ÐºÑÑÑÐŸÑÐœÑÐµ ÐºÐ»Ð°Ð²ÐžÑÐž Ð²ÐŸ Ð²ÑÐµÐŒÑ Ð²Ð²ÐŸÐŽÐ° ÐºÐŸÐŒÐ°ÐœÐŽ. Ð¢Ð°ÐºÐ¶Ðµ ÐµÑÑÑ ÐžÑÑÐŸÑÐžÑ, ÐºÐŸÑÐŸÑÐ°Ñ ÐŒÐŸÐ¶ÐµÑ Ð¿ÑÐŸÐºÑÑÑÐžÐ²Ð°ÑÑÑÑ Ñ Ð¿ÐŸÐŒÐŸÑÑÑ ÐºÑÑÑÐŸÑÐ° "Ð²Ð²ÐµÑÑ" Ðž "Ð²ÐœÐžÐ·". ÐÐ°Ð¶Ð°ÑÐžÐµ "Ð²Ð²ÐµÑÑ" ÐžÐ»Ðž "Ð²ÐœÐžÐ·" Ð¿ÐŸÑÐ»Ðµ ÑÐŸÐ³ÐŸ, ÐºÐ°Ðº ÐœÐ°Ð±ÑÐ°ÐœÐ° ÑÐ°ÑÑÑ ÑÐ»ÐŸÐ²Ð°, ÐœÐ°ÑÐœÑÑ ÐžÐœÐºÑÐµÐŒÐµÐœÑÐ°Ð»ÑÐœÑÐ¹ Ð¿ÐŸÐžÑÐº. +ÐÐ±ÐŸÐ»ÐŸÑÐºÐ° ÐŽÐŸÐ¿ÐŸÐ»ÐœÐµÐœÐ° ÐœÐµÑÐºÐŸÐ»ÑÐºÐžÐŒÐž ÐŽÐŸÐ¿ÐŸÐ»ÐœÐžÑÐµÐ»ÑÐœÑÐŒÐž ÐºÐŸÐŒÐ°ÐœÐŽÐ°ÐŒÐž. 'reset' ÑÐ±ÐžÐ²Ð°ÐµÑ ÑÐµÑÑÐžÑ Ðž ÑÐŸÐ·ÐŽÐ°ÑÑ ÐœÐŸÐ²ÑÑ. 'reset' ÑÐ±ÐžÐ²Ð°ÐµÑ ÐŸÐ±ÐŸÐ»ÐŸÑÐºÑ Ðž Ð·Ð°Ð¿ÑÑÐºÐ°ÐµÑ ÐœÐŸÐ²ÑÑ. 'start' ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑÑÑ ÐŽÐ»Ñ Ð¿ÐµÑÐµÐºÐ»ÑÑÐµÐœÐžÑ ÑÐ·ÑÐºÐ° Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐžÑÐŸÐ²Ð°ÐœÐžÑ Ðž ÐŽÐŸÐ»Ð¶ÐœÐ° Ð±ÑÑÑ Ð¿ÑÐŸÐŽÐŸÐ»Ð¶ÐµÐœÐ° Ð»ÐžÐ±ÐŸ ÑÐ»ÐŸÐ²ÐŸÐŒ 'Python', Ð»ÐžÐ±ÐŸ 'Ruby'. ÐÑÐž ÐºÐŸÐŒÐ°ÐœÐŽÑ ÑÐ°ÐºÐ¶Ðµ ÐŽÐŸÑÑÑÐ¿ÐœÑ ÑÐµÑÐµÐ· ÐºÐŸÐœÑÐµÐºÑÑÐœÐŸÐµ ÐŒÐµÐœÑ. +ÐÐ°Ð¶Ð°ÑÐžÐµÐŒ ÐºÐ»Ð°Ð²ÐžÑÐž Tab Ð¿ÐŸÑÐ»Ðµ Ð²Ð²ÐµÐŽÑÐœÐœÐŸÐ³ÐŸ ÐºÑÑÐºÐ° ÑÐµÐºÑÑÐ° ÐŒÐŸÐ¶ÐœÐŸ Ð¿ÑÐŸÑÐŒÐŸÑÑÐµÑÑ ÑÐ¿ÐžÑÐŸÐº Ð²ÐŸÐ·ÐŒÐŸÐ¶ÐœÑÑ ÐŽÐŸÐ¿ÐŸÐ»ÐœÐµÐœÐžÐ¹. ÐÐ· ÑÑÐŸÐ³ÐŸ ÑÐ¿ÐžÑÐºÐ° ÐŒÐŸÐ¶ÐœÐŸ Ð²ÑÐ±ÑÐ°ÑÑ Ð¿ÐŸÐŽÑÐŸÐŽÑÑÐµÐµ ÐŽÐŸÐ¿ÐŸÐ»ÐœÐµÐœÐžÐµ. ÐÑÐ»Ðž ÐŽÐŸÑÑÑÐ¿ÐœÐŸ ÑÐŸÐ»ÑÐºÐŸ ÐŸÐŽÐœÐŸ ÐŽÐŸÐ¿ÐŸÐ»ÐœÐµÐœÐžÐµ, ÐŸÐœÐŸ Ð±ÑÐŽÐµÑ Ð²ÑÑÐ°Ð²Ð»ÐµÐœÐŸ Ð°Ð²ÑÐŸÐŒÐ°ÑÐžÑÐµÑÐºÐž. +Ð ÑÐµÐ¶ÐžÐŒÐµ Ð¿Ð°ÑÑÐžÐ²ÐœÐŸÐ¹ ÐŸÑÐ»Ð°ÐŽÐºÐž ÐŸÐ±ÐŸÐ»ÐŸÑÐºÐ° ÐŽÐŸÑÑÑÐ¿ÐœÐ° ÑÐŸÐ»ÑÐºÐŸ Ð¿ÐŸÑÐ»Ðµ ÑÐŸÐ³ÐŸ, ÐºÐ°Ðº ÐŸÑÐ»Ð°Ð¶ÐžÐ²Ð°ÐµÐŒÐ°Ñ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐ° Ð¿ÐŸÐŽÐºÐ»ÑÑÐžÑÑÑ Ðº IDE Ðž ÐŽÐŸ ÐµÑ Ð·Ð°Ð²ÐµÑÑÐµÐœÐžÑ. ÐÑÐŸ ÐŸÑÐŸÐ±ÑÐ°Ð¶Ð°ÐµÑÑÑ ÐžÐœÑÐŒ Ð¿ÑÐžÐ³Ð»Ð°ÑÐµÐœÐžÐµÐŒ Ðž ÐŽÑÑÐ³ÐžÐŒ Ð·Ð°Ð³ÐŸÐ»ÐŸÐ²ÐºÐŸÐŒ ÐŸÐºÐœÐ°.</translation> + </message> </context> <context> <name>ShortcutForm</name> @@ -14534,12 +14738,6 @@ <translation>ÐÑÐŸÑ ÑÐ¿ÐžÑÐŸÐº ÐŸÑÐŸÐ±ÑÐ°Ð¶Ð°ÐµÑ Ð²ÑÐµ Ð³ÐŸÑÑÑÐžÐµ ÐºÐ»Ð°Ð²ÐžÑÐž.</translation> </message> <message> - <source>Keyboard Shortcuts List -This list shows all keyboard shortcuts defined in the application. Double click an entry in order to change the respective shortcut.</source> - <translation>ÐÐ»Ð°Ð²ÐžÐ°ÑÑÑÐœÑÐµ ÑÑÐ»ÑÐºÐž -ÐÑÐŸÑ ÑÐ¿ÐžÑÐŸÐº Ð¿ÐŸÐºÐ°Ð·ÑÐ²Ð°ÐµÑ Ð²ÑÐµ Ð³ÐŸÑÑÑÐžÐµ ÐºÐ»Ð°Ð²ÐžÑÐž Ð² Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐµ. ÐÐ²ÐŸÐ¹ÐœÐŸÐ¹ ÑÐµÐ»ÑÐŸÐº Ð¿ÐŸ ÑÐ»ÐµÐŒÐµÐœÑÑ Ð¿ÐŸÐ·Ð²ÐŸÐ»ÑÐµÑ ÐµÐ³ÐŸ ÑÐµÐŽÐ°ÐºÑÐžÑÐŸÐ²Ð°ÑÑ.</translation> - </message> - <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -14567,6 +14765,12 @@ <source>name</source> <translation>ÐžÐŒÑ</translation> </message> + <message> + <source>Keyboard Shortcuts List +This list shows all keyboard shortcuts defined in the application. Double click an entry in order to change the respective shortcut. Alternatively, the shortcut might be changed by editing the key sequence in the respective column.</source> + <translation>ÐÐ»Ð°Ð²ÐžÐ°ÑÑÑÐœÑÐµ ÑÑÐ»ÑÐºÐž +ÐÑÐŸÑ ÑÐ¿ÐžÑÐŸÐº Ð¿ÐŸÐºÐ°Ð·ÑÐ²Ð°ÐµÑ Ð²ÑÐµ Ð³ÐŸÑÑÑÐžÐµ ÐºÐ»Ð°Ð²ÐžÑÐž Ð² Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐµ. ÐÐ²ÐŸÐ¹ÐœÐŸÐ¹ ÑÐµÐ»ÑÐŸÐº Ð¿ÐŸ ÑÐ»ÐµÐŒÐµÐœÑÑ Ð¿ÐŸÐ·Ð²ÐŸÐ»ÑÐµÑ ÐµÐ³ÐŸ ÑÐµÐŽÐ°ÐºÑÐžÑÐŸÐ²Ð°ÑÑ. ÐÐŸÑÑÑÑÑ ÐºÐ»Ð°Ð²ÐžÑÑ ÑÐ°ÐºÐ¶Ðµ ÐŒÐŸÐ¶ÐœÐŸ ÑÐµÐŽÐ°ÐºÑÐžÑÐŸÐ²Ð°ÑÑ, ÑÐµÐŽÐ°ÐºÑÐžÑÑÑ Ð¿ÐŸÑÐ»ÐµÐŽÐŸÐ²Ð°ÑÐµÐ»ÑÐœÐŸÑÑÑ ÐºÐ»Ð°Ð²ÐžÑ Ð² ÑÐŸÐŸÑÐ²ÐµÑÑÑÐ²ÑÑÑÐµÐ¹ ÐºÐŸÐ»ÐŸÐœÐºÐµ.</translation> + </message> </context> <context> <name>StartDialog</name> @@ -14793,7 +14997,7 @@ </message> <message> <source>Locked</source> - <translation>ÐÐ°Ð¿Ñ</translation> + <translation>ÐÐ°ÑÐ²Ð°ÑÐµÐœÐŸ</translation> </message> <message> <source>History</source> @@ -14919,6 +15123,10 @@ <source>Alt+O</source> <translation>Alt+O</translation> </message> + <message> + <source>Lock Info</source> + <translation>ÐÐœÑÐŸÑÐŒ. ÐŸ Ð·Ð°ÑÐ²Ð°ÑÐµ</translation> + </message> </context> <context> <name>Subversion</name> @@ -15062,6 +15270,22 @@ <source>The project could not be checked out of the repository. Restoring the original contents.</source> <translation>ÐÐµÐ²ÐŸÐ·ÐŒÐŸÐ¶ÐœÐŸ Ð·Ð°Ð³ÑÑÐ·ÐžÑÑ Ð¿ÑÐŸÐµÐºÑ ÐžÐ· ÑÐµÐ¿ÐŸÐ·ÐžÑÐŸÑÐžÑ. ÐÐŸÑÑÑÐ°ÐœÐ°Ð²Ð»ÐžÐ²Ð°Ñ Ð¿ÑÐµÐŽÑÐŽÑÑÐµÐµ ÑÐŸÐŽÐµÑÐ¶ÐžÐŒÐŸÐµ.</translation> </message> + <message> + <source>Subversion Log</source> + <translation>ÐÑÑÐœÐ°Ð» Subversion</translation> + </message> + <message> + <source>Select number of entries to show.</source> + <translation>ÐÐ°ÐŽÐ°Ð¹ÑÐµ ÐºÐŸÐ»ÐžÑÐµÑÑÐ²ÐŸ ÑÐ»ÐµÐŒÐµÐœÑÐŸÐ² ÐŽÐ»Ñ ÐŸÑÐŸÐ±ÑÐ°Ð¶ÐµÐœÐžÑ.</translation> + </message> + <message> + <source>Locking in the Subversion repository</source> + <translation>ÐÐ°ÑÐ²Ð°ÑÑÐ²Ð°Ñ ÑÐ°Ð¹Ð»/ÐºÐ°ÑÐ°Ð»ÐŸÐ³ Ð² ÑÐµÐ¿ÐŸÐ·ÐžÑÐŸÑÐžÐž Subversion</translation> + </message> + <message> + <source>Unlocking in the Subversion repository</source> + <translation>ÐÑÐ²ÐŸÐ±ÐŸÐ¶ÐŽÐ°Ñ ÑÐ°Ð¹Ð»/ÐºÐ°ÑÐ°Ð»ÐŸÐ³ Ð² ÑÐµÐ¿ÐŸÐ·ÐžÑÐŸÑÐžÐž Subversion</translation> + </message> </context> <context> <name>SvnCommandDialog</name> @@ -15562,6 +15786,26 @@ <source>Select all versioned directory entries</source> <translation>ÐÑÐŽÐµÐ»ÐžÑÑ Ð²ÑÐµ ÐºÐ°ÑÐ°Ð»ÐŸÐ³Ðž Ñ Ð²ÐµÑÑÐžÑÐŒÐž (VCS)</translation> </message> + <message> + <source>Show limited log</source> + <translation>ÐÐŸÐºÐ°Ð·Ð°ÑÑ ÐŸÐ³ÑÐ°ÐœÐžÑÐµÐœÐœÑÐ¹ Ð¶ÑÑÐœÐ°Ð»</translation> + </message> + <message> + <source>Lock</source> + <translation>ÐÐ°ÑÐ²Ð°ÑÐžÑÑ</translation> + </message> + <message> + <source>Unlock</source> + <translation>ÐÑÐ²ÐŸÐ±ÐŸÐŽÐžÑÑ</translation> + </message> + <message> + <source>Break Lock</source> + <translation>ÐÐ°ÑÑÑÐžÑÑ Ð·Ð°ÑÐ²Ð°Ñ</translation> + </message> + <message> + <source>Steal Lock</source> + <translation>Ð£ÐºÑÐ°ÑÑÑ Ð·Ð°ÑÐ²Ð°Ñ</translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -15948,6 +16192,18 @@ <translation>Ð£ÐŽÐ°Ð»ÐžÑÑ ÑÐ²ÐŸÐ¹ÑÑÐ²ÐŸ Ð£ÐŽÐ°Ð»ÑÐµÑ ÑÐ²ÐŸÐ¹ÑÑÐ²ÐŸ ÐŽÐ»Ñ ÑÐ°Ð¹Ð»ÐŸÐ² Ð¿ÑÐŸÐµÐºÑÐ°.</translation> </message> + <message> + <source>Show limited log</source> + <translation>ÐÐŸÐºÐ°Ð·Ð°ÑÑ ÐŸÐ³ÑÐ°ÐœÐžÑÐµÐœÐœÑÐ¹ Ð¶ÑÑÐœÐ°Ð»</translation> + </message> + <message> + <source>Show a limited log of the local project</source> + <translation>ÐÐŸÐºÐ°Ð·Ð°ÑÑ ÐŸÐ³ÑÐ°ÐœÐžÑÐµÐœÐœÑÐ¹ Ð¶ÑÑÐœÐ°Ð» ÐžÐ·ÐŒÐµÐœÐµÐœÐžÐ¹ Ð»ÐŸÐºÐ°Ð»ÑÐœÐŸÐ³ÐŸ Ð¿ÑÐŸÐµÐºÑÐ°</translation> + </message> + <message> + <source>Show limited logThis shows the log of the local project limited to a selectable number of entries.</source> + <translation>ÐÐŸÐºÐ°Ð·Ð°ÑÑ ÐŸÐ³ÑÐ°ÐœÐžÑÐµÐœÐœÑÐ¹ Ð¶ÑÑÐœÐ°Ð»ÐÑÐŸÐ±ÑÐ°Ð¶Ð°ÐµÑ Ð¶ÑÑÐœÐ°Ð» Ñ Ð·Ð°ÐŽÐ°ÐœÐœÑÐŒ ÐºÐŸÐ»ÐžÑÐµÑÑÐ²ÐŸÐŒ ÑÐ»ÐµÐŒÐµÐœÑÐŸÐ².</translation> + </message> </context> <context> <name>SvnPropListDialog</name> @@ -16056,6 +16312,62 @@ <source>There are no uncommitted changes available/selected.</source> <translation>ÐÐµÑ ÐŽÐŸÑÑÑÐ¿ÐœÑÑ/Ð²ÑÐ±ÑÐ°ÐœÐœÑÑ ÐœÐµÐŸÑÐ¿ÑÐ°Ð²Ð»ÐµÐœÐœÑÑ ÐžÐ·ÐŒÐµÐœÐµÐœÐžÐ¹.</translation> </message> + <message> + <source>Lock</source> + <translation>ÐÐ°ÑÐ²Ð°ÑÐžÑÑ</translation> + </message> + <message> + <source>Unlock</source> + <translation>ÐÑÐ²ÐŸÐ±ÐŸÐŽÐžÑÑ</translation> + </message> + <message> + <source>Break lock</source> + <translation>ÐÐ°ÑÑÑÐžÑÑ Ð·Ð°ÑÐ²Ð°Ñ</translation> + </message> + <message> + <source>Steal lock</source> + <translation>Ð£ÐºÑÐ°ÑÑÑ Ð·Ð°ÑÐ²Ð°Ñ</translation> + </message> + <message> + <source>locked</source> + <translation>Ð·Ð°ÑÐ²Ð°ÑÐµÐœÐŸ</translation> + </message> + <message> + <source>other lock</source> + <translation>ÐŽÑÑÐ³ÐŸÐ¹ Ð·Ð°ÑÐ²Ð°Ñ</translation> + </message> + <message> + <source>stolen lock</source> + <translation>Ð·Ð°ÑÐ²Ð°Ñ ÑÐºÑÐ°ÐŽÐµÐœ</translation> + </message> + <message> + <source>broken lock</source> + <translation>Ð·Ð°ÑÐ²Ð°Ñ ÐœÐ°ÑÑÑÐµÐœ</translation> + </message> + <message> + <source>not locked</source> + <translation>ÐœÐµ Ð·Ð°ÑÐ²Ð°ÑÐµÐœÐŸ</translation> + </message> + <message> + <source>replaced</source> + <translation>Ð·Ð°ÐŒÐµÐœÐµÐœÐŸ</translation> + </message> + <message> + <source>There are no unlocked files available/selected.</source> + <translation>ÐÐµÑ ÐŽÐŸÑÑÑÐ¿ÐœÑÑ/Ð²ÑÐ±ÑÐ°ÐœÐœÑÑ ÐœÐµÐ·Ð°ÑÐ²Ð°ÑÐµÐœÐœÑÑ ÑÐ°Ð¹Ð»ÐŸÐ².</translation> + </message> + <message> + <source>There are no locked files available/selected.</source> + <translation>ÐÐµÑ ÐŽÐŸÑÑÑÐ¿ÐœÑÑ/Ð²ÑÐ±ÑÐ°ÐœÐœÑÑ Ð·Ð°ÑÐ²Ð°ÑÐµÐœÐœÑÑ ÑÐ°Ð¹Ð»ÐŸÐ².</translation> + </message> + <message> + <source>Break Lock</source> + <translation>ÐÐ°ÑÑÑÐžÑÑ Ð·Ð°ÑÐ²Ð°Ñ</translation> + </message> + <message> + <source>Steal Lock</source> + <translation>Ð£ÐºÑÐ°ÑÑÑ Ð·Ð°ÑÐ²Ð°Ñ</translation> + </message> </context> <context> <name>SvnSwitchDialog</name> @@ -16609,22 +16921,6 @@ <source>Untitled %1</source> <translation>ÐÐµÐ· ÐžÐŒÐµÐœÐž - %1</translation> </message> - <message> - <source>Show next tab</source> - <translation>ÐÐŸÐºÐ°Ð·Ð°ÑÑ ÑÐ»ÐµÐŽÑÑÑÑÑ Ð·Ð°ÐºÐ»Ð°ÐŽÐºÑ</translation> - </message> - <message> - <source>Ctrl+Alt+Tab</source> - <translation>Ctrl+Alt+Tab</translation> - </message> - <message> - <source>Show previous tab</source> - <translation>ÐÐŸÐºÐ°Ð·Ð°ÑÑ Ð¿ÑÐµÐŽÑÐŽÑÑÑÑ Ð·Ð°ÐºÐ»Ð°ÐŽÐºÑ</translation> - </message> - <message> - <source>Shift+Ctrl+Alt+Tab</source> - <translation>Shift+Ctrl+Alt+Tab</translation> - </message> </context> <context> <name>TagBranchListForm</name> @@ -17139,6 +17435,26 @@ ÐÑÐ»Ðž Ð²Ñ ÑÐŸÑÐžÑÐµ Ð·Ð°ÐŒÐµÐœÐžÑÑ ÐŸÐ³ÑÐ°ÐœÐžÑÐžÐ²Ð°ÑÑÐžÐ¹ ÑÐžÐŒÐ²ÐŸÐ» Ñ '$' ÐœÐ° ÐºÐ°ÐºÐŸÐ¹-Ð»ÐžÐ±ÐŸ ÐŽÑÑÐ³ÐŸÐ¹, Ð²ÐŸÑÐ¿ÐŸÐ»ÑÐ·ÑÐ¹ÑÐµÑÑ ÐŽÐžÐ°Ð»ÐŸÐ³ÐŸÐŒ ÐºÐŸÐœÑÐžÐ³ÑÑÐ°ÑÐžÐž.</translation> </message> + <message> + <source>Bash</source> + <translation>Bash</translation> + </message> + <message> + <source>Batch</source> + <translation>ÐÐ°ÐºÐµÑÐœÑÐ¹</translation> + </message> + <message> + <source>Makefile</source> + <translation>Makefile</translation> + </message> + <message> + <source>Properties</source> + <translation>Ð¡Ð²ÐŸÐ¹ÑÑÐ²Ð°</translation> + </message> + <message> + <source>TeX</source> + <translation>TeX</translation> + </message> </context> <context> <name>TemplatePropertiesForm</name> @@ -19297,6 +19613,134 @@ <source>The templates file %1 has an unsupported format.</source> <translation>Ð€Ð°Ð¹Ð» ÑÐ°Ð±Ð»ÐŸÐœÐŸÐ² %1 Ð² ÐœÐµÐ¿ÐŸÐŽÐŽÐµÑÐ¶ÐžÐ²Ð°ÐµÐŒÐŸÐŒ ÑÐŸÑÐŒÐ°ÑÐµ.</translation> </message> + <message> + <source>Activate Project-Browser</source> + <translation>ÐÐºÑÐžÐ²ÐžÐ·ÐžÑÐŸÐ²Ð°ÑÑ ÐÑÐŸÑÐŒÐŸÑÑÑÐžÐº Ð¿ÑÐŸÐµÐºÑÐ°</translation> + </message> + <message> + <source>Alt+Shift+P</source> + <translation>Alt+Shift+P</translation> + </message> + <message> + <source>Activate Debug-Browser</source> + <translation>ÐÐºÑÐžÐ²ÐžÐ·ÐžÑÐŸÐ²Ð°ÑÑ ÐÑÐŸÑÐŒÐŸÑÑÑÐžÐº ÐŸÑÐ»Ð°ÐŽÐºÐž</translation> + </message> + <message> + <source>Alt+Shift+D</source> + <translation>Alt+Shift+D</translation> + </message> + <message> + <source>Activate Shell</source> + <translation>ÐÐºÑÐžÐ²ÐžÐ·ÐžÑÐŸÐ²Ð°ÑÑ ÐÐ±ÐŸÐ»ÐŸÑÐºÑ</translation> + </message> + <message> + <source>Alt+Shift+S</source> + <translation>Alt+Shift+S</translation> + </message> + <message> + <source>Activate File-Browser</source> + <translation>ÐÐºÑÐžÐ²ÐžÐ·ÐžÑÐŸÐ²Ð°ÑÑ ÐÑÐŸÑÐŒÐŸÑÑÑÐžÐº ÑÐ°Ð¹Ð»ÐŸÐ²</translation> + </message> + <message> + <source>Alt+Shift+F</source> + <translation>Alt+Shift+F</translation> + </message> + <message> + <source>Activate Log-Viewer</source> + <translation>ÐÐºÑÐžÐ²ÐžÐ·ÐžÑÐŸÐ²Ð°ÑÑ ÐÑÐŸÑÐŒÐŸÑÑÑÐžÐº Ð¶ÑÑÐœÐ°Ð»Ð°</translation> + </message> + <message> + <source>Activate Task-Viewer</source> + <translation>ÐÐºÑÐžÐ²ÐžÐ·ÐžÑÐŸÐ²Ð°ÑÑ ÐÑÐŸÑÐŒÐŸÑÑÑÐžÐº Ð·Ð°ÐŽÐ°Ñ</translation> + </message> + <message> + <source>Alt+Shift+T</source> + <translation>Alt+Shift+T</translation> + </message> + <message> + <source>Activate Template-Viewer</source> + <translation>ÐÐºÑÐžÐ²ÐžÐ·ÐžÑÐŸÐ²Ð°ÑÑ ÐÑÐŸÑÐŒÐŸÑÑÑÐžÐº ÑÐ°Ð±Ð»ÐŸÐœÐŸÐ²</translation> + </message> + <message> + <source>Alt+Shift+M</source> + <translation>Alt+Shift+M</translation> + </message> + <message> + <source>Activate current editor</source> + <translation>ÐÐºÑÐžÐ²ÐžÐ·ÐžÑÐŸÐ²Ð°ÑÑ ÑÐµÐºÑÑÐžÐ¹ ÑÐµÐŽÐ°ÐºÑÐŸÑ</translation> + </message> + <message> + <source>Alt+Shift+E</source> + <translation>Alt+Shift+E</translation> + </message> + <message> + <source>Show next tab</source> + <translation>ÐÐŸÐºÐ°Ð·Ð°ÑÑ ÑÐ»ÐµÐŽÑÑÑÑÑ Ð·Ð°ÐºÐ»Ð°ÐŽÐºÑ</translation> + </message> + <message> + <source>Ctrl+Alt+Tab</source> + <translation>Ctrl+Alt+Tab</translation> + </message> + <message> + <source>Show previous tab</source> + <translation>ÐÐŸÐºÐ°Ð·Ð°ÑÑ Ð¿ÑÐµÐŽÑÐŽÑÑÑÑ Ð·Ð°ÐºÐ»Ð°ÐŽÐºÑ</translation> + </message> + <message> + <source>Shift+Ctrl+Alt+Tab</source> + <translation>Shift+Ctrl+Alt+Tab</translation> + </message> + <message> + <source>Alt+Shift+G</source> + <translation>Alt+Shift+G</translation> + </message> + <message> + <source>Qt-Designer 4</source> + <translation>Qt-ÐÐžÐ·Ð°Ð¹ÐœÐµÑ 4</translation> + </message> + <message> + <source>Designer 4...</source> + <translation>ÐÐžÐ·Ð°Ð¹ÐœÐµÑ 4...</translation> + </message> + <message> + <source>Start Qt-Designer 4</source> + <translation>ÐÐ°Ð¿ÑÑÑÐžÑÑ Qt-ÐÐžÐ·Ð°Ð¹ÐœÐµÑ 4</translation> + </message> + <message> + <source>Qt-Designer 4Start Qt-Designer 4.</source> + <translation>Qt-ÐÐžÐ·Ð°Ð¹ÐœÐµÑ 4ÐÐ°Ð¿ÑÑÑÐžÑÑ Qt-ÐÐžÐ·Ð°Ð¹ÐœÐµÑ 4.</translation> + </message> + <message> + <source>Qt-Linguist 4</source> + <translation>Qt-ÐÐžÐœÐ³Ð²ÐžÑÑ 4</translation> + </message> + <message> + <source>Linguist 4...</source> + <translation>ÐÐžÐœÐ³Ð²ÐžÑÑ 4...</translation> + </message> + <message> + <source>Start Qt-Linguist 4</source> + <translation>ÐÐ°Ð¿ÑÑÑÐžÑÑ Qt-ÐÐžÐœÐ³Ð²ÐžÑÑ 4</translation> + </message> + <message> + <source>Qt-Linguist 4Start Qt-Linguist 4.</source> + <translation>Qt-ÐÐžÐœÐ³Ð²ÐžÑÑ 4ÐÐ°Ð¿ÑÑÑÐžÑÑ Qt-ÐÐžÐœÐ³Ð²ÐžÑÑ 4.</translation> + </message> + <message> + <source>Qt4 Documentation</source> + <translation>ÐÐŸÐºÑÐŒÐµÐœÑÐ°ÑÐžÑ Qt4</translation> + </message> + <message> + <source>Qt&4 Documentation</source> + <translation>ÐÐŸÐºÑÐŒÐµÐœÑÐ°ÑÐžÑ Qt&4</translation> + </message> + <message> + <source>Open Qt4 Documentation</source> + <translation>ÐÑÐºÑÑÑÑ ÐŽÐŸÐºÑÐŒÐµÐœÑÐ°ÑÐžÑ Qt4</translation> + </message> + <message> + <source>Qt4 DocumentationDisplay the Qt4 Documentation with Qt Assistant. </source> + <translation>ÐÐŸÐºÑÐŒÐµÐœÑÐ°ÑÐžÑ Qt4ÐÐŸÐºÐ°Ð·Ð°ÑÑ ÐŽÐŸÐºÑÐŒÐµÐœÑÐ°ÑÐžÑ Qt4 Ñ Ð¿ÐŸÐŒÐŸÑÑÑ Qt Assistant.</translation> + </message> </context> <context> <name>Utilities</name> @@ -19509,13 +19953,6 @@ </message> </context> <context> - <name>VariablesFilterDialog</name> - <message> - <source>%1 - Variables Filter</source> - <translation>%1 - Ð€ÐžÐ»ÑÑÑ Ð¿ÐµÑÐµÐŒÐµÐœÐœÑÑ</translation> - </message> -</context> -<context> <name>VariablesFilterForm</name> <message> <source><h2>Filter Dialog</h2> @@ -21466,10 +21903,6 @@ <translation>Shift+Backspace</translation> </message> <message> - <source>Shift+Return</source> - <translation>Shift+Return</translation> - </message> - <message> <source>CTRL+SHIFT+Z</source> <comment>Edit|Redo</comment> <translation>CTRL+SHIFT+Z</translation> @@ -21571,6 +22004,88 @@ <source>Python Files (*.py);;Pyrex Files (*.pyx);;Quixote Template Files (*.ptl);;Ruby Files (*.rb);;IDL Files (*.idl);;C Files (*.h *.c);;C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc);;C# Files (*.cs);;HTML Files (*.html *.htm *.asp *.shtml);;CSS Files (*.css);;PHP Files (*.php *.php3 *.php4 *.php5 *.phtml);;XML Files (*.xml *.xsl *.xslt *.dtd);;Java Files (*.java);;JavaScript Files (*.js);;SQL Files (*.sql);;Docbook Files (*.docbook);;Perl Files (*.pl *.pm *.ph);;Lua Files (*.lua);;Tex Files (*.tex *.sty *.aux *.toc *.idx);;Shell Files (*.sh);;Batch Files (*.bat *.cmd);;Diff Files (*.diff *.patch);;Makefiles (*.mak);;Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc);;All Files (*)</source> <translation>ÐÑÑÐŸÐŽÐœÐžÐºÐž ÐœÐ° Python (*.py);;ÐÑÑÐŸÐŽÐœÐžÐºÐž ÐœÐ° Pyrex (*.pyx);;ÐšÐ°Ð±Ð»ÐŸÐœÑ Quixote (*.ptl);;ÐÑÑÐŸÐŽÐœÐžÐºÐž ÐœÐ° Ruby (*.rb);;ÐÐœÑÐµÑÑÐµÐ¹ÑÑ IDL (*.idl);;ÐÑÑÐŸÐŽÐœÐžÐºÐž ÐœÐ° C (*.h *.c);;ÐÑÑÐŸÐŽÐœÐžÐºÐž ÐœÐ° C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc);;ÐÑÑÐŸÐŽÐœÐžÐºÐž ÐœÐ° C# (*.cs);;Ð€Ð°Ð¹Ð»Ñ ÑÐ°Ð·ÐŒÐµÑÐºÐž HTML (*.html *.htm *.asp *.shtml);;Ð¡ÑÐžÐ»Ðž CSS (*.css);;ÐÑÑÐŸÐŽÐœÐžÐºÐž ÐœÐ° PHP (*.php);;Ð Ð°Ð·ÐŒÐµÑÐºÐ° XML (*.xml *.xsl *.xslt *.dtd);;ÐÑÑÐŸÐŽÐœÐžÐºÐž ÐœÐ° Java (*.java);;ÐÑÑÐŸÐŽÐœÐžÐºÐž ÐœÐ° JavaScript (*.js);;Ð€Ð°Ð¹Ð»Ñ Ð·Ð°Ð¿ÑÐŸÑÐŸÐ² SQL (*.sql);;Ð€Ð°Ð¹Ð»Ñ ÑÐ°Ð·ÐŒÐµÑÐºÐž Docbook (*.docbook);;ÐÑÑÐŸÐŽÐœÐžÐºÐž ÐœÐ° Perl (*.pl *.pm *.ph);;ÐÑÑÐŸÐŽÐœÐžÐºÐž ÐœÐ° Lua (*.lua);;Ð Ð°Ð·ÐŒÐµÑÐºÐ° TeX (*.tex *.sty *.aux *.toc *.idx);;Ð€Ð°Ð¹Ð»Ñ ÑÑÐµÐœÐ°ÑÐžÐµÐ² Shell (*.sh);;ÐÐ°ÐºÐµÑÐœÑÐµ ÑÐ°Ð¹Ð»Ñ (*.bat *.cmd);;Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÑ ÑÑÐ°Ð²ÐœÐµÐœÐžÑ (*.diff *.patch);;Ð¡ÑÐµÐœÐ°ÑÐžÐž ÑÐ±ÐŸÑ ÐºÐž (*.mak);;Ð€Ð°Ð¹Ð»Ñ ÑÐ²ÐŸÐ¹ÑÑÐ² (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc);;ÐÑÐµ ÑÐ°Ð¹Ð»Ñ (*)</translation> </message> + <message> + <source>Smart indent</source> + <translation>Ð£ÐŒÐœÑÐµ ÐŸÑÑÑÑÐ¿Ñ</translation> + </message> + <message> + <source>CTRL+ALT+I</source> + <comment>Edit|Smart indent</comment> + <translation>CTRL+ALT+I</translation> + </message> + <message> + <source>Smart indent Line or Selection</source> + <translation>Ð€ÐŸÑÐŒÐ°ÑÐžÑÐŸÐ²Ð°ÑÑ ÑÑÑÐŸÐºÑ ÐžÐ»Ðž Ð²ÑÐŽÐµÐ»ÐµÐœÐžÐµ ÑÐŒÐœÑÐŒÐž ÐŸÑÑÑÑÐ¿Ð°ÐŒÐž</translation> + </message> + <message> + <source>Smart indentIndents the current line or the lines of the current selection smartly.</source> + <translation>Ð£ÐŒÐœÑÐµ ÐŸÑÑÑÑÐ¿ÑÐ Ð°ÑÑÑÐ°Ð²ÐžÑÑ ÐŸÑÑÑÑÐ¿Ñ ÐŽÐ»Ñ Ð²ÑÐ±ÑÐ°ÐœÐœÐŸÐ¹ ÑÑÑÐŸÐºÐž (ÑÑÑÐŸÐº) Ñ Ð¿ÐŸÐŒÐŸÑÑÑ ÑÐŒÐœÐŸÐ³ÐŸ Ð°Ð»Ð³ÐŸÑÐžÑÐŒÐ°.</translation> + </message> + <message> + <source>CTRL++</source> + <comment>View|Zoom in</comment> + <translation>CTRL++</translation> + </message> + <message> + <source>CTRL+-</source> + <comment>View|Zoom out</comment> + <translation>CTRL+-</translation> + </message> + <message> + <source>Next split</source> + <translation>Ð¡Ð»ÐµÐŽÑÑÑÐžÐ¹ ÑÐ°Ð·ÐŽÐµÐ»ÐžÑÐµÐ»Ñ</translation> + </message> + <message> + <source>&Next split</source> + <translation>&Ð¡Ð»ÐµÐŽÑÑÑÐžÐ¹ ÑÐ°Ð·ÐŽÐµÐ»ÐžÑÐµÐ»Ñ</translation> + </message> + <message> + <source>CTRL+Alt+N</source> + <comment>View|Next split</comment> + <translation>CTRL+Alt+N</translation> + </message> + <message> + <source>Move to the next split</source> + <translation>ÐÐµÑÐµÐŒÐµÑÑÐžÑÑÑÑ ÐœÐ° ÑÐ»ÐµÐŽÑÑÑÐžÐ¹ ÑÐ°Ð·ÐŽÐµÐ»ÐžÑÐµÐ»Ñ</translation> + </message> + <message> + <source>Next splitMove to the next split.</source> + <translation>Ð¡Ð»ÐµÐŽÑÑÑÐžÐ¹ ÑÐ°Ð·ÐŽÐµÐ»ÐžÑÐµÐ»ÑÐÐµÑÐµÐŒÐµÑÑÐžÑÑÑÑ ÐœÐ° ÑÐ»ÐµÐŽÑÑÑÐžÐ¹ ÑÐ°Ð·ÐŽÐµÐ»ÐžÑÐµÐ»Ñ.</translation> + </message> + <message> + <source>Previous split</source> + <translation>ÐÑÐµÐŽÑÐŽÑÑÐžÐ¹ ÑÐ°Ð·ÐŽÐµÐ»ÐžÑÐµÐ»Ñ</translation> + </message> + <message> + <source>&Previous split</source> + <translation>&ÐÑÐµÐŽÑÐŽÑÑÐžÐ¹ ÑÐ°Ð·ÐŽÐµÐ»ÐžÑÐµÐ»Ñ</translation> + </message> + <message> + <source>CTRL+Alt+P</source> + <comment>View|Previous split</comment> + <translation>CTRL+Alt+P</translation> + </message> + <message> + <source>Move to the previous split</source> + <translation>ÐÐµÑÐµÐŒÐµÑÑÐžÑÑÑÑ ÐœÐ° Ð¿ÑÐµÐŽÑÐŽÑÑÐžÐ¹ ÑÐ°Ð·ÐŽÐµÐ»ÐžÑÐµÐ»Ñ</translation> + </message> + <message> + <source>Previous splitMove to the previous split.</source> + <translation>ÐÑÐµÐŽÑÐŽÑÑÐžÐ¹ ÑÐ°Ð·ÐŽÐµÐ»ÐžÑÐµÐ»ÑÐÐµÑÐµÐŒÐµÑÑÐžÑÑÑÑ ÐœÐ° Ð¿ÑÐµÐŽÑÐŽÑÑÐžÐ¹ ÑÐ°Ð·ÐŽÐµÐ»ÐžÑÐµÐ»Ñ.</translation> + </message> + <message> + <source>Ctrl+U</source> + <translation>Ctrl+U</translation> + </message> + <message> + <source>F3</source> + <comment>Search|Search</comment> + <translation>F3</translation> + </message> + <message> + <source>Enter</source> + <translation>ÐÐ²ÐŸÐŽ</translation> + </message> </context> <context> <name>ViewProfileDialog</name> @@ -21761,6 +22276,14 @@ <source>A watchpoint with the condition '%1' for the variable %2 already exists.</source> <translation>Ð¢ÐŸÑÐºÐ° Ð¿ÑÐŸÑÐŒÐŸÑÑÐ° Ñ ÑÑÐ»ÐŸÐ²ÐžÐµÐŒ '%1' ÐŽÐ»Ñ Ð¿ÐµÑÐµÐŒÐµÐœÐœÐŸÐ¹ %2 ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ.</translation> </message> + <message> + <source>Watchpoint Condition Error</source> + <translation>ÐÑÐžÐ±ÐºÐ° Ð² ÑÑÐ»ÐŸÐ²ÐžÑÑ ÑÐŸÑÐºÐž Ð¿ÑÐŸÑÐŒÐŸÑÑÐ°</translation> + </message> + <message> + <source>The watchpoint condition %1 contains a syntax error.</source> + <translation>Ð£ÑÐ»ÐŸÐ²ÐžÐµ ÑÐŸÑÐºÐž Ð¿ÑÐŸÑÐŒÐŸÑÑÐ° %1 ÑÐŸÐŽÐµÑÐ¶ÐžÑ ÑÐžÐœÑÐ°ÐºÑÐžÑÐµÑÐºÑÑ ÐŸÑÐžÐ±ÐºÑ.</translation> + </message> </context> <context> <name>WidgetView</name> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric-3.8.1/install-i18n.py new/eric-3.9.0/install-i18n.py --- old/eric-3.8.1/install-i18n.py 2005-12-18 15:26:25.000000000 +0100 +++ new/eric-3.9.0/install-i18n.py 2006-04-30 12:52:44.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2005 Detlev Offenbach <detlev(a)die-offenbachs.de> +# Copyright (c) 2004 - 2006 Detlev Offenbach <detlev(a)die-offenbachs.de> # # This is the install script for eric3's translation files. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit digikamimageplugins
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package digikamimageplugins checked in at Wed May 17 18:49:41 CEST 2006. -------- --- KDE/digikamimageplugins/digikamimageplugins.changes 2006-01-25 21:32:52.000000000 +0100 +++ digikamimageplugins/digikamimageplugins.changes 2006-05-17 13:04:31.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Feb 15 15:35:10 CET 2006 - stbinner(a)suse.de + +- update to version 0.8.1 + * add new iconset + * fixed several memory leaks + * don't render preview effect if final rendering is still in progress + * whitebalance: fix wrong memory access, fix color gradient color + +------------------------------------------------------------------- Old: ---- digikamimageplugins-0.8.0.tar.bz2 New: ---- digikamimageplugins-0.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikamimageplugins.spec ++++++ --- /var/tmp/diff_new_pack.nqtAzb/_old 2006-05-17 18:49:19.000000000 +0200 +++ /var/tmp/diff_new_pack.nqtAzb/_new 2006-05-17 18:49:19.000000000 +0200 @@ -1,11 +1,11 @@ # -# spec file for package digikamimageplugins (Version 0.8.0) +# spec file for package digikamimageplugins (Version 0.8.1) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -15,7 +15,7 @@ License: GPL Group: Productivity/Graphics/Bitmap Editors Summary: Image Manipulation Plug-Ins -Version: 0.8.0 +Version: 0.8.1 Release: 2 %define rversion %version URL: http://extragear.kde.org/apps/digikamimageplugins/ @@ -96,6 +96,12 @@ /opt/kde3/share/services/*.desktop %changelog -n digikamimageplugins +* Wed Feb 15 2006 - stbinner(a)suse.de +- update to version 0.8.1 + * add new iconset + * fixed several memory leaks + * don't render preview effect if final rendering is still in progress + * whitebalance: fix wrong memory access, fix color gradient color * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Nov 30 2005 - stbinner(a)suse.de ++++++ digikamimageplugins-0.8.0.tar.bz2 -> digikamimageplugins-0.8.1.tar.bz2 ++++++ ++++ 37875 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit dbxml
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package dbxml checked in at Wed May 17 18:48:09 CEST 2006. -------- --- dbxml/dbxml.changes 2006-02-06 17:27:17.000000000 +0100 +++ dbxml/dbxml.changes 2006-05-17 15:07:58.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 15:07:42 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbxml.spec ++++++ --- /var/tmp/diff_new_pack.rNXChe/_old 2006-05-17 18:46:23.000000000 +0200 +++ /var/tmp/diff_new_pack.rNXChe/_new 2006-05-17 18:46:23.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -21,7 +21,7 @@ %define xerces_cvs_version 2_7_0 Summary: Berkeley DB XML Version: 2.2.13 -Release: 2 +Release: 15 Source0: dbxml-%{dbxml_version}.tar.bz2 Source1: db-%{db_version}.tar.bz2 Source2: xerces-c-src_%{xerces_cvs_version}.tar.bz2 @@ -105,7 +105,7 @@ %package -n db-java Summary: Java Bindings for the Berkeley DB Version: 4.3.29 -Release: 4 +Release: 17 URL: http://www.sleepycat.com/products/xml.shtml License: BSD Group: Productivity/Databases/Servers @@ -128,7 +128,7 @@ %package -n libpathan Summary: Pathan Provides an XPath Parsing and Evaluation API Version: 2_2.2.13.dbxml -Release: 2 +Release: 15 URL: http://software.decisionsoft.com/pathan1Info.html License: BSD Group: Development/Languages/C and C++ @@ -150,7 +150,7 @@ %package -n libpathan-devel Summary: Include Files and Libraries mandatory for Development Version: 2_2.2.13.dbxml -Release: 2 +Release: 15 Group: Development/Languages/C and C++ Requires: Xerces-c-devel >= %{xerces_c_version} Requires: libpathan = %{version} @@ -171,7 +171,7 @@ %package -n libxquery Summary: Library Conforming with XQuery Version: 1.2.0 -Release: 3 +Release: 16 Url: http://www.sleepycat.com/products/xml.shtml License: BSD Group: Development/Libraries/C and C++ @@ -187,7 +187,7 @@ Summary: Library Conforming with XQuery Group: Development/Libraries/C and C++ Version: 1.2.0 -Release: 3 +Release: 16 Requires: libpathan-devel >= %{pathan_version} Requires: libpathan >= %{pathan_version} Requires: Xerces-c-devel >= %{xerces_c_version} @@ -496,7 +496,7 @@ pushd %{DBXMLROOT} cd build_unix make install prefix=%{dbxml_build_root}/%{prefix} libdir=%{dbxml_build_root}/%{_libdir} \ - docdir=$RPM_BUILD_ROOT/%{_defaultdocdir}/dbxml + docdir=$RPM_BUILD_ROOT/%{_defaultdocdir}/dbxml strip=true cd .. # removes windows batch files cp -a LICENSE README examples $RPM_BUILD_ROOT/%{_defaultdocdir}/dbxml @@ -602,6 +602,8 @@ rm -rf $RPM_BUILD_ROOT %changelog -n dbxml +* Wed May 17 2006 - schwab(a)suse.de +- Don't strip binaries. * Mon Feb 06 2006 - dbornkessel(a)suse.de - replaced macro containing a forbidden '-' with a valid macro (xerces-c_version -> xerces_c_version) ... this created an invalid ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit compiz
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package compiz checked in at Wed May 17 18:45:35 CEST 2006. -------- --- compiz/compiz.changes 2006-05-14 14:02:01.000000000 +0200 +++ compiz/compiz.changes 2006-05-17 13:37:43.000000000 +0200 @@ -1,0 +2,25 @@ +Wed May 17 13:19:50 CEST 2006 - dreveman(a)suse.de + +- New compiz snapshot, compiz-restart.diff no longer needed. +- Icon support in scale plugin. (bnc 174788) +- Fix key-bindings in scale plugin. +- Fix window position issue when transitioning to withdrawn state. +- Add "minimal" option to gnome-window-decorator so it can be used + when running the login manager. (bnc 173901) +- Fix issue that caused switcher window to lose decorations + when some window is unmapped. + +------------------------------------------------------------------- +Wed May 17 06:43:51 CEST 2006 - danw(a)suse.de + +- Add compiz-restart.diff to make sure all pending MapRequest + events are processed before compiz exits, to fix 175558 + (panel doesn't show up if you explicitly start compiz from + gnome-session-properties). +- Update gnome-xgl-settings tarball to 0.5, incorporating + xgl-settings-options.diff, adding code to run SaX2 in certain + cases, syncing strings to the versions sent for translation, + adding cube keybinding editors, and fixing the logout-request + to explicitly request a logout rather than a reboot or shutdown. + +------------------------------------------------------------------- Old: ---- xgl-settings-0.4.tar.gz xgl-settings-options.diff New: ---- gnome-xgl-settings-0.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.KYQvdl/_old 2006-05-17 18:43:53.000000000 +0200 +++ /var/tmp/diff_new_pack.KYQvdl/_new 2006-05-17 18:43:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package compiz (Version cvs_060514) +# spec file for package compiz (Version cvs_060517) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,7 +17,7 @@ PreReq: %fillup_prereq Requires: libpng libdrm gconf2 gtk2 gnome-desktop control-center2 libsvg libsvg-cairo libwnck Autoreqprov: on -Version: cvs_060514 +Version: cvs_060517 Release: 1 Summary: OpenGL window and compositing manager. BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -25,11 +25,10 @@ ### /bin/ls *.tar.{gz,bz2} 2>/dev/null|perl -ne 'print "Source$n: ".$_; $n++;' Source: Mesa-CVS-20060502.tar.bz2 Source1: compiz-0.0.10.tar.bz2 -Source2: xgl-settings-0.4.tar.gz +Source2: gnome-xgl-settings-0.5.tar.gz ### /bin/ls *.{diff,patch} | perl -ne 'print "Patch$n: ".$_; $n++;' Patch: Mesa-6.4.1-x86_64-fixes-1.patch Patch1: Mesa-configs.diff -Patch2: xgl-settings-options.diff %description Compiz is an OpenGL compositing manager that use @@ -50,7 +49,6 @@ %setup -q -n . -D -T -b 0 -b 1 -b 2 patch -d Mesa -p0 < $RPM_SOURCE_DIR/Mesa-6.4.1-x86_64-fixes-1.patch patch -d Mesa -p0 < $RPM_SOURCE_DIR/Mesa-configs.diff -patch -d xgl-set* -p0 < $RPM_SOURCE_DIR/xgl-settings-options.diff %build PREFIX=/usr @@ -90,9 +88,9 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL popd # -##### xgl-settings +##### gnome-xgl-settings # -pushd xgl-settings-* || exit 1 +pushd gnome-xgl-settings-* || exit 1 ./configure --prefix=/opt/gnome make DESTDIR=$RPM_BUILD_ROOT install || exit 1 popd @@ -127,14 +125,34 @@ /opt/gnome/bin/gnome-xgl-info /opt/gnome/bin/gnome-xgl-switch /opt/gnome/share/applications/gnome-xgl-settings.desktop -/opt/gnome/share/control-center-2.0/icons/xgl-settings-capplet.svg -/opt/gnome/share/control-center-2.0/icons/xgl-icon-16.png -/opt/gnome/share/control-center-2.0/icons/xgl-icon-22.png -/opt/gnome/share/control-center-2.0/interfaces/gnome-xgl-settings.glade +%dir /opt/gnome/share/gnome-xgl-settings +/opt/gnome/share/gnome-xgl-settings/xgl-settings-capplet.svg +/opt/gnome/share/gnome-xgl-settings/xgl-icon-16.png +/opt/gnome/share/gnome-xgl-settings/xgl-icon-22.png +/opt/gnome/share/gnome-xgl-settings/gnome-xgl-settings.glade /opt/gnome/share/pixmaps/xgl-settings-capplet.svg /etc/opt/gnome/gconf/schemas/compiz.schemas %changelog -n compiz +* Wed May 17 2006 - dreveman(a)suse.de +- New compiz snapshot, compiz-restart.diff no longer needed. +- Icon support in scale plugin. (bnc 174788) +- Fix key-bindings in scale plugin. +- Fix window position issue when transitioning to withdrawn state. +- Add "minimal" option to gnome-window-decorator so it can be used + when running the login manager. (bnc 173901) +- Fix issue that caused switcher window to lose decorations + when some window is unmapped. +* Wed May 17 2006 - danw(a)suse.de +- Add compiz-restart.diff to make sure all pending MapRequest + events are processed before compiz exits, to fix 175558 + (panel doesn't show up if you explicitly start compiz from + gnome-session-properties). +- Update gnome-xgl-settings tarball to 0.5, incorporating + xgl-settings-options.diff, adding code to run SaX2 in certain + cases, syncing strings to the versions sent for translation, + adding cube keybinding editors, and fixing the logout-request + to explicitly request a logout rather than a reboot or shutdown. * Sun May 14 2006 - dreveman(a)suse.de - Fix issue that caused some windows to not be unmapped correctly. Most noticeable on tooltips. ++++++ compiz-0.0.10.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/ChangeLog new/compiz-0.0.10/ChangeLog --- old/compiz-0.0.10/ChangeLog 2006-05-14 13:34:48.000000000 +0200 +++ new/compiz-0.0.10/ChangeLog 2006-05-17 12:50:25.000000000 +0200 @@ -1,3 +1,36 @@ +2006-05-17 David Reveman <davidr(a)novell.com> + + * plugins/compiz.schemas.in.in: Regen (Overlay Icon). + + * plugins/switcher.c (switchPaintScreen): Don't remove switcher + from window list, just temporarily mark it as destroyed. This fixes + issue with switcher decorations disappearing when some window is + unmapped. + + * src/screen.c (updateDefaultIcon): width and height should be + unsigned. + + * gnome/window-decorator/gnome-window-decorator.c: Add minimal + option that can be used to run g-w-d with drop-shadows but without full + window decorations. + + * plugins/minimize.c (minHandleEvent): Restore window position + when transitioning to withdrawn state. + + * plugins/scale.c: Remove next_window binding and fix so that arrow + keys can be used to select window. + Focus new window when pointer enter window decorations and sloppy focus + is used. + Remove scaleSelectWindow. + + * plugins/scale.c: Icon support (Nat Friedman). + +2006-05-17 Dan Winship <danw(a)novell.com> + + * src/display.c (handleSelectionClear, eventLoop): don't process + exit-on-selection-clear until the event queue is empty, or else + MapRequest and ConfigureRequest events could get lost. bnc 175558 + 2006-05-14 David Reveman <davidr(a)novell.com> * src/event.c (handleEvent): mapNum might be 0 if we found the window diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/gnome/window-decorator/gnome-window-decorator.c new/compiz-0.0.10/gnome/window-decorator/gnome-window-decorator.c --- old/compiz-0.0.10/gnome/window-decorator/gnome-window-decorator.c 2006-05-11 18:14:26.000000000 +0200 +++ new/compiz-0.0.10/gnome/window-decorator/gnome-window-decorator.c 2006-05-17 12:25:17.000000000 +0200 @@ -158,6 +158,8 @@ cairo_matrix_t m; } quad; +static gboolean minimal = FALSE; + static double decoration_alpha = 0.5; static extents _shadow_extents = { 0, 0, 0, 0 }; @@ -2092,7 +2094,7 @@ Window xroot; GdkDisplay *gdkdisplay = gdk_display_get_default (); Display *xdisplay = gdk_x11_display_get_xdisplay (gdkdisplay); - Atom atom; + Atom bareAtom, normalAtom, activeAtom; decor_t d; gint nQuad; quad quads[N_QUADS_MAX]; @@ -2100,7 +2102,10 @@ xroot = RootWindowOfScreen (gdk_x11_screen_get_xscreen (screen)); - atom = XInternAtom (xdisplay, "_NET_WINDOW_DECOR_BARE", FALSE); + bareAtom = XInternAtom (xdisplay, "_NET_WINDOW_DECOR_BARE", FALSE); + normalAtom = XInternAtom (xdisplay, "_NET_WINDOW_DECOR_NORMAL", FALSE); + activeAtom = XInternAtom (xdisplay, "_NET_WINDOW_DECOR_ACTIVE", FALSE); + if (shadow_pixmap) { int width, height; @@ -2113,16 +2118,39 @@ &_shadow_extents, 0, 0, quads, nQuad); XChangeProperty (xdisplay, xroot, - atom, + bareAtom, XA_INTEGER, 32, PropModeReplace, (guchar *) data, 7 + 9 * nQuad); + + if (minimal) + { + XChangeProperty (xdisplay, xroot, + normalAtom, + XA_INTEGER, + 32, PropModeReplace, (guchar *) data, + 7 + 9 * nQuad); + XChangeProperty (xdisplay, xroot, + activeAtom, + XA_INTEGER, + 32, PropModeReplace, (guchar *) data, + 7 + 9 * nQuad); + } } else { - XDeleteProperty (xdisplay, xroot, atom); + XDeleteProperty (xdisplay, xroot, bareAtom); + + if (minimal) + { + XDeleteProperty (xdisplay, xroot, normalAtom); + XDeleteProperty (xdisplay, xroot, activeAtom); + } } + if (minimal) + return; + d.width = left_space + left_corner_space + 1 + right_corner_space + right_space; d.height = top_space + titlebar_height + normal_top_corner_space + 2 + @@ -2152,12 +2180,11 @@ (*d.draw) (&d); - atom = XInternAtom (xdisplay, "_NET_WINDOW_DECOR_NORMAL", FALSE); decoration_to_property (data, GDK_PIXMAP_XID (d.pixmap), &extents, 0, 0, quads, nQuad); XChangeProperty (xdisplay, xroot, - atom, + normalAtom, XA_INTEGER, 32, PropModeReplace, (guchar *) data, 7 + 9 * nQuad); } @@ -2173,12 +2200,11 @@ (*d.draw) (&d); - atom = XInternAtom (xdisplay, "_NET_WINDOW_DECOR_ACTIVE", FALSE); decoration_to_property (data, GDK_PIXMAP_XID (d.pixmap), &extents, 0, 0, quads, nQuad); XChangeProperty (xdisplay, xroot, - atom, + activeAtom, XA_INTEGER, 32, PropModeReplace, (guchar *) data, 7 + 9 * nQuad); } @@ -4668,6 +4694,9 @@ update_default_decorations (gdkscreen); + if (minimal) + return; + windows = wnck_screen_get_windows (screen); while (windows != NULL) { @@ -4890,6 +4919,9 @@ update_default_decorations (gdkscreen); + if (minimal) + return; + windows = wnck_screen_get_windows (screen); while (windows != NULL) { @@ -4970,6 +5002,12 @@ gtk_init (&argc, &argv); + for (i = 0; i < argc; i++) + { + if (strcmp (argv[i], "--minimal") == 0) + minimal = TRUE; + } + gdkdisplay = gdk_display_get_default (); xdisplay = gdk_x11_display_get_xdisplay (gdkdisplay); gdkscreen = gdk_display_get_default_screen (gdkdisplay); @@ -5027,11 +5065,14 @@ screen = wnck_screen_get_default (); - gdk_window_add_filter (NULL, - event_filter_func, - NULL); + if (!minimal) + { + gdk_window_add_filter (NULL, + event_filter_func, + NULL); - connect_screen (screen); + connect_screen (screen); + } if (!init_settings (screen)) { Binary files old/compiz-0.0.10/images/background.png and new/compiz-0.0.10/images/background.png differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/plugins/compiz.schemas.in.in new/compiz-0.0.10/plugins/compiz.schemas.in.in --- old/compiz-0.0.10/plugins/compiz.schemas.in.in 2006-05-09 17:57:25.000000000 +0200 +++ new/compiz-0.0.10/plugins/compiz.schemas.in.in 2006-05-17 12:47:10.000000000 +0200 @@ -2023,20 +2023,6 @@ </schema> <schema> - <key>/schemas/apps/compiz/plugins/scale/screen0/options/next_window</key> - <applyto>/apps/compiz/plugins/scale/screen0/options/next_window</applyto> - <owner>compiz</owner> - <type>string</type> - <default>Right</default> - <locale name="C"> - <short>Next Window</short> - <long> - Focus next window - </long> - </locale> - </schema> - - <schema> <key>/schemas/apps/compiz/plugins/scale/screen0/options/speed</key> <applyto>/apps/compiz/plugins/scale/screen0/options/speed</applyto> <owner>compiz</owner> @@ -2122,6 +2108,20 @@ </locale> </schema> + <schema> + <key>/schemas/apps/compiz/plugins/scale/screen0/options/overlay_icon</key> + <applyto>/apps/compiz/plugins/scale/screen0/options/overlay_icon</applyto> + <owner>compiz</owner> + <type>string</type> + <default>Emblem</default> + <locale name="C"> + <short>Overlay Icon</short> + <long> + Overlay an icon on windows once they are scaled (None, Emblem, Big) + </long> + </locale> + </schema> +  <schema> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/plugins/minimize.c new/compiz-0.0.10/plugins/minimize.c --- old/compiz-0.0.10/plugins/minimize.c 2006-05-12 13:20:15.000000000 +0200 +++ new/compiz-0.0.10/plugins/minimize.c 2006-05-16 09:52:30.000000000 +0200 @@ -579,6 +579,11 @@ mw->xScaleVelocity = mw->yScaleVelocity = 1.0f; (*w->screen->setWindowScale) (w, 1.0f, 1.0f); + + moveWindow (w, + w->serverX - w->attrib.x, + w->serverY - w->attrib.y, + FALSE, TRUE); } mw->state = NormalState; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/plugins/scale.c new/compiz-0.0.10/plugins/scale.c --- old/compiz-0.0.10/plugins/scale.c 2006-05-07 19:48:43.000000000 +0200 +++ new/compiz-0.0.10/plugins/scale.c 2006-05-16 15:37:51.000000000 +0200 @@ -50,9 +50,6 @@ #define SCALE_TERMINATE_KEY_DEFAULT "Pause" #define SCALE_TERMINATE_MODIFIERS_DEFAULT 0 -#define SCALE_NEXT_WINDOW_KEY_DEFAULT "Right" -#define SCALE_NEXT_WINDOW_MODIFIERS_DEFAULT 0 - #define SCALE_SPEED_DEFAULT 1.5f #define SCALE_SPEED_MIN 0.1f #define SCALE_SPEED_MAX 50.0f @@ -98,6 +95,25 @@ }; #define N_CORNER_TYPE (sizeof (cornerType) / sizeof (cornerType[0])) +typedef enum { + ScaleIconNone = 0, + ScaleIconEmblem, + ScaleIconBig +} IconOverlay; + +static char *iconOverlayString[] = { + "None", + "Emblem", + "Big" +}; + +static IconOverlay iconOverlay[] = { + ScaleIconNone, + ScaleIconEmblem, + ScaleIconBig +}; +#define N_ICON_TYPE (sizeof (iconOverlayString) / sizeof (iconOverlayString[0])) +#define SCALE_SCREEN_ICON_DEFAULT (iconOverlayString[1]) static int displayPrivateIndex; @@ -111,19 +127,20 @@ HandleEventProc handleEvent; unsigned int lastActiveNum; + KeyCode leftKeyCode, rightKeyCode, upKeyCode, downKeyCode; } ScaleDisplay; #define SCALE_SCREEN_OPTION_SPACING 0 #define SCALE_SCREEN_OPTION_SLOPPY_FOCUS 1 #define SCALE_SCREEN_OPTION_INITIATE 2 #define SCALE_SCREEN_OPTION_TERMINATE 3 -#define SCALE_SCREEN_OPTION_NEXT_WINDOW 4 -#define SCALE_SCREEN_OPTION_SPEED 5 -#define SCALE_SCREEN_OPTION_TIMESTEP 6 -#define SCALE_SCREEN_OPTION_WINDOW_TYPE 7 -#define SCALE_SCREEN_OPTION_DARKEN_BACK 8 -#define SCALE_SCREEN_OPTION_OPACITY 9 -#define SCALE_SCREEN_OPTION_CORNERS 10 +#define SCALE_SCREEN_OPTION_SPEED 4 +#define SCALE_SCREEN_OPTION_TIMESTEP 5 +#define SCALE_SCREEN_OPTION_WINDOW_TYPE 6 +#define SCALE_SCREEN_OPTION_DARKEN_BACK 7 +#define SCALE_SCREEN_OPTION_OPACITY 8 +#define SCALE_SCREEN_OPTION_CORNERS 9 +#define SCALE_SCREEN_OPTION_ICON 10 #define SCALE_SCREEN_OPTION_NUM 11 typedef struct _ScaleScreen { @@ -170,6 +187,8 @@ GLushort opacity; unsigned int cornerMask; + + IconOverlay iconOverlay; } ScaleScreen; typedef struct _ScaleWindow { @@ -266,6 +285,7 @@ SCALE_SCREEN (screen); o = compFindOption (ss->opt, NUM_OPTIONS (ss), name, &index); + if (!o) return FALSE; @@ -291,7 +311,6 @@ } break; case SCALE_SCREEN_OPTION_TERMINATE: - case SCALE_SCREEN_OPTION_NEXT_WINDOW: if (compSetBindingOption (o, value)) return TRUE; break; @@ -336,6 +355,22 @@ ss->cornerMask = scaleUpdateCorners (screen, o); return TRUE; } + break; + case SCALE_SCREEN_OPTION_ICON: + if (compSetStringOption (o, value)) + { + int i; + + for (i = 0; i < N_ICON_TYPE; i++) + { + if (strcmp (o->value.s, iconOverlayString[i]) == 0) + { + ss->iconOverlay = iconOverlay[i]; + return TRUE; + } + } + } + break; default: break; } @@ -388,17 +423,6 @@ XKeysymToKeycode (display, XStringToKeysym (SCALE_TERMINATE_KEY_DEFAULT)); - o = &ss->opt[SCALE_SCREEN_OPTION_NEXT_WINDOW]; - o->name = "next_window"; - o->shortDesc = "Next Window"; - o->longDesc = "Focus next window"; - o->type = CompOptionTypeBinding; - o->value.bind.type = CompBindingTypeKey; - o->value.bind.u.key.modifiers = SCALE_NEXT_WINDOW_MODIFIERS_DEFAULT; - o->value.bind.u.key.keycode = - XKeysymToKeycode (display, - XStringToKeysym (SCALE_NEXT_WINDOW_KEY_DEFAULT)); - o = &ss->opt[SCALE_SCREEN_OPTION_SPEED]; o->name = "speed"; o->shortDesc = "Speed"; @@ -462,6 +486,32 @@ o->value.list.value[i].s = strdup (cornerType[i]); o->rest.s.string = cornerTypeString; o->rest.s.nString = nCornerTypeString; + + o = &ss->opt[SCALE_SCREEN_OPTION_ICON]; + o->name = "overlay_icon"; + o->shortDesc = "Overlay Icon"; + o->longDesc = "Overlay an icon on windows once they are scaled"; + o->type = CompOptionTypeString; + o->value.s = strdup (SCALE_SCREEN_ICON_DEFAULT); + o->rest.s.string = iconOverlayString; + o->rest.s.nString = N_ICON_TYPE; +} + +static Bool +isScaleWin (CompWindow *w) +{ + SCALE_SCREEN (w->screen); + + if (!(*w->screen->focusWindow) (w)) + return FALSE; + + if (!(ss->wMask & w->type)) + return FALSE; + + if (w->state & CompWindowStateSkipPagerMask) + return FALSE; + + return TRUE; } static Bool @@ -470,15 +520,17 @@ Region region, unsigned int mask) { - WindowPaintAttrib sAttrib; - CompScreen *s = w->screen; - Bool status; + CompScreen *s = w->screen; + Bool status; SCALE_SCREEN (s); - SCALE_WINDOW (w); if (ss->grabIndex) { + WindowPaintAttrib sAttrib = *attrib; + + SCALE_WINDOW (w); + if (sw->adjust || sw->slot) { mask |= PAINT_WINDOW_TRANSFORMED_MASK; @@ -488,44 +540,118 @@ ss->state != SCALE_STATE_IN) { /* modify opacity of windows that are not active */ - sAttrib = *attrib; - attrib = &sAttrib; - sAttrib.opacity = (sAttrib.opacity * ss->opacity) >> 16; } } else if (ss->darkenBack && ss->state != SCALE_STATE_IN) { /* modify brightness of the other windows */ - sAttrib = *attrib; - attrib = &sAttrib; - - sAttrib.brightness = (2 * sAttrib.brightness) / 3; + sAttrib.brightness = sAttrib.brightness / 2; } - } - UNWRAP (ss, s, paintWindow); - status = (*s->paintWindow) (w, attrib, region, mask); - WRAP (ss, s, paintWindow, scalePaintWindow); + UNWRAP (ss, s, paintWindow); + status = (*s->paintWindow) (w, &sAttrib, region, mask); + WRAP (ss, s, paintWindow, scalePaintWindow); - return status; -} + if ((ss->iconOverlay != ScaleIconNone) && (sw->adjust || sw->slot)) + { + CompIcon *icon; -static Bool -isScaleWin (CompWindow *w) -{ - SCALE_SCREEN (w->screen); + icon = getWindowIcon (w, 96, 96); + if (!icon) + icon = w->screen->defaultIcon; - if (!(*w->screen->focusWindow) (w)) - return FALSE; + if (icon && (icon->texture.name || iconToTexture (w->screen, icon))) + { + REGION iconReg; + CompMatrix matrix; + int wx, wy, width, height; + int scaledWinWidth, scaledWinHeight; + float ds; + + scaledWinWidth = w->width * sw->scale; + scaledWinHeight = w->height * sw->scale; + + switch (ss->iconOverlay) { + case ScaleIconNone: + case ScaleIconEmblem: + sAttrib.xScale = sAttrib.yScale = 1.0f; + break; + case ScaleIconBig: + sAttrib.opacity /= 3; + sAttrib.xScale = sAttrib.yScale = + MIN (((float) scaledWinWidth / (float) icon->width), + ((float) scaledWinHeight / (float) icon->height)); + default: + break; + } - if (!(ss->wMask & w->type)) - return FALSE; + width = icon->width * sAttrib.xScale; + height = icon->height * sAttrib.yScale; - if (w->state & CompWindowStateSkipPagerMask) - return FALSE; + switch (ss->iconOverlay) { + case ScaleIconNone: + case ScaleIconEmblem: + wx = w->attrib.x + (w->width * sw->scale) - icon->width; + wy = w->attrib.y + (w->height * sw->scale) - icon->height; + break; + case ScaleIconBig: + wx = w->attrib.x + ((scaledWinWidth - width) / 2) / + sAttrib.xScale; + wy = w->attrib.y + ((scaledWinHeight - height) / 2) / + sAttrib.yScale; + break; + default: + wx = wy = 0; + break; + } - return TRUE; + ds = 1.0f - ss->scale; + if (ds) + { + sAttrib.opacity = + (fabs (1.0f - sw->scale) * sAttrib.opacity) / ds; + } + else if (!sw->slot) + { + sAttrib.opacity = 0; + } + + mask |= PAINT_WINDOW_TRANSLUCENT_MASK; + + iconReg.rects = &iconReg.extents; + iconReg.numRects = 1; + + iconReg.extents.x1 = wx; + iconReg.extents.y1 = wy; + iconReg.extents.x2 = iconReg.extents.x1 + width; + iconReg.extents.y2 = iconReg.extents.y1 + height; + + matrix = icon->texture.matrix; + matrix.x0 -= wx * icon->texture.matrix.xx; + matrix.y0 -= wy * icon->texture.matrix.yy; + + w->vCount = 0; + if (iconReg.extents.x1 < iconReg.extents.x2 && + iconReg.extents.y1 < iconReg.extents.y2) + (*w->screen->addWindowGeometry) (w, &matrix, 1, &iconReg, + &iconReg); + + if (w->vCount) + (*w->screen->drawWindowTexture) (w, + &icon->texture, &sAttrib, + mask); + } + } + } + else + { + UNWRAP (ss, s, paintWindow); + status = (*s->paintWindow) (w, attrib, region, mask); + WRAP (ss, s, paintWindow, scalePaintWindow); + } + + return status; } static int @@ -902,10 +1028,10 @@ if (sw->slot) { - x1 = w->attrib.x; - y1 = w->attrib.y; - x2 = x1 + ((float) w->width * sw->scale); - y2 = y1 + ((float) w->height * sw->scale); + x1 = w->attrib.x - w->input.left * sw->scale; + y1 = w->attrib.y - w->input.top * sw->scale; + x2 = w->attrib.x + (w->width + w->input.right) * sw->scale; + y2 = w->attrib.y + (w->height + w->input.bottom) * sw->scale; if (x1 <= x && y1 <= y && x2 > x && y2 > y) return w; @@ -983,12 +1109,6 @@ } } -static void -scaleSelectWindow (CompWindow *w) -{ - activateWindow (w); -} - static Bool scaleSelectWindowAt (CompScreen *s, int x, @@ -1000,7 +1120,7 @@ w = scaleCheckForWindowAt (s, x, y); if (w && isScaleWin (w)) { - scaleSelectWindow (w); + activateWindow (w); return TRUE; } @@ -1009,55 +1129,60 @@ } static void -scaleNextWindow (CompScreen *s) +scaleMoveFocusWindow (CompScreen *s, + int dx, + int dy) { - CompWindow *next = NULL; - CompWindow *prev = NULL; - CompWindow *w; - - SCALE_DISPLAY (s->display); + CompWindow *active; - for (w = s->windows; w; w = w->next) + active = findWindowAtScreen (s, s->display->activeWindow); + if (active) { - if (s->display->activeWindow == w->id) - continue; + CompWindow *w, *focus = NULL; + ScaleSlot *slot; + int x, y, cx, cy, d, min = MAXSHORT; - if (isScaleWin (w)) + SCALE_SCREEN (s); + SCALE_WINDOW (active); + + if (!sw->slot) + return; + + cx = (sw->slot->x1 + sw->slot->x2) / 2; + cy = (sw->slot->y1 + sw->slot->y2) / 2; + + for (w = s->windows; w; w = w->next) { - if (w->activeNum < sd->lastActiveNum) - { - if (next) - { - if (w->activeNum > next->activeNum) - next = w; - } - else - next = w; - } - else if (w->activeNum > sd->lastActiveNum) + slot = GET_SCALE_WINDOW (w, ss)->slot; + if (!slot) + continue; + + x = (slot->x1 + slot->x2) / 2; + y = (slot->y1 + slot->y2) / 2; + + d = abs (x - cx) + abs (y - cy); + if (d < min) { - if (prev) - { - if (w->activeNum < prev->activeNum) - prev = w; - } - else - prev = w; + if ((dx > 0 && x < sw->slot->x2) || + (dx < 0 && x > sw->slot->x1) || + (dy > 0 && y < sw->slot->y2) || + (dy < 0 && y > sw->slot->y1)) + continue; + + min = d; + focus = w; } } - } - if (next) - w = next; - else - w = prev; + if (focus) + { + SCALE_DISPLAY (s->display); - if (w) - { - sd->lastActiveNum = w->activeNum; + sd->lastActiveNum = focus->activeNum; - scaleSelectWindow (w); + activateWindow (focus); + } } } @@ -1115,10 +1240,17 @@ if (eventMatches (d, event, &ss->opt[SCALE_SCREEN_OPTION_INITIATE])) scaleInitiate (s); - if (ss->grabIndex && - eventMatches (d, event, - &ss->opt[SCALE_SCREEN_OPTION_NEXT_WINDOW])) - scaleNextWindow (s); + if (ss->grabIndex && event->type == KeyPress) + { + if (event->xkey.keycode == sd->leftKeyCode) + scaleMoveFocusWindow (s, -1, 0); + else if (event->xkey.keycode == sd->rightKeyCode) + scaleMoveFocusWindow (s, 1, 0); + else if (event->xkey.keycode == sd->upKeyCode) + scaleMoveFocusWindow (s, 0, -1); + else if (event->xkey.keycode == sd->downKeyCode) + scaleMoveFocusWindow (s, 0, 1); + } if (state == ss->state && (eventMatches (d, event, @@ -1165,11 +1297,6 @@ if (eventMatches (d, event, &ss->opt[SCALE_SCREEN_OPTION_INITIATE])) scaleInitiate (s); - if (ss->grabIndex && - eventMatches (d, event, - &ss->opt[SCALE_SCREEN_OPTION_NEXT_WINDOW])) - scaleNextWindow (s); - if (state == ss->state && eventMatches (d, event, &ss->opt[SCALE_SCREEN_OPTION_TERMINATE])) @@ -1182,7 +1309,7 @@ { SCALE_SCREEN (s); - if (ss->grabIndex && + if (ss->grabIndex && ss->state != SCALE_STATE_IN && ss->opt[SCALE_SCREEN_OPTION_SLOPPY_FOCUS].value.b) scaleSelectWindowAt (s, @@ -1285,6 +1412,11 @@ sd->lastActiveNum = None; + sd->leftKeyCode = XKeysymToKeycode (d->display, XStringToKeysym ("Left")); + sd->rightKeyCode = XKeysymToKeycode (d->display, XStringToKeysym ("Right")); + sd->upKeyCode = XKeysymToKeycode (d->display, XStringToKeysym ("Up")); + sd->downKeyCode = XKeysymToKeycode (d->display, XStringToKeysym ("Down")); + WRAP (sd, d, handleEvent, scaleHandleEvent); d->privates[displayPrivateIndex].ptr = sd; @@ -1348,6 +1480,8 @@ ss->darkenBack = SCALE_DARKEN_BACK_DEFAULT; ss->cornerMask = 0; + ss->iconOverlay = ScaleIconEmblem; + scaleScreenInitOptions (ss, s->display->display); addScreenBinding (s, &ss->opt[SCALE_SCREEN_OPTION_INITIATE].value.bind); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/plugins/switcher.c new/compiz-0.0.10/plugins/switcher.c --- old/compiz-0.0.10/plugins/switcher.c 2006-05-12 11:42:58.000000000 +0200 +++ new/compiz-0.0.10/plugins/switcher.c 2006-05-17 08:07:53.000000000 +0200 @@ -1250,7 +1250,7 @@ CompWindow *zoomed; CompWindow *switcher; Window zoomedAbove = None; - Window switcherAbove = None; + Bool saveDestroyed = FALSE; if (ss->zooming) { @@ -1263,8 +1263,8 @@ switcher = findWindowAtScreen (s, ss->popupWindow); if (switcher) { - switcherAbove = (switcher->prev) ? switcher->prev->id : None; - unhookWindowFromScreen (s, switcher); + saveDestroyed = switcher->destroyed; + switcher->destroyed = TRUE; } if (ss->bringToFront) @@ -1272,7 +1272,11 @@ zoomed = findWindowAtScreen (s, ss->zoomedWindow); if (zoomed) { - zoomedAbove = (zoomed->prev) ? zoomed->prev->id : None; + CompWindow *w; + + for (w = zoomed->prev; w && w->id <= 1; w = w->prev); + zoomedAbove = (w) ? w->id : None; + unhookWindowFromScreen (s, zoomed); insertWindowIntoScreen (s, zoomed, s->reverseWindows->id); } @@ -1294,7 +1298,7 @@ if (switcher) { - insertWindowIntoScreen (s, switcher, switcherAbove); + switcher->destroyed = saveDestroyed; glPushMatrix (); glTranslatef (-0.5f, -0.5f, -DEFAULT_Z_CAMERA); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/src/display.c new/compiz-0.0.10/src/display.c --- old/compiz-0.0.10/src/display.c 2006-05-11 20:12:11.000000000 +0200 +++ new/compiz-0.0.10/src/display.c 2006-05-17 11:25:15.000000000 +0200 @@ -77,6 +77,8 @@ static Bool inHandleEvent = FALSE; +static Bool shutDown = FALSE; + int lastPointerX = 0; int lastPointerY = 0; int pointerX = 0; @@ -1171,6 +1173,10 @@ execvp (programName, programArgv); exit (1); } + else if (shutDown) + { + exit (0); + } while (XPending (display->display)) { @@ -2320,12 +2326,8 @@ event->xselectionclear.window, event->xselectionclear.selection); - if (!screen) - return; - - /* removeScreen (screen); */ - - exit (0); + if (screen) + shutDown = TRUE; } void diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/src/screen.c new/compiz-0.0.10/src/screen.c --- old/compiz-0.0.10/src/screen.c 2006-05-12 13:33:13.000000000 +0200 +++ new/compiz-0.0.10/src/screen.c 2006-05-17 08:26:26.000000000 +0200 @@ -120,9 +120,9 @@ static Bool updateDefaultIcon (CompScreen *screen) { - CompIcon *icon; - char *data; - int width, height; + CompIcon *icon; + char *data; + unsigned int width, height; if (!readPng (screen->opt[COMP_SCREEN_OPTION_DEFAULT_ICON].value.s, &data, &width, &height)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit compat-openssl097g
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package compat-openssl097g checked in at Wed May 17 18:43:46 CEST 2006. -------- --- compat-openssl097g/compat-openssl097g.changes 2006-01-25 21:35:09.000000000 +0100 +++ compat-openssl097g/compat-openssl097g.changes 2006-05-17 16:58:25.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 16:58:14 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compat-openssl097g.spec ++++++ --- /var/tmp/diff_new_pack.ApqPrO/_old 2006-05-17 18:43:21.000000000 +0200 +++ /var/tmp/diff_new_pack.ApqPrO/_new 2006-05-17 18:43:21.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -19,7 +19,7 @@ Provides: openssl:/usr/lib/libssl.so.0.9.7 openssl:/usr/lib64/libssl.so.0.9.7 Autoreqprov: on Version: 0.9.7g -Release: 1 +Release: 13 Summary: Secure Sockets and Transport Layer Security URL: http://www.openssl.org/ Source: http://www.openssl.org/source/openssl-%{version}.tar.bz2 @@ -162,8 +162,8 @@ %install mkdir -p ${RPM_BUILD_ROOT}%{_libdir} -install -s -m 755 libssl.so.%{num_version} ${RPM_BUILD_ROOT}%{_libdir}/ -install -s -m 755 libcrypto.so.%{num_version} ${RPM_BUILD_ROOT}%{_libdir}/ +install -m 755 libssl.so.%{num_version} ${RPM_BUILD_ROOT}%{_libdir}/ +install -m 755 libcrypto.so.%{num_version} ${RPM_BUILD_ROOT}%{_libdir}/ %clean rm -rf $RPM_BUILD_ROOT @@ -180,6 +180,8 @@ %{_libdir}/libcrypto.so.%{num_version} %changelog -n compat-openssl097g +* Wed May 17 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Jan 13 2006 - ro(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit cogito
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package cogito checked in at Wed May 17 18:43:13 CEST 2006. -------- --- cogito/cogito.changes 2006-03-08 01:22:08.000000000 +0100 +++ cogito/cogito.changes 2006-05-17 01:48:09.000000000 +0200 @@ -0,0 +1,8 @@ +Wed May 17 01:48:03 CEST 2006 - pbaudis(a)suse.cz +------------------------------------------------------------------- + +- Update to cogito 0.17.2. + * Random small bugfixes (esp. recursive adds/removals and doing + such in subdirectories), and few trivial or well-isolated + new features. Documentation improvements. + Old: ---- cogito-0.17.tar.gz New: ---- cogito-0.17.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cogito.spec ++++++ --- /var/tmp/diff_new_pack.i4emjb/_old 2006-05-17 18:42:52.000000000 +0200 +++ /var/tmp/diff_new_pack.i4emjb/_new 2006-05-17 18:42:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package cogito (Version 0.17) +# spec file for package cogito (Version 0.17.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,13 +12,13 @@ Name: cogito BuildRequires: asciidoc sgml-skel xmlto -Version: 0.17 +Version: 0.17.2 Release: 1 Summary: SCM Scripts Based on GIT License: GPL Group: Development/Tools/Version Control URL: http://www.kernel.org/pub/software/scm/cogito/ -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: git-core >= 1.2.4 BuildArchitectures: noarch @@ -63,6 +63,11 @@ %doc README COPYING Documentation/tutorial-script %changelog -n cogito +* Wed May 17 2006 - pbaudis(a)suse.cz +- Update to cogito 0.17.2. + * Random small bugfixes (esp. recursive adds/removals and doing + such in subdirectories), and few trivial or well-isolated + new features. Documentation improvements. * Wed Mar 08 2006 - pbaudis(a)suse.cz - Update to cogito 0.17. * Potential security improvement, the code has been audited for ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit bind
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package bind checked in at Wed May 17 18:42:45 CEST 2006. -------- --- bind/bind.changes 2006-03-13 16:57:26.000000000 +0100 +++ bind/bind.changes 2006-05-17 13:08:13.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 13:00:02 CEST 2006 - ug(a)suse.de + +- fix for ldapdump script (#175587) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bind.spec ++++++ --- /var/tmp/diff_new_pack.4yB94F/_old 2006-05-17 18:41:33.000000000 +0200 +++ /var/tmp/diff_new_pack.4yB94F/_new 2006-05-17 18:41:33.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: openldap2 openldap2-devel Summary: Domain Name System (DNS) Server (named) Version: 9.3.2 -Release: 9 +Release: 17 %define SDB_LDAP_VERSION 1.0-beta License: Other License(s), see package, GPL Group: Productivity/Networking/DNS/Servers @@ -675,6 +675,8 @@ %doc %{_mandir}/man5/idnrc.5.gz %changelog -n bind +* Wed May 17 2006 - ug(a)suse.de +- fix for ldapdump script (#175587) * Mon Mar 13 2006 - ug(a)suse.de - typos fixed (#157611) * Wed Feb 08 2006 - ug(a)suse.de ++++++ vendor-files.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/tools/ldapdump new/vendor-files/tools/ldapdump --- old/vendor-files/tools/ldapdump 2004-11-04 14:28:22.000000000 +0100 +++ new/vendor-files/tools/ldapdump 2006-05-17 12:59:11.000000000 +0200 @@ -154,6 +154,7 @@ foreach my $zone ( sortZones() ) { next unless $namedRunning; next unless $zones{$zone}->{"allow-update"}; + next if( $zones{$zone}->{type} eq 'slave' ); next unless( -f $namedDir."/".$zones{$zone}->{file} ); print STDERR "\tdropStaticZoneEntries($zone)\n" if($DEBUG); dropStaticZoneEntries($zone); @@ -163,6 +164,7 @@ print STDERR "********** CHECKPOINT : drop all static zones\n" if($DEBUG); foreach my $zone ( keys(%zones) ) { next if $zones{$zone}->{"allow-update"}; + next if( $zones{$zone}->{type} eq 'slave' ); print STDERR "\tdropZone($zone)\n" if($DEBUG); dropZone($zone); delete( $zones{$zone} ); @@ -174,6 +176,7 @@ # drop all dynamic zones that are not in LDAP print STDERR "********** CHECKPOINT : drop all dynamic zones that are not in LDAP\n" if($DEBUG); foreach my $zone ( keys(%zones) ) { + next if( $zones{$zone}->{type} eq 'slave' ); $mesg = $ldap->search( base => $base, scope => 'sub', ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit amarok
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package amarok checked in at Wed May 17 18:41:22 CEST 2006. -------- --- KDE/amarok/amarok.changes 2006-05-16 14:13:51.000000000 +0200 +++ amarok/amarok.changes 2006-05-17 10:07:09.000000000 +0200 @@ -1,0 +2,427 @@ +Wed May 17 09:55:45 CEST 2006 - stbinner(a)suse.de + +- update to version 1.4 + FEATURES: + * New DCOP call "player: version()". Returns the amaroK version. + * iFP has persistent settings when transferring tracks to the device. + * GStreamer-0.10 engine now supports Audio CDs. + * Context menus for entries in the statistics tool. (BR 124945) + + CHANGES: + * Composer, Disc Number and File Size columns in flat collection view. + * 'k' or 'm' suffixes for matching filesize in kibi or respectively mebi + bytes. + * Groupings when transferring files to mediadevices are now persistent. + (BR 127158) + * Transfer contents of smart playlists to media device without adding + them to a playlist. (BR 126997) + * Set %albumartist to Various Artists, but keep %artist as the track's + artist when organizing compilations. (BR 126936) + * Discard empty tokens surrounded by {} in custom organize file format. + (BR 124337) + * GStreamer-0.10 engine was disabled for this release (not yet stable). + * Only pick genres for Smart playlists that exist in your collection. + * VFAT plugin completely rewritten since 1.4beta3. Name is now changed to + "Generic Audio Player" to make it less needlessly technical. + * Don't limit the number of episodes shown with a new podcast, since the + user can limit the number shown afterwards by configuring the channel. + * Automatically populate the playlist with items if it is empty when a + dynamic playlist is loaded. (BR 126594) + * Unplayed/unrated tracks are no longer shown in the statistics dialog. + * Removed the option "Import Playlists". It's now always enabled. + * Show total track time in context browser (BR 126548) + * Derive filename for downloaded podcast episodes from their url in the + rss feed. (BR 125966) + * Only show albums/artists/genres with more than 3 tracks when listing + favourite albums/artists/genres. (BR 126435) + * libtunepimp 0.5 compiles successfully. + * Podcasts are automatically configured to be checked for updates. + * Show only 2 decimal places for scores in the statistics module. + * Replace 'Move to Collection' in file browser context menu by 'Organize + Files' for collection directories. (BR 125702) + * Removed the option "Show Status Bar". It's now always enabled. + * Tracks from a media device scan be submitted to last.fm immediately, + without waiting for tracks to be played in amaroK. Patch by Iain + Benson <iain(a)arctos.me.uk>. (BR 125690) + * Any failed attempts to submit to last.fm are now automatically retried + in the background, without waiting for new tracks to be played. + * Smart playlists can be constructed using mixed ALL and ANY matches + (BR 124483) + * Configure media devices in global settings, disable media browser when + no media device is configured. + * Dynamic Playlist bar made more conspicuous. + * The Konqueror setting to show a 'delete' entry in the menu is now + respected, if the setting exists and KDE is version 3.4 or higher. + * Cover art from m4a files. Updated m4a taglib patch by Jochen Issing + <jochen(a)isign-softart.de> and patch by Shane King + <kde(a)dontletsstart.com>. (BR 125414) + + BUGFIXES: + * The playlist would incorrectly sort after using the queue manager in + dynamic mode. + * Sort disc numbers numerically (BR 127114) + * Smart Playlists using 'last played time' now filter correctly. + (BR 127145) + * If "Transcode Whenever Possible" was selected for transferring to media + devices, if the file was in the device's preferred format, transcoding + would not take place. Thanks to Ants Aasma for the patch. (BR 127109) + * Fix possible loss of database after changing settings. (BR 126880) + * Only include audio files when expanding directories. (BR 126765) + * Correctly handle 'Cancel' in confirmation dialog for deleting items + from media devices. (BR 126989) + * Smart-Playlist random mode was not 'sticking'. (BR 126877) + * Statusbar log files would only ever write to the first log after all + four logs had been filled. + * iFP: Don't pretend to add newly transferred files to wrong folders. + * Set a podcast as listened only when it really has been listened to. + * All tracks from a cuesheet will now submit correctly to last.fm. + (BR 114969) + * xine-engine will now correctly detect a change when only one of the + artist or album metadata changes. Patch by Kim Rasmussen + <kml(a)elreki.net>. (BR 126648) + * Less than and between criteria in a smart playlist for playcount, rating + or score of 0 now work. (BR 97046) + * Empty genres are no longer displayed in the collection browser. + (BR 126495) + * Fix regression causing drag and drop of playlist track items in the + playlistbrowser to be functionless. (BR 126387) + * Fix regression causing podcast purge property to be ignored. (BR 126194) + * Automatically convert MySql/PostgreSql passwords from 1.3 to 1.4 state. + * Popup Messages would flicker when being shown. + * Some 1.3 podcasts wouldn't get transferred to 1.4 settings. + * New podcasts didn't get a default save location. (BR 126196) + * Fixed encoding problems with lyrics scripts. + * Mark/unmark as compilation is now stored in the file tag so it is + remembered when the colection is rescanned. (BR 120428) + * Submissions from media devices are timestamped so as to be less likely + to conflict with submissions from another last.fm client. (BR 125367) + * The MySQL connection will no longer time out when idle. (BR 120198) + * Load manually configured media devices even after failed DCOP queries. + Patch by Iain Benson <iain(a)arctos.me.uk>. (BR 125692) + * Copy/move to collection recurses into directories. (BR 125334) + * Amazon no longer tries to refetch invalid entries. (BR 125168) + * Skip hidden directories while scanning the collection. (BR 115478) + * Instead of cancelling collection organiziation operations when starting + new one append to running one. + * Correctly show & in playlist 'Burn' right-click submenu. Patch by + Laszlo Pandy <laszlok2(a)gmail.com>. (BR 125117) + * Disable option to delete remote items in playlist right-click menu. + (BR 124745) + * Reload playlist browser podcasts when switching database engines. + * Podcast tables recreated on startup if they don't exist. + + +VERSION 1.4-beta3: + FEATURES: + * amaroK now supports multiple media devices of varying types (currently + iPods, UMS/vfat, and iFP devices). + * Autodetection of iPods and UMS/vfat devices (if KDE has HAL/DBUS support + compiled in). + * New DCOP call "devices: showDeviceList()" to show the Device Manager's + current device knowledge. + * amaroK now has a custom icon theme, and an option to switch back to the + system icons, if preferred (in the General settings section). + * Collection browser view is separated alphabetically. Patch by + Christian Hoenig <list(a)hoenig.cc>. + * Ease navigation with track slider below playlist window by showing mood. + (BR 121715) + * Show context information for podcasts. + * Filebrowser: toolbar button to change to the directory of the currently + playing song. (BR 115479) + * Added "Play Audio CD" entry to the amaroK menu. (BR 103409) + * GStreamer-0.10 engine now supports visualizations. + * xine-engine: Show metadata for ogg vorbis streams. (BR 122505) + * Drag and drop podcast urls directly onto podcast folders for addition. + * Add media directly into directories for iRiver ifp devices. + * Button to directly edit lyrics from the context browser. (BR 123515) + * Support for SMIL playlists. (BR 121983) + * Support for WAX playlists. (BR 120980) + * Handle the Year tag when playing AudioCDs. Patch by Markus Kaufhold + <M.Kaufhold(a)gmx.de>. (BR 123428) + * Ignore 'The ' in artist names when sorting in the cover manager, as per + the collection browser. (BR 122858) + * Add autocompletion to the composer field in the tag dialog. (BR 123026) + + CHANGES: + * In context browser, show information about recently updated podcasts, + recently added and favourite albums when nothing is playing. + * Ratings can now have half stars: click again on the last star in the + rating to toggle it between a half and a full star. + * Improved handling of embedded cover art, utilizing the database. Patch + by Shane King <kde(a)dontletsstart.com>. (BR 124563) + * Statistics tool has had numerous improvements. + * Optimise: Only rerender the CollectionBrowser when relevant. + * Disable detection of iPod model and thus solve g_object_get related + problems. (BR 121990) + * Don't block GUI when trying to transfer large numbers of items already + on media device. (BR 123570) + * Update playlist items when their location is changed during organizing + files. (BR 123752) + * Recursively add tracks when directories are dropped to the media browser + and the collection browser. (BR 123982) + * Visualizations now receive stereo data from amaroK. (BR 118765) + * Upgraded internal SQLite library to version 3.3.4. + * Podcast information is stored in the database. + * Improved password handling in the PostgreSQL config dialog. Patch by + Peter C. Ndikuwera <pndiku(a)gmail.com>. (BR 118304) + + BUGFIXES: + * Expand-By smart playlists were returning the wrong number of values. + * Fix display of media device transfer queues larger than 4 GB. (BR 125247) + * Fix duplicate detection when transferring to media device for tracks having + empty album tags. (BR 125203) + * Fix spuriously garbled collection scans. Patch by Shane King + <kde(a)dontletsstart.com>. (BR 125114) + * Fix error with 'Back' link when browsing related artists. (BR 123227) + * Files with names containing '#' or '?' from smart playlists would not + get transferred to media device. (BR 122488) + * Stop Playing After Track option wouldn't be shown for the right tracks, + when there were queued tracks. Patch by Marcelo Penna Guerra + <eu(a)marcelopenna.org>. (BR 124297) + * Don't submit podcast episodes to last.fm. (BR 118987) + * Accept system:/media/ urls into the playlist. (BR 120249) + * Fix leak of file descriptors with embedded cover art. Patch by Shane + King <kde(a)dontletsstart.com>. (BR 123472) + * Stop collection folders being automatically removed. Instead, allow + user to remove non-existent folders by deselecting parent. (BR 123745) + * Stop delete key in playlist deleting last deselected item. (BR 123265) + * xine-engine: Show bitrate and samplerate for CD-Audio and WAV. Patch by + Markus Kaufhold <M.Kaufhold(a)gmx.de>. (BR 123625) + * Some podcasts would cause amaroK to hang. + * Check if directories still exist when showing Collection directories. + (BR 123834) + * Playlist popup menu had a visual glitch with Lipstik and (probably) + earlier versions of Plastik. + * Fixed a huge memory leak when using xine-engine with crossfading. + (BR 119230) + * Sometimes iRiver devices would crash upon disconnecting. (BR 123416) + * Adjust the Astraweb lyrics script for a layout change on the site. Patch + by Andrew Turner <andrewturner512+kdebugs googlemail com>. (BR 123636) + * Directory selection would incorrectly highlight a directory in a + corner case. (BR 123635) + * Don't pretend to be able to uninstall default ContextBrowser themes. + (BR 123585) + * Fix preamp and frequency band scaling in the xine equalizer. Patch by + Tobias Knieper <webmaster(a)micekiller.de>. (BR 116633) + * OSD text would not be stripped of empty lines. + * Playlist couldn't be shuffled if queued items existed. (BR 120221) + * Fixed renaming of Smart Playlists. (BR 122509) + * Fixed some bugs with PostgreSQL and Smart Playlists. Patch by Peter C. + Ndikuwera <pndiku(a)gmail.com>. (BR 123317) + * Escape invalid characters when transferring files to IFP devices. + (BR 123199) + * Escape newline characters when showing detailed information for podcast + items in the playlistbrowser. (BR 123109) + + +VERSION 1.4-beta2: + FEATURES: + * Equalizer for the GStreamer-0.10 engine. + * Crossfade in the helix engine! + * The build date is shown in the "About amaroK" dialog. + * Show album covers when dragging playlist items. Patch from Jonas + Hurrelmann <j(a)outpo.st>. + + CHANGES: + * Summarize transfer failures to media devices instead of a message for each. + (BR 122491) + * Don't list the <no engine> entry in the engine selection widget, when + it's not the active engine. Makes no sense to select this dummy engine. + * The aRts and GStreamer-0.8 engines have been removed for being obsolete. + * Automatically skip to the next track in the playlist when a track is + unplayable. (BR 116555) + * Don't check for collection changes on startup if Watch Folders is + disabled. (BR 116173) + + BUGFIXES: + * Handle .m4a files as audio when transferring to iPod video. (BR 122492) + * Smart playlists would not transfer to media devices. (BR 122838) + * Assume that .mp4 files are audio only when transferring to iPod. (BR 122591) + * Dereference symbolic links when transferring to iPod. (BR 123206) + * Correct domain for japanese wikipedia locale. (BR 122319) + * When deleting a downloaded podcast, the icon wouldn't be updated. + (BR 122440) + * Manage Files would create duplicates on collection. (BR 122519) + * On Statistics Dialog, Compilations would be shown with a random artist, + and dragging to playlist would add only the tracks by that artist. + (BR 122363) + * When editing current dynamic playlist, the adjusting of upcoming tracks + could be faulty. (BR 122401) + * Changing database on First-Run Wizard wouldn't work. + * When loading M3U playlists containing "." or "..", amaroK failed to + detect that the files are in the collection. Patch by Ted Percival + <ted(a)midg3t.net>. (BR 121046) + * Konqueror sidebar would show garbage for people not using UTF-8 locales. + (BR 122395) + * "Open in External Browser" in the lyrics tab works now. + * Lyrc lyrics script handles tick characters correctly. + * Crash on startup when upgrading from 1.3, using MySQL. (BR 122042) + * No more crash on exit or deleting podcast. + * Handle metadata for .aac files as mpeg instead of mp4. (BR 121852) + + +VERSION 1.4-beta1: + FEATURES: + * AudioCD (CDDA) support for xine-engine, including CDDB lookup. Patch by + Alberto Griggio <alberto.griggio(a)gmail.com>. (BR 121647) + * The Helix engine now supports direct alsa playback using Realplayer 10. + * New DCOP call "player: setVolumeRelative(int ticks)". + * Options for Random Mode to favor tracks with a higher rating, score, or + ones less recently played. + * Support for playing entire albums. This works just like normal, except + when choosing the next track, it'll go to the next track from the album + it finds in the playlist, or the first track of another album otherwise. + * Support for plain VFAT devices in the Media Device browser. + * You can now mousewheel over a track's queue label to change its position + in the queue. + * Added a time-filter to the CollectionBrowser. Now you can make it show + only those tracks, which have been added to your collection within the + last day, week, month or year. + * Fit to Width for the playlist columns is now optional (accessible in the + context menu for the column headers). + * On-the-fly transcoding when transferring to media devices, provided + that an appropriate transcoding script is running. + * Handle compilations as such on iPods. + * New DCOP calls "mediabrowser: ..." for interfacing with media devices. + * Multiple simultaneously connected media devices. + * Lyrics support is now scriptable. This allows to add support for any + lyrics site, and makes it possible to provide upgrades. (BR 94437) + * New DCOP call "contextbrowser: showLyrics(string)". + * New 'File Size' column in the playlist. + * Amarok now supports ASX playlist files. (BR 114051) + * New DCOP call "collection: isDirInCollection(const QString& path )". + * New DCOP call "playlist: removeByIndex(int)". (BR 119143) + * For mp3, aac/mp4, and ogg vorbis, it's possible to use Disc Number and + Composer tags. (BR 110675) (BR 90503) + * For xine-lib 1.1.1 and greater, xine engine has gapless playback. amaroK + is now "The Wall" compatible. (BR 77766) + * Option for selecting external web browser in amaroK. No longer requires + KDE-Base. (BR 106015) + * Press Enter in the Collection Browser filter to send all the visible + tracks to the playlist. + * Hold Ctrl while pressing Enter in the playlist's filter to apply to all + visible items instead of just the first, and Shift to only queue and not + play them. + * Tags can be edited inline in the playlist by clicking on a single selected + item. + * Switchable Wikipedia locale. (BR 104383) + * Initial port of GStreamer engine to GStreamer 0.10. + * Drag albums and compilations from context browser to media device and + playlist browser. + * Browse your collection and other related artists with context browser. + * Copy artwork to iPods capable of displaying it. + * Show extended podcast info on iPod. + * Optionally update playcount for items played on iPod and submit them + to last.fm and synchronize ratings between amaroK and iPod. + * Tracks can now be rated from 1-5 stars manually, in addition to the score + which amaroK calculates automatically based on your listening habits. You + can use the 'Rating' column and Win+1..5 to change the rating. + * Ability to copy items from iPod and from filebrowser to collection. + * New 'Last Played' column in the playlist, showing when the track was last + played. (Like in the Context Browser.) + * Browsers can be now accessed with keyboard shortcuts, Ctrl+1..5. + Also Ctrl+0 to close the current one, and Ctrl+Tab to switch the focus + between the playlist and the active browser. + * Downloaded podcast episodes can be deleted from the context menu. + * New DCOP call "player: osdEnabled". + * Add contents of smart amaroK playlists as playlist to media device. + * Mediabrowser support for the iRiver iFP series! + * New dcop call playlistbrowser loadPlaylist. (BR 110082) + * New Edit Track Information dialog. Lyrics can be edited there, comments + can have more than one line, some statistics and tag guessing from + filename. (BR 93982) + * Show/hide browsers via context menu. (BR 110823) + * Display disk space on media device. + * Copy standard and amaroK playlists to media device. + * Create playlist from items transferred to iPod. + * Edit dumb iPod playlists with media browser. + * Ability to read audible.com .aa file metadata and to transfer audiobooks + to iPod via file browser. + * Optionally add new podcasts to media device transfer queue on download + and remove podcasts already listened to on media device connect. + * Add podcast shows to the Podcast folder on iPods. + * Persistent media device transfer queue. + * Incremental update of media device view. + * Automatic scanning for stale and orphaned iPod items. + * Moodbar! + * configure: report not included extra features (BR 115057) + * Ability to uninstall context-browser themes. (BR 111449) + * More columns available in the Flat View of the Collection Browser. + * New Collection Scanner, running in an external process. No longer can + amaroK crash while scanning the Collection :) + * Statistics tool! + * Dragging external playlists into the playlist browser will add them. + * NMM engine now has a configure dialog. + * Collection scanner now supports WMA, MP4/AAC, and RealMedia (RA,RV,RM). + * You can now Organize Music from the Collection Browser, to move and + rename files to a logical place in your collection folders based on their + tags. + * Option to crossfade only on manual track changes. Useful for listening + to consecutive tracks on a single album. + + CHANGES: + * Dynamic Mode is now stateless, meaning there's no Dynamic Mode any more, + only loading and unloading of Dynamic Playlists. There's also now a nice + info bar above the playlist when a Dynamic Playlist is loaded. + * The major huge context menu used for hiding/showing columns in the + playlist has been replaced with a shorter one and a nice dialog. + * Elapsed time / length in the systray tooltip now updates in real time as + the song progresses. + * Tooltips in the playlist for truncated text are now shown directly above + the text, giving the effect of it being expanded to its full length. + * The option for restarting scripts automatically at startup is removed, as + it is now the default behaviour. + * Reduced memory usage for large playlists to under 30% of pre-1.4 versions. + (Measured as the difference in memory usage between an empty playlist and + loading the 'All Collection' smart playlist.) + * Import iTunes album art from directories. + * Media Devices (Apple iPod, iRiver iFP, ...) are now handled with plugins. + * New default image for albums with no cover art. + * When tabbing between cells while editing tags in the playlist, autosave + the contents of the previous tag you edited, so you don't have to + constantly go in and out of editing mode to edit lots of tags. + * When saving playlists, if there's already one with the same name, instead + of complaining about it, smartly append (2), (3), etc. to the end. + * 'Stop Playing After Track' now has a shortcut (Ctrl+Alt+V), and a global + shortcut for the currently playing track (Ctrl+Win+V). + * Various keyboard usability and focus tweaks so using amaroK with the + keyboard is nicer. + * Upgraded internal SQLite database library to version 3.2.7. + * Recoding mp3 tags has been removed due to many unjustified + complications. + * Viewing track information of remote media will show the url. + * "Update"-button is now hidden in the collection browser if "Watch + folders for changes" is enabled in the options. + * Playlist Browser now remembers which entries were open across startups. + * The tooltip and the menu from the queue icon in the statusbar now shows + the total length of the queued tracks. + * The Home tab has been merged into the Current tab, now called Music. + * New look for the current track marker in the playlist. Pimp my roK! + * When turning either random or dynamic mode on, turn the other off, + instead of completely disabling random mode when dynamic is on. + * libgpod from gtkpod replaces kio based iPod support for improved + compatibility with various iPod models. + * Podcast settings are hierarchical now, meaning you can set settings + for the category's, newly added podcasts take the settings from there parent category. + + BUGFIXES: + * Dragging text to a filter line edit would still show the "Filter + Here..." text in the background. (BR 108876) + * Don't show an empty playlist length holder in the statusbar. + * Allow for % and _ in tags, and filter them correctly. + * Do not copy files of types an iPod is not capable of playing to the + iPod. (BR 117486) + * Also take track number into account when comparing tags for checking + if a track is already present on iPod. (BR 117380) + * iPod nanos would not switch off during playing songs added with amaroK + because of their file size not being set. + * "Show Fullsize" now works for ID3 embedded cover images. (BR 114517) + * Fix possible bug when saving unencoded podcasts to strange file systems. + * OSD Preview did not update colours when toggling 'Use custom colours' + option. (BR 115965) + * Cached lyrics are not erased when rescanning. (BR 110489) + * No more "can't create amazon table" warnings. (BR 113930) + * Creating a new playlist via drag-and-drop no longer shows duplicates + of each song until amaroK is restarted. + +------------------------------------------------------------------- Old: ---- amarok-1.3.9.tar.bz2 amarok-gst10.diff amarok-gst10.tar.bz2 amarok-skip-hidden-dirs.diff helix-default-paths.diff helix-wrapper-metadata.diff helix-wrapper-scope.diff konqsidebar-translation.diff modplug_artsplugin-0.5.dif modplug_artsplugin-0.5.tar.bz2 New: ---- amarok-1.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ ++++ 645 lines (skipped) ++++ between KDE/amarok/amarok.spec ++++ and amarok/amarok.spec ++++++ amarok-1.3.9.tar.bz2 -> amarok-1.4.0.tar.bz2 ++++++ KDE/amarok/amarok-1.3.9.tar.bz2 amarok/amarok-1.4.0.tar.bz2 differ: char 11, line 1 ++++++ amarok-no-realaudio.diff ++++++ --- /var/tmp/diff_new_pack.l7dS77/_old 2006-05-17 18:39:42.000000000 +0200 +++ /var/tmp/diff_new_pack.l7dS77/_new 2006-05-17 18:39:42.000000000 +0200 @@ -1,11 +1,11 @@ ---- amarok/src/amarok.desktop 2006-02-06 15:30:14.000000000 +0100 -+++ amarok/src/amarok.desktop 2006-02-06 15:30:28.000000000 +0100 -@@ -100,7 +100,7 @@ +--- amarok/src/amarok.desktop 2006/05/17 07:58:11 1.1 ++++ amarok/src/amarok.desktop 2006/05/17 07:59:46 +@@ -93,7 +93,7 @@ Comment[zh_TW]=Uncle Rodney 說："10/10, amaroK is seriously super!" Icon=amarok #don't add inode/directory to mimetypes it leads to misbehavior --MimeType=application/x-ogg;audio/aac;audio/ac3;audio/basic;audio/midi;audio/mp4;audio/mpeg;audio/mpegurl;audio/prs.sid;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-aac;audio/x-aiff;audio/x-flac;audio/x-m4a;audio/x-matroska;audio/x-midi;audio/x-mod;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav; -+MimeType=application/x-ogg;audio/aac;audio/ac3;audio/basic;audio/midi;audio/mp4;audio/mpeg;audio/mpegurl;audio/prs.sid;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-aac;audio/x-aiff;audio/x-flac;audio/x-m4a;audio/x-matroska;audio/x-midi;audio/x-mod;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav; +-MimeType=application/asx;audio/aac;audio/ac3;audio/basic;audio/midi;audio/mp4;audio/mpeg;audio/mpegurl;audio/prs.sid;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-aac;audio/x-aiff;audio/x-flac;audio/x-m4a;audio/x-matroska;audio/x-midi;audio/x-mod;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav; ++MimeType=application/asx;audio/aac;audio/ac3;audio/basic;audio/midi;audio/mp4;audio/mpeg;audio/mpegurl;audio/prs.sid;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-aac;audio/x-aiff;audio/x-flac;audio/x-m4a;audio/x-matroska;audio/x-midi;audio/x-mod;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav; DocPath=amarok/index.html Terminal=false Categories=Qt;KDE;AudioVideo;Player; ++++++ amarok.diff ++++++ --- /var/tmp/diff_new_pack.l7dS77/_old 2006-05-17 18:39:42.000000000 +0200 +++ /var/tmp/diff_new_pack.l7dS77/_new 2006-05-17 18:39:42.000000000 +0200 @@ -18,11 +18,3 @@ // sort by rank, QValueList::operator[] is O(n), so this is quite inefficient #define rank( x ) (x)->property( "X-KDE-amaroK-rank" ).toInt() for( int n = offers.count()-1, i = 0; i < n; i++ ) ---- amarok/src/engine/arts/amarokarts/Makefile.am.orig 2006-03-12 13:04:43.914192625 +0100 -+++ amarok/src/engine/arts/amarokarts/Makefile.am 2006-03-12 13:04:54.769316790 +0100 -@@ -26,4 +26,4 @@ amarokmcop_DATA = Synth_STEREO_XFADE.mco - CLEANFILES = amarokarts.cc amarokarts.h amarokarts.mcopclass amarokarts.mcoptype - #noinst_HEADERS = amarokconfig.h - --rawscope_impl.lo : amarokarts.h -+synth_stereo_xfade_impl.lo rawscope_impl.lo : amarokarts.h ++++++ collectiondb-mutex.diff ++++++ --- /var/tmp/diff_new_pack.l7dS77/_old 2006-05-17 18:39:42.000000000 +0200 +++ /var/tmp/diff_new_pack.l7dS77/_new 2006-05-17 18:39:42.000000000 +0200 @@ -35,19 +35,13 @@ --- amarok/src/collectiondb.h +++ amarok/src/collectiondb.h @@ -15,6 +15,7 @@ - #include <qptrqueue.h> //baseclass - #include <qsemaphore.h> //stack allocated #include <qstringlist.h> //stack allocated + #include <qptrvector.h> + #include <qthread.h> +#include <qmutex.h> - class DbConnection; - class DbConnectionPool; -@@ -406,6 +407,8 @@ - QDir m_cacheDir; - QDir m_coverDir; - QImage m_noCover; -+ -+ QMutex m_mutex; - }; - + namespace KIO { class Job; } +@@ -406,1 +407,2 @@ + QImage m_noCover; ++ QMutex m_mutex; ++++++ helix.diff ++++++ --- /var/tmp/diff_new_pack.l7dS77/_old 2006-05-17 18:39:42.000000000 +0200 +++ /var/tmp/diff_new_pack.l7dS77/_new 2006-05-17 18:39:42.000000000 +0200 @@ -98,7 +98,7 @@ + + +#else - #include <helix-sp.h> + #include <hxplayercontrol.h> +#endif class QStringList; @@ -361,9 +361,9 @@ ///returns the configuration we will use static inline QCString configPath() { return QFile::encodeName( QDir::homeDirPath() + "/.helix/config" ); } @@ -78,6 +294,10 @@ - - memset(&m_md, 0, sizeof(m_md)); - + memset(hscope, 0, 2*sizeof(HelixScope)); + memset(&m_scopetm, 0, sizeof(struct timeval)); + memset(m_pfade, 0, 2*sizeof(FadeTrack)); +#ifdef USE_HELIX_WRAPPER + connect(&helper, SIGNAL(readyReadStdout()), this, SLOT(slotHandleHelper())); + helper.start(); @@ -379,14 +379,6 @@ if (!stat(m_coredir.utf8(), &s) && !stat(m_pluginsdir.utf8(), &s) && !stat(m_codecsdir.utf8(), &s)) { long vol=0; -@@ -214,7 +433,6 @@ - m_inited = exists = true; - } - -- - if (!exists || HelixSimplePlayer::getError()) - { - KMessageBox::error( 0, i18n("amaroK could not initialize the helix-engine. Please check the paths in \"amaroK Settings\" -> \"Engine\"") ); @@ -223,6 +441,7 @@ return true; } @@ -441,33 +433,21 @@ } -@@ -583,6 +813,8 @@ - - const Engine::Scope &HelixEngine::scope() - { -+#if 1 -+ - int i; - unsigned long t; - -@@ -701,18 +933,20 @@ - for (i=0; i<512; i++) - m_scope[i] = m_currentScope[i]; - m_scopeindex = 0; -- -+#endif - return m_scope; - } - +@@ -701,16 +933,18 @@ void - HelixEngine::resetScope() + HelixEngine::resetScope(int playerIndex) { +#ifndef USE_HELIX_WRAPPER - // make sure the scope is clear of old buffers - clearScopeQ(); - m_scopeindex = 0; - delete m_item; - m_item = 0; + if (playerIndex >=0 && playerIndex < numPlayers()) + { + // make sure the scope is clear of old buffers + clearScopeQ(playerIndex); + hscope[playerIndex].m_scopeindex = 0; + if (hscope[playerIndex].m_item && hscope[playerIndex].m_item->allocd) + delete hscope[playerIndex].m_item; + hscope[playerIndex].m_w = 0; + hscope[playerIndex].m_item = 0; + } +#endif } ++++++ threading-issues.diff ++++++ --- /var/tmp/diff_new_pack.l7dS77/_old 2006-05-17 18:39:42.000000000 +0200 +++ /var/tmp/diff_new_pack.l7dS77/_new 2006-05-17 18:39:42.000000000 +0200 @@ -1,60 +1,58 @@ -Index: src/metabundle.h -=================================================================== ---- src/metabundle.h (Revision 500428) -+++ src/metabundle.h (Arbeitskopie) -@@ -145,6 +145,8 @@ public: - void setBitrate( int bitrate ) { m_bitrate = bitrate; } - void setSampleRate( int sampleRate ) { m_sampleRate = sampleRate; } +--- src/metabundle.h 2006/04/11 11:24:03 1.1 ++++ src/metabundle.h 2006/04/11 11:24:03 +@@ -283,6 +283,8 @@ + static QString prettyTitle( const QString &filename ); + static QStringList genreList(); + void detach(); + protected: - KURL m_url; - QString m_title; -Index: src/metabundle.cpp -=================================================================== ---- src/metabundle.cpp (Revision 500428) -+++ src/metabundle.cpp (Arbeitskopie) -@@ -11,6 +11,7 @@ - #include "metabundle.h" - #include "playlistitem.h" + enum ExtendedTags { composerTag, discNumberTag }; + +--- src/metabundle.cpp 2006/04/11 12:57:26 1.1 ++++ src/metabundle.cpp 2006/04/11 12:58:20 +@@ -15,6 +15,7 @@ + #include <kmimetype.h> + #include <qdom.h> #include <qfile.h> //decodePath() +#include <qdeepcopy.h> + #include <taglib/attachedpictureframe.h> #include <taglib/fileref.h> #include <taglib/id3v1genres.h> //used to load genre list - #include <taglib/mpegfile.h> -@@ -328,3 +329,18 @@ MetaBundle::genreList() //static - - return list; +@@ -335,6 +336,22 @@ } -+ -+void + + void +MetaBundle::detach() +{ + // we'd do that, but unfortunately it does not exist + //m_url.detach(); + + m_title = QDeepCopy<QString>(m_title); -+ m_artist = QDeepCopy<QString>(m_artist); -+ m_album = QDeepCopy<QString>(m_album); -+ m_comment = QDeepCopy<QString>(m_comment); -+ m_genre = QDeepCopy<QString>(m_genre); ++ m_artist = m_artist.deepCopy(); ++ m_album = m_album.deepCopy(); ++ m_comment = m_comment.deepCopy(); ++ m_composer = m_composer.deepCopy(); ++ m_genre = m_genre.deepCopy(); + m_streamName = QDeepCopy<QString>(m_streamName); + m_streamUrl = QDeepCopy<QString>(m_streamUrl); +} -Index: src/contextbrowser.cpp -=================================================================== ---- src/contextbrowser.cpp (Revision 500428) -+++ src/contextbrowser.cpp (Arbeitskopie) -@@ -33,6 +33,7 @@ ++ ++void + MetaBundle::init( TagLib::AudioProperties *ap ) + { + if ( ap ) +--- src/contextbrowser.cpp 2006/04/11 11:24:03 1.1 ++++ src/contextbrowser.cpp 2006/04/11 11:24:29 +@@ -36,6 +36,7 @@ #include <qregexp.h> #include <qtextstream.h> // External CSS reading #include <qvbox.h> //wiki tab +#include <qdeepcopy.h> - - #include <kapplication.h> //kapp - #include <kcalendarsystem.h> // for verboseTimeSince() -@@ -1403,9 +1404,7 @@ void ContextBrowser::showHomeByAlbums() + #include <qhbox.h> + #include <qlineedit.h> + #include <qtooltip.h> +@@ -823,9 +824,7 @@ class CurrentTrackJob : public ThreadWeaver::DependentJob { public: @@ -65,9 +63,9 @@ private: virtual bool doJob(); -@@ -1426,10 +1425,17 @@ private: +@@ -854,10 +853,17 @@ + b->saveHtmlData(); // Send html code to file } - QString m_HTMLSource; + MetaBundle currentTrack; @@ -80,24 +78,24 @@ +{ + currentTrack = QDeepCopy<MetaBundle>(EngineController::instance()->bundle()); +} - - void ContextBrowser::showCurrentTrack() //SLOT + void + ContextBrowser::showContext( const KURL &url, bool fromHistory ) { -@@ -1453,8 +1459,6 @@ bool CurrentTrackJob::doJob() +@@ -1077,7 +1083,7 @@ + + if ( CollectionDB::instance()->albumIsCompilation( reqResult[ i + 1 ] ) ) + { +- QString albumImage = CollectionDB::instance()->albumImage( albumValues[5], reqResult[ i ], 50 ); ++ QString albumImage = QDeepCopy<QString>(CollectionDB::instance()->albumImage( albumValues[5], reqResult[ i ], 50 )); + QString albumImageTitleAttr = albumImageTitle( albumImage, 50 ); + albumImage = ContextBrowser::makeShadowedImage( albumImage ); + +@@ -2353,8 +2359,6 @@ { DEBUG_BLOCK - const MetaBundle &currentTrack = EngineController::instance()->bundle(); - - m_HTMLSource.append( "<html>" + m_HTMLSource.append( "<html><body>" "<script type='text/javascript'>" //Toggle visibility of a block. NOTE: if the block ID starts with the T -@@ -1901,7 +1905,7 @@ bool CurrentTrackJob::doJob() - } - } - -- QString albumImage = CollectionDB::instance()->albumImage( currentTrack.artist(), values[ i ], 50 ); -+ QString albumImage = QDeepCopy<QString>(CollectionDB::instance()->albumImage( currentTrack.artist(), values[ i ], 50 )); - if ( albumImage != CollectionDB::instance()->notAvailCover( 50 ) ) - albumImage = ContextBrowser::makeShadowedImage( albumImage ); - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit alsa
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package alsa checked in at Wed May 17 18:39:30 CEST 2006. -------- --- alsa/alsa.changes 2006-05-15 17:18:56.000000000 +0200 +++ alsa/alsa.changes 2006-05-17 15:06:17.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 15:05:40 CEST 2006 - tiwai(a)suse.de + +- fix endless loop bug in arecord, also code clean-up. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.4P812a/_old 2006-05-17 18:37:15.000000000 +0200 +++ /var/tmp/diff_new_pack.4P812a/_new 2006-05-17 18:37:15.000000000 +0200 @@ -21,7 +21,7 @@ Autoreqprov: on Summary: Advanced Linux Sound Architecture Version: 1.0.11 -Release: 32 +Release: 33 Source1: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source2: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2 Source5: ftp://ftp.alsa-project.org/pub/oss/alsa-oss-%{package_version}.tar.bz2 @@ -377,6 +377,8 @@ %doc alsa-lib*/doc/doxygen/html/* %changelog -n alsa +* Wed May 17 2006 - tiwai(a)suse.de +- fix endless loop bug in arecord, also code clean-up. * Mon May 15 2006 - tiwai(a)suse.de - update to ALSA 1.0.11-final + HG fixes. * all patches in SL10.1 have been merged ++++++ alsa-utils-hg-fixes.diff ++++++ --- /var/tmp/diff_new_pack.4P812a/_old 2006-05-17 18:37:15.000000000 +0200 +++ /var/tmp/diff_new_pack.4P812a/_new 2006-05-17 18:37:15.000000000 +0200 @@ -1,6 +1,6 @@ diff -r 420590283171 INSTALL --- a/INSTALL Wed Apr 19 12:29:49 2006 +0200 -+++ b/INSTALL Mon May 15 12:46:04 2006 +0200 ++++ b/INSTALL Wed May 17 15:01:37 2006 +0200 @@ -24,11 +24,11 @@ header file asoundlib.h in $prefix/inclu header file asoundlib.h in $prefix/include/alsa directory (usually in /usr/include/alsa directory). @@ -27,40 +27,239 @@ in the case. diff -r 420590283171 aplay/aplay.c --- a/aplay/aplay.c Wed Apr 19 12:29:49 2006 +0200 -+++ b/aplay/aplay.c Mon May 15 12:46:04 2006 +0200 -@@ -127,8 +127,9 @@ struct fmt_capture { ++++ b/aplay/aplay.c Wed May 17 15:01:37 2006 +0200 +@@ -126,9 +126,10 @@ struct fmt_capture { + char *what; long long max_filesize; } fmt_rec_table[] = { - { NULL, end_raw, N_("raw data"), LLONG_MAX }, +- { NULL, end_raw, N_("raw data"), LLONG_MAX }, - { begin_voc, end_voc, N_("VOC"), 16000000 }, - { begin_wave, end_wave, N_("WAVE"), 2000000000 }, ++ { NULL, NULL, N_("raw data"), LLONG_MAX }, + { begin_voc, end_voc, N_("VOC"), 16000000LL }, + /* FIXME: can WAV handle exactly 2GB or less than it? */ + { begin_wave, end_wave, N_("WAVE"), 2147483648LL }, { begin_au, end_au, N_("Sparc Audio"), LLONG_MAX } }; -@@ -2165,13 +2166,15 @@ static void capture(char *name_) - 2) all requested samples/bytes have been captured (cur>0) - 3) filesize threshold was reached (fdcount<wrthreshold) - */ +@@ -1882,12 +1883,6 @@ static void end_voc(int fd) + close(fd); + } + +-static void end_raw(int fd) +-{ /* REALLY only close output */ +- if (fd != 1) +- close(fd); +-} +- + static void end_wave(int fd) + { /* only close output */ + WaveChunkHeader cd; +@@ -2053,26 +2048,62 @@ static void playback(char *name) + close(fd); + } + +-static void capture(char *name_) ++static int new_capture_file(char *name, char *namebuf, size_t namelen, ++ int filecount) ++{ ++ /* get a copy of the original filename */ ++ char *s; ++ char buf[PATH_MAX+1]; ++ ++ strncpy(buf, name, sizeof(buf)); ++ ++ /* separate extension from filename */ ++ s = buf + strlen(buf); ++ while (s > buf && *s != '.' && *s != '/') ++ --s; ++ if (*s == '.') ++ *s++ = 0; ++ else if (*s == '/') ++ s = buf + strlen(buf); ++ ++ /* upon first jump to this if block rename the first file */ ++ if (filecount == 1) { ++ if (*s) ++ snprintf(namebuf, namelen, "%s-01.%s", buf, s); ++ else ++ snprintf(namebuf, namelen, "%s-01", buf); ++ remove(namebuf); ++ rename(name, namebuf); ++ filecount = 2; ++ } ++ ++ /* name of the current file */ ++ if (*s) ++ snprintf(namebuf, namelen, "%s-%02i.%s", buf, filecount, s); ++ else ++ snprintf(namebuf, namelen, "%s-%02i", buf, filecount); ++ ++ return filecount; ++} ++ ++static void capture(char *orig_name) + { + int tostdout=0; /* boolean which describes output stream */ + int filecount=0; /* number of files written */ +- char *name=name_; /* current filename */ ++ char *name = orig_name; /* current filename */ + char namebuf[PATH_MAX+1]; +- off64_t cur; /* number of bytes to capture */ ++ off64_t count, rest; /* number of bytes to capture */ + + /* get number of bytes to capture */ +- pbrec_count = calc_count(); ++ count = calc_count(); ++ if (count == 0) ++ count = LLONG_MAX; + /* WAVE-file should be even (I'm not sure), but wasting one byte + isn't a problem (this can only be in 8 bit mono) */ +- if (pbrec_count < LLONG_MAX) +- pbrec_count += pbrec_count % 2; ++ if (count < LLONG_MAX) ++ count += count % 2; + else +- pbrec_count -= pbrec_count % 2; +- if (pbrec_count == 0) +- pbrec_count -= 2; +- +- cur = pbrec_count; ++ count -= count % 2; + + /* display verbose output to console */ + header(file_type, name); +@@ -2085,93 +2116,63 @@ static void capture(char *name_) + fd = fileno(stdout); + name = "stdout"; + tostdout=1; +- fdcount = 0; + } + + do { + /* open a file to write */ + if(!tostdout) { +- + /* upon the second file we start the numbering scheme */ +- if(filecount) +- { +- /* get a copy of the original filename */ +- char *s; +- char buf[PATH_MAX+1]; +- strncpy(buf, name_, sizeof(buf)); +- +- /* separate extension from filename */ +- s=buf+strlen(buf); +- while(s>buf && *s!='.' && *s!='/') +- --s; +- if(*s=='.') +- *s++=0; +- else if(*s=='/') +- s=buf+strlen(buf); +- +- /* upon first jump to this if block rename the first file */ +- if(filecount==1) { +- if(*s) +- snprintf(namebuf, sizeof(namebuf), "%s-01.%s", buf, s); +- else +- snprintf(namebuf, sizeof(namebuf), "%s-01", buf); +- remove(namebuf); +- rename(name, namebuf); +- filecount=2; +- } +- +- /* name of the current file */ +- if(*s) +- snprintf(namebuf, sizeof(namebuf), "%s-%02i.%s", buf, filecount, s); +- else +- snprintf(namebuf, sizeof(namebuf), "%s-%02i", buf, filecount); +- name=namebuf; +- ++ if (filecount) { ++ filecount = new_capture_file(orig_name, namebuf, ++ sizeof(namebuf), ++ filecount); ++ name = namebuf; + } +- ++ + /* open a new file */ + remove(name); + if ((fd = open64(name, O_WRONLY | O_CREAT, 0644)) == -1) { + perror(name); + exit(EXIT_FAILURE); + } +- fdcount = 0; + filecount++; + } ++ ++ rest = count; ++ if (rest > fmt_rec_table[file_type].max_filesize) ++ rest = fmt_rec_table[file_type].max_filesize; + + /* setup sample header */ + if (fmt_rec_table[file_type].start) +- fmt_rec_table[file_type].start(fd, pbrec_count); ++ fmt_rec_table[file_type].start(fd, rest); + + /* capture */ +- do { +- ssize_t r=0; +- for (; cur > 0 && fdcount<fmt_rec_table[file_type].max_filesize; cur -= r) { +- ssize_t err; +- size_t c = (cur <= chunk_bytes) ? cur : chunk_bytes; +- c = c * 8 / bits_per_frame; +- if ((size_t)(r = pcm_read(audiobuf, c)) != c) +- break; +- r = r * bits_per_frame / 8; +- if ((err = write(fd, audiobuf, r)) != r) { +- perror(name); +- exit(EXIT_FAILURE); +- } +- if (err > 0) +- fdcount += err; ++ while (rest > 0) { ++ ssize_t err; ++ size_t c = (rest <= (off_t)chunk_bytes) ? ++ (size_t)rest : chunk_bytes; ++ c = c * 8 / bits_per_frame; ++ if ((size_t)(err = pcm_read(audiobuf, c)) != c) ++ break; ++ c = err * bits_per_frame / 8; ++ if ((err = write(fd, audiobuf, c)) != c) { ++ perror(name); ++ exit(EXIT_FAILURE); + } +- /* exit conditions: +- 1) format_raw and a timelimit +- 2) all requested samples/bytes have been captured (cur>0) +- 3) filesize threshold was reached (fdcount<wrthreshold) +- */ - } while (file_type == FORMAT_RAW && !timelimit && cur>0 && fdcount<fmt_rec_table[file_type].max_filesize); -+ } while (file_type == FORMAT_RAW && !timelimit && cur>0 && -+ fdcount<fmt_rec_table[file_type].max_filesize); ++ if (err > 0) { ++ count -= err; ++ rest -= err; ++ } ++ } /* finish sample container */ - fmt_rec_table[file_type].end(fd); - - /* repeat the loop when format is raw without timelimit or filesize threshold was reached */ +- fmt_rec_table[file_type].end(fd); +- +- /* repeat the loop when format is raw without timelimit or filesize threshold was reached */ - } while((file_type == FORMAT_RAW && !timelimit) || fdcount>=fmt_rec_table[file_type].max_filesize); -+ } while((file_type == FORMAT_RAW && !timelimit) || -+ fdcount < fmt_rec_table[file_type].max_filesize); ++ if (fmt_rec_table[file_type].end) ++ fmt_rec_table[file_type].end(fd); ++ ++ /* repeat the loop when format is raw without timelimit or ++ * requested counts of data are recorded ++ */ ++ } while ((file_type == FORMAT_RAW && !timelimit) || count > 0); } void playbackv_go(int* fds, unsigned int channels, size_t loaded, off64_t count, int rtype, char **names) diff -r 420590283171 seq/aplaymidi/aplaymidi.c --- a/seq/aplaymidi/aplaymidi.c Wed Apr 19 12:29:49 2006 +0200 -+++ b/seq/aplaymidi/aplaymidi.c Mon May 15 12:46:04 2006 +0200 ++++ b/seq/aplaymidi/aplaymidi.c Wed May 17 15:01:37 2006 +0200 @@ -786,6 +786,10 @@ static void list_ports(void) snd_seq_port_info_set_client(pinfo, client); snd_seq_port_info_set_port(pinfo, -1); @@ -74,7 +273,7 @@ & (SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE)) diff -r 420590283171 seq/aplaymidi/arecordmidi.c --- a/seq/aplaymidi/arecordmidi.c Wed Apr 19 12:29:49 2006 +0200 -+++ b/seq/aplaymidi/arecordmidi.c Mon May 15 12:46:04 2006 +0200 ++++ b/seq/aplaymidi/arecordmidi.c Wed May 17 15:01:37 2006 +0200 @@ -659,6 +659,10 @@ static void list_ports(void) snd_seq_port_info_set_client(pinfo, client); snd_seq_port_info_set_port(pinfo, -1); @@ -88,7 +287,7 @@ & (SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ)) diff -r 420590283171 speaker-test/speaker-test.c --- a/speaker-test/speaker-test.c Wed Apr 19 12:29:49 2006 +0200 -+++ b/speaker-test/speaker-test.c Mon May 15 12:46:04 2006 +0200 ++++ b/speaker-test/speaker-test.c Wed May 17 15:01:37 2006 +0200 @@ -342,6 +342,8 @@ static int set_hwparams(snd_pcm_t *handl } if (! buffer_time && ! period_time) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit aalib
by root＠suse.de 17 May '06

17 May '06

Hello community, here is the log from the commit of package aalib checked in at Wed May 17 18:37:05 CEST 2006. -------- --- aalib/aalib.changes 2006-04-10 13:36:25.000000000 +0200 +++ aalib/aalib.changes 2006-05-17 12:04:57.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 17 12:04:20 CEST 2006 - schwab(a)suse.de + +- Avoid crash when resizing window with X driver. + +------------------------------------------------------------------- New: ---- aalib-reentrant.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aalib.spec ++++++ --- /var/tmp/diff_new_pack.PswwGc/_old 2006-05-17 18:36:51.000000000 +0200 +++ /var/tmp/diff_new_pack.PswwGc/_new 2006-05-17 18:36:51.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/Libraries Autoreqprov: on Version: 1.4.0 -Release: 300 +Release: 305 Summary: An ASCII Art Library Source: aalib-1.4rc5.tar.gz Source1: aavga-1.0rc1.tar.gz @@ -31,6 +31,7 @@ Patch7: aview-signed-char.patch Patch8: aview-includes.patch Patch9: aalib-includes.patch +Patch10: aalib-reentrant.patch PreReq: %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -48,7 +49,7 @@ %package devel Version: 1.4.0 -Release: 300 +Release: 305 Summary: Development Package for AAlib Group: Development/Libraries/C and C++ Autoreqprov: on @@ -69,6 +70,7 @@ %setup -q -a 1 -b 2 %patch1 %patch3 +%patch10 cd aavga-1.0 %patch2 cd ../../aview-* @@ -93,7 +95,6 @@ make %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} cp -av ANNOUNCE AUTHORS COPYING INSTALL NEWS README $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} @@ -109,7 +110,7 @@ cp -av README* ANNOUNCE COPYING TODO *.lsm $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/aview cd - cd aavga-1.0 -make DESTDIR=$RPM_BUILD_ROOT +make CFLAGS="$RPM_OPT_FLAGS" cp -av aavga.so $RPM_BUILD_ROOT%_libdir mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/aavga cp -av aavga.lsm COPYING README $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/aavga @@ -159,6 +160,8 @@ %{_mandir}/man3/save_d.3.gz %changelog -n aalib +* Wed May 17 2006 - schwab(a)suse.de +- Avoid crash when resizing window with X driver. * Mon Apr 10 2006 - meissner(a)suse.de - added requires slang-devel to aalib-devel * Wed Jan 25 2006 - mls(a)suse.de ++++++ aalib-reentrant.patch ++++++ --- src/aax.c +++ src/aax.c @@ -437,6 +437,12 @@ int l, same; int s = 0; int pos; + static int called; + if (called++) + { + --called; + return; + } attr = AA_NORMAL; alloctables(d); drawed = 0; @@ -537,6 +543,7 @@ XSync(d->dp, 0); } freetables(); + called--; } void __aa_X_redraw(aa_context *c) { ++++++ aavga.dif ++++++ --- /var/tmp/diff_new_pack.PswwGc/_old 2006-05-17 18:36:51.000000000 +0200 +++ /var/tmp/diff_new_pack.PswwGc/_new 2006-05-17 18:36:51.000000000 +0200 @@ -3,5 +3,43 @@ @@ -1,3 +1,3 @@ aavga.so: aavga.c Makefile - gcc -Wl,-soname,libvga.so.1 -o aavga.so -shared -nostdlib -fPIC aavga.c -laa -lX11 -lm -lgpm -lc -O2 -fomit-frame-pointer -funroll-all-loops -L /usr/X11R6/lib -lncurses -+ gcc -Wl,-soname,libvga.so.1 -o aavga.so -shared -nostdlib -fPIC aavga.c -laa -lX11 -lm -lgpm -lc -O2 -fomit-frame-pointer -funroll-all-loops -I../src -L /usr/X11R6/lib64 -L /usr/X11R6/lib -L../src/.libs -lncurses ++ gcc -Wl,-soname,libvga.so.1 -o aavga.so -shared -nostdlib -fPIC aavga.c -laa -lX11 -lm -lgpm -O2 -fomit-frame-pointer -funroll-all-loops $(CFLAGS) -I../src -L /usr/X11R6/lib64 -L /usr/X11R6/lib -L../src/.libs -lncurses #i486-linuxlibc1-gcc -Wl,-soname,libvga.so.1 -o aavga.so -shared -nostdlib -fPIC aavga.c -laa -lX11 -lm -lgpm -lc -O2 -fomit-frame-pointer -funroll-all-loops #-L /usr/X11R6/lib +--- aavga.c ++++ aavga.c +@@ -64,7 +64,7 @@ + + }; + #define MAXMODE 13 +-int ++void + vga_setmousesupport (int stat) + { + if (debug) +@@ -257,7 +257,7 @@ + } + + +-int ++void + vga_setpalvec (int a, int b, int *n) + { + int i; +@@ -268,7 +268,7 @@ + aa_setpalette (palette, i, n[i * 3] * 4, n[i * 3 + 1] * 4, n[i * 3 + 2] * 4); + vga_flush (0); + } +-int ++void + vga_setpalette (int i, int r, int g, int b) + { + if (debug) +@@ -276,7 +276,7 @@ + aa_setpalette (palette, i, r * 4, g * 4, b * 4); + vga_flush (0); + } +-int ++void + vga_setcolor (int i) + { + if (debug) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit perl-NetAddr-IP
by root＠suse.de 16 May '06

16 May '06

Hello community, here is the log from the commit of package perl-NetAddr-IP checked in at Wed May 17 01:19:30 CEST 2006. -------- --- perl-NetAddr-IP/perl-NetAddr-IP.changes 2006-01-25 21:39:52.000000000 +0100 +++ perl-NetAddr-IP/perl-NetAddr-IP.changes 2006-05-08 11:10:09.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 8 11:04:16 CEST 2006 - ms(a)suse.de + +- update to version 3.32 + +------------------------------------------------------------------- Old: ---- NetAddr-IP-3.24.tar.gz New: ---- NetAddr-IP-3.32.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-NetAddr-IP.spec ++++++ --- /var/tmp/diff_new_pack.X6wqUD/_old 2006-05-17 01:19:25.000000000 +0200 +++ /var/tmp/diff_new_pack.X6wqUD/_new 2006-05-17 01:19:25.000000000 +0200 @@ -1,11 +1,11 @@ # -# spec file for package perl-NetAddr-IP (Version 3.24) +# spec file for package perl-NetAddr-IP (Version 3.32) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -15,8 +15,8 @@ Group: Development/Libraries/Perl Provides: NetAddr Autoreqprov: on -Version: 3.24 -Release: 5 +Version: 3.32 +Release: 1 Summary: NetAddr::IP - Manages IP addresses and subnets Url: http://search.cpan.org Source: NetAddr-IP-%{version}.tar.gz @@ -62,6 +62,8 @@ /var/adm/perl-modules/%{name} %changelog -n perl-NetAddr-IP +* Mon May 08 2006 - ms(a)suse.de +- update to version 3.32 * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Sep 29 2005 - dmueller(a)suse.de ++++++ NetAddr-IP-3.24.tar.gz -> NetAddr-IP-3.32.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetAddr-IP-3.24/IP.pm new/NetAddr-IP-3.32/IP.pm --- old/NetAddr-IP-3.24/IP.pm 2005-03-24 22:14:46.000000000 +0100 +++ new/NetAddr-IP-3.32/IP.pm 2006-05-01 19:11:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# $Id: IP.pm,v 1.30 2005/03/24 21:14:46 lem Exp $ +# $Id: IP.pm,v 3.32 2006/05/01 17:11:18 lem Exp $ package NetAddr::IP; @@ -28,7 +28,7 @@ =head1 DESCRIPTION This module provides an object-oriented abstraction on top of IP -addresses or IP subnets, that allows for easy manipulations. Many +addresses or IP subnets, that allows for easy manipulations. Many operations are supported, as described below: =head2 Overloaded Operators @@ -48,7 +48,13 @@ our @ISA = qw(Exporter); -our $VERSION = '3.24'; +our $VERSION = do { sprintf "%d.%02d", (q$Revision: 3.32 $ =~ /\d+/g) }; + +# Set to true, to enable recognizing of 4-octet binary notation IP +# addresses. Thanks to Steve Snodgrass for reporting. This can be done +# at the time of use-ing the module. See docs for details. + +our $Accept_Binary_IP = 0; ############################################# # These are the overload methods, placed here @@ -294,6 +300,8 @@ return $ip; } +=pod + =item B<Auto-decrement> Auto-decrementing a NetAddr::IP object performs exactly the opposite @@ -369,11 +377,15 @@ for my $o (0 .. $octets) { - return unless grep { vec($mask, $o, 8) == $_ } - (255, 254, 252, 248, 240, 224, 192, 128, 0); + my $v = vec($mask, $o, 8); +# return unless grep { $v == $_ } +# (255, 254, 252, 248, 240, 224, 192, 128, 0); + return unless $v == 255 or $v == 254 or $v == 252 or + $v == 248 or $v == 240 or $v == 224 or $v == 192 or + $v == 128 or $v == 0; } - return 1; + 1; } sub _to_quad ($) { @@ -426,13 +438,13 @@ } sub _parse_mask ($$) { - my $mask = lc shift; + my $mask = shift; my $bits = shift; my $bmask = ''; if ($bits == 128) { - if (grep($mask eq $_ , qw(unspecified loopback))) { + if (grep(lc $mask eq $_ , qw(unspecified loopback))) { for (0..3) { vec($bmask, $_, 32) = 0xFFFFFFFF; } @@ -454,15 +466,29 @@ else { $bmask = undef; } - return $bmask; } - elsif ($mask eq 'default' or $mask eq 'any') { + elsif ($mask eq '32') + { + # *Very* common case + # $bmask = "\xff\xff\xff\xff"; + vec($bmask, 0, 32) = 0xffffffff; + } + elsif ($mask =~ m/^(\d+)$/ and $1 <= 32) { + # Another very common case + if ($1) { + vec($bmask, 0, $bits) = _ones $bits; + vec($bmask, 0, $bits) <<= ($bits - $1); + } else { + vec($bmask, 0, $bits) = 0x0; + } + } + elsif (lc $mask eq 'default' or lc $mask eq 'any') { vec($bmask, 0, $bits) = 0x0; } - elsif ($mask eq 'broadcast' or $mask eq 'host') { + elsif (lc $mask eq 'broadcast' or lc $mask eq 'host') { vec($bmask, 0, $bits) = _ones $bits; } - elsif ($mask eq 'loopback') { + elsif (lc $mask eq 'loopback') { vec($bmask, 0, 8) = 255; vec($bmask, 1, 8) = 0; vec($bmask, 2, 8) = 0; @@ -487,19 +513,11 @@ vec($bmask, 2, 8) = $3; vec($bmask, 3, 8) = $4; } - elsif ($mask =~ m/^(\d+)$/ and $1 <= 32) { - if ($1) { - vec($bmask, 0, $bits) = _ones $bits; - vec($bmask, 0, $bits) <<= ($bits - $1); - } else { - vec($bmask, 0, $bits) = 0x0; - } - } elsif ($mask =~ m/^(\d+)$/) { vec($bmask, 0, $bits) = $1; } - return $bmask; + $bmask; } sub _obits ($$) { @@ -511,29 +529,20 @@ } sub _v4 ($$$) { - my $ip = lc shift; + my $ip = shift; my $mask = shift; my $present = shift; my $addr = ''; my $a; - if ($ip eq 'default' or $ip eq 'any') { - vec($addr, 0, 32) = 0x0; - } - elsif ($ip eq 'broadcast') { - vec($addr, 0, 32) = _ones 32; - } - elsif ($ip eq 'loopback') { - vec($addr, 0, 8) = 127; - vec($addr, 3, 8) = 1; - } - elsif ($ip =~ m/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/ + if ($ip =~ m/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/ and $1 >= 0 and $1 <= 255 and $2 >= 0 and $2 <= 255 and $3 >= 0 and $3 <= 255 and $4 >= 0 and $4 <= 255) { + # The most frequent case vec($addr, 0, 8) = $1; vec($addr, 1, 8) = $2; vec($addr, 2, 8) = $3; @@ -694,6 +703,40 @@ vec($mask, 1, 8) = _obits $2, $6; vec($mask, 2, 8) = _obits $3, $7; vec($mask, 3, 8) = _obits $4, $8; + + # Barf on invalid ranges. There can only be one + # octet in the netmask that is neither 0 nor 255. + + return + if grep ({ + vec($mask, $_, 8) != 0 + and vec($mask, $_, 8) != 255 + } (0 .. 3)) > 1; + + # Barf on invalid ranges. No octet on the right + # can be larger that any octet on the left + + for (0 .. 2) + { + return if vec($mask, $_, 8) < vec($mask, $_ + 1, 8); + } + } + elsif ($Accept_Binary_IP + and !$present and length($ip) == 4) { + my @o = unpack("C4", $ip); + + vec($addr, $_, 8) = $o[$_] for 0 .. 3; + vec($mask, 0, 32) = 0xFFFFFFFF; + } + elsif (lc $ip eq 'default' or lc $ip eq 'any') { + vec($addr, 0, 32) = 0x0; + } + elsif (lc $ip eq 'broadcast') { + vec($addr, 0, 32) = _ones 32; + } + elsif (lc $ip eq 'loopback') { + vec($addr, 0, 8) = 127; + vec($addr, 3, 8) = 1; } elsif (($a = gethostbyname($ip)) and defined($a) and ($a ne pack("C4", 0, 0, 0, 0))) { @@ -704,18 +747,14 @@ vec($addr, 3, 8) = $4; } } - elsif (!$present and length($ip) == 4) { - my @o = unpack("C4", $ip); - - vec($addr, $_, 8) = $o[$_] for 0 .. 3; - vec($mask, 0, 32) = 0xFFFFFFFF; - } else { # croak "Cannot obtain an IP address out of $ip"; - return undef; + return; } - return { addr => $addr, mask => $mask, bits => 32 }; + # Return the completed hash (no explicit return as this seems to be + # faster...) + { addr => $addr, mask => $mask, bits => 32 }; } sub expand_v6 ($) { @@ -829,7 +868,13 @@ }; } + if (grep { $_ eq ':aton' } @_) + { + $Accept_Binary_IP = 1; + } + @_ = grep { $_ ne ':old_storable' } @_; + @_ = grep { $_ ne ':aton' } @_; NetAddr::IP->export_to_level(1, @_); } @@ -853,8 +898,13 @@ speficied by the prefix must match with a valid subnet. Addresses in the same format returned by C<inet_aton> or -C<gethostbyname> are also understood, although no mask can be -specified for them. +C<gethostbyname> can also be understood, although no mask can be +specified for them. The default is to not attempt to recognize this +format, as it seems to be seldom used. + +To accept addresses in that format, invoke the module as in + + use NetAddr::IP ':aton' If called with no arguments, 'default' is assumed. @@ -866,20 +916,20 @@ sub new ($$;$) { my $type = $_[0]; my $class = ref($type) || $type || "NetAddr::IP"; - my $ip = lc $_[1]; + my $ip = $_[1]; my $hasmask = 1; my $bits; my $mask; $ip = 'default' unless defined $ip; - $bits = $ip =~ /:/ ? 128 : 32; + $bits = index($ip, ':') >= 0 ? 128 : 32; if (@_ == 2) { if ($ip =~ m!^(.+)/(.+)$!) { $ip = $1; $mask = $2; } - elsif (grep { $ip eq $_ } (qw(default any broadcast loopback))) + elsif (grep { lc $ip eq $_ } (qw(default any broadcast loopback))) { $mask = $ip; } @@ -887,7 +937,7 @@ if (defined $_[2]) { if ($_[2] =~ /^ipv6$/i) { - if (grep { $ip eq $_ } (qw(unspecified loopback))) { + if (grep { lc $ip eq $_ } (qw(unspecified loopback))) { $bits = 128; $mask = _parse_mask $ip, $bits; } @@ -1264,7 +1314,7 @@ } } -*{compact_addr} = \&short; +# *{compact_addr} = \&short; =pod @@ -1764,7 +1814,7 @@ =head1 HISTORY -$Id: IP.pm,v 1.30 2005/03/24 21:14:46 lem Exp $ +$Id: IP.pm,v 3.32 2006/05/01 17:11:18 lem Exp $ =over @@ -2363,11 +2413,39 @@ Version bump. Transfer of 3.23 to CPAN ended up in a truncated file being uploaded. +=item 3.25 + +Some IP specs resembling range notations but not depicting actual CIDR +ranges, were being erroneously recognized. Thanks to Steve Snodgrass +for reporting a bug with parsing IP addresses in 4-octet binary +format. Added optional Pod::Coverage tests. compact_addr has been +commented out, after a long time as deprecated. Improved speed of +-E<gt>new() for the case of a single host IPv4 address, which seems to +be the most common one. + =back +$Log: IP.pm,v $ +Revision 3.32 2006/05/01 17:11:18 lem +Force update as upload failed + +Revision 3.31 2006/05/01 16:47:15 lem +Fixed CPAN #16754, version contained a space + +Revision 3.30 2006/05/01 15:31:19 lem +Moved DNS resolution to the last spot in the chain, before special +keywords, as suggested by Kevin Brintnall - Thanks! + +Revision 3.29 2005/10/05 18:01:30 lem +Change version digits back to previous levels + +Revision 3.28 2005/09/28 23:56:52 lem +Each revision will now add the CVS log to the docs automatically. + + =head1 AUTHOR -Luis E. Muñoz <luismunoz(a)cpan.org> +Luis E. MuÃ±oz <luismunoz(a)cpan.org> =head1 WARRANTY @@ -2376,7 +2454,7 @@ =head1 LICENSE -This software is (c) Luis E. Muñoz. It can be used under the terms of +This software is (c) Luis E. MuÃ±oz. It can be used under the terms of the perl artistic license provided that proper credit for the work of the author is preserved in the form of this copyright notice and license for this module. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetAddr-IP-3.24/MANIFEST.SKIP new/NetAddr-IP-3.32/MANIFEST.SKIP --- old/NetAddr-IP-3.24/MANIFEST.SKIP 2005-03-24 19:39:53.000000000 +0100 +++ new/NetAddr-IP-3.32/MANIFEST.SKIP 2005-09-11 07:25:42.000000000 +0200 @@ -11,6 +11,7 @@ ^tmp/ \.old$ \.bak$ +\.tmp$ ~$ ^# \.shar$ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetAddr-IP-3.24/META.yml new/NetAddr-IP-3.32/META.yml --- old/NetAddr-IP-3.24/META.yml 2005-03-24 22:20:58.000000000 +0100 +++ new/NetAddr-IP-3.32/META.yml 2006-05-01 19:11:45.000000000 +0200 @@ -1,11 +1,12 @@ +# http://module-build.sourceforge.net/META-spec.html #XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# name: NetAddr-IP -version: 3.24 +version: 3.32 version_from: IP.pm installdirs: site requires: - Test::More: 0 Math::BigInt: 0 + Test::More: 0 distribution_type: module -generated_by: ExtUtils::MakeMaker version 6.12 +generated_by: ExtUtils::MakeMaker version 6.17 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetAddr-IP-3.24/Makefile.PL new/NetAddr-IP-3.32/Makefile.PL --- old/NetAddr-IP-3.24/Makefile.PL 2005-03-24 19:55:10.000000000 +0100 +++ new/NetAddr-IP-3.32/Makefile.PL 2005-08-25 17:36:09.000000000 +0200 @@ -2,7 +2,7 @@ # See lib/ExtUtils/MakeMaker.pm for details of how to influence # the contents of the Makefile that is written. -# $Id: Makefile.PL,v 1.10 2005/03/24 18:55:10 lem Exp $ +# $Id: Makefile.PL,v 1.11 2005/08/25 15:36:09 lem Exp $ my $checker = 0; @@ -26,6 +26,25 @@ ; } +$checker = 0; + +eval q{ use Pod::Coverage; + $checker = 1; }; + +unless ($checker) +{ + print <<EOF; + +You might want to install Pod::Coverage, so that coverage of the +documentation can be properly tested. You can do so by typing the +following: + + perl -MCPAN -e "install('Pod::Coverage')" + +EOF + ; +} + print <<EOF; ====================================================================== @@ -43,6 +62,14 @@ If you do not use Storable along NetAddr::IP or just don't know what this all means, most likely you're safe to go along. +Versions before 3.25 recognized by default IP addresses as returned by +inet_aton. This is no longer the default. To enable this behaviour +again, the module must be use()d as + + use NetAddr::IP ':aton'; + +We're still open for feedback on this one... + EOF ; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetAddr-IP-3.24/README new/NetAddr-IP-3.32/README --- old/NetAddr-IP-3.24/README 2005-03-24 19:54:01.000000000 +0100 +++ new/NetAddr-IP-3.32/README 2006-05-01 18:01:34.000000000 +0200 @@ -4,6 +4,7 @@ + NetAddr::IP - Manages IP addresses and subnets * * * * THIS MODULE REQUIRES PERL 5.6.0 OR NEWER. * * * * @@ -124,6 +125,14 @@ Report your bugs to me (luismunoz(a)cpan.org) +DO YOU WANT TO THANK ME? + +If you consider this a valuable contribution, there is a web page +where you can express your gratitude. Please see + + http://mipagina.cantv.net/lem/thanks-en.html (English) + http://mipagina.cantv.net/lem/thanks-es.html (Spanish) + SECURITY CONSIDERATIONS I have no control on the machanisms involved in the storage or @@ -152,7 +161,7 @@ LICENSE AND WARRANTY -This software is (c) Luis E. Muñoz. It can be used under the terms of +This software is (c) Luis E. MuÃ±oz. It can be used under the terms of the perl artistic license provided that proper credit for the work of the author is preserved in the form of this copyright notice and license for this module. @@ -162,7 +171,7 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (Darwin) -iD8DBQFCQwzJQyDWGRI/hhARAqd9AJ0XLAPEZ/r0laqAs4XhZ26xf00OAQCgzYxk -IjdkSW+uHhcUXN6nJlo7yqA= -=9Ztj +iD8DBQFEVjDeQyDWGRI/hhARAk+FAJ9hlpLFuGsJiGLqPzEA/jO+lCkoSACgjsMV +arBrKLqsAmyuUGm+JXA1rn0= +=6Doe -----END PGP SIGNATURE----- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetAddr-IP-3.24/SIGNATURE new/NetAddr-IP-3.32/SIGNATURE --- old/NetAddr-IP-3.24/SIGNATURE 2005-03-24 22:20:52.000000000 +0100 +++ new/NetAddr-IP-3.32/SIGNATURE 2006-05-01 18:57:55.000000000 +0200 @@ -14,15 +14,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -SHA1 8200f5d7dc8f45ffefc9ab0da2c885359830383f IP.pm +SHA1 d418fed3d33925e002411a2d36c1174d27704749 IP.pm SHA1 6433ee417d2773d717542beda307a4b769f23445 MANIFEST -SHA1 abef850c470fc33a86dd3d6658d9b7365ceb63b5 MANIFEST.SKIP -SHA1 aeb53c5d74c070190b2e543ea6a3d8b3c4d90f29 META.yml -SHA1 08862d39eaaa83329195724aae0817bcd2485727 Makefile.PL -SHA1 e0a622d5dfe578b0344b824b27f9c0a46f029250 README -SHA1 a3c3e184556159978520c47b7837c26efa453b29 TODO +SHA1 30074c1a88a1ac469ce2bab6104ee099d334d466 MANIFEST.SKIP +SHA1 15b06e5353ff05dd2fa881d5eb92e0a4a9457e67 META.yml +SHA1 7ff7c25206c71b0b8e16f782d33279a67ef0a6a3 Makefile.PL +SHA1 15f79045eb6bf6b0d4b35f4ca0468340f5e57a15 README +SHA1 834b38162820d64484b5c8f3e601962e60742ff6 TODO SHA1 2bf2f62cb765b20126756819844b45cbe5f89979 t/00-Sign.t -SHA1 ab5209c930fd972d45b9e740fb00ada18810c13b t/00-load.t +SHA1 ea1ba2a8137b5912f060a053a981d73ea300f73f t/00-load.t SHA1 647ad43b533838cfcacfd85af3c2176d9de9dc20 t/bitops.t SHA1 408e29a1b1ded7a1f42501c3e0843a1b07ac01c1 t/imhoff.t SHA1 ad8be2dc7d91acd0ab1e637f3032ff0175b879b1 t/loops.t @@ -33,8 +33,8 @@ SHA1 b577c363d7cad97f82750799ee2391bb2b625569 t/over-qq.t SHA1 a7b84175a7c961dfcc786d423a104c8e3e4c447b t/relops.t SHA1 1e520807bd379a9b1fa856f854cdfd1a41f81234 t/short.t -SHA1 2811d25f196f16858f8842118619b40199f155bd t/v4-aton.t -SHA1 aff5265fae459859785d1fa31a0d5b7da999032b t/v4-badnm.t +SHA1 2a052e687e3e08e79105214400f986227d3b36e4 t/v4-aton.t +SHA1 3234faaa5d93006fc00acf730cfcab20eeea9cfb t/v4-badnm.t SHA1 44e867fa16b31c47303407d2cf36c9e5281be695 t/v4-base.t SHA1 87c2bb554a3411ae076615b34ee89f8de1254621 t/v4-basem.t SHA1 215bc6deba22404eee3aa398dc66e5ddc070747a t/v4-cidr.t @@ -66,7 +66,7 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (Darwin) -iD8DBQFCQy80QyDWGRI/hhARAnTvAJ9aC7i9pgxI3kBJG7PJe4536GX50ACfSNdG -5v1M8ea98NiVxftZS/aQJpg= -=HR+z +iD8DBQFEVj4TQyDWGRI/hhARAr86AJ9pi5rGbrZ2s52Z43yiDEkynHSydACeK0u7 +ABWPf7iltCldgXsPY11webA= +=CoX8 -----END PGP SIGNATURE----- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetAddr-IP-3.24/TODO new/NetAddr-IP-3.32/TODO --- old/NetAddr-IP-3.24/TODO 2005-03-24 21:41:51.000000000 +0100 +++ new/NetAddr-IP-3.32/TODO 2006-05-01 18:55:18.000000000 +0200 @@ -1,5 +1,5 @@ -$Id: TODO,v 1.6 2005/03/24 20:41:51 lem Exp $ +$Id: TODO,v 1.7 2006/05/01 16:55:18 lem Exp $ o More tests for IPv6 functionality. This should be thoroughly tested. @@ -10,3 +10,13 @@ o Add a way to force the recognition of a v6 IP address when the input is presented numerically. (Suggested by Carlos Vicente) +o As suggested by Geoff Seeley's application, it may be good to have a + method that will convert an arbitrary IP range into a list of + subnets (a list of NetAddr::IP objects) + +o Add simple is_broadcast and is_network utility functions + +o Have foreach iteration of NetAddr::IP return objects based in the + specified netmask instead of forcing /32s, as suggested by Steve + Thompson + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetAddr-IP-3.24/t/00-load.t new/NetAddr-IP-3.32/t/00-load.t --- old/NetAddr-IP-3.24/t/00-load.t 2004-03-02 21:21:36.000000000 +0100 +++ new/NetAddr-IP-3.32/t/00-load.t 2006-05-01 17:24:50.000000000 +0200 @@ -1,6 +1,6 @@ # Generic load/POD test suite -# $Id: 00-load.t,v 1.4 2004/03/02 20:21:36 lem Exp $ +# $Id: 00-load.t,v 1.6 2006/05/01 15:24:50 lem Exp $ use Test::More; @@ -10,16 +10,21 @@ my @paths = (); -plan tests => 2 * scalar @modules; +plan tests => 3 * scalar @modules; use_ok($_) for @modules; my $checker = 0; +my $coverage = 0; eval { require Test::Pod; - Test::Pod::import(); + Test::Pod::import(); $checker = 1; }; +eval { require Pod::Coverage; + Pod::Coverage::import(); + $coverage = 1; }; + for my $m (@modules) { my $p = $m . ".pm"; @@ -27,11 +32,36 @@ push @paths, $INC{$p}; } -END { unlink "./out.$$" }; - SKIP: { skip "Test::Pod is not available on this host", scalar @paths unless $checker; pod_file_ok($_) for @paths; } +SKIP: { skip "Pod::Coverage is not available on this host", scalar @paths + unless $coverage; + + for my $m (@modules) + { + my $pc = Pod::Coverage->new(package => $m, + also_private => [qr/^STORABLE_/, + qr/^new4$/, + qr/^expand_v6$/, + qr/^do_prefix$/, + ], + trustme => [ qr/^Coalesce$|^Compact$/, + qr/^(plus){1,2}$/, + qr/^(minus){1,2}$/ + ], + ); + unless (is($pc->coverage, 1, "Coverage for $m")) + { +# diag "Symbols covered:\n", +# join("\n", map { " " . $_ } $pc->covered); + diag "Symbols NOT covered:\n", + join("\n", map { " " . $_ } $pc->naked); + } + } + } + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetAddr-IP-3.24/t/v4-aton.t new/NetAddr-IP-3.32/t/v4-aton.t --- old/NetAddr-IP-3.24/t/v4-aton.t 2002-10-31 14:45:29.000000000 +0100 +++ new/NetAddr-IP-3.32/t/v4-aton.t 2005-08-25 17:38:03.000000000 +0200 @@ -1,8 +1,7 @@ -use Test::More tests => 15; +use Test::More tests => 18; use Socket; -use NetAddr::IP; -# $Id: v4-aton.t,v 1.2 2002/10/31 13:45:29 lem Exp $ +# $Id: v4-aton.t,v 1.3 2005/08/25 15:38:03 lem Exp $ my @addr = ( [ 'localhost', '127.0.0.1' ], @@ -13,11 +12,29 @@ ); -is(NetAddr::IP->new($_->[0])->aton, inet_aton($_->[1]), "->aton($_->[0])") - for @addr; +# Verify that Accept_Binary_IP works... -ok(defined NetAddr::IP->new(inet_aton($_->[1])), "->new aton($_->[1])") - for @addr; +SKIP: +{ + skip "Failed to load NetAddr::IP", 17 + unless use_ok('NetAddr::IP'); -is(NetAddr::IP->new(inet_aton($_->[1]))->addr, $_->[1], "->new aton($_->[1])") - for @addr; + ok(! defined NetAddr::IP->new("\1\1\1\1"), + "binary unrecognized by default..."); + + # This mimicks the actual use with :aton + NetAddr::IP::import(':aton'); + + ok(defined NetAddr::IP->new("\1\1\1\1"), + "...but can be recognized"); + + is(NetAddr::IP->new($_->[0])->aton, inet_aton($_->[1]), "->aton($_->[0])") + for @addr; + + ok(defined NetAddr::IP->new(inet_aton($_->[1])), "->new aton($_->[1])") + for @addr; + + is(NetAddr::IP->new(inet_aton($_->[1]))->addr, $_->[1], + "->new aton($_->[1])") + for @addr; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetAddr-IP-3.24/t/v4-badnm.t new/NetAddr-IP-3.32/t/v4-badnm.t --- old/NetAddr-IP-3.24/t/v4-badnm.t 2002-10-31 05:30:35.000000000 +0100 +++ new/NetAddr-IP-3.32/t/v4-badnm.t 2005-08-08 04:42:05.000000000 +0200 @@ -1,58 +1,44 @@ # I know this does not look like -*- perl -*-, but I swear it is... -# $Id: v4-badnm.t,v 1.2 2002/10/31 04:30:35 lem Exp $ +# $Id: v4-badnm.t,v 1.3 2005/08/08 02:42:05 lem Exp $ -use NetAddr::IP; use strict; +use Test::More; $| = 1; our @badnets = ( - '10.10.10.10/255.255.0.255', - '10.10.10.10/255.0.255.255', - '10.10.10.10/0.255.255.255', - '10.10.10.10/128.255.0.255', - '10.10.10.10/255.128.0.255', - '10.10.10.10/255.255.255.129', - '10.10.10.10/255.255.129.0', - '10.10.10.10/255.255.255.130', - '10.10.10.10/255.255.130.0', - '10.10.10.10/255.0.0.1', - '10.10.10.10/255.129.0.1', - '10.10.10.10/0.255.0.255', - ); + '10.10.10.10/255.255.0.255', + '10.10.10.10/255.0.255.255', + '10.10.10.10/0.255.255.255', + '10.10.10.10/128.255.0.255', + '10.10.10.10/255.128.0.255', + '10.10.10.10/255.255.255.129', + '10.10.10.10/255.255.129.0', + '10.10.10.10/255.255.255.130', + '10.10.10.10/255.255.130.0', + '10.10.10.10/255.0.0.1', + '10.10.10.10/255.129.0.1', + '10.10.10.10/0.255.0.255', + '58.26.0.0-58.27.127.255', # Taken from APNIC's WHOIS case +); our @goodnets = (); push @goodnets, "10.0.0.1/$_" for (0 .. 32); push @goodnets, "10.0.0.1/255.255.255.255"; -print '1..', (scalar @badnets + scalar @goodnets) , "\n"; +plan tests => 1 + @badnets + @goodnets; -my $count = 1; +die "# Cannot continue without NetAddr::IP\n" + unless use_ok('NetAddr::IP'); -for my $bad (@badnets) { +my $count = 1; - if (defined NetAddr::IP->new($bad)) { - print "not ok $count # $bad should fail but succeeded\n"; - } - else { - print "ok $count # $bad must fail\n"; - } - - ++ $count; -} - -for my $good (@goodnets) { - - if (defined NetAddr::IP->new($good)) { - print "ok $count # $good should not fail\n"; - } - else { - print "not ok $count # $good must not fail\n"; - } +ok(! defined NetAddr::IP->new($_), "new $_ should fail") + for @badnets; - ++ $count; -} +ok(defined NetAddr::IP->new($_), "new $_ should work") + for @goodnets; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit nautilus
by root＠suse.de 16 May '06

16 May '06

Hello community, here is the log from the commit of package nautilus checked in at Wed May 17 01:17:10 CEST 2006. -------- --- GNOME/nautilus/nautilus.changes 2006-05-15 23:00:57.000000000 +0200 +++ nautilus/nautilus.changes 2006-05-17 01:02:04.000000000 +0200 @@ -1,0 +2,8 @@ +Wed May 17 01:01:49 CEST 2006 - federico(a)novell.com + +- Updated nautilus-158158-ignore-foreign-desktop-files.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=176123. The + "OnlyShowIn" key in desktop files can contain multiple items. Also + pay attention to the "NotShowIn" key. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.1OCTVK/_old 2006-05-17 01:16:56.000000000 +0200 +++ /var/tmp/diff_new_pack.1OCTVK/_new 2006-05-17 01:16:56.000000000 +0200 @@ -18,7 +18,7 @@ Group: Productivity/File utilities Autoreqprov: on Version: 2.12.2 -Release: 66 +Release: 67 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/%{name}-%{version}.tar.… URL: http://www.gnome.org @@ -191,6 +191,11 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n nautilus +* Wed May 17 2006 - federico(a)novell.com +- Updated nautilus-158158-ignore-foreign-desktop-files.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=176123. The + "OnlyShowIn" key in desktop files can contain multiple items. Also + pay attention to the "NotShowIn" key. * Mon May 15 2006 - federico(a)novell.com - Added nautilus-158279-add-location-toggle-button.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=158279. This adds a ++++++ nautilus-158158-ignore-foreign-desktop-files.diff ++++++ --- /var/tmp/diff_new_pack.1OCTVK/_old 2006-05-17 01:16:57.000000000 +0200 +++ /var/tmp/diff_new_pack.1OCTVK/_new 2006-05-17 01:16:57.000000000 +0200 @@ -1,3 +1,10 @@ +2006-05-16 Federico Mena Quintero <federico(a)novell.com> + + * libnautilus-private/nautilus-directory-async.c + (is_foreign_desktop_file): Split the contents of the OnlyShowIn + key; it can be a list of strings. Also consider the NotShowIn + key. Fixes https://bugzilla.novell.com/show_bug.cgi?id=176123 + 2006-04-18 Federico Mena Quintero <federico(a)novell.com> Skip .desktop files which are specific to other desktop @@ -17,11 +24,28 @@ --- nautilus-2.12.2.orig/libnautilus-private/nautilus-directory-async.c 2006-04-05 17:17:10.000000000 -0500 +++ nautilus-2.12.2/libnautilus-private/nautilus-directory-async.c 2006-04-18 14:27:04.000000000 -0500 -@@ -923,12 +923,55 @@ +@@ -923,12 +923,79 @@ nautilus_directory_schedule_dequeue_pend } } +static gboolean ++string_array_contains (char **array, ++ const char *str) ++{ ++ char **p; ++ ++ if (!array) ++ return FALSE; ++ ++ for (p = array; *p; p++) ++ if (g_ascii_strcasecmp (*p, str) == 0) { ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++static gboolean +is_foreign_desktop_file (NautilusDirectory *directory, + GnomeVFSFileInfo *info) +{ @@ -47,13 +71,20 @@ + retval = FALSE; + + if (ditem) { -+ const char *only_show_in; ++ char **only_show_in; ++ char **not_show_in; + -+ only_show_in = gnome_desktop_item_get_string (ditem, GNOME_DESKTOP_ITEM_ONLY_SHOW_IN); ++ only_show_in = gnome_desktop_item_get_strings (ditem, GNOME_DESKTOP_ITEM_ONLY_SHOW_IN); ++ if (!string_array_contains (only_show_in, "GNOME")) { ++ retval = TRUE; ++ } ++ g_strfreev (only_show_in); + -+ if (only_show_in && g_ascii_strcasecmp (only_show_in, "GNOME") != 0) { ++ not_show_in = gnome_desktop_item_get_strings (ditem, "NotShowIn"); ++ if (string_array_contains (not_show_in, "GNOME")) { + retval = TRUE; + } ++ g_strfreev (not_show_in); + + gnome_desktop_item_unref (ditem); + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit zmd
by root＠suse.de 16 May '06

16 May '06

Hello community, here is the log from the commit of package zmd checked in at Wed May 17 01:11:50 CEST 2006. -------- --- zmd/zmd.changes 2006-05-09 22:44:09.000000000 +0200 +++ zmd/zmd.changes 2006-05-16 23:30:47.000000000 +0200 @@ -1,0 +2,9 @@ +Tue May 16 23:20:22 CEST 2006 - maw(a)suse.de + +- New source drop (r28426) which: +- Improves remoting exception messages. + +- Add a patch (retry-interval.patch) so that zmd will wait longer + when retrying a service addition. + +------------------------------------------------------------------- New: ---- retry-interval.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.ER8hGA/_old 2006-05-17 01:11:21.000000000 +0200 +++ /var/tmp/diff_new_pack.ER8hGA/_new 2006-05-17 01:11:21.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-mono log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel URL: http://www.novell.com Version: 7.1.1.0 -Release: 37 +Release: 39 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 @@ -23,6 +23,7 @@ Patch2: dont-run-transaction-test.patch Patch3: zmd-networkmanager-reconnect.diff Patch4: ostargets.patch +Patch5: retry-interval.patch Summary: Novell ZENworks Linux Management daemon Group: System/Daemons Autoreqprov: on @@ -70,6 +71,7 @@ %patch2 %patch3 %patch4 +%patch5 %build libtoolize -f @@ -157,6 +159,11 @@ # %{_libdir}/monodoc/sources/* %changelog -n zmd +* Tue May 16 2006 - maw(a)suse.de +- New source drop (r28426) which: +- Improves remoting exception messages. +- Add a patch (retry-interval.patch) so that zmd will wait longer + when retrying a service addition. * Tue May 09 2006 - maw(a)suse.de - New source drop (r28129) which: - Handles ftp connection already open response ++++++ retry-interval.patch ++++++ --- src/Prefs.cs 2006-05-16 23:28:02.551825870 +0200 +++ src/Prefs.cs.rian 2006-05-16 23:28:14.812687692 +0200 @@ -438,7 +438,7 @@ this.description = GettextCatalog.GetString ("How long to wait between retries of a service addition, in seconds"); this.category = GettextCatalog.GetString ("Server"); this.type = typeof (int); - this.default_value = (int) 300; // 5 minutes + this.default_value = (int) 60 * 30; // 30 minutes } } ++++++ zmd-7.1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/ChangeLog new/zmd-7.1.1.0/ChangeLog --- old/zmd-7.1.1.0/ChangeLog 2006-05-02 15:45:54.000000000 +0200 +++ new/zmd-7.1.1.0/ChangeLog 2006-05-15 16:42:04.000000000 +0200 @@ -1,3 +1,8 @@ +2006-05-11 Dan Mills <thunder(a)ximian.com> + + * zmd.init.lsb.in: Add $remote_fs to the Should-Start line. Fixes + bug #170470. + 2006-05-02 Tambet Ingo <tambet(a)ximian.com> * Makefile.am: Install zmd.conf file with 0600 permissions. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/ChangeLog new/zmd-7.1.1.0/modules/ChangeLog --- old/zmd-7.1.1.0/modules/ChangeLog 2006-05-09 22:35:46.000000000 +0200 +++ new/zmd-7.1.1.0/modules/ChangeLog 2006-05-16 01:43:44.000000000 +0200 @@ -1,3 +1,28 @@ +2006-05-15 Chris Rivera <cmr(a)ximian.com> + + * linux/Atom.cs: Add a dummy object that is needed for zypp as suggested + by Tambet. This fixes 174740. + + * linux/RedCarpetBackend.cs (GetResolvableById): Search for atoms. + + * linux/RemotePackageManager.cs: Handle atoms. + + * linux/Makefile.am: Add Atom.cs. + +2006-05-11 James Willcox <james(a)ximian.com> + + * linux/RCEService.cs: adjust to WebProxy API changes + * linux/NUService.cs: ditto + +2006-05-11 Tambet Ingo <tambet(a)ximian.com> + + * linux/RedCarpetBackend.cs (GetResolvableById): Search for patterns + and packages as well. + + * linux/SystemResolvableCatalog.cs: Guard for the system time going + backwards and reload system packages if the saved time stamp is + different from the current (instead of being higher). Fixes #174509. + 2006-05-02 Chris Rivera <cmr(a)ximian.com> * linux/ZyppService.cs: call update-status after the metadata is parsed. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Atom.cs new/zmd-7.1.1.0/modules/linux/Atom.cs --- old/zmd-7.1.1.0/modules/linux/Atom.cs 1970-01-01 01:00:00.000000000 +0100 +++ new/zmd-7.1.1.0/modules/linux/Atom.cs 2006-05-16 00:57:44.000000000 +0200 @@ -0,0 +1,50 @@ +using System; +using System.Data; +using Mono.Data.SqliteClient; +using System.Collections; + +namespace Novell.Zenworks.Zmd.Packaging { + + public class Atom : ResolvableBaseDB { + + public static Atom GetById (Int64 id) { + string query = String.Format ("SELECT {0} FROM resolvables where kind=8 and id = {1}", + String.Join (", ", ResolvableBase.ResolvableSqlFields), + id); + Atom[] atoms = GetAtoms (query); + + if (atoms.Length > 0) + return atoms[0]; + + return null; + } + + private static Atom[] GetAtoms (string sql) { + IDbCommand cmd = Database.Connection.CreateCommand (); + cmd.CommandText = sql; + + ArrayList list = new ArrayList (); + + Database.GetLock (true); + + try { + IDataReader reader = cmd.ExecuteReader (); + while (reader.Read ()) { + Atom atom = FromSqlQuery (reader); + list.Add (atom); + } + } finally { + Database.ReleaseLock (true); + cmd.Dispose (); + } + + return (Atom[]) list.ToArray (typeof (Atom)); + } + + private static Atom FromSqlQuery (IDataReader reader) { + Atom atom = new Atom (); + ResolvableBase.ReadResolvableSqlFields (atom, reader, 0); + return atom; + } + } +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Makefile.am new/zmd-7.1.1.0/modules/linux/Makefile.am --- old/zmd-7.1.1.0/modules/linux/Makefile.am 2006-04-05 22:58:34.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/Makefile.am 2006-05-15 20:42:27.000000000 +0200 @@ -39,6 +39,7 @@ PACKAGE_MANAGEMENT_RESOURCES = -resource:$(srcdir)/history-tables.sql,history-tables.sql PACKAGE_MANAGEMENT_SOURCES = \ + $(srcdir)/Atom.cs \ $(srcdir)/Backend.cs \ $(srcdir)/Database.cs \ $(srcdir)/LockManager.cs \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Makefile.in new/zmd-7.1.1.0/modules/linux/Makefile.in --- old/zmd-7.1.1.0/modules/linux/Makefile.in 2006-04-12 00:18:37.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/Makefile.in 2006-05-15 20:43:17.000000000 +0200 @@ -279,6 +279,7 @@ PACKAGE_MANAGEMENT_RESOURCES = -resource:$(srcdir)/history-tables.sql,history-tables.sql PACKAGE_MANAGEMENT_SOURCES = \ + $(srcdir)/Atom.cs \ $(srcdir)/Backend.cs \ $(srcdir)/Database.cs \ $(srcdir)/LockManager.cs \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/NUService.cs new/zmd-7.1.1.0/modules/linux/NUService.cs --- old/zmd-7.1.1.0/modules/linux/NUService.cs 2006-04-12 00:18:11.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/NUService.cs 2006-05-15 16:42:04.000000000 +0200 @@ -336,7 +336,7 @@ string url = WebCache.GetMergedUri (uri, "RPC2/redcarpet-client.php"); HttpWebRequest request = (HttpWebRequest) WebRequest.Create (url); request.Method = "POST"; - request.Proxy = WebProxy.GetProxy (); + request.Proxy = WebProxy.GetProxy (request.RequestUri); XmlTextWriter writer = new XmlTextWriter (request.GetRequestStream (), Encoding.UTF8); writer.WriteStartDocument (); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/RCEService.cs new/zmd-7.1.1.0/modules/linux/RCEService.cs --- old/zmd-7.1.1.0/modules/linux/RCEService.cs 2006-04-25 22:15:36.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/RCEService.cs 2006-05-15 16:42:04.000000000 +0200 @@ -248,7 +248,7 @@ public void Activate (string key, string email, string alias) { HttpWebRequest request = (HttpWebRequest) WebRequest.Create (this.uri + "/RPC2/redcarpet-client.php"); request.Method = "POST"; - request.Proxy = WebProxy.GetProxy (); + request.Proxy = WebProxy.GetProxy (request.RequestUri); XmlTextWriter writer = new XmlTextWriter (request.GetRequestStream (), Encoding.UTF8); writer.WriteStartDocument (); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs --- old/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-04-26 22:34:00.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-05-15 20:54:21.000000000 +0200 @@ -1056,6 +1056,18 @@ if (script != null) return script; + Pattern pattern = Pattern.GetById (id); + if (pattern != null) + return pattern; + + Product product = Product.GetById (id); + if (product != null) + return product; + + Atom atom = Atom.GetById (id); + if (atom != null) + return atom; + return null; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs new/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs --- old/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs 2006-05-01 20:36:46.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs 2006-05-15 20:48:15.000000000 +0200 @@ -511,6 +511,8 @@ info.Type = ResolvableType.Pattern; else if (resolvable is Product) info.Type = ResolvableType.Product; + else if (resolvable is Atom) + info.Type = ResolvableType.Atom; else info.Type = ResolvableType.Invalid; @@ -591,6 +593,8 @@ return GetPattern (info); case ResolvableType.Product: return GetProduct (info); + case ResolvableType.Atom: + return GetAtom (info); default: throw new ZenException ("Invalid resolvable type"); } @@ -617,6 +621,10 @@ public static Script GetScript (ResolvableInfo info) { return Script.GetById (info.Id); } + + public static Atom GetAtom (ResolvableInfo info) { + return Atom.GetById (info.Id); + } public static Message GetMessage (ResolvableInfo info) { return Message.GetById (info.Id); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/SystemResolvableCatalog.cs new/zmd-7.1.1.0/modules/linux/SystemResolvableCatalog.cs --- old/zmd-7.1.1.0/modules/linux/SystemResolvableCatalog.cs 2006-04-24 19:10:09.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/SystemResolvableCatalog.cs 2006-05-15 16:42:04.000000000 +0200 @@ -28,7 +28,7 @@ UnixFileInfo dbInfo = new UnixFileInfo ("/var/lib/rpm/Packages"); - return dbInfo.LastWriteTime > stampInfo.LastWriteTime; + return dbInfo.LastWriteTime != stampInfo.LastWriteTime; } private void WriteStamp () { Binary files old/zmd-7.1.1.0/po/de_DE.gmo and new/zmd-7.1.1.0/po/de_DE.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/de_DE.po new/zmd-7.1.1.0/po/de_DE.po --- old/zmd-7.1.1.0/po/de_DE.po 2006-05-09 22:36:04.000000000 +0200 +++ new/zmd-7.1.1.0/po/de_DE.po 2006-05-16 22:43:04.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-09 15:36-0500\n" +"POT-Creation-Date: 2006-05-16 16:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -177,15 +177,16 @@ msgid "Authorization failed" msgstr "Autorisierungsfehler" -#: src/AuthServerSink.cs:128 +#: src/AuthServerSink.cs:132 msgid "Unauthorized" msgstr "Nicht autorisiert" -#: src/AuthServerSink.cs:148 +#: src/AuthServerSink.cs:152 #, csharp-format -msgid "You do not have the required access level ({0}) for this method." +msgid "" +"Permission denied. This operation requires '{0}' permission.\n" +"You currently have the following permissions: '{1}'." msgstr "" -"Sie weisen nicht die erforderliche Zugriffsstufe ({0}) für diese Methode auf." #: src/BundleCapability.cs:60 #, csharp-format @@ -803,24 +804,24 @@ msgid "Unsupported uri: '{0}'" msgstr "" -#: src/WebCache.cs:901 +#: src/WebCache.cs:896 #, csharp-format msgid "Unknown cache storage version '{0}'" msgstr "Unbekannte Cache-Speicherversion '{0}'" -#: src/WebProxy.cs:55 +#: src/WebProxy.cs:78 msgid "Proxy URL" msgstr "Proxy-URL" -#: src/WebProxy.cs:56 src/WebProxy.cs:70 src/WebProxy.cs:82 +#: src/WebProxy.cs:79 src/WebProxy.cs:93 src/WebProxy.cs:105 msgid "Proxy" msgstr "Proxy" -#: src/WebProxy.cs:69 +#: src/WebProxy.cs:92 msgid "Proxy Username" msgstr "Proxy-Benutzername" -#: src/WebProxy.cs:81 +#: src/WebProxy.cs:104 msgid "Proxy Password" msgstr "Proxy-Passwort" @@ -876,6 +877,11 @@ #~ msgid "Resolvable {0} is already installed." #~ msgstr "Bundle '{0}' ist bereits installiert." +#~ msgid "You do not have the required access level ({0}) for this method." +#~ msgstr "" +#~ "Sie weisen nicht die erforderliche Zugriffsstufe ({0}) für diese Methode " +#~ "auf." + #~ msgid "Cache downloaded packages and metadata" #~ msgstr "Heruntergeladene Pakete und Metadaten im Cache ablegen" Binary files old/zmd-7.1.1.0/po/en_US.gmo and new/zmd-7.1.1.0/po/en_US.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/en_US.po new/zmd-7.1.1.0/po/en_US.po --- old/zmd-7.1.1.0/po/en_US.po 2006-05-09 22:36:04.000000000 +0200 +++ new/zmd-7.1.1.0/po/en_US.po 2006-05-16 22:43:04.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-09 15:36-0500\n" +"POT-Creation-Date: 2006-05-16 16:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -174,14 +174,16 @@ msgid "Authorization failed" msgstr "Authorization failed" -#: src/AuthServerSink.cs:128 +#: src/AuthServerSink.cs:132 msgid "Unauthorized" msgstr "Unauthorized" -#: src/AuthServerSink.cs:148 +#: src/AuthServerSink.cs:152 #, csharp-format -msgid "You do not have the required access level ({0}) for this method." -msgstr "You do not have the required access level ({0}) for this method." +msgid "" +"Permission denied. This operation requires '{0}' permission.\n" +"You currently have the following permissions: '{1}'." +msgstr "" #: src/BundleCapability.cs:60 #, csharp-format @@ -788,24 +790,24 @@ msgid "Unsupported uri: '{0}'" msgstr "" -#: src/WebCache.cs:901 +#: src/WebCache.cs:896 #, csharp-format msgid "Unknown cache storage version '{0}'" msgstr "Unknown cache storage version '{0}'" -#: src/WebProxy.cs:55 +#: src/WebProxy.cs:78 msgid "Proxy URL" msgstr "Proxy URL" -#: src/WebProxy.cs:56 src/WebProxy.cs:70 src/WebProxy.cs:82 +#: src/WebProxy.cs:79 src/WebProxy.cs:93 src/WebProxy.cs:105 msgid "Proxy" msgstr "Proxy" -#: src/WebProxy.cs:69 +#: src/WebProxy.cs:92 msgid "Proxy Username" msgstr "Proxy Username" -#: src/WebProxy.cs:81 +#: src/WebProxy.cs:104 msgid "Proxy Password" msgstr "Proxy Password" @@ -861,6 +863,9 @@ #~ msgid "Resolvable {0} is already installed." #~ msgstr "Bundle '{0}' is already installed." +#~ msgid "You do not have the required access level ({0}) for this method." +#~ msgstr "You do not have the required access level ({0}) for this method." + #~ msgid "Cache downloaded packages and metadata" #~ msgstr "Cache downloaded packages and metadata" Binary files old/zmd-7.1.1.0/po/es_ES.gmo and new/zmd-7.1.1.0/po/es_ES.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/es_ES.po new/zmd-7.1.1.0/po/es_ES.po --- old/zmd-7.1.1.0/po/es_ES.po 2006-05-09 22:36:04.000000000 +0200 +++ new/zmd-7.1.1.0/po/es_ES.po 2006-05-16 22:43:04.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-09 15:36-0500\n" +"POT-Creation-Date: 2006-05-16 16:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -180,14 +180,16 @@ msgid "Authorization failed" msgstr "Autorización fallida" -#: src/AuthServerSink.cs:128 +#: src/AuthServerSink.cs:132 msgid "Unauthorized" msgstr "Sin autorización" -#: src/AuthServerSink.cs:148 +#: src/AuthServerSink.cs:152 #, csharp-format -msgid "You do not have the required access level ({0}) for this method." -msgstr "No dispone del nivel de acceso necesario ({0}) para este método." +msgid "" +"Permission denied. This operation requires '{0}' permission.\n" +"You currently have the following permissions: '{1}'." +msgstr "" #: src/BundleCapability.cs:60 #, csharp-format @@ -801,24 +803,24 @@ msgid "Unsupported uri: '{0}'" msgstr "" -#: src/WebCache.cs:901 +#: src/WebCache.cs:896 #, csharp-format msgid "Unknown cache storage version '{0}'" msgstr "Versión de almacenamiento en caché '{0}' desconocida" -#: src/WebProxy.cs:55 +#: src/WebProxy.cs:78 msgid "Proxy URL" msgstr "URL del alterno" -#: src/WebProxy.cs:56 src/WebProxy.cs:70 src/WebProxy.cs:82 +#: src/WebProxy.cs:79 src/WebProxy.cs:93 src/WebProxy.cs:105 msgid "Proxy" msgstr "Alterno" -#: src/WebProxy.cs:69 +#: src/WebProxy.cs:92 msgid "Proxy Username" msgstr "Nombre de usuario de alterno" -#: src/WebProxy.cs:81 +#: src/WebProxy.cs:104 msgid "Proxy Password" msgstr "Contraseña de alterno" @@ -874,6 +876,9 @@ #~ msgid "Resolvable {0} is already installed." #~ msgstr "El lote '{0}' ya está instalado." +#~ msgid "You do not have the required access level ({0}) for this method." +#~ msgstr "No dispone del nivel de acceso necesario ({0}) para este método." + #~ msgid "Cache downloaded packages and metadata" #~ msgstr "Paquetes y metadatos descargados en caché" Binary files old/zmd-7.1.1.0/po/fr_FR.gmo and new/zmd-7.1.1.0/po/fr_FR.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/fr_FR.po new/zmd-7.1.1.0/po/fr_FR.po --- old/zmd-7.1.1.0/po/fr_FR.po 2006-05-09 22:36:04.000000000 +0200 +++ new/zmd-7.1.1.0/po/fr_FR.po 2006-05-16 22:43:04.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-09 15:36-0500\n" +"POT-Creation-Date: 2006-05-16 16:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -179,14 +179,16 @@ msgid "Authorization failed" msgstr "Échec de l'autorisation" -#: src/AuthServerSink.cs:128 +#: src/AuthServerSink.cs:132 msgid "Unauthorized" msgstr "Non autorisé" -#: src/AuthServerSink.cs:148 +#: src/AuthServerSink.cs:152 #, csharp-format -msgid "You do not have the required access level ({0}) for this method." -msgstr "Vous n'avez pas le niveau d'accès requis ({0}) pour cette méthode." +msgid "" +"Permission denied. This operation requires '{0}' permission.\n" +"You currently have the following permissions: '{1}'." +msgstr "" #: src/BundleCapability.cs:60 #, csharp-format @@ -804,24 +806,24 @@ msgid "Unsupported uri: '{0}'" msgstr "" -#: src/WebCache.cs:901 +#: src/WebCache.cs:896 #, csharp-format msgid "Unknown cache storage version '{0}'" msgstr "Version de stockage de cache '{0}' inconnue" -#: src/WebProxy.cs:55 +#: src/WebProxy.cs:78 msgid "Proxy URL" msgstr "URL proxy" -#: src/WebProxy.cs:56 src/WebProxy.cs:70 src/WebProxy.cs:82 +#: src/WebProxy.cs:79 src/WebProxy.cs:93 src/WebProxy.cs:105 msgid "Proxy" msgstr "Mandataire" -#: src/WebProxy.cs:69 +#: src/WebProxy.cs:92 msgid "Proxy Username" msgstr "Utilisateur proxy" -#: src/WebProxy.cs:81 +#: src/WebProxy.cs:104 msgid "Proxy Password" msgstr "Mot de passe du proxy" @@ -877,6 +879,9 @@ #~ msgid "Resolvable {0} is already installed." #~ msgstr "L'ensemble '{0}' est déjà installé." +#~ msgid "You do not have the required access level ({0}) for this method." +#~ msgstr "Vous n'avez pas le niveau d'accès requis ({0}) pour cette méthode." + #~ msgid "Cache downloaded packages and metadata" #~ msgstr "Paquetages et métadonnées téléchargés dans le cache" Binary files old/zmd-7.1.1.0/po/pt_BR.gmo and new/zmd-7.1.1.0/po/pt_BR.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/pt_BR.po new/zmd-7.1.1.0/po/pt_BR.po --- old/zmd-7.1.1.0/po/pt_BR.po 2006-05-09 22:36:04.000000000 +0200 +++ new/zmd-7.1.1.0/po/pt_BR.po 2006-05-16 22:43:05.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-09 15:36-0500\n" +"POT-Creation-Date: 2006-05-16 16:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -176,14 +176,16 @@ msgid "Authorization failed" msgstr "Falha na autorização" -#: src/AuthServerSink.cs:128 +#: src/AuthServerSink.cs:132 msgid "Unauthorized" msgstr "Não Autorizado" -#: src/AuthServerSink.cs:148 +#: src/AuthServerSink.cs:152 #, csharp-format -msgid "You do not have the required access level ({0}) for this method." -msgstr "Você não tem o nível de acesso necessário ({0}) para este método." +msgid "" +"Permission denied. This operation requires '{0}' permission.\n" +"You currently have the following permissions: '{1}'." +msgstr "" #: src/BundleCapability.cs:60 #, csharp-format @@ -795,24 +797,24 @@ msgid "Unsupported uri: '{0}'" msgstr "" -#: src/WebCache.cs:901 +#: src/WebCache.cs:896 #, csharp-format msgid "Unknown cache storage version '{0}'" msgstr "Versão de armazenamento de cache desconhecida '{0}'" -#: src/WebProxy.cs:55 +#: src/WebProxy.cs:78 msgid "Proxy URL" msgstr "URL do Proxy" -#: src/WebProxy.cs:56 src/WebProxy.cs:70 src/WebProxy.cs:82 +#: src/WebProxy.cs:79 src/WebProxy.cs:93 src/WebProxy.cs:105 msgid "Proxy" msgstr "Proxy" -#: src/WebProxy.cs:69 +#: src/WebProxy.cs:92 msgid "Proxy Username" msgstr "Nome de Usuário Proxy" -#: src/WebProxy.cs:81 +#: src/WebProxy.cs:104 msgid "Proxy Password" msgstr "Senha Proxy" @@ -868,6 +870,9 @@ #~ msgid "Resolvable {0} is already installed." #~ msgstr "O bundle '{0}' já está instalado." +#~ msgid "You do not have the required access level ({0}) for this method." +#~ msgstr "Você não tem o nível de acesso necessário ({0}) para este método." + #~ msgid "Cache downloaded packages and metadata" #~ msgstr "O cache fez download de pacotes e metadados" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/zmd.pot new/zmd-7.1.1.0/po/zmd.pot --- old/zmd-7.1.1.0/po/zmd.pot 2006-05-09 22:36:04.000000000 +0200 +++ new/zmd-7.1.1.0/po/zmd.pot 2006-05-16 22:43:04.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-09 15:36-0500\n" +"POT-Creation-Date: 2006-05-16 16:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -172,13 +172,15 @@ msgid "Authorization failed" msgstr "" -#: src/AuthServerSink.cs:128 +#: src/AuthServerSink.cs:132 msgid "Unauthorized" msgstr "" -#: src/AuthServerSink.cs:148 +#: src/AuthServerSink.cs:152 #, csharp-format -msgid "You do not have the required access level ({0}) for this method." +msgid "" +"Permission denied. This operation requires '{0}' permission.\n" +"You currently have the following permissions: '{1}'." msgstr "" #: src/BundleCapability.cs:60 @@ -781,24 +783,24 @@ msgid "Unsupported uri: '{0}'" msgstr "" -#: src/WebCache.cs:901 +#: src/WebCache.cs:896 #, csharp-format msgid "Unknown cache storage version '{0}'" msgstr "" -#: src/WebProxy.cs:55 +#: src/WebProxy.cs:78 msgid "Proxy URL" msgstr "" -#: src/WebProxy.cs:56 src/WebProxy.cs:70 src/WebProxy.cs:82 +#: src/WebProxy.cs:79 src/WebProxy.cs:93 src/WebProxy.cs:105 msgid "Proxy" msgstr "" -#: src/WebProxy.cs:69 +#: src/WebProxy.cs:92 msgid "Proxy Username" msgstr "" -#: src/WebProxy.cs:81 +#: src/WebProxy.cs:104 msgid "Proxy Password" msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/AuthServerSink.cs new/zmd-7.1.1.0/src/AuthServerSink.cs --- old/zmd-7.1.1.0/src/AuthServerSink.cs 2006-04-12 00:18:12.000000000 +0200 +++ new/zmd-7.1.1.0/src/AuthServerSink.cs 2006-05-15 16:42:04.000000000 +0200 @@ -96,6 +96,10 @@ out Stream responseStream) { if (next != null) { + if (showMethods) { + log.Info (String.Format ("Running method {0}", requestMsg)); + } + Identity identity = null; IMethodCallMessage call = requestMsg as IMethodCallMessage; @@ -143,13 +147,13 @@ false) as PrivilegeAttribute; string req_role = (attribute != null) ? attribute.RequiredRole : PrivilegeManager.DefaultRequiredPrivilege; - if (!identity.ApproveAction (req_role)) - throw new ZenException - (GettextCatalog.GetString ("You do not have the required access level ({0}) for this method."), - req_role); + if (!identity.ApproveAction (req_role)) { + string msg = String.Format (GettextCatalog.GetString + ("Permission denied. This operation requires '{0}' permission.\n" + + "You currently have the following permissions: '{1}'."), + req_role, identity.Privs); - if (showMethods) { - log.Info (String.Format ("Running method {0}", requestMsg)); + throw new ZenException (msg); } // The client is authorized to execute the method, pass it on. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/BuildConfig.cs new/zmd-7.1.1.0/src/BuildConfig.cs --- old/zmd-7.1.1.0/src/BuildConfig.cs 2006-04-21 20:49:37.000000000 +0200 +++ new/zmd-7.1.1.0/src/BuildConfig.cs 2006-05-16 22:42:53.000000000 +0200 @@ -1,14 +1,14 @@ namespace Novell.Zenworks.Zmd { public class BuildConfig { - public const string PREFIX = "/opt/zmd"; - public const string SYSCONFDIR = "/opt/zmd/etc"; - public const string DATADIR = "/opt/zmd/share"; - public const string LIBDIR = "/opt/zmd/lib"; - public const string LIBDIR_MANAGED = "/opt/zmd" + "/lib"; - public const string LOCALSTATEDIR = "/opt/zmd/var"; + public const string PREFIX = "/opt/zypp"; + public const string SYSCONFDIR = "/opt/zypp/etc"; + public const string DATADIR = "/opt/zypp/share"; + public const string LIBDIR = "/opt/zypp/lib"; + public const string LIBDIR_MANAGED = "/opt/zypp" + "/lib"; + public const string LOCALSTATEDIR = "/opt/zypp/var"; - public const string LOGDIR = "/opt/zmd/var/log"; + public const string LOGDIR = "/opt/zypp/var/log"; public const string LOGFILE = LOGDIR + "/zmd-messages.log"; public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/ChangeLog new/zmd-7.1.1.0/src/ChangeLog --- old/zmd-7.1.1.0/src/ChangeLog 2006-05-09 22:35:46.000000000 +0200 +++ new/zmd-7.1.1.0/src/ChangeLog 2006-05-16 01:45:18.000000000 +0200 @@ -1,3 +1,21 @@ +2006-05-15 Chris Rivera <cmr(a)ximian.com> + + * WebProxy.cs: Catch ArgumentExceptions when getting the proxy password. + This will be thrown when one of the clients is run by a normal user + and isn't allowed to view the preference. + +2006-05-12 Tambet Ingo <tambet(a)ximian.com> + + * AuthServerSink.cs: Show the executed remoting message as early as + possible to make it visible for unauthorized requests as well. + Make the message for unauthorized requests more verbose, showing + current user privileges and required privilege. Fixes #174873. + +2006-05-11 James Willcox <james(a)ximian.com> + + * WebProxy.cs: use the 'http_proxy' and 'https_proxy' env vars + as the default proxy url appropriately. + 2006-05-05 Tambet Ingo <tambet(a)ximian.com> * Identity.cs: Allow '\' character in user names. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/SoapUtility.cs new/zmd-7.1.1.0/src/SoapUtility.cs --- old/zmd-7.1.1.0/src/SoapUtility.cs 2006-03-09 17:17:41.000000000 +0100 +++ new/zmd-7.1.1.0/src/SoapUtility.cs 2006-05-15 16:42:04.000000000 +0200 @@ -39,7 +39,7 @@ // The server sends compressed data but doesn't set the Content-Encoding correctly. // proxy.Url = "z" + url; // use zhttp proxy.Url = url; - proxy.Proxy = WebProxy.GetProxy (); + proxy.Proxy = WebProxy.GetProxy (new Uri (url)); proxy.Timeout = 1000 * PreferenceManager.GetInteger ("http-timeout"); return proxy; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/WebCache.cs new/zmd-7.1.1.0/src/WebCache.cs --- old/zmd-7.1.1.0/src/WebCache.cs 2006-04-26 22:34:00.000000000 +0200 +++ new/zmd-7.1.1.0/src/WebCache.cs 2006-05-15 16:42:04.000000000 +0200 @@ -521,10 +521,6 @@ request.Timeout = 1000 * PreferenceManager.GetInteger ("http-timeout"); request.Method = WebRequestMethods.Ftp.DownloadFile; - IWebProxy proxy = WebProxy.GetProxy (); - if (proxy != null) - request.Proxy = proxy; - FtpWebResponse response; try { @@ -622,10 +618,9 @@ request.Credentials = this; request.Timeout = 1000 * PreferenceManager.GetInteger ("http-timeout"); - IWebProxy proxy = WebProxy.GetProxy (); - if (proxy != null) - request.Proxy = proxy; - + request.Proxy = WebProxy.GetProxy (uri); + log.DebugFormat ("Using proxy '{0}'", request.Proxy.GetProxy (uri)); + request.Headers.Add ("Accept-Encoding", "gzip"); // Add any specified request headers diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/WebProxy.cs new/zmd-7.1.1.0/src/WebProxy.cs --- old/zmd-7.1.1.0/src/WebProxy.cs 2006-03-09 17:17:41.000000000 +0100 +++ new/zmd-7.1.1.0/src/WebProxy.cs 2006-05-15 20:49:20.000000000 +0200 @@ -23,20 +23,43 @@ using Novell.Zenworks.Utility; namespace Novell.Zenworks.Zmd { + + public sealed class WebProxy { - public static IWebProxy GetProxy () { + public static string GetSystemProxy (bool https) { + if (https) { + return Environment.GetEnvironmentVariable ("https_proxy"); + } else { + return Environment.GetEnvironmentVariable ("http_proxy"); + } + } + + public static IWebProxy GetProxy (Uri uri) { IWebProxy proxy = GlobalProxySelection.GetEmptyWebProxy (); - string proxyUrl = PreferenceManager.GetString ("proxy-url"); - if (proxyUrl != "") { - string proxyUsername = PreferenceManager.GetString ("proxy-username"); - string proxyPassword = PreferenceManager.GetString ("proxy-password"); - ICredentials proxyCreds = null; - - if (proxyUsername != "") - proxyCreds = new NetworkCredential (proxyUsername, - proxyPassword != "" ? proxyPassword : null); + string proxyUsername = PreferenceManager.GetString ("proxy-username"); + string proxyPassword; + + // this can happen for normal users without permission to + // see the proxy password + try { + proxyPassword = PreferenceManager.GetString ("proxy-password"); + } catch (ArgumentException e) { + proxyPassword = ""; + } + + ICredentials proxyCreds = null; + + if (proxyUsername != "") + proxyCreds = new NetworkCredential (proxyUsername, + proxyPassword != "" ? proxyPassword : null); + string proxyUrl = PreferenceManager.GetString ("proxy-url"); + if (proxyUrl == null || proxyUrl == String.Empty) { + proxyUrl = GetSystemProxy (uri.Scheme == Uri.UriSchemeHttps); + } + + if (proxyUrl != null && proxyUrl != String.Empty) { proxy = new System.Net.WebProxy (proxyUrl, true, // BypassOnLocal null, // BypassList, @@ -56,8 +79,8 @@ this.category = GettextCatalog.GetString ("Proxy"); this.type = typeof (string); - System.Net.WebProxy proxy = System.Net.WebProxy.GetDefaultProxy (); - this.default_value = (object) proxy.Address != null ? proxy.Address.ToString () : ""; + string systemProxy = WebProxy.GetSystemProxy (false); + this.default_value = (object) systemProxy != null ? systemProxy : ""; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/zmd.init.lsb.in new/zmd-7.1.1.0/zmd.init.lsb.in --- old/zmd-7.1.1.0/zmd.init.lsb.in 2006-05-02 01:54:28.000000000 +0200 +++ new/zmd-7.1.1.0/zmd.init.lsb.in 2006-05-15 16:42:04.000000000 +0200 @@ -5,9 +5,9 @@ ### BEGIN INIT INFO # Provides: novell-zmd # Required-Start: $network -# X-UnitedLinux-Should-Start: novell-zislnx +# X-UnitedLinux-Should-Start: novell-zislnx $remote_fs # Required-Stop: -# X-UnitedLinux-Should-Start: novell-zislnx +# X-UnitedLinux-Should-Start: novell-zislnx $remote_fs # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 # Description: ZMD, the ZENworks Management Daemon, allows users to manage \ @@ -15,7 +15,7 @@ # Visit http://www.novell.com for more information. ### END INIT INFO -# $Id: zmd.init.lsb.in 27746 2006-05-01 23:53:34Z james $ +# $Id: zmd.init.lsb.in 28280 2006-05-11 23:09:56Z thunder $ # Source SuSE config PATH=/sbin:/bin:/usr/sbin:/usr/bin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-pkg-bindings
by root＠suse.de 16 May '06

16 May '06

Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Wed May 17 01:11:13 CEST 2006. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-05-16 09:56:25.000000000 +0200 +++ yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-05-16 23:13:19.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 16 22:16:48 CEST 2006 - ma(a)suse.de + +- Adapt to libzypp-1.0.0 +- 2.13.75 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.13.74.tar.bz2 New: ---- yast2-pkg-bindings-2.13.75.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.cEZur4/_old 2006-05-17 01:10:43.000000000 +0200 +++ /var/tmp/diff_new_pack.cEZur4/_new 2006-05-17 01:10:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.13.74) +# spec file for package yast2-pkg-bindings (Version 2.13.75) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-pkg-bindings -Version: 2.13.74 +Version: 2.13.75 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.13.74.tar.bz2 +Source0: yast2-pkg-bindings-2.13.75.tar.bz2 prefix: /usr BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools Summary: YaST2 Package Manager Access @@ -36,7 +36,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.13.74 +%setup -n yast2-pkg-bindings-2.13.75 %build %{prefix}/bin/y2tool y2autoconf @@ -67,6 +67,9 @@ %doc %{prefix}/share/doc/packages/yast2-pkg-bindings %changelog -n yast2-pkg-bindings +* Tue May 16 2006 - ma(a)suse.de +- Adapt to libzypp-1.0.0 +- 2.13.75 * Tue May 16 2006 - mvidner(a)suse.cz - SourceDelete: no need to remove resolvables from pool if the source has not seen any resolvables yet. Fixes deleting corrupt sources ++++++ yast2-pkg-bindings-2.13.74.tar.bz2 -> yast2-pkg-bindings-2.13.75.tar.bz2 ++++++ ++++ 18532 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/yast2-pkg-bindings-2.13.74/Makefile.am new/yast2-pkg-bindings-2.13.75/Makefile.am --- old/yast2-pkg-bindings-2.13.74/Makefile.am 2006-05-16 10:00:00.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.75/Makefile.am 2005-10-04 14:04:30.000000000 +0200 @@ -6,9 +6,7 @@ # (Edit ./SUBDIRS instead) # -#where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +PREFIX = /usr VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -32,10 +30,6 @@ extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) AUTOMAKE_OPTIONS = foreign dist-bzip2 -# where devtools instal m4 snippets -# argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ @@ -63,8 +57,12 @@ # info '(automake)Conditionals' if CREATE_PKGCONFIG +# pkg-config +# if a package does not have its own pc, copy the generic one +$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in + test -f $@ || cp -p $< $@ # create the file here instead of by configure -# because the prerequisite is made here (not anymore!) +# because the prerequisite is made here # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' $(RPMNAME).pc: $(RPMNAME).pc.in @@ -96,7 +94,7 @@ done pot: - $(Y2TOOL) y2makepot -s $(srcdir) + y2tool y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -117,7 +115,7 @@ fi spellcheck: pot - $(Y2TOOL) pot-spellcheck + y2tool pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -144,20 +142,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(Y2TOOL); then \ - echo "$(Y2TOOL): not found."; \ + if ! test -x $(PREFIX)/bin/y2tool; then \ + echo "$(PREFIX)/bin/y2tool: not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages package-local -TAGVERSION = $(Y2TOOL) tagversion +TAGVERSION = $(PREFIX)/bin/y2tool tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -200,13 +198,10 @@ false; \ fi -check-textdomain: - $(Y2TOOL) check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package - $(Y2TOOL) checkin-stable + $(PREFIX)/bin/y2tool checkin-stable # For po/ modules 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/yast2-pkg-bindings-2.13.74/VERSION new/yast2-pkg-bindings-2.13.75/VERSION --- old/yast2-pkg-bindings-2.13.74/VERSION 2006-05-16 09:55:52.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.75/VERSION 2006-05-16 22:18:35.000000000 +0200 @@ -1 +1 @@ -2.13.74 +2.13.75 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/yast2-pkg-bindings-2.13.74/configure.in new/yast2-pkg-bindings-2.13.75/configure.in --- old/yast2-pkg-bindings-2.13.74/configure.in 2006-05-16 10:00:00.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.75/configure.in 2005-10-04 14:04:30.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-pkg-bindings dnl -dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.13.74, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.12.7, http://www.suse.de/feedback, yast2-pkg-bindings) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.74" +VERSION="2.12.7" RPMNAME="yast2-pkg-bindings" MAINTAINER="Michael Andres <ma(a)suse.de>" @@ -110,8 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools` +devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) @@ -158,7 +158,6 @@ AC_HEADER_STDC -PKG_CHECK_MODULES([ZYPP], [libzypp]) AX_CHECK_DOCBOOK AC_CONFIG_FILES(Makefile doc/Makefile 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/yast2-pkg-bindings-2.13.74/src/Callbacks.cc new/yast2-pkg-bindings-2.13.75/src/Callbacks.cc --- old/yast2-pkg-bindings-2.13.74/src/Callbacks.cc 2006-05-15 13:02:39.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.75/src/Callbacks.cc 2006-05-16 21:58:15.000000000 +0200 @@ -40,7 +40,7 @@ // on probing of source type ZyppRecipients::MediaChangeSensitivity _silent_probing = ZyppRecipients::MEDIA_CHANGE_FULL; - + /////////////////////////////////////////////////////////////////// namespace ZyppRecipients { /////////////////////////////////////////////////////////////////// @@ -98,7 +98,7 @@ } virtual bool progress(int value, zypp::Pathname pth) - { + { CB callback( ycpcb( YCPCallbacks::CB_ProgressConvertDb ) ); if (callback._set) { callback.addInt( value ); @@ -151,7 +151,7 @@ } virtual bool progress(int value, zypp::Pathname pth) - { + { CB callback( ycpcb( YCPCallbacks::CB_ProgressRebuildDb ) ); if ( callback._set ) { // report changed values @@ -181,8 +181,8 @@ { zypp::Resolvable::constPtr _last; int last_reported; - - InstallPkgReceive(RecipientCtl & construct_r) : Recipient(construct_r) + + InstallPkgReceive(RecipientCtl & construct_r) : Recipient(construct_r) { } @@ -193,20 +193,20 @@ virtual void reportend() { } - + virtual void start(zypp::Resolvable::constPtr resolvable) { // initialize the counter last_reported = 0; #warning install non-package - zypp::Package::constPtr res = + zypp::Package::constPtr res = zypp::asKind<zypp::Package>(resolvable); - + // if we have started this resolvable already, don't do it again if( _last == resolvable ) return; - + CB callback( ycpcb( YCPCallbacks::CB_StartPackage ) ); if (callback._set) { callback.addStr(res->location()); @@ -215,12 +215,12 @@ callback.addBool(false); // is_delete = false (package installation) callback.evaluateBool(); } - + _last = resolvable; } - + virtual bool progress(int value, zypp::Resolvable::constPtr resolvable) - { + { CB callback( ycpcb( YCPCallbacks::CB_ProgressPackage) ); // call the callback function only if the difference since the last call is at least 5% // or if 100% is reached @@ -231,7 +231,7 @@ if( !res ) y2milestone( "Package installation callback returned abort" ); - + last_reported = value; return res; } @@ -245,16 +245,16 @@ , zypp::target::rpm::InstallResolvableReport::Error error , std::string description , zypp::target::rpm::InstallResolvableReport::RpmLevel level - ) + ) { if (level != zypp::target::rpm::InstallResolvableReport::RPM_NODEPS_FORCE) { y2milestone( "Retrying installation problem with too low severity (%d)", level); return zypp::target::rpm::InstallResolvableReport::ABORT; } - + _last = zypp::Resolvable::constPtr(); - + CB callback( ycpcb( YCPCallbacks::CB_DonePackage) ); if (callback._set) { callback.addInt( error ); @@ -283,7 +283,7 @@ y2milestone( "Skipping finish due to retrying installation problem with too low severity (%d)", level); return; } - + CB callback( ycpcb( YCPCallbacks::CB_DonePackage) ); if (callback._set) { callback.addInt( level == zypp::target::rpm::InstallResolvableReport::RPM_NODEPS_FORCE ? error : NO_ERROR); @@ -320,9 +320,9 @@ callback.evaluateBool(); } } - + virtual bool progress(int value, zypp::Resolvable::constPtr resolvable) - { + { CB callback( ycpcb( YCPCallbacks::CB_ProgressPackage) ); if (callback._set) { callback.addInt( value ); @@ -371,13 +371,13 @@ if ( zypp::isKind<zypp::Package> (resolvable_ptr) ) { - zypp::Package::constPtr pkg = + zypp::Package::constPtr pkg = zypp::asKind<zypp::Package>(resolvable_ptr); size = pkg->archivesize(); int source_id = pkg->source().numericId(); - int media_nr = pkg->mediaId(); + int media_nr = pkg->sourceMediaNr(); if( source_id != last_source_id || media_nr != last_source_media ) { @@ -389,12 +389,12 @@ } last_source_id = source_id; last_source_media = media_nr; - } + } } CB callback( ycpcb( YCPCallbacks::CB_StartProvide ) ); if (callback._set) { - bool remote = url.getScheme() != "cd" && url.getScheme() != "dvd" + bool remote = url.getScheme() != "cd" && url.getScheme() != "dvd" && url.getScheme() != "nfs"; callback.addStr(resolvable_ptr->name()); callback.addInt( size ); @@ -402,7 +402,7 @@ callback.evaluateBool(); } } - + virtual void finish(zypp::Resolvable::constPtr resolvable, zypp::source::DownloadResolvableReport::Error error, std::string reason) { CB callback( ycpcb( YCPCallbacks::CB_DoneProvide) ); @@ -415,7 +415,7 @@ } virtual bool progress(int value, zypp::Resolvable::constPtr resolvable_ptr) - { + { CB callback( ycpcb( YCPCallbacks::CB_ProgressProvide) ); if (callback._set && (value - last_reported >= 5 || last_reported - value >= 5 || value == 100)) { @@ -423,7 +423,7 @@ callback.addInt( value ); return callback.evaluateBool(); // return value ignored by RpmDb } - + return zypp::source::DownloadResolvableReport::progress(value, resolvable_ptr); } @@ -540,7 +540,7 @@ arg->add( YCPString("product_dir"), YCPString( source.path().asString() ) ); } } - + callback.addMap( arg ); startArgs = arg; //remember @@ -602,13 +602,13 @@ virtual Action requestMedia(zypp::Source_Ref source, unsigned mediumNr, zypp::media::MediaChangeReport::Error error, std::string description) { - if ( _silent_probing == MEDIA_CHANGE_DISABLE ) + if ( _silent_probing == MEDIA_CHANGE_DISABLE ) return zypp::media::MediaChangeReport::ABORT; - - if ( _silent_probing == MEDIA_CHANGE_OPTIONALFILE + + if ( _silent_probing == MEDIA_CHANGE_OPTIONALFILE && error == zypp::media::MediaChangeReport::NOT_FOUND ) return zypp::media::MediaChangeReport::ABORT; - + CB callback( ycpcb( YCPCallbacks::CB_MediaChange ) ); if ( callback._set ) { @@ -627,9 +627,9 @@ { product_name = (*it)->summary(); break; - } + } } - + // current product name callback.addStr( product_name ); @@ -661,7 +661,7 @@ // "E" = eject media if (ret == "E") return zypp::media::MediaChangeReport::EJECT; - + // "S" = skip (ignore) this media if (ret == "S") return zypp::media::MediaChangeReport::IGNORE; @@ -678,7 +678,7 @@ return zypp::media::MediaChangeReport::RETRY; } } - + // return default value from the parent class return zypp::media::MediaChangeReport::requestMedia(source, mediumNr, error, description); } @@ -806,7 +806,7 @@ if (callback._set) { zypp::Patch::constPtr patch = message->patch(); - + // patch name callback.addStr(patch ? patch->name() : message->name()); // patch summary @@ -836,7 +836,7 @@ return callback.evaluateBool(); } - + return zypp::DigestReport::askUserToAcceptNoDigest(file); } }; @@ -859,10 +859,10 @@ callback.addStr(keyid); callback.addStr(keyname); callback.addStr(fingerprint); - + return callback.evaluateBool(); } - + return zypp::KeyRingReport::askUserToTrustKey(keyid, keyname, fingerprint); } @@ -879,7 +879,7 @@ return callback.evaluateBool(); } - + return zypp::KeyRingReport::askUserToAcceptUnknownKey(file, keyid, keyname, fingerprint ); } @@ -893,10 +893,10 @@ return callback.evaluateBool(); } - + return zypp::KeyRingReport::askUserToAcceptUnsignedFile(file); } - + virtual bool askUserToAcceptVerificationFailed(const std::string &file, const std::string &keyid, const std::string &keyname, const std::string &fingerprint) { @@ -911,7 +911,7 @@ return callback.evaluateBool(); } - + return zypp::KeyRingReport::askUserToAcceptVerificationFailed(file, keyid, keyname, fingerprint); } }; @@ -984,9 +984,9 @@ // resolvable report ZyppRecipients::ResolvableReport _resolvableReport; - // digest callback + // digest callback ZyppRecipients::DigestReceive _digestReceive; - + // key ring callback ZyppRecipients::KeyRingReceive _keyRingReceive; 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/yast2-pkg-bindings-2.13.74/src/Package.cc new/yast2-pkg-bindings-2.13.75/src/Package.cc --- old/yast2-pkg-bindings-2.13.74/src/Package.cc 2006-05-16 09:32:34.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.75/src/Package.cc 2006-05-16 21:57:49.000000000 +0200 @@ -54,7 +54,7 @@ /////////////////////////////////////////////////////////////////// namespace zypp { - typedef std::list<PoolItem> PoolItemList; + typedef std::list<PoolItem> PoolItemList; } // ------------------------ @@ -141,7 +141,7 @@ { onSystem = "CAND"; } - + // create list item YCPList item; item->add(YCPString(pkgname)); @@ -195,13 +195,13 @@ std::list<zypp::SourceManager::SourceId> source_ids = zypp::SourceManager::sourceManager()->enabledSources(); YCPList res; - - // initialize + + // initialize for( std::list<zypp::SourceManager::SourceId>::const_iterator sit = source_ids.begin(); sit != source_ids.end(); ++sit) { unsigned id = *sit; - + zypp::Source_Ref src = zypp::SourceManager::sourceManager()->findSource( id ); try @@ -217,24 +217,24 @@ if( product->source() == src ) { y2debug ("Found"); - + YCPList src_desc; src_desc->add( YCPString( product->summary() ) ); src_desc->add( YCPInteger( src.numericId() ) ); - + res->add( src_desc ); - break; + break; } } if( it == zypp_ptr()->pool().byKindEnd(zypp::ResTraits<zypp::Product>::kind) ) { y2error ("Product for source '%d' not found", id); - + YCPList src_desc; src_desc->add( YCPString( src.url().asString() ) ); src_desc->add( YCPInteger( src.numericId() ) ); - + res->add( src_desc ); } } @@ -245,7 +245,7 @@ } y2milestone( "Pkg::PkgMediaNames result: %s", res->toString().c_str()); - + return res; } @@ -270,59 +270,59 @@ // all enabled sources std::list<zypp::SourceManager::SourceId> source_ids = zypp::SourceManager::sourceManager()->enabledSources(); - - // map SourceId -> [ number_of_media, total_size ] + + // map SourceId -> [ number_of_media, total_size ] std::map<zypp::SourceManager::SourceId, std::vector<zypp::ByteCount> > result; - + // map zypp::Source -> SourceID std::map<zypp::Source_Ref, zypp::SourceManager::SourceId> source_map; - // initialize + // initialize for( std::list<zypp::SourceManager::SourceId>::const_iterator sit = source_ids.begin(); sit != source_ids.end(); ++sit) { zypp::SourceManager::SourceId id = *sit; - + zypp::Source_Ref src = zypp::SourceManager::sourceManager()->findSource( id ); unsigned media = src.numberOfMedia(); - + result[id] = std::vector<zypp::ByteCount>(media,0); - + source_map[ src ] = id; } - + for( zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin<zypp::Package>() ; it != zypp_ptr()->pool().byKindEnd<zypp::Package>() ; ++it ) { zypp::Package::constPtr pkg = boost::dynamic_pointer_cast<const zypp::Package>(it->resolvable()); - if( it->status().isToBeInstalled() && pkg->mediaId() > 0) + if( it->status().isToBeInstalled() && pkg->sourceMediaNr() > 0) { zypp::ByteCount size = pkg->size(); result[ source_map[pkg->source()] ] - [pkg->mediaId()-1] += size ; // media are numbered from 1 + [pkg->sourceMediaNr()-1] += size ; // media are numbered from 1 } } - + YCPList res; - + for(std::map<zypp::SourceManager::SourceId, std::vector<zypp::ByteCount> >::const_iterator it = result.begin(); it != result.end() ; ++it) { std::vector<zypp::ByteCount> values = it->second; YCPList source; - + for( unsigned i = 0 ; i < values.size() ; i++ ) { source->add( YCPInteger( values[i] ) ); } - + res->add( source ); } - + y2milestone( "Pkg::PkgMediaSize result: %s", res->toString().c_str()); - + return res; } @@ -344,57 +344,57 @@ // all enabled sources std::list<zypp::SourceManager::SourceId> source_ids = zypp::SourceManager::sourceManager()->enabledSources(); - - // map SourceId -> [ number_of_media, total_size ] + + // map SourceId -> [ number_of_media, total_size ] std::map<zypp::SourceManager::SourceId, std::vector<zypp::ByteCount> > result; - + // map zypp::Source -> SourceID std::map<zypp::Source_Ref, zypp::SourceManager::SourceId> source_map; - // initialize + // initialize for( std::list<zypp::SourceManager::SourceId>::const_iterator sit = source_ids.begin(); sit != source_ids.end(); ++sit) { zypp::SourceManager::SourceId id = *sit; - + zypp::Source_Ref src = zypp::SourceManager::sourceManager()->findSource( id ); unsigned media = src.numberOfMedia(); - + result[id] = std::vector<zypp::ByteCount>(media,0); - + source_map[ src ] = id; } - + for( zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin<zypp::Package>() ; it != zypp_ptr()->pool().byKindEnd<zypp::Package>() ; ++it ) { zypp::Package::constPtr pkg = boost::dynamic_pointer_cast<const zypp::Package>(it->resolvable()); - if( pkg && it->status().isToBeInstalled() && pkg->mediaId() > 0) + if( pkg && it->status().isToBeInstalled() && pkg->sourceMediaNr() > 0) result[ source_map[pkg->source()] ] - [pkg->mediaId()-1]++ ; // media are numbered from 1 + [pkg->sourceMediaNr()-1]++ ; // media are numbered from 1 } - + YCPList res; - + for(std::map<zypp::SourceManager::SourceId, std::vector<zypp::ByteCount> >::const_iterator it = result.begin(); it != result.end() ; ++it) { const std::vector<zypp::ByteCount> &values = it->second; YCPList source; - + for( unsigned i = 0 ; i < values.size() ; i++ ) { source->add( YCPInteger( values[i] ) ); } - + res->add( source ); } - + y2milestone( "Pkg::PkgMediaCount result: %s", res->toString().c_str()); - + return res; } @@ -588,10 +588,10 @@ invokeOnEach( zypp_ptr()->pool().byNameBegin( name ), zypp_ptr()->pool().byNameEnd( name ), zypp::resfilter::ByKind( kind ), - zypp::functor::functorRef<bool,zypp::PoolItem> (info) + zypp::functor::functorRef<bool,zypp::PoolItem> (info) ); - - if (!info.item) + + if (!info.item) return false; bool result = info.item.status().setToBeInstalled( whoWantsIt ); @@ -678,9 +678,9 @@ return false; } - if (!match.item) + if (!match.item) return false; - + bool result = match.item.status().setToBeUninstalled( whoWantsIt ); y2milestone ("DoRemoveNameKind %s -> %s\n", name.c_str(), (result ? "Ok" : "Bad")); @@ -724,7 +724,7 @@ } } } -# warning error handling - return value +# warning error handling - return value return ret; } @@ -966,7 +966,7 @@ } data->add( YCPString("arch"), YCPString( pkg->arch().asString() ) ); - data->add( YCPString("medianr"), YCPInteger( pkg->mediaId() ) ); + data->add( YCPString("medianr"), YCPInteger( pkg->sourceMediaNr() ) ); zypp::Source_Ref pkg_src = pkg->source(); zypp::SourceManager::SourceId srcid = 0; @@ -1090,7 +1090,7 @@ { } } - + return data; } @@ -1114,7 +1114,7 @@ catch (...) { } - + return YCPVoid(); } @@ -1219,7 +1219,7 @@ { } } - + return ret; } @@ -1335,7 +1335,7 @@ bool ret = false; try - { + { for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraits<zypp::Package>::kind); it != zypp_ptr()->pool().byKindEnd(zypp::ResTraits<zypp::Package>::kind); ++it) @@ -1368,7 +1368,7 @@ PkgModuleFunctions::PkgAnyToInstall () { bool ret = false; - + try { for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraits<zypp::Package>::kind); @@ -1392,7 +1392,7 @@ // ------------------------ -/* helper function */ +/* helper function */ static void pkg2list (YCPList &list, const zypp::ResPool::byKind_iterator& it, bool names_only) { @@ -1710,9 +1710,9 @@ ) ); - + // set the status to uninstalled - return YCPBoolean( (it != zypp_ptr()->pool().byNameEnd(name)) + return YCPBoolean( (it != zypp_ptr()->pool().byNameEnd(name)) && it->status().setToBeUninstalled(whoWantsIt) ); } catch (...) @@ -1750,7 +1750,7 @@ ); // remove the transactions, lock the status - return YCPBoolean( (it != zypp_ptr()->pool().byNameEnd(name)) + return YCPBoolean( (it != zypp_ptr()->pool().byNameEnd(name)) && it->status().resetTransact(whoWantsIt) && it->status().setLock(true, whoWantsIt) ); @@ -1789,7 +1789,7 @@ ); // reset all transactions - return YCPBoolean( (it != zypp_ptr()->pool().byNameEnd(name)) + return YCPBoolean( (it != zypp_ptr()->pool().byNameEnd(name)) && it->status().resetTransact(whoWantsIt) ); } catch (...) @@ -1843,7 +1843,7 @@ PkgModuleFunctions::PkgSolve (const YCPBoolean& filter) { bool result = false; - + try { result = zypp_ptr()->resolver()->resolvePool(); @@ -1911,7 +1911,7 @@ PkgModuleFunctions::PkgEstablish () { bool result = false; - + try { result = zypp_ptr()->resolver()->establishPool(); @@ -1971,7 +1971,7 @@ PkgModuleFunctions::PkgFreshen() { bool result = false; - + try { result = zypp_ptr()->resolver()->freshenPool(); @@ -2279,7 +2279,7 @@ { } } - + return YCPString(""); } @@ -2348,7 +2348,7 @@ YCPBoolean PkgModuleFunctions::PkgMarkLicenseConfirmed (const YCPString & package) { std::string pkgname = package->value(); - + if (!pkgname.empty()) { try ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit log4net
by root＠suse.de 16 May '06

16 May '06

Hello community, here is the log from the commit of package log4net checked in at Wed May 17 01:10:33 CEST 2006. -------- --- log4net/log4net.changes 2006-02-25 12:56:07.000000000 +0100 +++ log4net/log4net.changes 2006-04-26 00:04:20.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 26 00:03:35 CEST 2006 - wberrier(a)suse.de + +- Change to noarch package, remove unnecessary deps + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ log4net.spec ++++++ --- /var/tmp/diff_new_pack.57p0V0/_old 2006-05-17 01:10:25.000000000 +0200 +++ /var/tmp/diff_new_pack.57p0V0/_new 2006-05-17 01:10:25.000000000 +0200 @@ -19,16 +19,17 @@ License: Apache Group: System/Libraries Autoreqprov: on -Requires: mono-core >= 1.1.7.7 -Requires: mono-data >= 1.1.7.7 -Requires: mono-web >= 1.1.7.7 +#Requires: mono-core >= 1.1.7.7 +#Requires: mono-data >= 1.1.7.7 +#Requires: mono-web >= 1.1.7.7 Version: 1.2.9 -Release: 7 +Release: 17 Summary: A .NET framework for logging Source: incubating-log4net-1.2.9-beta.zip Source1: log4net.key Source2: log4net.pc BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArchitectures: noarch #============================================================================= %description @@ -287,6 +288,8 @@ %{prefix}/lib/mono/log4net %changelog -n log4net +* Wed Apr 26 2006 - wberrier(a)suse.de +- Change to noarch package, remove unnecessary deps * Sat Feb 25 2006 - aj(a)suse.de - Do not build as root - Reduce BuildRequires. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0