December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit kdebase3-SuSE
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package kdebase3-SuSE checked in at Thu Dec 7 20:37:34 CET 2006. -------- --- KDE/kdebase3-SuSE/kdebase3-SuSE.changes 2006-11-27 17:48:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3-SuSE/kdebase3-SuSE.changes 2006-12-05 09:54:35.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Dec 5 09:54:16 CET 2006 - stbinner(a)suse.de + +- provide and obsolete kdebase3-NLD + +------------------------------------------------------------------- +Mon Dec 4 12:16:55 CET 2006 - dmueller(a)suse.de + +- bump version to 10.3 + +------------------------------------------------------------------- Old: ---- kdebase-SuSE-10.2.tar.bz2 New: ---- kdebase-SuSE-10.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3-SuSE.spec ++++++ --- /var/tmp/diff_new_pack.cQDEWA/_old 2006-12-07 20:36:34.000000000 +0100 +++ /var/tmp/diff_new_pack.cQDEWA/_new 2006-12-07 20:36:34.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase3-SuSE (Version 10.2) +# spec file for package kdebase3-SuSE (Version 10.3) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,8 +18,8 @@ Conflicts: kdebase3-NLD Obsoletes: kdebase-SuSE kdebase3-BILD Provides: kdebase-SuSE kdebase3-BILD -Obsoletes: kdebase-yast2, susehelpcenter, SuSE-Wizard, susewm-kcmyast -Provides: kdebase-yast2, susehelpcenter, suse_help_viewer, base3-theme, SuSE-Wizard, susewm-kcmyast +Obsoletes: kdebase-yast2, susehelpcenter, SuSE-Wizard, susewm-kcmyast, kdebase3-NLD +Provides: kdebase-yast2, susehelpcenter, suse_help_viewer, base3-theme, SuSE-Wizard, susewm-kcmyast, kdebase3-NLD Requires: kdebase3,release-notes,ghostscript-fonts-std,yast2-theme-openSUSE,desktop-data-SuSE,kio_slp,susehelp,zypper Obsoletes: kdebase3-Personal %if %suse_version > 1010 @@ -33,8 +33,8 @@ %endif PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 10.2 -Release: 82 +Version: 10.3 +Release: 1 Source0: kdebase-SuSE-%{version}.tar.bz2 Source2: kdebase3-SuSE-displaymanager.fillup Source3: kdebase3-SuSE-windowmanager.fillup @@ -179,6 +179,10 @@ /var/lib/kde-profiles %changelog -n kdebase3-SuSE +* Tue Dec 05 2006 - stbinner(a)suse.de +- provide and obsolete kdebase3-NLD +* Mon Dec 04 2006 - dmueller(a)suse.de +- bump version to 10.3 * Mon Nov 27 2006 - stbinner(a)suse.de - install ~/.kde/share/apps/kicker/Home.desktop not only for new users but also on upgrade (#223737) ++++++ kdebase-SuSE-10.2.tar.bz2 -> kdebase-SuSE-10.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/env/startkde.suse.sh new/kdebase-SuSE/config-files/opt/kde3/env/startkde.suse.sh --- old/kdebase-SuSE/config-files/opt/kde3/env/startkde.suse.sh 2006-11-27 11:27:35.000000000 +0100 +++ new/kdebase-SuSE/config-files/opt/kde3/env/startkde.suse.sh 2006-12-04 10:06:09.000000000 +0100 @@ -87,12 +87,6 @@ fi if [ "$USER" == "root" ]; then if [ ! -e "$HOME/.skel/kdebase3" -a ! -e "$KDEHOME/share/config/kdeglobals" ]; then - if [ -e "/opt/kde3/bin/startkde.theme.unitedlinux" ]; then - . /opt/kde3/bin/startkde.theme.unitedlinux - copy_default_root_ul "$KDEHOME" - create_default_desktop_ul "$HOME/Desktop/" - fi - if [ -e "/opt/kde3/bin/startkde.theme" ]; then . /opt/kde3/bin/startkde.theme fi @@ -103,12 +97,6 @@ fi else if [ ! -e "$HOME/.skel/kdebase3" -a ! -e "$KDEHOME/share/config/kdeglobals" ]; then - if [ -e "/opt/kde3/bin/startkde.theme.unitedlinux" ]; then - . /opt/kde3/bin/startkde.theme.unitedlinux - copy_default_user_ul "$KDEHOME" - create_default_desktop_ul "$HOME/Desktop/" - fi - if [ -e "/opt/kde3/bin/startkde.theme" ]; then . /opt/kde3/bin/startkde.theme fi @@ -134,10 +122,6 @@ touch $HOME/.skel/kdebase3.102 fi - for i in /opt/kde3/share/UnitedLinux/addon-scripts/*; do - [ -r "$i" ] && \ - . "$i" - done fi # check if any rpms have been (un)installed since ksycoca diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/SUSEgreeter/hr.po new/kdebase-SuSE/po/SUSEgreeter/hr.po --- old/kdebase-SuSE/po/SUSEgreeter/hr.po 2006-11-27 11:32:30.000000000 +0100 +++ new/kdebase-SuSE/po/SUSEgreeter/hr.po 2006-12-04 12:12:56.000000000 +0100 @@ -1,31 +1,32 @@ -# SOME DESCRIPTIVE TITLE. +# translation of SUSEgreeter.hr.po to Croatian # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +# KreÅ¡imir JoziÄ <kjozic(a)gmail.com>, 2006. msgid "" msgstr "" -"Project-Id-Version: SUSEgreeter\n" +"Project-Id-Version: SUSEgreeter.hr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-10-19 17:53+0200\n" -"PO-Revision-Date: 2006-10-20 13:05:05+CEST\n" -"Last-Translator: hr <i18n(a)suse.de>\n" -"Language-Team: hr <i18n(a)suse.de>\n" +"PO-Revision-Date: 2006-12-02 12:35+0000\n" +"Last-Translator: KreÅ¡imir JoziÄ <kjozic(a)gmail.com>\n" +"Language-Team: Croatian <en(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" #: greetings.cpp:61 greetings.cpp:77 msgid "Error loading %1" -msgstr "" +msgstr "GreÅ¡ka kod uÄitavanja %1" #: main.cpp:31 main.cpp:44 msgid "SUSEgreeter" -msgstr "" +msgstr "openSUSEgreeter" #: translationdummy.cpp:4 msgid "Register Now to Access Your Free Installation Support" -msgstr "" +msgstr "Registrirajte se sada da biste pristupili vaÅ¡oj besplatnoj instalacijskoj podrÅ¡ci" #: translationdummy.cpp:6 msgid "" @@ -33,6 +34,9 @@ "free installation support. For full access to the openSUSE installation " "support, register now at:" msgstr "" +"Ako ste kupili openSUSE 10.2 u kutiji, imate pristup " +"besplatnoj instalacijskoj podrÅ¡ci. Za potpuni pristup openSUSE " +"instalacijskoj podrÅ¡ci, registrirajte se na:" #: translationdummy.cpp:8 msgid "" @@ -40,19 +44,21 @@ "information, and access to additional services that support your copy of " "openSUSE. Your support registration code can be found on your media cover." msgstr "" +"Portal vam omoguÄuje pristup besplatnoj instalacijskoj podrÅ¡ci, vaÅŸnim " +"informacijama i pristup dodatnim servisima koji podrÅŸavaju vaÅ¡u kopiju openSUSE-a. " +"VaÅ¡ registracijski kod moÅŸete pronaÄi na omotu medija." #: translationdummy.cpp:10 translationdummy.cpp:29 msgid "Keep Your System Up-to-Date" -msgstr "" +msgstr "OdrÅŸavajte vaÅ¡ sistem aÅŸurnim." #: translationdummy.cpp:12 translationdummy.cpp:31 -msgid "" -"Update your system regularly with performing an online update. It's easy!" -msgstr "" +msgid "Update your system regularly with performing an online update. It's easy!" +msgstr "DograÄujte vaÅ¡ sistem redovito pomoÄu online dogradnje. To je lako!" #: translationdummy.cpp:14 translationdummy.cpp:33 msgid "Get Your Free Novell Linux Newsletter!" -msgstr "" +msgstr "Dohvatite vaÅ¡u besplatnu Novell Linux poÅ¡tu!" #: translationdummy.cpp:16 translationdummy.cpp:35 msgid "" @@ -62,18 +68,23 @@ "plus comprehensive news and information about other Novell offerings. <a " "href=\"http://www.novell.com/company/subscribe/\">Subscribe today!</a>" msgstr "" +"openSUSE projekt je sponozoriran od Novell-a, koji nudi paket pune podrÅ¡ke " +"Linux rjeÅ¡enja namijenjenih poslovnim korisnicima. MjeseÄna Novell Linux poÅ¡ta " +"vam, pruÅŸa najnovije savjete za openSUSE plus opÅ¡irne vijesti i informacije o Novell-ovim " +"ponudama. <a " +"href=\"http://www.novell.com/company/subscribe/\">Pretplatite se danas!</a>" #: translationdummy.cpp:18 translationdummy.cpp:37 msgid "Enjoy openSUSE!" -msgstr "" +msgstr "UÅŸivajte u openSUSE!" #: translationdummy.cpp:20 translationdummy.cpp:39 msgid "CLOSE" -msgstr "" +msgstr "ZATVORI" #: translationdummy.cpp:25 msgid "Welcome to openSUSE Beta" -msgstr "" +msgstr "DobrodoÅ¡li na openSUSE Beta" #: translationdummy.cpp:27 msgid "" @@ -86,15 +97,28 @@ "learn how you can participate more fully in the openSUSE community, please " "visit opensuse.org." msgstr "" +"U krajnjoj verziji openSUSE 10.2, ovdje Äete se registrirati za podrÅ¡ku. " +"Zbog toga Å¡to ne pruÅŸamo formalnu tehniÄku podrÅ¡ku za testne izgradnje " +"openSUSE-a, jednostavno Äemo vam zahvaliti za vaÅ¡u podrÅ¡ku i sudjelovanje " +"u openSUSE zajednici. Kako koristite ovu razvoju verziju, sretat Äete se sa " +"stvarima koje ne rade ispravno. Molimo vas da nam javite Å¡to ste otkrili " +"da to moÅŸemo popraviti, tako da poÅ¡aljete greÅ¡ku u naÅ¡u bugzilla bazu podataka. " +"Da biste nauÄili kako moÅŸete sudjelovati viÅ¡e u naÅ¡oj openSUSE zajednici, molimo vas " +"da posjetite opensuse.org." #: _translatorinfo.cpp:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "" +"_: IME PREVODIOCA\n" +"VaÅ¡a imena" #: _translatorinfo.cpp:3 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "" +"_: EMAIL PREVODIOCA\n" +"VaÅ¡i email-ovi" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/SUSEgreeter/km.po new/kdebase-SuSE/po/SUSEgreeter/km.po --- old/kdebase-SuSE/po/SUSEgreeter/km.po 2006-11-27 11:32:30.000000000 +0100 +++ new/kdebase-SuSE/po/SUSEgreeter/km.po 2006-12-04 12:12:56.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: SUSEgreeter\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-10-19 17:53+0200\n" -"PO-Revision-Date: 2006-11-14 15:55+0700\n" +"PO-Revision-Date: 2006-11-28 11:21+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n" "Language-Team: Khmer <support(a)khmeros.info>\n" "MIME-Version: 1.0\n" @@ -31,7 +31,7 @@ #: translationdummy.cpp:6 msgid "If you have purchased a physical box of openSUSE 10.2, you have access to free installation support. For full access to the openSUSE installation support, register now at:" -msgstr "ááááá·áâááŸá¢áááâáá¶áâáá·áâáááá¢ááâá¢áŒáá¹áâáááŒáááž á¡á .á¢ áá·á áááââá¢áááâáá¹áâáá¶áâáá¶áááŒáâááááŸááá¶áâáááá¶ááâáá¶áâáá¶ááááâáá¶áâááá¡áŸáâáááâáááážÂ á ááŸáááážâááŒáâááááŸááá¶áâáááá¶ááâáá¶áâáá¶ááááâáá¶áááá¡âá¢áŒáá¹áâáááŒááážââE ááááááâááá ááºâááááŒáâáá»ááááááâáááá»ááááâá¥á¡áŒá ááÂ á" +msgstr "ááááá·áâááŸá¢áááâáá¶áâáá·áâáááá¢ááâá¢áŒáá¹áâáááŒáááž á¡á .á¢ áá·á áááââá¢áááâáá¹áâáá¶áâáá¶áááŒáâááááŸááá¶áâáááá¶ááâáá¶áâáá¶ááááâáá¶áâááá¡áŸáâáááâáááážÂ á ááŸáááážâááŒáâááááŸááá¶áâáááá¶ááâáá¶áâáá¶ááááâáá¶áááá¡âá¢áŒáá¹áâáááŒáááž ááááááâááá ááºâááááŒáâáá»ááááááâáááá»ááááâá¥á¡áŒá ááÂ á" #: translationdummy.cpp:8 msgid "The portal provides you access to your free installation support, important information, and access to additional services that support your copy of openSUSE. Your support registration code can be found on your media cover." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/kfiledialog/hr.po new/kdebase-SuSE/po/kfiledialog/hr.po --- old/kdebase-SuSE/po/kfiledialog/hr.po 2006-11-27 11:32:29.000000000 +0100 +++ new/kdebase-SuSE/po/kfiledialog/hr.po 2006-12-04 12:12:53.000000000 +0100 @@ -1,54 +1,57 @@ +# translation of kfiledialog.hr.po to Croatian # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # # This file is distributed under the same license as @PACKAGE@ package. FIRST # +# KreÅ¡imir JoziÄ <kjozic(a)gmail.com>, 2006. msgid "" msgstr "" -"Project-Id-Version: @PACKAGE@\n" +"Project-Id-Version: kfiledialog.hr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-18 10:26+0200\n" -"PO-Revision-Date: 2001-07-17 16:22+0200\n" -"Last-Translator: Vlatko Kosturjak <kost(a)iname.com>\n" -"Language-Team: Croatian <i18n(a)suse.de>\n" +"PO-Revision-Date: 2006-12-02 13:26+0000\n" +"Last-Translator: KreÅ¡imir JoziÄ <kjozic(a)gmail.com>\n" +"Language-Team: Croatian <en(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: KBabel 1.11.4\n" #: main.cpp:18 msgid "Front-end for the KDE file dialog" -msgstr "" +msgstr "Prednji dio za KDE prozor datoteka" #: main.cpp:24 msgid "Set dialog mode to single file (default)" -msgstr "" +msgstr "Postavi mod prozora na jednu datoteku (pretpostavljeno)" #: main.cpp:25 msgid "Set dialog mode to multiple file" -msgstr "" +msgstr "Postavi mod prozora na viÅ¡e datoteka" #: main.cpp:26 msgid "Set dialog mode to directory" -msgstr "" +msgstr "Postavi mod prozora na direktorij" #: main.cpp:27 msgid "Print selected files" -msgstr "" +msgstr "IspiÅ¡i odabrane dokumente" #: main.cpp:28 msgid "Accept nonlocal files" -msgstr "" +msgstr "Prihvati ne-lokane datoteke" #: main.cpp:29 msgid "Set initial directory" -msgstr "" +msgstr "Postavi poÄetni direktorij" #: main.cpp:30 msgid "Set filter" -msgstr "" +msgstr "Postavi filter" #: main.cpp:55 msgid "kfiledialog" -msgstr "" +msgstr "kfiledialog" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/kio_sysinfo/km.po new/kdebase-SuSE/po/kio_sysinfo/km.po --- old/kdebase-SuSE/po/kio_sysinfo/km.po 2006-11-27 11:32:30.000000000 +0100 +++ new/kdebase-SuSE/po/kio_sysinfo/km.po 2006-12-04 12:12:54.000000000 +0100 @@ -8,13 +8,13 @@ "Project-Id-Version: kio_sysinfo\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-09-14 17:19+0200\n" -"PO-Revision-Date: 2006-03-17 09:56+0700\n" +"PO-Revision-Date: 2006-11-28 09:04+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n" "Language-Team: Khmer <support(a)khmeros.info>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11\n" +"X-Generator: KBabel 1.11.4\n" #: ksysinfopart.cpp:72 msgid "KSysinfo" @@ -34,7 +34,7 @@ #: sysinfo.cpp:106 sysinfo.cpp:110 msgid "My Computer" -msgstr "áá»áááááŒáááâááááâáááá»á" +msgstr "áá»áááááŒáááâââáááá»á" #: sysinfo.cpp:111 msgid "Folders, Harddisks, Removable Devices, System Information and more..." @@ -223,3 +223,4 @@ #: sysinfo.cpp:553 msgid "Unknown network status" msgstr "áá·áâáááá¶ááâáááá¶ááá¶áâááááá¶á" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/krpmview/hr.po new/kdebase-SuSE/po/krpmview/hr.po --- old/kdebase-SuSE/po/krpmview/hr.po 2006-11-27 11:32:30.000000000 +0100 +++ new/kdebase-SuSE/po/krpmview/hr.po 2006-12-04 12:12:55.000000000 +0100 @@ -1,29 +1,31 @@ +# translation of krpmview.hr.po to Croatian # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # # This file is distributed under the same license as @PACKAGE@ package. FIRST # +# KreÅ¡imir JoziÄ <kjozic(a)gmail.com>, 2006. msgid "" msgstr "" -"Project-Id-Version: @PACKAGE@\n" +"Project-Id-Version: krpmview.hr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-10-07 19:48+0200\n" -"PO-Revision-Date: 2001-07-17 16:22+0200\n" -"Last-Translator: Vlatko Kosturjak <kost(a)iname.com>\n" -"Language-Team: Croatian <i18n(a)suse.de>\n" +"PO-Revision-Date: 2006-12-02 13:29+0000\n" +"Last-Translator: KreÅ¡imir JoziÄ <kjozic(a)gmail.com>\n" +"Language-Team: Croatian <en(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: KBabel 1.11.4\n" #: krpmview.cpp:59 msgid "Install Package with YaST" -msgstr "" +msgstr "Instaliraj paket s YaST-om" #: krpmview.cpp:65 msgid "Use Directory as Source with YaST" -msgstr "" +msgstr "Koristi direktorij kao izvor za YaST" #: krpmview.cpp:82 msgid "Description" @@ -31,28 +33,29 @@ #: krpmview.cpp:83 msgid "Changelog" -msgstr "" +msgstr "Dnevnik promjena" #: krpmview.cpp:182 msgid "Project Page: " -msgstr "" +msgstr "Stranica projekta:" #: krpmview.cpp:197 msgid "Parsing complete." -msgstr "" +msgstr "Parsiranje zavrÅ¡eno." #: krpmview.cpp:224 msgid "krpmview" -msgstr "" +msgstr "krpmview" #: krpmview.cpp:226 msgid "Viewer for RPM files" -msgstr "" +msgstr "Preglednik za RPM datoteke" #: krpmview.cpp:229 msgid "KRPMView views the content of RPM archives and can use YaST to install them" -msgstr "" +msgstr "KRPMView sluÅŸi za pregled RPM arhiva i moÅŸe korisiti YaST da bi ih instalirao" #: krpmview.cpp:232 msgid "Current Maintainer" -msgstr "" +msgstr "Osoba koja trenutno odrÅŸava" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/suseplugger/hr.po new/kdebase-SuSE/po/suseplugger/hr.po --- old/kdebase-SuSE/po/suseplugger/hr.po 2006-11-27 11:32:30.000000000 +0100 +++ new/kdebase-SuSE/po/suseplugger/hr.po 2006-12-04 12:12:56.000000000 +0100 @@ -1,17 +1,18 @@ +# translation of suseplugger.hr.po to Croatian # Croatian message file for YaST2 (@memory@) # Copyright (C) 2002 SUSE Linux AG. # Copyright (C) 2001 SUSE GmbH. -# Vlatko Kosturjak <kost(a)iname.com>, 2001 # -#, fuzzy +# Vlatko Kosturjak <kost(a)iname.com>, 2001. +# KreÅ¡imir JoziÄ <kjozic(a)gmail.com>, 2006. msgid "" msgstr "" -"Project-Id-Version: YaST2 (@memory@)\n" +"Project-Id-Version: suseplugger.hr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-09-14 17:19+0200\n" -"PO-Revision-Date: 2001-07-17 16:22+0200\n" -"Last-Translator: Vlatko Kosturjak <kost(a)iname.com>\n" -"Language-Team: Croatian <i18n(a)suse.de>\n" +"PO-Revision-Date: 2006-12-02 12:42+0000\n" +"Last-Translator: KreÅ¡imir JoziÄ <kjozic(a)gmail.com>\n" +"Language-Team: Croatian <en(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,24 +20,25 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "#-#-#-#-# suseplugger.po (YaST2 (@memory@)) #-#-#-#-#\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: KBabel 1.11.4\n" #: main.cpp:41 msgid "Check for new hardware on session startup." -msgstr "" +msgstr "Provjeri novo sklopovlje na poÄetku sesije." #: main.cpp:42 msgid "HAL UDI to process." -msgstr "" +msgstr "HAL UDI procesu." #: main.cpp:51 msgid "SUSEPlugger" -msgstr "" +msgstr "SUSEPlugger" #. i18n: file susehwpopup.ui line 24 #: rc.cpp:3 -#, fuzzy, no-c-format +#, no-c-format msgid "SUSE Hardware Detection" -msgstr "Izbor Software-a" +msgstr "SUSE detekcija sklopovlja" #. i18n: file susehwpopup.ui line 69 #: rc.cpp:6 @@ -54,37 +56,35 @@ #: rc.cpp:15 #, no-c-format msgid "&Keep me informed about new hardware" -msgstr "" +msgstr "&Obavijesti me o novom sklopovlju" #. i18n: file susehwpopup.ui line 164 #: rc.cpp:18 -#, fuzzy, no-c-format +#, no-c-format msgid "Configure scanner?" -msgstr "Konfiguriranje monitora" +msgstr "Postaviti skener?" #. i18n: file susehwpopup.ui line 230 #: rc.cpp:21 #, no-c-format msgid "New Hardware Found" -msgstr "" +msgstr "PronaÄeno novo sklopovlje" #: susehwitem.cpp:148 msgid "Network Interface" -msgstr "" +msgstr "MreÅŸno suÄelje" #: susehwitem.cpp:157 -#, fuzzy msgid "Mouse" -msgstr "Model" +msgstr "MiÅ¡" #: susehwitem.cpp:167 -#, fuzzy msgid "Keyboard" -msgstr "&Test tastature:" +msgstr "Tipkovnica" #: susehwitem.cpp:181 msgid "Bluetooth" -msgstr "" +msgstr "Bluetooth" #: susehwitem.cpp:194 msgid "Printer" @@ -92,140 +92,73 @@ #: susehwitem.cpp:202 msgid "Scanner" -msgstr "" +msgstr "Skener" #: susehwitem.cpp:210 msgid "PDA" -msgstr "" +msgstr "PDA" #: susehwitem.cpp:219 -#, fuzzy msgid "Modem" -msgstr "Model" +msgstr "Modem" #: susehwitem.cpp:229 msgid "USB" -msgstr "" +msgstr "USB" #: susehwitem.cpp:236 msgid "Monitor" -msgstr "" +msgstr "Monitor" #: susehwitem.cpp:237 msgid "Display" -msgstr "" +msgstr "Prikaz" #: susehwitem.cpp:238 msgid "Joystick" -msgstr "" +msgstr "Joystick" #: susehwitem.cpp:239 -#, fuzzy msgid "Chipcard" -msgstr "&Odbaci" +msgstr "Kartica" #: susehwitem.cpp:240 -#, fuzzy msgid "Sound Device" -msgstr "UreÄaj" +msgstr "ZvuÄni ureÄaj" #: susehwitem.cpp:241 msgid "TV Card" -msgstr "" +msgstr "TV kartica" #: susehwitem.cpp:242 msgid "ISDN Controller" -msgstr "" +msgstr "ISDN kontroler" #: susehwitem.cpp:244 -#, fuzzy msgid "Unknown" -msgstr "nepoznato" +msgstr "Nepoznato" #: susehwitem.cpp:328 -#, fuzzy msgid "Configure the %1?" -msgstr "Da li ÅŸelite vidjeti zapisivanje dogaÄaja ?" +msgstr "Podesiti %1?" #: susehwitem.cpp:330 -#, fuzzy msgid "Configure the %1 \"%2\"?" -msgstr "Da li ÅŸelite vidjeti zapisivanje dogaÄaja ?" +msgstr "Podesiti %1 \"%2\"?" #: susehwitem.cpp:401 msgid "The corresponding YaST2 module for %1 does not seem to be installed. Installing it first..." -msgstr "" +msgstr "OdgovarajuÄi YaST2 modul za %1 nije instaliran. Prvo ga instaliram..." #: susehwitem.cpp:427 msgid "An error occured while checking for the installed YaST2 module. Aborting." -msgstr "" +msgstr "Desila se greÅ¡ka prilikom provjere instaliranog YaST2 modula. Odustajem." #: susehwitemhandler.cpp:198 msgid "" "Your monitor did not report its X and Y Size. This might cause display problems like unreadable fonts.\n" "Configure your monitor geometry manually?" msgstr "" +"VaÅ¡ monitor nije prijavio svoju X i Y veliÄinu. To moÅŸe stvoriti probleme s prikazom kao npr. fontove koji se ne mogu Äitati.\n" +"Da li ÅŸelite ruÄno podesiti geometriju monitora?" -#, fuzzy -#~ msgid "Configure..." -#~ msgstr "Konfiguriranje monitora" - -#, fuzzy -#~ msgid "Disk" -#~ msgstr "Danska" - -#, fuzzy -#~ msgid "Camera" -#~ msgstr "Ime" - -#, fuzzy -#~ msgid "Start the Application Directly" -#~ msgstr "Zaista prekinuti instalaciju?" - -#, fuzzy -#~ msgid "Details" -#~ msgstr "Danska" - -#, fuzzy -#~ msgid "DeviceManager" -#~ msgstr "UreÄaj" - -#, fuzzy -#~ msgid "Eject" -#~ msgstr "&Izbaci" - -#, fuzzy -#~ msgid "term" -#~ msgstr "NjemaÄka" - -#, fuzzy -#~ msgid "General" -#~ msgstr "Meksiko/OpÄenito" - -#, fuzzy -#~ msgid "Driver" -#~ msgstr "Disketa sa upravljaÄkim programom" - -#~ msgid "Type" -#~ msgstr "Tip" - -#~ msgid "Vendor" -#~ msgstr "ProizvoÄaÄ" - -#~ msgid "Status" -#~ msgstr "Status" - -#, fuzzy -#~ msgid "Active" -#~ msgstr "Aktiviraj %1..." - -#~ msgid "Partition" -#~ msgstr "Particija" - -#, fuzzy -#~ msgid "Device Icons" -#~ msgstr "UreÄaj" - -#, fuzzy -#~ msgid "unknown vendor" -#~ msgstr "nepoznato" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/susetranslations/km.po new/kdebase-SuSE/po/susetranslations/km.po --- old/kdebase-SuSE/po/susetranslations/km.po 2006-11-27 11:32:30.000000000 +0100 +++ new/kdebase-SuSE/po/susetranslations/km.po 2006-12-04 12:12:57.000000000 +0100 @@ -1,17 +1,16 @@ -# translation of susetranslations.km.po to Khmer +# translation of susetranslations.po to Khmer # translation of susetranslations.km.po to # This file is put in the public domain. -#. # Khoem Sokhem <khoemsokhem(a)khmeros.info>, 2006. # Poch Sokun <sokunpoch(a)khmeros.info>, 2006. # Eng Vannak <evannak(a)khmeros.info>, 2006. # auk piseth <piseth_dv(a)khmeros.info>, 2006. msgid "" msgstr "" -"Project-Id-Version: susetranslations.km\n" +"Project-Id-Version: susetranslations\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-10-27 12:08+0200\n" -"PO-Revision-Date: 2006-11-16 16:38+0700\n" +"PO-Revision-Date: 2006-11-29 11:25+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n" "Language-Team: Khmer <support(a)khmeros.info>\n" "MIME-Version: 1.0\n" @@ -24,12 +23,8 @@ msgstr "áááááá á¬ áááááÂ á" #: china.cpp:3 china.cpp:13 -msgid "" -"Here you can choose your country or region. The settings for languages, " -"numbers etc. will automatically switch to the corresponding values." -msgstr "" -"áááážááá á¢áááâá¢á¶áâááááŸáâáááááá á¬ áááááâááááâá¢áááÂ á áá¶áâáááááâáá¶áá¶ áááÂ ááá áá¹áâááááŒáâáááâáááááâáááááááá·âááâ" -"áááááâáááâááááŒáâáááá¶Â á" +msgid "Here you can choose your country or region. The settings for languages, numbers etc. will automatically switch to the corresponding values." +msgstr "áááážááá á¢áááâá¢á¶áâááááŸáâáááááá á¬ áááááâááááâá¢áááÂ á áá¶áâáááááâáá¶áá¶ áááÂ ááá áá¹áâááááŒáâáááâáááááâáááááááá·âááâáááááâáááâááááŒáâáááá¶Â á" #: china.cpp:5 msgid "" @@ -62,9 +57,7 @@ msgstr "áááááááâáá·áá·ááááâ" #: dirfilter.cpp:3 kdeaddons3.spec.cpp:10 -msgid "" -"Enter here a text which shall be searched on the whole system in the Beagle " -"index." +msgid "Enter here a text which shall be searched on the whole system in the Beagle index." msgstr "áááááŒáâá¢áááááâáááážáááâ áááâáá¶âáá¹áâááááŒáâáá¶ááááááááâááŸâááááááááâáá¶ááááŒáâáááá»áâáá·áá·ááááâ BeagleÂ áâ" #: kaffeine.spec.cpp:2 @@ -75,30 +68,19 @@ msgstr "" "ááááâáááá Xine ááá (áá¶áâááááŸâááá Kaffeine) áá¶áâááâáááá»áâááááâááâááŒáá·áâáááâáá¶áâáá¶ááááâááá»áááááÂ á\n" "áá¶âáá·áâá¢á¶áâáá¶ááâáážáážáážâáá¶áâá¡áŸáÂ á\n" -"ááááá¶ááâááááááážáááá¢á·áâáááááá ááŒáâá¢á¶á http://portal.suse.com/sdb/en/2003/09/xine_dvd." -"htmlÂ á" +"ááááá¶ááâááááááážáááá¢á·áâáááááá ááŒáâá¢á¶á http://portal.suse.com/sdb/en/2003/09/xine_dvd.htmlÂ á" #: kaffeine.spec.cpp:5 -msgid "" -"No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows " -"Media 9 files, newer Real Media files and some less common formats." -msgstr "" -"ááâáá·áâááŸáâááŒáá·á WIN32 âáááá»á /usr/lib/win32 á¡áŸáÂ á á¢áááâáá·áâá¢á¶áâáá¶ááâá¯ááá¶áâááážáááŒâááááÂ á©, á¯ááá¶áââ" -"áááááááâáááážá áá·á ááááááááá¶áââááŒááâááœâáâááááœáâáááâáá¶áâá¡áŸáÂ á" +msgid "No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats." +msgstr "ááâáá·áâááŸáâááŒáá·á WIN32 âáááá»á /usr/lib/win32 á¡áŸáÂ á á¢áááâáá·áâá¢á¶áâáá¶ááâá¯ááá¶áâááážáááŒâááááÂ á©, á¯ááá¶áââáááááááâáááážá áá·á ááááááááá¶áââááŒááâááœâáâááááœáâáááâáá¶áâá¡áŸáÂ á" #: kaffeine.spec.cpp:8 -msgid "" -"libdvdcss not found. You're not able to play encrypted (most commercial) " -"DVD's." +msgid "libdvdcss not found. You're not able to play encrypted (most commercial) DVD's." msgstr "ááâáá·áááŸá libdvdcssÂ á á¢áááâáá·áâá¢á¶áâáá¶ááâáážáážáážâá¢áá·ááááážáâáá¶áâá¡áŸá (áá¶áâááááŸáâáá¶âáážáážáážââááááŸâááááœá)Â á" #: kaffeine.spec.cpp:11 -msgid "" -"The xine-lib shipped by SuSE \"may lack certain features because of legal " -"requirements (potential patent violation)\"." -msgstr "" -"xine-lib áááâáááá¶ááâááâáá¶ááœáâáááŒáááž \"á¢á¶áâááááâáá¶áâááááááâáá·áááâááœáâááááœá áááâáá¶áâááâáááááŒááá¶áâááááâáááá¶áá (áá·áâ" -"á¢á¶áâáááá¶áâááá¶áááâáá¶áâá¡áŸá)\"Â á" +msgid "The xine-lib shipped by SuSE \"may lack certain features because of legal requirements (potential patent violation)\"." +msgstr "xine-lib áááâáááá¶ááâááâáá¶ááœáâáááŒáááž \"á¢á¶áâááááâáá¶áâááááááâáá·áááâááœáâááááœá áááâáá¶áâááâáááááŒááá¶áâááááâáááá¶áá (áá·áâá¢á¶áâáááá¶áâááá¶áááâáá¶áâá¡áŸá)\"Â á" #: kconfigeditor.spec.cpp:2 msgid "Parsing configuration files..." @@ -223,17 +205,11 @@ msgstr "ááááŒá" #: kdebase3.spec.cpp:87 -msgid "" -"<p>This link type tells search engines which document is considered by the " -"author to be the starting point of the collection.</p>" -msgstr "" -"<p>ááááááâáááâáááâáááá¶ááâááá¶ááážáâááááááá áá¶ááŸâá¯ááá¶áâááœáâáá¶ á¢áááâáá·ááááâáá¶ááâáá»áâáá¶âáá¶âáááá»áâáá¶ááâááááŸáâááâáá¶áâ" -"áááááŒááááá»áÂ á</p>" +msgid "<p>This link type tells search engines which document is considered by the author to be the starting point of the collection.</p>" +msgstr "<p>ááááááâáááâáááâáááá¶ááâááá¶ááážáâááááááá áá¶ááŸâá¯ááá¶áâááœáâáá¶ á¢áááâáá·ááááâáá¶ááâáá»áâáá¶âáá¶âáááá»áâáá¶ááâááááŸáâááâáá¶áâáááááŒááááá»áÂ á</p>" #: kdebase3.spec.cpp:93 -msgid "" -"<p>This link references the previous document in an ordered series of " -"documents.</p>" +msgid "<p>This link references the previous document in an ordered series of documents.</p>" msgstr "<p>áááâáááâááááá¶áâá¯ááá¶áâáá»á ááâáááá»áâááááážââáááá¶ááâá¯ááá¶áÂ á</p>" #: kdebase3.spec.cpp:96 @@ -241,9 +217,7 @@ msgstr "ááááá¶áá" #: kdebase3.spec.cpp:99 -msgid "" -"<p>This link references the next document in an ordered series of documents." -"</p>" +msgid "<p>This link references the next document in an ordered series of documents.</p>" msgstr "<p>áááâáááâááááá¶áâá¯ááá¶áâááááá¶áá ááâáááá»áâááááážââáááá¶ááâá¯ááá¶á á</p>" #: kdebase3.spec.cpp:102 @@ -407,7 +381,7 @@ #: kdebase3.spec.cpp:224 msgid "Switch to SUSE Menu Style" -msgstr "ááááŒáâááâáááá¶âááááááááºáá»áâááááâáááŒáááž" +msgstr "ááááŒáâááâáááá¶áááááâáááºáá»áâááááâáááŒáááž" #: kdebase3.spec.cpp:227 msgid "Switch to KDE Menu Style" @@ -452,19 +426,15 @@ #: kdebase3.spec.cpp:261 msgid "Most commonly used applications and documents" -msgstr "áááááá·ááž âáá·á á¯ááá¶áâáá¶âáááâáá¶áááááŸâáá¶âááŒááâáááá»áâ" +msgstr "áááááá·ááž âáá·áâá¯ááá¶áâââáááâáá¶áâááááŸâáá¶âááŒááâáááá»áâ" #: kdebase3.spec.cpp:264 msgid "List of installed applications" msgstr "ááááážâáááááá·áážâáááâáá¶áâááá¡áŸá" #: kdebase3.spec.cpp:267 -msgid "" -"Information and configuration of your system, access to personal files, " -"network resources and connected disk drives" -msgstr "" -"áááááá¶á âáá·á áá¶áááááááááá¶ááááááááâáááá âáááááááá áá¶áâááŒáâááááŸááá¶áâáááá»áâá¯ááá¶áâáááá¶ááááááœáâ áááá¶áâááááá¶áâ áá·á " -"áážááááá¶áâáááâáá¶ááááá¶ááââááááâá¢ááá" +msgid "Information and configuration of your system, access to personal files, network resources and connected disk drives" +msgstr "áááááá¶á âáá·á áá¶áááááááááá¶ááááááááâáááá âáááááááá áá¶áâááŒáâááááŸááá¶áâáááá»áâá¯ááá¶áâáááá¶ááááááœáâ áááá¶áâááááá¶áâ áá·á áážááááá¶áâáááâáá¶ááááá¶ááââááááâá¢ááá" #: kdebase3.spec.cpp:270 msgid "<qt>Logout, switch user, switch off or reset, suspend of the system" @@ -782,13 +752,8 @@ msgstr "áááááâááá" #: kdebase3.spec.cpp:512 -msgid "" -"You are running low on disk space on your home partition (currently %1% " -"free), would you like to run Konqueror to free some disk space and fix the " -"problem?" -msgstr "" -"á¢áááâáááá»áâáááâááá ááá¶áâááŒáâááâááŸâáá¶áâááááâááááâá¢ááá (ááááá»ááááááâááááá %1% " -") ááŸâá¢áááâáááâááá Konqueror ááâááá áâáá¶áâááœáâááááœáâáááâááááá á áŸáâááœááá»áâáááá á¶Â ?" +msgid "You are running low on disk space on your home partition (currently %1% free), would you like to run Konqueror to free some disk space and fix the problem?" +msgstr "á¢áááâáááá»áâáááâááá ááá¶áâááŒáâááâááŸâáá¶áâááááâááááâá¢ááá (ááááá»ááááááâááááá %1% ) ááŸâá¢áááâáááâááá Konqueror ááâááá áâáá¶áâááœáâááááœáâáááâááááá á áŸáâááœááá»áâáááá á¶Â ?" #: kdebase3.spec.cpp:515 msgid "Low Disk Space" @@ -803,34 +768,20 @@ msgstr "ááááŸáá¶áâááááâááááá¶á" #: kdebase3.spec.cpp:524 -msgid "" -"<qt><h3>End Current Session</h3><p>Log out of the current session to login " -"with a different user</p></qt>" +msgid "<qt><h3>End Current Session</h3><p>Log out of the current session to login with a different user</p></qt>" msgstr "<qt><h3>ááááááâááááâááááá»áááááá</h3><p>áááâáážâááááâááááá»áááááá ááŸáááážâááŒáâáá¶âá¢áááâááááŸâáááááââááá</p></qt>" #: kdebase3.spec.cpp:527 -msgid "" -"<qt><h3>Turn Off Computer</h3><p>Log out of the current session and turn off " -"the computer</p></qt>" +msgid "<qt><h3>Turn Off Computer</h3><p>Log out of the current session and turn off the computer</p></qt>" msgstr "<qt><h3>áá·áâáá»áááááŒááá</h3><p>áááâáážâááááâááááá»ááááááâ á áŸáâáá·áâáá»áááááŒááá</p></qt>" #: kdebase3.spec.cpp:530 -msgid "" -"<qt><h3>Restart Computer</h3><p>Log out of the current session and restart " -"the computer</p><p>Hold the mouse button or the space bar for a short while " -"to get a list of options what to boot</p></qt>" -msgstr "" -"<qt><h3>áá¶ááâááááŸáâáá»áááááŒáááâá¡áŸáâáá·á</h3><p>áááâáážâááááâááááá»áááááá á áŸá âáá¶ááâááááŸáâáá»áááááŒáááâá¡áŸáâáá·á</p><p> " -"ááááááâáááŒáá»áâááááá»á á¬ âááááááâáá·áâááŸáâááœáâáááâáááâáááážâ ááŸáááážâá²ááâáááá á¶áâááááážâáááááŸáâááŒáâá¢ááážáááâááááŒâááá¶ááâááááŸá</p></" -"qt>" +msgid "<qt><h3>Restart Computer</h3><p>Log out of the current session and restart the computer</p><p>Hold the mouse button or the space bar for a short while to get a list of options what to boot</p></qt>" +msgstr "<qt><h3>áá¶ááâááááŸáâáá»áááááŒáááâá¡áŸáâáá·á</h3><p>áááâáážâááááâááááá»áááááá á áŸá âáá¶ááâááááŸáâáá»áááááŒáááâá¡áŸáâáá·á</p><p> ááááááâáááŒáá»áâááááá»á á¬ âááááááâáá·áâááŸáâááœáâáááâáááâáááážâ ááŸáááážâá²ááâáááá á¶áâááááážâáááááŸáâááŒáâá¢ááážáááâááááŒâááá¶ááâááááŸá</p></qt>" #: kdebase3.spec.cpp:533 -msgid "" -"<qt><h3>Restart Computer</h3><p>Log out of the current session and restart " -"the computer</p></qt>" -msgstr "" -"<qt><h3>áá¶ááââááááŸáâáá»áááááŒáááâá¡áŸáâáá·á</h3><p>áááâáážâááááâááááá»ááááááâ á áŸá âáá¶ááááááŸáââáá»áááááŒáááâá¡áŸáâáá·á</p></" -"qt>" +msgid "<qt><h3>Restart Computer</h3><p>Log out of the current session and restart the computer</p></qt>" +msgstr "<qt><h3>áá¶ááââááááŸáâáá»áááááŒáááâá¡áŸáâáá·á</h3><p>áááâáážâááááâááááá»ááááááâ á áŸá âáá¶ááááááŸáââáá»áááááŒáááâá¡áŸáâáá·á</p></qt>" #: kdebase3.spec.cpp:537 msgid "Suspend failed" @@ -885,28 +836,16 @@ msgstr "áááááâá¢ááááááâáááááâ" #: kdebase3.spec.cpp:567 xinerama.cpp:2 -msgid "" -"When this option is enabled, focus operations are limited only to the active " -"Xinerama screen" -msgstr "" -"áááâáááááŸáâáááâááááŒáâáá¶áâá¢áá»áááá¶áâ ááááá·ááááá·áá¶áâáááááââââááºâááááŒááá¶áâáááááá²ááááâáá¶âá¢áááááá Xinerama áááááâááâ" -"ááá»ááááá" +msgid "When this option is enabled, focus operations are limited only to the active Xinerama screen" +msgstr "áááâáááááŸáâáááâááááŒáâáá¶áâá¢áá»áááá¶áâ ááááá·ááááá·áá¶áâáááááââââááºâááááŒááá¶áâáááááá²ááááâáá¶âá¢áááááá Xinerama áááááâááâááá»ááááá" #: kdebase3.spec.cpp:570 xinerama.cpp:3 msgid "Active &mouse screen" msgstr "ááááŸâá²ááá¢ááááááâááááá»áâáááááâ" #: kdebase3.spec.cpp:573 xinerama.cpp:4 -msgid "" -"When this option is enabled, active Xinerama screen (where for example new " -"windows appear) is the screen with the mouse pointer. When disabled, the " -"active Xinerama screen is the screen with the focused window. This option is " -"by default disabled for Click to focus and enabled for other focus policies." -msgstr "" -"áááâáááááŸáâáááâá¢áá»áááá¶áâ á¢áááááá Xinerama ááááá (á§áá¶á ááá ááááááâáááâáááá¢áœáâáááážâáááá¡áŸá) ááºáá¶âá¢ááááááâ" -"áááâááááŸââááááááâááááá·áâááááá»áÂ á áááâáá·áá¢áá»áááá¶áâá¢áááááá âXinerama áááááâ ááºâáá¶âá¢ááááááââááááá¶áâáááá¢áœáâáááâáá¶áâ" -"áááááÂ á áááááŸáâááá ááºâáááâáá·ááá¶áâá¢áá»áááá¶áâáááá¶áááŸáââááááá¶ááâ áá¶ááá»áâááŸáááážâááááá áá·á áá·áâá¢áá»áááá¶áâááááááá¶áááâ" -"áááááâááááááááÂ á" +msgid "When this option is enabled, active Xinerama screen (where for example new windows appear) is the screen with the mouse pointer. When disabled, the active Xinerama screen is the screen with the focused window. This option is by default disabled for Click to focus and enabled for other focus policies." +msgstr "áááâáááááŸáâáááâá¢áá»áááá¶áâ á¢áááááá Xinerama ááááá (á§áá¶á ááá ááááááâáááâáááá¢áœáâáááážâáááá¡áŸá) ááºáá¶âá¢ááááááâáááâááááŸââááááááâááááá·áâááááá»áÂ á áááâáá·áá¢áá»áááá¶áâá¢áááááá âXinerama áááááâ ááºâáá¶âá¢ááááááââááááá¶áâáááá¢áœáâáááâáá¶áâáááááÂ á áááááŸáâááá ááºâáááâáá·ááá¶áâá¢áá»áááá¶áâáááá¶áááŸáââááááá¶ááâ áá¶ááá»áâááŸáááážâááááá áá·á áá·áâá¢áá»áááá¶áâááááááá¶áááâáááááâááááááááÂ á" #: kdebase3.spec.cpp:576 xinerama.cpp:8 msgid "Window to Screen 0" @@ -1065,13 +1004,8 @@ msgstr "ááâáá·áâááŸáâá§áááááâáááááŒááŒáâá¡áŸáÂ á áááá»áâáá·áâáááá»áâááááá¶ááÂ á" #: kdebluetooth.spec.cpp:8 -msgid "" -"Here you have to specify the correct start/stop commands for BlueZ's " -"<i>hcid</i> and the directory of the BlueZ's <i>link_key</i> files for the " -"distribution you are using." -msgstr "" -"áážâááá á¢ááâáâááááŒáâááâááááá¶ááâáá¶áááâááááá¶âáá¶ááááááŸá/áááááá áááá¹áááááŒáâááááá¶áá <i>hcid</i> áááá BlueZ áá·á " -"ááââá¯ááá¶á <i>ááŒáááâááááá¶áá</i> áááá BlueZ ááááá¶ááâáá¶áâááááá¶áâáááâá¢áááâáááá»áâááááŸÂ á" +msgid "Here you have to specify the correct start/stop commands for BlueZ's <i>hcid</i> and the directory of the BlueZ's <i>link_key</i> files for the distribution you are using." +msgstr "áážâááá á¢ááâáâááááŒáâááâááááá¶ááâáá¶áááâááááá¶âáá¶ááááááŸá/áááááá áááá¹áááááŒáâááááá¶áá <i>hcid</i> áááá BlueZ áá·á ááââá¯ááá¶á <i>ááŒáááâááááá¶áá</i> áááá BlueZ ááááá¶ááâáá¶áâááááá¶áâáááâá¢áááâáááá»áâááááŸÂ á" #: kdebluetooth.spec.cpp:11 msgid "Link key directory:" @@ -1269,96 +1203,62 @@ msgstr "áááááâáááá¡áá" #: mediamanager.cpp:42 -msgid "" -"Attempts to chown or chmod files do not return errors, although they fail. " -"Use with caution!" -msgstr "" -"áááâáážâáá¶âááœáâáá¶âááá¶áááâááâááá ááâáá¶áâááá»ááááâááŸááááž chown á¬ chmod ááŸâá¯ááá¶áâ áá·áâáááá¡ááâááá á»áâá¢ááážâá¡áŸá á ááŒáâááááŸâ" -"áááâáááá»áâááááááááÂ !" +msgid "Attempts to chown or chmod files do not return errors, although they fail. Use with caution!" +msgstr "áááâáážâáá¶âááœáâáá¶âááá¶áááâááâááá ááâáá¶áâááá»ááááâááŸááááž chown á¬ chmod ááŸâá¯ááá¶áâ áá·áâáááá¡ááâááá á»áâá¢ááážâá¡áŸá á ááŒáâááááŸâáááâáááá»áâááááááááÂ !" #: mediamanager.cpp:43 -msgid "" -"Under what directory this file system shall be mounted. Please note that " -"there is no guarantee that the system will respect your wish. For one the " -"directory has to be below /media - and it does not yet have to exist." -msgstr "" -"ááâáááâááœáâááááâááááááááâá¯ááá¶áâáááâááâáááááÂ á ááŒáâáááá¶áâáá¶ áááá¶áâáá¶áâáá¶áá¶âáá¶âááœáâáááâáá¶ ááááááááâáá¹áâááááâáá¶áâ" -"ááááâááááâá¢áááâáááâá¡áŸáÂ á ááááá¶ááâááâáááâááááŒáâáááá·áâááâááááá /media - áá¶âáá·áâáá¶ááá¶ááâááááŒáâáá¶áâáááâá¡áŸáÂ á" +msgid "Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist." +msgstr "ááâáááâááœáâááááâááááááááâá¯ááá¶áâáááâááâáááááÂ á ááŒáâáááá¶áâáá¶ áááá¶áâáá¶áâáá¶áá¶âáá¶âááœáâáááâáá¶ ááááááááâáá¹áâááááâáá¶áâááááâááááâá¢áááâáááâá¡áŸáÂ á ááááá¶ááâááâáááâááááŒáâáááá·áâááâááááá /media - áá¶âáá·áâáá¶ááá¶ááâááááŒáâáá¶áâáááâá¡áŸáÂ á" #: mediamanager.cpp:46 msgid "Always flush all data to the hot plug devices immediately and don't cache it." msgstr "ááâáá·ááááááâáá¶ááá¢ááâááâá§áááááâáááâááâáááá¶ááâáá¶áá·ááá áááâáá·áâáá»áâáá¶âáááá»áâáááá¶ááâááááá¶ááâá¡áŸáÂ á" #: mediamanager.cpp:47 -msgid "" -"UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the " -"console. It can be be enabled for the filesystem with this option." -msgstr "" -"UTF8 ááºâáá¶âáá·áážáá¶áááááâá¢áá·áááŒá (áš-ááážá) ááááááááâá¯ááá¶áâááâáá¶áâáá»ááááá·áá¶áâáááá»áâááááâááŒáážááŒá áááâááááŒáâáá¶áâááááŸâáááâ" -"áá»áááŒáÂ á á¢áááâá¢á¶áâá¢áá»áááá¶áâááááá¶ááâááááááááâá¯ááá¶á áááâááááŸâáááááŸáâáááÂ á" +msgid "UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option." +msgstr "UTF8 ááºâáá¶âáá·áážáá¶áááááâá¢áá·áááŒá (áš-ááážá) ááááááááâá¯ááá¶áâááâáá¶áâáá»ááááá·áá¶áâáááá»áâááááâááŒáážááŒá áááâááááŒáâáá¶áâááááŸâáááâáá»áááŒáÂ á á¢áááâá¢á¶áâá¢áá»áááá¶áâááááá¶ááâááááááááâá¯ááá¶á áááâááááŸâáááááŸáâáááÂ á" #: mediamanager.cpp:49 msgid "" -"<h2>Specifies the journalling mode for file data. Metadata is always " -"journaled. </h2>\n" +"<h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2>\n" " \n" "<h3><b>All Data</b></h3>\n" -" All data is committed into the journal prior to being written " -"into the main file system. This is the slowest variant with the highest data " -"security.\n" +" All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security.\n" "\n" "<h3><b>Ordered</b></h3>\n" -" All data is forced directly out to the main file system prior to " -"its metadata being committed to the journal.\n" +" All data is forced directly out to the main file system prior to its metadata being committed to the journal.\n" "\n" "<h3><b>Write Back</b></h3>\n" -" Data ordering is not preserved - data may be written into the " -"main file system after its metadata has been committed to the journal. This " -"is rumoured to be the highest-throughput option. It guarantees internal " -"file system integrity, however it can allow old data to appear in files " -"after a crash and journal recovery." +" Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery." msgstr "" -"<h2>ááááá¶ááâááááâáááááâáá·áááá¶áá»áááááááá·âááááá¶ááâáá·ááááááâá¯ááá¶áÂ á áá·ááááááâáááá¶âáááááâááááŒáâáá¶áâáááááâáááá»áâ" -"áá·áááá¶áá»áááááááá·Â á </h2>\n" +"<h2>ááááá¶ááâááááâáááááâáá·áááá¶áá»áááááááá·âááááá¶ááâáá·ááááááâá¯ááá¶áÂ á áá·ááááááâáááá¶âáááááâááááŒáâáá¶áâáááááâáááá»áâáá·áááá¶áá»áááááááá·Â á </h2>\n" " \n" "<h3><b>áá·ááááááâáá¶ááâá¢áá</b></h3>\n" -" áá·ááááááâáá¶ááâá¢ááâááááŒáâáá¶áâáá¶ááâáááááŒáâááâáááá»áâáá·áááá¶áá»áááááááá· áá»áâáááâáááááâááâááááááááâá¯ááá¶áâááÂ á " -"áá¶âááºâáá¶âáááááááááœáâááºáâáááá»á ááâáá·ááááááâáá¶áâáá»ááááá·áá¶áâáááá»áÂ á\n" +" áá·ááááááâáá¶ááâá¢ááâááááŒáâáá¶áâáá¶ááâáááááŒáâááâáááá»áâáá·áááá¶áá»áááááááá· áá»áâáááâáááááâááâááááááááâá¯ááá¶áâááÂ á áá¶âááºâáá¶âáááááááááœáâááºáâáááá»á ááâáá·ááááááâáá¶áâáá»ááááá·áá¶áâáááá»áÂ á\n" "\n" "<h3><b>áááá¶áá</b></h3>\n" -" áá·ááááááâáá¶ááâá¢ááâááááŒáâáá¶áâáááááââá²ááâáááâáááâáááá¶ááâáážâááááááááâá¯ááá¶áâáá áá»áâáá¹áâáá¶ááâáááááŒáâáá·ááááááâáááá¶â" -"ááâáááá»áâáá·áááá¶áá»áááááááá·Â á\n" +" áá·ááááááâáá¶ááâá¢ááâááááŒáâáá¶áâáááááââá²ááâáááâáááâáááá¶ááâáážâááááááááâá¯ááá¶áâáá áá»áâáá¹áâáá¶ááâáááááŒáâáá·ááááááâáááá¶âááâáááá»áâáá·áááá¶áá»áááááááá·Â á\n" "\n" "<h3><b>áááááâáááá¡áá</b></h3>\n" -" áááá¶ááâáá·ááááááâáá·áâááááŒáââááááá»áâáá»áâá¡áŸá - áá·ááááááâá¢á¶áâáá¹áâááááŒáâáá¶áâáááááâááâáááá»áâááááááááâá¯ááá¶áâáá " -"ááááá¶ááâáážâáá¶ááâáááááŒáâáá·ááááááâáááá¶âááááâáá¶âââááâáááá»áâáá·áááá¶áá»áááááááá·âááœáÂ á ááŸâáá¶áâáá¶áááâááá¶áá¢á¶áá¶áâááááá¶ áá¶âááºâáá¶â" -"áááááŸáâááâááá¢âáááá»áÂ á áá¶âáá¶áá¶âáá¶áâááŒáâáá¶áâáááá¹áááááŒáâáááá»áâááâáááááâáá¶áâáááá»áâááâááááááááâá¯ááá¶á ááâáááâááá¶áâáá¶ áá¶â" -"á¢á¶áâááááá¶áââá²ááâáá¶áâáá·ááááááâáá¶ááâáááá¡áŸáâááâáááá»áâá¯ááá¶á ááááá¶ááâáážâáá¶áá áá·á ááááááááâáá·áááá¶áá»áááááááá·âááœáÂ á" +" áááá¶ááâáá·ááááááâáá·áâááááŒáââááááá»áâáá»áâá¡áŸá - áá·ááááááâá¢á¶áâáá¹áâááááŒáâáá¶áâáááááâááâáááá»áâááááááááâá¯ááá¶áâáá ááááá¶ááâáážâáá¶ááâáááááŒáâáá·ááááááâáááá¶âááááâáá¶âââááâáááá»áâáá·áááá¶áá»áááááááá·âááœáÂ á ááŸâáá¶áâáá¶áááâááá¶áá¢á¶áá¶áâááááá¶ áá¶âááºâáá¶âáááááŸáâááâááá¢âáááá»áÂ á áá¶âáá¶áá¶âáá¶áâááŒáâáá¶áâáááá¹áááááŒáâáááá»áâááâáááááâáá¶áâáááá»áâááâááááááááâá¯ááá¶á ááâáááâááá¶áâáá¶ á á¶âá¢á¶áâááááá¶áââá²ááâáá¶áâáá·ááááááâáá¶ááâáááá¡áŸáâááâáááá»áâá¯ááá¶á ááááá¶ááâáážâáá¶áá áá·á ááááááááâáá·áááá¶áá»áááááááá·âááœáÂ á" #: mediamanager.cpp:67 msgid "" -"<h2>Defines the behaviour for creation and display of filenames which " -"fit into 8.3 characters. If a long name for a file exists, it will always be " -"preferred display.</h2>\n" +"<h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2>\n" "\n" "<h3><b>Lower</b></h3>\n" -"Force the short name to lower case upon display; store a long name when the " -"short name is not all upper case.\n" +"Force the short name to lower case upon display; store a long name when the short name is not all upper case.\n" "\n" "<h3><b>Windows 95</b></h3>\n" -"Force the short name to upper case upon display; store a long name when the " -"short name is not all upper case.\n" +"Force the short name to upper case upon display; store a long name when the short name is not all upper case.\n" "\n" "<h3><b>Windows NT</b></h3>\n" -"Display the shortname as is; store a long name when the short name is not " -"all lower case or all upper case.\n" +"Display the shortname as is; store a long name when the short name is not all lower case or all upper case.\n" "\n" "<h3><b>Mixed</b></h3>\n" -"Display the short name as is; store a long name when the short name is not " -"all upper case." +"Display the short name as is; store a long name when the short name is not all upper case." msgstr "" -"<h2>áááááâá¥áá·áá¶ááâááááá¶ááâáá¶áâáááááŸáâ áá·áââáá¶áâáááá á¶áâáááááâá¯ááá¶á áááâááâáá¹áâááœá¢áááá áš.á£Â á ááŸâá¯ááá¶áâáá¶áâ" -"áááááâááá áá¶âáá¹áâáááá á¶áâáááá¹áááááŒáâáá¶áá·áááÂ á</h2>\n" +"<h2>áááááâá¥áá·áá¶ááâááááá¶ááâáá¶áâáááááŸáâ áá·áââáá¶áâáááá á¶áâáááááâá¯ááá¶á áááâááâáá¹áâááœá¢áááá áš.á£Â á ááŸâá¯ááá¶áâáá¶áâáááááâááá áá¶âáá¹áâáááá á¶áâáááá¹áááááŒáâáá¶áá·áááÂ á</h2>\n" "\n" "<h3><b>áá¶áâáá¶á</b></h3>\n" "áááááâáááááâáááážâá²ááâáááá á¶áâáá¶âá¢ááááâááŒáÂ á áá»áâáááááâááá ááâáááâáááááâáááážâáá·áâáááâáá¶âá¢ááááâááâáá¶ááâá¢ááÂ á\n" @@ -1426,4 +1326,3 @@ #: qt3.spec.cpp:32 msgid "Default Input Method:" msgstr "áá·áážâáá¶áááááâáá¶áâáááááŒáâáááá¶áááŸáÂ á" - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/update_rpm new/kdebase-SuSE/update_rpm --- old/kdebase-SuSE/update_rpm 2006-10-17 17:31:38.000000000 +0200 +++ new/kdebase-SuSE/update_rpm 2006-12-04 12:05:11.000000000 +0100 @@ -15,6 +15,6 @@ cd kdebase-SuSE/po /usr/bin/make -f Makefile.am fill_pos cd ../.. -tar -cvj -f $opwd/kdebase-SuSE-10.2.tar.bz2 kdebase-SuSE +tar -cvj -f $opwd/kdebase-SuSE-10.3.tar.bz2 kdebase-SuSE cd / rm -rf $tdir ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase3
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package kdebase3 checked in at Thu Dec 7 20:36:26 CET 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-11-27 22:47:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-12-06 11:46:53.000000000 +0100 @@ -1,0 +2,24 @@ +Wed Dec 6 11:46:50 CET 2006 - stbinner(a)suse.de + +- make KDE protocol information use enhanced_browsing icon (#186707) +- use upstream logout effect for 8-bit displays (#214543) + +------------------------------------------------------------------- +Mon Dec 4 11:25:43 CET 2006 - stbinner(a)suse.de + +- remove UnitedLinux cruft from spec file +- ksmserver: escape "&" properly in grub partition label +- fix more the build for < 10.1 + +------------------------------------------------------------------- +Fri Dec 1 10:09:23 CET 2006 - stbinner(a)suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- +Fri Dec 1 04:20:22 CET 2006 - dmueller(a)suse.de + +- fix drag&drop of favourites on tab regression in kickoff +- fix tooltips sometimes disappearing (#221616) + +------------------------------------------------------------------- New: ---- fix-kicker-containerarea-build.diff fix-ksmserver-partition-label.diff ioslaveinfo-icon.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.0x9eVQ/_old 2006-12-07 20:35:42.000000000 +0100 +++ /var/tmp/diff_new_pack.0x9eVQ/_new 2006-12-07 20:35:42.000000000 +0100 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.5 -Release: 76 +Release: 78 %define kde_version 3.5.5 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -196,6 +196,9 @@ Patch190: kcontrol-energy.diff Patch191: set-media-enabled-to-false.diff Patch192: 3_5_BRANCH_607210.diff +Patch193: fix-ksmserver-partition-label.diff +Patch194: fix-kicker-containerarea-build.diff +Patch195: ioslaveinfo-icon.diff %description This package contains kdebase, one of the basic packages of the K @@ -382,7 +385,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 205 +Release: 208 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -554,6 +557,11 @@ %patch190 %patch191 %patch192 +%patch193 +%if %suse_version < 1010 +%patch194 +%endif +%patch195 cp %SOURCE17 l10n/tw/flag.png . /etc/opt/kde3/common_options cd ../fileshareset2 @@ -652,7 +660,6 @@ # # install pixmaps and configuration # -mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/UnitedLinux/addon-scripts/ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT/etc/init.d/ install -m 0644 %SOURCE9 ${RPM_BUILD_ROOT}/opt/kde3/share/apps/kdewizard/pics/wizard_small.png @@ -797,9 +804,11 @@ esac fi %endif +%if %suse_version > 1000 %post -n fileshareset %run_permissions +%endif %postun kdm %insserv_cleanup @@ -828,8 +837,6 @@ %files %defattr(-,root,root) %doc AUTHORS COPYING README README.pam ../lame.spec ../README.mp3 -%dir /opt/kde3/share/UnitedLinux -%dir /opt/kde3/share/UnitedLinux/addon-scripts/ %dir /opt/kde3/share/icons/hicolor/* %dir /opt/kde3/%_lib/kconf_update_bin %dir /opt/kde3/share/apps/plugin @@ -1520,6 +1527,18 @@ %endif %changelog -n kdebase3 +* Wed Dec 06 2006 - stbinner(a)suse.de +- make KDE protocol information use enhanced_browsing icon (#186707) +- use upstream logout effect for 8-bit displays (#214543) +* Mon Dec 04 2006 - stbinner(a)suse.de +- remove UnitedLinux cruft from spec file +- ksmserver: escape "&" properly in grub partition label +- fix more the build for < 10.1 +* Fri Dec 01 2006 - stbinner(a)suse.de +- fix build for < 10.1 +* Fri Dec 01 2006 - dmueller(a)suse.de +- fix drag&drop of favourites on tab regression in kickoff +- fix tooltips sometimes disappearing (#221616) * Mon Nov 27 2006 - dmueller(a)suse.de - refresh ksmserver-timed.diff to apply properly * Mon Nov 27 2006 - dmueller(a)suse.de ++++++ fix-kicker-containerarea-build.diff ++++++ --- kicker/kicker/core/containerarea.cpp 2006/12/04 10:27:16 1.173 +++ kicker/kicker/core/containerarea.cpp 2006/12/04 11:04:54 @@ -1764,7 +1764,7 @@ void ContainerArea::destroyCachedGeometry() { - m_cachedGeometry.remove( static_cast< const QWidget* >( sender())); + m_cachedGeometry.remove( const_cast<QWidget*>(static_cast< const QWidget* >( sender()))); } BaseContainer::List ContainerArea::containers(const QString& type) const ++++++ fix-ksmserver-partition-label.diff ++++++ --- ksmserver/shutdowndlg.cpp 2006/12/04 10:26:11 1.153 +++ ksmserver/shutdowndlg.cpp 2006/12/04 10:35:52 @@ -230,10 +230,12 @@ int index = 0; for (QStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index) { + QString label = (*it); + label=label.replace('&',"&&"); if (index == cur) - targets->insertItem( *it + i18n("current option in boot loader", " (current)"), index); + targets->insertItem( label + i18n("current option in boot loader", " (current)"), index); else - targets->insertItem( *it, index ); + targets->insertItem( label, index ); } btnReboot->setPopup(targets); ++++++ ioslaveinfo-icon.diff ++++++ --- kcontrol/ioslaveinfo/ioslaveinfo.desktop 2006/12/05 14:07:55 1.1 +++ kcontrol/ioslaveinfo/ioslaveinfo.desktop 2006/12/05 14:08:12 @@ -73,7 +73,7 @@ Comment[zu]=Ulwazi mayelana nemithetho elandelwayo ekhona DocPath=kinfocenter/protocols/index.html Exec=kcmshell ioslaveinfo -Icon=history +Icon=enhanced_browsing Keywords=Protocol,IO slaves,Slaves,Network,Information,Timeout Keywords[ar]=بروتوكول,IO Slaves,Slaves,الشبكة,معلومات الوقت المحدد Keywords[az]=Protokol, IO Kölələri, Kölələr, Şəbəkə,Mə'lumat, Vaxt Dolması ++++++ kickoff.diff ++++++ --- /var/tmp/diff_new_pack.0x9eVQ/_old 2006-12-07 20:35:46.000000000 +0100 +++ /var/tmp/diff_new_pack.0x9eVQ/_new 2006-12-07 20:35:46.000000000 +0100 @@ -263,10 +263,11 @@ static const int DEFAULT_FRAMES_PER_SECOND = 30; -@@ -72,7 +73,9 @@ +@@ -71,14 +72,16 @@ + m_dissolveDelta(-1), m_direction(KPanelApplet::Up), m_dirty(false), - m_toolTipsEnabled(KickerSettings::showToolTips()), +- m_toolTipsEnabled(KickerSettings::showToolTips()), - m_tippingFor(0) + m_tippingFor(0), + m_timer(0, "KickerTip::m_timer"), @@ -274,7 +275,26 @@ { setFocusPolicy(NoFocus); setBackgroundMode(NoBackground); -@@ -193,7 +196,6 @@ + resize(0, 0); + hide(); + connect(&m_frameTimer, SIGNAL(timeout()), SLOT(internalUpdate())); ++ connect(kapp, SIGNAL(settingsChanged(SettingsCategory)), SLOT(slotSettingsChanged())); + } + + KickerTip::~KickerTip() +@@ -87,6 +90,11 @@ + delete m_mimeFactory; + } + ++void KickerTip::slotSettingsChanged() ++{ ++ QToolTip::setGloballyEnabled(KickerSettings::showToolTips()); ++} ++ + void KickerTip::display() + { + if (!tippingEnabled()) +@@ -193,7 +201,6 @@ void KickerTip::mousePressEvent(QMouseEvent * /*e*/) { m_timer.stop(); @@ -282,7 +302,7 @@ hide(); } -@@ -394,8 +396,11 @@ +@@ -394,8 +401,11 @@ m_tippingEnabled--; } @@ -294,7 +314,33 @@ m_self->hide(); } } -@@ -475,7 +480,6 @@ +@@ -410,6 +420,8 @@ + m_tippingFor = 0; + m_frameTimer.stop(); + QWidget::hide(); ++ ++ QToolTip::setGloballyEnabled(KickerSettings::showToolTips()); + } + + bool KickerTip::eventFilter(QObject *object, QEvent *event) +@@ -438,7 +450,6 @@ + !qApp->activePopupWidget() && + !isTippingFor(widget)) + { +- m_toolTipsEnabled = QToolTip::isGloballyEnabled(); + QToolTip::setGloballyEnabled(false); + + tipFor(widget); +@@ -460,8 +471,6 @@ + } + break; + case QEvent::Leave: +- QToolTip::setGloballyEnabled(m_toolTipsEnabled); +- + m_timer.stop(); + + if (isTippingFor(widget) && isVisible()) +@@ -475,7 +484,6 @@ break; case QEvent::MouseButtonPress: m_timer.stop(); @@ -302,6 +348,24 @@ hide(); default: break; +--- libkicker/kickertip.h ++++ libkicker/kickertip.h +@@ -92,6 +92,7 @@ + void tipperDestroyed(QObject* o); + void internalUpdate(); + void display(); ++ void slotSettingsChanged(); + + private: + QBitmap m_mask; +@@ -108,7 +109,6 @@ + QTimer m_timer; + QTimer m_frameTimer; + bool m_dirty; +- bool m_toolTipsEnabled; + + const QWidget* m_tippingFor; + --- libkicker/panelbutton.cpp +++ libkicker/panelbutton.cpp @@ -42,6 +42,7 @@ @@ -6616,7 +6680,7 @@ setFocusPolicy(NoFocus); --- kicker/ui/kickoff_bar.cpp +++ kicker/ui/kickoff_bar.cpp -@@ -0,0 +1,172 @@ +@@ -0,0 +1,190 @@ +/***************************************************************** + + Copyright (c) 1996-2000 the kicker authors. See file AUTHORS. @@ -6640,6 +6704,7 @@ +******************************************************************/ + +#include "kickoff_bar.h" ++#include "itemview.h" + +#include <qiconset.h> +#include <qpainter.h> @@ -6652,6 +6717,7 @@ +KickoffTabBar::KickoffTabBar(QWidget* parent, const char* name) + : QTabBar(parent, name), m_tabsActivated(true) +{ ++ setAcceptDrops(true); +} + +void KickoffTabBar::deactivateTabs(bool b) @@ -6787,6 +6853,22 @@ + } +} + ++void KickoffTabBar::dragEnterEvent(QDragEnterEvent* event) ++{ ++ event->accept(KMenuItemDrag::canDecode(event)); ++} ++ ++void KickoffTabBar::dragMoveEvent(QDragMoveEvent* event) ++{ ++ QTab* t = selectTab(event->pos()); ++ ++ // ### uhhh, look away ++ if (t && t->identifier() == 0) ++ { ++ setCurrentTab(t); ++ } ++} ++ + +// vim:cindent:sw=4: --- kicker/ui/media_watcher.h @@ -7665,7 +7747,7 @@ +</UI> --- kicker/ui/kickoff_bar.h +++ kicker/ui/kickoff_bar.h -@@ -0,0 +1,46 @@ +@@ -0,0 +1,48 @@ +/***************************************************************** + + Copyright (c) 1996-2000 the kicker authors. See file AUTHORS. @@ -7705,6 +7787,8 @@ + virtual void paint(QPainter*, QTab*, bool) const; + virtual void paintLabel(QPainter* p, const QRect& br, QTab* t, bool has_focus) const; + virtual void layoutTabs(); ++ virtual void dragEnterEvent(QDragEnterEvent*); ++ virtual void dragMoveEvent(QDragMoveEvent*); + +private: + bool m_tabsActivated; ++++++ mach_blass.diff ++++++ --- /var/tmp/diff_new_pack.0x9eVQ/_old 2006-12-07 20:35:46.000000000 +0100 +++ /var/tmp/diff_new_pack.0x9eVQ/_new 2006-12-07 20:35:46.000000000 +0100 @@ -1,6 +1,6 @@ ---- ksmserver/shutdowndlg.cpp -+++ ksmserver/shutdowndlg.cpp -@@ -35,6 +35,7 @@ +--- ksmserver/shutdowndlg.cpp.sav 2006-11-28 18:18:41.000000000 +0100 ++++ ksmserver/shutdowndlg.cpp 2006-11-28 18:25:15.000000000 +0100 +@@ -35,6 +35,7 @@ Copyright (C) 2000 Matthias Ettrich <ett #include <kuser.h> #include <kpixmap.h> #include <kimageeffect.h> @@ -8,7 +8,7 @@ #include <kdialog.h> #include <kseparator.h> -@@ -48,6 +49,9 @@ +@@ -48,6 +49,9 @@ Copyright (C) 2000 Matthias Ettrich <ett #include "shutdowndlg.moc" @@ -18,32 +18,50 @@ KSMShutdownFeedback * KSMShutdownFeedback::s_pSelf = 0L; KSMShutdownFeedback::KSMShutdownFeedback() -@@ -55,33 +59,92 @@ - m_currentY( 0 ) +@@ -56,12 +60,22 @@ KSMShutdownFeedback::KSMShutdownFeedback { setBackgroundMode( QWidget::NoBackground ); -- setGeometry( QApplication::desktop()->geometry() ); + setGeometry( QApplication::desktop()->geometry() ); - QTimer::singleShot( 10, this, SLOT( slotPaintEffect() ) ); -+ QRect geo( QApplication::desktop()->geometry() ); -+ setGeometry( geo ); -+ int dep = QPixmap::defaultDepth(); -+ if (dep == 24 || dep == 16) -+ dep = 32; -+ grabbed.create( geo.size(), dep); -+ QTimer::singleShot( 0, this, SLOT( slotGrab() ) ); - m_root.resize( width(), height() ); - } +- m_root.resize( width(), height() ); +-} ++ if( QPixmap::defaultDepth() > 8 ) ++ { ++ grabbed.create( size(), 32 ); ++ QTimer::singleShot( 0, this, SLOT( slotGrab() ) ); ++ } ++ else ++ { ++ QTimer::singleShot( 10, this, SLOT( slotPaintEffectOld() ) ); ++ m_root.resize( width(), height() ); ++ } ++ + ++} -- -void KSMShutdownFeedback::slotPaintEffect() -+void KSMShutdownFeedback::slotGrab() ++// the upstream KDE effect ++void KSMShutdownFeedback::slotPaintEffectOld() { + if ( m_currentY >= height() ) { + if ( backgroundMode() == QWidget::NoBackground ) { +@@ -80,7 +94,76 @@ void KSMShutdownFeedback::slotPaintEffec + bitBlt( this, 0, m_currentY, &pixmap ); + bitBlt( &m_root, 0, m_currentY, &pixmap ); + m_currentY += 10; +- QTimer::singleShot( 1, this, SLOT( slotPaintEffect() ) ); ++ QTimer::singleShot( 1, this, SLOT( slotPaintEffectOld() ) ); ++} ++ ++// the SUSE effect ++void KSMShutdownFeedback::slotGrab() ++{ + // we start the passed early + if ( m_currentY * 4 >= height() * 3 && passed.isNull()) + passed.start(); + - if ( m_currentY >= height() ) { -+ slotPaintEffect(); ++ if ( m_currentY >= height() ) { ++ slotPaintEffectNew(); + return; + } + @@ -56,80 +74,58 @@ + QTimer::singleShot(0, this, SLOT(slotGrab())); +} + -+ void KSMShutdownFeedback::slotPaintEffect() -+ { ++void KSMShutdownFeedback::slotPaintEffectNew() ++{ + const unsigned int shift_scale = 10; + const unsigned int scale = 1 << shift_scale; + + //kdDebug() << "passed before paint " << passed.elapsed() << endl; -+ int current_fade = QMIN(scale, passed.elapsed() * scale / max_faded); ++ unsigned int current_fade = QMIN(scale, passed.elapsed() * scale / max_faded); + QImage copy; -+ if ( grabbed.depth() == 32 ) { -+ copy.create( grabbed.size(), grabbed.depth() ); -+ unsigned int pixels = grabbed.width()*grabbed.height(); -+ QRgb *orig = ( QRgb* )grabbed.bits(); -+ QRgb *dest = ( QRgb* )copy.bits(); -+ QColor clr; -+ int h, s, v; -+ -+ int r, g, b, tg; -+ -+ for ( unsigned int i = 0; i < pixels; ++i ) -+ { -+ r = qRed( orig[i] ); -+ g = qGreen( orig[i] ); -+ b = qBlue( orig[i] ); -+ -+ // qGray formla -+ tg = (r*11 + g*16 + b*5)/32; -+ // make it a bit darker than gray -+ tg = tg - tg / 5; -+ -+ r = ( ( r << shift_scale ) + current_fade * ( tg - r ) ) >> shift_scale; -+ g = ( ( g << shift_scale ) + current_fade * ( tg - g ) ) >> shift_scale; -+ b = ( ( b << shift_scale ) + current_fade * ( tg - b ) ) >> shift_scale; -+ -+ dest[i] = qRgb(r, g, b); -+ } ++ copy.create( grabbed.size(), grabbed.depth() ); ++ unsigned int pixels = grabbed.width()*grabbed.height(); ++ QRgb *orig = ( QRgb* )grabbed.bits(); ++ QRgb *dest = ( QRgb* )copy.bits(); ++ QColor clr; ++ ++ int r, g, b, tg; ++ ++ for ( unsigned int i = 0; i < pixels; ++i ) ++ { ++ r = qRed( orig[i] ); ++ g = qGreen( orig[i] ); ++ b = qBlue( orig[i] ); ++ ++ // qGray formla ++ tg = (r*11 + g*16 + b*5)/32; ++ // make it a bit darker than gray ++ tg = tg - tg / 5; ++ ++ r = ( ( r << shift_scale ) + current_fade * ( tg - r ) ) >> shift_scale; ++ g = ( ( g << shift_scale ) + current_fade * ( tg - g ) ) >> shift_scale; ++ b = ( ( b << shift_scale ) + current_fade * ( tg - b ) ) >> shift_scale; + -+ } else { -+ // old code - now used for 8bit -+ copy = grabbed; -+ copy = KImageEffect::desaturate(copy, current_fade); -+ copy = KImageEffect::fade(copy, 0.1 * current_fade, Qt::black); ++ dest[i] = qRgb(r, g, b); + } + //kdDebug() << "passed before bitBlt " << passed.elapsed() << endl; + bitBlt( this, 0, 0, &copy); + //kdDebug() << "passed after bitBlt " << passed.elapsed() << endl; + + if ( current_fade >= scale ) { - if ( backgroundMode() == QWidget::NoBackground ) { - setBackgroundMode( QWidget::NoBackground ); -- setBackgroundPixmap( m_root ); ++ if ( backgroundMode() == QWidget::NoBackground ) { ++ setBackgroundMode( QWidget::NoBackground ); + setBackgroundPixmap( copy ); - } - return; - } - -- KPixmap pixmap; -- pixmap = QPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 ); -- QImage image = pixmap.convertToImage(); -- KImageEffect::blend( Qt::black, image, 0.4 ); -- KImageEffect::toGray( image, true ); -- pixmap.convertFromImage( image ); -- bitBlt( this, 0, m_currentY, &pixmap ); -- bitBlt( &m_root, 0, m_currentY, &pixmap ); -- m_currentY += 10; -- QTimer::singleShot( 1, this, SLOT( slotPaintEffect() ) ); --} -+ QTimer::singleShot( 0, this, SLOT( slotPaintEffect() ) ); -+ } ++ } ++ return; ++ } ++ ++ QTimer::singleShot( 0, this, SLOT( slotPaintEffectNew() ) ); + } ////// - ---- ksmserver/shutdowndlg.h -+++ ksmserver/shutdowndlg.h -@@ -9,7 +9,9 @@ +--- ksmserver/shutdowndlg.h.sav 2006-11-28 18:18:41.000000000 +0100 ++++ ksmserver/shutdowndlg.h 2006-11-28 18:23:14.000000000 +0100 +@@ -9,7 +9,9 @@ Copyright (C) 2000 Matthias Ettrich <ett #include <qpixmap.h> #include <qdialog.h> @@ -139,10 +135,13 @@ class QPushButton; class QVButtonGroup; class QPopupMenu; -@@ -32,12 +34,15 @@ +@@ -31,13 +33,17 @@ protected: + ~KSMShutdownFeedback() {} private slots: - void slotPaintEffect(); +- void slotPaintEffect(); ++ void slotPaintEffectOld(); ++ void slotPaintEffectNew(); + void slotGrab(); private: ++++++ mach_blass_legacy.diff ++++++ --- /var/tmp/diff_new_pack.0x9eVQ/_old 2006-12-07 20:35:46.000000000 +0100 +++ /var/tmp/diff_new_pack.0x9eVQ/_new 2006-12-07 20:35:46.000000000 +0100 @@ -3,7 +3,7 @@ @@ -34,6 +34,7 @@ #include <kuser.h> #include <kpixmap.h> - #include <kimageeffect.h> + #i nclude <kimageeffect.h> +#include <kpixmapeffect.h> #include <kdialog.h> #include <kseparator.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kaffeine
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package kaffeine checked in at Thu Dec 7 20:35:28 CET 2006. -------- --- KDE/kaffeine/kaffeine.changes 2006-11-27 11:36:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/kaffeine/kaffeine.changes 2006-12-04 16:34:22.000000000 +0100 @@ -1,0 +2,25 @@ +Mon Dec 4 16:33:29 CET 2006 - stbinner(a)suse.de + +- update to version 0.8.3: + * DVB: selectAll button in scandialog + * DVB: save channels list sort order + * DVB: added "Current channel" button in epg window + * xine-part: shortcuts for delay/advance subtitles (ctrl+alt+right/left) + * xine-part: fixed wmv seeking. + * xine-part: save and restore video settings (hue,saturation,contrast,brightness) + * DVB: OSD warning when timeshift hd<300MB + * added: option to start in minimal mode + dcop call. + * added: "Open Dir" starts playing dvd from dir if dir points to a dvd image. + * added: playing dvd iso files. + * DVB: auto rename channels when adding to list + * Disc: fixed crash trying to play while encoding + * Disc: Ask user for cddb close matches + * fixed: session issue. + * fixed: better screensaver disabling method (no interfering key presses anymore). + * DVB: fixed scanning services sharing same pmt. + * DVB: added H/V (C band mutipoint) lnb settings. + * DVB: improved device detection. + * DVB: added : "int dvbSNR( int device )" dcop call. + * fixed: crash when quit from systray. + +------------------------------------------------------------------- Old: ---- fix-array-range.diff kaffeine-0.8.2.tar.bz2 New: ---- kaffeine-0.8.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kaffeine.spec ++++++ --- /var/tmp/diff_new_pack.RQtucU/_old 2006-12-07 20:34:39.000000000 +0100 +++ /var/tmp/diff_new_pack.RQtucU/_new 2006-12-07 20:34:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kaffeine (Version 0.8.2) +# spec file for package kaffeine (Version 0.8.3) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,8 +21,8 @@ License: GNU General Public License (GPL) Group: Productivity/Multimedia/Video/Players Summary: Xine-Based Multimedia Player -Version: 0.8.2 -Release: 33 +Version: 0.8.3 +Release: 1 %define rversion %version BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) @@ -39,7 +39,6 @@ Patch5: kaffeine-media.diff Patch7: kaffeine-gstreamer-0-10.patch Patch8: kaffeine-quote-subs.patch -Patch9: fix-array-range.diff Patch10: fix-german-translation.diff %description @@ -81,7 +80,6 @@ %patch7 %endif %patch8 -%patch9 %patch10 cp %SOURCE5 po/ . /etc/opt/kde3/common_options @@ -117,7 +115,6 @@ %files -f %name.lang %defattr(-,root,root) /opt/kde3/bin/* -/opt/kde3/include/*.h /opt/kde3/include/kaffeine /opt/kde3/%_lib/lib* /opt/kde3/%_lib/kde3/libxinepart.* @@ -144,6 +141,28 @@ /opt/kde3/share/services/gstreamer_part.desktop %changelog -n kaffeine +* Mon Dec 04 2006 - stbinner(a)suse.de +- update to version 0.8.3: + * DVB: selectAll button in scandialog + * DVB: save channels list sort order + * DVB: added "Current channel" button in epg window + * xine-part: shortcuts for delay/advance subtitles (ctrl+alt+right/left) + * xine-part: fixed wmv seeking. + * xine-part: save and restore video settings (hue,saturation,contrast,brightness) + * DVB: OSD warning when timeshift hd<300MB + * added: option to start in minimal mode + dcop call. + * added: "Open Dir" starts playing dvd from dir if dir points to a dvd image. + * added: playing dvd iso files. + * DVB: auto rename channels when adding to list + * Disc: fixed crash trying to play while encoding + * Disc: Ask user for cddb close matches + * fixed: session issue. + * fixed: better screensaver disabling method (no interfering key presses anymore). + * DVB: fixed scanning services sharing same pmt. + * DVB: added H/V (C band mutipoint) lnb settings. + * DVB: improved device detection. + * DVB: added : "int dvbSNR( int device )" dcop call. + * fixed: crash when quit from systray. * Mon Nov 27 2006 - stbinner(a)suse.de - fix one faulty German translation * Sat Nov 25 2006 - coolo(a)suse.de ++++++ adjust-mimetypes.diff ++++++ --- /var/tmp/diff_new_pack.RQtucU/_old 2006-12-07 20:34:39.000000000 +0100 +++ /var/tmp/diff_new_pack.RQtucU/_new 2006-12-07 20:34:39.000000000 +0100 @@ -5,13 +5,15 @@ -MimeType=application/x-ogg;audio/basic;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack; +MimeType=application/x-ogg;audio/basic;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack; Name=Kaffeine ---- kaffeine/src/player-parts/xine-part/xine_part.desktop -+++ kaffeine/src/player-parts/xine-part/xine_part.desktop 2005/09/05 06:50:08 -@@ -1,6 +1,6 @@ +--- kaffeine/src/player-parts/xine-part/xine_part.desktop 2006/12/04 15:36:24 1.1 ++++ kaffeine/src/player-parts/xine-part/xine_part.desktop 2006/12/04 15:40:06 +@@ -1,7 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Icon=kaffeine --MimeType=application/x-ogg;audio/basic;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack; -+MimeType=application/x-ogg;audio/basic;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack; +-MimeType=application/x-ogg;audio/basic;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack; ++#removed on SUSE: audio/vnd.rn-realaudio; audio/x-pn-realaudio;audio/x-pn-realaudio-plugin; video/vnd.rn-realvideo; ++MimeType=application/x-ogg;audio/basic;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack; Name=Kaffeine-Xine + Name[nb]=Kaffeine Xine Comment=A Kaffeine engine based on xine. ++++++ kaffeine-0.8.2.tar.bz2 -> kaffeine-0.8.3.tar.bz2 ++++++ ++++ 127476 lines of diff (skipped) ++++++ kaffeine-gstreamer-0-10.patch ++++++ --- /var/tmp/diff_new_pack.RQtucU/_old 2006-12-07 20:34:46.000000000 +0100 +++ /var/tmp/diff_new_pack.RQtucU/_new 2006-12-07 20:34:46.000000000 +0100 @@ -1,65 +1,35 @@ ---- configure.in -+++ configure.in -@@ -175,14 +175,14 @@ - dnl And we can also ask for the right version of gstreamer - have_gst=no - -- GST_MAJORMINOR=0.8 -- GST_REQ=0.8.4 -+ GST_MAJORMINOR=0.10 -+ GST_REQ=0.10.4 - - PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ -- gstreamer-interfaces-$GST_MAJORMINOR >= $GST_REQ, -- have_gst=yes,have_gst=no) -+ gstreamer-base-$GST_MAJORMINOR, -+ have_gst=yes,have_gst=no) - -- PKG_CHECK_MODULES(GST_PLUGINS, gstreamer-plugins-$GST_MAJORMINOR >= $GST_REQ, \ -+ PKG_CHECK_MODULES(GST_PLUGINS, gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ, \ - have_gst_plugins=yes,have_gst_plugins=no) - - dnl Give error if we don't have gstreamer -@@ -190,7 +190,7 @@ - LIB_GST="" - CFLAGS_GST="" - else -- LIB_GST=$GST_LIBS -+ LIB_GST="$GST_LIBS -lgstinterfaces-$GST_MAJORMINDOR" - LIB_GST_PLUGINS=$GST_INTERFACES_LIBS - CFLAGS_GST=$GST_CFLAGS - AC_SUBST(LIB_GST) ---- kaffeine/configure.in.in -+++ kaffeine/configure.in.in -@@ -95,14 +95,14 @@ - dnl And we can also ask for the right version of gstreamer - have_gst=no - -- GST_MAJORMINOR=0.8 -- GST_REQ=0.8.4 -+ GST_MAJORMINOR=0.10 -+ GST_REQ=0.10.4 - - PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ -- gstreamer-interfaces-$GST_MAJORMINOR >= $GST_REQ, -- have_gst=yes,have_gst=no) -+ gstreamer-base-$GST_MAJORMINOR, -+ have_gst=yes,have_gst=no) - -- PKG_CHECK_MODULES(GST_PLUGINS, gstreamer-plugins-$GST_MAJORMINOR >= $GST_REQ, \ -+ PKG_CHECK_MODULES(GST_PLUGINS, gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ, \ - have_gst_plugins=yes,have_gst_plugins=no) - - dnl Give error if we don't have gstreamer -@@ -110,7 +110,7 @@ - LIB_GST="" - CFLAGS_GST="" - else -- LIB_GST=$GST_LIBS -+ LIB_GST="$GST_LIBS -lgstinterfaces-$GST_MAJORMINOR" - LIB_GST_PLUGINS=$GST_INTERFACES_LIBS - CFLAGS_GST=$GST_CFLAGS - AC_SUBST(LIB_GST) +--- configure.in 2006/12/05 09:02:33 1.1 ++++ configure.in 2006/12/05 09:08:44 +@@ -222,10 +222,10 @@ + if test "$with_gstreamer" != "no" ; then + AC_MSG_CHECKING([for GStreamer]) + +- if "$PKG_CONFIG" --exists "gstreamer-0.8 >= 0.8.4" "gstreamer-interfaces-0.8 >= 0.8.4" ; then ++ if "$PKG_CONFIG" --exists "gstreamer-0.10 >= 0.10.4" "gstreamer-plugins-base-0.10 >= 0.10.4" ; then + with_gstreamer=yes +- CFLAGS_GSTREAMER=`"$PKG_CONFIG" --cflags gstreamer-0.8 gstreamer-interfaces-0.8` +- LIB_GSTREAMER=`"$PKG_CONFIG" --libs gstreamer-0.8 gstreamer-interfaces-0.8` ++ CFLAGS_GSTREAMER=`"$PKG_CONFIG" --cflags gstreamer-0.10 gstreamer-plugins-base-0.10` ++ LIB_GSTREAMER="`"$PKG_CONFIG" --libs gstreamer-0.10 gstreamer-plugins-base-0.10` -lgstinterfaces-0.10" + AC_MSG_RESULT([yes]) + else + with_gstreamer=no +--- kaffeine/configure.in.in 2006/12/05 09:02:33 1.1 ++++ kaffeine/configure.in.in 2006/12/05 09:10:36 +@@ -142,10 +142,10 @@ + if test "$with_gstreamer" != "no" ; then + AC_MSG_CHECKING([for GStreamer]) + +- if "$PKG_CONFIG" --exists "gstreamer-0.8 >= 0.8.4" "gstreamer-interfaces-0.8 >= 0.8.4" ; then ++ if "$PKG_CONFIG" --exists "gstreamer-0.10 >= 0.10.4" "gstreamer-plugins-base-0.10 >= 0.10.4" ; then + with_gstreamer=yes +- CFLAGS_GSTREAMER=`"$PKG_CONFIG" --cflags gstreamer-0.8 gstreamer-interfaces-0.8` +- LIB_GSTREAMER=`"$PKG_CONFIG" --libs gstreamer-0.8 gstreamer-interfaces-0.8` ++ CFLAGS_GSTREAMER=`"$PKG_CONFIG" --cflags gstreamer-0.10 gstreamer-plugins-base-0.10` ++ LIB_GSTREAMER="`"$PKG_CONFIG" --libs gstreamer-0.10 gstreamer-plugins-base-0.10` -lgstinterfaces-0.10" + AC_MSG_RESULT([yes]) + else + with_gstreamer=no --- kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp +++ kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp @@ -361,6 +361,7 @@ ++++++ kaffeine-quote-subs.patch ++++++ --- /var/tmp/diff_new_pack.RQtucU/_old 2006-12-07 20:34:46.000000000 +0100 +++ /var/tmp/diff_new_pack.RQtucU/_new 2006-12-07 20:34:46.000000000 +0100 @@ -14,8 +14,8 @@ entry.setAttribute("subs", subList); } ---- kaffeine/src/player-parts/playlistimport.cpp -+++ kaffeine/src/player-parts/playlistimport.cpp +--- kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp ++++ kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp @@ -69,7 +69,11 @@ int currentSub = -1; ++++++ messagebox-dvd.diff ++++++ --- /var/tmp/diff_new_pack.RQtucU/_old 2006-12-07 20:34:46.000000000 +0100 +++ /var/tmp/diff_new_pack.RQtucU/_new 2006-12-07 20:34:46.000000000 +0100 @@ -13,11 +13,15 @@ DCOPRef mediamanager("kded","mediamanager"); DCOPReply reply = mediamanager.call("fullList()"); if ( reply.isValid() ) { ---- po/de.po 2006/03/28 11:58:48 1.1 -+++ po/de.po 2006/03/28 11:59:46 -@@ -3123,2 +3123,5 @@ +--- po/de.po 2006/12/05 09:33:47 1.15 ++++ po/de.po 2006/12/05 09:34:21 +@@ -3210,6 +3210,9 @@ msgid "DummyPart" msgstr "DummyPart" -+ + +msgid "This version of Xine (used by Kaffeine) has only a reduced\nset of supported codecs. It is not able to play DVDs.\nPlease read http://portal.suse.com/sdb/en/2003/09/xine_dvd.html for further details." +msgstr "Diese Version von Xine (wird von Kaffeine benutzt) hat nur\neine limitierte Anzahl von Codecs. Daher ist es nicht möglich eine DVD anzusehen.\nBitte lesen Sie diese Seite http://en.opensuse.org/XINE für weitere Informationen." ++ + #~ msgid "These channels already exist and were not added:" + #~ msgstr "Diese Kanäle existieren bereits und werden nicht hinzugefügt:" + ++++++ mutex.diff ++++++ --- /var/tmp/diff_new_pack.RQtucU/_old 2006-12-07 20:34:46.000000000 +0100 +++ /var/tmp/diff_new_pack.RQtucU/_new 2006-12-07 20:34:46.000000000 +0100 @@ -41,10 +41,9 @@ case TIMER_EVENT_NEW_TITLE: --- kaffeine/src/player-parts/xine-part/kxinewidget.h +++ kaffeine/src/player-parts/xine-part/kxinewidget.h -@@ -47,6 +47,7 @@ +@@ -47,5 +47,6 @@ #include <qtimer.h> - #include <qthread.h> +#include <qmutex.h> #include <qptrlist.h> #include <X11/Xlib.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit joy2key
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package joy2key checked in at Thu Dec 7 20:34:43 CET 2006. -------- --- joy2key/joy2key.changes 2006-07-23 16:42:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/joy2key/joy2key.changes 2006-12-07 12:31:47.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 7 12:31:26 CET 2006 - sndirsch(a)suse.de + +- fixed warning (Bug #226508) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ joy2key.spec ++++++ --- /var/tmp/diff_new_pack.sV4cHR/_old 2006-12-07 20:34:12.000000000 +0100 +++ /var/tmp/diff_new_pack.sV4cHR/_new 2006-12-07 20:34:12.000000000 +0100 @@ -13,12 +13,12 @@ Name: joy2key BuildRequires: pkgconfig xorg-x11-devel URL: http://interreality.org/~tetron/technology/joy2key/ -License: GPL +License: GNU General Public License (GPL) Group: Hardware/Joystick #Requires: xforms Autoreqprov: on Version: 1.6.1 -Release: 16 +Release: 37 Summary: For Using the Joystick with Keyboard-Based Applications Source: %name-%version.tar.gz Patch: %name-%version.dif @@ -62,6 +62,8 @@ %_mandir/man1/joy2key.1.gz %changelog -n joy2key +* Thu Dec 07 2006 - sndirsch(a)suse.de +- fixed warning (Bug #226508) * Sun Jul 23 2006 - sndirsch(a)suse.de - fixed build for X.Org 7 * Wed Jan 25 2006 - mls(a)suse.de ++++++ joy2key-1.6.1.dif ++++++ --- /var/tmp/diff_new_pack.sV4cHR/_old 2006-12-07 20:34:12.000000000 +0100 +++ /var/tmp/diff_new_pack.sV4cHR/_new 2006-12-07 20:34:12.000000000 +0100 @@ -57,3 +57,14 @@ } void repeat_handler(int s) +--- joy2key.c.orig 2006-12-07 11:19:54.000000000 +0100 ++++ joy2key.c 2006-12-07 12:30:22.721766291 +0100 +@@ -402,7 +402,7 @@ + puts("Not enough arguments to -config"); + exit(1); + } +- if(rcfile==DEFAULT_RCFILE) ++ if(strcmp(rcfile,DEFAULT_RCFILE) == 0) + { + x=strlen(getenv("HOME")) + strlen(rcfile) + 2; + rcfile=(char*)malloc(x); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ivman
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package ivman checked in at Thu Dec 7 20:34:32 CET 2006. -------- --- ivman/ivman.changes 2006-11-17 12:38:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/ivman/ivman.changes 2006-12-06 15:55:12.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Dec 5 17:19:34 CET 2006 - mkoenig(a)suse.de + +- update to version 0.6.13: + * Merged dbus error patch +- provide rcivman symlink [#223757] + +------------------------------------------------------------------- Old: ---- ivman-0.6.12-dbus_error.patch ivman-0.6.12.tar.bz2 New: ---- ivman-0.6.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ivman.spec ++++++ --- /var/tmp/diff_new_pack.knJpCs/_old 2006-12-07 20:28:57.000000000 +0100 +++ /var/tmp/diff_new_pack.knJpCs/_new 2006-12-07 20:28:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package ivman (Version 0.6.12) +# spec file for package ivman (Version 0.6.13) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,14 +15,13 @@ License: GNU General Public License (GPL) Group: System/Daemons URL: http://ivman.sourceforge.net/ -Version: 0.6.12 -Release: 34 +Version: 0.6.13 +Release: 1 Source0: http://puzzle.dl.sourceforge.net/sourceforge/ivman/%name-%version.tar.bz2 Source1: halmount.py Source2: ivman.init Source3: halmount.1 Patch0: %{name}-config.patch -Patch1: %{name}-0.6.12-dbus_error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Autoreq: on BuildRequires: dbus-1-devel glib2-devel hal-devel libxml2-devel pkgconfig @@ -45,7 +44,6 @@ %prep %setup -q %patch0 -%patch1 -p1 %build CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \ @@ -63,7 +61,9 @@ install -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1 %find_lang %{name} mkdir -p $RPM_BUILD_ROOT/etc/init.d +mkdir -p $RPM_BUILD_ROOT/usr/sbin install -m 755 %{S:2} $RPM_BUILD_ROOT/etc/init.d/%{name} +ln -s /etc/init.d/%{name} $RPM_BUILD_ROOT/usr/sbin/rcivman #post #{fillup_and_insserv ivman} @@ -87,8 +87,13 @@ %_mandir/man1/* %_mandir/man5/* %_mandir/man8/* +/usr/sbin/rcivman %changelog -n ivman +* Tue Dec 05 2006 - mkoenig(a)suse.de +- update to version 0.6.13: + * Merged dbus error patch +- provide rcivman symlink [#223757] * Fri Nov 17 2006 - lnussel(a)suse.de - add halmount manpage * Thu Nov 16 2006 - lnussel(a)suse.de ++++++ ivman-0.6.12.tar.bz2 -> ivman-0.6.13.tar.bz2 ++++++ ++++ 14212 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/ivman-0.6.12/configure.in new/ivman-0.6.13/configure.in --- old/ivman-0.6.12/configure.in 2006-04-18 09:48:11.000000000 +0200 +++ new/ivman-0.6.13/configure.in 2006-12-02 01:35:51.000000000 +0100 @@ -1,8 +1,8 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([ivman],[0.6.12]) +AC_INIT([ivman],[0.6.13]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(ivman,0.6.12) +AM_INIT_AUTOMAKE(ivman,0.6.13) dnl If 'prefix' is not set, just set it to the default prefix if test x$prefix = xNONE; then 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/ivman-0.6.12/ivman-launch new/ivman-0.6.13/ivman-launch --- old/ivman-0.6.12/ivman-launch 2006-04-18 09:48:11.000000000 +0200 +++ new/ivman-0.6.13/ivman-launch 2006-05-23 10:00:15.000000000 +0200 @@ -1,9 +1,11 @@ #!/bin/bash # This script was written by Daniele Favara <danjele(a)gmail.com> +# CMD=ivman CONFDIR= # the config dir | null EXITWITH= SESSION= +set -x while [ ! -z "$1" ];do case "$1" in --help|-h) @@ -52,32 +54,45 @@ fi ;; *) - #usage - echo "---" - echo "Error $1: not a valid option" - echo "" - echo "Usage: ivman-launch [OPTIONS]" - echo "Please see 'man ivman-launch' for details." - exit 1 + SESSION=$@ ; shift $# ;; esac done echo "$CMD" if [ "x$SESSION" = "x" ]; then + # start normally exec $CMD exit $? else + + if [ "x$EXITWITH" = "x" ]; then + # we were passed a session to start + # + $CMD & ivmanpid=$! + echo $DISPLAY + $SESSION + while ps $ivmanpid + do + kill $ivmanpid || sleep 5 + done + exit $? + else + # we were called with --exit-with-session, which means we + # watch them and wait for them to die + # exec $CMD & pid=$! KILLCMD="kill $pid && echo 'ivman killed' && exit" trap "eval $KILLCMD" ALRM HUP INT PIPE PROF TERM USR1 USR2 VTALRM ABRT - while ps -C ivman -o pid --no-heading | grep -q $pid - do - if ! ps -C $SESSION -o user | grep -q $USER - then - eval $KILLCMD - fi - sleep 5 - done + + while ps -C ivman -o pid --no-heading | grep -q $pid + do + if ! ps -C $SESSION -o user | grep -q $USER + then + eval $KILLCMD + fi + sleep 5 + done + fi fi 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/ivman-0.6.12/ivman-launch.8 new/ivman-0.6.13/ivman-launch.8 --- old/ivman-0.6.12/ivman-launch.8 2006-04-18 09:48:11.000000000 +0200 +++ new/ivman-0.6.13/ivman-launch.8 2006-05-23 10:00:15.000000000 +0200 @@ -22,7 +22,7 @@ .SH NAME ivman-launch \- launch script for Ivman .SH SYNOPSIS -.B ivman-launch [ " --exit-with-session " <cmd> " ] [ OPTIONS ] +.B ivman-launch [ --exit-with-session <cmd> ] [ OPTIONS ] [ COMMAND [ ARGS... ]] .SH DESCRIPTION ivman-launch is a simple script used to launch Ivman. Its sole purpose is to ensure Ivman is closed at the end of a user's login session. You can use @@ -32,6 +32,10 @@ option: --exit-with-session. Thus, there is no point using ivman-launch if you do not need to use this option. +If you supply a COMMAND (with optional ARGS), the the specified +command will be run after ivman is started, and ivman will be killed +after that command exits. + .SH OPTIONS .TP .BR \-\-exit\-with\-session " " <cmd> @@ -39,16 +43,30 @@ Ivman and exit itself. If the command 'cmd' is not running when ivman-launch is started, Ivman will exit immediately. Note that this option implies Ivman will be called with the '--nofork' option. +option. +.TP +.BR \-\-debug " " \-\-nofork " " \-\-system +These flags be passed to the launched ivman command. -.SH EXAMPLE -The following command in an ~/.xinitrc file would cause Ivman to launch in the background when -your session begins, and exit when your session ends: +.SH EXAMPLES +.TP .BR ivman-launch " " --exit-with-session " " xinit " " & +The ivman process will be started, then the xinit process is watched. +When the xinit process exits, ivman is killed. Placing this command +in an ~/.xinitrc file would cause Ivman to launch in the background +when your session begins, and exit when your session ends: +.TP +.BR ivman-launch " " /usr/bin/x-window-manager +The ivman process is launched, then /usr/bin/x-window-manager is run, +when x-window-manager exits, ivman is killed. This is an example of +how ivman might be launched from Xsession in order to chain several +programs together in one session. .SH "SEE ALSO" .BR ivman (8) +.BR Xsession (5) .SH CREDITS This script was written by Daniele Favara. Binary files old/ivman-0.6.12/po/fr.gmo and new/ivman-0.6.13/po/fr.gmo differ 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/ivman-0.6.12/po/fr.po new/ivman-0.6.13/po/fr.po --- old/ivman-0.6.12/po/fr.po 2006-04-18 09:48:11.000000000 +0200 +++ new/ivman-0.6.13/po/fr.po 2006-12-02 01:39:38.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ivman 0.6.7\n" "Report-Msgid-Bugs-To: rohan.pm(a)gmail.com\n" -"POT-Creation-Date: 2006-04-20 17:44+1000\n" +"POT-Creation-Date: 2006-12-02 10:39+1000\n" "PO-Revision-Date: 2005-11-18 11:39+0100\n" "Last-Translator: julien <julviala(a)free.fr>\n" "Language-Team: French <traduc(a)traduc.org>\n" @@ -78,16 +78,16 @@ msgstr "" "Avertissement : hal_xml_property_matches a été appelée avec une valeur NULL." -#: src/IvmConfig/IvmConfigCommon.c:116 +#: src/IvmConfig/IvmConfigCommon.c:123 msgid "Warning: unhandled HAL type encountered!" msgstr "Avertissement : détection d'un type HAL non géré!" -#: src/IvmConfig/IvmConfigCommon.c:157 +#: src/IvmConfig/IvmConfigCommon.c:166 #, c-format msgid "UDI %s is device %s" msgstr "UDI %s est le device %s" -#: src/IvmConfig/IvmConfigCommon.c:164 +#: src/IvmConfig/IvmConfigCommon.c:173 #, c-format msgid "" "Device %s won't be mounted because it does not specify whether or not it is " @@ -95,12 +95,12 @@ msgstr "" "Le device %s ne sera pas monté car il ne précise pas s'il s'agit d'un volume." -#: src/IvmConfig/IvmConfigCommon.c:176 +#: src/IvmConfig/IvmConfigCommon.c:185 #, c-format msgid "Device %s can't be mounted because it is not a volume" msgstr "Le device %s ne peut être monté car il ne s'agit pas d'un volume." -#: src/IvmConfig/IvmConfigCommon.c:190 +#: src/IvmConfig/IvmConfigCommon.c:201 #, c-format msgid "" "Device %s won't be mounted because no mount policy or parent device is " @@ -109,7 +109,7 @@ "Le device %s ne sera pas monté car il manque la règle de montage ou le " "device parent" -#: src/IvmConfig/IvmConfigCommon.c:211 +#: src/IvmConfig/IvmConfigCommon.c:224 #, fuzzy, c-format msgid "" "Device %s won't be mounted because no mount policy was specified on volume " @@ -118,7 +118,7 @@ "Le device %s ne sera pas monté car aucune règle de montage n'est fournie " "pour lui et la règle du device parent l'interdit." -#: src/IvmConfig/IvmConfigCommon.c:226 +#: src/IvmConfig/IvmConfigCommon.c:239 #, c-format msgid "" "Device %s won't be mounted because no mount policy was specified on volume " @@ -127,21 +127,21 @@ "Le device %s ne sera pas monté car aucune règle de montage n'est fournie " "pour lui et la règle du device parent l'interdit." -#: src/IvmConfig/IvmConfigCommon.c:240 +#: src/IvmConfig/IvmConfigCommon.c:253 #, c-format msgid "" "Device %s won't be mounted because mount policy on volume says not to mount" msgstr "" "Le device %s ne sera pas monté car la règle de montage des volumes l'interdit" -#: src/IvmConfig/IvmConfigCommon.c:262 +#: src/IvmConfig/IvmConfigCommon.c:274 #, c-format msgid "Device %s can't be mounted because it is a disc with no data tracks" msgstr "" "Le device %s ne sera pas monté car il s'agit d'un disque sans pistes de " "données" -#: src/IvmConfig/IvmConfigCommon.c:294 +#: src/IvmConfig/IvmConfigCommon.c:306 #, fuzzy, c-format msgid "" "Device %s won't be mounted because storage.automount_enabled_hint = false on " @@ -150,11 +150,6 @@ "Le device %s ne sera pas monté car il manque la règle de montage ou le " "device parent" -#: src/IvmConfig/IvmConfigCommon.c:311 -#, fuzzy, c-format -msgid "Won't try to mount device %s, as it is already mounted" -msgstr "Device retiré: %s" - #: src/IvmConfig/IvmConfigCommon.c:319 #, c-format msgid "Device %s appears to be mountable" @@ -350,35 +345,46 @@ msgid "pmount-hal was found on your system. It will be used for mounting.\n" msgstr "pmount-hal a été trouvé. Les montages seront effectués avec.\n" -#: src/manager.c:290 +#: src/manager.c:289 +#, fuzzy +msgid "gnome-mount was not found on your system.\n" +msgstr "mount est introuvable.\n" + +#: src/manager.c:293 +#, fuzzy +msgid "gnome-mount was found on your system. It will be used for mounting.\n" +msgstr "pmount a été trouvé. Les montages seront effectués avec.\n" + +#: src/manager.c:303 +#, fuzzy msgid "" -"pmount-hal detection skipped, as we are a root instance of Ivman. pmount-" -"hal is only used for user instances.\n" +"pmount-hal/gnome-mount detection skipped, as we are a root instance of " +"Ivman. pmount-hal/gnome-mount is only used for user instances.\n" msgstr "" "La détection de pmount-hal est inutile cat ivman a l'identité 'root'.pmount-" "hal n'est utilisé dans ce cas.\n" -#: src/manager.c:297 +#: src/manager.c:310 msgid "pmount was not found on your system.\n" msgstr "pmount est introuvable.\n" -#: src/manager.c:302 +#: src/manager.c:315 msgid "pmount was found on your system, but pumount wasn't!\n" msgstr "pmount a été trouvé mais pas pumount!\n" -#: src/manager.c:310 src/manager.c:335 +#: src/manager.c:323 src/manager.c:348 msgid "pmount was found on your system. It will be used for mounting.\n" msgstr "pmount a été trouvé. Les montages seront effectués avec.\n" -#: src/manager.c:333 +#: src/manager.c:346 msgid "pmount accepts -u <umask>\n" msgstr "pmount accepte -u <umask>\n" -#: src/manager.c:356 +#: src/manager.c:369 msgid "pmount does not accept -u <umask>" msgstr "pmount n'accepte pas -u <umask>" -#: src/manager.c:359 +#: src/manager.c:372 #, c-format msgid "" "WARNING: pmount does not accept -u <umask>, so I will not mount volumes with " @@ -389,15 +395,15 @@ "pas effectués avec car ils ne seraient accessibles qu'avec le compte " "utilisateur %s. Vous devriez installer une version plus récente de pmount.\n" -#: src/manager.c:370 +#: src/manager.c:383 msgid "mount was not found on your system.\n" msgstr "mount est introuvable.\n" -#: src/manager.c:376 +#: src/manager.c:389 msgid "mount was found on your system, but umount was not!\n" msgstr "mount a été trouvé mais pas umount!\n" -#: src/manager.c:381 +#: src/manager.c:394 msgid "" "mount was found on your system. It will be used for mounting. This means " "you need fstab entries for the devices you want mounted, or you need to use " @@ -408,30 +414,30 @@ "que vous utilisize fstab-sync. Il est fortement recommandé d'utiliser pmount " "à la place.\n" -#: src/manager.c:436 +#: src/manager.c:449 msgid "Settings directory does not exist, attempting to create it...\n" msgstr "" "Le répertoire stockant les options n'existe pas. Tentative de création en " "cours...\n" -#: src/manager.c:460 +#: src/manager.c:473 #, c-format msgid "Couldn't create new directory %s\n" msgstr "Impossible de créer le répertoire %s\n" -#: src/manager.c:491 +#: src/manager.c:504 #, c-format msgid "Configuration file %s not found, creating one with default content...\n" msgstr "" "Le fichier de configuration %s n'existe pas. Création avec les valeurs par " "défaut en cours...\n" -#: src/manager.c:503 +#: src/manager.c:516 #, c-format msgid "Couldn't create configuration file %s!\n" msgstr "Impossible de créer le fichier de configuration %s!\n" -#: src/manager.c:526 +#: src/manager.c:539 msgid "" "Could not parse IvmConfigBase.xml! Please check this file for errors! Since " "I need IvmConfigBase.xml to function, I will now exit.\n" @@ -439,115 +445,115 @@ "Le format de IvmConfigBase.xml est incorrect! Merci de le vérifier! Ivman ne " "peut fonctionner sans : arrêt du programme.\n" -#: src/manager.c:709 +#: src/manager.c:727 msgid "Warning: unhandled HAL type encountered, NULL substituted for value!\n" msgstr "Avertissement : type HAL non géré, remplacement par la valeur NULL!\n" -#: src/manager.c:716 +#: src/manager.c:734 msgid "" "Warning: nonexistent HAL property encountered, NULL substituted for value!\n" msgstr "" "Avertissement : propriété HAL inconnue, remplacement par la valeur NULL!\n" -#: src/manager.c:768 +#: src/manager.c:786 #, c-format msgid "Running: %s\n" msgstr "Exécution de: %s\n" -#: src/manager.c:772 +#: src/manager.c:790 #, c-format msgid "Execution of %s failed with error: %s\n" msgstr "Exécution de %s en erreur: %s\n" -#: src/manager.c:824 +#: src/manager.c:843 #, c-format msgid "Checking for video DVD in device '%s' mounted at '%s'\n" msgstr "Recherche de capacité DVD vidéo dans le device '%s' monté sur '%s'\n" -#: src/manager.c:842 +#: src/manager.c:861 #, c-format msgid "%s looks like a video DVD\n" msgstr "%s semble être un lecteur de DVD vidéo\n" -#: src/manager.c:844 +#: src/manager.c:863 #, c-format msgid "%s does not look like a video DVD\n" msgstr "%s ne semble pas être un lecteur de DVD vidéo\n" -#: src/manager.c:863 +#: src/manager.c:882 #, c-format msgid "Can't mount %s; no mount command available!\n" msgstr "" "Impossible de monter %s; aucune commande de montage n'est disponible!\n" -#: src/manager.c:949 +#: src/manager.c:975 msgid "" "WARNING: execdvd rule found. execdvd is deprecated. Use HAL property " "volume.disc.is_videodvd instead." msgstr "" -#: src/manager.c:977 +#: src/manager.c:1003 msgid "Giving other programs a chance to mount...\n" msgstr "Abandon du montage aux profits d'éventuels autres programmes...\n" -#: src/manager.c:988 +#: src/manager.c:1014 #, c-format msgid "Attempting to mount device %s\n" msgstr "Tentative de montage du device %s\n" -#: src/manager.c:1004 +#: src/manager.c:1030 #, c-format msgid "%s wasn't mounted, by us or by others..." msgstr "%s n'est pas monté, ni par Ivman ni par quelqu'un d'autre..." -#: src/manager.c:1033 +#: src/manager.c:1059 #, c-format msgid "Couldn't get mount point of device %s after 5 seconds\n" msgstr "" "Impossible d'obtenir le point de montage du device %s après 5 secondes\n" -#: src/manager.c:1038 +#: src/manager.c:1064 #, fuzzy, c-format msgid "Device %s is mounted at %s\n" msgstr "Device retiré: %s" -#: src/manager.c:1089 +#: src/manager.c:1115 #, c-format msgid "Unmounting %s\n" msgstr "Démontage de %s\n" -#: src/manager.c:1100 +#: src/manager.c:1126 #, c-format msgid "bindtextdomain() failed: %s\n" msgstr "bindtextdomain() a échoué: %s\n" -#: src/manager.c:1103 +#: src/manager.c:1129 #, c-format msgid "textdomain() failed: %s\n" msgstr "textdomain() a échoué: %s\n" -#: src/manager.c:1106 +#: src/manager.c:1132 #, c-format msgid "setlocale() failed: %s\n" msgstr "setlocale() a échoué: %s\n" -#: src/manager.c:1131 src/manager.c:1138 +#: src/manager.c:1157 src/manager.c:1164 msgid "Failed to create HAL context!\n" msgstr "Echec de la création du contexte HAL!\n" -#: src/manager.c:1144 +#: src/manager.c:1170 msgid "Couldn't connect to HAL!\n" msgstr "Echec de la connexion à HAL!\n" -#: src/manager.c:1161 +#: src/manager.c:1187 msgid "Couldn't initialise HAL!\n" msgstr "Echec de l'initialisation de HAL!\n" -#: src/manager.c:1170 +#: src/manager.c:1196 msgid "Failed to watch all HAL properties!\n" msgstr "Echec de la consultation de toutes les propriétés HAL!\n" -#: src/manager.c:1175 +#: src/manager.c:1201 #, c-format msgid "" "Failed to watch all HAL properties!\n" @@ -556,21 +562,21 @@ "Echec de la consultation de toutes les propriétés HAL!\n" "Erreur: %s\n" -#: src/manager.c:1211 +#: src/manager.c:1237 #, fuzzy msgid "Will run through properties for every device currently attached\n" msgstr "Exécution des règles pour toutes les propriétés courantes.\n" -#: src/manager.c:1218 +#: src/manager.c:1244 #, fuzzy msgid "Will run through actions for every device currently attached\n" msgstr "Exécution des règles pour toutes les propriétés courantes.\n" -#: src/manager.c:1230 +#: src/manager.c:1256 msgid " Couldn't enumerate all devices!\n" msgstr "Impossible de lister tous les devices!\n" -#: src/manager.c:1284 +#: src/manager.c:1310 msgid "" "Force Ivman to run in system-wide mode. Use this if you want Ivman to behave " "like you started it as root, even if you did not." @@ -578,39 +584,39 @@ "Exécution forcée d'Ivman en mode système. Utilisez ceci pour que ivman se " "comporte comme s'il avait l'identité root alors que ce n'est pas le cas." -#: src/manager.c:1288 +#: src/manager.c:1314 msgid "Force Ivman to show debugging output." msgstr "Force Ivman à écrire les informations de debug." -#: src/manager.c:1290 +#: src/manager.c:1316 msgid "" "Force Ivman to look in a specific directory for configuration (default: /etc/" "ivman or ~/.ivman)" msgstr "" "Force le répertoire de configuration (par default: /etc/ivman or ~/.ivman)" -#: src/manager.c:1293 +#: src/manager.c:1319 msgid "Force Ivman not to daemonize itself." msgstr "Empêche Ivman de s'exécuter en tâche de fond." -#: src/manager.c:1298 +#: src/manager.c:1324 msgid "- start ivman" msgstr "- démarre ivman" -#: src/manager.c:1310 +#: src/manager.c:1336 msgid "-c option given with no directory!" msgstr "L'option -c attend un nom de répertoire!" -#: src/manager.c:1340 +#: src/manager.c:1366 msgid "Can't find home directory, exiting!\n" msgstr "Répertoire 'home' introuvable, arrêt!\n" -#: src/manager.c:1357 +#: src/manager.c:1383 #, c-format msgid "Directory %s will be used for configuration files." msgstr "Le répertoire %s va être utilisé pour les fichiers de configuration." -#: src/manager.c:1378 +#: src/manager.c:1404 msgid "" "An appropriate mount command could not be found! Please make sure you have " "mount/umount or pmount/pumount in Ivman's PATH. Mounting currently will not " @@ -620,39 +626,39 @@ "dispose du chemin de mount/umount ou pmount/pumount dans la variable PATH. " "Les montages ne seront pas effectués.\n" -#: src/manager.c:1407 +#: src/manager.c:1433 msgid "Compiled against HAL 0.4.x or earlier\n" msgstr "Compilé avec HAL 0.4.x ou une version plus ancienne\n" -#: src/manager.c:1409 +#: src/manager.c:1435 msgid "Compiled against HAL 0.5.x or later\n" msgstr "Compilé avec HAL 0.5.x ou une version plus récente\n" -#: src/manager.c:1413 +#: src/manager.c:1439 msgid "Running in system mode.\n" msgstr "Exécution en mode système.\n" -#: src/manager.c:1416 +#: src/manager.c:1442 msgid "Running in user mode.\n" msgstr "Exécution en mode utilisateur.\n" -#: src/manager.c:1425 +#: src/manager.c:1451 msgid "Couldn't daemonize, exiting..." msgstr "Impossible de s'exécuter en tâche de fond, arrêt..." -#: src/manager.c:1433 +#: src/manager.c:1459 msgid "Couldn't drop privileges, exiting!" msgstr "Impossible de perdre les privilèges, Arrêt!" -#: src/manager.c:1440 +#: src/manager.c:1466 msgid "Error creating main loop!\n" msgstr "Error de création de la boucle principale!\n" -#: src/manager.c:1450 +#: src/manager.c:1476 msgid "Entering main loop.\n" msgstr "Entrée dans la boucle principale.\n" -#: src/manager.c:1452 +#: src/manager.c:1478 msgid "Exiting normally.\n" msgstr "Arrêt normal.\n" 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/ivman-0.6.12/src/IvmConfig/IvmConfigCommon.c new/ivman-0.6.13/src/IvmConfig/IvmConfigCommon.c --- old/ivman-0.6.12/src/IvmConfig/IvmConfigCommon.c 2006-04-18 09:48:11.000000000 +0200 +++ new/ivman-0.6.13/src/IvmConfig/IvmConfigCommon.c 2006-12-02 01:30:16.000000000 +0100 @@ -11,7 +11,7 @@ * * See http://www.troll.no/qpl for QPL licensing information. * - * $Id: IvmConfigCommon.c,v 1.12 2006/04/18 03:15:12 ro_han Exp $ + * $Id: IvmConfigCommon.c,v 1.13 2006/12/02 00:30:16 ro_han Exp $ *****************************************************************************/ // Common functions which more than one IvmConfig* needs to call. @@ -46,9 +46,13 @@ if (libhal_device_property_exists (hal_ctx, udi, devProperty, &dbus_error)) { - int type = libhal_device_get_property_type(hal_ctx, udi, - devProperty, - &dbus_error); + int type; + + ivm_check_dbus_error(&dbus_error); + type = libhal_device_get_property_type(hal_ctx, udi, + devProperty, + &dbus_error); + ivm_check_dbus_error(&dbus_error); if (type == DBUS_TYPE_STRING) { @@ -56,6 +60,7 @@ (char *) libhal_device_get_property_string(hal_ctx, udi, devProperty, &dbus_error); + ivm_check_dbus_error(&dbus_error); if (!xmlStrcmp(value, (const xmlChar *) propVal)) { @@ -96,7 +101,8 @@ gboolean matches = (libhal_device_get_property_uint64 (hal_ctx, udi, devProperty, &dbus_error) == value_i); - free(devProperty); + ivm_check_dbus_error(&dbus_error); + free(devProperty); return matches; } // unsigned int @@ -108,6 +114,7 @@ gboolean matches = (libhal_device_get_property_int (hal_ctx, udi, devProperty, &dbus_error) == value_i); + ivm_check_dbus_error(&dbus_error); free(devProperty); return matches; } // signed int @@ -149,6 +156,8 @@ if ( !libhal_device_property_exists (hal_ctx, udi, "block.device", &dbus_error)) return FALSE; + ivm_check_dbus_error(&dbus_error); + char *device = (char *) libhal_device_get_property_string(hal_ctx, udi, "block.device", @@ -156,7 +165,7 @@ assert(device); DEBUG(_("UDI %s is device %s"), udi, device, &dbus_error); // if we get here, condition one is satisfied - + ivm_check_dbus_error(&dbus_error); if (!libhal_device_property_exists (hal_ctx, udi, "block.is_volume", &dbus_error)) @@ -180,10 +189,12 @@ } // if we get here, condition two is satisfied + ivm_check_dbus_error(&dbus_error); if (!libhal_device_property_exists (hal_ctx, udi, "volume.policy.should_mount", &dbus_error)) { + ivm_check_dbus_error(&dbus_error); if (!libhal_device_property_exists (hal_ctx, udi, "block.storage_device", &dbus_error)) { @@ -194,6 +205,7 @@ return FALSE; } + ivm_check_dbus_error(&dbus_error); char *new_udi = (char *) libhal_device_get_property_string(hal_ctx, udi, "block.storage_device", @@ -202,11 +214,12 @@ if (!libhal_device_property_exists (hal_ctx, new_udi, "storage.policy.should_mount", &dbus_error)) { + ivm_check_dbus_error(&dbus_error); // OK, so no storage policy was specified anywhere. Now we'll mount // if parent device is removable. if ( - !libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", &dbus_error ) || - !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", &dbus_error ) + !libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", NULL ) || + !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", NULL ) ) { DEBUG(_("\ Device %s won't be mounted because no mount policy was specified on \ @@ -221,7 +234,7 @@ !libhal_device_get_property_bool(hal_ctx, new_udi, "storage.policy.should_mount", - &dbus_error)) + NULL)) { DEBUG(_("\ Device %s won't be mounted because no mount policy was specified on \ @@ -235,7 +248,7 @@ else if ( !libhal_device_get_property_bool(hal_ctx, udi, "volume.policy.should_mount", - &dbus_error)) + NULL)) { DEBUG(_("\ Device %s won't be mounted because mount policy on volume says not \ @@ -245,19 +258,18 @@ } // if we get here, condition three is satisfied - + ivm_check_dbus_error(&dbus_error); /* Sufficient conditions for a volume to _not_ be mountable: (just one of these being true is sufficient) 1) volume is a disc with no data 2) storage.automount_enabled_hint = false on block.storage_device - 3) volume.is_mounted == true */ if (libhal_device_property_exists - (hal_ctx, udi, "volume.disc.has_data", &dbus_error) + (hal_ctx, udi, "volume.disc.has_data", NULL) && (!libhal_device_get_property_bool(hal_ctx, udi, "volume.disc.has_data", - &dbus_error))) + NULL))) { DEBUG(_("\ Device %s can't be mounted because it is a disc with no data tracks"), device); @@ -269,26 +281,26 @@ hal_ctx, udi, "block.storage_device", - &dbus_error + NULL ) ) { char *new_udi = (char *) libhal_device_get_property_string( hal_ctx, udi, "block.storage_device", - &dbus_error + NULL ); assert(new_udi); if ( libhal_device_property_exists( hal_ctx, new_udi, "storage.automount_enabled_hint", - &dbus_error + NULL ) && !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.automount_enabled_hint", - &dbus_error + NULL ) ) { DEBUG(_( "Device %s won't be mounted because " @@ -301,18 +313,6 @@ } libhal_free_string(new_udi); } - - if (libhal_device_property_exists - (hal_ctx, udi, "volume.is_mounted", &dbus_error) - && (libhal_device_get_property_bool(hal_ctx, udi, - "volume.is_mounted", - &dbus_error))) - { - DEBUG(_("\ -Won't try to mount device %s, as it is already mounted"), device); - libhal_free_string(device); - return FALSE; - } // yay, we made it!!! 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/ivman-0.6.12/src/dbus_interface.c new/ivman-0.6.13/src/dbus_interface.c --- old/ivman-0.6.12/src/dbus_interface.c 2006-04-18 09:48:11.000000000 +0200 +++ new/ivman-0.6.13/src/dbus_interface.c 2006-12-02 01:30:15.000000000 +0100 @@ -11,7 +11,7 @@ * * See http://www.troll.no/qpl for QPL licensing information. * - * $Id: dbus_interface.c,v 1.6 2005/11/29 00:42:48 ro_han Exp $ + * $Id: dbus_interface.c,v 1.7 2006/12/02 00:30:15 ro_han Exp $ *****************************************************************************/ #include <dbus/dbus.h> @@ -24,5 +24,6 @@ { if (dbus_error_is_set(error)) { DEBUG(_("DBus Error! %s: %s"), error->name, error->message); + dbus_error_free(error); } } 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/ivman-0.6.12/src/manager.c new/ivman-0.6.13/src/manager.c --- old/ivman-0.6.12/src/manager.c 2006-04-18 09:48:11.000000000 +0200 +++ new/ivman-0.6.13/src/manager.c 2006-12-02 01:30:15.000000000 +0100 @@ -11,7 +11,7 @@ * * See http://www.troll.no/qpl for QPL licensing information. * - * $Id: manager.c,v 1.74 2006/04/18 04:20:23 ro_han Exp $ + * $Id: manager.c,v 1.77 2006/12/02 00:30:15 ro_han Exp $ ************************************************************************/ #define _GNU_SOURCE @@ -266,11 +266,11 @@ // Test if pmount-hal exists if ( usermode ) { - if ( !command_exists( "pmount-hal &> /dev/null" ) ) { + if ( !command_exists( "pmount-hal > /dev/null 2>&1" ) ) { DEBUG(_("pmount-hal was not found on your system.\n")); } else { - if ( !command_exists( "pumount &> /dev/null" ) ) { + if ( !command_exists( "pumount > /dev/null 2>&1" ) ) { DEBUG(_("pmount-hal was found on your system, but pumount " "wasn't!\n")); } @@ -284,20 +284,33 @@ return; } } + // Test if gnome-mount exists + if ( !command_exists( "gnome-mount > /dev/null 2>&1" ) ) { + DEBUG(_("gnome-mount was not found on your system.\n")); + } + else { + DEBUG(_ + ("gnome-mount was found on your system. It will be " + "used for mounting.\n")); + known_mount_command = "gnome-mount -h '$hal.info.udi$'"; + unknown_mount_command = known_mount_command; + umount_command = "gnome-mount -u -d '$hal.block.device$'"; + return; + } } else { DEBUG(_ - ("pmount-hal detection skipped, as we are a root instance " - "of Ivman. pmount-hal is only used for user instances.\n")); + ("pmount-hal/gnome-mount detection skipped, as we are a root instance " + "of Ivman. pmount-hal/gnome-mount is only used for user instances.\n")); } // Now try looking for regular pmount. - if ( !command_exists( "pmount &> /dev/null" ) ) { + if ( !command_exists( "pmount > /dev/null 2>&1" ) ) { DEBUG(_("pmount was not found on your system.\n")); } else { - if ( !command_exists( "pumount &> /dev/null" ) ) { + if ( !command_exists( "pumount > /dev/null 2>&1" ) ) { DEBUG(_ ("pmount was found on your system, but pumount " "wasn't!\n")); @@ -323,7 +336,7 @@ g_string_append( pmount_umask_check, " --help | " ); pmount_umask_check = g_string_append( pmount_umask_check, GREP_PATH - " -- '-u <' &> /dev/null"); + " -- '-u <' > /dev/null 2>&1"); gboolean umask_accepted = command_succeeds( pmount_umask_check->str ); @@ -366,12 +379,12 @@ // At the bottom of the barrel is plain old mount ... - if ( !command_exists( "mount &> /dev/null" ) ) { + if ( !command_exists( "mount > /dev/null 2>&1" ) ) { DEBUG(_("mount was not found on your system.\n")); } else { - if ( !command_exists( "umount &> /dev/null" ) ) { + if ( !command_exists( "umount > /dev/null 2>&1" ) ) { DEBUG(_ ("mount was found on your system, but umount was " "not!\n")); @@ -650,12 +663,17 @@ || libhal_device_property_exists(hal_ctx, udi, propertyname, &dbus_error)) { - unsigned int type = execun ? psi_get_property_type(hal_ps, - propertyname) - : libhal_device_get_property_type(hal_ctx, + unsigned int type; + + ivm_check_dbus_error(&dbus_error); + + type = execun ? psi_get_property_type(hal_ps, + propertyname) + : libhal_device_get_property_type(hal_ctx, udi, propertyname, &dbus_error); + ivm_check_dbus_error(&dbus_error); if (type == DBUS_TYPE_STRING) { @@ -811,6 +829,7 @@ libhal_device_get_property_string(hal_ctx, udi, "volume.mount_point", &dbus_error); + ivm_check_dbus_error(&dbus_error); if (!libhal_device_property_exists (hal_ctx, udi, "block.device", &dbus_error)) @@ -886,24 +905,31 @@ udi, "block.storage_device", &dbus_error ) ) { - + + ivm_check_dbus_error(&dbus_error); + char * parent_udi = libhal_device_get_property_string( hal_ctx, udi, "block.storage_device", &dbus_error); + ivm_check_dbus_error(&dbus_error); + if ( libhal_device_property_exists( hal_ctx, parent_udi, "storage.policy.desired_mount_point", &dbus_error) ) { - + + ivm_check_dbus_error(&dbus_error); + char * mount_point = libhal_device_get_property_string( hal_ctx, parent_udi, "storage.policy.desired_mount_point", &dbus_error); - + ivm_check_dbus_error(&dbus_error); + GString * command = g_string_new( known_mount_command ); int strsize = strlen( "$hal.volume.policy.desired_mount_point$" ); int index = @@ -959,12 +985,12 @@ char *device = NULL; if (libhal_device_property_exists - (hal_ctx, udi, "block.device", &dbus_error)) + (hal_ctx, udi, "block.device", NULL)) device = (char *) libhal_device_get_property_string(hal_ctx, udi, - "block.device", &dbus_error); + "block.device", NULL); if (cfg->mount) { @@ -980,10 +1006,10 @@ if (libhal_device_property_exists(hal_ctx, udi, "volume.is_mounted", - &dbus_error) + NULL) && !libhal_device_get_property_bool(hal_ctx, udi, "volume.is_mounted", - &dbus_error)) + NULL)) { DEBUG(_("Attempting to mount device %s\n"), device); ivm_device_mount(udi); @@ -993,12 +1019,12 @@ if ((!libhal_device_property_exists(hal_ctx, udi, "volume.is_mounted", - &dbus_error)) + NULL)) || (!libhal_device_get_property_bool - (hal_ctx, udi, "volume.is_mounted", &dbus_error)) + (hal_ctx, udi, "volume.is_mounted", NULL)) || - (!libhal_device_property_exists(hal_ctx, udi, "volume.mount_point", &dbus_error)) + (!libhal_device_property_exists(hal_ctx, udi, "volume.mount_point", NULL)) ) { DEBUG(_("%s wasn't mounted, by us or by others..."), udi); @@ -1014,7 +1040,7 @@ char *mount_point = (char *) libhal_device_get_property_string(hal_ctx, udi, "volume.mount_point", - &dbus_error); + NULL); while (( !mount_point || (strlen(mount_point) < 2) ) && (i < 5)) @@ -1023,7 +1049,7 @@ mount_point = (char *) libhal_device_get_property_string(hal_ctx, udi, " volume.mount_point ", - &dbus_error); + NULL); i++; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit imap
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package imap checked in at Thu Dec 7 20:33:22 CET 2006. -------- --- imap/imap.changes 2006-02-02 11:26:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/imap/imap.changes 2006-11-16 12:06:57.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Nov 16 10:11:37 CET 2006 - mskibbe(a)suse.de + +- update to version 2006c1 which + o fix bugs + o fix bug( Bug 217287 - imap-2004g_suse-28: use of dangerous + "gets" function ) + o fix bug( Bug 144598 - imap-2004g_suse-4: dodgy code ) + +------------------------------------------------------------------- Old: ---- imap-2004g.tar.bz2 New: ---- imap-2006c1.diff imap-2006c1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imap.spec ++++++ --- /var/tmp/diff_new_pack.bPkgkf/_old 2006-12-07 20:26:35.000000000 +0100 +++ /var/tmp/diff_new_pack.bPkgkf/_new 2006-12-07 20:26:35.000000000 +0100 @@ -1,11 +1,11 @@ # -# spec file for package imap (Version 2004g_suse) +# spec file for package imap (Version 2006c1_suse) # # 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 @@ -13,12 +13,12 @@ Name: imap BuildRequires: openssl-devel pam-devel URL: http://www.washington.edu/imap/ -License: BSD +License: BSD License and BSD-like Group: Productivity/Networking/Email/Servers -Version: 2004g_suse -Release: 4 +Version: 2006c1_suse +Release: 2 Summary: IMAP4, POP2, and POP3 Mail Server -Source0: imap-2004g.tar.bz2 +Source0: imap-2006c1.tar.bz2 Source1: README.SuSE # pam config Source2: imap.pamd @@ -33,6 +33,7 @@ Patch3: imap-2004-cflags.diff Patch4: imap-2001a-overflow.diff Patch5: imap-2002c-c++.diff +Patch6: imap-2006c1.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: pam inet-daemon PreReq: bash /bin/echo /bin/mv @@ -78,13 +79,14 @@ Mark Crispin <mrc(a)cac.washington.edu> %prep -%setup -n imap-2004g +%setup -n imap-2006c1 %patch0 %patch1 %patch2 %patch3 %patch4 %patch5 +%patch6 %build export CFLAGS="$RPM_OPT_FLAGS -DDISABLE_POP_PROXY=1 -fPIC -fno-strict-aliasing -fstack-protector" @@ -103,7 +105,7 @@ install -m 644 src/imapd/imapd.8 $RPM_BUILD_ROOT/usr/share/man/man8/imapd.8 install -m 644 src/ipopd/ipopd.8 $RPM_BUILD_ROOT/usr/share/man/man8/ipopd.8 install -m 644 $RPM_SOURCE_DIR/README.SuSE $RPM_BUILD_ROOT/usr/share/doc/packages/imap/ -install -m 644 CONTENTS CPYRIGHT README docs/RELNOTES $RPM_BUILD_ROOT/usr/share/doc/packages/imap/ +install -m 644 CONTENTS README docs/RELNOTES $RPM_BUILD_ROOT/usr/share/doc/packages/imap/ install -m 644 docs/{FAQ,bugs,imaprc,md5,naming,drivers}.txt $RPM_BUILD_ROOT/usr/share/doc/packages/imap/ mkdir -p $RPM_BUILD_ROOT/%{_includedir}/imap cp src/osdep/tops-20/*.h $RPM_BUILD_ROOT/%{_includedir}/imap @@ -166,6 +168,12 @@ fi %changelog -n imap +* Thu Nov 16 2006 - mskibbe(a)suse.de +- update to version 2006c1 which + o fix bugs + o fix bug( Bug 217287 - imap-2004g_suse-28: use of dangerous + "gets" function ) + o fix bug( Bug 144598 - imap-2004g_suse-4: dodgy code ) * Thu Feb 02 2006 - ro(a)suse.de - give libc-client.so a SONAME * Wed Jan 25 2006 - mls(a)suse.de ++++++ imap-2002c-c++.diff ++++++ --- /var/tmp/diff_new_pack.bPkgkf/_old 2006-12-07 20:26:35.000000000 +0100 +++ /var/tmp/diff_new_pack.bPkgkf/_new 2006-12-07 20:26:35.000000000 +0100 @@ -1,6 +1,6 @@ --- src/c-client/c-client.h +++ src/c-client/c-client.h -@@ -23,11 +23,6 @@ +@@ -31,11 +31,6 @@ #ifdef __cplusplus /* help out people who use C++ compilers */ extern "C" { @@ -12,8 +12,8 @@ #endif #include "mail.h" /* primary interfaces */ -@@ -43,7 +38,6 @@ - #undef LOCAL /* undo driver mischief */ +@@ -47,7 +42,6 @@ + #include "misc.h" /* miscellaneous utility routines */ #ifdef __cplusplus /* undo the C++ mischief */ -#undef private @@ -22,10 +22,10 @@ --- src/c-client/mail.h +++ src/c-client/mail.h -@@ -696,7 +696,11 @@ +@@ -813,7 +813,11 @@ + unsigned int sequence : 1; /* saved sequence bit */ unsigned int dirty : 1; /* driver internal use */ unsigned int filter : 1; /* driver internal use */ - unsigned long data; /* driver internal use */ +#ifndef __cplusplus } private; +#else @@ -34,7 +34,7 @@ /* internal date */ unsigned int day : 5; /* day of month (1-31) */ unsigned int month : 4; /* month of year (1-12) */ -@@ -807,8 +811,13 @@ +@@ -924,8 +928,13 @@ SEARCHPGM { /* search program */ SEARCHSET *msgno; /* message numbers */ SEARCHSET *uid; /* unique identifiers */ @@ -48,16 +48,17 @@ SEARCHHEADER *header; /* list of headers */ STRINGLIST *bcc; /* bcc recipients */ STRINGLIST *body; /* text in message body */ -@@ -982,7 +991,12 @@ - long result; /* search result */ +@@ -1108,8 +1117,12 @@ char *text; /* cache of fetched text */ } search; + STRING string; /* stringstruct return hack */ +#ifndef __cplusplus } private; +- /* reserved for use by main program */ +#else + } cclientPrivate; +#endif -+ - /* reserved for use by main program */ ++ /* RESERVed for use by main program */ + void *sparep; /* spare pointer */ unsigned int spare : 1; /* first spare bit */ unsigned int spare2 : 1; /* second spare bit */ ++++++ imap-2004-cflags.diff ++++++ --- /var/tmp/diff_new_pack.bPkgkf/_old 2006-12-07 20:26:35.000000000 +0100 +++ /var/tmp/diff_new_pack.bPkgkf/_new 2006-12-07 20:26:35.000000000 +0100 @@ -1,11 +1,12 @@ --- src/osdep/unix/Makefile +++ src/osdep/unix/Makefile -@@ -454,7 +454,7 @@ - SPOOLDIR=/var/spool \ - ACTIVEFILE=/var/lib/news/active \ - RSHPATH=/usr/bin/rsh \ -- BASECFLAGS="-g -fno-omit-frame-pointer $(GCCOPTLEVEL)" \ -+ BASECFLAGS="${MYCFLAGS}" \ - BASELDFLAGS="$(PAMLDFLAGS)" +@@ -48,7 +48,8 @@ + # Try to have some consistency in GCC builds. We want optimization, but we + # also want to be able to debug. + +-GCCCFLAGS= -g $(GCCOPTLEVEL) -pipe -fno-omit-frame-pointer ++#GCCCFLAGS= -g $(GCCOPTLEVEL) -pipe -fno-omit-frame-pointer ++GCCCFLAGS=${MYCFLAGS} + GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-sign + - lnx: # Linux non-shadow passwords ++++++ imap-2006c1.diff ++++++ --- Makefile +++ Makefile @@ -529,7 +529,8 @@ @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @echo @echo Do you want to build with IPv6 anyway? Type y or n please: - @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make clean;exit 1);; esac' + @$(SH) -c 'read x; case "$$x" in *) exit 0;; esac' +# *) (make clean;exit 1);; esac' @echo OK, I will remember that you really want to build with IPv6. @echo You will not see this message again. @$(TOUCH) ip6 --- src/c-client/mail.c +++ src/c-client/mail.c @@ -2906,8 +2906,10 @@ /* parse time */ d = strtoul (s+1,(char **) &s,10); if (*s != ':') return NIL; - m = strtoul (++s,(char **) &s,10); - y = (*s == ':') ? strtoul (++s,(char **) &s,10) : 0; + s++; + m = strtoul (s,(char **) &s,10); + s++; + y = (*s == ':') ? strtoul (s,(char **) &s,10) : 0; /* validity check time */ if ((d > 23) || (m > 59) || (y > 60)) return NIL; /* set values in elt */ --- src/mlock/mlock.c +++ src/mlock/mlock.c @@ -38,8 +38,10 @@ #include <sys/param.h> #include <stdlib.h> #include <netdb.h> +#include <unistd.h> #include <ctype.h> #include <strings.h> +#include <string.h> #define LOCKTIMEOUT 5 /* lock timeout in minutes */ #define LOCKPROTECTION 0775 --- src/osdep/unix/mbx.c +++ src/osdep/unix/mbx.c @@ -37,6 +37,7 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> +#include <utime.h> extern int errno; /* just in case */ #include "mail.h" #include "osdep.h" --- src/osdep/unix/mh.c +++ src/osdep/unix/mh.c @@ -35,6 +35,7 @@ #include "osdep.h" #include <pwd.h> #include <time.h> +#include <utime.h> #include <sys/stat.h> #include <sys/time.h> #include "misc.h" --- src/osdep/unix/mmdf.c +++ src/osdep/unix/mmdf.c @@ -30,6 +30,7 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> +#include <utime.h> extern int errno; /* just in case */ #include <signal.h> #include "mail.h" --- src/osdep/unix/mtx.c +++ src/osdep/unix/mtx.c @@ -35,6 +35,7 @@ */ #include <stdio.h> +#include <utime.h> #include <ctype.h> #include <errno.h> extern int errno; /* just in case */ --- src/osdep/unix/mx.c +++ src/osdep/unix/mx.c @@ -35,6 +35,7 @@ #include "osdep.h" #include <pwd.h> #include <time.h> +#include <utime.h> #include <sys/stat.h> #include <sys/time.h> #include "misc.h" --- src/osdep/unix/tenex.c +++ src/osdep/unix/tenex.c @@ -41,6 +41,7 @@ #include <stdio.h> #include <ctype.h> +#include <utime.h> #include <errno.h> extern int errno; /* just in case */ #include "mail.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iputils
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package iputils checked in at Thu Dec 7 20:28:51 CET 2006. -------- --- iputils/iputils.changes 2006-11-22 11:54:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/iputils/iputils.changes 2006-11-23 17:04:33.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 23 17:04:15 CET 2006 - olh(a)suse.de + +- move ifenslave.c to the first patch to allow quilt setup *.spec + +------------------------------------------------------------------- Old: ---- ifenslave.c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iputils.spec ++++++ --- /var/tmp/diff_new_pack.8QlKRS/_old 2006-12-07 20:28:01.000000000 +0100 +++ /var/tmp/diff_new_pack.8QlKRS/_new 2006-12-07 20:28:01.000000000 +0100 @@ -13,14 +13,13 @@ Name: iputils Summary: IPv4and IPv6 Networking Utilities Version: ss021109 -Release: 187 +Release: 189 License: BSD License and BSD-like, GNU General Public License (GPL) Group: Productivity/Networking/Other Provides: nkitb Obsoletes: nkitb URL: ftp://ftp.tux.org/people/alexey-kuznetsov/ip-routing Source: iputils-%{version}-try.tar.bz2 -Source1: ifenslave.c Patch: %name-%version.diff Patch1: %name-%version-rdisc-server.patch Patch2: %name-%version-sec-traceroute6-setuid-retvalcheck.diff @@ -52,7 +51,6 @@ %prep %setup -q -n %name %patch -p1 -cp %SOURCE1 . %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -113,6 +111,8 @@ %attr(644,root,root) %_mandir/man8/* %changelog -n iputils +* Thu Nov 23 2006 - olh(a)suse.de +- move ifenslave.c to the first patch to allow quilt setup *.spec * Wed Nov 22 2006 - ms(a)suse.de - ping6: use getaddrinfo() instead of gethostbyname2 (#221745) * Fri Nov 10 2006 - ro(a)suse.de ++++++ iputils-ss021109.diff ++++++ ++++ 923 lines (skipped) ++++ between iputils/iputils-ss021109.diff ++++ and /mounts/work_src_done/STABLE/iputils/iputils-ss021109.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hylafax
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package hylafax checked in at Thu Dec 7 20:28:46 CET 2006. -------- --- hylafax/hylafax.changes 2006-08-06 23:08:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/hylafax/hylafax.changes 2006-12-07 00:36:28.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Dec 7 00:33:45 CET 2006 - kkeil(a)suse.de + +- fix FaxDispatch to take the correct parameter (#212516) + +------------------------------------------------------------------- +Tue Dec 5 17:01:27 CET 2006 - kkeil(a)suse.de + +- capi4hylafax: security fix against executing arbitrary commands + on the fax receiving system. CVE-2006-3126 (#203515) + +------------------------------------------------------------------- New: ---- capi4hylafax-secfix2.diff hylafax-4.3.0-dispatch-isdn.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hylafax.spec ++++++ --- /var/tmp/diff_new_pack.w5H5LJ/_old 2006-12-07 20:25:20.000000000 +0100 +++ /var/tmp/diff_new_pack.w5H5LJ/_new 2006-12-07 20:25:20.000000000 +0100 @@ -19,7 +19,7 @@ Conflicts: sendfax Autoreqprov: on Version: 4.3.0 -Release: 1 +Release: 25 Source: %{name}-%{version}.tar.bz2 Source1: latex-cover-1.04.tar.bz2 Source2: %{name}-SuSE.tar.bz2 @@ -31,8 +31,10 @@ Patch4: %{name}-%{version}-fax_user.dif Patch5: %{name}-%{version}-asciifix.dif Patch6: %{name}-%{version}-warning.diff +Patch7: %{name}-%{version}-dispatch-isdn.diff Patch10: capi4hylafax-suse.diff Patch11: capi4hylafax-secfix.diff +Patch12: capi4hylafax-secfix2.diff URL: http://www.hylafax.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Very Powerful Fax Server @@ -67,7 +69,7 @@ Sam Leffler <sam(a)engr.sgi.com> %package -n capi4hylafax -License: GPL +License: GNU General Public License (GPL) URL: http://www.avm.de Summary: faxcapi modem for hylafax Group: Hardware/Fax @@ -94,12 +96,14 @@ %patch4 -p1 %patch5 -p1 %patch6 +%patch7 -p1 #-b .valist # need to be executable chmod 755 SuSE/usr/lib/fax/a2pswrap cd ../capi4hylafax-01.03.00 %patch10 -p1 %patch11 -p1 +%patch12 -p1 find ../ -name .cvsignore -exec rm {} \; %build @@ -383,6 +387,11 @@ /etc/config.faxCAPI.sample %changelog -n hylafax +* Thu Dec 07 2006 - kkeil(a)suse.de +- fix FaxDispatch to take the correct parameter (#212516) +* Tue Dec 05 2006 - kkeil(a)suse.de +- capi4hylafax: security fix against executing arbitrary commands + on the fax receiving system. CVE-2006-3126 (#203515) * Thu Aug 03 2006 - kkeil(a)suse.de - update to version 4.3.0 * Fix DCS tag handling in Class2 (BUG 771) (5 May 2006) @@ -712,7 +721,7 @@ - fixed doinst.sh for installion not in running system * Fri May 30 1997 - choeger(a)suse.de - built new package because of new location of httpd/cgi-bin --> /usr/local/httpd/cgi-bin + -> /usr/local/httpd/cgi-bin * Mon May 05 1997 - choeger(a)suse.de - added latex-cover v1.03 to the binary distribution * Tue Apr 22 1997 - choeger(a)suse.de ++++++ capi4hylafax-secfix2.diff ++++++ Index: capi4hylafax-01.03.00/src/faxrecv/faxrecv.cpp =================================================================== --- capi4hylafax-01.03.00.orig/src/faxrecv/faxrecv.cpp +++ capi4hylafax-01.03.00/src/faxrecv/faxrecv.cpp @@ -331,7 +331,7 @@ void CFaxReceive::IsDisconnected (c_info } // Hylafax: <qfile> <ModemDeviceID> <CommID> <Reason> <CIDNumber> <CIDName> <destination> - executeCommand.PrintAppend (" \"%S\" \"%S\" \"%09u\" \"%s\" \"%S\" \"\" \"%S\"", + executeCommand.PrintAppend (" \"%eS\" \"%eS\" \"%09u\" \"%es\" \"%eS\" \"\" \"%eS\"", GetRecvFiles()->GetFirst(), &FaxDevice->DeviceName, jobNr, StateText, GetReceiveID(), &MyNumber); WriteXferLog ("RECV", jobNr, 0, 0, (char *)FaxDevice->DeviceName.GetPointer(), 0, @@ -361,14 +361,14 @@ void CFaxReceive::IsDisconnected (c_info } executeCommand.PrintAppend (" %u 0x%X \"", recvStatus, Reason); - executeCommand.Append (GetReceiveID()); + executeCommand.PrintAppend ("%eS", GetReceiveID()); executeCommand.Append ("\" \""); if (!MyNumber.IsEmpty()) { - executeCommand.Append (&MyNumber); + executeCommand.PrintAppend ("%eS", &MyNumber); } executeCommand.PrintAppend ("\" %u", GetPageCount()); for (COneMultiString *pLauf = GetRecvFiles()->GetFirst(); (pLauf != 0); pLauf = pLauf->GetNext()) { - executeCommand.PrintAppend (" \"%S\"", pLauf); + executeCommand.PrintAppend (" \"%eS\"", pLauf); } } Index: capi4hylafax-01.03.00/src/faxsend/faxsend.cpp =================================================================== --- capi4hylafax-01.03.00.orig/src/faxsend/faxsend.cpp +++ capi4hylafax-01.03.00/src/faxsend/faxsend.cpp @@ -572,7 +572,7 @@ void CFaxSend::IsDisconnected (c_info Re commStr.Print ("%09u", m_commID); // Hylafax: <mailaddr> <qfile> <ModemDeviceID> <CommID> <Reason> - executeCommand.PrintAppend (" \"%S\" \"%S\" \"%S\" \"%S\" \"%s\"", &PollString, + executeCommand.PrintAppend (" \"%eS\" \"%eS\" \"%eS\" \"%eS\" \"%es\"", &PollString, GetRecvFiles()->GetFirst(), &DeviceName, &commStr, StateText); } else { // mgetty: <RecvStatus> <Hangup Code> "<sender id>" "<poll text>" <nr of pages> <file(s)> @@ -591,10 +591,10 @@ void CFaxSend::IsDisconnected (c_info Re case 3: break; } - executeCommand.PrintAppend (" %u 0x%X \"%S\" \"%S\" %u", recvStatus, Reason, GetReceiveID(), + executeCommand.PrintAppend (" %u 0x%X \"%eS\" \"%eS\" %u", recvStatus, Reason, GetReceiveID(), &PollString, GetPageCount()); for (COneMultiString *pLauf = GetRecvFiles()->GetFirst(); (pLauf != 0); pLauf = pLauf->GetNext()) { - executeCommand.PrintAppend (" \"%s\"", pLauf->GetPointer()); + executeCommand.PrintAppend (" \"%es\"", pLauf->GetPointer()); } } Index: capi4hylafax-01.03.00/src/standard/CString.cpp =================================================================== --- capi4hylafax-01.03.00.orig/src/standard/CString.cpp +++ capi4hylafax-01.03.00/src/standard/CString.cpp @@ -44,6 +44,9 @@ #define PRINTFLAGS_NEAR 0x0400 // Placeholder is a NEAR-pointer #define PRINTFLAGS_QUESTION 0x0800 // Sizeof Char specified before string #define PRINTFLAGS_STRINGTYPE 0x1000 // Placeholder is a CDynamicString-Pointer +#define PRINTFLAGS_SHELLESCAPE 0x2000 // The placeholder should be filled in with + // a string suitable for passing to /bin/sh + // between double quotes. /*===========================================================================*\ \*===========================================================================*/ @@ -389,6 +392,10 @@ tSInt CDynamicString::i_vPrintAppend (tF PrtFlags |= PRINTFLAGS_SHORT; break; + case 'e': + PrtFlags |= PRINTFLAGS_SHELLESCAPE; + break; + /*----- WIDTH or PRECISION-----*/ case '0': if (PrtPreci == -2) { @@ -580,13 +587,102 @@ tSInt CDynamicString::i_vPrintAppend (tF PrtWidth = 0; } tSize endPos = curLen + copyBufLen; - if (endPos >= GetMaxSize()) { - if (DynExpand (endPos + 1) == vFalse) { + const tSize max_space_needed = endPos + ((PrtFlags & PRINTFLAGS_SHELLESCAPE) ? copyBufLen : 0); + if (max_space_needed >= GetMaxSize()) { + if (DynExpand (max_space_needed + 1) == vFalse) { RETURN ('x', CSTRING_PRINT_MemoryError); } } - dassert (endPos < GetMaxSize()); + dassert (max_space_needed < GetMaxSize()); dassert (pntr != 0); + if (PrtFlags & PRINTFLAGS_SHELLESCAPE) { + const tChar * const c_bs = (tChar*) "\\"; + const tChar * const c_0 = (tChar*) "\0"; + const tChar * const c_dq = (tChar*) "\""; + const tChar * const c_d = (tChar*) "$"; + const tChar * const c_bq = (tChar*) "`"; + const tChar * const c_qm = (tChar*) "?"; + // Note that in this case, PrtWidth refers to the string _after_ + // interpretation by /bin/sh, i.e. after the escaping is removed. + if (PrtFlags & PRINTFLAGS_STRINGTYPE) { + const tStringChar *p = (tStringChar*)copyBuf; + const tStringChar * const p_end = p + copyBufLen; + for (;p < p_end; ++p) { + if (!s_strncmp(p,c_0,1)) { + s_strncpy (pntr + curLen, c_qm, 1); + } else { + if (!(s_strncmp(p,c_dq,1) && + s_strncmp(p,c_bs,1) && + s_strncmp(p,c_d ,1) && + s_strncmp(p,c_bq,1))) { + s_strncpy (pntr + curLen, c_bs, 1); + ++curLen; + ++endPos; + } + s_strncpy (pntr + curLen, p, 1); + } + ++curLen; + } + } else if (PrtFlags & PRINTFLAGS_LARGE) { + const tUWiChar *p = (tUWiChar*)copyBuf; + const tUWiChar * const p_end = p + copyBufLen; + for (;p < p_end; ++p) { + if (!s_strncmp(p,c_0,1)) { + s_strncpy (pntr + curLen, c_qm, 1); + } else { + if (!(s_strncmp(p,c_dq,1) && + s_strncmp(p,c_bs,1) && + s_strncmp(p,c_d,1) && + s_strncmp(p,c_bq,1))) { + s_strncpy (pntr + curLen, c_bs, 1); + ++curLen; + ++endPos; + } + s_strncpy (pntr + curLen, p, 1); + } + ++curLen; + } + } else if (PrtFlags & PRINTFLAGS_SHORT) { + const tUChar *p = (tUChar*)copyBuf; + const tUChar * const p_end = p + copyBufLen; + for (;p < p_end; ++p) { + if (!s_strncmp(p,c_0,1)) { + s_strncpy (pntr + curLen, c_qm, 1); + } else { + if (!(s_strncmp(p,c_dq,1) && + s_strncmp(p,c_bs,1) && + s_strncmp(p,c_d,1) && + s_strncmp(p,c_bq,1))) { + s_strncpy (pntr + curLen, c_bs, 1); + ++curLen; + ++endPos; + } + s_strncpy (pntr + curLen, p, 1); + } + ++curLen; + } + } else { + dassert((sizeof tChar)== (sizeof tFormatChar)); + const tChar *p = (tChar*)copyBuf; + const tChar * const p_end = p + copyBufLen; + for (;p < p_end; ++p) { + if (!s_strncmp(p,c_0,1)) { + s_strncpy (pntr + curLen, c_qm, 1); + } else { + if (!(s_strncmp(p,c_dq,1) && + s_strncmp(p,c_bs,1) && + s_strncmp(p,c_d,1) && + s_strncmp(p,c_bq,1))) { + s_strncpy (pntr + curLen, c_bs, 1); + ++curLen; + ++endPos; + } + s_strncpy (pntr + curLen, p, 1); + } + ++curLen; + } + } + } else { if (PrtFlags & PRINTFLAGS_STRINGTYPE) { s_strncpy (pntr + curLen, (tStringChar *)copyBuf, copyBufLen); } else if (PrtFlags & PRINTFLAGS_LARGE) { @@ -596,6 +692,7 @@ tSInt CDynamicString::i_vPrintAppend (tF } else { s_strncpy (pntr + curLen, copyBuf, copyBufLen); } + } pntr[endPos] = '\0'; curLen = endPos; if ((PrtWidth > copyBufLen) && (FillAppend (' ', PrtWidth - copyBufLen) == vFalse)) { Index: capi4hylafax-01.03.00/src/standard/aTypes.h =================================================================== --- capi4hylafax-01.03.00.orig/src/standard/aTypes.h +++ capi4hylafax-01.03.00/src/standard/aTypes.h @@ -29,6 +29,7 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ +#include <limits.h> // should give __WORDSIZE #include <wchar.h> #if defined HAVE_STDINT_H && HAVE_STDINT_H > 0 ++++++ hylafax-4.3.0-dispatch-isdn.diff ++++++ Index: hylafax-4.3.0/util/FaxDispatch.sh =================================================================== --- hylafax-4.3.0.orig/util/FaxDispatch.sh +++ hylafax-4.3.0/util/FaxDispatch.sh @@ -2,8 +2,8 @@ # Dispatch fax to email depending on own MSN or extention (ISDN lines) # sourced from faxrcvd # -if [ "$7" != "" ]; then - PHONEMATCH=$7\$ +if [ "$CALLID3" != "" ]; then + PHONEMATCH=$CALLID3\$ USERENTRY=`grep -v "^#" etc/users | grep "$PHONEMATCH"` if [ "$USERENTRY" != "" ]; then USERNAME=`echo $USERENTRY | awk '{print $1}'` ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iprutils
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package iprutils checked in at Thu Dec 7 20:27:57 CET 2006. -------- --- iprutils/iprutils.changes 2006-11-15 11:33:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/iprutils/iprutils.changes 2006-12-07 14:19:11.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 7 14:18:46 CET 2006 - olh(a)suse.de + +- fix comparison with string literal warning (226402) + +------------------------------------------------------------------- New: ---- iprutils.stringliteral.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iprutils.spec ++++++ --- /var/tmp/diff_new_pack.M0W4Ob/_old 2006-12-07 20:27:21.000000000 +0100 +++ /var/tmp/diff_new_pack.M0W4Ob/_new 2006-12-07 20:27:21.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: pciutils-devel sysfsutils Summary: Utilities for the IBM Power Linux RAID Adapters Version: 2.2.3 -Release: 1 +Release: 5 License: Other uncritical OpenSource License, Other License(s), see package URL: http://sourceforge.net/projects/iprdd/ Group: Hardware/Other @@ -24,6 +24,7 @@ Source0: iprutils-%{version}-src.tgz Patch0: iprconfig.usr-sbin.patch Patch1: iprutils.install-man.patch +Patch2: iprutils.stringliteral.patch %description Provides a suite of utilities to manage and configure SCSI devices @@ -39,6 +40,7 @@ %setup -q -n iprutils %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS \$(IPR_DEFINES)" @@ -75,6 +77,8 @@ %attr(755,root,root) /etc/init.d/* %changelog -n iprutils +* Thu Dec 07 2006 - olh(a)suse.de +- fix comparison with string literal warning (226402) * Wed Nov 15 2006 - olh(a)suse.de - update to version 2.2.3 (218770 - LTC28528 - FATE301562) Fix SAS disk hotplug dual path bug. ++++++ iprutils.stringliteral.patch ++++++ --- iprconfig.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: iprutils/iprconfig.c =================================================================== --- iprutils.orig/iprconfig.c +++ iprutils/iprconfig.c @@ -744,12 +744,12 @@ static struct screen_output *screen_driv for (i = 0; i < screen->num_opts; i++) { temp = &(screen->options[i]); - if ((temp->key == "\n") || + if ((temp->key[0] == '\n') || ((num_fields > 0)?(strcasecmp(input,temp->key) == 0):0)) { invalid = false; - if ((temp->key == "\n") && (num_fields > 0)) { + if ((temp->key[0] == '\n') && (num_fields > 0)) { /* store field data to existing i_con (which should already contain pointers) */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ipmitool
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package ipmitool checked in at Thu Dec 7 20:27:16 CET 2006. -------- --- ipmitool/ipmitool.changes 2006-10-10 15:53:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/ipmitool/ipmitool.changes 2006-10-13 15:08:15.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 13 15:07:13 CEST 2006 - duwe(a)suse.de + +- update to today's CVS state + * might fix SoL issues (Fate #30911) + +------------------------------------------------------------------- Old: ---- ipmitool-1.8.8-compile-fixes New: ---- ipmitool-CVS-2006-10-13.patch ipmitool-cvs-compile-fixes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipmitool.spec ++++++ --- /var/tmp/diff_new_pack.Q1wk8g/_old 2006-12-07 20:26:23.000000000 +0100 +++ /var/tmp/diff_new_pack.Q1wk8g/_new 2006-12-07 20:26:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package ipmitool (Version 1.8.8) +# spec file for package ipmitool (Version 1.8.8cvs20061013) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,12 +14,13 @@ BuildRequires: openssl-devel readline-devel URL: http://ipmitool.sourceforge.net/ Summary: Utility for IPMI Control -Version: 1.8.8 -Release: 1 -License: BSD +Version: 1.8.8cvs20061013 +Release: 2 +License: BSD License and BSD-like Group: System/Management -Source: ipmitool-%{version}.tar.gz -Patch: ipmitool-%{version}-compile-fixes +Source: ipmitool-1.8.8.tar.gz +Patch: ipmitool-CVS-2006-10-13.patch +Patch2: ipmitool-cvs-compile-fixes BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -41,8 +42,9 @@ %prep -%setup +%setup -n %{name}-1.8.8 %patch -p1 +%patch2 -p1 %build CFLAGS="$RPM_OPT_FLAGS" ./configure \ @@ -74,6 +76,9 @@ %doc %{_mandir}/man8/* %changelog -n ipmitool +* Fri Oct 13 2006 - duwe(a)suse.de +- update to today's CVS state + * might fix SoL issues (Fate #30911) * Tue Oct 10 2006 - duwe(a)suse.de - update to 1.8.8 mainly various fixes: version 1.8.8 @@ -110,17 +115,17 @@ - Fix byte swapping. * Mon Feb 13 2006 - kukuk(a)suse.de - Update to ipmitool 1.8.6 [#134708,#131823] -- Fix memory corruption when sending encrypted SOL traffic -- Add keepalive timer to IPMIv2 SOL sessions -- Raise privilege level after creating IPMIv2 session -- Add support for settable SOL escape character with -e option -- Add support for Kg BMC key for IPMIv2 authentication with -k option -- Add support for Tyan IPMIv1.5 SOL with tsol command -- Add support for PICMG devices -- Add support for OEM SEL event parsing -- Add support for command bridging over lan and lanplus interfaces -- New 'chassis selftest' command -- Many bufxies and patches from contributors + - Fix memory corruption when sending encrypted SOL traffic + - Add keepalive timer to IPMIv2 SOL sessions + - Raise privilege level after creating IPMIv2 session + - Add support for settable SOL escape character with -e option + - Add support for Kg BMC key for IPMIv2 authentication with -k option + - Add support for Tyan IPMIv1.5 SOL with tsol command + - Add support for PICMG devices + - Add support for OEM SEL event parsing + - Add support for command bridging over lan and lanplus interfaces + - New 'chassis selftest' command + - Many bufxies and patches from contributors * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Jan 20 2006 - schwab(a)suse.de ++++++ ipmitool-CVS-2006-10-13.patch ++++++ ++++ 7201 lines (skipped) ++++++ ipmitool-cvs-compile-fixes ++++++ diff -Burbp ipmitool-1.8.8.orig/lib/ipmi_fwum.c ipmitool-1.8.8/lib/ipmi_fwum.c --- ipmitool-1.8.8.orig/lib/ipmi_fwum.c 2006-05-03 15:34:59.000000000 +0200 +++ ipmitool-1.8.8/lib/ipmi_fwum.c 2006-10-10 14:07:24.000000000 +0200 @@ -1488,5 +1488,5 @@ tKFWUM_Status KfwumOutputInfo(tKFWUM_Boa printf("File Size : %u bytes\n",firmInfo.fileSize); printf("Firmware Version : %d.%d%d SDR %d\n",firmInfo.versMajor, firmInfo.versMinor, firmInfo.versSubMinor, firmInfo.sdrRev); - + return KFWUM_STATUS_OK; } --- ipmitool-1.8.8.orig/lib/ipmi_sdr.c 2006-05-12 16:07:31.000000000 +0200 +++ ipmitool-1.8.8/lib/ipmi_sdr.c 2006-10-10 16:02:35.000000000 +0200 @@ -3843,7 +3843,6 @@ ipmi_sdr_dump_bin(struct ipmi_intf *intf itr = ipmi_sdr_start(intf); if (itr == NULL) { lprintf(LOG_ERR, "Unable to open SDR for reading"); - fclose(fp); return -1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0