Hello community, here is the log from the commit of package joe for openSUSE:Factory checked in at 2015-10-01 12:20:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/joe (Old) and /work/SRC/openSUSE:Factory/.joe.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "joe" Changes: -------- --- /work/SRC/openSUSE:Factory/joe/joe.changes 2013-11-30 17:36:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.joe.new/joe.changes 2015-10-01 12:21:00.000000000 +0200 @@ -1,0 +2,57 @@ +Sat Sep 19 05:33:29 UTC 2015 - [email protected] + +- Actually fix download url + +------------------------------------------------------------------- +Wed Jul 8 12:15:27 CEST 2015 - [email protected] + +- Fix source URI. +- Update and fix german messages. +- Add a rpmlintrc file to stop rpmlint from complaining about + files marked as config but not in /etc. + +------------------------------------------------------------------- +Wed Jun 17 08:12:37 UTC 2015 - [email protected] + +- Version update to 4.0: + - JOE now has pop-up shell windows with full terminal emulation + and shell commands that can control the editor. Hit F1 - F4 to bring up a shell window. + - See Pop-up shell feature for a full description. + - The status command (^K SPACE) can now be customized using the same syntax + as the status bar. Look for smsg and zmsg in joerc to see how to do this. + parserr (the error parser) will parse only the highlighted block if it's set. + Before it always parsed the entire buffer. + - Now there is a per-buffer concept of current directory. This was added to + make the pop-up shell windows work better, but it's useful in general. + - At file prompts you can begin a new anchored path without having to delete + the old one. It means that ~jhallen/foo//etc/passwd is translated to /etc/passwd. + - Prompt windows are now highighted to indicate which parts of the path are + being dropped. There is a syntax file for this: filename.jsf + - The error parser now ignores ANSI sequences (some versions of grep + color their results, now JOE can still parse it). + - Temporary messages are now dismissed by keyboard input only. Before, they + could also be dismissed by shell input. + - Tags search now supports multiple matches. ^K ; can be configured to + either provide a menu of the matches or to cycle through them. + - Tags search will now match on the member name part of member functions + ('fred' will match 'myclass::fred'). + - Tags search will prepend the path to the tags file file name in the tags + file. This is important when JOE finds the tags file via the TAGS + environment variable. + - Remove ` as quote character from incremental search. + - Clean up documentation, convert much of it to Markdown. +- Cleanup with spec-cleaner +- Drop languages as they don't work at all +- refreshed patches: + * joe-3.1-fix_isblanck_argument.patch + * joe-3.1-terminate_buffer.patch + * joe-3.3-warnings.patch + * joe-3.7-additional_key_mappings.patch + * joe-3.7-spec_association.patch + * joe-codecleanup.patch + * joe-sigiot.patch +- deleted patches: + * joe-activate_po.patch.bz2 + * joe-fr_trans.patch + +------------------------------------------------------------------- Old: ---- joe-3.7.tar.gz joe-activate_po.patch.bz2 joe-fr_trans.patch New: ---- joe-4.0.tar.gz joe-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ joe.spec ++++++ --- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:01.000000000 +0200 +++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package joe # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,86 +17,39 @@ Name: joe -BuildRequires: automake -BuildRequires: ncurses-devel -Version: 3.7 +Version: 4.0 Release: 0 Summary: A Text Editor License: GPL-2.0+ Group: Productivity/Editors/Other Url: http://sourceforge.net/projects/joe-editor - -Source0: http://downloads.sourceforge.net/joe-editor/%{name}-%{version}.tar.gz +Source0: http://sourceforge.net/projects/joe-editor/files/JOE%%20sources/%{name}-%{version}/%{name}-%{version}.tar.gz Source2: de.po +Source3: joe-rpmlintrc Patch0: joe-3.1-terminate_buffer.patch Patch2: joe-3.1-fix_isblanck_argument.patch Patch3: joe-3.3-warnings.patch -Patch5: joe-activate_po.patch.bz2 -Patch6: joe-fr_trans.patch Patch7: joe-3.7-additional_key_mappings.patch Patch8: joe-3.7-spec_association.patch Patch9: joe-codecleanup.patch Patch10: joe-sigiot.patch +BuildRequires: automake +BuildRequires: ncurses-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -JOE (Joe's Own Editor) is a freeware ASCII editor for UNIX. Joe is -similar to most IBM PC text editors. The keyboard combinations are -similar to WordStar[tm] and Turbo C. Some of Joe's features include: - --full support of termcap and terminfo (useful for device-independent -descriptions to control screen output) -optimized screen refresh like -GNU Emacs (Joe can even be used at 2400 baud) -easy installation with -all features for UNIX integration with vi: a marked block of text can -be filtered through a UNIX command and wherever JOE accepts a filename -parameter, the following can also be substituted: - -!command\t\t:to redirect from or to another command - ->>filename\t\t:to append onto an existing file - -filename,start,size\t:to edit a part of a file or device - --\t\t\t:to use standard input/output - -When JOE has several files opened at the same time, each file is -displayed in its own window. Additionally, JOE allows for shell windows -from which the output of the executed commands are saved in a buffer, -automatic filename completion (via TAB), help windows, undo and redo, -and search and replace using regular expressions. - - - -Authors: --------- - Joseph H. Allen <[email protected]> - Marek 'Marx' Grac <[email protected]> +Joe is a powerful, easy to use, modeless text editor. It uses the same +WordStar keybindings used in Borland's development environment. %prep %setup -q -%patch0 -%patch2 -%patch3 -%patch5 -%patch6 -%patch7 -%patch8 -%patch9 -%patch10 -cp %{S:2} po -# Convert Russian docs and locale from KOI8-R to UTF-8. -for ru in man/ru/joe.1.in po/ru.po rc/jicerc.ru.in ; do - iconv -f KOI8-R -t UTF-8 -o "${ru}.tmp" "${ru}" && \ - mv -f "${ru}.tmp" "${ru}" -done -sed -i 's/charset=koi8-r/charset=UTF-8/' po/ru.po -# Convert Ukrainian locale from KOI8-U to UTF-8. -iconv -f KOI8-U -t UTF-8 po/uk.po | \ -sed 's/charset=koi8-u/charset=UTF-8/' > po/uk.po.tmp && \ -mv -f po/uk.po.tmp po/uk.po - -# new automake-1.13.1 removed old macro -sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac +%patch0 -p1 +%patch2 -p1 +%patch3 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 %build autoreconf -fi @@ -105,36 +58,30 @@ --prefix=%{_prefix} \ --mandir=%{_mandir} \ --sysconfdir=%{_sysconfdir} \ - --docdir=%{_defaultdocdir}/%name -cd po -make update-po + --docdir=%{_defaultdocdir}/%{name} + make %{?_smp_mflags} %install -make install DESTDIR="%buildroot" +make DESTDIR=%{buildroot} install %{?_smp_mflags} for i in jmacs jpico jstar rjoe; do ln -s joe.1.gz %{buildroot}%{_mandir}/man1/$i.1.gz done +rm -rf %{buildroot}/%{_datadir}/%{name}/lang %files %defattr(-,root,root) %doc %{_defaultdocdir}/%{name} -%doc %{_mandir}/man1/* -%doc %{_mandir}/*/man1/* +%{_mandir}/man1/* +%{_mandir}/*/man1/* %config %{_sysconfdir}/joe/* %dir %{_sysconfdir}/joe %dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/lang %dir %{_mandir}/ru %dir %{_mandir}/ru/man1 %{_bindir}/* %{_datadir}/%{name}/charmaps %dir %{_datadir}/%{name}/syntax %config(noreplace) %{_datadir}/%{name}/syntax/* -%lang(de) %{_datadir}/%{name}/lang/de.mo -%lang(en) %{_datadir}/%{name}/lang/en@*.mo -%lang(fr) %{_datadir}/%{name}/lang/fr.mo -%lang(ru) %{_datadir}/%{name}/lang/ru.mo -%lang(uk) %{_datadir}/%{name}/lang/uk.mo %changelog ++++++ de.po ++++++ --- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:01.000000000 +0200 +++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:01.000000000 +0200 @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: joe 3.5\n" +"Project-Id-Version: joe 4.0\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2009-10-23 15:19+0200\n" -"PO-Revision-Date: 2009-10-23 13:58+0100\n" +"PO-Revision-Date: 2015-07-08 13:58+0100\n" "Last-Translator: Philipp Thomas <[email protected]>\n" -"Language-Team: German <[email protected]>\n" +"Language-Team: German <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -50,7 +50,7 @@ "*** File '%s'\n" msgstr "" "\n" -"*** Datei '%s'\n" +"*** Datei „%s“\n" #: b.c:2999 msgid "" @@ -58,7 +58,7 @@ "*** File '(Unnamed)'\n" msgstr "" "\n" -"*** Datei '(Unbenannt)'\n" +"*** Datei „(Unbenannt)“\n" #: bw.c:1279 #, c-format @@ -182,7 +182,7 @@ #: main.c:222 main.c:239 #, c-format msgid "There were errors in '%s'. Use it anyway?" -msgstr "Fehler in '%s'. Trotzdem verwenden?" +msgstr "Fehler in „%s“. Trotzdem verwenden?" #: main.c:294 #, c-format @@ -202,12 +202,12 @@ #: main.c:309 main.c:328 main.c:345 #, c-format msgid "There were errors in '%s'. Use it anyway (y,n)? " -msgstr "Fehler in '%s'. Trotzdem verwenden (y,n)? " +msgstr "Fehler in „%s“. Trotzdem verwenden (y,n)? " #: main.c:353 #, c-format msgid "Couldn't open '%s'\n" -msgstr "Konnte '%s' nicht öffnen\n" +msgstr "Konnte „%s“ nicht öffnen\n" #: main.c:359 msgid "rc file has no :main key binding section or no bindings. Bye.\n" @@ -217,7 +217,7 @@ #: main.c:372 #, c-format msgid "Unknown option '%s'\n" -msgstr "Unbekannte Option '%s'\n" +msgstr "Unbekannte Option „%s“\n" #: main.c:512 #, c-format @@ -894,7 +894,7 @@ #: rc.c:365 msgid " ^G ignores '... ' " -msgstr " ^G ignoriert '... ' " +msgstr " ^G ignoriert „… “ " #: rc.c:366 msgid "Double quoting disabled" @@ -906,7 +906,7 @@ #: rc.c:366 msgid " ^G ignores \"... \" " -msgstr " ^G ignoriert \"... \" " +msgstr " ^G ignoriert \"… \" " #: rc.c:367 msgid "/* comments enabled" @@ -918,7 +918,7 @@ #: rc.c:367 msgid " ^G ignores /*...*/ " -msgstr " ^G ignoriert /*...*/ " +msgstr " ^G ignoriert /*…*/ " #: rc.c:368 msgid "// comments enabled" @@ -930,7 +930,7 @@ #: rc.c:368 msgid " ^G ignores //... " -msgstr " ^G ignoriert //... " +msgstr " ^G ignoriert //… " #: rc.c:369 msgid "# comments enabled" @@ -942,7 +942,7 @@ #: rc.c:369 msgid " ^G ignores #... " -msgstr " ^G ignoriert #... " +msgstr " ^G ignoriert #… " #: rc.c:370 msgid "-- comments enabled" @@ -954,7 +954,7 @@ #: rc.c:370 msgid " ^G ignores --... " -msgstr " ^G ignoriert --... " +msgstr " ^G ignoriert --… " #: rc.c:371 msgid "; comments enabled" @@ -966,7 +966,7 @@ #: rc.c:371 msgid " ^G ignores ;... " -msgstr " ^G ignoriert ;... " +msgstr " ^G ignoriert ;… " #: rc.c:372 #, no-c-format @@ -980,7 +980,7 @@ #: rc.c:372 msgid " ^G ignores %... " -msgstr " ^G ignoriert %... " +msgstr " ^G ignoriert %… " #: rc.c:373 #, c-format @@ -1073,7 +1073,7 @@ #: rc.c:1256 #, c-format msgid "Processing '%s'..." -msgstr "Bearbeite '%s'..." +msgstr "Bearbeite „%s“…" #: rc.c:1312 #, c-format @@ -1190,7 +1190,7 @@ "%s %d: Bad key sequence '%s'" msgstr "" "\n" -"%s %d: Ungültige Tastenfolge »%s«" +"%s %d: Ungültige Tastenfolge „%s“" #: rc.c:1492 msgid "" @@ -1366,16 +1366,16 @@ #: tty.c:743 msgid "You are at the command shell. Type 'exit' to return\n" -msgstr "Befehlszeilenmodus. 'exit' eingeben um zurückzukehren\n" +msgstr "Befehlszeilenmodus. „exit“ eingeben um zurückzukehren\n" #: tty.c:807 msgid "You have suspended the program. Type 'fg' to return\n" -msgstr "Das Program wurde unterbrochen. 'fg' eingeben um zurückzukehren\n" +msgstr "Das Program wurde unterbrochen. „fg“ eingeben um zurückzukehren\n" #: tty.c:1158 #, c-format msgid "Couldn't execute shell '%s'\n" -msgstr "Konnte Shell '%s' nicht ausführen\n" +msgstr "Konnte Shell „%s“ nicht ausführen\n" #: tw.c:281 msgid "Unnamed" @@ -1396,7 +1396,7 @@ #: tw.c:401 #, c-format msgid "(Macro %d recording...)" -msgstr "(Makro %d wird aufgenommen...)" +msgstr "(Makro %d wird aufgenommen…)" #: tw.c:626 tw.c:652 ufile.c:1009 ufile.c:1219 msgid "Lose changes to this file (y,n,^C)? " @@ -1567,7 +1567,7 @@ #: ufile.c:307 msgid "Couldn't make backup file... file not saved" -msgstr "Konnte Backupdatei nicht erstellen... Datei nicht gespeichert" +msgstr "Konnte Backupdatei nicht erstellen… Datei nicht gespeichert" #: ufile.c:319 msgid "Could not make backup file. Save anyway (y,n,^C)? " @@ -1794,7 +1794,7 @@ #: ushell.c:197 msgid "Enter build command (for example, 'make'): " -msgstr "Buildbefehl eingeben (z.B. `make`): " +msgstr "Buildbefehl eingeben (z.B. „make“): " #: ushell.c:212 msgid "Grep command: " @@ -1802,7 +1802,7 @@ #: ushell.c:221 msgid "Enter grep command (for example, 'grep -n foo *.c'): " -msgstr "grep-Befehl eingeben (z.B. `grep -n foo *.c`): " +msgstr "grep-Befehl eingeben (z.B. „grep -n foo *.c“): " #: ushell.c:250 msgid "Kill program (y,n,^C)?" @@ -1823,27 +1823,8 @@ #: vfile.c:241 #, c-format msgid "Couldn't open file '%s'\n" -msgstr "Konnte '%s' nicht öffnen\n" +msgstr "Konnte „%s“ nicht öffnen\n" #: w.c:822 msgid "There is no message buffer" msgstr "Kein Nachrichtenpuffer vorhanden" - -#~ msgid "" -#~ "\n" -#~ "*** These modified files were found in JOE when it aborted on %s" -#~ msgstr "" -#~ "\n" -#~ "*** Diese geänderten Dateien wurden nach Abbruch von %s in JOE gefunden" - -#~ msgid "*** JOE was aborted by UNIX signal %d\n" -#~ msgstr "*** JOE wurde durch UNIX-Signal %d abgebrochen\n" - -#~ msgid "*** JOE was aborted because the terminal closed\n" -#~ msgstr "*** JOE wurde durch Schließen des Terminals abgebrochen\n" - -#~ msgid "Delimiters (%s): " -#~ msgstr "Begrenzer (%s): " - -#~ msgid "Delimiters: " -#~ msgstr "Begrenzer: " ++++++ joe-3.1-fix_isblanck_argument.patch ++++++ --- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:01.000000000 +0200 +++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:01.000000000 +0200 @@ -1,6 +1,8 @@ ---- b.c.orig 2008-11-02 21:59:06.000000000 +0100 -+++ b.c 2009-10-20 12:18:46.443802718 +0200 -@@ -601,9 +601,10 @@ int piseow(P *p) +Index: joe-4.0/joe/b.c +=================================================================== +--- joe-4.0.orig/joe/b.c ++++ joe-4.0/joe/b.c +@@ -626,9 +626,10 @@ int piseow(P *p) int pisblank(P *p) { P *q = pdup(p, USTR "pisblank"); @@ -12,7 +14,7 @@ pgetb(q); if (piseol(q)) { prm(q); -@@ -635,9 +636,10 @@ long pisindent(P *p) +@@ -660,9 +661,10 @@ long pisindent(P *p) { P *q = pdup(p, USTR "pisindent"); long col; ++++++ joe-3.1-terminate_buffer.patch ++++++ --- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:02.000000000 +0200 +++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:02.000000000 +0200 @@ -1,7 +1,7 @@ -Index: path.c +Index: joe-4.0/joe/path.c =================================================================== ---- path.c.orig 2008-11-02 21:33:23.000000000 +0100 -+++ path.c 2009-10-20 12:04:34.844305049 +0200 +--- joe-4.0.orig/joe/path.c ++++ joe-4.0/joe/path.c @@ -200,6 +200,8 @@ unsigned char *mktmp(unsigned char *wher where = (unsigned char *)getenv("TEMP"); if (!where) ++++++ joe-3.3-warnings.patch ++++++ --- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:02.000000000 +0200 +++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:02.000000000 +0200 @@ -1,6 +1,8 @@ ---- bw.c -+++ bw.c -@@ -206,6 +206,7 @@ +Index: joe-4.0/joe/bw.c +=================================================================== +--- joe-4.0.orig/joe/bw.c ++++ joe-4.0/joe/bw.c +@@ -206,6 +206,7 @@ HIGHLIGHT_STATE get_highlight_state(BW * #ifdef junk P *tmp = 0; HIGHLIGHT_STATE state; ++++++ joe-3.7-additional_key_mappings.patch ++++++ --- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:02.000000000 +0200 +++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:02.000000000 +0200 @@ -1,8 +1,8 @@ -Index: rc/jmacsrc.in +Index: joe-4.0/rc/jmacsrc.in =================================================================== ---- rc/jmacsrc.in.orig 2008-11-02 20:13:54.000000000 +0100 -+++ rc/jmacsrc.in 2009-10-20 12:23:51.005295489 +0200 -@@ -868,6 +868,7 @@ home .kh Goto beginning of line +--- joe-4.0.orig/rc/jmacsrc.in ++++ joe-4.0/rc/jmacsrc.in +@@ -938,6 +938,7 @@ home .kh Goto beginning of line home ^A home ^[ [ H home ^[ [ 1 ~ @@ -10,7 +10,7 @@ bop ^[ p (uemacs) bop ^[ { bufed ^X b -@@ -896,6 +897,7 @@ eol .@7 +@@ -966,6 +967,7 @@ eol .@7 eol ^E eol ^[ [ F eol ^[ [ 4 ~ @@ -18,11 +18,11 @@ eop ^[ n (uemacs) eop ^[ } execmd ^[ x -Index: rc/joerc.in +Index: joe-4.0/rc/joerc.in =================================================================== ---- rc/joerc.in.orig 2008-11-02 04:29:43.000000000 +0100 -+++ rc/joerc.in 2009-10-20 12:23:51.039801181 +0200 -@@ -949,6 +949,9 @@ bof ^K u +--- joe-4.0.orig/rc/joerc.in ++++ joe-4.0/rc/joerc.in +@@ -1016,6 +1016,9 @@ bof ^K u bol ^# SP A home .kh home ^A @@ -32,7 +32,7 @@ center ^K A Center line center ^K ^A center ^K a -@@ -973,6 +976,9 @@ eof ^K v +@@ -1040,6 +1043,9 @@ eof ^K v eol .kH Go to end of line eol .@7 eol ^E @@ -42,11 +42,11 @@ exsave ^K X Save and exit exsave ^K ^X exsave ^K x -Index: rc/jpicorc.in +Index: joe-4.0/rc/jpicorc.in =================================================================== ---- rc/jpicorc.in.orig 2008-11-02 04:19:48.000000000 +0100 -+++ rc/jpicorc.in 2009-10-20 12:23:51.092404427 +0200 -@@ -766,6 +766,7 @@ home .kh Goto beginning of line +--- joe-4.0.orig/rc/jpicorc.in ++++ joe-4.0/rc/jpicorc.in +@@ -837,6 +837,7 @@ home .kh Goto beginning of line home ^A home ^[ [ H home ^[ [ 1 ~ @@ -54,7 +54,7 @@ center ^[ ^C Center line center ^[ c delch .kD Delete character -@@ -794,6 +795,7 @@ eol .@7 +@@ -865,6 +866,7 @@ eol .@7 eol ^E eol ^[ [ F eol ^[ [ 4 ~ @@ -62,11 +62,11 @@ execmd ^[ X Prompt for command to execute execmd ^[ ^X Prompt for command to execute execmd ^[ x Prompt for command to execute -Index: rc/jstarrc.in +Index: joe-4.0/rc/jstarrc.in =================================================================== ---- rc/jstarrc.in.orig 2008-11-02 04:20:19.000000000 +0100 -+++ rc/jstarrc.in 2009-10-20 12:23:51.131880999 +0200 -@@ -805,6 +805,7 @@ bof ^Q .kP +--- joe-4.0.orig/rc/jstarrc.in ++++ joe-4.0/rc/jstarrc.in +@@ -875,6 +875,7 @@ bof ^Q .kP home .kh Goto beginning of line home ^[ [ H home ^[ [ 1 ~ @@ -74,7 +74,7 @@ home ^Q S home ^Q ^S home ^Q s -@@ -846,6 +847,7 @@ eol .kH Go to end of line +@@ -916,6 +917,7 @@ eol .kH Go to end of line eol .@7 eol ^[ [ F eol ^[ [ 4 ~ @@ -82,11 +82,11 @@ eol ^Q D eol ^Q ^D eol ^Q d -Index: rc/rjoerc.in +Index: joe-4.0/rc/rjoerc.in =================================================================== ---- rc/rjoerc.in.orig 2008-11-02 04:20:28.000000000 +0100 -+++ rc/rjoerc.in 2009-10-20 12:23:51.176448836 +0200 -@@ -837,6 +837,7 @@ bol .kh Goto beginning of line +--- joe-4.0.orig/rc/rjoerc.in ++++ joe-4.0/rc/rjoerc.in +@@ -880,6 +880,7 @@ bol .kh Goto beginning of line bol ^A bol ^[ [ H bol ^[ [ 1 ~ @@ -94,7 +94,7 @@ bol ^# SP A center ^K A Center line center ^K ^A -@@ -863,6 +864,7 @@ eol .kH Go to end of line +@@ -906,6 +907,7 @@ eol .kH Go to end of line eol ^E eol ^[ [ F eol ^[ [ 4 ~ ++++++ joe-3.7-spec_association.patch ++++++ --- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:02.000000000 +0200 +++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:02.000000000 +0200 @@ -1,6 +1,8 @@ ---- rc/ftyperc -+++ rc/ftyperc -@@ -753,3 +753,9 @@ +Index: joe-4.0/rc/ftyperc +=================================================================== +--- joe-4.0.orig/rc/ftyperc ++++ joe-4.0/rc/ftyperc +@@ -935,6 +935,12 @@ *jpicorc.in -syntax joerc @@ -10,3 +12,6 @@ +*.spec.in +-syntax spec + + Markdown + *.md + -syntax md ++++++ joe-3.7.tar.gz -> joe-4.0.tar.gz ++++++ ++++ 146511 lines of diff (skipped) ++++++ joe-codecleanup.patch ++++++ --- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:02.000000000 +0200 +++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:02.000000000 +0200 @@ -1,40 +1,40 @@ -Index: b.c +Index: joe-4.0/joe/b.c =================================================================== ---- b.c.orig 2009-10-20 18:31:36.000000000 +0200 -+++ b.c 2009-10-20 18:35:09.643712608 +0200 -@@ -2194,13 +2194,13 @@ unsigned char *parsens(unsigned char *s, +--- joe-4.0.orig/joe/b.c ++++ joe-4.0/joe/b.c +@@ -2327,13 +2327,13 @@ unsigned char *parsens(unsigned char *s, - #if SIZEOF_LONG_LONG && SIZEOF_OFF_T == SIZEOF_LONG_LONG + #if HAVE_LONG_LONG if (n[x + 1] == 'x' || n[x + 1] == 'X') -- sscanf((char *)(n + x + 2), "%llx", skip); -+ sscanf((char *)(n + x + 2), "%llx", (long long unsigned int *)skip); +- sscanf((char *)(n + x + 2), "%llx", &skipr); ++ sscanf((char *)(n + x + 2), "%llx", (long long unsigned int *)skipr); else if (n[x + 1] == '0' && (n[x + 2] == 'x' || n[x + 2] == 'X')) -- sscanf((char *)(n + x + 3), "%llx", skip); -+ sscanf((char *)(n + x + 3), "%llx", (long long unsigned int *)skip); +- sscanf((char *)(n + x + 3), "%llx", &skipr); ++ sscanf((char *)(n + x + 3), "%llx", (long long unsigned int *)skipr); else if (n[x + 1] == '0') -- sscanf((char *)(n + x + 1), "%llo", skip); -+ sscanf((char *)(n + x + 1), "%llo", (long long unsigned int *)skip); +- sscanf((char *)(n + x + 1), "%llo", &skipr); ++ sscanf((char *)(n + x + 1), "%llo", (long long unsigned int *)skipr); else -- sscanf((char *)(n + x + 1), "%lld", skip); -+ sscanf((char *)(n + x + 1), "%lld", (long long int *)skip); +- sscanf((char *)(n + x + 1), "%llu", &skipr); ++ sscanf((char *)(n + x + 1), "%llu", (long long int *)skipr); #else if (n[x + 1] == 'x' || n[x + 1] == 'X') - sscanf((char *)(n + x + 2), "%lx", skip); -@@ -2219,13 +2219,13 @@ unsigned char *parsens(unsigned char *s, + sscanf((char *)(n + x + 2), "%lx", &skipr); +@@ -2353,13 +2353,13 @@ unsigned char *parsens(unsigned char *s, *amnt = *skip; - #if SIZEOF_LONG_LONG && SIZEOF_OFF_T == SIZEOF_LONG_LONG + #ifdef HAVE_LONG_LONG if (n[x + 1] == 'x' || n[x + 1] == 'X') -- sscanf((char *)(n + x + 2), "%llx", skip); -+ sscanf((char *)(n + x + 2), "%llx", (long long unsigned int *)skip); +- sscanf((char *)(n + x + 2), "%llx", &skipr); ++ sscanf((char *)(n + x + 2), "%llx", (long long unsigned int *)&skipr); else if (n[x + 1] == '0' && (n[x + 2] == 'x' || n[x + 2] == 'X')) -- sscanf((char *)(n + x + 3), "%llx", skip); -+ sscanf((char *)(n + x + 3), "%llx", (long long unsigned int *)skip); +- sscanf((char *)(n + x + 3), "%llx", &skipr); ++ sscanf((char *)(n + x + 3), "%llx", (long long unsigned int *)skipr); else if (n[x + 1] == '0') -- sscanf((char *)(n + x + 1), "%llo", skip); -+ sscanf((char *)(n + x + 1), "%llo", (long long unsigned int *)skip); +- sscanf((char *)(n + x + 1), "%llo", &skipr); ++ sscanf((char *)(n + x + 1), "%llo", (long long unsigned int *)skipr); else -- sscanf((char *)(n + x + 1), "%lld", skip); -+ sscanf((char *)(n + x + 1), "%lld", (long long int *)skip); +- sscanf((char *)(n + x + 1), "%llu", &skipr); ++ sscanf((char *)(n + x + 1), "%llu", (long long int *)skipr); #else if (n[x + 1] == 'x' || n[x + 1] == 'X') - sscanf((char *)(n + x + 2), "%lx", skip); + sscanf((char *)(n + x + 2), "%lx", &skipr); ++++++ joe-rpmlintrc ++++++ # This line is mandatory to access the configuration functions from Config import * # The *are* configuration files, just not in /etc addFilter("joe.* non-etc-or-var-file-marked-as-conffile") ++++++ joe-sigiot.patch ++++++ --- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:02.000000000 +0200 +++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:02.000000000 +0200 @@ -1,20 +1,8 @@ -Index: uformat.c +Index: joe-4.0/joe/uformat.c =================================================================== ---- uformat.c.orig 2008-10-28 05:13:56.000000000 +0100 -+++ uformat.c 2009-10-26 18:13:08.726241696 +0100 -@@ -361,9 +361,10 @@ void wrapword(BW *bw, P *p, long int ind - if (!bw->o.autoindent) { - /* Don't indent second line of single-line paragraphs if autoindent is off */ - int x = zlen(indents); -+ int start = x; - while (x && (indents[x - 1] == ' ' || indents[x - 1] == '\t')) - indents[--x] = 0; -- if (x) { -+ if (x < start) { - indents[x++] = ' '; - indents[x] = 0; - } -@@ -430,7 +431,7 @@ void wrapword(BW *bw, P *p, long int ind +--- joe-4.0.orig/joe/uformat.c ++++ joe-4.0/joe/uformat.c +@@ -444,7 +444,7 @@ void wrapword(BW *bw, P *p, long int ind if (!pisbol(p) && piscol(p) > indent) { /* Move q to two (or one if 'french' is set) spaces after end of previous word */ @@ -23,7 +11,7 @@ while (!pisbol(q)) if (!joe_isblank(p->b->o.charmap, (c = prgetc(q)))) { pgetc(q); -@@ -564,10 +565,12 @@ int uformat(BW *bw) +@@ -578,10 +578,12 @@ int uformat(BW *bw) if (!bw->o.autoindent) { /* Don't indent second line of single-line paragraphs if autoindent is off */ int x = zlen(indents);
