April 2013 - openSUSE Commits - openSUSE Mailing Lists

commit ed for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package ed for openSUSE:Factory checked in at 2013-04-26 19:21:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ed (Old) and /work/SRC/openSUSE:Factory/.ed.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ed", Maintainer is "MVyskocil(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ed/ed.changes 2013-03-26 14:06:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ed.new/ed.changes 2013-04-26 19:21:04.000000000 +0200 @@ -1,0 +2,27 @@ +Fri Apr 26 08:28:40 UTC 2013 - mvyskocil(a)suse.com + +- update to 1.8 + + Ed now stops reading stdin when reaching real End Of File the first + time. (Before it needed to reach EOF twice). + + Show the "Try 'ed --help' for more information." message if a bad + option is given in the command line. + + Quote characters in messages have been changed as advised by GNU + Coding Standards. + + The description of address offsets in the manual and a link to the + Bash manual have been fixed. + + Displaying of null characters by the "l" command has been fixed. + + The condition deciding when to show the message "Newline appended" has + been corrected. + + The "modified" flag is now set when reading a non-empty file into + an empty buffer. + + An error that prevented using NUL characters in regular expressions + has been fixed. + + Ed now signals an error if it can't create a shell process when + executing a shell command. + + Ed now flushes stdout/stderr before reading a new command. + + Man page is now generated with "help2man". All command-line options + are now documented in the man page. +- use gpg-offline to verify the package tarball +- adapt the Summary and Description according current README + +------------------------------------------------------------------- Old: ---- ed-1.6.tar.gz New: ---- ed-1.8.tar.gz ed-1.8.tar.gz.sig ed.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ed.spec ++++++ --- /var/tmp/diff_new_pack.0ZUtK5/_old 2013-04-26 19:21:05.000000000 +0200 +++ /var/tmp/diff_new_pack.0ZUtK5/_new 2013-04-26 19:21:05.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package ed (Version 1.5) +# spec file for package ed # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,21 +15,37 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ed -Url: http://www.gnu.org/software/ed/ +Version: 1.8 +Release: 0 +Summary: GNU ed is a line-oriented text editor License: GPL-3.0+ and LGPL-2.1+ Group: Productivity/Editors/Other -PreReq: %install_info_prereq -Version: 1.6 -Release: 1 -Summary: Standard UNIX Line Editor -Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz +Url: http://www.gnu.org/software/ed/ +Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz +Source1: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig +Source2: ed.keyring +%if 0%{?suse_version} >= 1230 +BuildRequires: gpg-offline +%endif +Requires(pre): %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -The standard, old Unix line editor. +GNU ed is a line-oriented text editor. It is used to create, display, +modify and otherwise manipulate text files, both interactively and via +shell scripts. A restricted version of ed, red, can only edit files in +the current directory and cannot execute shell commands. Ed is the +"standard" text editor in the sense that it is the original editor for +Unix, and thus widely available. For most purposes, however, it is +superseded by full-screen editors such as GNU Emacs or GNU Moe. %prep +%if 0%{?suse_version} >= 1230 +%gpg_verify %{SOURCE1} +%endif + %setup -q sed -i \ -e "s/CFLAGS='.*/CFLAGS='%{optflags}'/" \ ++++++ ed-1.6.tar.gz -> ed-1.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/AUTHORS new/ed-1.8/AUTHORS --- old/ed-1.6/AUTHORS 2011-11-12 17:52:21.000000000 +0100 +++ new/ed-1.8/AUTHORS 2012-04-28 19:56:53.000000000 +0200 @@ -11,7 +11,7 @@ GNU ed THANKS file - last updated on 15 November 1994. GNU ed originated with the editor algorithm from Brian W. Kernighan & -P. J. Plauger's wonderful book "Software Tools in Pascal," Addison-Wesley, +P. J. Plauger's wonderful book "Software Tools in Pascal", Addison-Wesley, 1981. GNU ed has also benefitted from the contributions of numerous people who reported problems, suggested various improvements or submitted actual code. Among these are the following: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/ChangeLog new/ed-1.8/ChangeLog --- old/ed-1.6/ChangeLog 2012-01-01 16:50:32.000000000 +0100 +++ new/ed-1.8/ChangeLog 2013-04-23 12:52:37.000000000 +0200 @@ -1,20 +1,35 @@ +2013-04-23 Antonio Diaz Diaz <antonio(a)gnu.org> + + * Version 1.8 released. + * io.c (get_tty_line): Removed "double EOF" behavior. + +2012-10-09 Antonio Diaz Diaz <ant_diaz(a)teleline.es> + + * Version 1.7 released. + * main.c (main): Set invocation_name before calling show_error. + * Changed quote characters in messages as advised by GNU Standards. + * ed.texinfo: Fixed description of address offsets. + * ed.texinfo: Fixed a link to the Bash manual. + * configure: 'datadir' renamed to 'datarootdir'. + * Makefile.in: Added new target 'install-bin'. + 2012-01-01 Antonio Diaz Diaz <ant_diaz(a)teleline.es> * Version 1.6 released. * io.c (put_tty_line): Null characters where incorrectly - shown by the `l' command. (Reported by Martin Guy). + shown by the 'l' command. (Reported by Martin Guy). * io.c (read_stream): Corrected the condition deciding when to show the message "Newline appended". - * main_loop.c (exec_command): The `modified' flag is now set + * main_loop.c (exec_command): The 'modified' flag is now set when reading a non-empty file into an empty buffer. * regex.c (translit_text): Fixed typo that prevented using NUL characters in regular expressions. - * main_loop.c (exec_command): Return ERR if `system' can't + * main_loop.c (exec_command): Return ERR if 'system' can't create a shell process. * main_loop.c (main_loop): Flush stdout/stderr before reading a new command. * buffer.c (put_sbuf_line): Added size parameter. - * ed.1: Man page is now generated with `help2man'. + * ed.1: Man page is now generated with 'help2man'. * ed.1: All command-line options are now documented in the man page. * Restored copyright notices of Andrew L. Moore. It seems Andrew granted some permissions but never assigned copyright to the FSF. @@ -22,22 +37,22 @@ 2010-08-30 Antonio Diaz Diaz <ant_diaz(a)teleline.es> * Version 1.5 released. - * buffer.c (append_lines): Fixed `a', `c' and `i' commands. + * buffer.c (append_lines): Fixed 'a', 'c' and 'i' commands. (When used in a global command list, the commands following them in the list were ignored). - * main_loop.c (exec_command): Fixed `e' command. (It quitted + * main_loop.c (exec_command): Fixed 'e' command. (It quitted when invoked a second time with a modified buffer). - * main.c: Added new option `--restricted'. - * `red' has been converted to a script invoking `ed --restricted'. + * main.c: Added new option '--restricted'. + * 'red' has been converted to a script invoking 'ed --restricted'. * Description of ed in the manual has been changed. * testsuite: Modified some tests and removed obsolete posix tests. - * main_loop.c: `ibufp' variable made local to main_loop. + * main_loop.c: 'ibufp' variable made local to main_loop. * Defined type bool to make clear which functions and variables are Boolean. - * Added `const' to all pointer declarations accepting it. + * Added 'const' to all pointer declarations accepting it. * regex.c (replace_matching_text): Make se_max an enum. * signal.c: Include termios.h - * Converted C99 style comments `//' to C89 style comments `/* */'. + * Converted C99 style comments '//' to C89 style comments '/* */'. * ed.texinfo: Fixed an erratum. * Changed copyright holder from Andrew, Antonio to the FSF. @@ -62,9 +77,9 @@ 2009-01-31 Antonio Diaz Diaz <ant_diaz(a)teleline.es> * Version 1.2 released. - * configure: Locale has been fixed to `C'. + * configure: Locale has been fixed to 'C'. * Makefile.in: Man page is now installed by default. - * `make install-info' should now work on Debian and OS X. + * 'make install-info' should now work on Debian and OS X. * ed.texinfo: License updated to GFDL version 1.3 or later. 2008-10-14 Antonio Diaz Diaz <ant_diaz(a)teleline.es> @@ -75,7 +90,7 @@ 2008-08-21 Antonio Diaz Diaz <ant_diaz(a)teleline.es> * Version 1.0 released. - * configure: Added option `--program-prefix'. + * configure: Added option '--program-prefix'. * signal.c (strip_escapes): Buffer overflow fixed. * signal.c (resize_buffer): Pointer aliasing warning fixed. @@ -119,16 +134,16 @@ 2006-11-11 Antonio Diaz Diaz <ant_diaz(a)teleline.es> * Version 0.3 released. - * buffer.c (open_sbuf): Fixed symlink vulnerability using `tmpfile'. + * buffer.c (open_sbuf): Fixed symlink vulnerability using 'tmpfile'. * signal.c: Fixed signal handling for SIGINT. - * main_loop.c (exec_command): Fixed `c' and `i' commands with + * main_loop.c (exec_command): Fixed 'c' and 'i' commands with address 0. * The pause mode has been removed. - * main.c: Added new options `--loose-exit-status' and `--verbose'. - * carg_parser.c: New argument parser that replaces `getopt_long'. - * `configure' and `Makefile.in' have been replaced. + * main.c: Added new options '--loose-exit-status' and '--verbose'. + * carg_parser.c: New argument parser that replaces 'getopt_long'. + * 'configure' and 'Makefile.in' have been replaced. * Removed recursive make for testsuite. - * Created directory `doc'. + * Created directory 'doc'. * Removed all pre ISO C89 code. * Removed all global variables. * ed.texinfo: Added the changes from Andrew and some mine. @@ -161,7 +176,7 @@ * Version 0.1. Initial release for GNU. - * main.c (exec_command): Add comment command `#'. + * main.c (exec_command): Add comment command '#'. Mon Mar 21 21:58:11 PST 1994 Andrew Moore <alm(a)netcom.com> @@ -182,7 +197,7 @@ Copyright (C) 1993 François Pinard Copyright (C) 1994 Andrew Moore -Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. This file is a collection of facts, and thus it is not copyrightable, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/INSTALL new/ed-1.8/INSTALL --- old/ed-1.6/INSTALL 2012-01-01 16:50:32.000000000 +0100 +++ new/ed-1.8/INSTALL 2013-04-11 13:29:07.000000000 +0200 @@ -1,7 +1,7 @@ Requirements ------------ You'll need a C compiler and a C library compatible with GNU libc. -I use gcc 4.3.5 and 3.3.6, but the code should compile with any +I use gcc 4.8.0 and 3.3.6, but the code should compile with any standards compliant compiler. Gcc is available at http://gcc.gnu.org. @@ -18,7 +18,7 @@ the main archive. 2. Change to ed directory and run configure. - (Try `configure --help' for usage instructions). + (Try 'configure --help' for usage instructions). cd ed[version] ./configure @@ -27,30 +27,34 @@ make -4. Optionally, type `make check' to run the tests that come with ed. +4. Optionally, type 'make check' to run the tests that come with ed. -5. Type `make install' to install the program and any data files and +5. Type 'make install' to install the program and any data files and documentation. + You can install only the program, the info manual or the man page + typing 'make install-bin', 'make install-info' or 'make install-man' + respectively. + Another way ----------- You can also compile ed into a separate directory. To do this, you -must use a version of `make' that supports the `VPATH' variable, such -as GNU `make'. `cd' to the directory where you want the object files -and executables to go and run the `configure' script. `configure' -automatically checks for the source code in `.', in `..' and in the -directory that `configure' is in. +must use a version of 'make' that supports the 'VPATH' variable, such +as GNU 'make'. 'cd' to the directory where you want the object files +and executables to go and run the 'configure' script. 'configure' +automatically checks for the source code in '.', in '..' and in the +directory that 'configure' is in. -`configure' recognizes the option `--srcdir=DIR' to control where to -look for the sources. Usually `configure' can determine that directory +'configure' recognizes the option '--srcdir=DIR' to control where to +look for the sources. Usually 'configure' can determine that directory automatically. -After running `configure', you can run `make' and `make install' as +After running 'configure', you can run 'make' and 'make install' as explained above. -Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz. This file is free documentation: you have unlimited permission to copy, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/Makefile.in new/ed-1.8/Makefile.in --- old/ed-1.6/Makefile.in 2011-04-16 13:17:15.000000000 +0200 +++ new/ed-1.8/Makefile.in 2012-10-09 17:17:27.000000000 +0200 @@ -11,8 +11,8 @@ main.o main_loop.o regex.o signal.o -.PHONY : all install install-info install-man install-strip \ - uninstall uninstall-info uninstall-man \ +.PHONY : all install install-bin install-info install-man install-strip \ + uninstall uninstall-bin uninstall-info uninstall-man \ doc info man check dist clean distclean all : $(progname) r$(progname) @@ -57,7 +57,9 @@ check : all @$(VPATH)/testsuite/check.sh $(VPATH)/testsuite $(pkgversion) -install : all install-info install-man +install : install-bin install-info install-man + +install-bin : all if [ ! -d "$(DESTDIR)$(bindir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ; fi $(INSTALL_PROGRAM) ./$(progname) "$(DESTDIR)$(bindir)/$(program_prefix)$(progname)" $(INSTALL_SCRIPT) ./r$(progname) "$(DESTDIR)$(bindir)/$(program_prefix)r$(progname)" @@ -76,7 +78,9 @@ install-strip : all $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install -uninstall : uninstall-info uninstall-man +uninstall : uninstall-bin uninstall-info uninstall-man + +uninstall-bin : -rm -f "$(DESTDIR)$(bindir)/$(program_prefix)$(progname)" -rm -f "$(DESTDIR)$(bindir)/$(program_prefix)r$(progname)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/NEWS new/ed-1.8/NEWS --- old/ed-1.6/NEWS 2011-11-12 18:13:32.000000000 +0100 +++ new/ed-1.8/NEWS 2013-02-09 00:05:27.000000000 +0100 @@ -1,20 +1,4 @@ -Changes in version 1.6: +Changes in version 1.8: -Displaying of null characters by the "l" command has been fixed. - -The condition deciding when to show the message "Newline appended" has -been corrected. - -The "modified" flag is now set when reading a non-empty file into an -empty buffer. - -An error that prevented using NUL characters in regular expressions has -been fixed. - -Ed now signals an error if it can't create a shell process when -executing a shell command. - -Ed now flushes stdout/stderr before reading a new command. - -Man page is now generated with "help2man". All command-line options are -now documented in the man page. +Ed now stops reading stdin when reaching real End Of File the first +time. (Before it needed to reach EOF twice). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/README new/ed-1.8/README --- old/ed-1.6/README 2012-01-01 16:50:32.000000000 +0100 +++ new/ed-1.8/README 2013-02-09 00:22:57.000000000 +0100 @@ -1,3 +1,5 @@ +Description + GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files, both interactively and via shell scripts. A restricted version of ed, red, can only edit files in @@ -17,7 +19,7 @@ Ed home page: http://www.gnu.org/software/ed/ed.html For a description of the ed algorithm, see Kernighan and Plauger's book -"Software Tools in Pascal," Addison-Wesley, 1981. +"Software Tools in Pascal", Addison-Wesley, 1981. GNU ed(1) is not strictly POSIX compliant, as described in the @@ -44,25 +46,25 @@ r /dev/null wq - Similarly, to remove a newline from the end of binary `file': + Similarly, to remove a newline from the end of binary 'file': $ ed file r /dev/null wq * BSD commands have been implemented wherever they do not conflict with the POSIX standard. The BSD-ism's included are: - * `s' (i.e., s[n][rgp]*) to repeat a previous substitution, - * `W' for appending text to an existing file, - * `wq' for exiting after a write, and - * `z' for scrolling through the buffer. - - * The POSIX interactive global commands `G' and `V' are extended to - support multiple commands, including `a', `i' and `c'. The command - format is the same as for the global commands `g' and `v', i.e., one + * 's' (i.e., s[n][rgp]*) to repeat a previous substitution, + * 'W' for appending text to an existing file, + * 'wq' for exiting after a write, and + * 'z' for scrolling through the buffer. + + * The POSIX interactive global commands 'G' and 'V' are extended to + support multiple commands, including 'a', 'i' and 'c'. The command + format is the same as for the global commands 'g' and 'v', i.e., one command per line with each line, except for the last, ending in a backslash (\). - * The file commands `E', `e', `r', `W' and `w' process a <file> + * The file commands 'E', 'e', 'r', 'W' and 'w' process a <file> argument for backslash escapes; i.e., any character preceded by a backslash is interpreted literally. If the first unescaped character of a <file> argument is a bang (!), then the rest of the line is @@ -79,23 +81,23 @@ addresses cannot be used where only a single address is expected has been relaxed. - * To support the BSD `s' command (see EXTENSIONS above), + * To support the BSD 's' command (see EXTENSIONS above), substitution patterns cannot be delimited by numbers or the characters - `r', `g' and `p'. In contrast, POSIX specifies any character expect + 'r', 'g' and 'p'. In contrast, POSIX specifies any character expect space or newline can used as a delimiter. - * Since the behavior of `u' (undo) within a `g' (global) command list is + * Since the behavior of 'u' (undo) within a 'g' (global) command list is not specified by POSIX, GNU ed follows the behavior of the SunOS ed: undo forces a global command list to be executed only once, rather than for each line matching a global pattern. In addtion, each instance of - `u' within a global command undoes all previous commands (including + 'u' within a global command undoes all previous commands (including undo's) in the command list. This seems the best way, since the alternatives are either too complicated to implement or too confusing to use. - * The `m' (move) command within a `g' command list also follows the SunOS + * The 'm' (move) command within a 'g' command list also follows the SunOS ed implementation: any moved lines are removed from the global command's - `active' list. + 'active' list. * If GNU ed is invoked with a name argument prefixed by a bang (!), then the remainder of the argument is interpreted as a shell command. To invoke @@ -109,9 +111,9 @@ TESTSUITE --------- -The files in the `testsuite' directory with suffixes `.t', `.d', `.r', -`.pr' and `.err' are used for testing ed. To run the tests, configure -the package and type `make check' from the build directory. The tests do +The files in the 'testsuite' directory with suffixes '.t', '.d', '.r', +'.pr' and '.err' are used for testing ed. To run the tests, configure +the package and type 'make check' from the build directory. The tests do not exhaustively verify POSIX compliance nor do they verify correct 8-bit or long line support. @@ -134,7 +136,7 @@ Copyright (C) 1993, 1994 Andrew Moore -Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. This file is free documentation: you have unlimited permission to copy, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/TODO new/ed-1.8/TODO --- old/ed-1.6/TODO 1994-11-19 12:26:26.000000000 +0100 +++ new/ed-1.8/TODO 2012-04-28 21:11:23.000000000 +0200 @@ -4,12 +4,8 @@ 2) a hello^V^Jworld . - okay: embedded newlines in insert mode -3) ed "" - error: invalid filename -4) red .. - error: restricted -5) red / - error: restricted -5) red !xx - error: restricted -6) ed -x - verify: 8-bit clean -7) ed - verify: long-line support -8) ed - verify: interactive/help mode -9) G/pat/ - verify: global interactive command -10) V/pat/ - verify: global interactive command +3) ed -x - verify: 8-bit clean +4) ed - verify: long-line support +5) ed - verify: interactive/help mode +6) G/pat/ - verify: global interactive command +7) V/pat/ - verify: global interactive command diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/buffer.c new/ed-1.8/buffer.c --- old/ed-1.6/buffer.c 2012-01-01 16:50:32.000000000 +0100 +++ new/ed-1.8/buffer.c 2013-02-09 00:22:56.000000000 +0100 @@ -1,7 +1,7 @@ /* buffer.c: scratch-file buffer routines for the ed line editor. */ /* GNU ed - The GNU line editor. Copyright (C) 1993, 1994 Andrew Moore, Talke Studio - Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/carg_parser.c new/ed-1.8/carg_parser.c --- old/ed-1.6/carg_parser.c 2012-01-01 14:16:14.000000000 +0100 +++ new/ed-1.8/carg_parser.c 2013-02-18 23:43:22.000000000 +0100 @@ -1,5 +1,5 @@ /* Arg_parser - POSIX/GNU command line argument parser. (C version) - Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz. This library is free software: you can redistribute it and/or modify @@ -32,7 +32,7 @@ #include "carg_parser.h" -/* assure at least a minimum size for buffer `buf' */ +/* assure at least a minimum size for buffer 'buf' */ static void * ap_resize_buffer( void * buf, const int min_size ) { if( buf ) buf = realloc( buf, min_size ); @@ -88,16 +88,15 @@ const struct ap_Option options[], int * const argindp ) { - unsigned int len; - int index = -1; - int i; + unsigned len; + int index = -1, i; char exact = 0, ambig = 0; for( len = 0; opt[len+2] && opt[len+2] != '='; ++len ) ; /* Test all long options for either exact match or abbreviated matches. */ for( i = 0; options[i].code != 0; ++i ) - if( options[i].name && !strncmp( options[i].name, &opt[2], len ) ) + if( options[i].name && strncmp( options[i].name, &opt[2], len ) == 0 ) { if( strlen( options[i].name ) == len ) /* Exact match found */ { index = i; exact = 1; break; } @@ -109,31 +108,31 @@ if( ambig && !exact ) { - add_error( ap, "option `" ); add_error( ap, opt ); + add_error( ap, "option '" ); add_error( ap, opt ); add_error( ap, "' is ambiguous" ); return 1; } if( index < 0 ) /* nothing found */ { - add_error( ap, "unrecognized option `" ); add_error( ap, opt ); + add_error( ap, "unrecognized option '" ); add_error( ap, opt ); add_error( ap, "'" ); return 1; } ++*argindp; - if( opt[len+2] ) /* `--<long_option>=<argument>' syntax */ + if( opt[len+2] ) /* '--<long_option>=<argument>' syntax */ { if( options[index].has_arg == ap_no ) { - add_error( ap, "option `--" ); add_error( ap, options[index].name ); + add_error( ap, "option '--" ); add_error( ap, options[index].name ); add_error( ap, "' doesn't allow an argument" ); return 1; } if( options[index].has_arg == ap_yes && !opt[len+3] ) { - add_error( ap, "option `--" ); add_error( ap, options[index].name ); + add_error( ap, "option '--" ); add_error( ap, options[index].name ); add_error( ap, "' requires an argument" ); return 1; } @@ -144,7 +143,7 @@ { if( !arg || !arg[0] ) { - add_error( ap, "option `--" ); add_error( ap, options[index].name ); + add_error( ap, "option '--" ); add_error( ap, options[index].name ); add_error( ap, "' requires an argument" ); return 1; } @@ -165,8 +164,7 @@ while( cind > 0 ) { - int index = -1; - int i; + int index = -1, i; const unsigned char code = opt[cind]; char code_str[2]; code_str[0] = code; code_str[1] = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/carg_parser.h new/ed-1.8/carg_parser.h --- old/ed-1.6/carg_parser.h 2012-01-01 14:16:14.000000000 +0100 +++ new/ed-1.8/carg_parser.h 2013-02-18 23:43:22.000000000 +0100 @@ -1,5 +1,5 @@ /* Arg_parser - POSIX/GNU command line argument parser. (C version) - Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz. This library is free software: you can redistribute it and/or modify @@ -26,13 +26,13 @@ Public License. */ -/* Arg_parser reads the arguments in `argv' and creates a number of +/* Arg_parser reads the arguments in 'argv' and creates a number of option codes, option arguments and non-option arguments. - In case of error, `ap_error' returns a non-null pointer to an error + In case of error, 'ap_error' returns a non-null pointer to an error message. - `options' is an array of `struct ap_Option' terminated by an element + 'options' is an array of 'struct ap_Option' terminated by an element containing a code which is zero. A null name means a short-only option. A code value outside the unsigned char range means a long-only option. @@ -41,13 +41,13 @@ were specified before all the non-option arguments for the purposes of parsing, even if the user of your program intermixed option and non-option arguments. If you want the arguments in the exact order - the user typed them, call `ap_init' with `in_order' = true. + the user typed them, call 'ap_init' with 'in_order' = true. - The argument `--' terminates all options; any following arguments are + The argument '--' terminates all options; any following arguments are treated as non-option arguments, even if they begin with a hyphen. - The syntax for optional option arguments is `-<short_option><argument>' - (without whitespace), or `--<long_option>=<argument>'. + The syntax for optional option arguments is '-<short_option><argument>' + (without whitespace), or '--<long_option>=<argument>'. */ #ifdef __cplusplus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/configure new/ed-1.8/configure --- old/ed-1.6/configure 2012-01-01 16:50:32.000000000 +0100 +++ new/ed-1.8/configure 2013-04-23 12:37:08.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # configure script for GNU ed - The GNU line editor -# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 # Antonio Diaz Diaz. # # This configure script is free software: you have unlimited permission @@ -9,7 +9,7 @@ args= no_create= pkgname=ed -pkgversion=1.6 +pkgversion=1.8 progname=ed srctrigger=ed.h @@ -20,16 +20,23 @@ prefix=/usr/local exec_prefix='$(prefix)' bindir='$(exec_prefix)/bin' -datadir='$(prefix)/share' -infodir='$(datadir)/info' -mandir='$(datadir)/man' -sysconfdir='$(prefix)/etc' +datarootdir='$(prefix)/share' +infodir='$(datarootdir)/info' +mandir='$(datarootdir)/man' program_prefix= -CC= +CC=gcc CPPFLAGS= CFLAGS='-Wall -W -O2' LDFLAGS= +# checking whether we are using GNU C. +if [ ! -x /bin/gcc ] && + [ ! -x /usr/bin/gcc ] && + [ ! -x /usr/local/bin/gcc ] ; then + CC=cc + CFLAGS='-W -O2' +fi + # Loop over all args while [ -n "$1" ] ; do @@ -42,12 +49,12 @@ # Split out the argument for options that take them case ${option} in - *=*) optarg=`echo ${option} | sed -e 's,^[^=]*=,,'` ;; + *=*) optarg=`echo ${option} | sed -e 's,^[^=]*=,,;s,/$,,'` ;; esac # Process the options case ${option} in - --help | --he* | -h) + --help | -h) echo "Usage: configure [options]" echo echo "Options: [defaults in brackets]" @@ -57,10 +64,9 @@ echo " --prefix=DIR install into DIR [${prefix}]" echo " --exec-prefix=DIR base directory for arch-dependent files [${exec_prefix}]" echo " --bindir=DIR user executables directory [${bindir}]" - echo " --datadir=DIR base directory for doc and data [${datadir}]" + echo " --datarootdir=DIR base directory for doc and data [${datarootdir}]" echo " --infodir=DIR info files directory [${infodir}]" echo " --mandir=DIR man pages directory [${mandir}]" - echo " --sysconfdir=DIR read-only single-machine data directory [${sysconfdir}]" echo " --program-prefix=NAME install program and documentation prefixed with NAME" echo " CC=COMPILER C compiler to use [gcc]" echo " CPPFLAGS=OPTIONS command line options for the preprocessor [${CPPFLAGS}]" @@ -68,34 +74,23 @@ echo " LDFLAGS=OPTIONS command line options for the linker [${LDFLAGS}]" echo exit 0 ;; - --version | --ve* | -V) + --version | -V) echo "Configure script for GNU ${pkgname} version ${pkgversion}" exit 0 ;; - --srcdir* | --sr*) - srcdir=`echo ${optarg} | sed -e 's,/$,,'` ;; - --prefix* | --pre*) - prefix=`echo ${optarg} | sed -e 's,/$,,'` ;; - --exec-prefix* | --ex*) - exec_prefix=`echo ${optarg} | sed -e 's,/$,,'` ;; - --bindir* | --bi*) - bindir=`echo ${optarg} | sed -e 's,/$,,'` ;; - --datadir* | --da*) - datadir=`echo ${optarg} | sed -e 's,/$,,'` ;; - --infodir* | --inf*) - infodir=`echo ${optarg} | sed -e 's,/$,,'` ;; - --mandir* | --ma*) - mandir=`echo ${optarg} | sed -e 's,/$,,'` ;; - --sysconfdir* | --sy*) - sysconfdir=`echo ${optarg} | sed -e 's,/$,,'` ;; - --program-prefix* | --pro*) - program_prefix=`echo ${optarg} | sed -e 's,/$,,'` ;; - --no-create | --no-c*) - no_create=yes ;; + --srcdir=*) srcdir=${optarg} ;; + --prefix=*) prefix=${optarg} ;; + --exec-prefix=*) exec_prefix=${optarg} ;; + --bindir=*) bindir=${optarg} ;; + --datarootdir=*) datarootdir=${optarg} ;; + --infodir=*) infodir=${optarg} ;; + --mandir=*) mandir=${optarg} ;; + --program-prefix=*) program_prefix=${optarg} ;; + --no-create) no_create=yes ;; - CC=*) CC=${optarg} ;; + CC=*) CC=${optarg} ;; CPPFLAGS=*) CPPFLAGS=${optarg} ;; - CFLAGS=*) CFLAGS=${optarg} ;; - LDFLAGS=*) LDFLAGS=${optarg} ;; + CFLAGS=*) CFLAGS=${optarg} ;; + LDFLAGS=*) LDFLAGS=${optarg} ;; --* | *=* | *-*-*) ;; *) @@ -108,14 +103,14 @@ srcdirtext= if [ -z "${srcdir}" ] ; then srcdirtext="or . or .." ; srcdir=. - if [ ! -r ${srcdir}/${srctrigger} ] ; then srcdir=.. ; fi - if [ ! -r ${srcdir}/${srctrigger} ] ; then + if [ ! -r "${srcdir}/${srctrigger}" ] ; then srcdir=.. ; fi + if [ ! -r "${srcdir}/${srctrigger}" ] ; then ## the sed command below emulates the dirname command srcdir=`echo $0 | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` fi fi -if [ ! -r ${srcdir}/${srctrigger} ] ; then +if [ ! -r "${srcdir}/${srctrigger}" ] ; then exec 1>&2 echo echo "configure: Can't find sources in ${srcdir} ${srcdirtext}" @@ -124,18 +119,7 @@ fi # Set srcdir to . if that's what it is. -if [ "`pwd`" = "`cd ${srcdir} ; pwd`" ] ; then srcdir=. ; fi - -# checking whether we are using GNU C. -if [ -z "${CC}" ] ; then # Let the user override the test. - if [ -x /bin/gcc ] || - [ -x /usr/bin/gcc ] || - [ -x /usr/local/bin/gcc ] ; then - CC="gcc" - else - CC="cc" - fi -fi +if [ "`pwd`" = "`cd "${srcdir}" ; pwd`" ] ; then srcdir=. ; fi echo if [ -z "${no_create}" ] ; then @@ -159,10 +143,9 @@ echo "prefix = ${prefix}" echo "exec_prefix = ${exec_prefix}" echo "bindir = ${bindir}" -echo "datadir = ${datadir}" +echo "datarootdir = ${datarootdir}" echo "infodir = ${infodir}" echo "mandir = ${mandir}" -echo "sysconfdir = ${sysconfdir}" echo "program_prefix = ${program_prefix}" echo "CC = ${CC}" echo "CPPFLAGS = ${CPPFLAGS}" @@ -171,7 +154,7 @@ rm -f Makefile cat > Makefile << EOF # Makefile for GNU ed - The GNU line editor -# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 # Antonio Diaz Diaz. # This file was generated automatically by configure. Do not edit. # @@ -185,16 +168,15 @@ prefix = ${prefix} exec_prefix = ${exec_prefix} bindir = ${bindir} -datadir = ${datadir} +datarootdir = ${datarootdir} infodir = ${infodir} mandir = ${mandir} -sysconfdir = ${sysconfdir} program_prefix = ${program_prefix} CC = ${CC} CPPFLAGS = ${CPPFLAGS} CFLAGS = ${CFLAGS} LDFLAGS = ${LDFLAGS} EOF -cat ${srcdir}/Makefile.in >> Makefile +cat "${srcdir}/Makefile.in" >> Makefile echo "OK. Now you can run make." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/doc/ed.1 new/ed-1.8/doc/ed.1 --- old/ed-1.6/doc/ed.1 2012-01-01 16:50:36.000000000 +0100 +++ new/ed-1.8/doc/ed.1 2013-04-23 12:37:12.000000000 +0200 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ED "1" "January 2012" "Ed 1.6" "User Commands" +.TH ED "1" "April 2013" "Ed 1.8" "User Commands" .SH NAME Ed \- line-oriented text editor .SH SYNOPSIS @@ -33,8 +33,8 @@ \fB\-v\fR, \fB\-\-verbose\fR be verbose .PP -Start edit by reading in `file' if given. -If `file' begins with a `!', read output of shell command. +Start edit by reading in 'file' if given. +If 'file' begins with a '!', read output of shell command. .SH "REPORTING BUGS" Report bugs to <bug\-ed(a)gnu.org>. .br @@ -44,7 +44,7 @@ .SH COPYRIGHT Copyright \(co 1994 Andrew L. Moore. .br -Copyright \(co 2012 Free Software Foundation, Inc. +Copyright \(co 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> .br This is free software: you are free to change and redistribute it. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/doc/ed.info new/ed-1.8/doc/ed.info --- old/ed-1.6/doc/ed.info 2012-01-01 16:50:34.000000000 +0100 +++ new/ed-1.8/doc/ed.info 2013-04-23 12:34:00.000000000 +0200 @@ -5,8 +5,8 @@ * Ed: (ed). The GNU line editor END-INFO-DIR-ENTRY - Copyright (C) 1993, 1994, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2006, 2007, 2008, 2009, 2010, 2011, 2012, +2013 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -19,7 +19,7 @@ The GNU ed line editor ********************** -This manual is for GNU ed (version 1.6, 1 January 2012). +This manual is for GNU ed (version 1.8, 23 April 2013). GNU ed is a line-oriented text editor. It is used to create, display, @@ -44,8 +44,8 @@ * GNU Free Documentation License:: How you can copy and share this manual - Copyright (C) 1993, 1994, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2006, 2007, 2008, 2009, 2010, 2011, 2012, +2013 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -113,8 +113,9 @@ Expressions::). For the purposes of this tutorial, a working knowledge of the Unix -shell `sh' (*note Bash: (bash)Bash.) and the Unix file system is -recommended, since `ed' is designed to interact closely with them. +shell `sh' and the Unix file system is recommended, since `ed' is +designed to interact closely with them. (*Note GNU bash manual: +(bash)Top, for details about bash). The principal difference between line editors and display editors is that display editors provide instant feedback to user commands, whereas @@ -204,7 +205,7 @@ followed by a <newline> character. Comments begin with a `#'. $ ed - # The `a' command is for appending text to the editor buffer. + # The 'a' command is for appending text to the editor buffer. a No more be grieved at that which thou hast done. Roses have thorns, and filvers foutians mud. @@ -227,7 +228,7 @@ $ ed sonnet 183 # Begin by printing the buffer to the terminal with the `p' command. - # The `,' means ``all lines.'' + # The ',' means "all lines". ,p No more be grieved at that which thou hast done. Roses have thorns, and filvers foutians mud. @@ -236,11 +237,11 @@ # Select line 2 for editing. 2 Roses have thorns, and filvers foutians mud. - # Use the substitute command, `s', to replace `filvers' with `silver', + # Use the substitute command, `s', to replace 'filvers' with 'silver', # and print the result. s/filvers/silver/p Roses have thorns, and silver foutians mud. - # And correct the spelling of `fountains'. + # And correct the spelling of 'fountains'. s/utia/untai/p Roses have thorns, and silver fountains mud. w sonnet @@ -273,8 +274,8 @@ Clouds and eclipses stain both moon and sun, And loathsome canker lives in sweetest bud. Sonnet #50 - # The title got appended to the end; we should have used `0a' - # to append ``before the first line.'' + # The title got appended to the end; we should have used '0a' + # to append "before the first line". # Move the title to its proper place. 5m0p Sonnet #50 @@ -377,30 +378,23 @@ general, the current address is set to the last line affected by a command. - A line address is constructed from one of the bases in the list -below, optionally followed by a numeric offset. The offset may include -any combination of digits, operators (i.e., `+' and `-') and -whitespace. Addresses are read from left to right, and their values may -be absolute or relative to the current address. - One exception to the rule that addresses represent line numbers is -the address `0' (zero). This means "before the first line," and is +the address `0' (zero). This means "before the first line", and is valid wherever it makes sense. - An address range is two addresses separated either by a comma or -semicolon. The value of the first address in a range cannot exceed the -value of the second. If only one address is given in a range, then the -second address is set to the given address. If an N-tuple of addresses -is given where N > 2, then the corresponding range is determined by the -last two addresses in the N-tuple. If only one address is expected, -then the last address is used. - - Each address in a comma-delimited range is interpreted relative to -the current address. In a semicolon-delimited range, the first address -is used to set the current address, and the second address is -interpreted relative to the first. + An address range is two addresses separated either by a comma (`,') +or a semicolon (`;'). The value of the first address in a range cannot +exceed the value of the second. If only one address is given in a +range, then the second address is set to the given address. If an +N-tuple of addresses is given where N > 2, then the corresponding range +is determined by the last two addresses in the N-tuple. If only one +address is expected, then the last address is used. + + In a semicolon-delimited range, the current address (`.') is set to +the first address before the second address is calculated. This feature +can be used to set the starting line for searches. - The following address symbols are recognized. + A line address is constructed as follows: `.' The current line (address) in the buffer. @@ -409,7 +403,13 @@ The last line in the buffer. `N' - The Nth, line in the buffer where N is a number in the range `0,$'. + The Nth line in the buffer, where N is a number in the range `0,$'. + +`+N' + The Nth next line, where N is a non-negative number. + +`-N' + The Nth previous line, where N is a non-negative number. `+' The next line. This is equivalent to `+1' and may be repeated with @@ -419,14 +419,6 @@ The previous line. This is equivalent to `-1' and may be repeated with cumulative effect. -`+N' -`WHITESPACE N' - The Nth next line, where N is a non-negative number. Whitespace - followed by a number N is interpreted as `+N'. - -`-N' - The Nth previous line, where N is a non-negative number. - `,' The first through last lines in the buffer. This is equivalent to the address range `1,$'. @@ -451,6 +443,18 @@ from the portable character set. + Addresses can be followed by one or more address offsets, optionally +separated by whitespace. Offsets are constructed as follows: + + * A number adds the indicated number of lines to the address. + + * `+' or `-' followed by a number adds or subtracts the indicated + number of lines to or from the address. + + * `+' or `-' not followed by a number adds or subtracts 1 to or from + the address. + + File: ed.info, Node: Regular Expressions, Next: Commands, Prev: Line Addressing, Up: Top @@ -478,7 +482,7 @@ `<' and `>', matches itself. `\C' - Any backslash-escaped character C, other than `{', ``}', `(', `)', + Any backslash-escaped character C, other than `{', `}', `(', `)', `<', `>', `b', `B', `w', `W', `+' and `?', matches itself. `.' @@ -916,7 +920,7 @@ If you find a bug in `ed', please send electronic mail to <bug-ed(a)gnu.org>. Include the version number, which you can find by -running ``ed' --version'. +running `ed --version'. File: ed.info, Node: GNU Free Documentation License, Prev: Problems, Up: Top @@ -1407,17 +1411,17 @@ Tag Table: -Node: Top568 -Node: Overview2247 -Node: Introduction to Line Editing4304 -Node: Invoking Ed11516 -Node: Line Addressing13317 -Node: Regular Expressions16420 -Node: Commands21765 -Node: Limitations32910 -Node: Diagnostics33551 -Node: Problems34255 -Node: GNU Free Documentation License34790 +Node: Top574 +Node: Overview2258 +Node: Introduction to Line Editing4315 +Node: Invoking Ed11558 +Node: Line Addressing13359 +Node: Regular Expressions16436 +Node: Commands21780 +Node: Limitations32925 +Node: Diagnostics33566 +Node: Problems34270 +Node: GNU Free Documentation License34803 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/doc/ed.texinfo new/ed-1.8/doc/ed.texinfo --- old/ed-1.6/doc/ed.texinfo 2012-01-01 16:50:32.000000000 +0100 +++ new/ed-1.8/doc/ed.texinfo 2013-04-23 12:33:58.000000000 +0200 @@ -6,8 +6,8 @@ @finalout @c %**end of header -@set UPDATED 1 January 2012 -@set VERSION 1.6 +@set UPDATED 23 April 2013 +@set VERSION 1.8 @dircategory Basics @direntry @@ -16,7 +16,7 @@ @copying Copyright @copyright{} 1993, 1994, 2006, 2007, 2008, 2009, 2010, 2011, -2012 Free Software Foundation, Inc. +2012, 2013 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -134,9 +134,16 @@ Expressions}). For the purposes of this tutorial, a working knowledge of the Unix shell -@command{sh} (@pxref{Bash,,, bash, The GNU Bash Reference Manual}) and -the Unix file system is recommended, since @command{ed} is designed to -interact closely with them. +@command{sh} and the Unix file system is recommended, since @command{ed} +is designed to interact closely with them. +@ifnothtml +(@xref{Top,GNU bash manual,,bash}, +@end ifnothtml +@ifhtml +(See the +@uref{http://www.gnu.org/software/bash/manual/,,bash manual} +@end ifhtml +for details about bash). The principal difference between line editors and display editors is that display editors provide instant feedback to user commands, whereas @@ -150,7 +157,7 @@ utilities. As with the shell, @key{RETURN} (the carriage-return key) enters a line -of input. So when we speak of ``entering'' a command or some text in +of input. So when we speak of "entering" a command or some text in @command{ed}, @key{RETURN} is implied at the end of each line. Prior to typing @key{RETURN}, corrections to the line may be made by typing either @key{BACKSPACE} (sometimes labeled @key{DELETE} or @key{DEL}) to @@ -171,7 +178,7 @@ avoid confusion with the shell command prompt (@samp{$}). We can run Unix shell (@command{sh}) commands from inside @command{ed} -by prefixing them with @key{!} (exclamation mark, aka ``bang''). For +by prefixing them with @key{!} (exclamation mark, aka "bang"). For example: @example @@ -203,7 +210,7 @@ issue the @key{p} (@dfn{print}) command (not to be confused with the prompt command, which is uppercase!). To indicate the range of lines in the buffer that should be printed, we prefix the command with @key{,} -(comma) which is shorthand for ``the whole buffer'': +(comma) which is shorthand for "the whole buffer": @example *,p @@ -239,7 +246,7 @@ @example $ ed -# The `a' command is for appending text to the editor buffer. +# The 'a' command is for appending text to the editor buffer. a No more be grieved at that which thou hast done. Roses have thorns, and filvers foutians mud. @@ -264,7 +271,7 @@ $ ed sonnet 183 # Begin by printing the buffer to the terminal with the @samp{p} command. -# The `,' means ``all lines.'' +# The ',' means "all lines". ,p No more be grieved at that which thou hast done. Roses have thorns, and filvers foutians mud. @@ -273,11 +280,11 @@ # Select line 2 for editing. 2 Roses have thorns, and filvers foutians mud. -# Use the substitute command, @samp{s}, to replace `filvers' with `silver', +# Use the substitute command, @samp{s}, to replace 'filvers' with 'silver', # and print the result. s/filvers/silver/p Roses have thorns, and silver foutians mud. -# And correct the spelling of `fountains'. +# And correct the spelling of 'fountains'. s/utia/untai/p Roses have thorns, and silver fountains mud. w sonnet @@ -313,8 +320,8 @@ Clouds and eclipses stain both moon and sun, And loathsome canker lives in sweetest bud. Sonnet #50 -# The title got appended to the end; we should have used `0a' -# to append ``before the first line.'' +# The title got appended to the end; we should have used '0a' +# to append "before the first line". # Move the title to its proper place. 5m0p Sonnet #50 @@ -344,7 +351,7 @@ @end quotation @quotation -B. W. Kernighan and P. J. Plauger: ``Software Tools in Pascal'', +B. W. Kernighan and P. J. Plauger: "Software Tools in Pascal", Addison-Wesley, 1981. @end quotation @@ -423,30 +430,24 @@ general, the current address is set to the last line affected by a command. -A line address is constructed from one of the bases in the list below, -optionally followed by a numeric offset. The offset may include any -combination of digits, operators (i.e., @samp{+} and @samp{-}) and -whitespace. Addresses are read from left to right, and their values may -be absolute or relative to the current address. - One exception to the rule that addresses represent line numbers is the -address @samp{0} (zero). This means ``before the first line,'' and is +address @samp{0} (zero). This means "before the first line", and is valid wherever it makes sense. -An address range is two addresses separated either by a comma or -semicolon. The value of the first address in a range cannot exceed the -value of the second. If only one address is given in a range, then the -second address is set to the given address. If an @var{n}-tuple of -addresses is given where @var{n} > 2, then the corresponding range is -determined by the last two addresses in the @var{n}-tuple. If only one -address is expected, then the last address is used. - -Each address in a comma-delimited range is interpreted relative to the -current address. In a semicolon-delimited range, the first address is -used to set the current address, and the second address is interpreted -relative to the first. +An address range is two addresses separated either by a comma (@samp{,}) +or a semicolon (@samp{;}). The value of the first address in a range +cannot exceed the value of the second. If only one address is given in a +range, then the second address is set to the given address. If an +@var{n}-tuple of addresses is given where @var{n} > 2, then the +corresponding range is determined by the last two addresses in the +@var{n}-tuple. If only one address is expected, then the last address is +used. + +In a semicolon-delimited range, the current address (@samp{.}) is set to +the first address before the second address is calculated. This feature +can be used to set the starting line for searches. -The following address symbols are recognized. +A line address is constructed as follows: @table @code @item . @@ -456,9 +457,15 @@ The last line in the buffer. @item @var{n} -The @var{n}th, line in the buffer where @var{n} is a number in the range +The @var{n}th line in the buffer, where @var{n} is a number in the range @samp{0,$}. +@item +@var{n} +The @var{n}th next line, where @var{n} is a non-negative number. + +@item -@var{n} +The @var{n}th previous line, where @var{n} is a non-negative number. + @item + The next line. This is equivalent to @samp{+1} and may be repeated with cumulative effect. @@ -467,15 +474,6 @@ The previous line. This is equivalent to @samp{-1} and may be repeated with cumulative effect. -@item +@var{n} -@itemx @var{whitespace} @var{n} -The @var{n}th next line, where @var{n} is a non-negative number. -Whitespace followed by a number @var{n} is interpreted as -@samp{+@var{n}}. - -@item -@var{n} -The @var{n}th previous line, where @var{n} is a non-negative number. - @item , The first through last lines in the buffer. This is equivalent to the address range @samp{1,$}. @@ -501,6 +499,23 @@ @end table +Addresses can be followed by one or more address offsets, optionally +separated by whitespace. Offsets are constructed as follows: + +@itemize @bullet +@item +A number adds the indicated number of lines to the address. + +@item +@samp{+} or @samp{-} followed by a number adds or subtracts the +indicated number of lines to or from the address. + +@item +@samp{+} or @samp{-} not followed by a number adds or subtracts 1 to or +from the address. + +@end itemize + @node Regular Expressions @chapter Regular Expressions @@ -533,7 +548,7 @@ @item \@var{c} Any backslash-escaped character @var{c}, other than @samp{@{}, -`@samp{@}}, @samp{(}, @samp{)}, @samp{<}, @samp{>}, @samp{b}, @samp{B}, +@samp{@}}, @samp{(}, @samp{)}, @samp{<}, @samp{>}, @samp{b}, @samp{B}, @samp{w}, @samp{W}, @samp{+} and @samp{?}, matches itself. @item . @@ -980,7 +995,7 @@ If you find a bug in @command{ed}, please send electronic mail to @email{bug-ed@@gnu.org}. Include the version number, which you can -find by running @w{@samp{@command{ed} --version}}. +find by running @w{@samp{ed --version}}. @node GNU Free Documentation License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/ed.h new/ed-1.8/ed.h --- old/ed-1.6/ed.h 2012-01-01 16:50:32.000000000 +0100 +++ new/ed-1.8/ed.h 2013-02-09 00:22:56.000000000 +0100 @@ -1,7 +1,7 @@ /* Global declarations for the ed editor. */ /* GNU ed - The GNU line editor. Copyright (C) 1993, 1994 Andrew Moore, Talke Studio - Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/global.c new/ed-1.8/global.c --- old/ed-1.6/global.c 2012-01-01 16:50:32.000000000 +0100 +++ new/ed-1.8/global.c 2013-02-09 00:22:56.000000000 +0100 @@ -1,7 +1,7 @@ /* global.c: global command routines for the ed line editor */ /* GNU ed - The GNU line editor. Copyright (C) 1993, 1994 Andrew Moore, Talke Studio - Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/io.c new/ed-1.8/io.c --- old/ed-1.6/io.c 2012-01-01 16:50:32.000000000 +0100 +++ new/ed-1.8/io.c 2013-02-09 00:22:56.000000000 +0100 @@ -1,7 +1,7 @@ /* io.c: i/o routines for the ed line editor */ /* GNU ed - The GNU line editor. Copyright (C) 1993, 1994 Andrew Moore, Talke Studio - Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -128,17 +128,19 @@ /* Read a line of text from stdin. - Return pointer to buffer and line size (uncluding trailing newline + Return pointer to buffer and line size (including trailing newline if it exists) */ const char * get_tty_line( int * const sizep ) { static char * buf = 0; static int bufsz = 0; - int i = 0, oi = -1; + int i = 0; while( true ) { const int c = getchar(); + if( !resize_buffer( &buf, &bufsz, i + 2 ) ) + { if( sizep ) *sizep = 0; return 0; } if( c == EOF ) { if( ferror( stdin ) ) @@ -147,17 +149,15 @@ clearerr( stdin ); if( sizep ) *sizep = 0; return 0; } - else + if( feof( stdin ) ) { - clearerr( stdin ); if( i != oi ) { oi = i; continue; } - if( i ) buf[i] = 0; if( sizep ) *sizep = i; + clearerr( stdin ); + buf[i] = 0; if( sizep ) *sizep = i; return buf; } } else { - if( !resize_buffer( &buf, &bufsz, i + 2 ) ) - { if( sizep ) *sizep = 0; return 0; } buf[i++] = c; if( !c ) set_binary(); if( c != '\n' ) continue; buf[i] = 0; if( sizep ) *sizep = i; return buf; @@ -167,7 +167,7 @@ /* Read a line of text from a stream. - Return pointer to buffer and line size (uncluding trailing newline + Return pointer to buffer and line size (including trailing newline if it exists and is not added now) */ static const char * read_stream_line( FILE * const fp, int * const sizep, bool * const newline_added_nowp ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/main.c new/ed-1.8/main.c --- old/ed-1.6/main.c 2012-01-01 16:50:32.000000000 +0100 +++ new/ed-1.8/main.c 2013-02-09 00:29:00.000000000 +0100 @@ -1,5 +1,5 @@ /* GNU ed - The GNU line editor. - Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -26,7 +26,7 @@ * * This program is based on the editor algorithm described in * Brian W. Kernighan and P. J. Plauger's book "Software Tools - * in Pascal," Addison-Wesley, 1981. + * in Pascal", Addison-Wesley, 1981. * * The buffering algorithm is attributed to Rodney Ruddock of * the University of Guelph, Guelph, Ontario. @@ -45,7 +45,7 @@ static const char * const Program_name = "GNU Ed"; static const char * const program_name = "ed"; -static const char * const program_year = "2012"; +static const char * const program_year = "2013"; static const char * invocation_name = 0; static bool restricted_ = false; /* if set, run in restricted mode */ @@ -71,8 +71,8 @@ " -r, --restricted run in restricted mode\n" " -s, --quiet, --silent suppress diagnostics\n" " -v, --verbose be verbose\n" - "Start edit by reading in `file' if given.\n" - "If `file' begins with a `!', read output of shell command.\n" + "Start edit by reading in 'file' if given.\n" + "If 'file' begins with a '!', read output of shell command.\n" "\nReport bugs to <bug-ed(a)gnu.org>.\n" "Ed home page: http://www.gnu.org/software/ed/ed.html\n" "General help using GNU software: http://www.gnu.org/gethelp\n" ); @@ -109,8 +109,9 @@ if( errcode > 0 ) fprintf( stderr, ": %s", strerror( errcode ) ); fprintf( stderr, "\n" ); } - if( help && invocation_name && invocation_name[0] ) - fprintf( stderr, "Try `%s --help' for more information.\n", invocation_name ); + if( help ) + fprintf( stderr, "Try '%s --help' for more information.\n", + invocation_name ); } @@ -152,12 +153,12 @@ { 0 , 0, ap_no } }; struct Arg_parser parser; + invocation_name = argv[0]; if( !ap_init( &parser, argc, argv, options, 0 ) ) { show_error( "Memory exhausted.", 0, false ); return 1; } if( ap_error( &parser ) ) /* bad option */ { show_error( ap_error( &parser ), 0, true ); return 1; } - invocation_name = argv[0]; for( argind = 0; argind < ap_arguments( &parser ); ++argind ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/main_loop.c new/ed-1.8/main_loop.c --- old/ed-1.6/main_loop.c 2012-01-01 16:50:32.000000000 +0100 +++ new/ed-1.8/main_loop.c 2013-02-09 00:22:56.000000000 +0100 @@ -1,6 +1,6 @@ /* GNU ed - The GNU line editor. Copyright (C) 1993, 1994 Andrew Moore, Talke Studio - Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -198,7 +198,7 @@ { const char * const s = *ibufpp = skip_blanks( *ibufpp ); int addr = current_addr(); - bool first = true; + bool first = true; /* true == addr, false == offset */ while( true ) { @@ -644,7 +644,7 @@ if( !interactive ) { if( traditional() && !strcmp( *ibufpp, "\n" ) ) - cmd = "p\n"; /* null cmd_list == `p' */ + cmd = "p\n"; /* null cmd_list == 'p' */ else { if( !get_extended_line( ibufpp, 0, false ) ) return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/regex.c new/ed-1.8/regex.c --- old/ed-1.6/regex.c 2012-01-01 16:50:32.000000000 +0100 +++ new/ed-1.8/regex.c 2013-02-09 00:22:56.000000000 +0100 @@ -1,7 +1,7 @@ /* regex.c: regular expression interface routines for the ed line editor. */ /* GNU ed - The GNU line editor. Copyright (C) 1993, 1994 Andrew Moore, Talke Studio - Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/signal.c new/ed-1.8/signal.c --- old/ed-1.6/signal.c 2012-01-01 16:50:32.000000000 +0100 +++ new/ed-1.8/signal.c 2013-02-09 00:22:56.000000000 +0100 @@ -1,7 +1,7 @@ /* signal.c: signal and miscellaneous routines for the ed line editor. */ /* GNU ed - The GNU line editor. Copyright (C) 1993, 1994 Andrew Moore, Talke Studio - Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -42,7 +42,7 @@ static void sighup_handler( int signum ) { - signum = 0; /* keep compiler happy */ + if( signum ) {} /* keep compiler happy */ if( mutex ) sighup_pending = true; else { @@ -56,14 +56,14 @@ const int need_slash = ( ( !len || s[len-1] != '/' ) ? 1 : 0 ); char * const hup = ( ( len + need_slash + (int)sizeof hb < path_max( 0 ) ) ? (char *) malloc( len + need_slash + sizeof hb ) : 0 ); - if( len && hup ) /* hup filename */ + if( len && hup ) /* hup filename */ { memcpy( hup, s, len ); if( need_slash ) hup[len] = '/'; memcpy( hup + len + need_slash, hb, sizeof hb ); if( write_file( hup, "w", 1, last_addr() ) >= 0 ) exit( 0 ); } - exit( 1 ); /* hup file write failed */ + exit( 1 ); /* hup file write failed */ } exit( 0 ); } @@ -88,7 +88,7 @@ static void sigwinch_handler( int signum ) { #ifdef TIOCGWINSZ - struct winsize ws; /* window size structure */ + struct winsize ws; /* window size structure */ if( ioctl( 0, TIOCGWINSZ, (char *) &ws ) >= 0 ) { @@ -97,7 +97,7 @@ if( ws.ws_col > 8 && ws.ws_col < 1800 ) window_columns_ = ws.ws_col - 8; } #endif - signum = 0; /* keep compiler happy */ + if( signum ) {} /* keep compiler happy */ } @@ -172,7 +172,7 @@ } -/* assure at least a minimum size for buffer `buf' */ +/* assure at least a minimum size for buffer 'buf' */ bool resize_buffer( char ** const buf, int * const size, const int min_size ) { if( *size < min_size ) @@ -197,7 +197,7 @@ } -/* assure at least a minimum size for buffer `buf' */ +/* assure at least a minimum size for buffer 'buf' */ bool resize_line_buffer( const line_t *** const buf, int * const size, const int min_size ) { @@ -223,7 +223,7 @@ } -/* assure at least a minimum size for buffer `buf' */ +/* assure at least a minimum size for buffer 'buf' */ bool resize_undo_buffer( undo_t ** const buf, int * const size, const int min_size ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.6/testsuite/check.sh new/ed-1.8/testsuite/check.sh --- old/ed-1.6/testsuite/check.sh 2012-01-01 16:50:32.000000000 +0100 +++ new/ed-1.8/testsuite/check.sh 2013-02-09 00:22:57.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # check script for GNU ed - The GNU line editor -# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 # Free Software Foundation, Inc. # # This script is free software; you have unlimited permission @@ -54,11 +54,14 @@ done +cd "${objdir}"/tmp +fail=0 + +printf "testing ed-%s...\n" "$2" + # Run the .ed and .red scripts just generated # and compare their output against the .r and .pr files, which contain # the correct output. -printf "testing ed-%s...\n" "$2" -cd "${objdir}"/tmp # Run the *.red scripts first, since these don't generate output; # they exit with non-zero status @@ -99,9 +102,12 @@ done > scripts.ck 2>&1 grep '\*\*\*' *.ck | sed 's/^[^*]*//' -if grep '\*\*\*' *.ck > /dev/null ; then - exit 127 -else +grep '\*\*\*' *.ck > /dev/null && fail=127 + +if [ ${fail} = 0 ] ; then echo "tests completed successfully." cd "${objdir}" && rm -r tmp +else + echo "tests failed." fi +exit ${fail} ++++++ ed.keyring ++++++ pub 1024D/132D7742 2003-09-17 uid Antonio Diaz <ant_diaz(a)teleline.es> sub 1024g/754578DA 2003-09-17 -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.19 (GNU/Linux) mQGiBD9odIARBADkRI3Qc2qWpoxOFBlD8L5JaQlIEAaPI/19Y/z4ORHESY6s2Tfm EtC51vlu8V/hXX8Sh4OZC3CrBIwhvSyIVIXbas+GR09B+8GRsfekRUS7jiwz/FsZ Rnb0AjV1zNjJZazjyOUQjBou3Mo1MwiQXzeMQzqLC1xW+ABkAbQnAnZZIwCgvquq rmQ1LKpBpYhb876T8x9TZIcD/2KTMvrvJVj+tKiRp6Wfiib8B4unllXAQ04hlul2 FP5oVIETdhQjsxj7/8F8yOONGgnL5Vn1+6sldd0LQ9il4MiZ36VFOec2xAeyYoB1 D3hup/zUTjzljj+JyKyGXahrwm0941QhYr+Kw/99dvE0pB8CsaQ5/e5R70uv7YnD ZT9xA/wO4acdvGCLDw5ZPVKZW1rcgGL1Pr2nWCc92hv4SxdSWu3FU8aeGOVwJa2q I/CwiEk2oEXI/WwTEf9mde3qlsc1SkRKgR0DDj+7Az5MUcilCUDv2BG2mLa+dEus zwqLDPmjo2AWP1L2UIx7c46U9suvcGBwsI7NSnD9PLrvrUVGYrQjQW50b25pbyBE aWF6IDxhbnRfZGlhekB0ZWxlbGluZS5lcz6IYQQTEQIAGQUCP2h0gAQLBwMCAxUC AwMWAgECHgECF4AAEgkQj+mVAxMtd0IHZUdQRwABASgPAJ9FP48ts9GETKX1Kc6m P6trpaMZdACfTNqHKHiG5qaFqp1dT93+iM4KMgu5AQ0EP2h0khAEALs2v8E4IE6i 8W0gCcW59yUGJRnWMLyS81MLSLy+lquHRaujJEI1/Ni6NzgfrMtt7/2E+F7FJNHw YPSrebYzEacAOlvCEcWuwwr5OmT929ru3CU9abC3hk6X7CyZdEb13qINd2BV9OG5 djTT2VjpNFQeU9YIJ7jOSOxFXRKr2rLTAAMFBACHcUXAcqrYz2p+7KTGWEykO3YJ t6LCch4yk4fBehVwbxqF/GVpPUn1GcoiTMwn0pK57Kpa+MasN9YCagVteBD+u/za qYQzArCaDvmTOS16VWUUyJypfU3UpPVO1x7RQDG7F3VWL9J8zMkttzSzh8cN1+dV kft+Cr5Iz0XQMdyqe4hOBBgRAgAGBQI/aHSSABIJEI/plQMTLXdCB2VHUEcAAQFo dgCfVuhwTHwY3KREb9EF7ahy2MUQWU0AoIwi6s8g7NijbSwECruQhH3Hyq/B =1P0w -----END PGP PUBLIC KEY BLOCK-----

1 0

commit dmidecode for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package dmidecode for openSUSE:Factory checked in at 2013-04-26 19:20:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dmidecode (Old) and /work/SRC/openSUSE:Factory/.dmidecode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dmidecode", Maintainer is "JDelvare(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/dmidecode/dmidecode.changes 2013-04-26 12:37:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dmidecode.new/dmidecode.changes 2013-04-26 19:20:27.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 26 12:37:12 UTC 2013 - guillaume(a)opensuse.org + +- Enable build for ARM + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmidecode.spec ++++++ --- /var/tmp/diff_new_pack.JwmwYt/_old 2013-04-26 19:20:29.000000000 +0200 +++ /var/tmp/diff_new_pack.JwmwYt/_new 2013-04-26 19:20:29.000000000 +0200 @@ -28,7 +28,7 @@ Patch1: dmidecode-1.173-drop-cast.patch Patch2: dmidecode-1.175-fix-SMBIOS-2.8.0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 ia64 x86_64 +ExclusiveArch: %ix86 ia64 x86_64 %arm aarch64 Obsoletes: pmtools < 20071117 %description @@ -57,7 +57,7 @@ install -dm 755 %{buildroot}/usr/sbin install -dm 755 %{buildroot}%{_mandir}/man8 install -dm 755 %{buildroot}%{_docdir}/%{name} -%ifarch ia64 +%ifarch ia64 %arm aarch64 for i in dmidecode ; do %else for i in dmidecode vpddecode ownership biosdecode ; do -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zeitgeist for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package zeitgeist for openSUSE:Factory checked in at 2013-04-26 15:54:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zeitgeist (Old) and /work/SRC/openSUSE:Factory/.zeitgeist.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zeitgeist", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/zeitgeist/zeitgeist.changes 2013-04-14 16:13:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zeitgeist.new/zeitgeist.changes 2013-04-26 15:54:19.000000000 +0200 @@ -1,0 +2,12 @@ +Sat Apr 13 18:48:31 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 0.9.12: + + Libzeitgeist: + - Fix find_related_uris to only print out the ranking if + EXPLAIN_QUERIES is enabled. + - Fixed find_related_uris to take RelevantResultType as an + argument instead of ResultType. + - Pass copy of templates to search and search_with_relevancies. + + Overall: Fixed documentation. + +------------------------------------------------------------------- Old: ---- zeitgeist-0.9.11.tar.xz New: ---- zeitgeist-0.9.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zeitgeist.spec ++++++ --- /var/tmp/diff_new_pack.a6WvCl/_old 2013-04-26 15:54:21.000000000 +0200 +++ /var/tmp/diff_new_pack.a6WvCl/_new 2013-04-26 15:54:21.000000000 +0200 @@ -18,7 +18,7 @@ Name: zeitgeist -Version: 0.9.11 +Version: 0.9.12 Release: 0 Summary: Zeitgeist Engine License: LGPL-2.1+ and GPL-2.0+ ++++++ zeitgeist-0.9.11.tar.xz -> zeitgeist-0.9.12.tar.xz ++++++ ++++ 35082 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit webkitgtk for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package webkitgtk for openSUSE:Factory checked in at 2013-04-26 15:54:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webkitgtk (Old) and /work/SRC/openSUSE:Factory/.webkitgtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "webkitgtk", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/webkitgtk/webkitgtk.changes 2013-04-05 09:35:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.webkitgtk.new/webkitgtk.changes 2013-04-26 15:54:07.000000000 +0200 @@ -1,0 +2,24 @@ +Thu Apr 25 07:35:14 UTC 2013 - dimstar(a)opensuse.org + +- Rename %{_datadir}/gtk-doc/html/webkitgtk to + %{_datadir}/gtk-doc/html/%{name}: on webkitgtk (for GTK2), this + means no change, but the gtk-doc for webkigtk (for GTK3) will be + renamed to %{_datadir}/gtk-doc/html/webkitgtk3: this allows to + parallel install libwebkitgtk-devel and libwebkitgtk3-devel + without conflicts. + +------------------------------------------------------------------- +Wed Apr 17 08:51:56 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 2.0.1: + + Fix a crash in Web Process when the UI process finishes too + early. + + Fix load notification of main resource when loaded from the + memory cache. + + Fix GObject DOM generation to make sure the right GType is + used for every wrapped object. + + Fix the build with non-bash shells. + + Fix WebKit1 build in windows. + + Updated translations. + +------------------------------------------------------------------- webkitgtk3.changes: same change Old: ---- webkitgtk-2.0.0.tar.xz New: ---- webkitgtk-2.0.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webkitgtk.spec ++++++ --- /var/tmp/diff_new_pack.KyWWTx/_old 2013-04-26 15:54:10.000000000 +0200 +++ /var/tmp/diff_new_pack.KyWWTx/_new 2013-04-26 15:54:10.000000000 +0200 @@ -46,7 +46,7 @@ Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0+ and BSD-3-Clause Group: Development/Libraries/C and C++ -Version: 2.0.0 +Version: 2.0.1 Release: 0 # FIXME: at some point, figure out a way to remove the hack where we use -g0 to have successful builds # FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and gtk3 versions @@ -335,6 +335,10 @@ %makeinstall %find_lang WebKitGTK-%{_gtkver} %{no_lang_C} find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print +# for webkitgtk3, we rename %{_datadir}/gtk-doc/html/webkitgtk to %{_datadir}/gtk-doc/html/webkitgtk3 +%if %{build_for_gtk3} +mv %{buildroot}%{_datadir}/gtk-doc/html/webkitgtk %{buildroot}%{_datadir}/gtk-doc/html/%{name} +%endif %post -n libwebkitgtk%{_sover} -p /sbin/ldconfig @@ -394,8 +398,7 @@ %files -n libwebkitgtk%{?_develnamever}-devel %defattr(-,root,root) -# FIXME: this is wrong: libwebkitgtk-devel and libwebkitgtk3-devel will conflict on the gtk-doc files -%doc %{_datadir}/gtk-doc/html/webkitgtk/ +%doc %{_datadir}/gtk-doc/html/%{name}/ %{_libdir}/libjavascriptcoregtk-%{_sonamever}.so %{_libdir}/libwebkitgtk-%{_sonamever}.so %{_libdir}/pkgconfig/javascriptcoregtk-%{_sonamever}.pc ++++++ webkitgtk3.spec ++++++ --- /var/tmp/diff_new_pack.KyWWTx/_old 2013-04-26 15:54:10.000000000 +0200 +++ /var/tmp/diff_new_pack.KyWWTx/_new 2013-04-26 15:54:10.000000000 +0200 @@ -46,7 +46,7 @@ Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0+ and BSD-3-Clause Group: Development/Libraries/C and C++ -Version: 2.0.0 +Version: 2.0.1 Release: 0 # FIXME: at some point, figure out a way to remove the hack where we use -g0 to have successful builds # FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and gtk3 versions @@ -335,6 +335,10 @@ %makeinstall %find_lang WebKitGTK-%{_gtkver} %{no_lang_C} find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print +# for webkitgtk3, we rename %{_datadir}/gtk-doc/html/webkitgtk to %{_datadir}/gtk-doc/html/webkitgtk3 +%if %{build_for_gtk3} +mv %{buildroot}%{_datadir}/gtk-doc/html/webkitgtk %{buildroot}%{_datadir}/gtk-doc/html/%{name} +%endif %post -n libwebkitgtk%{_sover} -p /sbin/ldconfig @@ -394,8 +398,7 @@ %files -n libwebkitgtk%{?_develnamever}-devel %defattr(-,root,root) -# FIXME: this is wrong: libwebkitgtk-devel and libwebkitgtk3-devel will conflict on the gtk-doc files -%doc %{_datadir}/gtk-doc/html/webkitgtk/ +%doc %{_datadir}/gtk-doc/html/%{name}/ %{_libdir}/libjavascriptcoregtk-%{_sonamever}.so %{_libdir}/libwebkitgtk-%{_sonamever}.so %{_libdir}/pkgconfig/javascriptcoregtk-%{_sonamever}.pc ++++++ webkitgtk-2.0.0.tar.xz -> webkitgtk-2.0.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/webkitgtk/webkitgtk-2.0.0.tar.xz /work/SRC/openSUSE:Factory/.webkitgtk.new/webkitgtk-2.0.1.tar.xz differ: char 26, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vte for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package vte for openSUSE:Factory checked in at 2013-04-26 15:53:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vte (Old) and /work/SRC/openSUSE:Factory/.vte.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vte", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/vte/vte.changes 2013-04-03 13:06:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vte.new/vte.changes 2013-04-26 15:53:59.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 15 17:58:20 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 0.34.4: + + Improved vte.sh script (bgo#697225). + +------------------------------------------------------------------- Old: ---- vte-0.34.3.tar.xz New: ---- vte-0.34.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vte.spec ++++++ --- /var/tmp/diff_new_pack.opfAkt/_old 2013-04-26 15:54:00.000000000 +0200 +++ /var/tmp/diff_new_pack.opfAkt/_new 2013-04-26 15:54:00.000000000 +0200 @@ -24,7 +24,7 @@ Name: vte %define _name vte Url: http://www.gnome.org -Version: 0.34.3 +Version: 0.34.4 Release: 0 Summary: Terminal Emulator Library License: LGPL-2.0 and GPL-2.0+ ++++++ vte-0.34.3.tar.xz -> vte-0.34.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vte-0.34.3/ChangeLog new/vte-0.34.4/ChangeLog --- old/vte-0.34.3/ChangeLog 2013-03-25 21:07:48.000000000 +0100 +++ new/vte-0.34.4/ChangeLog 2013-04-15 18:12:51.000000000 +0200 @@ -1,3 +1,45 @@ +commit bd4f09b0262a247c3af2c3f6c3befc2b17b3f1aa +Author: Christian Persch <chpe(a)gnome.org> +Date: Mon Apr 15 18:12:08 2013 +0200 + + vte.sh: Fix distcheck + + src/test-vte-sh.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3a88aae49c03d423bb1e4c589c2fb8cde676e895 +Author: Christian Persch <chpe(a)gnome.org> +Date: Mon Apr 15 18:04:38 2013 +0200 + + Version 0.34.4 + + NEWS | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 7045b26c47008e27742bf3b3dc4b1f127553fbb5 +Author: Christian Persch <chpe(a)gnome.org> +Date: Sat Apr 13 19:49:28 2013 +0200 + + vte.sh: Improve vte.sh script and add testcase + + Improved vte.sh script by Peter De Wachter. + + Add a test that checks the urlencoding is done right. + + src/Makefile.am | 5 +++- + src/test-vte-sh.sh | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/vte.sh | 26 +++++++++---------- + 3 files changed, 90 insertions(+), 15 deletions(-) + +commit 425246f2f683b6f41b479867c298f08eab73f857 +Author: Christian Persch <chpe(a)gnome.org> +Date: Mon Mar 25 21:08:04 2013 +0100 + + Post release version bump + + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit b8ea15489cb31079d235b34235db44d7d4c1eb9c Author: Christian Persch <chpe(a)gnome.org> Date: Mon Mar 25 21:07:32 2013 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vte-0.34.3/NEWS new/vte-0.34.4/NEWS --- old/vte-0.34.3/NEWS 2013-03-25 21:03:47.000000000 +0100 +++ new/vte-0.34.4/NEWS 2013-04-15 18:04:32.000000000 +0200 @@ -1,3 +1,7 @@ +0.34.4 +====== +- Improved vte.sh script (#697225) + 0.34.3 ====== - Introspection fixes (#676999, #690003) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vte-0.34.3/configure new/vte-0.34.4/configure --- old/vte-0.34.3/configure 2013-03-25 21:04:10.000000000 +0100 +++ new/vte-0.34.4/configure 2013-04-15 18:04:52.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for vte 0.34.3. +# Generated by GNU Autoconf 2.68 for vte 0.34.4. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=vte>. # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='vte' PACKAGE_TARNAME='vte' -PACKAGE_VERSION='0.34.3' -PACKAGE_STRING='vte 0.34.3' +PACKAGE_VERSION='0.34.4' +PACKAGE_STRING='vte 0.34.4' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=vte' PACKAGE_URL='' @@ -1439,7 +1439,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 vte 0.34.3 to adapt to many kinds of systems. +\`configure' configures vte 0.34.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1509,7 +1509,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of vte 0.34.3:";; + short | recursive ) echo "Configuration of vte 0.34.4:";; esac cat <<\_ACEOF @@ -1643,7 +1643,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -vte configure 0.34.3 +vte configure 0.34.4 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2112,7 +2112,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by vte $as_me 0.34.3, which was +It was created by vte $as_me 0.34.4, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2932,7 +2932,7 @@ # Define the identity of the package. PACKAGE='vte' - VERSION='0.34.3' + VERSION='0.34.4' cat >>confdefs.h <<_ACEOF @@ -3048,7 +3048,7 @@ -LT_VERSION_INFO="3409:3:3400" +LT_VERSION_INFO="3409:4:3400" ################################################################################ @@ -15116,7 +15116,7 @@ VTE_MINOR_VERSION=34 -VTE_MICRO_VERSION=3 +VTE_MICRO_VERSION=4 AM_CPPFLAGS="$AM_CPPFLAGS -DGLIB_DISABLE_DEPRECATION_WARNINGS" @@ -15714,7 +15714,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by vte $as_me 0.34.3, which was +This file was extended by vte $as_me 0.34.4, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15780,7 +15780,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -vte config.status 0.34.3 +vte config.status 0.34.4 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vte-0.34.3/configure.in new/vte-0.34.4/configure.in --- old/vte-0.34.3/configure.in 2013-02-23 22:57:12.000000000 +0100 +++ new/vte-0.34.4/configure.in 2013-04-14 01:08:49.000000000 +0200 @@ -1,6 +1,6 @@ m4_define([version_major],0) m4_define([version_minor],34) -m4_define([version_micro],3) +m4_define([version_micro],4) m4_define([version_triplet],version_major.version_minor.version_micro) m4_define([so_major_adjust],9) dnl Don't change! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vte-0.34.3/doc/reference/html/index.html new/vte-0.34.4/doc/reference/html/index.html --- old/vte-0.34.3/doc/reference/html/index.html 2013-03-25 21:07:50.000000000 +0100 +++ new/vte-0.34.4/doc/reference/html/index.html 2013-04-15 18:12:53.000000000 +0200 @@ -15,14 +15,14 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">VTE Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - Documentation for VTE version 0.34.3 + Documentation for VTE version 0.34.4 . The latest version of this documentation can be found on-line at the <a class="ulink" href="http://library.gnome.org/devel/vte/" target="_top">GNOME Library</a>. </p></div> <div><p class="copyright">Copyright © 2009, 2010 Christian Persch</p></div> <div><div class="legalnotice"> -<a name="idp4779728"></a><p> +<a name="idp639208"></a><p> Permission is granted to copy, distribute and/or modify this document under the terms of the <em class="citetitle">GNU Lesser General Public Licence</em>, Version 2.1 or (at your option) any later version published by the Free Software Foundation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vte-0.34.3/doc/reference/html/pt01.html new/vte-0.34.4/doc/reference/html/pt01.html --- old/vte-0.34.3/doc/reference/html/pt01.html 2013-03-25 21:07:50.000000000 +0100 +++ new/vte-0.34.4/doc/reference/html/pt01.html 2013-04-15 18:12:53.000000000 +0200 @@ -21,7 +21,7 @@ </tr></table> <div class="part"> <div class="titlepage"><div><div><h1 class="title"> -<a name="idp6957232"></a>Part I. API Reference</h1></div></div></div> +<a name="idp642264"></a>Part I. API Reference</h1></div></div></div> <div class="toc"> <p><b>Table of Contents</b></p> <dl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vte-0.34.3/doc/reference/html/vte-Version-Information.html new/vte-0.34.4/doc/reference/html/vte-Version-Information.html --- old/vte-0.34.3/doc/reference/html/vte-Version-Information.html 2013-03-25 21:07:50.000000000 +0100 +++ new/vte-0.34.4/doc/reference/html/vte-Version-Information.html 2013-04-15 18:12:53.000000000 +0200 @@ -78,7 +78,7 @@ <hr> <div class="refsect2"> <a name="VTE-MICRO-VERSION:CAPS"></a><h3>VTE_MICRO_VERSION</h3> -<pre class="programlisting">#define VTE_MICRO_VERSION (3) +<pre class="programlisting">#define VTE_MICRO_VERSION (4) </pre> <p> The micro version number of the VTE library diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vte-0.34.3/doc/reference/version.xml new/vte-0.34.4/doc/reference/version.xml --- old/vte-0.34.3/doc/reference/version.xml 2013-03-25 21:04:24.000000000 +0100 +++ new/vte-0.34.4/doc/reference/version.xml 2013-04-15 18:05:09.000000000 +0200 @@ -1 +1 @@ -0.34.3 +0.34.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vte-0.34.3/src/Makefile.am new/vte-0.34.4/src/Makefile.am --- old/vte-0.34.3/src/Makefile.am 2013-02-23 22:57:13.000000000 +0100 +++ new/vte-0.34.4/src/Makefile.am 2013-04-14 01:08:49.000000000 +0200 @@ -201,7 +201,10 @@ noinst_SCRIPTS = decset osc window EXTRA_DIST += $(noinst_SCRIPTS) -TEST_SH = check-doc-syntax.sh +TEST_SH = \ + check-doc-syntax.sh \ + test-vte-sh.sh \ + $(NULL) EXTRA_DIST += $(TEST_SH) check_PROGRAMS = dumpkeys iso2022 reaper reflect-text-view reflect-vte mev ssfe table trie xticker vteconv vtetc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vte-0.34.3/src/Makefile.in new/vte-0.34.4/src/Makefile.in --- old/vte-0.34.3/src/Makefile.in 2013-03-25 21:04:12.000000000 +0100 +++ new/vte-0.34.4/src/Makefile.in 2013-04-15 18:04:53.000000000 +0200 @@ -63,7 +63,7 @@ reflect-text-view$(EXEEXT) reflect-vte$(EXEEXT) mev$(EXEEXT) \ ssfe$(EXEEXT) table$(EXEEXT) trie$(EXEEXT) xticker$(EXEEXT) \ vteconv$(EXEEXT) vtetc$(EXEEXT) -TESTS = table$(EXEEXT) trie$(EXEEXT) $(TEST_SH) +TESTS = table$(EXEEXT) trie$(EXEEXT) $(am__EXEEXT_1) subdir = src DIST_COMMON = $(dist_profile_DATA) $(header_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ @@ -298,6 +298,7 @@ CTAGS = ctags am__tty_colors = \ red=; grn=; lgn=; blu=; std= +am__EXEEXT_1 = check-doc-syntax.sh test-vte-sh.sh DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -633,7 +634,11 @@ @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0 @HAVE_INTROSPECTION_TRUE@nodist_typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) noinst_SCRIPTS = decset osc window -TEST_SH = check-doc-syntax.sh +TEST_SH = \ + check-doc-syntax.sh \ + test-vte-sh.sh \ + $(NULL) + LDADD = $(GLIB_LIBS) reflect_text_view_CPPFLAGS = -DUSE_TEXT_VIEW reflect_text_view_CFLAGS = $(VTE_CFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vte-0.34.3/src/test-vte-sh.sh new/vte-0.34.4/src/test-vte-sh.sh --- old/vte-0.34.3/src/test-vte-sh.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/vte-0.34.4/src/test-vte-sh.sh 2013-04-15 18:12:03.000000000 +0200 @@ -0,0 +1,74 @@ +#!/bin/sh +# Copyright © 2013 Christian Persch +# +# 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. + +set -e + +source $srcdir/vte.sh + +check_urlencode() ( + input=$(echo -ne "$1") + encoded=$(__vte_urlencode "$input") + if test "$encoded" != "$2"; then + echo "FAILED:" + echo "Input : \"$input\"" + echo "Output : \"$encoded\"" + echo "Expected: \"$2\"" + exit 1 + fi +) + +# raw bytes + +check_urlencode "\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017" \ + "%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F" +check_urlencode "\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" \ + "%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F" +check_urlencode "\040\041\042\043\044\045\046\047\050\051\052\053\054\055\056\057" \ + "%20!%22%23%24%25%26'()%2A%2B%2C-./" +check_urlencode "\060\061\062\063\064\065\066\067\070\071\072\073\074\075\076\077" \ + "0123456789:%3B%3C%3D%3E%3F" +check_urlencode "\0100\0101\0102\0103\0104\0105\0106\0107\0110\0111\0112\0113\0114\0115\0116\0117" \ + "%40ABCDEFGHIJKLMNO" +check_urlencode "\0120\0121\0122\0123\0124\0125\0126\0127\0130\0131\0132\0133\0134\0135\0136\0137" \ + "PQRSTUVWXYZ%5B%5C%5D%5E_" +check_urlencode "\0140\0141\0142\0143\0144\0145\0146\0147\0150\0151\0152\0153\0154\0155\0156\0157" \ + "%60abcdefghijklmno" +check_urlencode "\0160\0161\0162\0163\0164\0165\0166\0167\0170\0171\0172\0173\0174\0175\0176\0177" \ + "pqrstuvwxyz%7B%7C%7D~%7F" +check_urlencode "\0200\0201\0202\0203\0204\0205\0206\0207\0210\0211\0212\0213\0214\0215\0216\0217" \ + "%80%81%82%83%84%85%86%87%88%89%8A%8B%8C%8D%8E%8F" +check_urlencode "\0220\0221\0222\0223\0224\0225\0226\0227\0230\0231\0232\0233\0234\0235\0236\0237" \ + "%90%91%92%93%94%95%96%97%98%99%9A%9B%9C%9D%9E%9F" +check_urlencode "\0240\0241\0242\0243\0244\0245\0246\0247\0250\0251\0252\0253\0254\0255\0256\0257" \ + "%A0%A1%A2%A3%A4%A5%A6%A7%A8%A9%AA%AB%AC%AD%AE%AF" +check_urlencode "\0260\0261\0262\0263\0264\0265\0266\0267\0270\0271\0272\0273\0274\0275\0276\0277" \ + "%B0%B1%B2%B3%B4%B5%B6%B7%B8%B9%BA%BB%BC%BD%BE%BF" +check_urlencode "\0300\0301\0302\0303\0304\0305\0306\0307\0310\0311\0312\0313\0314\0315\0316\0317" \ + "%C0%C1%C2%C3%C4%C5%C6%C7%C8%C9%CA%CB%CC%CD%CE%CF" +check_urlencode "\0320\0321\0322\0323\0324\0325\0326\0327\0330\0331\0332\0333\0334\0335\0336\0337" \ + "%D0%D1%D2%D3%D4%D5%D6%D7%D8%D9%DA%DB%DC%DD%DE%DF" +check_urlencode "\0340\0341\0342\0343\0344\0345\0346\0347\0350\0351\0352\0353\0354\0355\0356\0357" \ + "%E0%E1%E2%E3%E4%E5%E6%E7%E8%E9%EA%EB%EC%ED%EE%EF" +check_urlencode "\0360\0361\0362\0363\0364\0365\0366\0367\0370\0371\0372\0373\0374\0375\0376\0377" \ + "%F0%F1%F2%F3%F4%F5%F6%F7%F8%F9%FA%FB%FC%FD%FE%FF" + +# UTF-8 + +check_urlencode "ẞ" "%E1%BA%9E" + +# all tests pass! +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vte-0.34.3/src/vte.sh new/vte-0.34.4/src/vte.sh --- old/vte-0.34.3/src/vte.sh 2013-02-23 22:57:13.000000000 +0100 +++ new/vte-0.34.4/src/vte.sh 2013-04-14 01:08:37.000000000 +0200 @@ -1,9 +1,9 @@ -#!/bin/bash +#!/bin/sh # Copyright © 2006 Shaun McCance <shaunm(a)gnome.org> -# +# Copyright © 2013 Peter De Wachter <pdewacht(a)gmail.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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -19,22 +19,20 @@ # This is important to make sure string manipulation is handled # byte-by-byte. LANG=C - arg="$1" - i="0" - while [ "$i" -lt ${#arg} ]; do - c=${arg:$i:1} - if echo "$c" | grep -q '[a-zA-Z/:_\.\-]'; then - echo -n "$c" - else - echo -n "%" - printf "%X" "'$c'" + str="$1" + while [ -n "$str" ]; do + safe="${str%%[!a-zA-Z0-9/:_\.\-\!\'~]*}" + printf "%s" "$safe" + str="${str#"$safe"}" + if [ -n "$str" ]; then + printf "%%%02X" "'$str" + str="${str#?}" fi - i=$((i+1)) done ) __vte_ps1() { - printf "\e]7;file://%s" $HOSTNAME + printf "\033]7;file://%s" ${HOSTNAME:-$(hostname)} __vte_urlencode "$PWD" printf "\a" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vte-0.34.3/src/vteversion.h new/vte-0.34.4/src/vteversion.h --- old/vte-0.34.3/src/vteversion.h 2013-03-25 21:04:24.000000000 +0100 +++ new/vte-0.34.4/src/vteversion.h 2013-04-15 18:05:09.000000000 +0200 @@ -60,7 +60,7 @@ * * Since: 0.16.15 */ -#define VTE_MICRO_VERSION (3) +#define VTE_MICRO_VERSION (4) /** * VTE_CHECK_VERSION: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vino for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package vino for openSUSE:Factory checked in at 2013-04-26 15:53:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vino (Old) and /work/SRC/openSUSE:Factory/.vino.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vino", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/vino/vino.changes 2013-04-02 20:45:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vino.new/vino.changes 2013-04-26 15:53:53.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 15 20:33:22 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 3.8.1: + + Fixed syntax in translation of Keywords string. + + Back out "authentication-method" setting change. + + Updated translations. + +------------------------------------------------------------------- Old: ---- vino-3.8.0.tar.xz New: ---- vino-3.8.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vino.spec ++++++ --- /var/tmp/diff_new_pack.rUpKLv/_old 2013-04-26 15:53:55.000000000 +0200 +++ /var/tmp/diff_new_pack.rUpKLv/_new 2013-04-26 15:53:55.000000000 +0200 @@ -17,7 +17,7 @@ Name: vino -Version: 3.8.0 +Version: 3.8.1 Release: 0 Summary: GNOME VNC Server License: GPL-2.0+ ++++++ vino-3.8.0.tar.xz -> vino-3.8.1.tar.xz ++++++ ++++ 3358 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vinagre for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package vinagre for openSUSE:Factory checked in at 2013-04-26 15:53:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vinagre (Old) and /work/SRC/openSUSE:Factory/.vinagre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vinagre", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/vinagre/vinagre.changes 2013-04-02 20:45:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vinagre.new/vinagre.changes 2013-04-26 15:53:45.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 15 20:33:11 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 3.8.1: + + Updated translations. + +------------------------------------------------------------------- Old: ---- vinagre-3.8.0.tar.xz New: ---- vinagre-3.8.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vinagre.spec ++++++ --- /var/tmp/diff_new_pack.Y9bhcg/_old 2013-04-26 15:53:46.000000000 +0200 +++ /var/tmp/diff_new_pack.Y9bhcg/_new 2013-04-26 15:53:46.000000000 +0200 @@ -20,7 +20,7 @@ Summary: VNC client for GNOME License: GPL-2.0+ Group: Productivity/Networking/Other -Version: 3.8.0 +Version: 3.8.1 Release: 0 Url: http://www.gnome.org/projects/vinagre/ Source0: http://download.gnome.org/sources/vinagre/3.8/%{name}-%{version}.tar.xz ++++++ vinagre-3.8.0.tar.xz -> vinagre-3.8.1.tar.xz ++++++ ++++ 3644 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit system-config-printer for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package system-config-printer for openSUSE:Factory checked in at 2013-04-26 15:53:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/system-config-printer (Old) and /work/SRC/openSUSE:Factory/.system-config-printer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "system-config-printer", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/system-config-printer/system-config-printer.changes 2013-02-12 12:55:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.system-config-printer.new/system-config-printer.changes 2013-04-26 15:53:39.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Apr 15 17:58:05 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 1.4.0: + + Support for firewalld. + + Use gi.repository throughout. + + Removed old bits (gtk_label_autowrap and gtkspinner). + + Some locking fixes. +- Drop system-config-printer-fix-name-of-udev-helper.patch: fixed + upstream. +- Rebase system-config-printer-no-openprinting.patch. +- Add gobject-introspection BuildRequires: needed to get automatic + typelib() requires. + +------------------------------------------------------------------- Old: ---- system-config-printer-1.3.12.tar.xz system-config-printer-fix-name-of-udev-helper.patch New: ---- system-config-printer-1.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ system-config-printer.spec ++++++ --- /var/tmp/diff_new_pack.BTBFKL/_old 2013-04-26 15:53:41.000000000 +0200 +++ /var/tmp/diff_new_pack.BTBFKL/_new 2013-04-26 15:53:41.000000000 +0200 @@ -17,19 +17,17 @@ Name: system-config-printer -Version: 1.3.12 +Version: 1.4.0 Release: 0 Summary: A printer administration tool License: GPL-2.0+ Group: Hardware/Printing Url: http://cyberelk.net/tim/software/system-config-printer/ -Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.t… +Source0: http://cyberelk.net/tim/data/system-config-printer/1.4/%{name}-%{version}.t… # PATCH-FIX-OPENSUSE system-config-printer-icon-brp-friendly.patch vuntz(a)novell.com -- brp checks don't like the printer icon name, so we have to use something else Patch13: system-config-printer-icon-brp-friendly.patch # PATCH-FIX-OPENSUSE system-config-printer-no-openprinting.patch bnc#733542 vuntz(a)opensuse.org -- Disable feature that downloads ppd from openprinting.org Patch19: system-config-printer-no-openprinting.patch -# PATCH-FIX-UPSTREAM system-config-printer-fix-name-of-udev-helper.patch coolo(a)suse.de -- the systemd service calls the wrong path for udev-configure-printer -Patch20: system-config-printer-fix-name-of-udev-helper.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: gnome-cups-manager <= 0.33 BuildRequires: cups-devel @@ -39,6 +37,8 @@ BuildRequires: fdupes BuildRequires: glib2-devel BuildRequires: gnome-icon-theme +# Needed for typelib() requires +BuildRequires: gobject-introspection # For directory ownership BuildRequires: hicolor-icon-theme BuildRequires: intltool @@ -47,7 +47,7 @@ BuildRequires: systemd BuildRequires: update-desktop-files BuildRequires: xmlto -BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(libudev) >= 172 BuildRequires: pkgconfig(libusb-1.0) Requires: %{name}-common = %{version} Requires: cups @@ -145,7 +145,6 @@ %setup -q %patch13 -p1 %patch19 -p1 -%patch20 -p1 %build %configure \ @@ -192,6 +191,7 @@ %defattr(-,root,root,-) %doc ChangeLog COPYING README %{_bindir}/%{name} +%{_bindir}/install-printerdriver %{_datadir}/applications/system-config-printer.desktop %{_mandir}/man1/system-config-printer.1%{?ext_man} ++++++ system-config-printer-1.3.12.tar.xz -> system-config-printer-1.4.0.tar.xz ++++++ ++++ 163120 lines of diff (skipped) ++++++ system-config-printer-no-openprinting.patch ++++++ --- /var/tmp/diff_new_pack.BTBFKL/_old 2013-04-26 15:53:42.000000000 +0200 +++ /var/tmp/diff_new_pack.BTBFKL/_new 2013-04-26 15:53:42.000000000 +0200 @@ -1,7 +1,7 @@ -Index: system-config-printer-1.3.8/cupshelpers/openprinting.py +Index: system-config-printer-1.4.0/cupshelpers/openprinting.py =================================================================== ---- system-config-printer-1.3.8.orig/cupshelpers/openprinting.py -+++ system-config-printer-1.3.8/cupshelpers/openprinting.py +--- system-config-printer-1.4.0.orig/cupshelpers/openprinting.py ++++ system-config-printer-1.4.0/cupshelpers/openprinting.py @@ -48,6 +48,11 @@ class _QueryThread (threading.Thread): def run (self): @@ -22,20 +22,20 @@ if self.callback != None: self.callback (status, self.user_data, self.result) -Index: system-config-printer-1.3.8/newprinter.py +Index: system-config-printer-1.4.0/newprinter.py =================================================================== ---- system-config-printer-1.3.8.orig/newprinter.py -+++ system-config-printer-1.3.8/newprinter.py -@@ -362,6 +362,8 @@ class NewPrinterGUI(GtkGUI): +--- system-config-printer-1.4.0.orig/newprinter.py ++++ system-config-printer-1.4.0/newprinter.py +@@ -424,6 +424,8 @@ class NewPrinterGUI(GtkGUI): # Set up OpenPrinting widgets. self.openprinting = cupshelpers.openprinting.OpenPrinting () self.openprinting_query_handle = None + ## Disabled on openSUSE, see discussion in https://bugzilla.novell.com/show_bug.cgi?id=733542 + self.rbtnNPDownloadableDriverSearch.hide() combobox = self.cmbNPDownloadableDriverFoundPrinters - cell = gtk.CellRendererText() + cell = Gtk.CellRendererText() combobox.pack_start (cell, True) -@@ -1248,6 +1250,7 @@ class NewPrinterGUI(GtkGUI): +@@ -1537,6 +1539,7 @@ class NewPrinterGUI(GtkGUI): self.btnNPBack.hide() self.btnNPForward.show() downloadable_selected = False @@ -43,7 +43,7 @@ if self.rbtnNPDownloadableDriverSearch.get_active (): combobox = self.cmbNPDownloadableDriverFoundPrinters iter = combobox.get_active_iter () -@@ -3340,6 +3343,8 @@ class NewPrinterGUI(GtkGUI): +@@ -3717,6 +3720,8 @@ class NewPrinterGUI(GtkGUI): elif self.rbtnNPPPD.get_active(): ppd = cups.PPD(self.filechooserPPD.get_filename()) else: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit swell-foop for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package swell-foop for openSUSE:Factory checked in at 2013-04-26 15:53:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swell-foop (Old) and /work/SRC/openSUSE:Factory/.swell-foop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "swell-foop", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/swell-foop/swell-foop.changes 2013-03-27 19:33:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.swell-foop.new/swell-foop.changes 2013-04-26 15:53:34.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 15 17:57:42 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 3.8.1: + + Updated translations. + +------------------------------------------------------------------- Old: ---- swell-foop-3.8.0.tar.xz New: ---- swell-foop-3.8.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swell-foop.spec ++++++ --- /var/tmp/diff_new_pack.yIn0KL/_old 2013-04-26 15:53:36.000000000 +0200 +++ /var/tmp/diff_new_pack.yIn0KL/_new 2013-04-26 15:53:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: swell-foop -Version: 3.8.0 +Version: 3.8.1 Release: 0 Summary: Same Game for GNOME License: GPL-2.0+ ++++++ swell-foop-3.8.0.tar.xz -> swell-foop-3.8.1.tar.xz ++++++ ++++ 6629 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit seed for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package seed for openSUSE:Factory checked in at 2013-04-26 15:53:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/seed (Old) and /work/SRC/openSUSE:Factory/.seed.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "seed", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/seed/seed.changes 2012-10-03 15:10:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.seed.new/seed.changes 2013-04-26 15:53:30.000000000 +0200 @@ -1,0 +2,26 @@ +Tue Apr 16 15:50:40 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 3.8.1: + + Re-release due to broken tarball. +- Drop GLib.js, as it is now included in the tarball. + +------------------------------------------------------------------- +Tue Apr 16 08:56:44 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 3.8.0: + + Adding ondemand for reference. + + Remove duplicated code, call function instead. + + Fix a crash when creating a new GObject from the javascript + code. + + Add support for uint8 array as return type. + + Major memory reduction by garbage collecting at end of closure. + + Bugs fixed: bgo#695857, bgo#696547, bgo#695876, bgo#694458, + bgo#618454, bgo#692794, bgo#657699, bgo#693217, bgo#653077, + bgo#637248, bgo#663609, bgo#663289. +- Drop seed-webkit-1.0-detection.patch: fixed upstream. +- Drop gnome-common BuildRequires and call to gnome-autogen.sh, as + we no longe carry any patch. +- Add GLib.js as source and copy to extensions: the file is missing + from the released tarballs. + +------------------------------------------------------------------- seed2.changes: same change Old: ---- seed-3.2.0.tar.bz2 seed-webkit-1.0-detection.patch New: ---- seed-3.8.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seed.spec ++++++ --- /var/tmp/diff_new_pack.ynksI6/_old 2013-04-26 15:53:32.000000000 +0200 +++ /var/tmp/diff_new_pack.ynksI6/_new 2013-04-26 15:53:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package seed # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,19 +36,15 @@ Name: seed %define _name seed -Version: 3.2.0 +Version: 3.8.1 Release: 0 Summary: JavaScript bindings based on gobject-introspection and WebKit License: LGPL-2.1+ Group: Development/Libraries/GNOME Url: http://live.gnome.org/Seed -Source: http://download.gnome.org/sources/seed/3.2/%{_name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM seed-webkit-1.0-detection.patch bgo#653077 dimstar(a)opensuse.org -- Fix libwebkit detection. -Patch0: seed-webkit-1.0-detection.patch +Source: http://download.gnome.org/sources/seed/3.8/%{_name}-%{version}.tar.xz BuildRequires: cairo-devel BuildRequires: dbus-1-glib-devel -# Needed by patch0 -BuildRequires: gnome-common BuildRequires: gnome-js-common BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -123,11 +119,8 @@ %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 %build -# Needed by patch0 -NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static \ --with-webkit=%{_webkitver} \ ++++++ seed2.spec ++++++ --- /var/tmp/diff_new_pack.ynksI6/_old 2013-04-26 15:53:32.000000000 +0200 +++ /var/tmp/diff_new_pack.ynksI6/_new 2013-04-26 15:53:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package seed2 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,19 +36,15 @@ Name: seed2 %define _name seed -Version: 3.2.0 +Version: 3.8.1 Release: 0 Summary: JavaScript bindings based on gobject-introspection and WebKit License: LGPL-2.1+ Group: Development/Libraries/GNOME Url: http://live.gnome.org/Seed -Source: http://download.gnome.org/sources/seed/3.2/%{_name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM seed-webkit-1.0-detection.patch bgo#653077 dimstar(a)opensuse.org -- Fix libwebkit detection. -Patch0: seed-webkit-1.0-detection.patch +Source: http://download.gnome.org/sources/seed/3.8/%{_name}-%{version}.tar.xz BuildRequires: cairo-devel BuildRequires: dbus-1-glib-devel -# Needed by patch0 -BuildRequires: gnome-common BuildRequires: gnome-js-common BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -123,11 +119,8 @@ %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 %build -# Needed by patch0 -NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static \ --with-webkit=%{_webkitver} \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0