May 2009 - openSUSE Commits - openSUSE Mailing Lists

commit kdebase4-openSUSE for openSUSE:Factory
by root＠Hilbert.suse.de 15 May '09

15 May '09

Hello community, here is the log from the commit of package kdebase4-openSUSE for openSUSE:Factory checked in at Sat May 16 00:35:23 CEST 2009. -------- --- KDE/kdebase4-openSUSE/kdebase4-openSUSE.changes 2009-05-02 19:19:22.000000000 +0200 +++ kdebase4-openSUSE/kdebase4-openSUSE.changes 2009-05-10 16:55:10.000000000 +0200 @@ -1,0 +2,7 @@ +Sun May 10 12:21:27 CEST 2009 - beineri(a)opensuse.org + +- special SUSEgreeter splash for development releases +- add (web)pin search provider definition +- don't require kde-susetranslations + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- devel-splash.tar.bz2 pin.desktop ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.tK3733/_old 2009-05-16 00:33:09.000000000 +0200 +++ /var/tmp/diff_new_pack.tK3733/_new 2009-05-16 00:33:09.000000000 +0200 @@ -26,9 +26,11 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 11.2 -Release: 7 +Release: 8 Source0: kdebase4-openSUSE-%{version}.tar.bz2 -Requires: kdebase4-workspace kde-susetranslations +Source1: pin.desktop +Source2: devel-splash.tar.bz2 +Requires: kdebase4-workspace Provides: kdebase4-SuSE = 11.0 Obsoletes: kdebase4-SuSE <= 11.0 Recommends: kde4-kio_sysinfo = %version @@ -176,7 +178,7 @@ %endif %prep -%setup -q -n %name +%setup -q -n %name -b 2 %build %cmake_kde4 -d build @@ -191,6 +193,7 @@ done cp -a config-files/* $RPM_BUILD_ROOT cp -a branding/root/* $RPM_BUILD_ROOT + install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/kde4/services/searchproviders/ gzip $RPM_BUILD_ROOT/usr/share/kde4/apps/desktoptheme/default/widgets/branding.svg mv $RPM_BUILD_ROOT/usr/share/kde4/apps/desktoptheme/default/widgets/branding.svg.gz $RPM_BUILD_ROOT/usr/share/kde4/apps/desktoptheme/default/widgets/branding.svgz chmod og-w -R "${RPM_BUILD_ROOT}" @@ -305,6 +308,10 @@ /usr/share/kde4/apps/kdm/pics %changelog +* Sun May 10 2009 beineri(a)opensuse.org +- special SUSEgreeter splash for development releases +- add (web)pin search provider definition +- don't require kde-susetranslations * Sat May 02 2009 beineri(a)opensuse.org - add kdebase4-runtime-branding-openSUSE sub-package * Fri Apr 24 2009 coolo(a)suse.de ++++++ pin.desktop ++++++ [Desktop Entry] Charset= Hidden=false Keys=pin Name=openSUSE Webpin Search Query=http://packages.opensuse-community.org/index.jsp?searchTerm=\\{@}&dis… ServiceTypes=SearchProvider Type=Service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kipi-plugins for openSUSE:Factory
by root＠Hilbert.suse.de 15 May '09

15 May '09

Hello community, here is the log from the commit of package kipi-plugins for openSUSE:Factory checked in at Sat May 16 00:31:01 CEST 2009. -------- --- KDE/kipi-plugins/kipi-plugins.changes 2009-04-20 18:09:14.000000000 +0200 +++ kipi-plugins/kipi-plugins.changes 2009-05-12 09:51:09.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 12 09:28:59 CEST 2009 - beineri(a)opensuse.org + +- update to 0.3 release: several bugfixes and + * PicasaWebExport : Support protected albums (sign-in required) + * PrintImages : Added per photo print management. + * PrintImages : Added Atkins page layout printing. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kipi-plugins-0.2.0.tar.bz2 New: ---- kipi-plugins-0.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kipi-plugins.spec ++++++ --- /var/tmp/diff_new_pack.a13233/_old 2009-05-16 00:29:20.000000000 +0200 +++ /var/tmp/diff_new_pack.a13233/_new 2009-05-16 00:29:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kipi-plugins (Version 0.2) +# spec file for package kipi-plugins (Version 0.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,8 @@ Name: kipi-plugins -BuildRequires: imlib2-devel libkdepim4-devel -BuildRequires: libkdcraw7-devel libkexiv2-7-devel libkipi-devel -BuildRequires: cmake libexpat-devel libgcrypt-devel -BuildRequires: libgphoto2-devel libksane-devel +BuildRequires: imlib2-devel libkdcraw-devel libkdepim4-devel libkexiv2-devel libkipi-devel +BuildRequires: cmake libexpat-devel libgcrypt-devel libgphoto2-devel libksane-devel %if %suse_version > 1020 #BuildRequires: libgpod-devel %endif @@ -30,9 +28,9 @@ Url: http://www.kipi-plugins.org/ Group: Productivity/Graphics/Other Summary: KDE Plug-Ins for Image Manipulation -Version: 0.2 +Version: 0.3 Release: 1 -%define rversion 0.2.0 +%define rversion 0.3.0 Recommends: dcraw Requires: /usr/bin/jpegtran Requires: %{name}-lang = %{version} @@ -172,8 +170,17 @@ %_kde_share_dir/services/kipiplugin_acquireimages.desktop %_kde4_modules/kipiplugin_advancedslideshow.so %_kde_share_dir/apps/kipiplugin_advancedslideshow +%if %suse_version < 1120 +%dir /usr/share/locale/hne +%dir /usr/share/locale/hne/LC_MESSAGES +%endif %changelog +* Tue May 12 2009 beineri(a)opensuse.org +- update to 0.3 release: several bugfixes and + * PicasaWebExport : Support protected albums (sign-in required) + * PrintImages : Added per photo print management. + * PrintImages : Added Atkins page layout printing. * Mon Apr 20 2009 dmueller(a)suse.de - rename kde4-kipi-plugins to kipi-plugins * Sat Apr 18 2009 beineri(a)opensuse.org ++++++ kipi-plugins-0.2.0.tar.bz2 -> kipi-plugins-0.3.0.tar.bz2 ++++++ ++++ 235430 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 linuxrc for openSUSE:Factory
by root＠Hilbert.suse.de 15 May '09

15 May '09

Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at Sat May 16 00:29:06 CEST 2009. -------- --- linuxrc/linuxrc.changes 2009-02-13 14:48:15.000000000 +0100 +++ linuxrc/linuxrc.changes 2009-05-14 18:03:00.000000000 +0200 @@ -1,0 +2,12 @@ +Thu May 14 18:02:32 CEST 2009 - snwint(a)suse.de + +- s390: falling back to manual mode in network setup has nasty side + effects and is not really necessary to begin with; do away with it + (bnc#471452) +- s390: merge OSAHWAddr feature from SLES10 (bnc#479481) +- s390: ask for relative port number even when device parameters + have been entered manually (bnc#477918) +- netsetup option is not used when doing network install (bnc #495525) +- reintegrate zenworks imaging options + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- linuxrc-3.3.32.tar.bz2 New: ---- linuxrc-3.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.BY9528/_old 2009-05-16 00:28:23.000000000 +0200 +++ /var/tmp/diff_new_pack.BY9528/_new 2009-05-16 00:28:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.3.32) +# spec file for package linuxrc (Version 3.4.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,9 +24,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.3.32 +Version: 3.4.0 Release: 1 -Source: linuxrc-3.3.32.tar.bz2 +Source: linuxrc-3.4.0.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,6 +59,15 @@ %doc linuxrc.html %changelog +* Thu May 14 2009 snwint(a)suse.de +- s390: falling back to manual mode in network setup has nasty side + effects and is not really necessary to begin with; do away with it + (bnc#471452) +- s390: merge OSAHWAddr feature from SLES10 (bnc#479481) +- s390: ask for relative port number even when device parameters + have been entered manually (bnc#477918) +- netsetup option is not used when doing network install (bnc #495525) +- reintegrate zenworks imaging options * Fri Feb 13 2009 snwint(a)suse.de - call gpg with '--ignore-valid-from --ignore-time-conflict' to avoid failing on systems with broken date/time (bnc #456755) @@ -435,7 +444,7 @@ - set min vnc password length to 8 (#184204) - changed tftp to bind to different port for each connection (#187745) - remove libsysfs but for s390 -* Tue Aug 29 2006 ro(a)suse.de +* Wed Aug 30 2006 ro(a)suse.de - added sysfsutils to BuildRequires and -lsysfs to LDFLAGS * Thu Jul 13 2006 trenn(a)suse.de - activate dynamic cpufreq on supported machines (#176791) @@ -874,7 +883,7 @@ - remove more items from cmdline (#30164) * Mon Aug 25 2003 snwint(a)suse.de - allow more net devices in selection list (#28659) -* Tue Aug 19 2003 ro(a)suse.de +* Wed Aug 20 2003 ro(a)suse.de - reduce number of warnings: include stdlib.h for exit - rename "int log" to "int err_log" in insmod stuff - use tmpfs instead of shmfs (will be deprecated soon) ++++++ linuxrc-3.3.32.tar.bz2 -> linuxrc-3.4.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/auto2.c new/linuxrc-3.4.0/auto2.c --- old/linuxrc-3.3.32/auto2.c 2008-11-25 17:49:24.000000000 +0100 +++ new/linuxrc-3.4.0/auto2.c 2009-05-14 17:56:34.000000000 +0200 @@ -36,7 +36,6 @@ #include "url.h" #include "checkmd5.h" -static void auto2_user_netconfig(void); static int driver_is_active(hd_t *hd); static void auto2_progress(char *pos, char *msg); static void auto2_read_repo_files(url_t *url); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/auto2.h new/linuxrc-3.4.0/auto2.h --- old/linuxrc-3.3.32/auto2.h 2008-07-23 15:40:21.000000000 +0200 +++ new/linuxrc-3.4.0/auto2.h 2009-05-14 17:56:34.000000000 +0200 @@ -9,3 +9,4 @@ int auto2_add_extension(char *extension); int auto2_remove_extension(char *extension); void load_drivers(hd_data_t *hd_data, hd_hw_item_t hw_item); +void auto2_user_netconfig(void); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/Changelog new/linuxrc-3.4.0/Changelog --- old/linuxrc-3.3.32/Changelog 2009-02-13 14:47:45.000000000 +0100 +++ new/linuxrc-3.4.0/Changelog 2009-05-14 17:57:38.000000000 +0200 @@ -1,3 +1,15 @@ +14/5/2009: v3.4.0 + - s390: merge OSAHWAddr feature from SLES10 (bnc#479481) + - s390: ask for relative port number even when device parameters + have been entered manually (bnc#477918) + - netsetup option is not used when doing network install (bnc #495525) + - reintegrate zenworks imaging options + +19/2/2009: v3.3.33 + - s390: falling back to manual mode in network setup has nasty side + effects and is not really necessary to begin with; do away with it + (bnc#471452) + 13/2/2009: v3.3.32 - call gpg with '--ignore-valid-from --ignore-time-conflict' to avoid failing on systems with broken date/time (bnc #456755) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/file.c new/linuxrc-3.4.0/file.c --- old/linuxrc-3.3.32/file.c 2009-01-19 13:50:16.000000000 +0100 +++ new/linuxrc-3.4.0/file.c 2009-05-14 17:56:34.000000000 +0200 @@ -238,10 +238,13 @@ { key_osainterface, "OSAInterface", kf_cfg + kf_cmd }, { key_layer2, "Layer2", kf_cfg + kf_cmd }, { key_portno, "PortNo", kf_cfg + kf_cmd }, + { key_osahwaddr, "OSAHWAddr", kf_cfg + kf_cmd }, #endif { key_netwait, "NetWait", kf_cfg + kf_cmd }, { key_newid, "NewID", kf_cfg + kf_cmd_early }, { key_moduledisks, "ModuleDisks", kf_cfg + kf_cmd }, + { key_zen, "Zen", kf_cfg + kf_cmd + kf_cmd_early }, + { key_zenconfig, "ZenConfig", kf_cfg + kf_cmd + kf_cmd_early }, { key_port, "Port", kf_none }, { key_smbshare, "Share", kf_none }, { key_rootimage2, "RootImage2", kf_cfg + kf_cmd }, @@ -1192,6 +1195,9 @@ case key_portno: if(f->is.numeric) config.hwp.portno = f->nvalue + 1; break; + case key_osahwaddr: + if(*f->value) str_copy(&config.hwp.osahwaddr, f->value); + break; #endif case key_netwait: @@ -1206,6 +1212,14 @@ if(f->is.numeric) config.module.disks = f->nvalue; break; + case key_zen: + if(f->is.numeric) config.zen = f->nvalue; + break; + + case key_zenconfig: + if(*f->value) str_copy(&config.zenconfig, f->value); + break; + case key_rootimage2: if(*f->value) str_copy(&config.rootimage2, f->value); break; @@ -1761,6 +1775,10 @@ file_write_str(f, key_netid, config.net.unique_id); file_write_str(f, key_nethwaddr, config.net.hwaddr); file_write_str(f, key_netcardname, config.net.cardname); +#if defined(__s390__) || defined(__s390x__) + if(config.hwp.osahwaddr) file_write_str(f, key_osahwaddr, config.hwp.osahwaddr); + if(config.hwp.layer2) file_write_num(f, key_layer2, config.hwp.layer2 - 1); +#endif file_write_str(f, key_ethtool, config.net.ethtool_used); file_write_inet2(f, key_ip, &config.net.hostname, INET_WRITE_IP_BOTH + INET_WRITE_PREFIX); if(config.net.realhostname) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/file.h new/linuxrc-3.4.0/file.h --- old/linuxrc-3.3.32/file.h 2008-11-11 16:19:00.000000000 +0100 +++ new/linuxrc-3.4.0/file.h 2009-05-14 17:56:34.000000000 +0200 @@ -49,7 +49,8 @@ key_sha1, key_insecure, key_kexec, key_nisdomain, key_nomodprobe, key_device, key_nomdns, key_yepurl, key_yepcert, key_mediacheck, key_y2gdb, key_squash, key_kexec_reboot, key_devbyid, key_braille, key_nfsopts, key_ipv4, key_ipv4only, - key_ipv6, key_ipv6only, key_usesax2, key_efi, key_supporturl, key_portno + key_ipv6, key_ipv6only, key_usesax2, key_efi, key_supporturl, key_portno, + key_osahwaddr, key_zen, key_zenconfig } file_key_t; typedef enum { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/global.h new/linuxrc-3.4.0/global.h --- old/linuxrc-3.3.32/global.h 2008-11-11 17:43:40.000000000 +0100 +++ new/linuxrc-3.4.0/global.h 2009-05-14 17:56:34.000000000 +0200 @@ -325,6 +325,8 @@ unsigned forceip:1; /* do not check for duplicate IP address */ unsigned mediacheck:1; /* check media */ unsigned installfilesread:1; /* already got install files */ + unsigned zen; /* zenworks mode */ + char *zenconfig; /* zenworks config file */ unsigned has_pcmcia:1; /* we've seen a pcmcia chip */ unsigned ntfs_3g:1; /* use ntfs-3g */ unsigned secure:1; /* secure mode (check sha1 of all downloaded files) */ @@ -588,6 +590,7 @@ int medium; int layer2; int portno; + char* osahwaddr; } hwp; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/linuxrc.c new/linuxrc-3.4.0/linuxrc.c --- old/linuxrc-3.3.32/linuxrc.c 2009-01-20 15:59:56.000000000 +0100 +++ new/linuxrc-3.4.0/linuxrc.c 2009-05-14 17:56:34.000000000 +0200 @@ -744,6 +744,8 @@ config.update.map = calloc(1, MAX_UPDATES); + config.zenconfig = strdup("settings.txt"); + util_set_product_dir("suse"); config.net.bootp_timeout = 10; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/net.c new/linuxrc-3.4.0/net.c --- old/linuxrc-3.3.32/net.c 2009-02-11 15:53:45.000000000 +0100 +++ new/linuxrc-3.4.0/net.c 2009-05-14 17:51:13.000000000 +0200 @@ -32,6 +32,7 @@ #include <net/if.h> #include <net/route.h> #include <netinet/in.h> +#include <netinet/ether.h> #include <nfs/nfs.h> #include "nfs_mount4.h" @@ -2152,12 +2153,11 @@ #if defined(__s390__) || defined(__s390x__) -/* switch to manual mode if expr is false, execute following statement if in manual mode */ -#define IFNOTAUTO(expr) if(!config.manual && !(expr)) { \ - config.manual=1; \ - if(!config.win) util_disp_init(); \ +/* turn on display and execute if expr is false */ +#define IFNOTAUTO(expr) if(!(expr) && !config.win) { \ + util_disp_init(); \ } \ - if(config.manual) + if(config.manual || !(expr)) #include <dirent.h> @@ -2398,7 +2398,7 @@ else rc=config.hwp.medium; - if(hd && hd->is.dualport) + if(!hd || hd->is.dualport) { IFNOTAUTO(config.hwp.portno) { @@ -2436,6 +2436,11 @@ { config.hwp.layer2 = dia_yesno(txt_get(TXT_ENABLE_LAYER2), YES) == YES ? 2 : 1; } + if(config.hwp.layer2 == 2) { + IFNOTAUTO(config.hwp.osahwaddr) { + dia_input2(txt_get(TXT_HWADDR), &config.hwp.osahwaddr, 17, 1); + } + } } } @@ -2513,6 +2518,41 @@ return -1; } + if(config.hwp.osahwaddr && strlen(config.hwp.osahwaddr) > 0) { + struct ifreq ifr; + struct ether_addr* ea; + int skfd; + DIR* d; + struct dirent* de; + char* ifname; + + net_s390_get_ifname(config.hwp.readchan, &ifname); + strcpy(ifr.ifr_name, ifname); + free(ifname); + + if((skfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) { + perror("socket"); + return 1; + } + + /* convert MAC address to binary */ + if((ea = ether_aton(config.hwp.osahwaddr)) == NULL) { + fprintf(stderr,"MAC address invalid: %s\n", config.hwp.osahwaddr); + return 1; + } + memcpy((void*) &ifr.ifr_hwaddr.sa_data[0], ea, ETHER_ADDR_LEN); + + //ifr.ifr_hwaddr.sa_len = ETHER_ADDR_LEN + ifr.ifr_hwaddr.sa_family = AF_UNIX; + + if(ioctl(skfd, SIOCSIFHWADDR, &ifr) < 0) { + fprintf(stderr, "SIOCSIFHWADDR: %s\n", strerror(errno)); + close(skfd); + return 1; + } + close(skfd); + } + if (device) { if (config.hwp.type == di_390net_iucv) strprintf(device, "iucv0"); /* bold assumption */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/af.po new/linuxrc-3.4.0/po/af.po --- old/linuxrc-3.3.32/po/af.po 2009-01-12 16:11:32.000000000 +0100 +++ new/linuxrc-3.4.0/po/af.po 2009-05-14 17:51:13.000000000 +0200 @@ -1236,3 +1236,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/bg.po new/linuxrc-3.4.0/po/bg.po --- old/linuxrc-3.3.32/po/bg.po 2009-01-12 16:11:32.000000000 +0100 +++ new/linuxrc-3.4.0/po/bg.po 2009-05-14 17:51:13.000000000 +0200 @@ -1242,3 +1242,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/ca.po new/linuxrc-3.4.0/po/ca.po --- old/linuxrc-3.3.32/po/ca.po 2009-01-12 16:11:32.000000000 +0100 +++ new/linuxrc-3.4.0/po/ca.po 2009-05-14 17:51:13.000000000 +0200 @@ -1239,3 +1239,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/cs.po new/linuxrc-3.4.0/po/cs.po --- old/linuxrc-3.3.32/po/cs.po 2009-01-12 16:11:32.000000000 +0100 +++ new/linuxrc-3.4.0/po/cs.po 2009-05-14 17:51:13.000000000 +0200 @@ -1241,3 +1241,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "Neplatný podpis" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/da.po new/linuxrc-3.4.0/po/da.po --- old/linuxrc-3.3.32/po/da.po 2009-01-12 16:11:33.000000000 +0100 +++ new/linuxrc-3.4.0/po/da.po 2009-05-14 17:51:13.000000000 +0200 @@ -1241,3 +1241,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/de.po new/linuxrc-3.4.0/po/de.po --- old/linuxrc-3.3.32/po/de.po 2009-01-12 16:11:33.000000000 +0100 +++ new/linuxrc-3.4.0/po/de.po 2009-05-14 17:51:13.000000000 +0200 @@ -1240,3 +1240,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "Ungültige Signatur." +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/el.po new/linuxrc-3.4.0/po/el.po --- old/linuxrc-3.3.32/po/el.po 2009-01-12 16:11:33.000000000 +0100 +++ new/linuxrc-3.4.0/po/el.po 2009-05-14 17:51:13.000000000 +0200 @@ -1245,3 +1245,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/es.po new/linuxrc-3.4.0/po/es.po --- old/linuxrc-3.3.32/po/es.po 2009-01-12 16:11:33.000000000 +0100 +++ new/linuxrc-3.4.0/po/es.po 2009-05-14 17:51:13.000000000 +0200 @@ -1242,3 +1242,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "Firma no válida." +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/fi.po new/linuxrc-3.4.0/po/fi.po --- old/linuxrc-3.3.32/po/fi.po 2009-01-12 16:11:33.000000000 +0100 +++ new/linuxrc-3.4.0/po/fi.po 2009-05-14 17:51:13.000000000 +0200 @@ -1240,3 +1240,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/fr.po new/linuxrc-3.4.0/po/fr.po --- old/linuxrc-3.3.32/po/fr.po 2009-01-12 16:11:33.000000000 +0100 +++ new/linuxrc-3.4.0/po/fr.po 2009-05-14 17:51:13.000000000 +0200 @@ -1410,3 +1410,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "Signature non valide." +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/hu.po new/linuxrc-3.4.0/po/hu.po --- old/linuxrc-3.3.32/po/hu.po 2009-01-12 16:11:34.000000000 +0100 +++ new/linuxrc-3.4.0/po/hu.po 2009-05-14 17:51:13.000000000 +0200 @@ -1246,3 +1246,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "Érvénytelen aláírás." +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/it.po new/linuxrc-3.4.0/po/it.po --- old/linuxrc-3.3.32/po/it.po 2009-01-12 16:11:34.000000000 +0100 +++ new/linuxrc-3.4.0/po/it.po 2009-05-14 17:51:13.000000000 +0200 @@ -1235,3 +1235,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "Firma non valida." +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/ja.po new/linuxrc-3.4.0/po/ja.po --- old/linuxrc-3.3.32/po/ja.po 2009-01-12 16:11:34.000000000 +0100 +++ new/linuxrc-3.4.0/po/ja.po 2009-05-14 17:51:13.000000000 +0200 @@ -1236,3 +1236,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "無効な署名です。" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/linuxrc.pot new/linuxrc-3.4.0/po/linuxrc.pot --- old/linuxrc-3.3.32/po/linuxrc.pot 2008-10-31 12:58:39.000000000 +0100 +++ new/linuxrc-3.4.0/po/linuxrc.pot 2009-05-14 17:51:13.000000000 +0200 @@ -1188,3 +1188,7 @@ msgid "Invalid signature." msgstr "" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/nb.po new/linuxrc-3.4.0/po/nb.po --- old/linuxrc-3.3.32/po/nb.po 2009-01-12 16:11:34.000000000 +0100 +++ new/linuxrc-3.4.0/po/nb.po 2009-05-14 17:51:13.000000000 +0200 @@ -1242,3 +1242,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/nl.po new/linuxrc-3.4.0/po/nl.po --- old/linuxrc-3.3.32/po/nl.po 2009-01-12 16:11:34.000000000 +0100 +++ new/linuxrc-3.4.0/po/nl.po 2009-05-14 17:51:13.000000000 +0200 @@ -1238,3 +1238,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "Ongeldige ondertekening." +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/pl.po new/linuxrc-3.4.0/po/pl.po --- old/linuxrc-3.3.32/po/pl.po 2009-01-12 16:11:34.000000000 +0100 +++ new/linuxrc-3.4.0/po/pl.po 2009-05-14 17:51:13.000000000 +0200 @@ -1236,3 +1236,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "Nieprawidłowy podpis." +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/pt_BR.po new/linuxrc-3.4.0/po/pt_BR.po --- old/linuxrc-3.3.32/po/pt_BR.po 2009-01-12 16:11:34.000000000 +0100 +++ new/linuxrc-3.4.0/po/pt_BR.po 2009-05-14 17:51:13.000000000 +0200 @@ -1236,3 +1236,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "Assinatura inválida." +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/pt.po new/linuxrc-3.4.0/po/pt.po --- old/linuxrc-3.3.32/po/pt.po 2009-01-12 16:11:34.000000000 +0100 +++ new/linuxrc-3.4.0/po/pt.po 2009-05-14 17:51:13.000000000 +0200 @@ -1241,3 +1241,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/ru.po new/linuxrc-3.4.0/po/ru.po --- old/linuxrc-3.3.32/po/ru.po 2009-01-12 16:11:34.000000000 +0100 +++ new/linuxrc-3.4.0/po/ru.po 2009-05-14 17:51:13.000000000 +0200 @@ -1232,3 +1232,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "Недействительная подпись." +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/sk.po new/linuxrc-3.4.0/po/sk.po --- old/linuxrc-3.3.32/po/sk.po 2009-01-12 16:11:34.000000000 +0100 +++ new/linuxrc-3.4.0/po/sk.po 2009-05-14 17:51:13.000000000 +0200 @@ -1243,3 +1243,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/sl.po new/linuxrc-3.4.0/po/sl.po --- old/linuxrc-3.3.32/po/sl.po 2009-01-12 16:11:35.000000000 +0100 +++ new/linuxrc-3.4.0/po/sl.po 2009-05-14 17:51:13.000000000 +0200 @@ -1237,3 +1237,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/sv.po new/linuxrc-3.4.0/po/sv.po --- old/linuxrc-3.3.32/po/sv.po 2009-01-12 16:11:35.000000000 +0100 +++ new/linuxrc-3.4.0/po/sv.po 2009-05-14 17:51:13.000000000 +0200 @@ -1239,3 +1239,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "Ogiltig signatur." +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/uk.po new/linuxrc-3.4.0/po/uk.po --- old/linuxrc-3.3.32/po/uk.po 2009-01-12 16:11:35.000000000 +0100 +++ new/linuxrc-3.4.0/po/uk.po 2009-05-14 17:51:13.000000000 +0200 @@ -1241,3 +1241,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/xh.po new/linuxrc-3.4.0/po/xh.po --- old/linuxrc-3.3.32/po/xh.po 2009-01-12 16:11:35.000000000 +0100 +++ new/linuxrc-3.4.0/po/xh.po 2009-05-14 17:51:13.000000000 +0200 @@ -1233,3 +1233,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/zh_CN.po new/linuxrc-3.4.0/po/zh_CN.po --- old/linuxrc-3.3.32/po/zh_CN.po 2009-01-12 16:11:35.000000000 +0100 +++ new/linuxrc-3.4.0/po/zh_CN.po 2009-05-14 17:51:13.000000000 +0200 @@ -1236,3 +1236,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "无效签名。" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/zh_TW.po new/linuxrc-3.4.0/po/zh_TW.po --- old/linuxrc-3.3.32/po/zh_TW.po 2009-01-12 16:11:35.000000000 +0100 +++ new/linuxrc-3.4.0/po/zh_TW.po 2009-05-14 17:51:13.000000000 +0200 @@ -1236,3 +1236,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "無效的簽章。" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/po/zu.po new/linuxrc-3.4.0/po/zu.po --- old/linuxrc-3.3.32/po/zu.po 2009-01-12 16:11:35.000000000 +0100 +++ new/linuxrc-3.4.0/po/zu.po 2009-05-14 17:51:13.000000000 +0200 @@ -1236,3 +1236,7 @@ #. TXT_INVALID_SIGNATURE msgid "Invalid signature." msgstr "" +#. TXT_HWADDR +msgid "MAC address" +msgstr "" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/url.c new/linuxrc-3.4.0/url.c --- old/linuxrc-3.3.32/url.c 2009-02-13 14:46:29.000000000 +0100 +++ new/linuxrc-3.4.0/url.c 2009-05-14 17:59:41.000000000 +0200 @@ -30,6 +30,7 @@ #include "slp.h" #include "dialog.h" #include "display.h" +#include "auto2.h" #include "url.h" #define CRAMFS_SUPER_MAGIC 0x28cd3d45 @@ -1836,15 +1837,21 @@ config.sha1 = slist_free(config.sha1); config.sha1_failed = 0; + strprintf(&buf, "/%s", config.zen ? config.zenconfig : "content"); + strprintf(&buf2, "file:%s", buf); + if( - url_read_file(url, NULL, "/content", "/content", NULL, + url_read_file(url, NULL, buf, buf, NULL, URL_FLAG_NOSHA1 + (config.secure ? URL_FLAG_CHECK_SIG : 0) ) ) return 0; if(!config.sig_failed) { - file_read_info_file("file:/content", kf_cont); + file_read_info_file(buf2, config.zen ? kf_cont + kf_cfg : kf_cont); } + + str_copy(&buf, NULL); + str_copy(&buf2, NULL); } if(config.url.instsys->scheme != inst_rel || config.kexec) return 1; @@ -2259,7 +2266,9 @@ if(url->is.wlan && wlan_setup()) return 0; - config.net.configured = nc_static; + if((config.net.do_setup & DS_SETUP)) auto2_user_netconfig(); + + if(config.net.configured == nc_none) config.net.configured = nc_static; /* we need at least ip & netmask for static network config */ if((net_config_mask() & 3) != 3) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.32/VERSION new/linuxrc-3.4.0/VERSION --- old/linuxrc-3.3.32/VERSION 2009-02-13 14:47:07.000000000 +0100 +++ new/linuxrc-3.4.0/VERSION 2009-05-14 17:57:56.000000000 +0200 @@ -1 +1 @@ -3.3.32 +3.4.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 virtualbox-ose for openSUSE:Factory
by root＠Hilbert.suse.de 15 May '09

15 May '09

Hello community, here is the log from the commit of package virtualbox-ose for openSUSE:Factory checked in at Sat May 16 00:23:45 CEST 2009. -------- --- virtualbox-ose/virtualbox-ose.changes 2009-05-07 16:22:18.000000000 +0200 +++ virtualbox-ose/virtualbox-ose.changes 2009-05-07 18:02:20.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 7 17:36:37 CEST 2009 - mseben(a)suse.cz + +- fixed ose-init-scripts.diff : don't use vboxusers group for + /dev/vboxdrv (bnc#429725) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox-ose.spec ++++++ --- /var/tmp/diff_new_pack.t31156/_old 2009-05-16 00:20:54.000000000 +0200 +++ /var/tmp/diff_new_pack.t31156/_new 2009-05-16 00:20:54.000000000 +0200 @@ -57,7 +57,7 @@ # ExclusiveArch: %ix86 x86_64 Version: 2.2.2 -Release: 3 +Release: 4 Summary: VirtualBox OSE is an Emulator License: GPL v2 or later Group: System/Emulators/PC @@ -527,6 +527,9 @@ %{_datadir}/virtualbox/x11restore.pl %changelog +* Thu May 07 2009 mseben(a)suse.cz +- fixed ose-init-scripts.diff : don't use vboxusers group for + /dev/vboxdrv (bnc#429725) * Thu May 07 2009 dmueller(a)suse.de - make sure that the kmp is also updated at the same time like the main module, otherwise bad things will happen ++++++ virtualbox-ose-init-scripts.diff ++++++ --- /var/tmp/diff_new_pack.t31156/_old 2009-05-16 00:20:57.000000000 +0200 +++ /var/tmp/diff_new_pack.t31156/_new 2009-05-16 00:20:57.000000000 +0200 @@ -178,6 +178,20 @@ ### END INIT INFO PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH +@@ -180,12 +180,7 @@ + failure "Cannot create device $DEVICE with major $MAJOR and minor $MINOR" + fi + fi +- # ensure permissions +- if ! chown :$GROUPNAME $DEVICE 2>/dev/null; then +- rmmod vboxnetflt 2>/dev/null +- rmmod vboxdrv 2>/dev/null +- failure "Cannot change owner $GROUPNAME for device $DEVICE" +- fi ++ + if ! modprobe vboxnetflt > /dev/null 2>&1; then + failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" + fi @@ -260,28 +261,8 @@ stop_vms() setup() { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 aaa_base for openSUSE:Factory
by root＠Hilbert.suse.de 15 May '09

15 May '09

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Sat May 16 00:19:47 CEST 2009. -------- --- aaa_base/aaa_base.changes 2009-05-07 12:00:48.000000000 +0200 +++ aaa_base/aaa_base.changes 2009-05-12 16:06:44.000000000 +0200 @@ -1,0 +2,10 @@ +Tue May 12 16:04:51 CEST 2009 - werner(a)suse.de + +- Make some expansions work for bash completion (bnc#493303, bnc#487252) + +------------------------------------------------------------------- +Fri May 8 15:01:04 CEST 2009 - werner(a)suse.de + +- Add missing line in boot.clock + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.S15953/_old 2009-05-16 00:19:20.000000000 +0200 +++ /var/tmp/diff_new_pack.S15953/_new 2009-05-16 00:19:20.000000000 +0200 @@ -28,7 +28,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv udev net-tools AutoReqProv: on Version: 11.2 -Release: 25 +Release: 26 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -139,6 +139,10 @@ %defattr(-,root,root) %changelog +* Tue May 12 2009 werner(a)suse.de +- Make some expansions work for bash completion (bnc#493303, bnc#487252) +* Fri May 08 2009 werner(a)suse.de +- Add missing line in boot.clock * Thu May 07 2009 werner(a)suse.de - At shutdown boot.clock should be executed *before* boot.apparmor otherwise it may happen that /etc/localtime is not readable and ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.clock new/aaa_base/etc/init.d/boot.clock --- old/aaa_base/etc/init.d/boot.clock 2009-05-07 11:50:21.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.clock 2009-05-08 15:00:53.000000000 +0200 @@ -13,6 +13,7 @@ # Should-Start: $null # Should-Stop: apparmor # X-Start-Before: boot.localfs +# X-Stop-After: $null # Default-Start: B S # Default-Stop: # Description: Read hardware clock and set system clock diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.localfs new/aaa_base/etc/init.d/boot.localfs --- old/aaa_base/etc/init.d/boot.localfs 2009-04-29 17:26:35.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.localfs 2009-05-08 15:19:20.000000000 +0200 @@ -357,8 +357,16 @@ rc_exit fi + # # If e.g. /var is on a different filesystem than / make sure we can umount - mkill -TERM $ulist + # but check if /etc/ld.so.preload exists and if this may hold a partition + # even for root file systems based programs + # + if test -s /etc/ld.so.preload && grep -qE "(${ulist// /|})" /etc/ld.so.preload ; then + echo "${warn}Oops${done}: /etc/ld.so.preload exist and breaks the system :-(" + else + mkill -TERM $ulist + fi UMOUNT_FAILED=false umount -rv $mtab -t no${tmpfs//,/,no},$nofs -O no_netdev $ulist || { @@ -368,7 +376,7 @@ rc_status -v1 -r if test "$UMOUNT_FAILED" = true -a -z "$mtab" ; then - echo "Oops: umount failed :-( -- trying to remount readonly..." + echo "${warn}Oops${done}: umount failed :-( -- trying to remount readonly..." ulist=,${ulist// /,}, mounts=/etc/fstab test -r /proc/mounts && mounts=/proc/mounts diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile.d/complete.bash new/aaa_base/etc/profile.d/complete.bash --- old/aaa_base/etc/profile.d/complete.bash 2009-01-20 17:31:18.000000000 +0100 +++ new/aaa_base/etc/profile.d/complete.bash 2009-05-12 15:48:11.000000000 +0200 @@ -7,21 +7,64 @@ # REQUIRES bash 2.0 and higher # -_def=; _dir=; _file=; _nosp= if complete -o default _nullcommand &> /dev/null ; then _def="-o default" _dir="-o dirnames" - _file="-o filenames" + _file="-o filenames" +else + _def="" + _dir="" + _file="" fi -_minusdd="-d ${_dir}" -_minusdf="-d ${_file}" if complete -o nospace _nullcommand &> /dev/null ; then _nosp="-o nospace" - _minusdd="${_nosp} ${_dir}" - _minusdf="${_nosp} ${_dir}" + _minusdd="${_def} ${_nosp} ${_dir}" + _minusdf="${_def} ${_nosp} ${_dir}" +else + _nosp="" + _minusdd="-d ${_dir}" + _minusdf="-d ${_file}" fi complete -r _nullcommand &> /dev/null +# Escape file and directory names, add slash to directories if needed. +# Escaping could be done by the option 'filenames' but this fails +# e.g. on variable expansion like $HO<TAB> +_compreply_ () +{ + local IFS=$'\n' + local s x + local -i o + + test ${#COMPREPLY[@]} -eq 0 && return 0 + + # + # Escape spaces and braces in path names with `\' + # + s="${COMP_WORDBREAKS// }" + s="${s// }" + s="${s//[\{\}()\[\]]}" + s="${s} (){}[]" + o=${#s} + + while test $((o--)) -gt 0 ; do + x="${s:${o}:1}" + case "$x" in + $) COMPREPLY=($(echo "${COMPREPLY[*]}"|command sed -r 's/\(/\\\(/g')) ;; + *) COMPREPLY=(${COMPREPLY[*]//${x}/\\${x}}) ;; + esac + done + + # + # Append a slash on the real result, avoid annoying double tab + # + for ((o=0; o < ${#COMPREPLY[*]}; o++)) ; do + test -d "${COMPREPLY[$o]}" || continue + test -z "${COMPREPLY[$o]##*/}" || continue + COMPREPLY[$o]="${COMPREPLY[$o]}/" + done +} + # Expanding shell function for directories _cd_ () { @@ -34,8 +77,8 @@ test $g -eq 0 && shopt -s extglob case "$(complete -p ${1##*/} 2> /dev/null)" in - mkdir) ;; - *) s="-S/" + mkdir) ;; + *) s="-S/" esac case "$c" in @@ -49,8 +92,8 @@ \$\{*\}) eval COMPREPLY=\(${c}$ ;; \$\{*) COMPREPLY=($(compgen -v -P '${' -S '}' -- ${c#??})) ;; \$*) COMPREPLY=($(compgen -v -P '$' $s -- ${c#?})) ;; - \~*/*) COMPREPLY=($(compgen -d $s -- "${c}")) ;; - \~*) COMPREPLY=($(compgen -u $s -- "${c}")) ;; + \~*/*) COMPREPLY=($(compgen -d $s -- "${c}")) ;; + \~*) COMPREPLY=($(compgen -u $s -- "${c}")) ;; *\:*) if [[ $COMP_WORDBREAKS =~ : ]] ; then local C=${c%"${c##*[^\\]:}"} @@ -80,34 +123,10 @@ done fi - if test ${#COMPREPLY[@]} -gt 0 ; then - # - # Escape spaces and braces in path names with `\' - # - s="${COMP_WORDBREAKS// }" - s="${s// }" - s="${s//[\{\}()\[\]]}" - s="${s} (){}[]" - o=${#s} - - while test $((o--)) -gt 0 ; do - c="${s:${o}:1}" - COMPREPLY=(${COMPREPLY[*]//${c}/\\${c}}) - done - fi - - # - # Append a slash on the real result, avoid annoying double tab - # - if test "${1##*/}" != "mkdir" -a ${#COMPREPLY[@]} -eq 1 ; then - x=${COMPREPLY[0]} - o=$((${#x} - 1)) - if test "$x" = "$c" -a "${x:${o}:1}" != "/"; then - COMPREPLY[0]="${x}/" - fi - fi + _compreply_ test $g -eq 0 && shopt -u extglob + return 0 } if shopt -q cdable_vars; then @@ -126,6 +145,7 @@ local c=${COMP_WORDS[COMP_CWORD]} local a="${COMP_LINE}" local e s g=0 cd dc t="" + local -i o local IFS shopt -q extglob && g=1 @@ -140,10 +160,10 @@ case "$c" in -) COMPREPLY=(d c) test $g -eq 0 && shopt -u extglob - return ;; + return 0 ;; -?|-??) COMPREPLY=($c) test $g -eq 0 && shopt -u extglob - return ;; + return 0 ;; esac case "$a" in $cd|$dc) e='!*.bz2' ;; @@ -154,16 +174,44 @@ case "$c" in -) COMPREPLY=(d c) test $g -eq 0 && shopt -u extglob - return ;; + return 0 ;; -?|-??) COMPREPLY=($c) test $g -eq 0 && shopt -u extglob - return ;; + return 0 ;; esac case "$a" in $cd|$dc) e='!*.+(gz|tgz|z|Z)' ;; *) e='*.+(gz|tgz|z|Z)' ;; esac ;; gunzip) e='!*.+(gz|tgz|z|Z)' ;; + lzma) + case "$c" in + -) COMPREPLY=(d c) + test $g -eq 0 && shopt -u extglob + return 0 ;; + -?|-??) COMPREPLY=($c) + test $g -eq 0 && shopt -u extglob + return 0 ;; + esac + case "$a" in + $cd|$dc) e='!*.+(lzma)' ;; + *) e='*.+(lzma)' ;; + esac ;; + unlzma) e='!*.+(lzma)' ;; + xz) + case "$c" in + -) COMPREPLY=(d c) + test $g -eq 0 && shopt -u extglob + return 0 ;; + -?|-??) COMPREPLY=($c) + test $g -eq 0 && shopt -u extglob + return 0 ;; + esac + case "$a" in + $cd|$dc) e='!*.+(xz)' ;; + *) e='*.+(xz)' ;; + esac ;; + unxz) e='!*.+(xz)' ;; uncompress) e='!*.Z' ;; unzip) e='!*.+(???)' t="@(MS-DOS executable|Zip archive)*" ;; @@ -178,7 +226,7 @@ *=*) c=${c#*=} ;; *) COMPREPLY=($(compgen -v -- ${c})) test $g -eq 0 && shopt -u extglob - return ;; + return 0 ;; esac ;; *) e='!*' @@ -206,30 +254,73 @@ if test $g -eq 0 ; then COMPREPLY=($(compgen -f -X "$e" -- $c)) test $g -eq 0 && shopt -u extglob - return + return 0 fi COMPREPLY=($(compgen -G "${c}")) ;; *) if test "$c" = ".." ; then - COMPREPLY=($(compgen -d -X "$e" -S / ${_nosp} -- $c)) + COMPREPLY=($(compgen -d -X "$e" ${_nosp} -- $c)) else - for s in $(compgen -f -X "$e" -- $c) ; do - if test -d $s ; then - COMPREPLY=(${COMPREPLY[@]} $(compgen -f -X "$e" -S / -- $s)) - elif test -z "$t" ; then - COMPREPLY=(${COMPREPLY[@]} $s) - else - case "$(file -b $s 2> /dev/null)" in - $t) COMPREPLY=(${COMPREPLY[@]} $s) ;; + if test -n "$t" ; then + let o=0 + COMPREPLY=() + for s in $(compgen -f -X "$e" -- $c) ; do + case "$(file -b "$s" 2> /dev/null)" in + directory) COMPREPLY[$((o++))]="$s" ;; + $t) COMPREPLY[$((o++))]="$s" ;; esac - fi - done - fi ;; + done + else + COMPREPLY=($(compgen -f -X "$e" -- $c)) + fi + fi esac + test $g -eq 0 && shopt -u extglob + return 0 } -complete -d -X '.[^./]*' -F _exp_ ${_file} \ +_gdb_ () +{ + local c=${COMP_WORDS[COMP_CWORD]} + local x + local -i o + + if test $COMP_CWORD -eq 1 ; then + case "$c" in + -*) COMPREPLY=($(compgen -W '-args -tty -s -e -se -c -x -d' -- "$c")) ;; + *) COMPREPLY=($(compgen -c -- "$c")) + esac + return 0 + fi + local p=${COMP_WORDS[COMP_CWORD-1]} + case "$p" in + -args) COMPREPLY=($(compgen -c -- "$c")) ;; + -tty) COMPREPLY=(/dev/tty* /dev/pts/*) + COMPREPLY=($(compgen -W "${COMPREPLY[*]}" -- "$c")) ;; + -s|e|-se) COMPREPLY=($(compgen -f -- "$c")) ;; + -c|-x) COMPREPLY=($(compgen -f -- "$c")) ;; + -d) COMPREPLY=($(compgen -d ${_nosp} -- "$c")) ;; + *) + if test -z "$c"; then + COMPREPLY=($(command ps axho comm,pid |\ + command sed -rn "\@^${p##*/}@{ s@.*[[:blank:]]+@@p; }")) + else + COMPREPLY=() + fi + let o=${#COMPREPLY[*]} + for s in $(compgen -f -- "$c") ; do + case "$(file -b "$s" 2> /dev/null)" in + directory) COMPREPLY[$((o++))]="$s" ;; + *) COMPREPLY[$((o++))]="$s" ;; + esac + done + esac + + return 0 +} + +complete -d -X '.[^./]*' -F _exp_ ${_file} ${_def} \ compress \ bzip2 \ bunzip2 \ @@ -242,10 +333,9 @@ acroread xpdf kpdf \ dvips xdvi kdvi \ tex latex pdflatex -# No clean way to hande variable expansion _and_ file/dir name expansion -# with the same string. So let the default expansion on for that commands. -#complete -d -F _exp_ ${_def} chown chgrp chmod chattr ln -#complete -d -F _exp_ ${_def} more cat less strip grep vi ed + +complete -d -F _exp_ ${_file} ${_def} chown chgrp chmod chattr ln +complete -d -F _exp_ ${_file} ${_def} more cat less strip grep vi ed complete -A function -A alias -A command -A builtin \ type @@ -261,7 +351,8 @@ complete -A builtin builtin complete -A export printenv complete -A command ${_def} command which nohup exec nice eval -complete -A command ${_def} ltrace strace gdb +complete -A command ${_def} ltrace strace +complete -F _gdb_ ${_file} ${_def} gdb HOSTFILE="" test -s $HOME/.hosts && HOSTFILE=$HOME/.hosts complete -A hostname ping telnet slogin rlogin \ @@ -302,8 +393,8 @@ s=$(eval echo {${m}}$o/) if type -p sed &> /dev/null ; then COMPREPLY=(\ - $(ls -1fUA $s 2>/dev/null|\ - sed -n "/^$c/{s@\.[0-9n].*\.gz@@g;s@.*/:@@g;p;}")\ + $(command ls -1UA $s 2>/dev/null|\ + command sed -rn "/^$c/{s@\.[0-9n].*\.gz@@g;s@.*/:@@g;p;}")\ ) else s=($(ls -1fUA $s 2>/dev/null)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libmsn for openSUSE:Factory
by root＠Hilbert.suse.de 15 May '09

15 May '09

Hello community, here is the log from the commit of package libmsn for openSUSE:Factory checked in at Sat May 16 00:15:52 CEST 2009. -------- --- libmsn/libmsn.changes 2009-01-13 10:38:09.000000000 +0100 +++ libmsn/libmsn.changes 2009-05-14 15:43:12.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 14 15:39:54 CEST 2009 - dmueller(a)suse.de + +- update to 4.0 Beta5 (bnc#503513): + * no upstream changelog available + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libmsn-4.0-beta2.tar.bz2 New: ---- libmsn-4.0-beta5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmsn.spec ++++++ --- /var/tmp/diff_new_pack.E11699/_old 2009-05-16 00:05:52.000000000 +0200 +++ /var/tmp/diff_new_pack.E11699/_new 2009-05-16 00:05:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libmsn (Version 3.9.91) +# spec file for package libmsn (Version 3.9.95) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,15 +19,15 @@ Name: libmsn -BuildRequires: cmake gcc-c++ kde4-filesystem openssl-devel +BuildRequires: cmake gcc-c++ kde4-filesystem libopenssl-devel License: GPLv2 or later with linking exception for openssl Group: Development/Libraries/C and C++ Summary: Reusable, open-source library for MSN Messenger BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://sourceforge.net/projects/libmsn -Version: 3.9.91 -Release: 2 -%define tar_version 4.0-beta2 +Version: 3.9.95 +Release: 1 +%define tar_version 4.0-beta5 Source: libmsn-%{tar_version}.tar.bz2 Patch1: gcc-warnings.diff Patch2: literal-string-compare.diff @@ -55,6 +55,7 @@ Summary: Reusable, open-source library for MSN Messenger Group: Development/Libraries/C and C++ Requires: libmsn0_1 = %version +Requires: libopenssl-devel %description devel Libmsn is a reusable, open-source, fully documented library for @@ -95,6 +96,9 @@ %{_libdir}/pkgconfig/libmsn.pc %changelog +* Thu May 14 2009 dmueller(a)suse.de +- update to 4.0 Beta5 (bnc#503513): + * no upstream changelog available * Thu Jan 01 2009 dmueller(a)suse.de - update to 4.0 Beta2: * no changelog available ++++++ libmsn-4.0-beta2.tar.bz2 -> libmsn-4.0-beta5.tar.bz2 ++++++ ++++ 2825 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 sysvinit for openSUSE:Factory
by root＠Hilbert.suse.de 15 May '09

15 May '09

Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at Sat May 16 00:05:35 CEST 2009. -------- --- sysvinit/sysvinit.changes 2009-05-07 12:48:14.000000000 +0200 +++ sysvinit/sysvinit.changes 2009-05-11 10:50:37.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 11 10:27:43 CEST 2009 - werner(a)suse.de + +- Make it build + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sysvinit-2.86-dynamically_link_init.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysvinit.spec ++++++ --- /var/tmp/diff_new_pack.C24808/_old 2009-05-15 23:55:43.000000000 +0200 +++ /var/tmp/diff_new_pack.C24808/_new 2009-05-15 23:55:43.000000000 +0200 @@ -30,7 +30,7 @@ PreReq: coreutils AutoReqProv: on Version: 2.86 -Release: 208 +Release: 209 Summary: SysV-Style init BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libselinux-devel libsepol-devel @@ -65,7 +65,6 @@ Patch19: sysvinit-2.86-fuse-no-kill.patch Patch20: startpar-preload.diff Patch21: startpar-bootchart.diff -Patch22: sysvinit-2.86-dynamically_link_init.patch %description System V style init programs by Miquel van Smoorenburg that control the @@ -101,7 +100,6 @@ %patch -P 17 -b .hddown %patch -P 18 -b .selinux %patch -P 19 -b .fuse -%patch -P 22 -b .dynamic %patch pushd ../powerd-%{PDVER} %patch -P 2 @@ -329,6 +327,8 @@ %doc %{_mandir}/man8/mkill.8.gz %changelog +* Mon May 11 2009 werner(a)suse.de +- Make it build * Thu May 07 2009 werner(a)suse.de - Reorder last patch in spec file * Wed May 06 2009 crrodriguez(a)suse.de ++++++ sysvinit-2.86.dif ++++++ ++++ 613 lines (skipped) ++++ between sysvinit/sysvinit-2.86.dif ++++ and sysvinit/sysvinit-2.86.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 desktop-translations for openSUSE:Factory
by root＠Hilbert.suse.de 15 May '09

15 May '09

Hello community, here is the log from the commit of package desktop-translations for openSUSE:Factory checked in at Fri May 15 23:55:27 CEST 2009. -------- --- desktop-translations/desktop-translations.changes 2009-03-19 14:22:05.000000000 +0100 +++ desktop-translations/desktop-translations.changes 2009-05-15 15:05:03.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 15 15:03:43 CEST 2009 - ke(a)suse.de + +- update translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-translations.spec ++++++ --- /var/tmp/diff_new_pack.oL3075/_old 2009-05-15 23:53:43.000000000 +0200 +++ /var/tmp/diff_new_pack.oL3075/_new 2009-05-15 23:53:43.000000000 +0200 @@ -20,7 +20,7 @@ Name: desktop-translations Version: 11.2 -Release: 3 +Release: 4 Summary: Desktop Files Translation updates License: BSD 3-Clause Group: System/GUI/Other @@ -76,6 +76,8 @@ %defattr(-,root,root) %changelog +* Fri May 15 2009 ke(a)suse.de +- update translations. * Thu Mar 19 2009 ke(a)suse.de - update translations. - PREPARE_PACKAGE: Skip missing entries.mo files. ++++++ desktop-translations.tar.bz2 ++++++ desktop-translations/desktop-translations.tar.bz2 desktop-translations/desktop-translations.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 kde4-webkitpart for openSUSE:Factory
by root＠Hilbert.suse.de 15 May '09

15 May '09

Hello community, here is the log from the commit of package kde4-webkitpart for openSUSE:Factory checked in at Fri May 15 23:52:33 CEST 2009. -------- --- KDE/kde4-webkitpart/kde4-webkitpart.changes 2009-04-23 21:57:12.000000000 +0200 +++ kde4-webkitpart/kde4-webkitpart.changes 2009-05-13 09:04:29.000000000 +0200 @@ -1,0 +2,8 @@ +Wed May 13 08:57:29 CEST 2009 - beineri(a)opensuse.org + +- update to SVN 967285 + * prevent crash when part is null + * improve zoom actions behavior + * performace optimization: create page when it is needed only + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-webkitpart.spec ++++++ --- /var/tmp/diff_new_pack.p21051/_old 2009-05-15 23:51:03.000000000 +0200 +++ /var/tmp/diff_new_pack.p21051/_new 2009-05-15 23:51:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kde4-webkitpart (Version 4.2.2.svn958332) +# spec file for package kde4-webkitpart (Version 4.2.3.svn967285) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ License: LGPL v2.0 or later; LGPL v2.1 or later Group: System/GUI/KDE Summary: WebKit render engine for Konqueror -Version: 4.2.2.svn958332 +Version: 4.2.3.svn967285 Release: 1 Source0: libs.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -98,6 +98,11 @@ %_kde_share_dir/apps/cmake/modules/FindWebKitPart.cmake %changelog +* Wed May 13 2009 beineri(a)opensuse.org +- update to SVN 967285 + * prevent crash when part is null + * improve zoom actions behavior + * performace optimization: create page when it is needed only * Thu Apr 23 2009 beineri(a)opensuse.org - update to SVN 958332 * better behavior on mouse middle click ++++++ libs.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdewebkit/kwebpage.cpp new/libs/webkitkde/kdewebkit/kwebpage.cpp --- old/libs/webkitkde/kdewebkit/kwebpage.cpp 2009-04-22 23:04:10.000000000 +0200 +++ new/libs/webkitkde/kdewebkit/kwebpage.cpp 2009-05-11 23:26:22.000000000 +0200 @@ -121,7 +121,7 @@ } KWebPage::KWebPage(QObject *parent) - : QWebPage(parent), d(new KWebPage::KWebPagePrivate()) + : QWebPage(parent), d(new KWebPage::KWebPagePrivate()) { #if KDE_IS_VERSION(4, 2, 70) d->accessManager = new KIO::AccessManager(this); @@ -306,7 +306,7 @@ QString errMsgEx = i18n("Try to reinstall it. \n\nThe integration with Konqueror will be disabled."); KMessageBox::detailedSorry(view(), errMsg, errMsgEx); cfg.writePathEntry("DownloadManager", QString()); - cfg.sync (); + cfg.sync(); } else { downloadViaKIO = false; cmd += ' ' + KShell::quoteArg(url.url()); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdewebkit/kwebpluginfactory.cpp new/libs/webkitkde/kdewebkit/kwebpluginfactory.cpp --- old/libs/webkitkde/kdewebkit/kwebpluginfactory.cpp 2009-01-19 02:10:18.000000000 +0100 +++ new/libs/webkitkde/kdewebkit/kwebpluginfactory.cpp 2009-05-11 23:26:22.000000000 +0200 @@ -43,14 +43,14 @@ }; KWebPluginFactory::KWebPluginFactory(QObject *parent) - : QWebPluginFactory(parent) - , d(new KWebPluginFactory::KWebPluginFactoryPrivate(0)) + : QWebPluginFactory(parent) + , d(new KWebPluginFactory::KWebPluginFactoryPrivate(0)) { } KWebPluginFactory::KWebPluginFactory(QWebPluginFactory *delegate, QObject *parent) - : QWebPluginFactory(parent) - , d(new KWebPluginFactory::KWebPluginFactoryPrivate(delegate)) + : QWebPluginFactory(parent) + , d(new KWebPluginFactory::KWebPluginFactoryPrivate(delegate)) { } @@ -91,7 +91,7 @@ openUrlArgs.metaData() = metaData; openUrlArgs.setMimeType(mimeType); part->setArguments(openUrlArgs); - kDebug()<< part->arguments().metaData(); + kDebug() << part->arguments().metaData(); part->openUrl(url); } kDebug() << "Asked for" << mimeType << "plugin, got" << part; @@ -123,7 +123,7 @@ mime.name = servicetypes.at(z); KMimeType::Ptr kmime = KMimeType::mimeType(mime.name); if (kmime) { - mime.fileExtensions = kmime->patterns().replaceInStrings("*.",""); + mime.fileExtensions = kmime->patterns().replaceInStrings("*.", ""); } mimes.append(mime); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdewebkit/kwebview.cpp new/libs/webkitkde/kdewebkit/kwebview.cpp --- old/libs/webkitkde/kdewebkit/kwebview.cpp 2009-04-23 00:59:03.000000000 +0200 +++ new/libs/webkitkde/kdewebkit/kwebview.cpp 2009-05-11 23:26:22.000000000 +0200 @@ -46,19 +46,20 @@ , keyboardModifiers(Qt::NoModifier) , pressedButtons(Qt::NoButton) , searchBar(0) + , page(0) {} + bool customContextMenu; Qt::KeyboardModifiers keyboardModifiers; Qt::MouseButtons pressedButtons; KDEPrivate::SearchBar *searchBar; + KWebPage *page; }; KWebView::KWebView(QWidget *parent) : QWebView(parent), d(new KWebView::KWebViewPrivate()) -{ - setPage(new KWebPage(this)); -} +{} KWebView::~KWebView() { @@ -79,13 +80,24 @@ d->customContextMenu = show; } -KWebPage *KWebView::page() +KWebPage *KWebView::page() const { - KWebPage *webPage = qobject_cast<KWebPage*>(QWebView::page()); - if (!webPage) { - return 0; + if (!d->page) { + KWebView *that = const_cast<KWebView *>(this); + that->setNewPage(); } - return webPage; + return d->page; +} + +void KWebView::setNewPage() +{ + setPage(new KWebPage(this)); +} + +void KWebView::setPage(KWebPage *page) +{ + d->page = page; + QWebView::setPage(page); } void KWebView::wheelEvent(QWheelEvent *event) @@ -116,8 +128,9 @@ { const QWebHitTestResult result = page()->mainFrame()->hitTestContent(event->pos()); const QUrl url = result.linkUrl(); - if (!url.isEmpty() && ((d->pressedButtons & Qt::MidButton) || - ((d->pressedButtons & Qt::LeftButton) && (d->keyboardModifiers & Qt::ControlModifier)))) { + if (!url.isEmpty() + && ((d->pressedButtons & Qt::MidButton) + || ((d->pressedButtons & Qt::LeftButton) && (d->keyboardModifiers & Qt::ControlModifier)))) { kDebug() << "middle clicked or ctrl-clicked url" << url; emit openUrlInNewTab(url); return; @@ -179,7 +192,8 @@ d->searchBar->setFoundMatch(status); } -void KWebView::load(const KUrl &url, const KParts::OpenUrlArguments &args, const KParts::BrowserArguments &bargs) { +void KWebView::load(const KUrl &url, const KParts::OpenUrlArguments &args, const KParts::BrowserArguments &bargs) +{ QNetworkRequest req; req.setUrl(url); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdewebkit/kwebview.h new/libs/webkitkde/kdewebkit/kwebview.h --- old/libs/webkitkde/kdewebkit/kwebview.h 2009-04-23 00:59:03.000000000 +0200 +++ new/libs/webkitkde/kdewebkit/kwebview.h 2009-05-11 23:22:45.000000000 +0200 @@ -44,9 +44,19 @@ { Q_OBJECT public: - KWebView(QWidget *parent = 0); + explicit KWebView(QWidget *parent = 0); ~KWebView(); - KWebPage *page(); + /** + * This method returns the current KWebPage, if there is none, one will be created. + * It calles virtual method setNewPage() to create new (K)WebPage, so + * of you reimplements KWebPage ypu should reimplement this setNewPage() + * @see setPage() + * @see setNewPage() + * @short Getter for KWebPage + * @return current KWebPage + */ + KWebPage *page() const; + void setPage(KWebPage *page); QWidget *searchBar(); public Q_SLOTS: @@ -63,6 +73,18 @@ void openUrlInNewTab(const KUrl &url); protected: + /** + * Creates new (K)WebPage. This virtual method is called by page() to create new (K)WebPage if necessary. + * Reimplement this method if you reimplement KWebPage, e.g: + * @code + * void MyWebView::setNewPage() + * { + * setPage(new MyWebPage(this)); + * } + * @endcode + * @see page() + */ + virtual void setNewPage(); void contextMenuEvent(QContextMenuEvent *event); void wheelEvent(QWheelEvent *event); void mousePressEvent(QMouseEvent *event); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdewebkit/searchbar_p.cpp new/libs/webkitkde/kdewebkit/searchbar_p.cpp --- old/libs/webkitkde/kdewebkit/searchbar_p.cpp 2009-04-10 17:58:28.000000000 +0200 +++ new/libs/webkitkde/kdewebkit/searchbar_p.cpp 2009-05-11 23:26:22.000000000 +0200 @@ -32,10 +32,11 @@ namespace KDEPrivate { -class SearchBar::SearchBarPrivate { +class SearchBar::SearchBarPrivate +{ public: - SearchBarPrivate(SearchBar* searchBar, QWidget* widget, QTimeLine* timeLine) - : widget(widget), timeLine(timeLine), m_searchBar(searchBar) {} + SearchBarPrivate(SearchBar* searchBar, QWidget* widget, QTimeLine* timeLine) + : widget(widget), timeLine(timeLine), m_searchBar(searchBar) {} void initializeSearchWidget() { widget = new QWidget(m_searchBar); widget->setContentsMargins(0, 0, 0, 0); @@ -47,8 +48,8 @@ ui.nextButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); ui.searchInfo->setText(QString()); if (ui.searchAsYouType->checkState() == Qt::Checked) { - connect(ui.searchLineEdit, SIGNAL(textChanged(const QString&)), - m_searchBar, SIGNAL(searchChanged(const QString&))); + connect(ui.searchLineEdit, SIGNAL(textChanged(const QString&)), + m_searchBar, SIGNAL(searchChanged(const QString&))); } connect(ui.searchAsYouType, SIGNAL(stateChanged(int)), m_searchBar, SLOT(searchAsYouTypeChanged(int))); connect(ui.nextButton, SIGNAL(clicked()), @@ -71,7 +72,7 @@ }; SearchBar::SearchBar(QWidget *parent) - : QWidget(parent) + : QWidget(parent) { d = new SearchBarPrivate(this, 0, new QTimeLine(150, this)); d->initializeSearchWidget(); @@ -79,7 +80,7 @@ // we start off hidden setMaximumHeight(0); d->widget->setGeometry(0, -1 * d->widget->height(), - d->widget->width(), d->widget->height()); + d->widget->width(), d->widget->height()); QWidget::hide(); connect(d->timeLine, SIGNAL(frameChanged(int)), @@ -179,7 +180,7 @@ this, SIGNAL(searchChanged(const QString&))); } else { connect(d->ui.searchLineEdit, SIGNAL(textChanged(const QString&)), - this, SIGNAL(searchChanged(const QString&))); + this, SIGNAL(searchChanged(const QString&))); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdewebkit/settings/webkitsettings.cpp new/libs/webkitkde/kdewebkit/settings/webkitsettings.cpp --- old/libs/webkitkde/kdewebkit/settings/webkitsettings.cpp 2009-04-10 11:34:02.000000000 +0200 +++ new/libs/webkitkde/kdewebkit/settings/webkitsettings.cpp 2009-05-11 23:18:58.000000000 +0200 @@ -90,6 +90,7 @@ bool m_hideAdsEnabled : 1; bool m_jsPopupBlockerPassivePopup : 1; bool m_accessKeysEnabled : 1; + bool m_zoomTextOnly : 1; // the virtual global "domain" KPerDomainSettings global; @@ -156,11 +157,11 @@ const char* WebKitSettings::adviceToStr(KJavaScriptAdvice _advice) { switch( _advice ) { - case KJavaScriptAccept: return I18N_NOOP("Accept"); - case KJavaScriptReject: return I18N_NOOP("Reject"); - default: return 0; + case KJavaScriptAccept: return I18N_NOOP("Accept"); + case KJavaScriptReject: return I18N_NOOP("Reject"); + default: return 0; } - return 0; + return 0; } @@ -194,7 +195,8 @@ } void WebKitSettings::readDomainSettings(const KConfigGroup &config, bool reset, - bool global, KPerDomainSettings &pd_settings) { + bool global, KPerDomainSettings &pd_settings) +{ QString jsPrefix = global ? QString() : QString::fromLatin1("javascript."); QString javaPrefix = global ? QString() @@ -428,6 +430,10 @@ d->m_smoothScrolling = KSmoothScrollingEnabled; } + if ( reset || cgHtml.hasKey( "ZoomTextOnly" ) ) { + d->m_zoomTextOnly = cgHtml.readEntry( "ZoomTextOnly", false ); + } + if ( cgHtml.readEntry( "UserStyleSheetEnabled", false ) == true ) { if ( reset || cgHtml.hasKey( "UserStyleSheet" ) ) d->m_userSheet = cgHtml.readEntry( "UserStyleSheet", "" ); @@ -505,19 +511,19 @@ // merge all domains into one list QMap<QString,int> domainList; // why can't Qt have a QSet? for (unsigned i = 0; i < sizeof domain_keys/sizeof domain_keys[0]; ++i) { - if ( reset || cgJava.hasKey(domain_keys[i]) ) { - if (i == 0) check_old_ecma_settings = false; - else if (i == 1) check_old_java_settings = false; - const QStringList dl = cgJava.readEntry( domain_keys[i], QStringList() ); - const QMap<QString,int>::Iterator notfound = domainList.end(); - QStringList::ConstIterator it = dl.begin(); - const QStringList::ConstIterator itEnd = dl.end(); - for (; it != itEnd; ++it) { - const QString domain = (*it).toLower(); - QMap<QString,int>::Iterator pos = domainList.find(domain); - if (pos == notfound) domainList.insert(domain,0); - }/*next it*/ - } + if (reset || cgJava.hasKey(domain_keys[i])) { + if (i == 0) check_old_ecma_settings = false; + else if (i == 1) check_old_java_settings = false; + const QStringList dl = cgJava.readEntry( domain_keys[i], QStringList() ); + const QMap<QString,int>::Iterator notfound = domainList.end(); + QStringList::ConstIterator it = dl.begin(); + const QStringList::ConstIterator itEnd = dl.end(); + for (; it != itEnd; ++it) { + const QString domain = (*it).toLower(); + QMap<QString,int>::Iterator pos = domainList.find(domain); + if (pos == notfound) domainList.insert(domain,0); + }/*next it*/ + } }/*next i*/ if (reset) @@ -646,7 +652,9 @@ QWebSettings::globalSettings()->setAttribute(QWebSettings::PluginsEnabled, isPluginsEnabled()); QWebSettings::globalSettings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, windowOpenPolicy() != WebKitSettings::KJSWindowOpenDeny); - +#if QT_VERSION >= 0x040500 + QWebSettings::globalSettings()->setAttribute(QWebSettings::ZoomTextOnly, zoomTextOnly()); +#endif QWebSettings::globalSettings()->setFontFamily(QWebSettings::StandardFont, stdFontName()); QWebSettings::globalSettings()->setFontFamily(QWebSettings::FixedFont, fixedFontName()); QWebSettings::globalSettings()->setFontFamily(QWebSettings::SerifFont, serifFontName()); @@ -1035,6 +1043,11 @@ return d->m_smoothScrolling; } +bool WebKitSettings::zoomTextOnly() const +{ + return d->m_zoomTextOnly; +} + bool WebKitSettings::isAutoDelayedActionsEnabled() const { return d->m_autoDelayedActionsEnabled; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdewebkit/settings/webkitsettings.h new/libs/webkitkde/kdewebkit/settings/webkitsettings.h --- old/libs/webkitkde/kdewebkit/settings/webkitsettings.h 2008-08-26 01:26:00.000000000 +0200 +++ new/libs/webkitkde/kdewebkit/settings/webkitsettings.h 2009-05-11 23:12:18.000000000 +0200 @@ -126,6 +126,7 @@ bool autoSpellCheck() const; KAnimationAdvice showAnimations() const; KSmoothScrollingMode smoothScrolling() const; + bool zoomTextOnly() const; // Font settings QString stdFontName() const; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/part/webkitpart.cpp new/libs/webkitkde/part/webkitpart.cpp --- old/libs/webkitkde/part/webkitpart.cpp 2009-04-23 00:59:03.000000000 +0200 +++ new/libs/webkitkde/part/webkitpart.cpp 2009-05-11 23:26:22.000000000 +0200 @@ -51,13 +51,13 @@ #include <QPrintPreviewDialog> WebKitPart::WebKitPart(QWidget *parentWidget, QObject *parent, const QStringList &/*args*/) - : KParts::ReadOnlyPart(parent) + : KParts::ReadOnlyPart(parent) { KAboutData about = KAboutData("webkitpart", "webkitkde", ki18n("WebKit HTML Component"), - /*version*/ "0.1", /*ki18n("shortDescription")*/ KLocalizedString(), - KAboutData::License_LGPL, - ki18n("(c) 2008 - 2009, Urs Wolfer\n" - "(c) 2007 Trolltech ASA")); + /*version*/ "0.1", /*ki18n("shortDescription")*/ KLocalizedString(), + KAboutData::License_LGPL, + ki18n("(c) 2008 - 2009, Urs Wolfer\n" + "(c) 2007 Trolltech ASA")); about.addAuthor(ki18n("Laurent Montel"), KLocalizedString(), "montel(a)kde.org"); about.addAuthor(ki18n("Michael Howell"), KLocalizedString(), "mhowell123(a)gmail.com"); @@ -113,16 +113,29 @@ actionCollection()->addAction("printFrame", action); connect(action, SIGNAL(triggered(bool)), m_browserExtension, SLOT(printFrame())); - action = new KAction(KIcon("format-font-size-more"), i18n("Enlarge Font"), this); - actionCollection()->addAction("incFontSizes", action); + action = new KAction(KIcon("zoom-in"), i18n("Zoom In"), this); + actionCollection()->addAction("zoomIn", action); action->setShortcut(KShortcut("CTRL++; CTRL+=")); connect(action, SIGNAL(triggered(bool)), m_browserExtension, SLOT(zoomIn())); - action = new KAction(KIcon("format-font-size-less"), i18n("Shrink Font"), this); - actionCollection()->addAction("decFontSizes", action); - action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Minus)); + action = new KAction(KIcon("zoom-out"), i18n("Zoom Out"), this); + actionCollection()->addAction("zoomOut", action); + action->setShortcut(KShortcut("CTRL+-; CTRL+_")); connect(action, SIGNAL(triggered(bool)), m_browserExtension, SLOT(zoomOut())); + action = new KAction(KIcon("zoom-original"), i18n("Actual Size"), this); + actionCollection()->addAction("zoomNormal", action); + action->setShortcut(KShortcut("CTRL+0")); + connect(action, SIGNAL(triggered(bool)), m_browserExtension, SLOT(zoomNormal())); +#if QT_VERSION >= 0x040500 + action = new KAction(i18n("Zoom Text Only"), this); + action->setCheckable(true); + KConfigGroup cgHtml(KGlobal::config(), "HTML Settings"); + bool zoomTextOnly = cgHtml.readEntry("ZoomTextOnly", false); + action->setChecked(zoomTextOnly); + actionCollection()->addAction("zoomTextOnly", action); + connect(action, SIGNAL(triggered(bool)), m_browserExtension, SLOT(toogleZoomTextOnly())); +#endif action = actionCollection()->addAction(KStandardAction::SelectAll, "selectAll", m_browserExtension, SLOT(slotSelectAll())); action->setShortcutContext(Qt::WidgetShortcut); @@ -209,7 +222,7 @@ WebKitBrowserExtension::WebKitBrowserExtension(WebKitPart *parent) - : KParts::BrowserExtension(parent), part(parent) + : KParts::BrowserExtension(parent), part(parent) { connect(part->view()->page(), SIGNAL(selectionChanged()), this, SLOT(updateEditActions())); @@ -297,19 +310,40 @@ void WebKitBrowserExtension::zoomIn() { -#if QT_VERSION < 0x040500 - part->view()->setTextSizeMultiplier(part->view()->textSizeMultiplier() * 2); +#if QT_VERSION >= 0x040500 + part->view()->setZoomFactor(part->view()->zoomFactor() + 0.1); #else - part->view()->setZoomFactor(part->view()->zoomFactor() * 1.25); + part->view()->setTextSizeMultiplier(part->view()->textSizeMultiplier() + 0.1); #endif } void WebKitBrowserExtension::zoomOut() { -#if QT_VERSION < 0x040500 - part->view()->setTextSizeMultiplier(part->view()->textSizeMultiplier() * 2); +#if QT_VERSION >= 0x040500 + part->view()->setZoomFactor(part->view()->zoomFactor() - 0.1); +#else + part->view()->setTextSizeMultiplier(part->view()->textSizeMultiplier() - 0.1); +#endif +} + +void WebKitBrowserExtension::zoomNormal() +{ +#if QT_VERSION >= 0x040500 + part->view()->setZoomFactor(1); #else - part->view()->setZoomFactor(part->view()->zoomFactor() * 0.8); + part->view()->setTextSizeMultiplier(1); +#endif +} + +void WebKitBrowserExtension::toogleZoomTextOnly() +{ +#if QT_VERSION >= 0x040500 + KConfigGroup cgHtml(KGlobal::config(), "HTML Settings"); + bool zoomTextOnly = cgHtml.readEntry( "ZoomTextOnly", false ); + cgHtml.writeEntry("ZoomTextOnly", !zoomTextOnly); + KGlobal::config()->reparseConfiguration(); + + part->view()->settings()->setAttribute(QWebSettings::ZoomTextOnly, !zoomTextOnly); #endif } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/part/webkitpart.h new/libs/webkitkde/part/webkitpart.h --- old/libs/webkitkde/part/webkitpart.h 2009-03-15 13:22:37.000000000 +0100 +++ new/libs/webkitkde/part/webkitpart.h 2009-05-11 23:12:18.000000000 +0200 @@ -82,6 +82,8 @@ void zoomIn(); void zoomOut(); + void zoomNormal(); + void toogleZoomTextOnly(); void slotSelectAll(); void slotFrameInWindow(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/part/webkitpart.rc new/libs/webkitkde/part/webkitpart.rc --- old/libs/webkitkde/part/webkitpart.rc 2009-03-15 13:04:22.000000000 +0100 +++ new/libs/webkitkde/part/webkitpart.rc 2009-05-11 23:12:18.000000000 +0200 @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="webkitpart" version="5"> +<kpartgui name="webkitpart" version="6"> <MenuBar> <Menu name="file"> <Action name="saveDocument" /> @@ -13,14 +13,18 @@ <Action name="find" /> </Menu> <Menu name="view"> - <Action name="incFontSizes" /> - <Action name="decFontSizes" /> + <Action name="zoomIn" /> + <Action name="zoomOut" /> + <Action name="zoomNormal" /> + <Action name="zoomTextOnly" /> + <Separator /> <Action name="viewDocumentSource" /> <ActionList name="debugScriptList" /> </Menu> </MenuBar> <ToolBar name="htmlToolBar" iconText="icononly" iconSize="22" hidden="true"><text>HTML Toolbar</text> - <Action name="incFontSizes" /> - <Action name="decFontSizes" /> + <Action name="zoomIn" /> + <Action name="zoomOut" /> + <Action name="zoomNormal" /> </ToolBar> </kpartgui> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/part/webpage.cpp new/libs/webkitkde/part/webpage.cpp --- old/libs/webkitkde/part/webpage.cpp 2009-04-23 00:59:03.000000000 +0200 +++ new/libs/webkitkde/part/webpage.cpp 2009-05-11 23:26:22.000000000 +0200 @@ -47,8 +47,8 @@ #include <QtNetwork/QNetworkReply> WebPage::WebPage(WebKitPart *wpart, QWidget *parent) - : KWebPage(parent) - , m_part(wpart) + : KWebPage(parent) + , m_part(wpart) { connect(this, SIGNAL(geometryChangeRequested(const QRect &)), this, SLOT(slotGeometryChangeRequested(const QRect &))); @@ -80,7 +80,11 @@ KParts::WindowArgs(), &part); WebKitPart *webKitPart = qobject_cast<WebKitPart*>(part); if (!webKitPart) { - kDebug() << "got NOT a WebKitPart but a" << part->metaObject()->className(); + if (part) + kDebug() << "got NOT a WebKitPart but a" << part->metaObject()->className(); + else + kDebug() << "part is null"; + return 0; } return webKitPart->view()->page(); @@ -126,8 +130,8 @@ moveByX = - right + sg.right(); // always <0 if (bottom > sg.bottom()) moveByY = - bottom + sg.bottom(); // always <0 - if ((moveByX || moveByY) && - WebKitSettings::self()->windowMovePolicy(host) == WebKitSettings::KJSWindowMoveAllow) { + if ((moveByX || moveByY) + && WebKitSettings::self()->windowMovePolicy(host) == WebKitSettings::KJSWindowMoveAllow) { emit m_part->browserExtension()->moveTopLevelWidget(view()->x() + moveByX, view()->y() + moveByY); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/part/webview.cpp new/libs/webkitkde/part/webview.cpp --- old/libs/webkitkde/part/webview.cpp 2009-03-31 21:15:28.000000000 +0200 +++ new/libs/webkitkde/part/webview.cpp 2009-05-11 23:26:22.000000000 +0200 @@ -45,8 +45,7 @@ { public: WebViewPrivate(WebView *webView) - : webView(webView) - {} + : webView(webView) {} void addSearchActions(QList<QAction *>& selectActions); QString selectedTextAsOneLine() const; @@ -68,10 +67,9 @@ WebView::WebView(WebKitPart *wpart, QWidget *parent) - : KWebView(parent), d(new WebViewPrivate(this)) + : KWebView(parent), d(new WebViewPrivate(this)) { d->part = wpart; - setPage(new WebPage(wpart, this)); d->actionCollection = new KActionCollection(this); setAcceptDrops(true); } @@ -86,6 +84,11 @@ return d->result; } +void WebView::setNewPage() +{ + setPage(new WebPage(d->part, this)); +} + void WebView::contextMenuEvent(QContextMenuEvent *e) { d->result = page()->mainFrame()->hitTestContent(e->pos()); @@ -311,7 +314,7 @@ while (!text.isEmpty() && text[0].isSpace()) text = text.mid(1); while (!text.isEmpty() && text[text.length()-1].isSpace()) - text.truncate(text.length()-1); + text.truncate(text.length() - 1); return text; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/part/webview.h new/libs/webkitkde/part/webview.h --- old/libs/webkitkde/part/webview.h 2008-09-06 20:07:27.000000000 +0200 +++ new/libs/webkitkde/part/webview.h 2009-05-11 23:22:45.000000000 +0200 @@ -43,6 +43,7 @@ QWebHitTestResult contextMenuResult() const; protected: + void setNewPage(); void contextMenuEvent(QContextMenuEvent *e); void selectActionPopupMenu(KParts::BrowserExtension::ActionGroupMap &selectGroupMap); void linkActionPopupMenu(KParts::BrowserExtension::ActionGroupMap &linkGroupMap); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/scripts/codingstyle.sh new/libs/webkitkde/scripts/codingstyle.sh --- old/libs/webkitkde/scripts/codingstyle.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libs/webkitkde/scripts/codingstyle.sh 2009-05-11 23:15:48.000000000 +0200 @@ -0,0 +1,19 @@ +#!/bin/sh +# +# Kdelibs coding style is defined in http://techbase.kde.org/Policies/Kdelibs_Coding_Style +# + +PWD=$(pwd) +cd $PWD + +echo "Applying astyle rules..." +astyle -v --indent=spaces=4 \ + --brackets=linux \ + --indent-labels \ + --pad=oper --unpad=paren \ + --one-line=keep-statements \ + --convert-tabs --indent-preprocessor \ + `find -type f -name '*.cpp' -or -name '*.h' -or -name '*.cc' | grep -Ev "\./.+/settings/"` + +echo "Done!" + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 suseRegister for openSUSE:Factory
by root＠Hilbert.suse.de 15 May '09

15 May '09

Hello community, here is the log from the commit of package suseRegister for openSUSE:Factory checked in at Fri May 15 23:50:51 CEST 2009. -------- --- suseRegister/suseRegister.changes 2009-05-08 11:04:48.000000000 +0200 +++ suseRegister/suseRegister.changes 2009-05-14 16:53:18.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 14 16:52:55 CEST 2009 - mc(a)suse.de + +- strip non-printable characters (bnc#502785) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.RY3528/_old 2009-05-15 23:48:10.000000000 +0200 +++ /var/tmp/diff_new_pack.RY3528/_new 2009-05-15 23:48:10.000000000 +0200 @@ -20,7 +20,7 @@ Name: suseRegister Version: 1.3 -Release: 16 +Release: 17 Summary: Registration Tool Group: Productivity/Other License: GPL v2 or later @@ -89,6 +89,8 @@ /usr/lib/suseRegister/bin/* %changelog +* Thu May 14 2009 mc(a)suse.de +- strip non-printable characters (bnc#502785) * Fri May 08 2009 mc(a)suse.de - do not change LANG and LANGUAGE enviroment variables if they are already en_* (bnc#490811) ++++++ suseRegister-1.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.3/SRPrivate.pm new/suseRegister-1.3/SRPrivate.pm --- old/suseRegister-1.3/SRPrivate.pm 2009-05-08 11:04:04.000000000 +0200 +++ new/suseRegister-1.3/SRPrivate.pm 2009-05-14 16:49:24.000000000 +0200 @@ -878,13 +878,16 @@ { $writer->startTag("param", "id" => $key); - if ($ctx->{args}->{$key}->{value} =~ /\s+/) + my $value = $ctx->{args}->{$key}->{value}; + $value =~ s/[\x00-\x08\x0B-\x0C\x0E-\x1F]/ /g; + + if ($value =~ /\s+/) { - $writer->cdata($ctx->{args}->{$key}->{value}); + $writer->cdata($value); } else { - $writer->characters($ctx->{args}->{$key}->{value}); + $writer->characters($value); } $writer->endTag("param"); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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