June 2007 - openSUSE Commits - openSUSE Mailing Lists

commit kdeedu4
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package kdeedu4 checked in at Sun Jun 24 11:56:27 CEST 2007. -------- --- KDE/kdeedu4/kdeedu4.changes 2007-06-08 09:52:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdeedu4/kdeedu4.changes 2007-06-23 10:27:50.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Jun 23 10:27:47 CEST 2007 - stbinner(a)suse.de + +- update to 3.90.1.svn678988 + +------------------------------------------------------------------- +Wed Jun 13 18:22:14 CEST 2007 - dmueller(a)suse.de + +- update buildrequires (ocaml-facile) + +------------------------------------------------------------------- Old: ---- marble-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeedu4.spec ++++++ --- /var/tmp/diff_new_pack.mv2676/_old 2007-06-24 11:56:07.000000000 +0200 +++ /var/tmp/diff_new_pack.mv2676/_new 2007-06-24 11:56:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeedu4 (Version 3.90.1.svn672300) +# spec file for package kdeedu4 (Version 3.90.1.svn678988) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,8 +11,8 @@ Name: kdeedu4 BuildRequires: boost-devel freeglut-devel libeigen libkde4-devel ocaml -%if 0%{?opensuse_bs} -BuildRequires: facile openbabel +%if 0%{?kde_kde4} +BuildRequires: ocaml-facile openbabel %endif %ifarch %ix86 BuildRequires: sbig @@ -24,14 +24,13 @@ Group: System/GUI/KDE Summary: General Data for KDE Education Applications URL: http://edu.kde.org -Version: 3.90.1.svn672300 +Version: 3.90.1.svn678988 Release: 1 Source0: kdeedu.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdebase4-runtime libkdeedu4 Patch: desktop-files.diff -Patch1: marble-fix.diff Suggests: libkdeedu4 Suggests: kde4-blinken Suggests: kde4-kalzium @@ -66,7 +65,6 @@ %prep %setup -q -n kdeedu %patch -%patch1 %build %cmake_kde4 -d build @@ -89,9 +87,9 @@ %suse_update_desktop_file kpercentage Education Math %suse_update_desktop_file kalzium Education Chemistry %suse_update_desktop_file kstars Education Astronomy - %suse_update_desktop_file ktouch Education Teaching - %suse_update_desktop_file blinken Education Teaching - %suse_update_desktop_file kgeography Education Teaching + %suse_update_desktop_file ktouch Education X-KDE-Edu-Teaching + %suse_update_desktop_file blinken Education X-KDE-Edu-Teaching + %suse_update_desktop_file kgeography Education X-KDE-Edu-Teaching %suse_update_desktop_file kanagram Education Languages %kde_post_install %if %suse_version > 1020 @@ -132,7 +130,7 @@ /usr/%_lib/libkdeeduui.so.* /usr/%_lib/libextdate.so.* /usr/%_lib/libscience.so.* -%if 0%{?opensuse_bs} +%if 0%{?kde_kde4} /usr/%_lib/libcompoundviewer.so.* %endif %package -n libkdeedu4-devel @@ -156,7 +154,7 @@ %doc COPYING COPYING-DOCS README /usr/include/libkdeedu /usr/%_lib/kde4/plugins/designer/kdeeduwidgets.so -%if 0%{?opensuse_bs} +%if 0%{?kde_kde4} /usr/%_lib/libcompoundviewer.so %endif /usr/%_lib/libextdate.so @@ -196,7 +194,7 @@ %doc %lang(en) /usr/share/doc/HTML/en/blinken /usr/share/icons/hicolor/*/apps/blinken.* %package -n kde4-marble -Group: Amusements/Toys/Graphics +Group: Amusements/Teaching/Other Summary: A generic map viewer Requires: kdebase4-runtime @@ -226,7 +224,7 @@ %_kde_share_dir/apps/marble %doc %lang(en) /usr/share/doc/HTML/en/marble %package -n kde4-marble-devel -Group: Amusements/Toys/Graphics +Group: Amusements/Teaching/Other Summary: A generic map viewer: Build Environment Requires: kde4-marble @@ -249,7 +247,7 @@ %package -n kde4-kalzium Group: Productivity/Scientific/Chemistry Summary: Periodic Table of Elements -%if 0%{?opensuse_bs} +%if 0%{?kde_kde4} Requires: facile %endif Requires: kdebase4-runtime kdeedu4 @@ -276,7 +274,7 @@ /usr/bin/kalzium /usr/share/applications/kde4/kalzium.desktop %config %_kde_config_dir/kalzium.knsrc -%if 0%{?opensuse_bs} +%if 0%{?kde_kde4} /usr/%_lib/kde4/plugins/designer/kalziumuiwidgets.so %endif @@ -285,13 +283,13 @@ %_kde_share_dir/config.kcfg/kalzium.kcfg %doc %lang(en) /usr/share/doc/HTML/en/kalzium /usr/share/icons/hicolor/*/apps/kalzium.* -%if 0%{?opensuse_bs} +%if 0%{?kde_kde4} %_libdir/avogadro-kalzium /usr/%_lib/libavogadro-kalzium.so /usr/%_lib/libavogadro-kalzium.so.* %endif %package -n kde4-kanagram -Group: Amusements/Games/Other +Group: Amusements/Teaching/Language Summary: Anagram Game Requires: kdebase4-runtime kdeedu4 @@ -324,7 +322,7 @@ /usr/share/icons/hicolor/*/apps/kanagram.* %config %_kde_config_dir/kanagram.knsrc %package -n kde4-kbruch -Group: Amusements/Games/Other +Group: Amusements/Teaching/Mathematics Summary: Excercise Fractions Requires: kdebase4-runtime @@ -387,7 +385,7 @@ /usr/share/applications/kde4/kalgebra.desktop %doc %lang(en) /usr/share/doc/HTML/en/kalgebra %package -n kde4-kgeography -Group: Amusements/Games/Other +Group: Amusements/Teaching/Other Summary: Geography Trainer Requires: kdebase4-runtime @@ -420,7 +418,7 @@ /usr/share/icons/crystalsvg/*/apps/kgeography.* /usr/share/icons/hicolor/*/apps/kgeography.* %package -n kde4-khangman -Group: Amusements/Games/Other +Group: Amusements/Teaching/Language Summary: Hangman Game Requires: kdebase4-runtime kdeedu4 @@ -492,7 +490,7 @@ %_kde_share_dir/services/kig_part.desktop %package -n kde4-kiten -Group: Productivity/Other +Group: Amusements/Teaching/Language Summary: Japanese Reference/Study Tool Requires: kdebase4-runtime @@ -530,7 +528,7 @@ %_kde_share_dir/apps/kitenradselect %package -n kde4-klettres -Group: Amusements/Games/Other +Group: Amusements/Teaching/Language Summary: Alphabet Learning Game Requires: kdebase4-runtime @@ -603,7 +601,7 @@ %_kde_share_dir/services/kmplot_part.desktop %package -n kde4-kpercentage -Group: Amusements/Games/Other +Group: Amusements/Teaching/Mathematics Summary: Exercise Percentages Requires: kdebase4-runtime @@ -683,7 +681,7 @@ /usr/%_lib/libsbigudrv.* %endif %package -n kde4-ktouch -Group: Amusements/Games/Other +Group: Amusements/Teaching/Other Summary: Touch Typing Tutor Requires: kdebase4-runtime @@ -715,7 +713,7 @@ %doc %lang(en) /usr/share/doc/HTML/en/ktouch /usr/share/icons/hicolor/*/apps/ktouch.* %package -n kde4-kturtle -Group: Amusements/Games/Other +Group: Amusements/Teaching/Mathematics Summary: Logo Programming Environment Requires: kdebase4-runtime @@ -743,7 +741,7 @@ %doc %lang(en) /usr/share/doc/HTML/en/kturtle /usr/share/icons/hicolor/*/apps/kturtle.* %package -n kde4-kvoctrain -Group: System/GUI/KDE +Group: Amusements/Teaching/Language Summary: Vocabulary Trainer Requires: kdebase4-runtime kdeedu4 @@ -780,7 +778,7 @@ %_kde_share_dir/config.kcfg/presettings.kcfg %config %_kde_config_dir/kvoctrain.knsrc %package -n kde4-kwordquiz -Group: Productivity/Other +Group: Amusements/Teaching/Language Summary: Vocabulary Trainer Requires: kdebase4-runtime kdeedu4 @@ -820,6 +818,10 @@ %_kde_share_dir/apps/libkdeedu %changelog +* Sat Jun 23 2007 - stbinner(a)suse.de +- update to 3.90.1.svn678988 +* Wed Jun 13 2007 - dmueller(a)suse.de +- update buildrequires (ocaml-facile) * Fri Jun 08 2007 - stbinner(a)suse.de - update to 3.90.1.svn670254 * Mon Jun 04 2007 - stbinner(a)suse.de ++++++ desktop-files.diff ++++++ --- /var/tmp/diff_new_pack.mv2676/_old 2007-06-24 11:56:07.000000000 +0200 +++ /var/tmp/diff_new_pack.mv2676/_new 2007-06-24 11:56:07.000000000 +0200 @@ -36,23 +36,23 @@ DocPath=kvoctrain/index.html Type=Application Terminal=false ---- marble/src/marble.desktop 2007/06/04 13:22:52 1.1 -+++ marble/src/marble.desktop 2007/06/04 13:25:48 -@@ -4,6 +4,5 @@ - Exec=marble - Name=Marble - GenericName=Desktop Globe --Icon=marble - Terminal=false --Categories=Qt;KDE;Utility;X-KDE-More;Education;Science; -+Categories=Qt;KDE;Education;Science;Astronomy; --- ./kalgebra/src/kalgebra.desktop 2007/06/07 09:34:19 1.1 +++ ./kalgebra/src/kalgebra.desktop 2007/06/07 09:34:24 @@ -5,7 +5,6 @@ Comment=Math Expression Solver and Plotter Exec=kalgebra - MimeType=application/x-kalgebra + MimeType=application/x-kalgebra; -Icon=kalgebra Type=Application DocPath=kalgebra/index.html Terminal=false +--- marble/src/marble.desktop 2007/06/21 13:18:36 1.1 ++++ marble/src/marble.desktop 2007/06/21 13:18:48 +@@ -5,6 +5,5 @@ + Name=Marble + GenericName=Desktop Globe + GenericName[es]=Planetario para el escritorio +-Icon=marble + Terminal=false +-Categories=Qt;KDE;Utility;X-KDE-More;Education;Science; ++Categories=Qt;KDE;Education;Science;Astronomy; ++++++ kdeedu.tar.bz2 ++++++ KDE/kdeedu4/kdeedu.tar.bz2 /mounts/work_src_done/STABLE/kdeedu4/kdeedu.tar.bz2 differ: byte 11, line 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 wine
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package wine checked in at Sun Jun 24 11:55:53 CEST 2007. -------- --- arch/i386/wine/wine.changes 2007-06-15 18:54:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/wine/wine.changes 2007-06-23 13:45:17.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jun 23 13:44:57 CEST 2007 - meissner(a)suse.de + +- run fdupes, fixup desktop file to be more compliant. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.w31926/_old 2007-06-24 11:55:10.000000000 +0200 +++ /var/tmp/diff_new_pack.w31926/_new 2007-06-24 11:55:10.000000000 +0200 @@ -11,12 +11,12 @@ # norootforbuild Name: wine -BuildRequires: alsa-devel audiofile bison capi4linux cups-devel desktop-file-utils flex fontforge freeglut-devel freetype2-devel giflib-devel hal-devel jack-devel libgphoto2-devel libicu-devel liblcms-devel libpng-devel libtiff-devel libxslt-devel ncurses-devel openldap2-devel prelink update-desktop-files +BuildRequires: alsa-devel audiofile bison capi4linux cups-devel desktop-file-utils fdupes flex fontforge freeglut-devel freetype2-devel giflib-devel hal-devel jack-devel libgphoto2-devel libicu-devel liblcms-devel libpng-devel libtiff-devel libxslt-devel ncurses-devel openldap2-devel prelink update-desktop-files License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Emulators/PC Autoreqprov: on Version: 0.9.39 -Release: 1 +Release: 2 Summary: An MS Windows Emulator URL: http://www.winehq.com Source0: wine-%version.tar.bz2 @@ -84,6 +84,8 @@ install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/applications/ install -m 0755 %SOURCE1 $RPM_BUILD_ROOT/usr/bin/ +%fdupes -s $RPM_BUILD_ROOT + %clean rm -rf $RPM_BUILD_ROOT @@ -113,6 +115,8 @@ /usr/share/aclocal/wine.m4 %changelog +* Sat Jun 23 2007 - meissner(a)suse.de +- run fdupes, fixup desktop file to be more compliant. * Fri Jun 15 2007 - meissner(a)suse.de - Upgraded to upstream 0.9.39: - Many MSHTML improvements. ++++++ wine.desktop ++++++ --- arch/i386/wine/wine.desktop 2007-05-07 13:24:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/wine/wine.desktop 2007-06-23 11:57:47.000000000 +0200 @@ -58,6 +58,6 @@ GenericName[zu]=Sebenzisa izinhlelo zemisebenzi zama-WIndow Icon=wine Type=Application -MimeType=application/x-msdos-program +MimeType=application/x-msdos-program; Encoding=UTF-8 X-KDE-StartupNotify=false ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-server
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package xorg-x11-server checked in at Sun Jun 24 11:55:04 CEST 2007. -------- --- xorg-x11-server/xorg-x11-server.changes 2007-06-21 16:13:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2007-06-23 04:56:48.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jun 23 04:56:28 CEST 2007 - sndirsch(a)suse.de + +- updated Mesa source to final release 7.0 + +------------------------------------------------------------------- Old: ---- MesaLib-7.0-rc1.tar.gz New: ---- MesaLib-7.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.G29109/_old 2007-06-24 11:54:32.000000000 +0200 +++ /var/tmp/diff_new_pack.G29109/_new 2007-06-24 11:54:32.000000000 +0200 @@ -21,7 +21,7 @@ URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.2 -Release: 98 +Release: 99 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -35,7 +35,7 @@ Obsoletes: xorg-x11-server-glx Summary: X.Org Server Source: xorg-server-%{dirsuffix}.tar.bz2 -Source1: MesaLib-7.0-rc1.tar.gz +Source1: MesaLib-7.0.tar.bz2 Source3: README.updates Source4: xorgcfg.tar.bz2 %if %suse_version > 1010 @@ -527,6 +527,8 @@ %endif %changelog +* Sat Jun 23 2007 - sndirsch(a)suse.de +- updated Mesa source to final release 7.0 * Thu Jun 21 2007 - sndirsch(a)suse.de - updated Mesa source to release 7.0 RC1 * Mesa 7.0 is a stable, follow-on release to Mesa 6.5.3. The only ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 udev
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package udev checked in at Sun Jun 24 11:55:02 CEST 2007. -------- --- udev/udev.changes 2007-06-04 14:20:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/udev/udev.changes 2007-06-23 18:55:06.885419000 +0200 @@ -1,0 +2,9 @@ +Sat Jun 23 17:46:58 CEST 2007 - kay.sievers(a)suse.de + +- new upstream relase 113 + distinguish more reliably between partitions and disk in persistent rules + atomically replace existing files (prepare for handling /dev/mapper/) + udevd: do not use syslog for --verbose +- add volume_id version dependency + +------------------------------------------------------------------- Old: ---- udev-112.tar.bz2 New: ---- udev-113.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ --- /var/tmp/diff_new_pack.w27393/_old 2007-06-24 11:54:18.000000000 +0200 +++ /var/tmp/diff_new_pack.w27393/_new 2007-06-24 11:54:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package udev (Version 112) +# spec file for package udev (Version 113) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,13 @@ Name: udev URL: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ -Version: 112 +Version: 113 Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Summary: A Rule-Based Device Node and Kernel Event Manager PreReq: /bin/pidof /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq +Requires: libvolume_id = %{version}-%{release} Provides: hotplug Obsoletes: hotplug BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -245,6 +246,12 @@ /%{_lib}/libvolume_id.so.* %changelog +* Sat Jun 23 2007 - kay.sievers(a)suse.de +- new upstream relase 113 + distinguish more reliably between partitions and disk in persistent rules + atomically replace existing files (prepare for handling /dev/mapper/) + udevd: do not use syslog for --verbose +- add volume_id version dependency * Mon Jun 04 2007 - kay.sievers(a)suse.de - new upstream relase 112 - changes for integration of libvolume_id into util-linux ++++++ udev-112.tar.bz2 -> udev-113.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/ChangeLog new/udev-113/ChangeLog --- old/udev-112/ChangeLog 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/ChangeLog 2007-06-23 17:44:48.000000000 +0200 @@ -1,3 +1,84 @@ +Summary of changes from v112 to v113 +============================================ + +David Zeuthen (1): + vol_id: do not fail if unable to drop privileges + +Kay Sievers (12): + add missing ChangeLog + make ATTR{[$SUBSYSTEM/$KERNEL]<attr>}="<value>" working + rules: recognize partitions and disk devices properly + rules: SUSE update + atomically replace existing nodes and symlinks + do not try to create existing file + info() for ignore_remove + rules: SUSE update + Makefile: check for missing ChangeLog or RELEASE-NOTES at release + allow to disable the replacement of unusual characters + no newline in log messages + udevd: do not use syslog if --verbose (debugging) is used + +Tobias Klauser (1): + fix typo in udev_utils_run.c + + +Summary of changes from v111 to v112 +============================================ + +Fabio Massimo Di Nitto (1): + rules: ignore partitons that span the entire disk + +Hannes Reinecke (1): + cciss device support + +Kay Sievers (34): + udevd: close /proc/meminfo after reading + create_floppy_devices: remove dead "unlink" code + volume_id: add function documentation + udev_db: escape path names with \x00 instead of %00 + udevsettle: use long options + replace_chars: replace spaces in node name + volume_id: add and export string encoding function + vol_id: export encoded strings + rules: use encoded strings instead of skipping characters + udevtest: print message before log output + volume_id: escape % character + replace_chars: replace % character + IMPORT: do not mangle whitespace + scsi_id: do not install symlink in /sbin + rules: SUSE update + volume_id: terminate overlong label strings + scsi_id: add long options + rules: use long options for scsi_id + path_id: skip subsystem directory + rules: fix cciss rule + rules: SUSE update + scsi_id: fix typo in help text + fix "do not access parent" warning for ATTR{} + sysfs: add device lookup by $SUBSYSYTEM:$KERNEL + events for "bus" and "class" registration must be matched as "subsystem" + udevtest: add --subsystem option + sysfs: change order of subsystem lookup + add $sys substitution + add TEST=="<file>" key + add "[$SUBSYSTEM/$KERNEL]<attribute>" lookup + sysfs: handle bus/class top-level directories + sysfs: skip unknown sysfs directories + rules: SUSE update + release 112 + +Miklos Vajna (2): + create_floppy_devices: add man page + path_id: remove on make uninstall + +Ryan Lortie (1): + volume_id: support for long-filename based labels + +Scott James Remnant (2): + replace_untrusted_chars: replace all whitespace with space + run_program: log "info" not "error" if program is missing + + Summary of changes from v110 to v111 ============================================ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/etc/udev/rules.d/60-persistent-storage.rules new/udev-113/etc/udev/rules.d/60-persistent-storage.rules --- old/udev-112/etc/udev/rules.d/60-persistent-storage.rules 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/etc/udev/rules.d/60-persistent-storage.rules 2007-06-23 17:44:48.000000000 +0200 @@ -3,12 +3,10 @@ ACTION!="add", GOTO="persistent_storage_end" -KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode" -KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst" +KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst" # type 8 devices are "Medium Changers" -KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode" -KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}" +KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}" SUBSYSTEM!="block", GOTO="persistent_storage_end" @@ -20,46 +18,52 @@ KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end" # ignore partitions that span the entire disk -ATTR{whole_disk}=="", GOTO="persistent_storage_end" +ATTR{whole_disk}=="*", GOTO="persistent_storage_end" + +# /sys/class/block will export this +ENV{DEVTYPE}!="?*", ATTR{range}=="?*", ENV{DEVTYPE}="disk" +ENV{DEVTYPE}!="?*", ATTR{start}=="?*", ENV{DEVTYPE}="partition" # for partitions import parent information -KERNEL=="*[0-9]", IMPORT{parent}="ID_*" +ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*" # by-id (hardware serial number) KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}" -KERNEL=="hd*[0-9]", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n" +KERNEL=="hd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n" KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="?*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394" -KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="usb_id --export" -KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode" -KERNEL=="cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id --export --whitelisted --ignore-sysfs -s %p -d $tempnode", ENV{ID_BUS}="cciss" +KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}!="?*", IMPORT{program}="usb_id --export %p" +KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode" +KERNEL=="cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted --ignore-sysfs -s %p -d $tempnode", ENV{ID_BUS}="cciss" KERNEL=="sd*[!0-9]|sr*|cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}" KERNEL=="sd*[0-9]|cciss*p[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n" +KERNEL=="st*", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}" # libata compat (links like hd*) -KERNEL=="sd*[!0-9]|sr*", ENV{ID_VENDOR}=="ATA", PROGRAM="ata_id $tempnode", ENV{ID_ATA_COMPAT}="$result" -KERNEL=="sd*[!0-9]|sr*", ENV{ID_ATA_COMPAT}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_ATA_COMPAT}" +KERNEL=="sd*[!0-9]|sr*", ENV{ID_VENDOR}=="ATA", PROGRAM="ata_id $tempnode", RESULT=="?*", ENV{ID_ATA_COMPAT}="$result", SYMLINK+="disk/by-id/ata-$env{ID_ATA_COMPAT}" KERNEL=="sd*[0-9]", ENV{ID_ATA_COMPAT}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_ATA_COMPAT}-part%n" -KERNEL=="mmcblk[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}" -KERNEL=="mmcblk[0-9]p[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}-part%n" +KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ATTRS{name}=="?*", ATTRS{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}" +KERNEL=="mmcblk[0-9]p[0-9]", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}-part%n" # by-path (shortest physical path) -KERNEL=="*[!0-9]|sr*|cciss?c[0-9]d[0-9]", IMPORT{program}="path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}" -KERNEL=="*[0-9]|cciss*p[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n" -KERNEL=="st*", IMPORT{program}="path_id %p", SYMLINK+="tape/by-path/$env{ID_PATH}" +ENV{DEVTYPE}=="disk", IMPORT{program}="path_id %p" +ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}" +ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n" +KERNEL=="st*", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}" + KERNEL=="sr*|st*", GOTO="persistent_storage_end" +KERNEL=="hd*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end" # by-label/by-uuid (filesystem properties) -KERNEL=="*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end" IMPORT{program}="vol_id --export $tempnode" ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" # BIOS Enhanced Disk Device -KERNEL=="*[!0-9]", IMPORT{program}="edd_id --export $tempnode" -KERNEL=="*[!0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}" -KERNEL=="*[0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n" +ENV{DEVTYPE}=="disk", IMPORT{program}="edd_id --export $tempnode" +ENV{DEVTYPE}=="disk", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}" +ENV{DEVTYPE}=="partition", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n" LABEL="persistent_storage_end" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/etc/udev/suse/50-udev-default.rules new/udev-113/etc/udev/suse/50-udev-default.rules --- old/udev-112/etc/udev/suse/50-udev-default.rules 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/etc/udev/suse/50-udev-default.rules 2007-06-23 17:44:48.000000000 +0200 @@ -13,6 +13,7 @@ KERNEL=="mwave", NAME="modems/%k", GROUP="uucp" KERNEL=="ttyUSB*", ATTRS{product}=="[Pp]alm*Handheld*", SYMLINK+="pilot" KERNEL=="ttyUSB*", ATTRS{product}=="[Hh]andspring*Treo*|[Hh]andspring*Visor*", SYMLINK+="pilot" +KERNEL=="ppp", MODE="0600", OPTIONS+="ignore_remove" # video/graphics SUBSYSTEM=="video4linux", GROUP="video" @@ -55,7 +56,7 @@ KERNEL=="sxctl", NAME="specialix_sxctl", SYMLINK+="%k" # network -KERNEL=="tun", NAME="net/%k", MODE="0666" +KERNEL=="tun", NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove" # misc devices KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/etc/udev/suse/64-device-mapper.rules new/udev-113/etc/udev/suse/64-device-mapper.rules --- old/udev-112/etc/udev/suse/64-device-mapper.rules 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/etc/udev/suse/64-device-mapper.rules 2007-06-23 17:44:48.000000000 +0200 @@ -9,10 +9,12 @@ SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}" ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}" -ENV{DM_STATE}!="ACTIVE", GOTO="device_mapper_end" +ENV{DM_STATE}=="SUSPENDED", GOTO="device_mapper_end" ENV{DM_TARGET_TYPES}=="|*error*", GOTO="device_mapper_end" + IMPORT{program}="vol_id --export $tempnode" OPTIONS="link_priority=-100" +ENV{DM_TARGET_TYPES}=="*snapshot-origin*", OPTIONS="link_priority=-90" ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/extras/volume_id/vol_id.c new/udev-113/extras/volume_id/vol_id.c --- old/udev-112/extras/volume_id/vol_id.c 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/extras/volume_id/vol_id.c 2007-06-23 17:44:48.000000000 +0200 @@ -154,7 +154,6 @@ int skip_raid = 0; int probe_all = 0; const char *node; - struct passwd *pw; int fd; const char *label, *uuid, *type, *type_version, *usage; int retval; @@ -237,16 +236,15 @@ dbg("BLKGETSIZE64=%llu", (unsigned long long)size); /* try to drop all privileges before reading disk content */ - pw = getpwnam ("nobody"); - if (pw != NULL && pw->pw_uid > 0 && pw->pw_gid > 0) { - dbg("dropping privileges to %u:%u", - (unsigned int)pw->pw_uid, (unsigned int)pw->pw_gid); - if (setgroups(0, NULL) != 0 || - setgid(pw->pw_gid) != 0 || - setuid(pw->pw_uid) != 0) { - fprintf(stderr, "error dropping privileges: %s\n", strerror(errno)); - rc = 3; - goto exit; + if (getuid() == 0) { + struct passwd *pw; + + pw = getpwnam("nobody"); + if (pw != NULL && pw->pw_uid > 0 && pw->pw_gid > 0) { + if (setgroups(0, NULL) != 0 || + setgid(pw->pw_gid) != 0 || + setuid(pw->pw_uid) != 0) + info("unable to drop privileges: %s\n", strerror(errno)); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/Makefile new/udev-113/Makefile --- old/udev-112/Makefile 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/Makefile 2007-06-23 17:44:48.000000000 +0200 @@ -16,7 +16,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -VERSION = 112 +VERSION = 113 # set this to make use of syslog USE_LOG = true @@ -225,11 +225,6 @@ done; .PHONY: clean -release: - git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | gzip -9v > udev-$(VERSION).tar.gz - git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | bzip2 -9v > udev-$(VERSION).tar.bz2 -.PHONY: release - install-config: $(INSTALL) -d $(DESTDIR)$(configdir)/rules.d @ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \ @@ -324,7 +319,8 @@ test/simple-build-check.sh .PHONY: buildtest -ChangeLog: Makefile +ChangeLog: + head -1 $@ | grep -q "to v$(shell echo $$(($(VERSION) - 1)))" @ mv $@ $@.tmp @ echo "Summary of changes from v$(shell echo $$(($(VERSION) - 1))) to v$(VERSION)" >> $@ @ echo "============================================" >> $@ @@ -334,6 +330,21 @@ @ cat $@ @ cat $@.tmp >> $@ @ rm $@.tmp + head -1 $@ | grep -q "to v$(VERSION)" +.PHONY: ChangeLog +.PRECIOUS: ChangeLog + +release: + $(Q) - rm -f udev-$(VERSION).tar.gz + $(Q) - rm -f udev-$(VERSION).tar.bz2 + head -1 ChangeLog | grep -q "to v$(VERSION)" + head -1 RELEASE-NOTES | grep -q "udev $(VERSION)" + git commit -a -m "release $(VERSION)" + cat .git/refs/heads/master > .git/refs/tags/$(VERSION) + @ echo + git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | gzip -9v > udev-$(VERSION).tar.gz + git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | bzip2 -9v > udev-$(VERSION).tar.bz2 +.PHONY: release gcov-all: $(MAKE) clean all USE_GCOV=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/RELEASE-NOTES new/udev-113/RELEASE-NOTES --- old/udev-112/RELEASE-NOTES 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/RELEASE-NOTES 2007-06-23 17:44:48.000000000 +0200 @@ -1,3 +1,9 @@ +udev 113 +======== +Bugfixes. + +Final merge of patches/features from the Ubuntu package. + udev 112 ======== Bugfixes. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udev.7 new/udev-113/udev.7 --- old/udev-112/udev.7 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udev.7 2007-06-23 17:44:48.000000000 +0200 @@ -290,6 +290,11 @@ .RS 4 Create the device nodes for all available partitions of a block device. This may be useful for removable media devices where media changes are not detected. .RE +.PP +\fBstring_escape=\fR\fB\fInone|replace\fR\fR +.RS 4 +Usually control and other possibly unsafe characters are replaced in strings used for device naming. The mode of replacement can be specified with this option. +.RE .RE .RE .PP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udevd.c new/udev-113/udevd.c --- old/udev-112/udevd.c 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udevd.c 2007-06-23 17:44:48.000000000 +0200 @@ -76,15 +76,16 @@ if (priority > udev_log_priority) return; - va_start(args, format); - vsyslog(priority, format, args); - va_end(args); - if (verbose) { + printf("[%d] ", (int) getpid()); va_start(args, format); vprintf(format, args); va_end(args); printf("\n"); + } else { + va_start(args, format); + vsyslog(priority, format, args); + va_end(args); } } @@ -957,7 +958,6 @@ selinux_init(); dbg("version %s", UDEV_VERSION); - /* parse commandline options */ while (1) { option = getopt_long(argc, argv, "dtvhV", options, NULL); if (option == -1) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udev_device.c new/udev-113/udev_device.c --- old/udev-112/udev_device.c 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udev_device.c 2007-06-23 17:44:48.000000000 +0200 @@ -239,8 +239,8 @@ if (udev_db_get_device(udev, udev->dev->devpath) == 0) { udev_db_delete_device(udev); if (udev->ignore_remove) { - dbg("remove event for '%s' requested to be ignored by rule", udev->name); - return 0; + info("ignore_remove for '%s'", udev->name); + goto exit; } /* restore stored persistent data */ list_for_each_entry(name_loop, &udev->env_list, node) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udevinfo.c new/udev-113/udevinfo.c --- old/udev-112/udevinfo.c 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udevinfo.c 2007-06-23 17:44:48.000000000 +0200 @@ -265,7 +265,6 @@ goto exit; } - /* get command line options */ while (1) { option = getopt_long(argc, argv, "aen:p:q:rVh", options, NULL); if (option == -1) @@ -279,7 +278,7 @@ strlcpy(name, &optarg[strlen(udev_root)+1], sizeof(name)); else strlcpy(name, optarg, sizeof(name)); - dbg("name: %s\n", name); + dbg("name: %s", name); break; case 'p': /* remove /sys if given */ @@ -287,10 +286,9 @@ strlcpy(path, &optarg[strlen(sysfs_path)], sizeof(path)); else strlcpy(path, optarg, sizeof(path)); - dbg("path: %s\n", path); + dbg("path: %s", path); break; case 'q': - dbg("udev query: %s\n", optarg); action = ACTION_QUERY; if (strcmp(optarg, "name") == 0) { query = QUERY_NAME; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udev_node.c new/udev-113/udev_node.c --- old/udev-112/udev_node.c 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udev_node.c 2007-06-23 17:44:48.000000000 +0200 @@ -33,9 +33,11 @@ #include "udev_rules.h" #include "udev_selinux.h" +#define TMP_FILE_EXT ".udev-tmp" int udev_node_mknod(struct udevice *udev, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid) { + char file_tmp[PATH_SIZE + sizeof(TMP_FILE_EXT)]; struct stat stats; int retval = 0; @@ -44,28 +46,36 @@ else mode |= S_IFCHR; - if (lstat(file, &stats) != 0) - goto create; - - /* preserve node with already correct numbers, to prevent changing the inode number */ - if ((stats.st_mode & S_IFMT) == (mode & S_IFMT) && (stats.st_rdev == devt)) { - info("preserve file '%s', because it has correct dev_t", file); - selinux_setfilecon(file, udev->dev->kernel, stats.st_mode); - goto perms; + if (lstat(file, &stats) == 0) { + if ((stats.st_mode & S_IFMT) == (mode & S_IFMT) && (stats.st_rdev == devt)) { + info("preserve file '%s', because it has correct dev_t", file); + selinux_setfilecon(file, udev->dev->kernel, stats.st_mode); + goto perms; + } + } else { + selinux_setfscreatecon(file, udev->dev->kernel, mode); + retval = mknod(file, mode, devt); + selinux_resetfscreatecon(); + if (retval == 0) + goto perms; } - if (unlink(file) != 0) - err("unlink(%s) failed: %s", file, strerror(errno)); - else - dbg("already present file '%s' unlinked", file); - -create: - selinux_setfscreatecon(file, udev->dev->kernel, mode); - retval = mknod(file, mode, devt); + info("atomically replace '%s'", file); + strlcpy(file_tmp, file, sizeof(file_tmp)); + strlcat(file_tmp, TMP_FILE_EXT, sizeof(file_tmp)); + selinux_setfscreatecon(file_tmp, udev->dev->kernel, mode); + retval = mknod(file_tmp, mode, devt); selinux_resetfscreatecon(); if (retval != 0) { err("mknod(%s, %#o, %u, %u) failed: %s", - file, mode, major(devt), minor(devt), strerror(errno)); + file_tmp, mode, major(devt), minor(devt), strerror(errno)); + goto exit; + } + retval = rename(file_tmp, file); + if (retval != 0) { + err("rename(%s, %s) failed: %s", + file_tmp, file, strerror(errno)); + unlink(file_tmp); goto exit; } @@ -84,18 +94,19 @@ goto exit; } } - exit: return retval; } static int node_symlink(const char *node, const char *slink) { + struct stat stats; char target[PATH_SIZE] = ""; - char buf[PATH_SIZE]; + char slink_tmp[PATH_SIZE + sizeof(TMP_FILE_EXT)]; int i = 0; int tail = 0; int len; + int retval = 0; /* use relative link */ while (node[i] && (node[i] == slink[i])) { @@ -110,28 +121,62 @@ } strlcat(target, &node[tail], sizeof(target)); - /* look if symlink already exists */ - len = readlink(slink, buf, sizeof(buf)); - if (len > 0) { - buf[len] = '\0'; - if (strcmp(target, buf) == 0) { - info("preserve already existing symlink '%s' to '%s'", slink, target); - selinux_setfilecon(slink, NULL, S_IFLNK); - goto exit; + /* preserve link with correct target, do not replace node of other device */ + if (lstat(slink, &stats) == 0) { + if (S_ISBLK(stats.st_mode) || S_ISCHR(stats.st_mode)) { + struct stat stats2; + + info("found existing node instead of symlink '%s'", slink); + if (lstat(node, &stats2) == 0) { + if ((stats.st_mode & S_IFMT) == (stats2.st_mode & S_IFMT) && + stats.st_rdev == stats2.st_rdev) { + info("replace device node '%s' with symlink to our node '%s'", slink, node); + } else { + err("device node '%s' already exists, link '%s' will not overwrite it", node, slink); + goto exit; + } + } + } else if (S_ISLNK(stats.st_mode)) { + char buf[PATH_SIZE]; + + info("found existing symlink '%s'", slink); + len = readlink(slink, buf, sizeof(buf)); + if (len > 0) { + buf[len] = '\0'; + if (strcmp(target, buf) == 0) { + info("preserve already existing symlink '%s' to '%s'", slink, target); + selinux_setfilecon(slink, NULL, S_IFLNK); + goto exit; + } + } } - info("link '%s' points to different target '%s', delete it", slink, buf); - unlink(slink); + } else { + info("creating symlink '%s' to '%s'", slink, target); + selinux_setfscreatecon(slink, NULL, S_IFLNK); + retval = symlink(target, slink); + selinux_resetfscreatecon(); + if (retval == 0) + goto exit; } - /* create link */ - info("creating symlink '%s' to '%s'", slink, target); - selinux_setfscreatecon(slink, NULL, S_IFLNK); - if (symlink(target, slink) != 0) - err("symlink(%s, %s) failed: %s", target, slink, strerror(errno)); + info("atomically replace '%s'", slink); + strlcpy(slink_tmp, slink, sizeof(slink_tmp)); + strlcat(slink_tmp, TMP_FILE_EXT, sizeof(slink_tmp)); + selinux_setfscreatecon(slink_tmp, NULL, S_IFLNK); + retval = symlink(target, slink_tmp); selinux_resetfscreatecon(); - + if (retval != 0) { + err("symlink(%s, %s) failed: %s", target, slink_tmp, strerror(errno)); + goto exit; + } + retval = rename(slink_tmp, slink); + if (retval != 0) { + err("rename(%s, %s) failed: %s", slink_tmp, slink, strerror(errno)); + unlink(slink_tmp); + goto exit; + } exit: - return 0; + return retval; } static int update_link(struct udevice *udev, const char *name) @@ -303,7 +348,7 @@ gid = lookup_group(udev->group); } - info("creating device node '%s', major = '%d', minor = '%d', " "mode = '%#o', uid = '%d', gid = '%d'", + info("creating device node '%s', major=%d, minor=%d, mode=%#o, uid=%d, gid=%d", filename, major(udev->devt), minor(udev->devt), udev->mode, uid, gid); if (!udev->test_run) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udev_rules.c new/udev-113/udev_rules.c --- old/udev-112/udev_rules.c 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udev_rules.c 2007-06-23 17:44:48.000000000 +0200 @@ -837,7 +837,8 @@ strlcpy(program, key_val(rule, &rule->program), sizeof(program)); udev_rules_apply_format(udev, program, sizeof(program)); - if (run_program(program, udev->dev->subsystem, result, sizeof(result), NULL, (udev_log_priority >= LOG_INFO)) != 0) { + if (run_program(program, udev->dev->subsystem, result, sizeof(result), + NULL, (udev_log_priority >= LOG_INFO)) != 0) { dbg("PROGRAM is false"); udev->program_result[0] = '\0'; if (rule->program.operation != KEY_OP_NOMATCH) @@ -847,9 +848,12 @@ dbg("PROGRAM matches"); remove_trailing_chars(result, '\n'); - count = replace_chars(result, ALLOWED_CHARS_INPUT); - if (count) - info("%i character(s) replaced" , count); + if (rule->string_escape == ESCAPE_UNSET || + rule->string_escape == ESCAPE_REPLACE) { + count = replace_chars(result, ALLOWED_CHARS_INPUT); + if (count > 0) + info("%i character(s) replaced" , count); + } dbg("result is '%s'", result); strlcpy(udev->program_result, result, sizeof(udev->program_result)); dbg("PROGRAM returned successful"); @@ -923,14 +927,28 @@ if (pair->key.operation == KEY_OP_ASSIGN) { const char *key_name = key_pair_name(rule, pair); - char attr[PATH_SIZE]; + char devpath[PATH_SIZE]; + char *attrib; + char attr[PATH_SIZE] = ""; char value[NAME_SIZE]; FILE *f; - strlcpy(attr, sysfs_path, sizeof(attr)); - strlcat(attr, udev->dev->devpath, sizeof(attr)); - strlcat(attr, "/", sizeof(attr)); - strlcat(attr, key_name, sizeof(attr)); + if (attr_get_by_subsys_id(key_name, devpath, sizeof(devpath), &attrib)) { + if (attrib != NULL) { + strlcpy(attr, sysfs_path, sizeof(attr)); + strlcat(attr, devpath, sizeof(attr)); + strlcat(attr, "/", sizeof(attr)); + strlcat(attr, attrib, sizeof(attr)); + } + } + + if (attr[0] == '\0') { + strlcpy(attr, sysfs_path, sizeof(attr)); + strlcat(attr, udev->dev->devpath, sizeof(attr)); + strlcat(attr, "/", sizeof(attr)); + strlcat(attr, key_name, sizeof(attr)); + } + strlcpy(value, key_val(rule, &pair->key), sizeof(value)); udev_rules_apply_format(udev, value, sizeof(value)); info("writing '%s' to sysfs file '%s'", value, attr); @@ -1033,9 +1051,12 @@ /* allow multiple symlinks separated by spaces */ strlcpy(temp, key_val(rule, &rule->symlink), sizeof(temp)); udev_rules_apply_format(udev, temp, sizeof(temp)); - count = replace_chars(temp, ALLOWED_CHARS_FILE " "); - if (count) - info("%i character(s) replaced" , count); + if (rule->string_escape == ESCAPE_UNSET || + rule->string_escape == ESCAPE_REPLACE) { + count = replace_chars(temp, ALLOWED_CHARS_FILE " "); + if (count > 0) + info("%i character(s) replaced" , count); + } dbg("rule applied, added symlink(s) '%s'", temp); pos = temp; while (isspace(pos[0])) @@ -1065,9 +1086,12 @@ name_set = 1; strlcpy(udev->name, key_val(rule, &rule->name), sizeof(udev->name)); udev_rules_apply_format(udev, udev->name, sizeof(udev->name)); - count = replace_chars(udev->name, ALLOWED_CHARS_FILE); - if (count) - info("%i character(s) replaced", count); + if (rule->string_escape == ESCAPE_UNSET || + rule->string_escape == ESCAPE_REPLACE) { + count = replace_chars(udev->name, ALLOWED_CHARS_FILE); + if (count > 0) + info("%i character(s) replaced", count); + } info("rule applied, '%s' becomes '%s'", udev->dev->kernel, udev->name); if (strcmp(udev->dev->subsystem, "net") != 0) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udev_rules.h new/udev-113/udev_rules.h --- old/udev-112/udev_rules.h 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udev_rules.h 2007-06-23 17:44:48.000000000 +0200 @@ -57,6 +57,12 @@ IMPORT_PARENT, }; +enum escape_type { + ESCAPE_UNSET, + ESCAPE_NONE, + ESCAPE_REPLACE, +}; + struct udev_rule { struct key action; struct key devpath; @@ -88,6 +94,7 @@ struct key group; mode_t mode; enum key_operation mode_operation; + enum escape_type string_escape; unsigned int link_priority; unsigned int partitions; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udev_rules_parse.c new/udev-113/udev_rules_parse.c --- old/udev-112/udev_rules_parse.c 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udev_rules_parse.c 2007-06-23 17:44:48.000000000 +0200 @@ -232,6 +232,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filename, unsigned int lineno) { + char buf[sizeof(struct udev_rule) + LINE_SIZE]; struct udev_rule *rule; size_t rule_size; int valid; @@ -241,15 +242,12 @@ int physdev = 0; int retval; - /* get all the keys */ - rule = calloc(1, sizeof (struct udev_rule) + LINE_SIZE); - if (!rule) { - err("malloc failed"); - return -1; - } + memset(buf, 0x00, sizeof(buf)); + rule = (struct udev_rule *) buf; linepos = line; valid = 0; + /* get all the keys */ while (1) { char *key; char *value; @@ -592,6 +590,14 @@ rule->link_priority = atoi(&pos[strlen("link_priority=")]); info("link priority=%i", rule->link_priority); } + pos = strstr(value, "string_escape="); + if (pos != NULL) { + pos = &pos[strlen("string_escape=")]; + if (strncmp(pos, "none", strlen("none")) == 0) + rule->string_escape = ESCAPE_NONE; + else if (strncmp(pos, "replace", strlen("replace")) == 0) + rule->string_escape = ESCAPE_REPLACE; + } if (strstr(value, "all_partitions") != NULL) { dbg("creation of partition nodes requested"); rule->partitions = DEFAULT_PARTITIONS_COUNT; @@ -627,11 +633,9 @@ memcpy(rules->buf + rules->bufsize, rule, rule_size); rules->bufsize += rule_size; exit: - free(rule); return 0; invalid: - free(rule); err("invalid rule '%s:%u'", filename, lineno); return -1; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udev_selinux.c new/udev-113/udev_selinux.c --- old/udev-112/udev_selinux.c 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udev_selinux.c 2007-06-23 17:44:48.000000000 +0200 @@ -75,7 +75,7 @@ } media = strdup(mediabuf); - info("selinux_get_media(%s)='%s'\n", devname, media); + info("selinux_get_media(%s)='%s'", devname, media); close_out: fclose(fp); @@ -100,7 +100,7 @@ if (ret < 0) if (matchpathcon(file, mode, &scontext) < 0) { - err("matchpathcon(%s) failed\n", file); + err("matchpathcon(%s) failed", file); return; } @@ -128,7 +128,7 @@ if (ret < 0) if (matchpathcon(file, mode, &scontext) < 0) { - err("matchpathcon(%s) failed\n", file); + err("matchpathcon(%s) failed", file); return; } @@ -155,10 +155,10 @@ */ if (is_selinux_running()) { if (!udev_root[0]) - err("selinux_init: udev_root not set\n"); + err("selinux_init: udev_root not set"); matchpathcon_init_prefix(NULL, udev_root); if (getfscreatecon(&prev_scontext) < 0) { - err("getfscreatecon failed\n"); + err("getfscreatecon failed"); prev_scontext = NULL; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udevstart.c new/udev-113/udevstart.c --- old/udev-112/udevstart.c 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udevstart.c 2007-06-23 17:44:48.000000000 +0200 @@ -68,7 +68,7 @@ struct device *new_device; const char *devpath = &path[strlen(sysfs_path)]; - dbg("insert: '%s'\n", devpath); + dbg("insert: '%s'", devpath); list_for_each_entry(loop_device, device_list, node) { if (strcmp(loop_device->path, devpath) > 0) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udevtest.c new/udev-113/udevtest.c --- old/udev-112/udevtest.c 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udevtest.c 2007-06-23 17:44:48.000000000 +0200 @@ -44,8 +44,7 @@ va_start(args, format); vprintf(format, args); va_end(args); - if (format[strlen(format)-1] != '\n') - printf("\n"); + printf("\n"); } #endif @@ -211,6 +210,7 @@ info("run: '%s'", program); } } + udev_device_cleanup(udev); exit: udev_rules_cleanup(&rules); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udevtrigger.c new/udev-113/udevtrigger.c --- old/udev-112/udevtrigger.c 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udevtrigger.c 2007-06-23 17:44:48.000000000 +0200 @@ -118,12 +118,12 @@ fd = open(filename, O_WRONLY); if (fd < 0) { - dbg("error on opening %s: %s\n", filename, strerror(errno)); + dbg("error on opening %s: %s", filename, strerror(errno)); return; } if (write(fd, "add", 3) < 0) - info("error on triggering %s: %s\n", filename, strerror(errno)); + info("error on triggering %s: %s", filename, strerror(errno)); close(fd); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udev_utils_file.c new/udev-113/udev_utils_file.c --- old/udev-112/udev_utils_file.c 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udev_utils_file.c 2007-06-23 17:44:48.000000000 +0200 @@ -45,14 +45,14 @@ pos--; pos[0] = '\0'; - dbg("stat '%s'\n", p); + dbg("stat '%s'", p); if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR) return 0; if (create_path (p) != 0) return -1; - dbg("mkdir '%s'\n", p); + dbg("mkdir '%s'", p); if (mkdir(p, 0755) == 0) return 0; if (errno == EEXIST) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udev_utils_run.c new/udev-113/udev_utils_run.c --- old/udev-112/udev_utils_run.c 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udev_utils_run.c 2007-06-23 17:44:48.000000000 +0200 @@ -158,7 +158,7 @@ close(errpipe[WRITE_END]); } execv(argv[0], argv); - if ((errno == ENOENT) || (errno = ENOTDIR)) { + if (errno == ENOENT || errno == ENOTDIR) { /* may be on a filesytem which is not mounted right now */ info("program '%s' not found", argv[0]); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-112/udev.xml new/udev-113/udev.xml --- old/udev-112/udev.xml 2007-06-04 15:05:23.000000000 +0200 +++ new/udev-113/udev.xml 2007-06-23 17:44:48.000000000 +0200 @@ -435,6 +435,14 @@ detected.</para> </listitem> </varlistentry> + <varlistentry> + <term><option>string_escape=<replaceable>none|replace</replaceable></option></term> + <listitem> + <para>Usually control and other possibly unsafe characters are replaced + in strings used for device naming. The mode of replacement can be specified + with this option.</para> + </listitem> + </varlistentry> </variablelist> </listitem> </varlistentry> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package xorg-x11 checked in at Sun Jun 24 11:54:20 CEST 2007. -------- --- xorg-x11/xorg-x11.changes 2007-06-18 15:34:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2007-06-22 22:05:35.233496000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 22 22:05:02 CEST 2007 - sndirsch(a)suse.de + +- xdm: no need to run SuSEconfig.xdm by kdm + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.z24777/_old 2007-06-24 11:53:48.000000000 +0200 +++ /var/tmp/diff_new_pack.z24777/_new 2007-06-24 11:53:48.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: mcpp URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 86 +Release: 87 License: X11/MIT, xc/fonts/scaled/Type1/Copyright BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -449,6 +449,8 @@ /var/lib/xdm/authdir/ %changelog +* Fri Jun 22 2007 - sndirsch(a)suse.de +- xdm: no need to run SuSEconfig.xdm by kdm * Mon Jun 18 2007 - dmueller(a)suse.de - xrdb: cpp -> mcpp (2300kb -> 51kb) * Sat Apr 28 2007 - sndirsch(a)suse.de ++++++ xdm.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/init.d/xdm new/etc/init.d/xdm --- old/etc/init.d/xdm 2007-04-28 12:45:14.000000000 +0200 +++ new/etc/init.d/xdm 2007-06-22 22:02:04.000000000 +0200 @@ -114,11 +114,13 @@ rc_exit 0 fi - test -x /etc/X11/xdm/SuSEconfig.xdm && \ - MD5DIR="/var/adm/SuSEconfig/md5" \ - /etc/X11/xdm/SuSEconfig.xdm | \ - sed 's+$.*$+/etc/init.d/xdm: \1+g' | \ - /bin/logger + if test "$DISPLAYMANAGER" != /opt/kde3/bin/kdm; then + test -x /etc/X11/xdm/SuSEconfig.xdm && \ + MD5DIR="/var/adm/SuSEconfig/md5" \ + /etc/X11/xdm/SuSEconfig.xdm | \ + sed 's+$.*$+/etc/init.d/xdm: \1+g' | \ + /bin/logger + fi echo -n "Starting service $DM" # Don't start xdm if no Xserver is configured and xdm is not ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pwdutils
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package pwdutils checked in at Sun Jun 24 11:54:11 CEST 2007. -------- --- pwdutils/pwdutils.changes 2007-05-15 12:58:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/pwdutils/pwdutils.changes 2007-06-22 14:03:51.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 22 14:03:30 CEST 2007 - kukuk(a)suse.de + +- Update pwdutils to 3.1.4 + - Better NIS support for pwconv + +------------------------------------------------------------------- Old: ---- pwdutils-3.1.3.tar.bz2 New: ---- pwdutils-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pwdutils.spec ++++++ --- /var/tmp/diff_new_pack.J25589/_old 2007-06-24 11:53:56.000000000 +0200 +++ /var/tmp/diff_new_pack.J25589/_new 2007-06-24 11:53:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package pwdutils (Version 3.1.3) +# spec file for package pwdutils (Version 3.1.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ License: BSD License and BSD-like, GNU General Public License (GPL) Group: System/Base Autoreqprov: on -Version: 3.1.3 -Release: 28 +Version: 3.1.4 +Release: 1 Summary: Utilities to Manage User and Group Accounts PreReq: grep /bin/cp /bin/mv aaa_base Requires: pam-modules @@ -125,6 +125,13 @@ fi fi +%preun +%stop_on_removal rpasswdd + +%postun +%restart_on_update rpasswdd +%insserv_cleanup + %files -f pwdutils.lang %defattr(-,root,root,755) %doc AUTHORS COPYING NEWS README THANKS TODO @@ -187,6 +194,9 @@ %{_libdir}/pwdutils/liblog_audit.so.1* %changelog +* Fri Jun 22 2007 - kukuk(a)suse.de +- Update pwdutils to 3.1.4 + - Better NIS support for pwconv * Tue May 15 2007 - ro(a)suse.de - prereq aaa_base (for /etc/shadow) (#272744) * Fri May 04 2007 - kukuk(a)suse.de ++++++ pwdutils-3.1.3.tar.bz2 -> pwdutils-3.1.4.tar.bz2 ++++++ ++++ 10566 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdewebdev4
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package kdewebdev4 checked in at Sun Jun 24 11:53:48 CEST 2007. -------- --- KDE/kdewebdev4/kdewebdev4.changes 2007-06-08 14:14:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdewebdev4/kdewebdev4.changes 2007-06-23 16:13:07.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jun 23 16:13:02 CEST 2007 - stbinner(a)suse.de + +- update to 3.90.1.svn679155, run fdupes + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdewebdev4.spec ++++++ --- /var/tmp/diff_new_pack.W22129/_old 2007-06-24 11:53:32.000000000 +0200 +++ /var/tmp/diff_new_pack.W22129/_new 2007-06-24 11:53:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdewebdev4 (Version 3.90.1.svn672844) +# spec file for package kdewebdev4 (Version 3.90.1.svn679155) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,11 +12,14 @@ Name: kdewebdev4 BuildRequires: kdesdk4 libkde4-devel libkdevplatform4-devel libtidy-devel BuildRequires: libkdepimlibs4-devel +%if %suse_version > 1020 +BuildRequires: fdupes +%endif License: GNU General Public License (GPL) Group: System/GUI/KDE Summary: kdewebdev base package URL: http://quanta.sf.net -Version: 3.90.1.svn672844 +Version: 3.90.1.svn679155 Release: 1 Source0: kdewebdev.tar.bz2 Source1: _upstream @@ -60,6 +63,9 @@ %suse_update_desktop_file -r kfilereplace System FileManager %suse_update_desktop_file -r quanta Office WebDevelopment %kde_post_install + %if %suse_version > 1020 + %fdupes -s $RPM_BUILD_ROOT + %endif %post -p /sbin/ldconfig @@ -219,6 +225,7 @@ /usr/%_lib/kde4/libkdevtagdialogs.so /usr/%_lib/kde4/libkdevtemplatestree.so /usr/%_lib/kde4/libkdevusertoolbars.so +/usr/%_lib/kde4/quantaprojectfilemanager.so /usr/%_lib/libkdevquanta.* /usr/share/applications/kde4/quanta.desktop @@ -238,6 +245,8 @@ %_kde_share_dir/apps/kdevusertoolbars +%_kde_share_dir/apps/quantaprojectfilemanager + %_kde_share_dir/apps/quanta %_kde_share_dir/config.kcfg/quanta.kcfg @@ -259,6 +268,8 @@ %_kde_share_dir/services/kdevtemplatestree.desktop %_kde_share_dir/services/kdevusertoolbars.desktop + +%_kde_share_dir/services/quantaprojectfilemanager.desktop %doc %lang(en) /usr/share/doc/HTML/en/quanta /usr/share/kde4/apps/kdevplatform /usr/share/kde4/servicetypes/kdevplatformquanta.desktop @@ -338,6 +349,8 @@ %doc AUTHORS COPYING COPYING-DOCS README %changelog +* Sat Jun 23 2007 - stbinner(a)suse.de +- update to 3.90.1.svn679155, run fdupes * Fri Jun 08 2007 - stbinner(a)suse.de - update to 3.90.1.svn672385 * Wed Jun 06 2007 - dmueller(a)suse.de ++++++ kdewebdev.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kfilereplace/kfilereplace.desktop new/kdewebdev/kfilereplace/kfilereplace.desktop --- old/kdewebdev/kfilereplace/kfilereplace.desktop 2007-05-29 07:18:49.000000000 +0200 +++ new/kdewebdev/kfilereplace/kfilereplace.desktop 2007-06-16 07:26:49.000000000 +0200 @@ -33,7 +33,6 @@ GenericName[nds]=Söök- un Utwesselwarktüüch GenericName[nl]=Gereedschap voor zoeken en vervangen GenericName[pl]=Narzędzie do wyszukiwania i zamiany -GenericName[pt]=Ferramenta de Procura e Substituição GenericName[pt_BR]=Ferramenta de Procura & Substituição GenericName[ru]=Поиск и замена GenericName[sl]=Orodje za iskanje in zamenjavo diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kfilereplace/kfilereplacepart.desktop new/kdewebdev/kfilereplace/kfilereplacepart.desktop --- old/kdewebdev/kfilereplace/kfilereplacepart.desktop 2007-05-29 07:18:49.000000000 +0200 +++ new/kdewebdev/kfilereplace/kfilereplacepart.desktop 2007-06-16 07:26:49.000000000 +0200 @@ -27,7 +27,6 @@ Comment[nds]=En Söök- un Utwesselwarktüüch för Stapelbedrief Comment[nl]=Een gereedschap voor zoeken en vervangen Comment[pl]=Narzędzie do wyszukiwania i zamiany -Comment[pt]=Uma ferramenta de procura e substituição por atacado Comment[pt_BR]=Uma ferramenta de substituição e pesquisa batch Comment[ru]=Пакетный поиск и замена Comment[sl]=Orodje serijskega iskanja in zamenjevanja @@ -69,7 +68,6 @@ GenericName[nds]=Datei-Utwesselansicht GenericName[nl]=Weergave van bestanden vervangen GenericName[pl]=Widok zamiany w plikach -GenericName[pt]=Vista de Substituição de Ficheiros GenericName[pt_BR]=Visçai de Substituição de Arquivos GenericName[ru]=Средство поиска и замены в файлах GenericName[sl]=Prikaz zamenjave datotek diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kimagemapeditor/imagemapchoosedialog.cpp new/kdewebdev/kimagemapeditor/imagemapchoosedialog.cpp --- old/kdewebdev/kimagemapeditor/imagemapchoosedialog.cpp 2007-06-03 22:48:16.000000000 +0200 +++ new/kdewebdev/kimagemapeditor/imagemapchoosedialog.cpp 2007-06-11 23:14:42.000000000 +0200 @@ -33,6 +33,7 @@ : KDialog(parent) { kDebug() << "ImageMapChooseDialog::ImageMapChooseDialog" << endl; + kWarning(parent == 0) << "ImageMapChooseDialog: parent is null!" << endl; setCaption(i18n( "Choose Map & Image to Edit" )); setModal(true); @@ -217,7 +218,8 @@ kDebug() << "ImageMapChooseDialog::selectImageWithUsemap: " << usemap << endl; for (int i=0; i<imageListTable->rowCount(); i++) { - if (imageListTable->item(i,1)->text()==usemap) { + QTableWidgetItem *item = imageListTable->item(i,1); + if (item && (item->text()==usemap)) { imageListTable->selectRow(i); slotImageChanged(); return; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kimagemapeditor/imageslistview.cpp new/kdewebdev/kimagemapeditor/imageslistview.cpp --- old/kdewebdev/kimagemapeditor/imageslistview.cpp 2007-06-02 13:04:08.000000000 +0200 +++ new/kdewebdev/kimagemapeditor/imageslistview.cpp 2007-06-11 23:14:42.000000000 +0200 @@ -133,19 +133,23 @@ } void ImagesListView::slotSelectionChanged() { - QTreeWidgetItem* item = selectedItems()[0]; + if (selectedItems().isEmpty()) + return; + + QTreeWidgetItem* item = selectedItems().first(); QString src = item->text(0); emit imageSelected(KUrl(_baseUrl,src)); } ImageTag* ImagesListView::selectedImage() { - ImagesListViewItem* item = static_cast<ImagesListViewItem*>(selectedItems().first()); - if ( ! item) { + if (selectedItems().isEmpty()) { kDebug() << "ImagesListView::selectedImage: No Image is selected !" << endl; return 0L; } + ImagesListViewItem* item = static_cast<ImagesListViewItem*>(selectedItems().first()); + return item->imageTag(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kimagemapeditor/kimagemapeditor.cpp new/kdewebdev/kimagemapeditor/kimagemapeditor.cpp --- old/kdewebdev/kimagemapeditor/kimagemapeditor.cpp 2007-06-03 22:48:16.000000000 +0200 +++ new/kdewebdev/kimagemapeditor/kimagemapeditor.cpp 2007-06-11 23:14:42.000000000 +0200 @@ -175,6 +175,7 @@ drawZone = new DrawZone(0L,this); mainWindow->setCentralWidget(sa); sa->setWidget(drawZone); + setWidget(mainWindow); // sa->setWidgetResizable(true); } @@ -411,15 +412,22 @@ // kDebug() << "loading entry lastopenurl : " << lastURL.path() << endl; // KMessageBox::information(0L, config.group()+" "+lastURL.path()); if (!lastURL.isEmpty()) { + openUrl(lastURL); + if (!lastMap.isEmpty()) + mapsListView->selectMap(lastMap); + if (!lastImage.isEmpty()) + setPicture(lastImage); // kDebug() << "opening HTML file with map " << lastMap << " and image " << lastImage << endl; - if ( openHTMLFile(lastURL, lastMap, lastImage) ) - openUrl(lastURL); - else - closeUrl(); +// if (! openHTMLFile(lastURL, lastMap, lastImage) ) +// closeUrl(); + //openUrl(lastURL); + // else + //closeUrl(); } } void KImageMapEditor::saveLastURL(KConfigGroup & config) { + kDebug() << "saveLastURL: " << url().path() << endl; config.writePathEntry("lastopenurl",url().path()); config.writeEntry("lastactivemap",mapName()); config.writePathEntry("lastactiveimage",_imageUrl.path()); @@ -1102,7 +1110,8 @@ deselect( a ); areas->removeAll( a ); a->deleteListViewItem(); - a=areas->first(); // because the current is deleted + if (!areas->isEmpty()) + a = areas->first(); // because the current is deleted } drawZone->repaint(); @@ -1880,7 +1889,7 @@ } -bool KImageMapEditor::openHTMLFile(const KUrl & url, const QString & mapName, const QString & imagePath) +bool KImageMapEditor::openHTMLFile(const KUrl & url) { QFile f(url.path()); if ( !f.exists () ) @@ -1928,7 +1937,9 @@ } else if (tagName == "map") { map = new MapTag(); - map->name= attr->value("name") ; + map->name = attr->value("name"); + kDebug() << "KImageMapEditor::openHTMLFile: found map with name:" << map->name << endl; + readMap=true; } else if (tagName=="/map") { @@ -1964,59 +1975,66 @@ KUrl imageUrl; - delete map; map = 0L; - // If there is a preselection of map and image - // don't let the user choose something - if (imagePath.isNull() || mapName.isNull()) { // If we have more than on map or more than one image // Let the user choose, otherwise take the only ones - if (maps.count() == 1) { + if (maps.count() > 1) { map = maps.first(); } - if (images.count() == 1) { - if (images.first()) { - ImageTag* imgTag = images.first(); + if (images.count() > 1) { + ImageTag* imgTag = images.first(); + if (imgTag) { if (imgTag->contains("src")) imageUrl = KUrl(url,imgTag->value("src")); } } - // If there is only one map and more than one image - // try to find out the image with the according usemap tag - if (maps.count() == 1 && images.count() > 1) { - ImageTag* imageTag; + // If there is more than one map and more than one image + // use the map that has an image with an according usemap tag + if (maps.count() > 1 && images.count() > 1) { + bool found = false; + MapTag *mapTag; + foreach(mapTag, maps) { + ImageTag *imageTag; foreach(imageTag, images) { if (imageTag->contains("usemap")) { QString usemap = imageTag->value("usemap"); // Remove the # QString usemapName = usemap.right(usemap.length()-1); - if (usemapName == map->name) { - if (imageTag->contains("src")) + if (usemapName == mapTag->name) { + if (imageTag->contains("src")) { imageUrl = KUrl(url,imageTag->value("src")); + found = true; + } } } + if (found) + break; } + if (found) + break; + } + if (found) { + map = mapTag; + } } // If there are more than one map or there wasn't // found a fitting image and there is something to choose // let the user choose - if (maps.count() >1 || (imageUrl.isEmpty() && images.count() > 1)) + /* if (maps.count() >1 || (imageUrl.isEmpty() && images.count() > 1)) { - ImageMapChooseDialog* dialog = - new ImageMapChooseDialog(widget(),maps,images,url); + ImageMapChooseDialog dialog(widget(),maps,images,url); kDebug() << "KImageMapEditor::openHTMLFile: before dialog->exec()" << endl; - dialog->exec(); - map = dialog->currentMap; - imageUrl = dialog->pixUrl; - } - } - else - imageUrl = imagePath; + dialog.exec(); + kDebug() << "KImageMapEditor::openHTMLFile: after dialog->exec()" << endl; + map = dialog.currentMap; + imageUrl = dialog.pixUrl; + }*/ + imagesListView->clear(); imagesListView->setBaseUrl(url); @@ -2030,9 +2048,6 @@ if (map) { mapsListView->selectMap(map->name); - } - else if ( ! mapName.isNull()) { - mapsListView->selectMap(mapName); } else { #ifdef WITH_TABWIDGET if (tabWidget) @@ -2279,7 +2294,7 @@ } /** - * Sets wether actions that depend on an selected map + * Sets whether actions that depend on an selected map * are enabled */ void KImageMapEditor::setMapActionsEnabled(bool b) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kimagemapeditor/kimagemapeditor.desktop new/kdewebdev/kimagemapeditor/kimagemapeditor.desktop --- old/kdewebdev/kimagemapeditor/kimagemapeditor.desktop 2007-05-29 07:18:49.000000000 +0200 +++ new/kdewebdev/kimagemapeditor/kimagemapeditor.desktop 2007-06-23 08:35:17.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Encoding=UTF-8 -MimeType=text/html +MimeType=text/html; Exec=kimagemapeditor -caption "%c" %i Icon=kimagemapeditor Terminal=false @@ -34,7 +34,6 @@ GenericName[nds]=Editor för HTML-Bildkoorten GenericName[nl]=HTML imagemap editor GenericName[pl]=Edytor map obrazków HTML -GenericName[pt]=Editor de Mapas de Imagem HTML GenericName[pt_BR]=Editor de Mapeamento de Imagem HTML GenericName[sl]=Urejevalnik slikovnih zemljevidov v HTML GenericName[sr]=Уређивач HTML сликовне мапе diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kimagemapeditor/kimagemapeditor.h new/kdewebdev/kimagemapeditor/kimagemapeditor.h --- old/kdewebdev/kimagemapeditor/kimagemapeditor.h 2007-04-16 23:25:49.000000000 +0200 +++ new/kdewebdev/kimagemapeditor/kimagemapeditor.h 2007-06-11 23:14:42.000000000 +0200 @@ -219,8 +219,7 @@ protected: void init(); - bool openHTMLFile(const KUrl &, const QString & mapName = QString::null, - const QString & imagePath = QString::null); + bool openHTMLFile(const KUrl &); void saveImageMap(const KUrl &); /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kimagemapeditor/kimagemapeditorpart.desktop new/kdewebdev/kimagemapeditor/kimagemapeditorpart.desktop --- old/kdewebdev/kimagemapeditor/kimagemapeditorpart.desktop 2007-05-29 07:18:49.000000000 +0200 +++ new/kdewebdev/kimagemapeditor/kimagemapeditorpart.desktop 2007-06-16 07:26:49.000000000 +0200 @@ -27,7 +27,6 @@ Comment[nds]=En Editor för HTML-Bildkoorten Comment[nl]=Een hulpmiddel om HTML imagemaps te maken Comment[pl]=Edytor map obrazków HTML -Comment[pt]=Editor de Mapas de Imagem HTML Comment[pt_BR]=Um editor de mapeamento de imagem HTML Comment[ru]=Редактор HTML imagemap Comment[sl]=Urejevalnik slikovnih zemljevidov v HTML diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kimagemapeditor/kimedialogs.cpp new/kdewebdev/kimagemapeditor/kimedialogs.cpp --- old/kdewebdev/kimagemapeditor/kimedialogs.cpp 2007-06-03 22:48:16.000000000 +0200 +++ new/kdewebdev/kimagemapeditor/kimedialogs.cpp 2007-06-11 23:14:42.000000000 +0200 @@ -214,8 +214,6 @@ } PolyCoordsEdit::~PolyCoordsEdit() { - if (area) - area->highlightSelectionPoint(-1); } void PolyCoordsEdit::slotHighlightPoint(int row) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kimagemapeditor/kimeshell.cpp new/kdewebdev/kimagemapeditor/kimeshell.cpp --- old/kdewebdev/kimagemapeditor/kimeshell.cpp 2007-06-02 13:04:08.000000000 +0200 +++ new/kdewebdev/kimagemapeditor/kimeshell.cpp 2007-06-11 23:14:42.000000000 +0200 @@ -80,7 +80,7 @@ KParts::GUIActivateEvent ev( true ); QApplication::sendEvent( m_part, &ev ); //setCentralWidget(part->widget()); - kDebug() << "KimeShell starting 2"; + kDebug() << "KimeShell starting 3" << endl; if (!initialGeometrySet()) resize( QSize(725, 525).expandedTo(minimumSizeHint())); @@ -91,7 +91,7 @@ this, SLOT(setCaption( const QString &))); setAutoSaveSettings( "General Options" ); - kDebug() << "KimeShell starting 3"; + kDebug() << "KimeShell starting 4" << endl; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kimagemapeditor/mapslistview.cpp new/kdewebdev/kimagemapeditor/mapslistview.cpp --- old/kdewebdev/kimagemapeditor/mapslistview.cpp 2007-06-02 13:04:08.000000000 +0200 +++ new/kdewebdev/kimagemapeditor/mapslistview.cpp 2007-06-11 23:14:42.000000000 +0200 @@ -50,8 +50,10 @@ MapsListView::~MapsListView() { } -void MapsListView::addMap(const QString & name = QString::null) { - new QTreeWidgetItem(_listView,QStringList() << name); +void MapsListView::addMap(const QString & name = "") { + kDebug() << "MapsListView::addMap: " << name << endl; + QStringList list(name); + new QTreeWidgetItem(_listView,list); //kDebug() << "MapsListView::addMap : Added map '" << name << "'" << endl; } @@ -59,7 +61,10 @@ void MapsListView::addMaps(const QList<MapTag*> & maps) { QListIterator<MapTag*> it(maps); while (it.hasNext()) { - addMap(it.next()->name); + MapTag *tag = it.next(); + QString s = tag->name; + kDebug() << "MapsListView::addMaps:" << s << endl; + addMap(s); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/klinkstatus.desktop new/kdewebdev/klinkstatus/src/klinkstatus.desktop --- old/kdewebdev/klinkstatus/src/klinkstatus.desktop 2007-05-29 07:18:49.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/klinkstatus.desktop 2007-06-16 07:26:49.000000000 +0200 @@ -32,7 +32,6 @@ GenericName[nds]=Linkprööv GenericName[nl]=Linkchecker GenericName[pl]=Program sprawdzający odnośniki -GenericName[pt]=Verificação de Ligações GenericName[pt_BR]=Verificador de Links GenericName[ru]=Проверка ссылок GenericName[sl]=Preverjalnik povezav diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kommander/editor/kmdr-editor.desktop new/kdewebdev/kommander/editor/kmdr-editor.desktop --- old/kdewebdev/kommander/editor/kmdr-editor.desktop 2007-05-29 07:18:49.000000000 +0200 +++ new/kdewebdev/kommander/editor/kmdr-editor.desktop 2007-06-22 07:15:47.000000000 +0200 @@ -5,7 +5,7 @@ GenericName[cs]=Editor dynamických dialogů GenericName[da]=Dynamisk dialog-editor GenericName[de]=Editor für dynamische Dialoge -GenericName[el]=Eπεξεργαστής δυναμικών διαλόγων +GenericName[el]=Επεξεργαστής δυναμικών διαλόγων GenericName[en_GB]=Dynamic Dialogue Editor GenericName[es]=Editor de cuadros de diálogo dinámicos GenericName[et]=Dünaamiliste dialoogide redaktor @@ -23,7 +23,6 @@ GenericName[nds]=Editor för dünaamsch Dialogen GenericName[nl]=Dynamische dialoog-editor GenericName[pl]=Edytor do dynamicznych okien dialogowych -GenericName[pt]=Editor de Diálogos Dinâmicos GenericName[pt_BR]=Editor de Diálogo Dinâmico GenericName[ru]=Динамический редактор диалогов GenericName[sl]=Urejevalnik dinamičnih pogovornih oken @@ -43,7 +42,7 @@ Name[cs]=Editor Kommanderu Name[da]=Kommander-editor Name[de]=Kommander-Editor -Name[el]=Eπεξεργαστής Kommander +Name[el]=Επεξεργαστής Kommander Name[et]=Redaktor Kommander Name[eu]=Kommander editorea Name[fa]=ویرایشگر Kommander @@ -59,7 +58,6 @@ Name[nds]=Kommander-Editor Name[pa]=Kommander ਸੰਪਾਦਕ Name[pl]=Edytor Kommander -Name[pt]=Editor do Kommander Name[pt_BR]=Editor Kommander Name[ru]=Редактор Kommander Name[sl]=Urejevalnik Kommander @@ -81,7 +79,7 @@ Comment[cs]=Editor dynamických dialogů Comment[da]=Dynamisk dialog-editor Comment[de]=Editor für dynamische Dialoge -Comment[el]=Eπεξεργαστής δυναμικών διαλόγων +Comment[el]=Επεξεργαστής δυναμικών διαλόγων Comment[en_GB]=Dynamic Dialogue Editor Comment[es]=Editor de cuadros de diálogo dinámicos Comment[et]=Dünaamiliste dialoogide redaktor @@ -99,7 +97,6 @@ Comment[nds]=Editor för dünaamsch Dialogen Comment[nl]=Dynamische dialoog-editor Comment[pl]=Edytor do dynamicznych okien dialogowych -Comment[pt]=Editor de diálogos dinâmicos Comment[pt_BR]=Editor de Diálogo Dinâmico Comment[ru]=Динамический редактор диалогов Comment[sl]=Urejevalnik dinamičnih pogovornih oken diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kommander/editor/main.cpp new/kdewebdev/kommander/editor/main.cpp --- old/kdewebdev/kommander/editor/main.cpp 2007-01-29 19:07:22.000000000 +0100 +++ new/kdewebdev/kommander/editor/main.cpp 2007-06-11 00:11:09.000000000 +0200 @@ -46,8 +46,8 @@ aboutData.addAuthor("Marc Britton", "Original author", "consume(a)optusnet.com.au"); aboutData.addAuthor("Eric Laffoon", "Project manager", "eric(a)kdewebdev.org"); aboutData.addAuthor("Michal Rudolf", "Current maintainer", "mrudolf(a)kdewebdev.org"); - aboutData.setTranslator (I18N_NOOP2("NAME OF TRANSLATORS","Your names"), - I18N_NOOP2("EMAIL OF TRANSLATORS","Your emails")); + aboutData.setTranslator (ki18nc("NAME OF TRANSLATORS", "Your names"), + ki18nc("EMAIL OF TRANSLATORS", "Your emails")); KCmdLineArgs::init(argc, argv, &aboutData); KCmdLineArgs::addCmdLineOptions(options); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kommander/executor/kmdr-executor.desktop new/kdewebdev/kommander/executor/kmdr-executor.desktop --- old/kdewebdev/kommander/executor/kmdr-executor.desktop 2007-05-29 07:18:49.000000000 +0200 +++ new/kdewebdev/kommander/executor/kmdr-executor.desktop 2007-06-16 07:26:49.000000000 +0200 @@ -27,7 +27,6 @@ Comment[nds]=Föhrt Kommander-Dialogen ut Comment[nl]=Kommander-dialogen uitvoeren Comment[pl]=Uruchamianie z okien dialogowych Kommandera -Comment[pt]=Executor dos diálogos do Kommander Comment[pt_BR]=Executor para diálogos do Kommander Comment[ru]=Выполнение диалогов Kommander Comment[sl]=Izvajalnik za pogovorna okna Kommanderja @@ -59,7 +58,6 @@ Name[nds]=Kommander-Executor Name[nl]=Kommander Uitvoerder Name[pl]=Kommander: uruchamianie -Name[pt]=Executor do Kommander Name[pt_BR]=Executor do Kommander Name[ru]=Kommander Name[sl]=Izvajalnik Kommander diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kommander/widgets/textbrowser.cpp new/kdewebdev/kommander/widgets/textbrowser.cpp --- old/kdewebdev/kommander/widgets/textbrowser.cpp 2005-07-24 10:58:00.000000000 +0200 +++ new/kdewebdev/kommander/widgets/textbrowser.cpp 2007-06-09 04:38:33.000000000 +0200 @@ -22,8 +22,8 @@ #include <specials.h> #include "textbrowser.h" -TextBrowser::TextBrowser(QWidget * a_parent, const char *a_name) - : KTextBrowser(a_parent, a_name), KommanderWidget((QObject *) this) +TextBrowser::TextBrowser(QWidget * a_parent) + : KTextBrowser(a_parent), KommanderWidget((QObject *) this) { QStringList states; states << "default"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kommander/widgets/textbrowser.h new/kdewebdev/kommander/widgets/textbrowser.h --- old/kdewebdev/kommander/widgets/textbrowser.h 2004-09-24 14:21:06.000000000 +0200 +++ new/kdewebdev/kommander/widgets/textbrowser.h 2007-06-09 04:38:33.000000000 +0200 @@ -33,7 +33,7 @@ Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - TextBrowser(QWidget*, const char*); + TextBrowser(QWidget*); virtual ~TextBrowser(); virtual bool isKommanderWidget() const; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kommander/widgets/widgets.desktop new/kdewebdev/kommander/widgets/widgets.desktop --- old/kdewebdev/kommander/widgets/widgets.desktop 2007-05-29 07:18:49.000000000 +0200 +++ new/kdewebdev/kommander/widgets/widgets.desktop 2007-06-16 07:26:49.000000000 +0200 @@ -17,7 +17,6 @@ Name[lt]=Valdikliai Name[ms]=Wijet Name[pl]=Elementy interfejsu -Name[pt]=Elementos Name[pt_BR]=Janelas Name[ru]=Виджеты (элементы интерфейса) Name[sl]=Gradniki diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kommander/x-kommander.desktop new/kdewebdev/kommander/x-kommander.desktop --- old/kdewebdev/kommander/x-kommander.desktop 2007-05-29 07:18:49.000000000 +0200 +++ new/kdewebdev/kommander/x-kommander.desktop 2007-06-16 07:26:49.000000000 +0200 @@ -25,7 +25,6 @@ Comment[nl]=Kommander-dialoogbestand Comment[pa]=Kommander ਫਾਇਲ Comment[pl]=Plik Kommandera -Comment[pt]=Ficheiro do Kommander Comment[pt_BR]=Arquivo do Kommander Comment[ru]=Файл Kommander Comment[sl]=Datoteka Kommanderja diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kxsldbg/kxsldbg.desktop new/kdewebdev/kxsldbg/kxsldbg.desktop --- old/kdewebdev/kxsldbg/kxsldbg.desktop 2007-05-29 07:18:49.000000000 +0200 +++ new/kdewebdev/kxsldbg/kxsldbg.desktop 2007-06-16 07:26:49.000000000 +0200 @@ -28,7 +28,6 @@ GenericName[nds]=XSLT-Fehlersöker GenericName[nl]=XSLT-debugger GenericName[pl]=Debuger XSLT -GenericName[pt]=Depuração de XSLT GenericName[pt_BR]=Debugger para XSLT GenericName[ro]=Depanator XSLT GenericName[ru]=Отладчик XSLT diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/data/config/quanta_preview_config.desktop new/kdewebdev/quanta/data/config/quanta_preview_config.desktop --- old/kdewebdev/quanta/data/config/quanta_preview_config.desktop 2007-05-29 07:18:49.000000000 +0200 +++ new/kdewebdev/quanta/data/config/quanta_preview_config.desktop 2007-06-16 07:26:49.000000000 +0200 @@ -26,7 +26,6 @@ Name[nds]=KHTML-Browserkomponent inrichten Name[nl]=KHTML Browser Part configuratie Name[pl]=Konfiguracja osadzalnej części przeglądarki KHTML -Name[pt]=Configurar a Parte de Navegação HTML Name[pt_BR]=Configurar o Componente KHTML do Navegador Name[ru]=Настроить компонент просмтра KHTML Name[sl]=Nastavite del brskalnika KHTML diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/CMakeLists.txt new/kdewebdev/quanta/plugins/CMakeLists.txt --- old/kdewebdev/quanta/plugins/CMakeLists.txt 2007-04-04 21:28:04.000000000 +0200 +++ new/kdewebdev/quanta/plugins/CMakeLists.txt 2007-06-14 20:32:56.000000000 +0200 @@ -1,6 +1,6 @@ add_subdirectory( createproject ) -#add_subdirectory( project ) +add_subdirectory( project ) add_subdirectory( structuretree ) add_subdirectory( tagdialogs ) add_subdirectory( filestree ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/createproject/kdevcreatequantaproject.desktop new/kdewebdev/quanta/plugins/createproject/kdevcreatequantaproject.desktop --- old/kdewebdev/quanta/plugins/createproject/kdevcreatequantaproject.desktop 2006-09-20 00:26:43.000000000 +0200 +++ new/kdewebdev/quanta/plugins/createproject/kdevcreatequantaproject.desktop 2007-06-22 07:15:47.000000000 +0200 @@ -3,10 +3,15 @@ Type=Service Exec=blubb Name=KDevCreateQuantaProject +Name[it]=Crea progetto Quanta Name[x-test]=xxKDevCreateQuantaProjectxx GenericName=CreateQuantaProject Plugin +GenericName[el]=Πρόσθετο δημιουργίας έργου Quanta +GenericName[it]=Plugin per creare un progetto Quanta GenericName[x-test]=xxCreateQuantaProject Pluginxx Comment=CreateQuantaProject Description +Comment[el]=Περιγραφή δημιουργίας έργου Quanta +Comment[it]=Crea un progetto di Quanta Comment[x-test]=xxCreateQuantaProject Descriptionxx Icon=kdevelop ServiceTypes=KDevelop/Plugin diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/filestree/kdevquantafilestree.desktop new/kdewebdev/quanta/plugins/filestree/kdevquantafilestree.desktop --- old/kdewebdev/quanta/plugins/filestree/kdevquantafilestree.desktop 2006-09-20 00:26:43.000000000 +0200 +++ new/kdewebdev/quanta/plugins/filestree/kdevquantafilestree.desktop 2007-06-22 07:15:47.000000000 +0200 @@ -3,10 +3,15 @@ Type=Service Exec=blubb Name=KDevQuantaFilesTree +Name[it]=Albero dei file di Quanta Name[x-test]=xxKDevQuantaFilesTreexx GenericName=Quanta Files Tree Plugin +GenericName[el]=Πρόσθετο δέντρου αρχείων Quanta +GenericName[it]=Plugin per l'albero dei file di Quanta GenericName[x-test]=xxQuanta Files Tree Pluginxx Comment=The Files Tree provides an interface to work with your filesystem +Comment[el]=Το δέντρο αρχείων προσφέρει μια διασύνδεση εργασίας με το σύστημα αρχείων σας +Comment[it]=L'albero dei file fornisce un'interfaccia per lavorare con il tuo filesystem Comment[x-test]=xxThe Files Tree provides an interface to work with your filesystemxx Icon=system ServiceTypes=KDevelop/Plugin diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/preview/kdevhtmlpreview.desktop new/kdewebdev/quanta/plugins/preview/kdevhtmlpreview.desktop --- old/kdewebdev/quanta/plugins/preview/kdevhtmlpreview.desktop 2006-09-20 00:26:43.000000000 +0200 +++ new/kdewebdev/quanta/plugins/preview/kdevhtmlpreview.desktop 2007-06-22 07:15:47.000000000 +0200 @@ -3,10 +3,15 @@ Type=Service Exec=blubb Name=KDevHTMLPreview +Name[it]=Anteprima HTML Name[x-test]=xxKDevHTMLPreviewxx GenericName=HTMLPreview Plugin +GenericName[el]=Πρόσθετο προεπισκόπησης HTML +GenericName[it]=Plugin di anteprima HTML GenericName[x-test]=xxHTMLPreview Pluginxx Comment=HTMLPreview Description +Comment[el]=Περιγραφή προεπισκόπησης HTML +Comment[it]=Anteprima HTML Comment[x-test]=xxHTMLPreview Descriptionxx Icon=konqueror ServiceTypes=KDevelop/Plugin diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/project/CMakeLists.txt new/kdewebdev/quanta/plugins/project/CMakeLists.txt --- old/kdewebdev/quanta/plugins/project/CMakeLists.txt 2006-05-12 19:57:07.000000000 +0200 +++ new/kdewebdev/quanta/plugins/project/CMakeLists.txt 2007-06-14 20:32:56.000000000 +0200 @@ -1,12 +1,4 @@ +#add_subdirectory( quantaproject ) +#add_subdirectory( projecttree ) +add_subdirectory( projectfilemanager ) -add_subdirectory( quantaproject ) -add_subdirectory( projecttree ) - - - - -#original Makefile.am contents follow: - -#SUBDIRS = quantaproject projecttree -#_SOURCES = PROJECTDOM.dtd -# diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/project/projectfilemanager/CMakeLists.txt new/kdewebdev/quanta/plugins/project/projectfilemanager/CMakeLists.txt --- old/kdewebdev/quanta/plugins/project/projectfilemanager/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kdewebdev/quanta/plugins/project/projectfilemanager/CMakeLists.txt 2007-06-20 19:16:16.000000000 +0200 @@ -0,0 +1,32 @@ +include_directories( + ${CMAKE_SOURCE_DIR}/quanta/lib + ${CMAKE_BINARY_DIR}/quanta/lib + ${KDE4_INCLUDE_DIR}/kdevplatform + ${KDE4_INCLUDE_DIR}/kdevplatform/interfaces + ${KDE4_INCLUDE_DIR}/kdevplatform/project + ) + +########### next target ############### + +set(quantaprojectfilemanager_PART_SRCS + quantaprojectfilemanager.cpp + ) + +kde4_automoc(${quantaprojectfilemanager_PART_SRCS}) + +#kde4_add_ui_files(quantaprojectfilemanager_PART_SRCS +# projecttreeglobalconfigbase.ui +# projecttreeprojectconfigbase.ui ) + +kde4_add_plugin(quantaprojectfilemanager ${quantaprojectfilemanager_PART_SRCS}) + +target_link_libraries(quantaprojectfilemanager kdevquanta kdevplatforminterfaces kdevplatformproject ${KDE4_KDECORE_LIBS} ) + +install(TARGETS quantaprojectfilemanager DESTINATION ${PLUGIN_INSTALL_DIR}) + + +########### install files ############### + +install( FILES quantaprojectfilemanager.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install( FILES quantaprojectfilemanager.rc DESTINATION ${DATA_INSTALL_DIR}/quantaprojectfilemanager) + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.cpp new/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.cpp --- old/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.cpp 2007-06-20 19:16:16.000000000 +0200 @@ -0,0 +1,173 @@ +/*************************************************************************** + * Copyright (C) 2007 - Andras Mantia <amantia(a)kde.org> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; version 2 of the License. * + * * + * See COPYING file that comes with this distribution for details. * + ***************************************************************************/ + +#include "quantaprojectfilemanager.h" + +#include <icore.h> +#include <iproject.h> +#include <iuicontroller.h> +#include <projectmodel.h> + +#include <kdebug.h> +#include <kio/netaccess.h> +#include <kmessagebox.h> +#include <kgenericfactory.h> +#include <kparts/mainwindow.h> + +#include <QDomDocument> +#include <QDir> +#include <QFile> +#include <QStack> + +typedef KGenericFactory<QuantaProjectFileManager> QuantaProjectFileManagerFactory; +K_EXPORT_COMPONENT_FACTORY( quantaprojectfilemanager, QuantaProjectFileManagerFactory( "quantaprojectfilemanager" ) ) + + QuantaProjectFileManager::QuantaProjectFileManager(QObject *parent, const QStringList &args): KDevelop::IPlugin( QuantaProjectFileManagerFactory::componentData(), parent ), KDevelop::IProjectFileManager() +{ + kDebug(24000) << "Creating QuantaProjectFileManager Part" << endl; + KDEV_USE_EXTENSION_INTERFACE( KDevelop::IProjectFileManager ) + Q_UNUSED(args) +} + + +QuantaProjectFileManager::~QuantaProjectFileManager() +{ +} + +KDevelop::ProjectItem* QuantaProjectFileManager::import(KDevelop::IProject *project) +{ + m_project = project; + m_baseItem = new KDevelop::ProjectItem(project, project->folder().pathOrUrl(), 0L); + kDebug(24000) << "Importing project url: " << project->folder() << " base item: " << m_baseItem->url() << endl; + emit folderAdded(m_baseItem); + return m_baseItem; +} + +QList<KDevelop::ProjectFolderItem*> QuantaProjectFileManager::parse(KDevelop::ProjectFolderItem *base) +{ + KUrl url = base->url(); + url.adjustPath(KUrl::AddTrailingSlash); + url.setFileName(base->project()->name() + ".webprj"); + kDebug(24000) << "Parsing project file: " << url << endl; + QString projectTmpFile; + KParts::MainWindow *mainWindow = core()->uiController()->activeMainWindow(); + QDomDocument dom; + + // test if url is writeable and download to local file + if (KIO::NetAccess::exists(url, false, mainWindow) && + KIO::NetAccess::download(url, projectTmpFile, mainWindow)) + { + QFile f(projectTmpFile); + if (f.open(IO_ReadOnly)) + { + KUrl baseURL = url; + baseURL.setPath(url.directory()); + if (baseURL.isLocalFile()) + { + QDir dir(baseURL.path()); + baseURL.setPath(dir.canonicalPath()); + baseURL.adjustPath(KUrl::RemoveTrailingSlash); + } + dom.setContent(&f); + kDebug(24000) << "Project content: " << dom.toString() << endl; + f.close(); + } + } else + { + KMessageBox::error(mainWindow, i18n("<qt>Cannot access the project file <b>%1</b>.</qt>").arg(url.pathOrUrl())); + return QList<KDevelop::ProjectFolderItem*>(); + } + +/* + const QString prefix = "Item - "; + KSharedConfigPtr projectConfig = m_project->projectConfiguration(); + QStringList groupList = projectConfig->groupList(); + QMap<KUrl, KDevelop::ProjectFolderItem*> folderList; + KUrl baseUrl = base->url(); + folderList.insert(baseUrl, base); + QStack<KUrl> urlStack; + QString relFileName; + KUrl url, fileUrl; + KDevelop::ProjectFolderItem *parent; + + //Just for testing with more files +// KUrl::List urls = ExtFileInfo::allFiles(m_baseItem->url(), "*"); +// foreach( KUrl fileUrl, urls) + + foreach (QString group, groupList) + { + if (! group.startsWith(prefix)) + continue; + + relFileName = group.mid(prefix.length()); + fileUrl = m_project->urlRelativeToProject(relFileName); + parent = m_baseItem; + url = fileUrl.upUrl(); + // search for not yet created folders + while (url != baseUrl) + { + if (folderList.contains(url)) + { + parent = folderList[url]; + break; + } + urlStack.push(url); + url = url.upUrl(); + } + // add new folders + while (! urlStack.isEmpty()) + { + KDevelop::ProjectFolderItem *item = new KDevelop::ProjectFolderItem(m_project, urlStack.top(), parent); + parent->add(item); + folderList.insert(urlStack.pop(), item); + parent = item; + emit folderAdded(item); + } + // add the file + KDevelop::ProjectFileItem *item = new KDevelop::ProjectFileItem(m_project, fileUrl, parent); + parent->add(item); + emit fileAdded(item); + } + return QList<KDevelop::ProjectFolderItem *>();*/ +} + +KDevelop::ProjectFolderItem* QuantaProjectFileManager::addFolder(const KUrl &folder, KDevelop::ProjectFolderItem *parent) +{ + //TODO implement it +} + +KDevelop::ProjectFileItem* QuantaProjectFileManager::addFile(const KUrl &folder, KDevelop::ProjectFolderItem *parent) +{ + //TODO implement it +} +bool QuantaProjectFileManager::removeFolder(KDevelop::ProjectFolderItem *folder) +{ + //TODO implement it +} + +bool QuantaProjectFileManager::removeFile(KDevelop::ProjectFileItem *file) +{ + //TODO implement it +} + +bool QuantaProjectFileManager::renameFile(KDevelop::ProjectFileItem *oldFile, const KUrl &newFile) +{ + //TODO implement it +} + +bool QuantaProjectFileManager::renameFolder(KDevelop::ProjectFolderItem *oldFolder, const KUrl &newFolder) +{ + //TODO implement it +} + +#include "quantaprojectfilemanager.moc" + + +//kate: indent-mode cstyle; space-indent on; indent-width 2; replace-tabs on; mixedindent off; encoding utf-8#include "quantaprojectfilemanager.h" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.desktop new/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.desktop --- old/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.desktop 2007-06-23 07:29:01.000000000 +0200 @@ -0,0 +1,15 @@ +[Desktop Entry] +Type=Service +Name=Quanta Project Importer +Name[el]=Εισαγωγέας έργου Quanta +Name[it]=Importazione di progetti Quanta +Comment=Allow KDevelop to manage Quanta projects +Comment[el]=Επιτρέπει στο KDevelop τη διαχείριση έργων Quanta +Comment[it]=Permetti a KDevelop di gestire i progetti di Quanta +Icon=gear +ServiceTypes=KDevelop/Plugin +X-KDE-Library=quantaprojectfilemanager +X-KDE-PluginInfo-Name=QuantaProjectFileManager +X-KDevelop-FileManager=None +X-KDevelop-Version=4 +X-KDevelop-Interfaces=org.kdevelop.IProjectFileManager diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.h new/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.h --- old/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.h 2007-06-20 19:16:16.000000000 +0200 @@ -0,0 +1,74 @@ +/*************************************************************************** + * Copyright (C) 2007 - Andras Mantia <amantia(a)kde.org> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; version 2 of the License. * + * * + * See COPYING file that comes with this distribution for details. * + **************************************************************************/ + +#ifndef QUANTAPROJECTFILEMANAGER_H +#define QUANTAPROJECTFILEMANAGER_H + +#include <interfaces/iplugin.h> +#include <project/interfaces/iprojectfilemanager.h> + +namespace KDevelop +{ + class ProjectBaseItem; + class ProjectFolderItem; + class ProjectFileItem; + class ProjectItem; +} + +class KDialogBase; + +/** + * @short This class operates on the Quanta specific project file. + * + * @author Andras Mantia <amantia(a)kde.org> +*/ +class QuantaProjectFileManager : public KDevelop::IPlugin, public KDevelop::IProjectFileManager +{ + Q_OBJECT + Q_INTERFACES( KDevelop::IProjectFileManager ) +public: + explicit QuantaProjectFileManager( QObject *parent = 0, + const QStringList &args = QStringList()); + + virtual ~QuantaProjectFileManager(); + + //Reimplemented methods from IProjectFileManager + virtual QList<KDevelop::ProjectFolderItem*> parse(KDevelop::ProjectFolderItem *dom); + /** + * Create the root project item for a project. + * @param project the project + * @return the root item + */ + virtual KDevelop::ProjectItem* import(KDevelop::IProject *project); + virtual KDevelop::ProjectFolderItem* addFolder(const KUrl &folder, KDevelop::ProjectFolderItem *parent); + virtual KDevelop::ProjectFileItem* addFile(const KUrl &folder, KDevelop::ProjectFolderItem *parent); + virtual bool removeFolder(KDevelop::ProjectFolderItem *folder); + virtual bool removeFile(KDevelop::ProjectFileItem *file); + virtual bool renameFile(KDevelop::ProjectFileItem *oldFile, const KUrl &newFile); + virtual bool renameFolder(KDevelop::ProjectFolderItem *oldFolder, const KUrl &newFolder); + +Q_SIGNALS: + //Declare again the signals as IProjectFileManager doesn't inherit from QObject + void projectItemConfigWidget(const QList<KDevelop::ProjectBaseItem*> &dom, KDialogBase *dialog); + void folderAdded( KDevelop::ProjectFolderItem* folder ); + void folderRemoved( KDevelop::ProjectFolderItem* folder ); + void folderRenamed( const KUrl& oldFolder, KDevelop::ProjectFolderItem* newFolder ); + void fileAdded(KDevelop::ProjectFileItem* file); + void fileRemoved(KDevelop::ProjectFileItem* file); + void fileRenamed(const KUrl& oldFile, KDevelop::ProjectFileItem* newFile); + +private: + KDevelop::ProjectItem *m_baseItem; + KDevelop::IProject *m_project; +}; + +#endif + +//kate: indent-mode cstyle; space-indent on; indent-width 2; replace-tabs on; mixedindent off; encoding utf-8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.rc new/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.rc --- old/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.rc 1970-01-01 01:00:00.000000000 +0100 +++ new/kdewebdev/quanta/plugins/project/projectfilemanager/quantaprojectfilemanager.rc 2007-06-14 20:32:56.000000000 +0200 @@ -0,0 +1,3 @@ +<!DOCTYPE kpartgui> +<kpartplugin name="projecttree" library="libquantaprojectfilemanager" version="1"> +</kpartplugin> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/project/projecttree/kdevprojecttree.desktop new/kdewebdev/quanta/plugins/project/projecttree/kdevprojecttree.desktop --- old/kdewebdev/quanta/plugins/project/projecttree/kdevprojecttree.desktop 2006-09-20 00:26:43.000000000 +0200 +++ new/kdewebdev/quanta/plugins/project/projecttree/kdevprojecttree.desktop 2007-06-22 07:15:47.000000000 +0200 @@ -3,10 +3,15 @@ Type=Service Exec=blubb Name=KDevProjectTree +Name[it]=Albero dei progetti Name[x-test]=xxKDevProjectTreexx GenericName=ProjectTree Plugin +GenericName[el]=Πρόσθετο δέντρου έργου +GenericName[it]=Plugin per l'albero dei progetti GenericName[x-test]=xxProjectTree Pluginxx Comment=ProjectTree Description +Comment[el]=Περιγραφή δέντρου έργου +Comment[it]=Albero dei progetti Comment[x-test]=xxProjectTree Descriptionxx Icon=folder_green ServiceTypes=KDevelop/Plugin diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/project/quantaproject/kdevquantaproject.desktop new/kdewebdev/quanta/plugins/project/quantaproject/kdevquantaproject.desktop --- old/kdewebdev/quanta/plugins/project/quantaproject/kdevquantaproject.desktop 2006-09-20 00:26:43.000000000 +0200 +++ new/kdewebdev/quanta/plugins/project/quantaproject/kdevquantaproject.desktop 2007-06-22 07:15:47.000000000 +0200 @@ -3,10 +3,15 @@ Type=Service Exec=blubb Name=KDevQuantaProject +Name[it]=Progetto Quanta Name[x-test]=xxKDevQuantaProjectxx GenericName=Quantaproject Plugin +GenericName[el]=Πρόσθετο έργου Quanta +GenericName[it]=Plugin per progetti Quanta GenericName[x-test]=xxQuantaproject Pluginxx Comment=QuantaProject Description +Comment[el]=Περιγραφή έργου Quanta +Comment[it]=Progetto Quanta Comment[x-test]=xxQuantaProject Descriptionxx Icon=quanta ServiceTypes=KDevelop/Project diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/structuretree/kdevstructuretree.desktop new/kdewebdev/quanta/plugins/structuretree/kdevstructuretree.desktop --- old/kdewebdev/quanta/plugins/structuretree/kdevstructuretree.desktop 2006-09-20 00:26:43.000000000 +0200 +++ new/kdewebdev/quanta/plugins/structuretree/kdevstructuretree.desktop 2007-06-22 07:15:47.000000000 +0200 @@ -3,10 +3,15 @@ Type=Service Exec=blubb Name=KDevStructureTree +Name[it]=Albero di struttura Name[x-test]=xxKDevStructureTreexx GenericName=Structure Tree Plugin +GenericName[el]=Πρόσθετο δέντρου δομής +GenericName[it]=Plugin per alberi di struttura GenericName[x-test]=xxStructure Tree Pluginxx Comment=The Structure Tree is a view on the stucture of the document. +Comment[el]=Το δέντρο δομής είναι μια προβολή της δομής του εγγράφου. +Comment[it]=L'albero di struttura è una vista della struttura del documento. Comment[x-test]=xxThe Structure Tree is a view on the stucture of the document.xx Icon=view_tree ServiceTypes=KDevelop/Plugin diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/tagdialogs/kdevtagdialogs.desktop new/kdewebdev/quanta/plugins/tagdialogs/kdevtagdialogs.desktop --- old/kdewebdev/quanta/plugins/tagdialogs/kdevtagdialogs.desktop 2006-09-20 00:26:43.000000000 +0200 +++ new/kdewebdev/quanta/plugins/tagdialogs/kdevtagdialogs.desktop 2007-06-22 07:15:47.000000000 +0200 @@ -3,10 +3,15 @@ Type=Service Exec=blubb Name=KDevTagDialogs +Name[it]=Finestre dei tag Name[x-test]=xxKDevTagDialogsxx GenericName=TagDialogs Plugin +GenericName[el]=Πρόσθετο διαλόγων ετικετών +GenericName[it]=Plugin per le finestre dei tag GenericName[x-test]=xxTagDialogs Pluginxx Comment=TagDialogs Description +Comment[el]=Περιγραφή διαλόγων ετικετών +Comment[it]=Finestre dei tag Comment[x-test]=xxTagDialogs Descriptionxx Icon=view_sidetree ServiceTypes=KDevelop/Plugin,KDevelop/TagDialogs diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/templatestree/kdevtemplatestree.desktop new/kdewebdev/quanta/plugins/templatestree/kdevtemplatestree.desktop --- old/kdewebdev/quanta/plugins/templatestree/kdevtemplatestree.desktop 2006-09-20 00:26:43.000000000 +0200 +++ new/kdewebdev/quanta/plugins/templatestree/kdevtemplatestree.desktop 2007-06-22 07:15:47.000000000 +0200 @@ -3,10 +3,15 @@ Type=Service Exec=blubb Name=KDevTemplatesTree +Name[it]=Albero dei modelli Name[x-test]=xxKDevTemplatesTreexx GenericName=TemplatesTree Plugin +GenericName[el]=Πρόσθετο δέντρου προτύπων +GenericName[it]=Plugin per l'albero dei modelli GenericName[x-test]=xxTemplatesTree Pluginxx Comment=TemplatesTree Description +Comment[el]=Περιγραφή δέντρου προτύπων +Comment[it]=Albero dei modelli Comment[x-test]=xxTemplatesTree Descriptionxx Icon=template_source ServiceTypes=KDevelop/Plugin diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/usertoolbars/kdevusertoolbars.desktop new/kdewebdev/quanta/plugins/usertoolbars/kdevusertoolbars.desktop --- old/kdewebdev/quanta/plugins/usertoolbars/kdevusertoolbars.desktop 2006-09-20 00:26:43.000000000 +0200 +++ new/kdewebdev/quanta/plugins/usertoolbars/kdevusertoolbars.desktop 2007-06-22 07:15:47.000000000 +0200 @@ -3,10 +3,15 @@ Type=Service Exec=blubb Name=KDevUserToolbars +Name[it]=Barre dell'utente Name[x-test]=xxKDevUserToolbarsxx GenericName=UserToolbars Plugin +GenericName[el]=Πρόσθετο γραμμών εργαλείων χρήστη +GenericName[it]=Plugin per le barre dell'utente GenericName[x-test]=xxUserToolbars Pluginxx Comment=UserToolbars Description +Comment[el]=Περιγραφή γραμμών εργαλείων χρήστη +Comment[it]=Barre dell'utente Comment[x-test]=xxUserToolbars Descriptionxx Icon=kdevelop ServiceTypes=KDevelop/Plugin,KDevelop/UserToolbars diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/quantacore/kdevquantacore.desktop new/kdewebdev/quanta/quantacore/kdevquantacore.desktop --- old/kdewebdev/quanta/quantacore/kdevquantacore.desktop 2006-09-20 00:26:43.000000000 +0200 +++ new/kdewebdev/quanta/quantacore/kdevquantacore.desktop 2007-06-22 07:15:47.000000000 +0200 @@ -3,10 +3,14 @@ Type=Service Exec=blubb Comment=Quanta Core +Comment[el]=Ο πυρήνας του Quanta +Comment[it]=Nocciolo di Quanta Comment[x-test]=xxQuanta Corexx Name=KDevQuantaCore +Name[it]=Nocciolo di Quanta Name[x-test]=xxKDevQuantaCorexx GenericName=Quanta Core +GenericName[it]=Nocciolo di Quanta GenericName[x-test]=xxQuanta Corexx ServiceTypes=KDevelop/Plugin,KDevelop/Quanta Icon=kdevelop diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/src/kdevplatformquanta.desktop new/kdewebdev/quanta/src/kdevplatformquanta.desktop --- old/kdewebdev/quanta/src/kdevplatformquanta.desktop 2007-06-08 11:14:53.000000000 +0200 +++ new/kdewebdev/quanta/src/kdevplatformquanta.desktop 2007-06-22 07:15:47.000000000 +0200 @@ -2,6 +2,8 @@ Encoding=UTF-8 Icon= Name=KDevelop Project Interface +Name[el]=Διασύνδεση έργου KDevelop +Name[it]=Interfaccia con il progetto KDevelop Name[x-test]=xxKDevelop Project Interfacexx Type=ServiceType X-KDE-Derived=KDevelop/Plugin diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/src/quanta.desktop new/kdewebdev/quanta/src/quanta.desktop --- old/kdewebdev/quanta/src/quanta.desktop 2007-03-20 20:20:21.000000000 +0100 +++ new/kdewebdev/quanta/src/quanta.desktop 2007-06-23 08:35:17.000000000 +0200 @@ -4,9 +4,11 @@ Encoding=UTF-8 Exec=quanta %u GenericName=IDE for Web Development +GenericName[el]=Περιβάλλον ανάπτυξης ιστοσελίδων +GenericName[it]=Ambiente integrato per lo sviluppo Web GenericName[x-test]=xxIDE for Web Developmentxx Icon=quanta -MimeType=application/x-kdevelop;application/x-php;text/css;application/docbook+xml;text/html;application/xml +MimeType=application/x-kdevelop;application/x-php;text/css;application/docbook+xml;text/html;application/xml; Name=Quanta Plus Name[br]=Quanta+ Name[sv]=Quanta plus ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdevplatform4
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package kdevplatform4 checked in at Sun Jun 24 11:53:45 CEST 2007. -------- --- KDE/kdevplatform4/kdevplatform4.changes 2007-06-11 11:38:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdevplatform4/kdevplatform4.changes 2007-06-23 10:17:48.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jun 23 10:17:45 CEST 2007 - stbinner(a)suse.de + +- update to 3.90.1.svn678425 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevplatform4.spec ++++++ --- /var/tmp/diff_new_pack.d22031/_old 2007-06-24 11:53:30.000000000 +0200 +++ /var/tmp/diff_new_pack.d22031/_new 2007-06-24 11:53:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdevplatform4 (Version 3.90.1.svn672307) +# spec file for package kdevplatform4 (Version 3.90.1.svn678425) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,8 +15,8 @@ Group: Development/Tools/IDE Summary: Base Package for Integrated Development Environments URL: http://www.kdevelop.org -Version: 3.90.1.svn672307 -Release: 4 +Version: 3.90.1.svn678425 +Release: 1 Source0: kdevplatform.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -143,7 +143,6 @@ %files %defattr(-,root,root) /usr/%_lib/kde4/kcm_kdev_uisettings.so -/usr/%_lib/kde4/kdevcvs.so /usr/%_lib/kde4/kdevduchainview.so /usr/%_lib/kde4/kdevfilemanager.so /usr/%_lib/kde4/kdevgenericmanager.so @@ -152,14 +151,12 @@ /usr/%_lib/kde4/kdevsnippet.so /usr/%_lib/kde4/kdevstandardoutputview.so /usr/%_lib/kde4/kdevsubversion.so -/usr/share/kde4/apps/kdevcvs /usr/share/kde4/apps/kdevduchainview /usr/share/kde4/apps/kdevfilemanager /usr/share/kde4/apps/kdevprojectmanagerview /usr/share/kde4/apps/kdevstandardoutputview /usr/share/kde4/apps/kdevsubversion /usr/share/kde4/services/kcm_kdev_uisettings.desktop -/usr/share/kde4/services/kdevcvs.desktop /usr/share/kde4/services/kdevduchainview.desktop /usr/share/kde4/services/kdevfilemanager.desktop /usr/share/kde4/services/kdevgenericmanager.desktop @@ -171,6 +168,8 @@ /usr/share/kde4/servicetypes/kdevelopplugin.desktop %changelog +* Sat Jun 23 2007 - stbinner(a)suse.de +- update to 3.90.1.svn678425 * Mon Jun 11 2007 - stbinner(a)suse.de - reduce build requires * Fri Jun 08 2007 - stbinner(a)suse.de ++++++ kdevplatform.tar.bz2 ++++++ ++++ 64310 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MesaGLw
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package MesaGLw checked in at Sun Jun 24 11:53:38 CEST 2007. -------- --- MesaGLw/MesaGLw.changes 2007-06-21 16:13:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/MesaGLw/MesaGLw.changes 2007-06-23 04:54:52.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jun 23 04:54:33 CEST 2007 - sndirsch(a)suse.de + +- updated to final release 7.0 + +------------------------------------------------------------------- Old: ---- MesaLib-7.0-rc1.tar.gz New: ---- MesaLib-7.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MesaGLw.spec ++++++ --- /var/tmp/diff_new_pack.p22237/_old 2007-06-24 11:53:33.000000000 +0200 +++ /var/tmp/diff_new_pack.p22237/_new 2007-06-24 11:53:33.000000000 +0200 @@ -18,9 +18,9 @@ Provides: Mesa:/usr/%{_lib}/libGLw.so.1 Autoreqprov: on Version: 7.0 -Release: 1 +Release: 2 Summary: Mesa Widget library -Source: MesaLib-%{version}-rc1.tar.gz +Source: MesaLib-%{version}.tar.bz2 Patch: GLw-motif.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -85,6 +85,8 @@ /usr/%{_lib}/libGLw.so %changelog +* Sat Jun 23 2007 - sndirsch(a)suse.de +- updated to final release 7.0 * Thu Jun 21 2007 - sndirsch(a)suse.de - updated Mesa to release 7.0 RC1 * Mesa 7.0 is a stable, follow-on release to Mesa 6.5.3. The only ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 Mesa
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package Mesa checked in at Sun Jun 24 11:53:25 CEST 2007. -------- --- Mesa/Mesa.changes 2007-06-21 16:13:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/Mesa/Mesa.changes 2007-06-23 04:52:15.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jun 23 04:51:48 CEST 2007 - sndirsch(a)suse.de + +- updated to final release 7.0 + +------------------------------------------------------------------- Old: ---- MesaDemos-7.0-rc1.tar.gz MesaLib-7.0-rc1.tar.gz New: ---- MesaDemos-7.0.tar.bz2 MesaLib-7.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.U20674/_old 2007-06-24 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.U20674/_new 2007-06-24 11:53:16.000000000 +0200 @@ -19,10 +19,10 @@ Obsoletes: xorg-x11-Mesa Autoreqprov: on Version: 7.0 -Release: 1 +Release: 2 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.* -Source: MesaLib-%{version}-rc1.tar.gz -Source1: MesaDemos-%{version}-rc1.tar.gz +Source: MesaLib-%{version}.tar.bz2 +Source1: MesaDemos-%{version}.tar.bz2 Source3: README.updates Source4: manual-pages.tar.bz2 Source5: via.csh @@ -265,6 +265,8 @@ /usr/%{_lib}/libMesaGL.a %changelog +* Sat Jun 23 2007 - sndirsch(a)suse.de +- updated to final release 7.0 * Thu Jun 21 2007 - sndirsch(a)suse.de - updated Mesa to release 7.0 RC1 * Mesa 7.0 is a stable, follow-on release to Mesa 6.5.3. The only ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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