September 2008 - openSUSE Commits - openSUSE Mailing Lists

commit powerpc-utils
by root＠Hilbert.suse.de 30 Sep '08

30 Sep '08

Hello community, here is the log from the commit of package powerpc-utils checked in at Tue Sep 30 14:12:20 CEST 2008. -------- --- arch/ppc/powerpc-utils/powerpc-utils.changes 2008-09-15 17:02:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/powerpc-utils/powerpc-utils.changes 2008-09-30 08:55:19.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 30 08:54:23 CEST 2008 - olh(a)suse.de + +- fix malloc size lsslot (bnc#430790 - LTC48583) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- powerpc-utils-papr.lsslot.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerpc-utils.spec ++++++ --- /var/tmp/diff_new_pack.g32161/_old 2008-09-30 14:12:11.000000000 +0200 +++ /var/tmp/diff_new_pack.g32161/_new 2008-09-30 14:12:11.000000000 +0200 @@ -25,7 +25,7 @@ Obsoletes: ppc64-utils Provides: ppc64-utils Version: 1.1.1 -Release: 3 +Release: 4 License: IBM Public License Url: http://powerpc-utils.ozlabs.org/ Group: System/Management @@ -41,6 +41,7 @@ Patch3: powerpc-utils.ofpathname.bootlist.patch Patch4: powerpc-utils-papr.open-flag.patch Patch5: powerpc-utils-papr.insserv-ibmvscsis.patch +Patch6: powerpc-utils-papr.lsslot.patch ExclusiveArch: ppc ppc64 %description @@ -64,6 +65,7 @@ cd powerpc-utils-papr-%{papr_version} %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" %{?jobs:-j%jobs} @@ -99,6 +101,8 @@ %config %attr (755,root,root) /etc/init.d/ibmvscsis.sh %changelog +* Tue Sep 30 2008 olh(a)suse.de +- fix malloc size lsslot (bnc#430790 - LTC48583) * Mon Sep 15 2008 olh(a)suse.de - update powerpc-utils-papr to 1.1.2 (bnc#417533) compile with new libservicelog sources ++++++ powerpc-utils-papr.lsslot.patch ++++++ Bug 430790 - UPT-LTE: lsslot in powerpc-utils-papr package aborts unexpectly The reason is that if the content in devspec in sysfs doesn't start with '/'(e.g. the content in "/sys/devices/vio/devspec" is "none"), the full_path_len in function of_to_full_path() is not enough to hold the OFDT_BASE, of_path, an additional '/' char, and the terminating null byte. --- cmds/drmgr/common_ofdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/cmds/drmgr/common_ofdt.c +++ b/cmds/drmgr/common_ofdt.c @@ -177,7 +177,7 @@ of_to_full_path(const char *of_path) return NULL; } } else { - full_path_len = strlen(OFDT_BASE) + strlen(of_path) + 1; + full_path_len = strlen(OFDT_BASE) + strlen(of_path) + 2; full_path = malloc(full_path_len); if (full_path == NULL) { err_msg("malloc failed\n"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit petitboot
by root＠Hilbert.suse.de 30 Sep '08

30 Sep '08

Hello community, here is the log from the commit of package petitboot checked in at Tue Sep 30 14:12:02 CEST 2008. -------- --- arch/ppc/petitboot/petitboot.changes 2008-09-05 15:50:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/petitboot/petitboot.changes 2008-09-30 11:43:37.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 30 11:43:17 CEST 2008 - sassmann(a)suse.de + +- added BuildRequires for ncurses-devel + +------------------------------------------------------------------- @@ -6 +11 @@ - * Convert the build to use autotools + * Conver the build to use autotools calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ petitboot.spec ++++++ --- /var/tmp/diff_new_pack.E30470/_old 2008-09-30 14:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.E30470/_new 2008-09-30 14:11:55.000000000 +0200 @@ -20,11 +20,11 @@ Name: petitboot Version: 1.0rc2 -Release: 1 +Release: 2 Url: http://ozlabs.org/~jk/projects/petitboot/ Summary: Petitboot is a graphical bootloader for the PlayStation 3 License: GPL v2 only -BuildRequires: busybox kexec-tools libjpeg-devel libpng-devel libtwin0-devel pkg-config ps3-utils +BuildRequires: busybox kexec-tools libjpeg-devel libpng-devel libtwin0-devel ncurses-devel pkg-config ps3-utils BuildRequires: dtc kernel-ps3 lilo powerpc-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}.tar.bz2 @@ -104,10 +104,12 @@ /usr/share/ps3/otheros.bld %changelog +* Tue Sep 30 2008 sassmann(a)suse.de +- added BuildRequires for ncurses-devel * Mon Sep 01 2008 sassmann(a)suse.de - switch to Geoff Levands branch which is a rework of petitboot * Rename the original graphical petitboot application to petitboot-gui - * Convert the build to use autotools + * Conver the build to use autotools * Rewrite or update the path related petitboot library functions. * Cleanup kboot parser * Cleanup native parser ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 lilo
by root＠Hilbert.suse.de 30 Sep '08

30 Sep '08

Hello community, here is the log from the commit of package lilo checked in at Tue Sep 30 14:11:46 CEST 2008. -------- --- arch/i386/lilo/lilo.changes 2008-09-29 17:17:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2008-09-30 11:46:34.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 30 11:45:54 CEST 2008 - olh(a)suse.de + +- handle memory for initrd download correctly + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yaboot-22.8-r1129.tar.bz2 New: ---- yaboot-22.8-r1138.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.m29492/_old 2008-09-30 14:11:33.000000000 +0200 +++ /var/tmp/diff_new_pack.m29492/_new 2008-09-30 14:11:33.000000000 +0200 @@ -21,7 +21,7 @@ Name: lilo ExclusiveArch: ppc ppc64 %ix86 x86_64 -%define yaboot_vers 22.8-r1129 +%define yaboot_vers 22.8-r1138 Group: System/Boot License: BSD 3-Clause Summary: The Linux Loader, a Boot Menu @@ -50,7 +50,7 @@ BuildRequires: gcc-32bit glibc-devel-32bit libgcc42-32bit libmudflap42-32bit %endif Version: 22.8 -Release: 26 +Release: 27 Source0: lilo-ppc-%{version}.tar.bz2 Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2 Source86: lilo-%{version}.src.tar.bz2 @@ -212,6 +212,8 @@ %endif %doc %{_mandir}/*/* %changelog +* Tue Sep 30 2008 olh(a)suse.de +- handle memory for initrd download correctly * Mon Sep 29 2008 olh(a)suse.de - do not force zImage if root is on iscsi (bnc#417539) yaboot can handle iscsi now ++++++ lilo-ppc-22.8.tar.bz2 ++++++ ++++++ yaboot-22.8-r1129.tar.bz2 -> yaboot-22.8-r1138.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1129/Changelog.SuSE new/yaboot-22.8-r1138/Changelog.SuSE --- old/yaboot-22.8-r1129/Changelog.SuSE 2008-09-26 08:58:07.000000000 +0200 +++ new/yaboot-22.8-r1138/Changelog.SuSE 2008-09-30 11:42:25.000000000 +0200 @@ -1,4 +1,46 @@ ------------------------------------------------------------------------ +r1138 | olh | 2008-09-30 09:42:25 +0000 (Tue, 30 Sep 2008) | 1 line +Changed paths: + M /trunk/yaboot/second/yaboot.c + +read initrd only in chunks for non-network devices +------------------------------------------------------------------------ +r1137 | olh | 2008-09-30 09:35:14 +0000 (Tue, 30 Sep 2008) | 1 line +Changed paths: + M /trunk/yaboot/second/yaboot.c + +increment claim_base for initrd memory in 64k instead of 1MB steps +------------------------------------------------------------------------ +r1136 | olh | 2008-09-30 09:34:26 +0000 (Tue, 30 Sep 2008) | 1 line +Changed paths: + M /trunk/yaboot/second/yaboot.c + +try to claim initrd memory up to 128MB +------------------------------------------------------------------------ +r1135 | olh | 2008-09-30 09:31:28 +0000 (Tue, 30 Sep 2008) | 1 line +Changed paths: + M /trunk/yaboot/second/yaboot.c + +base allocation size on filesize for tftp downloads +------------------------------------------------------------------------ +r1134 | olh | 2008-09-30 09:28:33 +0000 (Tue, 30 Sep 2008) | 1 line +Changed paths: + M /trunk/yaboot/second/yaboot.c + +increment claim_base for initrd memory correctly +------------------------------------------------------------------------ +r1133 | olh | 2008-09-30 08:56:56 +0000 (Tue, 30 Sep 2008) | 1 line +Changed paths: + M /trunk/yaboot/second/yaboot.c + +make claim_base an unsigned long +------------------------------------------------------------------------ +r1132 | olh | 2008-09-30 08:55:36 +0000 (Tue, 30 Sep 2008) | 1 line +Changed paths: + M /trunk/yaboot/second/yaboot.c + +Lindent yaboot.c +------------------------------------------------------------------------ r1129 | olh | 2008-09-26 06:58:07 +0000 (Fri, 26 Sep 2008) | 1 line Changed paths: M /trunk/yaboot/include/file.h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1129/Makefile new/yaboot-22.8-r1138/Makefile --- old/yaboot-22.8-r1129/Makefile 2008-09-25 15:32:32.000000000 +0200 +++ new/yaboot-22.8-r1138/Makefile 2008-09-25 15:32:32.000000000 +0200 @@ -6,7 +6,7 @@ include Config -VERSION = 22.8-r1129 +VERSION = 22.8-r1138 # Debug mode (spam/verbose) DEBUG = 0 # make install vars diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1129/second/yaboot.c new/yaboot-22.8-r1138/second/yaboot.c --- old/yaboot-22.8-r1129/second/yaboot.c 2008-09-26 08:58:07.000000000 +0200 +++ new/yaboot-22.8-r1138/second/yaboot.c 2008-09-30 11:42:25.000000000 +0200 @@ -59,7 +59,7 @@ static char *hard_coded_bootpath(char *bootpath) { #ifdef HARD_CODED_BOOTPATH - const char path[] = HARD_CODED_BOOTPATH ; + const char path[] = HARD_CODED_BOOTPATH; prom_printf("original bootpath: '%s'\n using hardcoded bootpath: '%s'\n", bootpath, path); bootpath = malloc(strlen(path) + 1); if (bootpath) @@ -78,8 +78,8 @@ #define _ALIGN(addr,size) (((addr)+size-1)&(~(size-1))) #define MAX_HEADERS 32 -#define SLES9_ZIMAGE_BASE ((4 * 1024 * 1024)) /* the zImage header used in SLES8/9 is not relocatable */ -#define SLES9_ZIMAGE_SIZE ((7 * 1024 * 1024)) /* its a binary blob from 2.4 kernel source ... */ +#define SLES9_ZIMAGE_BASE ((4 * 1024 * 1024)) /* the zImage header used in SLES8/9 is not relocatable */ +#define SLES9_ZIMAGE_SIZE ((7 * 1024 * 1024)) /* its a binary blob from 2.4 kernel source ... */ #define MALLOCADDR ((2 * 1024 * 1024) + (512 * 1024)) #define MALLOCSIZE ((1 * 1024 * 1024) + (512 * 1024)) #define CLAIM_END (128 * 1024 * 1024) /* FIXME: look at /memory/reg */ @@ -219,9 +219,7 @@ for (i = 0; i < 6; i++) if (b->u.n.mac[i]) { sprintf(config_file_name_ether_mac, config_file_name_ether_mac_template, - b->u.n.mac[0], b->u.n.mac[1], - b->u.n.mac[2], b->u.n.mac[3], - b->u.n.mac[4], b->u.n.mac[5]); + b->u.n.mac[0], b->u.n.mac[1], b->u.n.mac[2], b->u.n.mac[3], b->u.n.mac[4], b->u.n.mac[5]); break; } break; @@ -349,10 +347,7 @@ e->e_ident[EI_MAG1] == ELFMAG1 && e->e_ident[EI_MAG2] == ELFMAG2 && e->e_ident[EI_MAG3] == ELFMAG3 && - e->e_ident[EI_CLASS] == ELFCLASS32 && - e->e_ident[EI_DATA] == ELFDATA2MSB && - (e->e_type == ET_EXEC || e->e_type == ET_DYN) && - e->e_machine == EM_PPC); + e->e_ident[EI_CLASS] == ELFCLASS32 && e->e_ident[EI_DATA] == ELFDATA2MSB && (e->e_type == ET_EXEC || e->e_type == ET_DYN) && e->e_machine == EM_PPC); } static int is_elf64(loadinfo_t * loadinfo) @@ -364,9 +359,7 @@ e->e_ident[EI_MAG2] == ELFMAG2 && e->e_ident[EI_MAG3] == ELFMAG3 && e->e_ident[EI_CLASS] == ELFCLASS64 && - e->e_ident[EI_DATA] == ELFDATA2MSB && - (e->e_type == ET_EXEC || e->e_type == ET_DYN) && - e->e_machine == EM_PPC64); + e->e_ident[EI_DATA] == ELFDATA2MSB && (e->e_type == ET_EXEC || e->e_type == ET_DYN) && e->e_machine == EM_PPC64); } static int load_elf32(struct boot_file_t *file, loadinfo_t * loadinfo) @@ -638,11 +631,9 @@ #ifdef COLOR_TEST for (i = 0; i < 16; i++) { prom_printf("\x1b[%d;%dm\x1b[1;47m%s \x1b[2;40m %s\n", - ansi_color_table[i].index, - ansi_color_table[i].value, ansi_color_table[i].name, ansi_color_table[i].name); + ansi_color_table[i].index, ansi_color_table[i].value, ansi_color_table[i].name, ansi_color_table[i].name); prom_printf("\x1b[%d;%dm\x1b[1;37m%s \x1b[2;30m %s\n", - ansi_color_table[i].index, - ansi_color_table[i].value + 10, ansi_color_table[i].name, ansi_color_table[i].name); + ansi_color_table[i].index, ansi_color_table[i].value + 10, ansi_color_table[i].name, ansi_color_table[i].name); } prom_printf("\x1b[1;37m\x1b[2;40m"); #endif /* COLOR_TEST */ @@ -799,8 +790,7 @@ } } prom_printf(" ___________________\n< Permission denied >\n -------------------\n" - " \\ ^__^\n \\ (oo)\\_______\n (__)\\ )\\/\\\n" - " ||----w |\n || ||\n"); + " \\ ^__^\n \\ (oo)\\_______\n (__)\\ )\\/\\\n" " ||----w |\n || ||\n"); prom_sleep(4); prom_interpret("reset-all"); } @@ -998,10 +988,11 @@ struct boot_file_t file; int result; + int chunksize; enum get_params_result gpr; struct boot_param_t params; struct path_description *kernel, *rd; - void *claim_base; + unsigned long claim_base; void *initrd_base; unsigned long initrd_size; kernel_entry_t kernel_entry; @@ -1100,41 +1091,46 @@ } gpr = GET_PARAMS_STOP; } else { -#define INITRD_CHUNKSIZE 0x400000 /* put initrd after the kernels final location */ /* it seems that the B50 has trouble with a location between * real-base and 32M. The kernel crashes at random places in * prom_init, usually in opening display. */ if (64 == _cpu) - claim_base = (void *)loadinfo.memsize; + claim_base = loadinfo.memsize; else - claim_base = (void *)(32 * 1024 * 1024); - for (result = 0; result < 128; result++) { - initrd_base = prom_claim(claim_base, INITRD_CHUNKSIZE, 0); + claim_base = 32 * 1024 * 1024; + if (file.dev_type == TYPE_NET) + chunksize = file.len; + else + chunksize = 4 * 1024 * 1024; + /* try to claim memory up to 128MB */ + while (claim_base + chunksize < 128 * 1024 * 1024) { + initrd_base = prom_claim((void *)claim_base, chunksize, 0); if (initrd_base != (void *)-1) break; - claim_base += (unsigned long)claim_base + (1 * 1024 * 1024); + claim_base += 64 * 1024; } if (initrd_base == (void *)-1) { prom_printf("Claim failed for initrd memory\n"); initrd_base = NULL; } else { - initrd_size = file.fs->read(&file, INITRD_CHUNKSIZE, initrd_base); + initrd_size = file.fs->read(&file, chunksize, initrd_base); if (initrd_size == 0) initrd_base = NULL; - initrd_read = initrd_size; - initrd_more = initrd_base; - while (initrd_read == INITRD_CHUNKSIZE) { /* need to read more? */ - initrd_want = (void *)((unsigned long)initrd_more + INITRD_CHUNKSIZE); - initrd_more = prom_claim(initrd_want, INITRD_CHUNKSIZE, 0); - if (initrd_more != initrd_want) { - prom_printf("Claim failed for initrd memory at %p rc=%p\n", initrd_want, - initrd_more); - break; + if (file.dev_type != TYPE_NET) { + initrd_read = initrd_size; + initrd_more = initrd_base; + while (initrd_read == chunksize) { /* need to read more? */ + initrd_want = (void *)((unsigned long)initrd_more + chunksize); + initrd_more = prom_claim(initrd_want, chunksize, 0); + if (initrd_more != initrd_want) { + prom_printf("Claim failed for initrd memory at %p rc=%p\n", initrd_want, initrd_more); + break; + } + initrd_read = file.fs->read(&file, chunksize, initrd_more); + DEBUG_F(" block at %p rc=%lu\n", initrd_more, initrd_read); + initrd_size += initrd_read; } - initrd_read = file.fs->read(&file, INITRD_CHUNKSIZE, initrd_more); - DEBUG_F(" block at %p rc=%lu\n", initrd_more, initrd_read); - initrd_size += initrd_read; } } file.fs->close(&file); @@ -1162,8 +1158,7 @@ kernel_entry = loadinfo.base + loadinfo.entry - loadinfo.load_loc; DEBUG_F("Kernel entry point = %p\n", kernel_entry); - DEBUG_F("kernel: arg1 = %p,\n" - " arg2 = %08lx,\n" " prom = %p,\n", initrd_base + loadinfo.load_loc, initrd_size, prom); + DEBUG_F("kernel: arg1 = %p,\n" " arg2 = %08lx,\n" " prom = %p,\n", initrd_base + loadinfo.load_loc, initrd_size, prom); DEBUG_F("Entering kernel...\n"); @@ -1276,7 +1271,7 @@ prom_printf("brokenfirmware did not claim executable memory, fixed it myself\n"); sles9_base = prom_claim((void *)SLES9_ZIMAGE_BASE, SLES9_ZIMAGE_SIZE, 0); - if (sles9_base == (void*) - 1) + if (sles9_base == (void *)-1) sles9_base = NULL; DEBUG_F("Allocated %08x bytes @ %p for SLES8/9 install file\n", SLES9_ZIMAGE_SIZE, sles9_base); @@ -1284,17 +1279,18 @@ addr = SLES9_ZIMAGE_BASE + SLES9_ZIMAGE_SIZE; else addr = 64 * 1024; - for ( ; addr < CLAIM_END - MALLOCSIZE; addr += 64*1024) { + for (; addr < CLAIM_END - MALLOCSIZE; addr += 64 * 1024) { /* overlap check */ - if ((addr < (unsigned long)_end || addr + MALLOCSIZE < (unsigned long)_end) && (addr >= (unsigned long)_start || addr + MALLOCSIZE >= (unsigned long)_start)) + if ((addr < (unsigned long)_end || addr + MALLOCSIZE < (unsigned long)_end) + && (addr >= (unsigned long)_start || addr + MALLOCSIZE >= (unsigned long)_start)) continue; /* Allocate some memory for malloc'ator */ - malloc_base = prom_claim((void*)addr , MALLOCSIZE, 0); - if (malloc_base && malloc_base != (void*) -1) + malloc_base = prom_claim((void *)addr, MALLOCSIZE, 0); + if (malloc_base && malloc_base != (void *)-1) break; } if (malloc_base == (void *)-1) { - prom_printf("Can't claim malloc buffer (%x bytes between %08x and %08x)\n", MALLOCSIZE, 64*1024, CLAIM_END - MALLOCSIZE); + prom_printf("Can't claim malloc buffer (%x bytes between %08x and %08x)\n", MALLOCSIZE, 64 * 1024, CLAIM_END - MALLOCSIZE); goto exit; } malloc_init(malloc_base, MALLOCSIZE); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-branding-openSUSE
by root＠Hilbert.suse.de 30 Sep '08

30 Sep '08

Hello community, here is the log from the commit of package yast2-branding-openSUSE checked in at Tue Sep 30 14:08:28 CEST 2008. -------- --- yast2-branding-openSUSE/yast2-branding-openSUSE.changes 2008-09-11 15:39:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-branding-openSUSE/yast2-branding-openSUSE.changes 2008-09-30 12:17:25.996565000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 30 12:15:52 CEST 2008 - jsrain(a)suse.cz + +- reduced BuildRequires + +------------------------------------------------------------------- --- yast2-branding-openSUSE/yast2-branding-SLED.changes 2008-09-30 10:08:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-branding-openSUSE/yast2-branding-SLED.changes 2008-09-30 12:17:26.061500000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 30 12:16:12 CEST 2008 - jsrain(a)suse.cz + +- reduced BuildRequires + +------------------------------------------------------------------- --- yast2-branding-openSUSE/yast2-branding-SLES.changes 2008-09-30 10:06:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-branding-openSUSE/yast2-branding-SLES.changes 2008-09-30 12:17:26.124437000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 30 12:16:22 CEST 2008 - jsrain(a)suse.cz + +- reduced BuildRequires + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.c24242/_old 2008-09-30 14:08:22.000000000 +0200 +++ /var/tmp/diff_new_pack.c24242/_new 2008-09-30 14:08:22.000000000 +0200 @@ -20,13 +20,13 @@ Name: yast2-branding-openSUSE Version: 2.17.0 -Release: 6 +Release: 7 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: COPYING Prefix: /usr -BuildRequires: fdupes hicolor-icon-theme pkg-config update-desktop-files yast2-devtools +BuildRequires: yast2-devtools BuildArch: noarch Provides: yast2-branding Conflicts: yast2-branding-SLES @@ -55,5 +55,7 @@ %{prefix}/share/YaST2/theme/current %changelog +* Tue Sep 30 2008 jsrain(a)suse.cz +- reduced BuildRequires * Thu Sep 11 2008 jsrain(a)suse.cz - initial package (fate #301794) ++++++ yast2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.c24242/_old 2008-09-30 14:08:22.000000000 +0200 +++ /var/tmp/diff_new_pack.c24242/_new 2008-09-30 14:08:22.000000000 +0200 @@ -20,13 +20,13 @@ Name: yast2-branding-SLED Version: 2.17.0 -Release: 6 +Release: 7 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: COPYING Prefix: /usr -BuildRequires: fdupes hicolor-icon-theme pkg-config update-desktop-files yast2-devtools +BuildRequires: yast2-devtools BuildArch: noarch Provides: yast2-branding Conflicts: yast2-branding-openSUSE @@ -55,6 +55,8 @@ %{prefix}/share/YaST2/theme/current %changelog +* Tue Sep 30 2008 jsrain(a)suse.cz +- reduced BuildRequires * Tue Sep 30 2008 kukuk(a)suse.de - Use yast2-theme-SLE * Thu Sep 11 2008 jsrain(a)suse.cz ++++++ yast2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.c24242/_old 2008-09-30 14:08:22.000000000 +0200 +++ /var/tmp/diff_new_pack.c24242/_new 2008-09-30 14:08:22.000000000 +0200 @@ -20,13 +20,13 @@ Name: yast2-branding-SLES Version: 2.17.0 -Release: 6 +Release: 7 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: COPYING Prefix: /usr -BuildRequires: fdupes hicolor-icon-theme pkg-config update-desktop-files yast2-devtools +BuildRequires: yast2-devtools BuildArch: noarch Provides: yast2-branding Conflicts: yast2-branding-openSUSE @@ -55,6 +55,8 @@ %{prefix}/share/YaST2/theme/current %changelog +* Tue Sep 30 2008 jsrain(a)suse.cz +- reduced BuildRequires * Tue Sep 30 2008 kukuk(a)suse.de - Change to use yast2-theme-SLE * Thu Sep 11 2008 jsrain(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-squid
by root＠Hilbert.suse.de 30 Sep '08

30 Sep '08

Hello community, here is the log from the commit of package yast2-squid checked in at Tue Sep 30 14:08:00 CEST 2008. -------- --- yast2-squid/yast2-squid.changes 2008-03-21 14:48:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-squid/yast2-squid.changes 2008-09-30 13:30:49.683131000 +0200 @@ -1,0 +2,28 @@ +Tue Sep 30 13:00:25 CEST 2008 - jsrain(a)suse.cz + +- fixed writing the settings (bnc #421100) +- 2.17.1 + +------------------------------------------------------------------- +Fri Jun 6 12:52:42 CEST 2008 - jsrain(a)suse.cz + +- fixed several typos +- 2.17.0 + +------------------------------------------------------------------- +Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz + +- added categories Settings and System into desktop file + (bnc #382778) + +------------------------------------------------------------------- +Fri Apr 11 11:19:42 CEST 2008 - jsrain(a)suse.cz + +- more texts fixes (bnc #377805) + +------------------------------------------------------------------- +Wed Apr 2 11:51:34 CEST 2008 - jsrain(a)suse.cz + +- fixed some texts (bnc #373131, bnc #373103, bnc #373109) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-squid-2.16.3.tar.bz2 New: ---- yast2-squid-2.17.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-squid.spec ++++++ --- /var/tmp/diff_new_pack.X22160/_old 2008-09-30 14:07:39.000000000 +0200 +++ /var/tmp/diff_new_pack.X22160/_new 2008-09-30 14:07:39.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-squid (Version 2.16.3) +# spec file for package yast2-squid (Version 2.17.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-squid -Version: 2.16.3 +Version: 2.17.1 Release: 1 License: GPL v2 only Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-squid-2.16.3.tar.bz2 +Source0: yast2-squid-2.17.1.tar.bz2 Prefix: /usr Requires: yast2 filesystem boost BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools @@ -35,7 +42,7 @@ Daniel Fiser <dfiser(a)suse.cz> %prep -%setup -n yast2-squid-2.16.3 +%setup -n yast2-squid-2.17.1 %build %{prefix}/bin/y2tool y2autoconf @@ -74,8 +81,20 @@ %{_libdir}/YaST2/plugin/libpy2ag_squid.so* /usr/share/YaST2/scrconf/*.scr %doc %{prefix}/share/doc/packages/yast2-squid - %changelog +* Tue Sep 30 2008 jsrain(a)suse.cz +- fixed writing the settings (bnc #421100) +- 2.17.1 +* Fri Jun 06 2008 jsrain(a)suse.cz +- fixed several typos +- 2.17.0 +* Fri May 16 2008 jsrain(a)suse.cz +- added categories Settings and System into desktop file + (bnc #382778) +* Fri Apr 11 2008 jsrain(a)suse.cz +- more texts fixes (bnc #377805) +* Wed Apr 02 2008 jsrain(a)suse.cz +- fixed some texts (bnc #373131, bnc #373103, bnc #373109) * Fri Mar 21 2008 jsrain(a)suse.cz - changed 'Accept' button to 'Finish' (fate #120373) - 2.16.3 ++++++ yast2-squid-2.16.3.tar.bz2 -> yast2-squid-2.17.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/aclocal.m4 new/yast2-squid-2.17.1/aclocal.m4 --- old/yast2-squid-2.16.3/aclocal.m4 2008-03-21 14:47:45.000000000 +0100 +++ new/yast2-squid-2.17.1/aclocal.m4 2008-09-30 13:30:14.000000000 +0200 @@ -7519,3 +7519,159 @@ AC_MSG_RESULT([$SED]) ]) +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_ifval([$2], [$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/agents/config/Makefile.in new/yast2-squid-2.17.1/agents/config/Makefile.in --- old/yast2-squid-2.16.3/agents/config/Makefile.in 2008-03-21 14:47:49.000000000 +0100 +++ new/yast2-squid-2.17.1/agents/config/Makefile.in 2008-09-30 13:30:19.000000000 +0200 @@ -110,6 +110,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = @RPMNAME@ @@ -124,6 +125,8 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/agents/Makefile.in new/yast2-squid-2.17.1/agents/Makefile.in --- old/yast2-squid-2.16.3/agents/Makefile.in 2008-03-21 14:47:49.000000000 +0100 +++ new/yast2-squid-2.17.1/agents/Makefile.in 2008-09-30 13:30:19.000000000 +0200 @@ -110,6 +110,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = @RPMNAME@ @@ -124,6 +125,8 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/agents/src/Makefile.in new/yast2-squid-2.17.1/agents/src/Makefile.in --- old/yast2-squid-2.16.3/agents/src/Makefile.in 2008-03-21 14:47:49.000000000 +0100 +++ new/yast2-squid-2.17.1/agents/src/Makefile.in 2008-09-30 13:30:19.000000000 +0200 @@ -150,6 +150,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = @RPMNAME@ @@ -164,6 +165,8 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/config/Makefile.in new/yast2-squid-2.17.1/config/Makefile.in --- old/yast2-squid-2.16.3/config/Makefile.in 2008-03-21 14:47:49.000000000 +0100 +++ new/yast2-squid-2.17.1/config/Makefile.in 2008-09-30 13:30:19.000000000 +0200 @@ -113,6 +113,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = @RPMNAME@ @@ -127,6 +128,8 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/config/squid.desktop new/yast2-squid-2.17.1/config/squid.desktop --- old/yast2-squid-2.16.3/config/squid.desktop 2008-03-17 12:43:01.000000000 +0100 +++ new/yast2-squid-2.17.1/config/squid.desktop 2008-05-16 16:45:51.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced; +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced; X-KDE-ModuleType=Library X-KDE-RootOnly=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/configure new/yast2-squid-2.17.1/configure --- old/yast2-squid-2.16.3/configure 2008-03-21 14:47:47.000000000 +0100 +++ new/yast2-squid-2.17.1/configure 2008-09-30 13:30:16.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-squid 2.16.3. +# Generated by GNU Autoconf 2.61 for yast2-squid 2.17.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='yast2-squid' PACKAGE_TARNAME='yast2-squid' -PACKAGE_VERSION='2.16.3' -PACKAGE_STRING='yast2-squid 2.16.3' +PACKAGE_VERSION='2.17.1' +PACKAGE_STRING='yast2-squid 2.17.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -899,6 +899,9 @@ am__fastdepCC_TRUE am__fastdepCC_FALSE CPP +PKG_CONFIG +Y2CORE_CFLAGS +Y2CORE_LIBS AGENT_LIBADD SED GREP @@ -933,6 +936,9 @@ CC CFLAGS CPP +PKG_CONFIG +Y2CORE_CFLAGS +Y2CORE_LIBS CXXCPP F77 FFLAGS' @@ -1438,7 +1444,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-squid 2.16.3 to adapt to many kinds of systems. +\`configure' configures yast2-squid 2.17.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1509,7 +1515,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-squid 2.16.3:";; + short | recursive ) echo "Configuration of yast2-squid 2.17.1:";; esac cat <<\_ACEOF @@ -1547,6 +1553,10 @@ CC C compiler command CFLAGS C compiler flags CPP C preprocessor + PKG_CONFIG path to pkg-config utility + Y2CORE_CFLAGS + C compiler flags for Y2CORE, overriding pkg-config + Y2CORE_LIBS linker flags for Y2CORE, overriding pkg-config CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags @@ -1615,7 +1625,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-squid configure 2.16.3 +yast2-squid configure 2.17.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1629,7 +1639,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-squid $as_me 2.16.3, which was +It was created by yast2-squid $as_me 2.17.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2450,7 +2460,7 @@ # Define the identity of the package. PACKAGE='yast2-squid' - VERSION='2.16.3' + VERSION='2.17.1' cat >>confdefs.h <<_ACEOF @@ -2678,7 +2688,7 @@ -VERSION="2.16.3" +VERSION="2.17.1" RPMNAME="yast2-squid" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -4848,8 +4858,247 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" -CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2" +# If we have core, get its Y2CORE_CFLAGS. +# When building core itself, it has set Y2CORE_CFLAGS elsewhere already + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf(a)gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf(a)gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + PKG_CONFIG="" + fi + +fi +if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5 + ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for Y2CORE" >&5 +echo $ECHO_N "checking for Y2CORE... $ECHO_C" >&6; } + +if test -n "$Y2CORE_CFLAGS"; then + pkg_cv_Y2CORE_CFLAGS="$Y2CORE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5 + ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_Y2CORE_CFLAGS=`$PKG_CONFIG --cflags "yast2-core" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$Y2CORE_LIBS"; then + pkg_cv_Y2CORE_LIBS="$Y2CORE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5 + ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_Y2CORE_LIBS=`$PKG_CONFIG --libs "yast2-core" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + Y2CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "yast2-core" 2>&1` + else + Y2CORE_PKG_ERRORS=`$PKG_CONFIG --print-errors "yast2-core" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$Y2CORE_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (yast2-core) were not met: + +$Y2CORE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables Y2CORE_CFLAGS +and Y2CORE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (yast2-core) were not met: + +$Y2CORE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables Y2CORE_CFLAGS +and Y2CORE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables Y2CORE_CFLAGS +and Y2CORE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables Y2CORE_CFLAGS +and Y2CORE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + Y2CORE_CFLAGS=$pkg_cv_Y2CORE_CFLAGS + Y2CORE_LIBS=$pkg_cv_Y2CORE_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi + +fi + +CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" +CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" : ${AGENT_LIBADD:='-L$(libdir) -lscr'} @@ -5569,7 +5818,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5572 "configure"' > conftest.$ac_ext + echo '#line 5821 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7924,11 +8173,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7927: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8176: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7931: \$? = $ac_status" >&5 + echo "$as_me:8180: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8214,11 +8463,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8217: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8466: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8221: \$? = $ac_status" >&5 + echo "$as_me:8470: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8318,11 +8567,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8321: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8570: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8325: \$? = $ac_status" >&5 + echo "$as_me:8574: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10682,7 +10931,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10685 "configure" +#line 10934 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10782,7 +11031,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10785 "configure" +#line 11034 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13183,11 +13432,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13186: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13435: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13190: \$? = $ac_status" >&5 + echo "$as_me:13439: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13287,11 +13536,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13290: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13539: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13294: \$? = $ac_status" >&5 + echo "$as_me:13543: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14870,11 +15119,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14873: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15122: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14877: \$? = $ac_status" >&5 + echo "$as_me:15126: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14974,11 +15223,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14977: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15226: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14981: \$? = $ac_status" >&5 + echo "$as_me:15230: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17181,11 +17430,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17184: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17433: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17188: \$? = $ac_status" >&5 + echo "$as_me:17437: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17471,11 +17720,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17474: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17723: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17478: \$? = $ac_status" >&5 + echo "$as_me:17727: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17575,11 +17824,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17578: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17827: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17582: \$? = $ac_status" >&5 + echo "$as_me:17831: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -21393,7 +21642,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-squid $as_me 2.16.3, which was +This file was extended by yast2-squid $as_me 2.17.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21446,7 +21695,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-squid config.status 2.16.3 +yast2-squid config.status 2.17.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -21803,6 +22052,9 @@ am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim CPP!$CPP$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +Y2CORE_CFLAGS!$Y2CORE_CFLAGS$ac_delim +Y2CORE_LIBS!$Y2CORE_LIBS$ac_delim AGENT_LIBADD!$AGENT_LIBADD$ac_delim SED!$SED$ac_delim GREP!$GREP$ac_delim @@ -21825,7 +22077,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/configure.in new/yast2-squid-2.17.1/configure.in --- old/yast2-squid-2.16.3/configure.in 2008-03-21 14:47:34.000000000 +0100 +++ new/yast2-squid-2.17.1/configure.in 2008-09-30 13:30:03.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-squid dnl -dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-squid, 2.16.3, http://bugs.opensuse.org/, yast2-squid) +AC_INIT(yast2-squid, 2.17.1, http://bugs.opensuse.org/, yast2-squid) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.3" +VERSION="2.17.1" RPMNAME="yast2-squid" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -149,8 +149,14 @@ AC_PROG_CC AC_PROG_CPP -CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" -CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2" +# If we have core, get its Y2CORE_CFLAGS. +# When building core itself, it has set Y2CORE_CFLAGS elsewhere already +PKG_CHECK_EXISTS([yast2-core],[ + PKG_CHECK_MODULES(Y2CORE, yast2-core) +]) + +CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" +CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" : ${AGENT_LIBADD:='-L$(libdir) -lscr'} AC_SUBST(AGENT_LIBADD) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/doc/autodocs/Makefile.in new/yast2-squid-2.17.1/doc/autodocs/Makefile.in --- old/yast2-squid-2.16.3/doc/autodocs/Makefile.in 2008-03-21 14:47:49.000000000 +0100 +++ new/yast2-squid-2.17.1/doc/autodocs/Makefile.in 2008-09-30 13:30:19.000000000 +0200 @@ -122,6 +122,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = @RPMNAME@ @@ -136,6 +137,8 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/doc/Makefile.in new/yast2-squid-2.17.1/doc/Makefile.in --- old/yast2-squid-2.16.3/doc/Makefile.in 2008-03-21 14:47:49.000000000 +0100 +++ new/yast2-squid-2.17.1/doc/Makefile.in 2008-09-30 13:30:19.000000000 +0200 @@ -123,6 +123,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = @RPMNAME@ @@ -137,6 +138,8 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/Makefile.in new/yast2-squid-2.17.1/Makefile.in --- old/yast2-squid-2.16.3/Makefile.in 2008-03-21 14:47:50.000000000 +0100 +++ new/yast2-squid-2.17.1/Makefile.in 2008-09-30 13:30:19.000000000 +0200 @@ -146,6 +146,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -160,6 +161,8 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = $(shell cat $(srcdir)/VERSION) XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/squid.pot new/yast2-squid-2.17.1/squid.pot --- old/yast2-squid-2.16.3/squid.pot 2008-03-14 10:01:06.000000000 +0100 +++ new/yast2-squid-2.17.1/squid.pot 2008-09-25 13:12:27.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-14 10:01+0100\n" +"POT-Creation-Date: 2008-09-25 13:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -37,15 +37,15 @@ msgstr "" #: src/Squid.ycp:1036 -msgid "Read the rest settings." +msgid "Read Other Settings." msgstr "" #: src/Squid.ycp:1037 -msgid "Read service status." +msgid "Read Service Status." msgstr "" #: src/Squid.ycp:1038 -msgid "Read firewall settings." +msgid "Read Firewall Settings." msgstr "" #: src/Squid.ycp:1039 @@ -65,15 +65,15 @@ msgstr "" #: src/Squid.ycp:1043 -msgid "Reading the rest settings ..." +msgid "Reading Other Settings ..." msgstr "" #: src/Squid.ycp:1044 -msgid "Reading service status ..." +msgid "Reading Service Status ..." msgstr "" #: src/Squid.ycp:1045 -msgid "Reading firewall settings ..." +msgid "Reading Firewall Settings ..." msgstr "" #: src/Squid.ycp:1053 @@ -184,7 +184,7 @@ msgstr "" #: src/SquidACL.ycp:90 -msgid "The IP address of the requesting client, or the clients IP Address." +msgid "The IP address of the requesting client." msgstr "" #: src/SquidACL.ycp:93 @@ -288,7 +288,7 @@ msgstr "" #: src/SquidACL.ycp:183 -msgid "This provides match against local socket TCP port." +msgid "This provides match against local TCP port number." msgstr "" #: src/SquidACL.ycp:186 @@ -351,7 +351,7 @@ #: src/SquidACL.ycp:247 msgid "" "Regular expression matching against the mime type of the reply received by\n" -"squid. Can be used to detect file download or some types HTTP tunneling requests." +"squid. Can be used to detect file download or some types HTTP tunnelling requests." msgstr "" #: src/SquidACL.ycp:250 @@ -388,7 +388,7 @@ msgstr "" #: src/SquidACL_local_functions.ycp:314 -msgid "You must select at least on day." +msgid "You must select at least one day." msgstr "" #: src/SquidACL_local_functions.ycp:317 @@ -396,7 +396,7 @@ msgstr "" #: src/SquidACL_local_functions.ycp:320 -msgid "From must be less then To." +msgid "From must be less than To." msgstr "" #: src/SquidACL_local_functions.ycp:359 src/SquidACL_local_functions.ycp:388 @@ -411,12 +411,14 @@ msgid "Header Name and Regular Expression must not be empty." msgstr "" -#: src/SquidACL_local_functions.ycp:521 +#. error report +#: src/SquidACL_local_functions.ycp:522 msgid "MAC Address must not be empty." msgstr "" -#: src/SquidACL_local_functions.ycp:524 -msgid "Incorrect formar of MAC Address." +#. error report +#: src/SquidACL_local_functions.ycp:526 +msgid "Incorrect format of MAC Address." msgstr "" #: src/complex.ycp:93 @@ -498,7 +500,7 @@ msgid "Refresh Patterns" msgstr "" -#: src/complex.ycp:247 src/complex.ycp:248 src/dialogs.ycp:80 +#: src/complex.ycp:247 src/complex.ycp:248 src/dialogs.ycp:86 msgid "Cache Setting" msgstr "" @@ -506,7 +508,7 @@ msgid "Cache Directory Setting" msgstr "" -#: src/complex.ycp:255 src/dialogs.ycp:177 +#: src/complex.ycp:255 src/dialogs.ycp:183 msgid "Cache Directory" msgstr "" @@ -514,7 +516,7 @@ msgid "Access Control Setting" msgstr "" -#: src/complex.ycp:266 src/dialogs.ycp:216 +#: src/complex.ycp:266 src/dialogs.ycp:222 msgid "Access Control" msgstr "" @@ -526,7 +528,7 @@ msgid "Logging and Timeouts" msgstr "" -#: src/complex.ycp:285 src/dialogs.ycp:276 +#: src/complex.ycp:285 src/dialogs.ycp:282 msgid "Miscellaneous Setting" msgstr "" @@ -546,123 +548,126 @@ msgid "Options" msgstr "" -#: src/dialogs.ycp:60 +#. table header, stands for minimum +#: src/dialogs.ycp:62 msgid "Min" msgstr "" -#: src/dialogs.ycp:60 -msgid "Precent" +#. table header +#: src/dialogs.ycp:64 src/popup_dialogs.ycp:110 +msgid "Percent" msgstr "" -#: src/dialogs.ycp:60 +#. table header, stands for maximum +#: src/dialogs.ycp:66 msgid "Max" msgstr "" -#: src/dialogs.ycp:83 +#: src/dialogs.ycp:89 msgid "C&ache Memory" msgstr "" -#: src/dialogs.ycp:88 +#: src/dialogs.ycp:94 msgid "Ma&x Object Size" msgstr "" -#: src/dialogs.ycp:93 +#: src/dialogs.ycp:99 msgid "M&in Object Size" msgstr "" -#: src/dialogs.ycp:98 -msgid "Swap &Low-Water Mark (in percents)" +#: src/dialogs.ycp:104 +msgid "Swap &Low-Water Mark (percentage)" msgstr "" -#: src/dialogs.ycp:102 -msgid "Swap &High-Water Mark (in percents)" +#: src/dialogs.ycp:108 +msgid "Swap &High-Water Mark (percentage)" msgstr "" -#: src/dialogs.ycp:107 +#: src/dialogs.ycp:113 msgid "&Cache Replacement Policy" msgstr "" -#: src/dialogs.ycp:113 +#: src/dialogs.ycp:119 msgid "&Memory Replacement Policy" msgstr "" -#: src/dialogs.ycp:180 +#: src/dialogs.ycp:186 msgid "&Directory Name" msgstr "" -#: src/dialogs.ycp:184 +#: src/dialogs.ycp:190 msgid "&Size (in MB)" msgstr "" -#: src/dialogs.ycp:186 +#: src/dialogs.ycp:192 msgid "L&evel 1 Directories" msgstr "" -#: src/dialogs.ycp:188 +#: src/dialogs.ycp:194 msgid "Le&vel 2 Directories" msgstr "" -#: src/dialogs.ycp:201 src/dialogs.ycp:218 +#: src/dialogs.ycp:207 src/dialogs.ycp:224 msgid "ACL Groups" msgstr "" -#: src/dialogs.ycp:202 src/popup_dialogs.ycp:294 +#: src/dialogs.ycp:208 src/popup_dialogs.ycp:294 msgid "Name" msgstr "" -#: src/dialogs.ycp:202 src/popup_dialogs.ycp:295 +#: src/dialogs.ycp:208 src/popup_dialogs.ycp:295 msgid "Type" msgstr "" -#: src/dialogs.ycp:202 +#: src/dialogs.ycp:208 msgid "Description" msgstr "" -#: src/dialogs.ycp:218 src/popup_dialogs.ycp:203 +#: src/dialogs.ycp:224 src/popup_dialogs.ycp:203 msgid "Allow/Deny" msgstr "" -#: src/dialogs.ycp:236 +#: src/dialogs.ycp:242 msgid "Logging" msgstr "" -#: src/dialogs.ycp:239 +#: src/dialogs.ycp:245 msgid "&Access Log" msgstr "" -#: src/dialogs.ycp:243 +#: src/dialogs.ycp:249 msgid "&Cache Log" msgstr "" -#: src/dialogs.ycp:247 +#: src/dialogs.ycp:253 msgid "Cache &Store Log" msgstr "" -#: src/dialogs.ycp:250 +#: src/dialogs.ycp:256 msgid "&Emulate Httpd Log?" msgstr "" -#: src/dialogs.ycp:258 +#: src/dialogs.ycp:264 msgid "Timeouts" msgstr "" -#: src/dialogs.ycp:261 +#: src/dialogs.ycp:267 msgid "Connection &Timeout" msgstr "" -#: src/dialogs.ycp:265 +#: src/dialogs.ycp:271 msgid "Client &Lifetime" msgstr "" -#: src/dialogs.ycp:278 +#: src/dialogs.ycp:284 msgid "&Language of error messages" msgstr "" -#: src/dialogs.ycp:281 +#: src/dialogs.ycp:287 msgid "&Administrator's e-mail" msgstr "" -#: src/dialogs.ycp:283 +#: src/dialogs.ycp:289 msgid "&Use Ftp Passive Mode" msgstr "" @@ -748,7 +753,7 @@ #: src/helps.ycp:86 msgid "" "Percent is percentage of the objects age (time since last\n" -"modification age) an object without explicit expire time will be\n" +"modification) an object without explicit expire time will be\n" "considered fresh." msgstr "" @@ -839,14 +844,14 @@ #: src/helps.ycp:144 msgid "" "ACL Group has various types and description of ACL Group depends\n" -"on them." +"on the particular type." msgstr "" #: src/helps.ycp:147 msgid "" -"In Access Control table can be denied or allowed ACL Groups.\n" -"If there is more ACL Groups in one line it means that access will be allowed\n" -"or denied for those who are from all ACL Groups at the same time." +"In the Access Control table access can be denied or allowed to ACL Groups.\n" +"If there are more ACL Groups in one line, it means that access will be allowed\n" +"or denied for those who belong to all ACL Groups at the same time." msgstr "" #: src/helps.ycp:150 @@ -861,7 +866,7 @@ #: src/helps.ycp:157 msgid "" -"Cache Log defines the file where general informations about your\n" +"Cache Log defines the file where general information about your\n" "cache's behavior is logged." msgstr "" @@ -869,7 +874,7 @@ msgid "" "Cache Store Log defines the location where the transaction log of all\n" "objects that are stored in the object store, as well as the time when the object\n" -"get deleted. This option can be leaved empty." +"gets deleted. This option can be left empty." msgstr "" #: src/helps.ycp:162 @@ -892,7 +897,7 @@ #: src/helps.ycp:173 msgid "" -"Admistrator's e-mail is the address which will be added to any\n" +"Administrator's e-mail is the address which will be added to any\n" "error pages that are displayed to clients. Defaults to either webmaster." msgstr "" @@ -920,10 +925,6 @@ msgid "Min (in minutes)" msgstr "" -#: src/popup_dialogs.ycp:110 -msgid "Percent" -msgstr "" - #: src/popup_dialogs.ycp:111 msgid "Max (in minutes)" msgstr "" @@ -991,16 +992,14 @@ msgid "ACL table must not be empty." msgstr "" -#: src/store_del.ycp:333 src/store_del.ycp:334 -msgid "ACL Group '" -msgstr "" - #: src/store_del.ycp:333 -msgid "' already exists with different type.\n" +#, ycp-format +msgid "ACL Group '%1' already exists with different type.\n" msgstr "" #: src/store_del.ycp:334 -msgid "' has to have type '" +#, ycp-format +msgid "ACL Group '%1' has to have type '%2'.\n" msgstr "" #: src/store_del.ycp:335 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/src/dialogs.ycp new/yast2-squid-2.17.1/src/dialogs.ycp --- old/yast2-squid-2.16.3/src/dialogs.ycp 2007-11-09 17:24:41.000000000 +0100 +++ new/yast2-squid-2.17.1/src/dialogs.ycp 2008-06-06 12:47:59.000000000 +0200 @@ -57,7 +57,13 @@ `Left(`Label( _("Refresh Patterns"))), `HBox( `Table(`id("refresh_patterns"), `opt(`keepSorting, `notify), - `header(_("Regular Expression"), _("Min"), _("Precent"), _("Max")/*, _("Options")*/)), + `header(_("Regular Expression"), + // table header, stands for minimum + _("Min"), + // table header + _("Percent"), + // table header, stands for maximum + _("Max")/*, _("Options")*/)), `Top(`VBox( `PushButton(`id(`up), Label::UpButton()), `PushButton(`id(`down), Label::DownButton()) @@ -95,11 +101,11 @@ )), `VSpacing(0.4), `VWeight(1, `HBox( - `IntField(`id("cache_swap_low"), _("Swap &Low-Water Mark (in percents)"), 0, 100, 0) + `IntField(`id("cache_swap_low"), _("Swap &Low-Water Mark (percentage)"), 0, 100, 0) )), `VSpacing(0.4), `VWeight(1, `HBox( - `IntField(`id("cache_swap_high"), _("Swap &High-Water Mark (in percents)"), 0, 100, 0) + `IntField(`id("cache_swap_high"), _("Swap &High-Water Mark (percentage)"), 0, 100, 0) )), `VSpacing(0.4), `Left(`VWeight(1, `HBox( diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/src/helps.ycp new/yast2-squid-2.17.1/src/helps.ycp --- old/yast2-squid-2.16.3/src/helps.ycp 2007-11-09 17:24:41.000000000 +0100 +++ new/yast2-squid-2.17.1/src/helps.ycp 2008-06-06 12:52:39.000000000 +0200 @@ -84,7 +84,7 @@ _("Min determines how long (in minutes) should be an object considered fresh if no explicit expire time given.") + _("Percent is percentage of the objects age (time since last -modification age) an object without explicit expire time will be +modification) an object without explicit expire time will be considered fresh.") + _("Max is upper limit on how long objects without an explicit expiry time will be considered fresh."), @@ -142,11 +142,11 @@ "acl_groups" : _("Access to Squid server can be controlled via ACL Groups.") + _("ACL Group has various types and description of ACL Group depends -on them."), +on the particular type."), "http_access" : -_("In Access Control table can be denied or allowed ACL Groups. -If there is more ACL Groups in one line it means that access will be allowed -or denied for those who are from all ACL Groups at the same time.") + +_("In the Access Control table access can be denied or allowed to ACL Groups. +If there are more ACL Groups in one line, it means that access will be allowed +or denied for those who belong to all ACL Groups at the same time.") + _("Access Control table is checked in the order listed here. The first entry which matches is used."), @@ -154,11 +154,11 @@ /* Logging and Timeouts Dialog */ "logging" : _("Access Log defines the file where client activities are logged.") + -_("Cache Log defines the file where general informations about your +_("Cache Log defines the file where general information about your cache's behavior is logged.") + _("Cache Store Log defines the location where the transaction log of all objects that are stored in the object store, as well as the time when the object -get deleted. This option can be leaved empty.") + +gets deleted. This option can be left empty.") + _("Emulate Httpd Log allows you to specify that Squid write its Access Log in HTTPD common log file format."), "timeouts" : @@ -170,7 +170,7 @@ /* Miscellaneous Dialog */ "miscellaneous" : -_("Admistrator's e-mail is the address which will be added to any +_("Administrator's e-mail is the address which will be added to any error pages that are displayed to clients. Defaults to either webmaster.") ]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/src/Makefile.in new/yast2-squid-2.17.1/src/Makefile.in --- old/yast2-squid-2.16.3/src/Makefile.in 2008-03-21 14:47:50.000000000 +0100 +++ new/yast2-squid-2.17.1/src/Makefile.in 2008-09-30 13:30:19.000000000 +0200 @@ -118,6 +118,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = @RPMNAME@ @@ -132,6 +133,8 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/src/SquidACL_local_functions.ycp new/yast2-squid-2.17.1/src/SquidACL_local_functions.ycp --- old/yast2-squid-2.16.3/src/SquidACL_local_functions.ycp 2008-01-17 17:54:18.000000000 +0100 +++ new/yast2-squid-2.17.1/src/SquidACL_local_functions.ycp 2008-04-11 11:17:48.000000000 +0200 @@ -311,13 +311,13 @@ if (selected_items == 0){ ok = false; - Report::Error( _("You must select at least on day.")); + Report::Error( _("You must select at least one day.")); }else if (!isHHMMFormat(from) || !isHHMMFormat(to)){ ok = false; Report::Error( _("Time is not filled in correct format.")); }else if (!isCorrectFromTo(from, to)){// from must be less then to ok = false; - Report::Error( _("From must be less then To."));//TODO: better error message + Report::Error( _("From must be less than To."));//TODO: better error message } return ok; } @@ -518,10 +518,12 @@ string mac = (string)UI::QueryWidget(`id("acl_mac"), `Value); if (size(mac) == 0){ ok = false; + // error report Report::Error( _("MAC Address must not be empty.")); }else if (!regexpmatch(mac, "^([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}$")){ ok = false; - Report::Error( _("Incorrect formar of MAC Address.")); + // error report + Report::Error( _("Incorrect format of MAC Address.")); } return ok; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/src/SquidACL.ycp new/yast2-squid-2.17.1/src/SquidACL.ycp --- old/yast2-squid-2.16.3/src/SquidACL.ycp 2007-08-21 11:15:02.000000000 +0200 +++ new/yast2-squid-2.17.1/src/SquidACL.ycp 2008-06-06 12:46:38.000000000 +0200 @@ -87,7 +87,7 @@ "widget_init" : srcWidgetInit, "verification" : srcVerif, "options" : srcOptions, - "help" : _("The IP address of the requesting client, or the clients IP Address.") ], + "help" : _("The IP address of the requesting client.") ], "dst" : $[ "name" : "dst", "widget" : `Frame( _("dst"), @@ -180,7 +180,7 @@ "widget_init" : myportWidgetInit, "verification" : myportVerif, "options" : portOptions, - "help" : _("This provides match against local socket TCP port.") ], + "help" : _("This provides match against local TCP port number.") ], "proto" : $[ "name" : "proto", "widget" : `Frame ( _("proto"), @@ -245,7 +245,7 @@ "verification" : headerVerif, "options" : headerOptions, "help" : _("Regular expression matching against the mime type of the reply received by -squid. Can be used to detect file download or some types HTTP tunneling requests.") ], +squid. Can be used to detect file download or some types HTTP tunnelling requests.") ], "req_mime_type" : regexp("req_mime_type", "req_mime_type", _("Match against the mime type of the request generated by the client.")), "rep_mime_type" : regexp("rep_mime_type", "rep_mime_type", _("Match against the mime type of the reply received by Squid.")), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/src/Squid.ycp new/yast2-squid-2.17.1/src/Squid.ycp --- old/yast2-squid-2.16.3/src/Squid.ycp 2007-11-09 17:24:41.000000000 +0100 +++ new/yast2-squid-2.17.1/src/Squid.ycp 2008-09-30 12:59:07.000000000 +0200 @@ -1033,16 +1033,16 @@ _("Read Refresh Patterns from config file."), _("Read ACL Groups from config file."), _("Read Access Control table from config file."), - _("Read the rest settings."), - _("Read service status."), - _("Read firewall settings.")], + _("Read Other Settings."), + _("Read Service Status."), + _("Read Firewall Settings.")], [_("Reading HTTP Ports ..."), _("Reading Refresh Patterns ..."), _("Reading ACL Groups ..."), _("Reading Access Control table ..."), - _("Reading the rest settings ..."), - _("Reading service status ..."), - _("Reading firewall settings ...")], + _("Reading Other Settings ..."), + _("Reading Service Status ..."), + _("Reading Firewall Settings ...")], ""); if(Abort()) return false; @@ -1192,10 +1192,10 @@ boolean writeRestSetting() { boolean ok = true; - list<string> setting = nil; foreach (string key, list value, parameters, { + value = settings[key]:[]; if (size(value) > 0){ y2debug("Squid::Write - %1: %2", key, value); if (!SCR::Write(add(squid_path, key), [value])){ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/src/store_del.ycp new/yast2-squid-2.17.1/src/store_del.ycp --- old/yast2-squid-2.16.3/src/store_del.ycp 2007-11-09 17:24:41.000000000 +0100 +++ new/yast2-squid-2.17.1/src/store_del.ycp 2008-06-06 12:45:45.000000000 +0200 @@ -330,9 +330,9 @@ if (error){ ok = false; - Report::Error( _("ACL Group '") + name + _("' already exists with different type.\n") - + _("ACL Group '") + name + _("' has to have type '") + existed_type + "'.\n" - + _("If you want to change type of this ACL Group you must\ndelete other ACL Groups with same name before that.")); + Report::Error( sformat (_("ACL Group '%1' already exists with different type.\n"), name) + + sformat (_("ACL Group '%1' has to have type '%2'.\n" ), name, existed_type ) + + _("If you want to change type of this ACL Group you must\ndelete other ACL Groups with same name before that.") ); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/testsuite/Makefile.in new/yast2-squid-2.17.1/testsuite/Makefile.in --- old/yast2-squid-2.16.3/testsuite/Makefile.in 2008-03-21 14:47:50.000000000 +0100 +++ new/yast2-squid-2.17.1/testsuite/Makefile.in 2008-09-30 13:30:19.000000000 +0200 @@ -108,6 +108,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = @RPMNAME@ @@ -122,6 +123,8 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-squid-2.16.3/VERSION new/yast2-squid-2.17.1/VERSION --- old/yast2-squid-2.16.3/VERSION 2008-03-21 13:23:05.000000000 +0100 +++ new/yast2-squid-2.17.1/VERSION 2008-09-30 13:00:58.000000000 +0200 @@ -1 +1 @@ -2.16.3 +2.17.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 yast2-schema
by root＠Hilbert.suse.de 30 Sep '08

30 Sep '08

Hello community, here is the log from the commit of package yast2-schema checked in at Tue Sep 30 14:07:55 CEST 2008. -------- --- yast2-schema/yast2-schema.changes 2008-09-26 17:15:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-schema/yast2-schema.changes 2008-09-30 13:59:07.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 30 13:57:11 CEST 2008 - locilka(a)suse.cz + +- Added some more BuildIgnores to build the package. +- 2.17.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-schema-2.17.1.tar.bz2 New: ---- yast2-schema-2.17.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-schema.spec ++++++ --- /var/tmp/diff_new_pack.c22046/_old 2008-09-30 14:07:37.000000000 +0200 +++ /var/tmp/diff_new_pack.c22046/_new 2008-09-30 14:07:37.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-schema (Version 2.17.1) +# spec file for package yast2-schema (Version 2.17.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ Url: http://www.suse.com/ Name: yast2-schema -Version: 2.17.1 +Version: 2.17.2 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-schema-2.17.1.tar.bz2 +Source0: yast2-schema-2.17.2.tar.bz2 Prefix: /usr BuildRequires: java2-devel-packages trang yast2-all-packages #!BuildIgnore: yast2-build-test yast2-online-update @@ -33,11 +33,13 @@ #!BuildIgnore: tomcat5 # ignoring conflicting packages #!BuildIgnore: yast2-branding-SLED yast2-branding-openSUSE -#!BuildIgnore: yast2-theme yast2-theme-SLED yast2-theme-openSUSE +#!BuildIgnore: yast2-theme yast2-theme-SLED yast2-theme-openSUSE yast2-theme-SLE # Hotfix to build a package, bnc #427684 #!BuildIgnore: xerces-j2-bootstrap libusb-0_1-4 crimson -# Speedup -#!BuildIgnore: yast2-pkg-bindings-devel-doc yast2-pkg-bindings zypper +# Just a S390 thingie +#!BuildIgnore: yast2-reipl +# To speedup && to easily recover from dependency hell +#!BuildIgnore: yast2-pkg-bindings-devel-doc yast2-pkg-bindings zypper libzypp yast2-gtk yast2-qt yast2-ncurses yast2-qt-pkg yast2-ncurses-pkg BuildArch: noarch Summary: YaST2 - AutoYaST Schema @@ -52,7 +54,7 @@ Martin Vidner <mvidner(a)suse.cz> %prep -%setup -n yast2-schema-2.17.1 +%setup -n yast2-schema-2.17.2 %build %{prefix}/bin/y2tool y2autoconf @@ -85,6 +87,9 @@ /usr/share/YaST2/schema/autoyast/rng/*.rng %doc %{prefix}/share/doc/packages/yast2-schema %changelog +* Tue Sep 30 2008 locilka(a)suse.cz +- Added some more BuildIgnores to build the package. +- 2.17.2 * Fri Sep 26 2008 locilka(a)suse.cz - Adding some more BuildIgnores to build the package (bnc #427684). - 2.17.1 ++++++ yast2-schema-2.17.1.tar.bz2 -> yast2-schema-2.17.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.17.1/configure new/yast2-schema-2.17.2/configure --- old/yast2-schema-2.17.1/configure 2008-09-16 09:55:53.000000000 +0200 +++ new/yast2-schema-2.17.2/configure 2008-09-30 13:59:41.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-schema 2.17.0. +# Generated by GNU Autoconf 2.61 for yast2-schema 2.17.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-schema' PACKAGE_TARNAME='yast2-schema' -PACKAGE_VERSION='2.17.0' -PACKAGE_STRING='yast2-schema 2.17.0' +PACKAGE_VERSION='2.17.2' +PACKAGE_STRING='yast2-schema 2.17.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-schema 2.17.0 to adapt to many kinds of systems. +\`configure' configures yast2-schema 2.17.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-schema 2.17.0:";; + short | recursive ) echo "Configuration of yast2-schema 2.17.2:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-schema configure 2.17.0 +yast2-schema configure 2.17.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-schema $as_me 2.17.0, which was +It was created by yast2-schema $as_me 2.17.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-schema' - VERSION='2.17.0' + VERSION='2.17.2' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.0" +VERSION="2.17.2" RPMNAME="yast2-schema" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-schema $as_me 2.17.0, which was +This file was extended by yast2-schema $as_me 2.17.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-schema config.status 2.17.0 +yast2-schema config.status 2.17.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.17.1/configure.in new/yast2-schema-2.17.2/configure.in --- old/yast2-schema-2.17.1/configure.in 2008-09-16 09:55:51.000000000 +0200 +++ new/yast2-schema-2.17.2/configure.in 2008-09-30 13:59:38.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-schema, 2.17.0, http://bugs.opensuse.org/, yast2-schema) +AC_INIT(yast2-schema, 2.17.2, http://bugs.opensuse.org/, yast2-schema) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.0" +VERSION="2.17.2" RPMNAME="yast2-schema" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.17.1/VERSION new/yast2-schema-2.17.2/VERSION --- old/yast2-schema-2.17.1/VERSION 2008-09-26 17:15:47.000000000 +0200 +++ new/yast2-schema-2.17.2/VERSION 2008-09-30 13:59:15.000000000 +0200 @@ -1 +1 @@ -2.17.1 +2.17.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-country
by root＠Hilbert.suse.de 30 Sep '08

30 Sep '08

Hello community, here is the log from the commit of package yast2-country checked in at Tue Sep 30 14:07:30 CEST 2008. -------- --- yast2-country/yast2-country.changes 2008-09-29 16:05:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2008-09-29 21:59:55.769009000 +0200 @@ -1,0 +2,12 @@ +Mon Sep 29 21:57:55 CEST 2008 - jsuchome(a)suse.cz + +- added Galician language support +- 2.17.16 + +------------------------------------------------------------------- +Mon Sep 29 21:41:12 CEST 2008 - jsuchome(a)suse.cz + +- keyboard configuration is in hardware category (bnc#430606) +- 2.17.15 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-country-2.17.14.tar.bz2 New: ---- yast2-country-2.17.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.x20491/_old 2008-09-30 14:07:19.000000000 +0200 +++ /var/tmp/diff_new_pack.x20491/_new 2008-09-30 14:07:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-country (Version 2.17.14) +# spec file for package yast2-country (Version 2.17.16) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-country -Version: 2.17.14 +Version: 2.17.16 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.17.14.tar.bz2 +Source0: yast2-country-2.17.16.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite Requires: yast2-trans-stats yast2-perl-bindings timezone @@ -75,7 +75,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-country-2.17.14 +%setup -n yast2-country-2.17.16 %build %{prefix}/bin/y2tool y2autoconf @@ -142,8 +142,15 @@ %dir /usr/share/YaST2/data/languages /usr/share/YaST2/data/languages/*.ycp /usr/share/YaST2/modules/Language.y* + %changelog * Mon Sep 29 2008 jsuchome(a)suse.cz +- added Galician language support +- 2.17.16 +* Mon Sep 29 2008 jsuchome(a)suse.cz +- keyboard configuration is in hardware category (bnc#430606) +- 2.17.15 +* Mon Sep 29 2008 jsuchome(a)suse.cz - save system time from ntpdate to HW clock (#429079) - 2.17.14 * Fri Sep 26 2008 jsuchome(a)suse.cz ++++++ yast2-country-2.17.14.tar.bz2 -> yast2-country-2.17.16.tar.bz2 ++++++ ++++ 7556 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.17.14/keyboard/src/keyboard.desktop new/yast2-country-2.17.16/keyboard/src/keyboard.desktop --- old/yast2-country-2.17.14/keyboard/src/keyboard.desktop 2008-05-19 08:01:37.000000000 +0200 +++ new/yast2-country-2.17.16/keyboard/src/keyboard.desktop 2008-09-29 21:38:21.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-System; +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Hardware; X-KDE-ModuleType=Library X-KDE-RootOnly=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.17.14/language/data/language_gl_ES.ycp new/yast2-country-2.17.16/language/data/language_gl_ES.ycp --- old/yast2-country-2.17.14/language/data/language_gl_ES.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-2.17.16/language/data/language_gl_ES.ycp 2008-09-29 21:56:40.000000000 +0200 @@ -0,0 +1,43 @@ +/** + * This file contains the description of the language needed by yast2-country + * module. + * + * Translation of the 'language name' to actual YaST language be must applied + * each time this file is invoked. + * + * If you want to add new language to YaST using a file of this type provided + * by some module different from yast2-country (e.g. in some Add-On Product), + * consider using special textdomain, so it is possible to provide also + * translations of the 'language name' string to all installed languages. + * + * Author: Jiří Suchomel <jsuchome(a)suse.cz> + * $Id: language_es_ES.ycp 32769 2006-09-08 09:29:15Z jsuchome $ + */ +{ + textdomain "languages_db"; + + return + $[ + // 1. information for language selection: + // Format is + // <LANG-Code> : [ + // <Language-to-display-UTF8-coded>, + // <Language-to-display-ASCII-coded-if-needed>, + // <LANG modifier used when UTF-8 enconding is selected> + // <LANG modifier used when no UTF-8 enconding is selected> + // <translated Language-to-display-UTF8-coded> ] + // + "gl_ES" : [ + "Galego" + "Galego", + ".UTF-8", + "@euro", + // language name + _("Galician") + ], + // 2. what time zone propose for this language + "timezone" : "Europe/Madrid", + // 3. which keyboard layout propose for this language + "keyboard" : "spanish", + ]; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.17.14/timezone/src/dialogs.ycp new/yast2-country-2.17.16/timezone/src/dialogs.ycp --- old/yast2-country-2.17.14/timezone/src/dialogs.ycp 2008-09-29 15:32:52.000000000 +0200 +++ new/yast2-country-2.17.16/timezone/src/dialogs.ycp 2008-09-29 16:05:36.000000000 +0200 @@ -11,7 +11,7 @@ * Summary: * Dialogs for timeone and time configuration. * - * $Id: dialogs.ycp 50857 2008-09-09 09:12:52Z jsuchome $ + * $Id: dialogs.ycp 51662 2008-09-29 14:06:35Z jsuchome $ */ { textdomain "country"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.17.14/VERSION new/yast2-country-2.17.16/VERSION --- old/yast2-country-2.17.14/VERSION 2008-09-29 15:51:16.000000000 +0200 +++ new/yast2-country-2.17.16/VERSION 2008-09-29 21:58:21.000000000 +0200 @@ -1 +1 @@ -2.17.14 +2.17.16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-bootloader
by root＠Hilbert.suse.de 30 Sep '08

30 Sep '08

Hello community, here is the log from the commit of package yast2-bootloader checked in at Tue Sep 30 14:06:57 CEST 2008. -------- --- yast2-bootloader/yast2-bootloader.changes 2008-09-29 17:29:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-09-30 13:48:28.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 30 13:37:44 CEST 2008 - juhliarik(a)suse.cz + +- updated fix for converting LILO to GRUB (bnc #430579) +- 2.17.24 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-bootloader-2.17.23.tar.bz2 New: ---- yast2-bootloader-2.17.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.h17784/_old 2008-09-30 14:06:44.000000000 +0200 +++ /var/tmp/diff_new_pack.h17784/_new 2008-09-30 14:06:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.17.23) +# spec file for package yast2-bootloader (Version 2.17.24) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-bootloader -Version: 2.17.23 +Version: 2.17.24 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.17.23.tar.bz2 +Source0: yast2-bootloader-2.17.24.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite # to eliminate a cyclic dependency in autobuild: @@ -61,7 +61,7 @@ Daniel Fiser %prep -%setup -n yast2-bootloader-2.17.23 +%setup -n yast2-bootloader-2.17.24 %build %{prefix}/bin/y2tool y2autoconf @@ -107,6 +107,9 @@ /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc %changelog +* Tue Sep 30 2008 juhliarik(a)suse.cz +- updated fix for converting LILO to GRUB (bnc #430579) +- 2.17.24 * Mon Sep 29 2008 juhliarik(a)suse.cz - added new dialog for updating from lilo to grub (bnc #430579) - 2.17.23 ++++++ yast2-bootloader-2.17.23.tar.bz2 -> yast2-bootloader-2.17.24.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.23/src/clients/inst_lilo_convert.ycp new/yast2-bootloader-2.17.24/src/clients/inst_lilo_convert.ycp --- old/yast2-bootloader-2.17.23/src/clients/inst_lilo_convert.ycp 2008-09-29 17:07:57.000000000 +0200 +++ new/yast2-bootloader-2.17.24/src/clients/inst_lilo_convert.ycp 2008-09-30 12:38:03.000000000 +0200 @@ -18,7 +18,7 @@ textdomain "bootloader"; -import "Bootloader"; + import "BootCommon"; import "Installation"; import "GetInstArgs"; @@ -27,6 +27,8 @@ import "Wizard"; import "Popup"; import "Pkg"; +import "Arch"; +import "BootGRUB"; y2milestone ("starting inst_lilo_convert"); @@ -45,25 +47,60 @@ void convertSettings() { - + string lilo_conf = (string) WFM::Read(.local.string, Installation::destdir + "/etc/lilo.conf"); + BootCommon::InitializeLibrary(true, "lilo"); BootCommon::setLoaderType("lilo"); map<string,string> new_files = $[]; new_files["/etc/lilo.conf"] = lilo_conf; y2milestone("/etc/lilo.conf : %1", new_files); - BootCommon::ProposeDeviceMap (); - BootCommon::SetDeviceMap(BootCommon::device_mapping); - map<string,string> old_files = BootCommon::GetFilesContents (); - new_files["/boot/grub/device.map"] = old_files["/boot/grub/device.map"]:""; - y2milestone("added device.map : %1", new_files); BootCommon::SetFilesContents (new_files); + + list<map <string, any > > sec = BootCommon::GetSections(); + + list<map <string, any > > tmp_sec = []; + //FIXME: change "kernel" to "image" in sections + foreach(map <string, any> section, sec, { + + // replace "kernel" by "image" + if (haskey(section, "kernel")) + { + section["image"] = section["kernel"]:""; + section = remove(section, "kernel"); + } + + // replace "vga" by "vgamode" + if (haskey(section, "vga")) + { + section["vgamode"] = section["vga"]:""; + section = remove(section, "vga"); + } + + tmp_sec= add(tmp_sec, section); + + }); + sec = tmp_sec; + BootCommon::sections = tmp_sec; + BootCommon::globals = BootCommon::GetGlobal (); + + BootCommon::InitializeLibrary(true, "grub"); BootCommon::setLoaderType("grub"); + BootCommon::ProposeDeviceMap (); + BootGRUB::Propose(); + + + BootCommon::SetDeviceMap(BootCommon::device_mapping); + BootCommon::SetSections(sec); + BootCommon::SetGlobal(BootCommon::globals); + + + map<string,string> tmp_files = BootCommon::GetFilesContents (); + y2milestone("new content file: %1", tmp_files); foreach (string file, string content, tmp_files, { - integer last=findlastof(file,"/"); string path_file = substring (file, 0, last); WFM::Execute(.local.mkdir, Installation::destdir + path_file); @@ -80,7 +117,22 @@ return `auto; // don't execute this once more } -if (Mode::update()) + +boolean checkArch() +{ + boolean ret = false; + if (Arch::x86_64() || Arch::i386() || Arch::ia64()) + ret = true; + + if (ret) + y2milestone("inst_lilo_convert - supported architecture for converting LILO -> GRUB"); + else + y2milestone("inst_lilo_convert - UNsupported architecture for converting LILO -> GRUB"); + return ret; + +} + +if (Mode::update() && checkArch()) { // save some sysconfig variables @@ -99,8 +151,8 @@ `HSquash ( `VBox(`Left(`Label("LILO is not supported. The recommended option is select convert LILO to GRUB")), `Left(`Label("Do you want convert settings and install GRUB?")), - `Left(`RadioButton(`id("lilo"), _("Stay LILO"))), - `Left(`RadioButton(`id("grub"), _("Convert Settings and Install GRUB"), true )) + `Left(`RadioButton(`id("lilo"), _("Stay &LILO"))), + `Left(`RadioButton(`id("grub"), _("Convert Settings and Install &GRUB"), true )) ) ) ), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.23/VERSION new/yast2-bootloader-2.17.24/VERSION --- old/yast2-bootloader-2.17.23/VERSION 2008-09-29 17:11:37.000000000 +0200 +++ new/yast2-bootloader-2.17.24/VERSION 2008-09-30 13:38:38.000000000 +0200 @@ -1 +1 @@ -2.17.23 +2.17.24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-add-on
by root＠Hilbert.suse.de 30 Sep '08

30 Sep '08

Hello community, here is the log from the commit of package yast2-add-on checked in at Tue Sep 30 14:06:34 CEST 2008. -------- --- yast2-add-on/yast2-add-on.changes 2008-09-08 17:34:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-add-on/yast2-add-on.changes 2008-09-30 10:54:54.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 30 10:53:19 CEST 2008 - locilka(a)suse.cz + +- Support for commandline: "help", "longhelp", and "xmlhelp" + (bnc #430852). +- 2.17.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-add-on-2.17.3.tar.bz2 New: ---- yast2-add-on-2.17.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.D16682/_old 2008-09-30 14:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.D16682/_new 2008-09-30 14:06:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-add-on (Version 2.17.3) +# spec file for package yast2-add-on (Version 2.17.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-add-on -Version: 2.17.3 +Version: 2.17.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-2.17.3.tar.bz2 +Source0: yast2-add-on-2.17.4.tar.bz2 Prefix: /usr Requires: autoyast2-installation # WorkflowManager module @@ -58,7 +58,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-add-on-2.17.3 +%setup -n yast2-add-on-2.17.4 %build %{prefix}/bin/y2tool y2autoconf @@ -96,6 +96,10 @@ /usr/share/YaST2/schema/autoyast/rnc/add-on.rnc %doc %{prefix}/share/doc/packages/yast2-add-on %changelog +* Tue Sep 30 2008 locilka(a)suse.cz +- Support for commandline: "help", "longhelp", and "xmlhelp" + (bnc #430852). +- 2.17.4 * Mon Sep 08 2008 locilka(a)suse.cz - merged texts from proofread - 2.17.3 ++++++ yast2-add-on-2.17.3.tar.bz2 -> yast2-add-on-2.17.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.3/add-on.pot new/yast2-add-on-2.17.4/add-on.pot --- old/yast2-add-on-2.17.3/add-on.pot 2008-09-08 17:31:30.000000000 +0200 +++ new/yast2-add-on-2.17.4/add-on.pot 2008-09-30 11:01:27.000000000 +0200 @@ -1,76 +1,256 @@ -# translation of add-on.po to +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg # This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # -# Andrew Spackman <kiwilinux(a)gmail.com>, 2008. +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: add-on\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-04 10:32+0200\n" -"PO-Revision-Date: 2008-08-24 18:03+1200\n" -"Last-Translator: Andrew Spackman <kiwilinux(a)gmail.com>\n" -"Language-Team: <en(a)li.org>\n" +"POT-Creation-Date: 2008-09-30 11:01+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" + +#. table cell +#: src/add-on-workflow.ycp:124 src/add-on-workflow.ycp:462 +msgid "No product found in the repository" +msgstr "" + +#. error report +#: src/add-on-workflow.ycp:244 +msgid "No software repository found on medium." +msgstr "" + +#. busy message +#: src/add-on-workflow.ycp:261 +msgid "Initializing new source..." +msgstr "" + +#. error report +#: src/add-on-workflow.ycp:289 src/add-on-workflow.ycp:392 +msgid "Failed to initialize the software repository." +msgstr "" + +#. placeholder for unknown directory +#. place holder for unknown URL +#. placeholder for unknown path +#. placeholder for unknown URL +#. placeholder for unknown path +#. summary item, %1 is product name, %2 media URL, %3 directory on media +#: src/add-on-workflow.ycp:307 src/add-on-workflow.ycp:312 +#: src/add-on-workflow.ycp:806 src/add-on-workflow.ycp:812 +#: src/add-on_proposal.ycp:32 src/add-on_proposal.ycp:36 +msgid "Unknown" +msgstr "" + +#: src/add-on-workflow.ycp:310 +#, ycp-format +msgid "URL: %1, Directory: %2" +msgstr "" + +#. dialog caption +#: src/add-on-workflow.ycp:316 +msgid "Software Repository Selection" +msgstr "" #. help text #: src/add-on-workflow.ycp:318 msgid "" "<big>Software Repository Selection</big> \n" -"Multiple repositories found on the selected medium.\n" -"Select the repository to use." -msgstr "" -"<big>Software Repository Selection</big> \n" "Multiple repositories were found on the selected medium.\n" -"Select the repository to use." +"Select the repository to use.\n" +msgstr "" -#. help text -#: src/add-on-workflow.ycp:614 +#: src/add-on-workflow.ycp:325 +msgid "Repositories &Found" +msgstr "" + +#. if (Stage::initial()) +#. { +#. if (Popup::ConfirmAbort (`painless)) +#. break; +#. } +#. else +#. { +#. yes-no popup +#: src/add-on-workflow.ycp:345 src/add-on-workflow.ycp:634 +msgid "Really abort add-on product installation?" +msgstr "" + +#. popup message +#: src/add-on-workflow.ycp:361 +msgid "Select a repository." +msgstr "" + +#. error pop-up +#: src/add-on-workflow.ycp:532 src/add-on-workflow.ycp:689 msgid "" -"<big>Product Selection</big> \n" -"Multiple products found in the repository. Select the products\n" -"to install." +"The product on the media is already installed\n" +"or selected for installation." +msgstr "" + +#. message popup +#: src/add-on-workflow.ycp:550 +msgid "Dependencies of the add-on product cannot be fulfilled." +msgstr "" + +#. dialog caption +#: src/add-on-workflow.ycp:607 +msgid "Product Selection" +msgstr "" + +#. multi selection list +#: src/add-on-workflow.ycp:611 +msgid "Available Products" msgstr "" + +#. help text +#: src/add-on-workflow.ycp:615 +msgid "" "<big>Product Selection</big> \n" "Multiple products were found in the repository. Select the products\n" -"to install." +"to install.\n" +msgstr "" + +#. message popup +#: src/add-on-workflow.ycp:676 +msgid "Dependencies of the selected add-on products cannot be fulfilled." +msgstr "" + +#. main screen heading +#. feedback heading +#. TRANSLATORS: dialog caption +#: src/add-on-workflow.ycp:793 src/add-on-workflow.ycp:1311 +#: src/inst_language_add-on.ycp:114 src/inst_language_add-on.ycp:163 +msgid "Add-On Product Installation" +msgstr "" + +#. Help for add-on products +#: src/add-on-workflow.ycp:796 +msgid "" +"<big>Add-On Product Installation</big>\n" +"Here see all add-on products that are selected for installation.\n" +"To add a new product, click Add. To remove an already added one,\n" +"select it and click Delete." +msgstr "" + +#. table cell, %1 is URL, %2 is directory name +#: src/add-on-workflow.ycp:810 +#, ycp-format +msgid "%1, Directory: %2" +msgstr "" + +#. table header +#: src/add-on-workflow.ycp:825 +msgid "Product" +msgstr "" + +#. table header +#: src/add-on-workflow.ycp:827 +msgid "Media" +msgstr "" + +#. message report +#: src/add-on-workflow.ycp:952 +msgid "Select a product to delete." +msgstr "" + +#. TRANSLATORS: busy message +#: src/add-on-workflow.ycp:962 +msgid "Removing selected add-on..." +msgstr "" + +#. TRANSLATORS: dialog caption +#: src/add-on-workflow.ycp:1033 +msgid "Installed Add-On Products" +msgstr "" + +#. TRANSLATORS: table header item +#: src/add-on-workflow.ycp:1040 +msgid "Add-On Product" +msgstr "" + +#. TRANSLATORS: table header item +#: src/add-on-workflow.ycp:1042 +msgid "URL" +msgstr "" + +#. TRANSLATORS: push button +#: src/add-on-workflow.ycp:1058 +msgid "Run &Package Manager..." +msgstr "" #. TRANSLATORS: dialog help adp/1 -#: src/add-on-workflow.ycp:1060 -msgid "Here you can see all add-on products installed on your system." -msgstr "Here you can see all of the add-on products which are installed on your system." +#: src/add-on-workflow.ycp:1062 +msgid "Here you can see all of the add-on products which are installed on your system." +msgstr "" #. TRANSLATORS: dialog help adp/2 -#: src/add-on-workflow.ycp:1062 -msgid "Use Add button to use a new add-on product or Delete to remove an add-on in use." -msgstr "Use the Add button to add a new add-on product, or the Delete button to remove an add-on which is in use." +#: src/add-on-workflow.ycp:1064 +msgid "Use the Add button to add a new add-on product, or the Delete button to remove an add-on which is in use." +msgstr "" + +#: src/add-on-workflow.ycp:1111 +#, ycp-format +msgid "Vendor: %1 " +msgstr "" + +#: src/add-on-workflow.ycp:1112 +msgid "Unknown vendor" +msgstr "" + +#: src/add-on-workflow.ycp:1115 +#, ycp-format +msgid "Version: %1 " +msgstr "" + +#: src/add-on-workflow.ycp:1116 +msgid "Unknown version" +msgstr "" + +#: src/add-on-workflow.ycp:1119 +#, ycp-format +msgid "Repository URL: %1 " +msgstr "" + +#: src/add-on-workflow.ycp:1120 +msgid "Unknown repository URL" +msgstr "" + +#: src/add-on-workflow.ycp:1123 +#, ycp-format +msgid "Repository Alias: %1 " +msgstr "" + +#: src/add-on-workflow.ycp:1163 src/add-on-workflow.ycp:1206 +msgid "Unknown product" +msgstr "" + +#: src/add-on-workflow.ycp:1164 +msgid "Unknown URL" +msgstr "" + +#. TRANSLATORS: busy popup message +#: src/add-on-workflow.ycp:1213 +msgid "Removing product dependencies..." +msgstr "" + +#: src/add-on-workflow.ycp:1314 +msgid "Reading packages available at the installation repositories..." +msgstr "" #. TRANSLATORS: commandline help -#: src/add-on.ycp:33 +#: src/add-on.ycp:37 msgid "" "\n" "Add-On Module Help\n" "------------------\n" "\n" -"To add a new add-on product via command-line, use this syntax:\n" -" /sbin/yast2 add-on URL\n" -"URL is the path to the add-on source.\n" -"\n" -"Examples of URL:\n" -"http://server.name/directory/Lang-AddOn-10.2-i386/\n" -"ftp://server.name/directory/Lang-AddOn-10.2-i386/\n" -"nfs://server.name/directory/SDK1-SLE-i386/\n" -"disk://dev/sda5/directory/Product/CD1/\n" -"cd://\n" -"dvd://\n" -msgstr "" -"\n" -"Add-On Module Help\n" -"------------------\n" -"\n" "To add a new add-on product via the command-line, use this syntax:\n" " /sbin/yast2 add-on URL\n" "URL is the path to the add-on source.\n" @@ -82,8 +262,153 @@ "disk://dev/sda5/directory/Product/CD1/\n" "cd://\n" "dvd://\n" +msgstr "" + +#: src/add-on.ycp:57 +msgid "Target file name ('xmlfile' option) is missing. Use xmlfile=<target_XML_file> command line option." +msgstr "" + +#. dialog caption +#. this is a heading +#: src/add-on.ycp:85 src/add-on_proposal.ycp:69 +msgid "Add-On Products" +msgstr "" + +#. busy message (dialog) +#. TRANSLATORS: dialog content - a very simple label +#: src/add-on.ycp:87 src/inst_language_add-on.ycp:116 +msgid "Initializing..." +msgstr "" + +#. help +#. TRANSLATORS: help text +#: src/add-on.ycp:89 src/inst_language_add-on.ycp:118 +msgid "Initializing add-on products..." +msgstr "" + +#: src/add-on_auto.ycp:59 +#, ycp-format +msgid "<li>Media: %1, Path: %2, Product: %3</li>\n" +msgstr "" + +#. error report +#: src/add-on_auto.ycp:162 +msgid "Failed to add add-on product." +msgstr "" + +#: src/add-on_auto.ycp:164 +#, ycp-format +msgid "Please make the add-on \"%1\" available via \"%2\"" +msgstr "" + +#. summary string +#: src/add-on_proposal.ycp:41 +msgid "No add-on product selected for installation" +msgstr "" + +#. this is a menu entry +#: src/add-on_proposal.ycp:71 +msgid "Add-On &Products" +msgstr "" + +#. TRANSLATORS: popup message +#: src/inst_language_add-on.ycp:77 +msgid "Installation of the Language Extension has been finished." +msgstr "" + +#. TRANSLATORS:: multi-selection box +#: src/inst_language_add-on.ycp:170 +msgid "&Select Language Extensions to be Installed" +msgstr "" #. TRANSLATORS: help text #: src/inst_language_add-on.ycp:177 -msgid "Select language extensions to be installed and click OK." -msgstr "Select the language extensions to be installed and then click the OK button." +msgid "Select the language extensions to be installed and then click the OK button." +msgstr "" + +#. TRANSLATORS: popup question +#: src/inst_language_add-on.ycp:194 +msgid "Are you sure you want to abort the add-on product installation?" +msgstr "" + +#: src/inst_language_add-on.ycp:203 +msgid "" +"There are no selected languages to be installed.\n" +"Are you sure you want to abort the installation?" +msgstr "" + +#. TRANSLATORS: multiselection box item, %1 stands for 'ar', 'mk', 'zh_TW' +#. it used only as a fallback +#: src/inst_language_add-on.ycp:251 +#, ycp-format +msgid "Language %1" +msgstr "" + +#. TRANSLATORS: pop-up headline +#: src/misc.ycp:65 +msgid "Warning: Not enough memory!" +msgstr "" + +#. TRANSLATORS: pop-up question +#: src/misc.ycp:67 +msgid "" +"Your system does not seem to have enough memory to use add-on products\n" +"during installation. You can enable add-on products later when the\n" +"system is running.\n" +"\n" +"Do you want to skip using add-on products?" +msgstr "" + +#. TRANSLATORS: error message - the module does not provide command line interface +#: src/vendor.ycp:29 +msgid "There is no user interface available for this module." +msgstr "" + +#. VENDOR: main screen heading +#: src/vendor.ycp:92 +msgid "Vendor Driver CD" +msgstr "" + +#. VENDOR: cant mount /dev/cdrom popup +#: src/vendor.ycp:108 +msgid "Please insert the vendor CD-ROM" +msgstr "" + +#. VENDOR: vendor cd contains wrong data +#: src/vendor.ycp:157 src/vendor.ycp:171 src/vendor.ycp:219 +msgid "" +"Could not find driver data on the CD-ROM.\n" +"Aborting now." +msgstr "" + +#. VENDOR: vendor cd doesn't contain data for current system and linux version +#: src/vendor.ycp:194 +msgid "" +"The CD-ROM data does not match the running Linux system.\n" +"Aborting now.\n" +msgstr "" + +#. VENDOR: dialog heading +#: src/vendor.ycp:256 +msgid "Installing driver..." +msgstr "" + +#. VENDOR: popup if installation of driver failed +#: src/vendor.ycp:265 +msgid "" +"The installation failed.\n" +"Contact the address on the CD-ROM.\n" +msgstr "" + +#. VENDOR: message box with number of drivers installed +#: src/vendor.ycp:277 +#, ycp-format +msgid "Installed %1 drivers from CD" +msgstr "" + +#. VENDOR: message box with error text +#: src/vendor.ycp:282 +msgid "" +"No driver data found on the CD-ROM.\n" +"Aborting now." +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.3/src/add-on.ycp new/yast2-add-on-2.17.4/src/add-on.ycp --- old/yast2-add-on-2.17.3/src/add-on.ycp 2008-09-08 17:33:59.000000000 +0200 +++ new/yast2-add-on-2.17.4/src/add-on.ycp 2008-09-30 11:14:15.000000000 +0200 @@ -18,16 +18,19 @@ import "GetInstArgs"; import "Mode"; import "CommandLine"; +import "Directory"; +import "XML"; include "add-on/add-on-workflow.ycp"; list wfm_args = WFM::Args(); y2milestone ("ARGS: %1", wfm_args); -if ( - (size (wfm_args) > 0) - && - (contains (wfm_args, "help") || contains (wfm_args, "longhelp")) -) { + +map <string, any> commands = CommandLine::Parse (wfm_args); +y2debug ("Commands: %1", commands); + +// bnc #430852 +if (commands["command"]:"" == "help" || commands["command"]:"" == "longhelp") { Mode::SetUI ("commandline"); // TRANSLATORS: commandline help CommandLine::Print(_(" @@ -47,6 +50,31 @@ dvd:// ")); return `auto; +} else if (commands["command"]:"" == "xmlhelp") { + Mode::SetUI ("commandline"); + if (! haskey (commands["options"]:$[], "xmlfile")) { + CommandLine::Print(_("Target file name ('xmlfile' option) is missing. Use xmlfile=<target_XML_file> command line option.")); + return `auto; + } else { + map doc = $[]; + + doc["listEntries"] = $[ + "commands": "command", + "options": "option", + "examples": "example", + ]; + doc["systemID"] = Directory::schemadir + "/commandline.dtd"; + doc["typeNamespace"] = "http://www.suse.com/1.0/configns"; + doc["rootElement"] = "commandline"; + XML::xmlCreateDoc(`xmlhelp, doc); + + map exportmap = $[ + "module" : "add-on", + ]; + XML::YCPToXMLFile(`xmlhelp, exportmap, commands["options", "xmlfile"]:""); + y2milestone("exported XML map: %1", exportmap); + return `auto; + } } Wizard::CreateDialog(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.3/VERSION new/yast2-add-on-2.17.4/VERSION --- old/yast2-add-on-2.17.3/VERSION 2008-09-08 17:34:55.000000000 +0200 +++ new/yast2-add-on-2.17.4/VERSION 2008-09-30 10:54:59.000000000 +0200 @@ -1 +1 @@ -2.17.3 +2.17.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 patterns
by root＠Hilbert.suse.de 30 Sep '08

30 Sep '08

Hello community, here is the log from the commit of package patterns checked in at Tue Sep 30 14:06:26 CEST 2008. -------- --- patterns/patterns.changes 2008-09-19 16:20:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/patterns/patterns.changes 2008-09-23 19:05:54.176848000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 23 19:03:06 CEST 2008 - cthiel(a)suse.de + +- translation update + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns.spec ++++++ --- /var/tmp/diff_new_pack.d16024/_old 2008-09-30 14:06:12.000000000 +0200 +++ /var/tmp/diff_new_pack.d16024/_new 2008-09-30 14:06:12.000000000 +0200 @@ -25,7 +25,7 @@ AutoReqProv: on Summary: Patterns Translation Tool Version: 1.2086 -Release: 10 +Release: 11 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-%{version}.tar.bz2 Source1: create_pattern.sh @@ -65,6 +65,8 @@ %_sbindir/create_pattern.sh %changelog +* Tue Sep 23 2008 cthiel(a)suse.de +- translation update * Fri Sep 19 2008 cthiel(a)suse.de - fix typo * Thu Sep 18 2008 aj(a)suse.de ++++++ patterns-1.2086.tar.bz2 ++++++ ++++ 6383 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