Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2015-09-19 06:52:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses" Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2015-06-03 08:12:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ncurses.new/ncurses.changes 2015-09-19 06:52:10.000000000 +0200 @@ -1,0 +2,132 @@ +Mon Aug 17 07:18:34 UTC 2015 - wer...@suse.de + +- Add ncurses patch 20150815 + + disallow "no" as a possible value for "--with-shlib-version" option, + overlooked in cleanup-changes for 20000708 (report by Tommy Alex). + + update release notes in INSTALL. + + regenerate llib-* files to help with review for release notes. +- Modify patch ncurses-5.9-overwrite.dif + +------------------------------------------------------------------- +Fri Aug 14 14:26:52 UTC 2015 - wer...@suse.de + +- Add ncurses patch 20150810 + + workaround for Debian #65617, which was fixed in mawk's upstream + releases in 2009 (report by Sven Joachim). See + http://invisible-island.net/mawk/CHANGES.html#t20090727 +- Move infocmp from devel to utils package for ruby readline implementation + +------------------------------------------------------------------- +Mon Aug 12 10:11:22 UTC 2015 - wer...@suse.de + +- Update to official ncurses 6.0 + + based on the patch 20150808 +- Port and rename several patches + ncurses-5.9-avoid-line-markers.dif becomes ncurses-6.0-avoid-line-markers.dif + ncurses-5.9.dif becomes ncurses-6.0.dif +- Add ncurses patch 20150808 + + build-fix for Ada95 on older platforms without stdint.h + + build-fix for Solaris, whose /bin/sh and /usr/bin/sed are non-POSIX. + + update release announcement, summarizing more than 800 changes across + more than 200 snapshots. + + minor fixes to manpages, etc., to simplify linking from announcement + page. + +------------------------------------------------------------------- +Tue Jul 28 12:26:57 UTC 2015 - wer...@suse.de + +- Add ncurses patch 20150725 + + updated llib-* files. + + build-fixes for ncurses library "test_progs" rule. + + use alternate workaround for gcc 5.x feature (adapted from patch by + Mikhail Peselnik). + + add status line to tmux via xterm+sl (patch by Nicholas Marriott). + + fixes for st 0.5 from testing with tack -TD + + review/improve several manual pages to break up wall-of-text: + curs_add_wch.3x, curs_attr.3x, curs_bkgd.3x, curs_bkgrnd.3x, + curs_getcchar.3x, curs_getch.3x, curs_kernel.3x, curs_mouse.3x, + curs_outopts.3x, curs_overlay.3x, curs_pad.3x, curs_termattrs.3x + curs_trace.3x, and curs_window.3x + +------------------------------------------------------------------- +Mon Jul 27 12:01:41 UTC 2015 - wer...@suse.de + +- Rework fixing the pkg-config files + +------------------------------------------------------------------- +Mon Jul 20 08:09:33 UTC 2015 - wer...@suse.de + +- Add ncurses patch 20150719 + + correct an old logic error for %A and %O in tparm (report by "zreed"). + + improve documentation for signal handlers by adding section in the + curs_initscr.3x page. + + modify logic in make_keys.c to not assume anything about the size + of strnames and strfnames variables, since those may be functions + in the thread- or broken-linker configurations (problem found by + Coverity). + + modify test/configure script to check for pthreads configuration, + e.g., ncursestw library. + +------------------------------------------------------------------- +Mon Jul 13 12:34:48 UTC 2015 - wer...@suse.de + +- Add ncurses patch 20150711 pre-release + + modify scripts to build/use test-packages for the pthreads + configuration of ncurses6. + + add references to ttytype and termcap symbols in demo_terminfo.c and + demo_termcap.c to ensure that when building ncursest.map, etc., that + the corresponding names such as _nc_ttytype are added to the list of + versioned symbols (report by Werner Fink) + + fix regression from 20150704 (report/patch by Werner Fink). + +------------------------------------------------------------------- +Mon Jul 6 13:37:05 UTC 2015 - wer...@suse.de + +- Add ncurses patch 20150606 pre-release + + make ABI 6 the default by updates to dist.mk and VERSION, with the + intention that the existing ABI 5 should build as before using the + "--with-abi=5" option. + + regenerate ada- and man-html documentation. + + minor fixes to color- and util-manpages. + + fix a regression in Ada95/gen/Makefile.in, to handle special case of + Cygwin, which uses the broken-linker feature. + + amend fix for CF_NCURSES_CONFIG used in test/configure to assume that + ncurses package scripts work when present for cross-compiling, as the + lessor of two evils (cf: 20150530). + + add check in configure script to disallow conflicting options + "--with-termlib" and "--enable-term-driver". + + move defaults for "--disable-lp64" and "--with-versioned-syms" into + CF_ABI_DEFAULTS macro. +- Add ncurses patch 20150613 + + fix overflow warning for OSX with lib_baudrate.c (cf: 20010630). + + modify script used to generate map/sym files to mark 5.9.20150530 as + the last "5.9" version, and regenerated the files. That makes the + files not use ".current" for the post-5.9 symbols. This also + corrects the label for _nc_sigprocmask used in when weak symbols are + configured for the ncursest/ncursestw libraries (prompted by + discussion with Sven Joachim). + + fix typo in NEWS (report by Sven Joachim). +- Add ncurses patch 20150627 + + modify configure script to remove deprecated ABI 5 symbols when + building ABI 6. + + add symbols _nc_Default_Field, _nc_Default_Form, _nc_has_mouse to + map-files, but marked as deprecated so that they can easily be + suppressed from ABI 6 builds (Debian #788610). + + comment-out "screen.xterm" entry, and inherit screen.xterm-256color + from xterm-new (report by Richard Birkett) -TD + + modify read_entry.c to set the error-return to -1 if no terminal + databases were found, as documented for setupterm. + + add test_setupterm.c to demonstrate normal/error returns from the + setupterm and restartterm functions. + + amend cleanup change from 20110813 which removed redundant definition + of ret_error, etc., from tinfo_driver.c, to account for the fact that + it should return a bool rather than int (report/analysis by Johannes + Schindelin). +- Add ncurses patch 20150704 + + fix a few problems reported by Coverity. + + fix comparison against "/usr/include" in misc/gen-pkgconfig.in + (report by Daiki Ueno, Debian #790548, cf: 20141213). +- Add tack patch 1.07.20150606 + + Able to handle ncurses6 in configure + +------------------------------------------------------------------- Old: ---- ncurses-5.9-avoid-line-markers.dif ncurses-5.9-patches.tar.bz2 ncurses-5.9.dif ncurses-5.9.tar.bz2 tack-1.07-20130713.tar.bz2 New: ---- ncurses-6.0-avoid-line-markers.dif ncurses-6.0-patches.tar.bz2 ncurses-6.0.dif ncurses-6.0.tar.gz tack-1.07-20150606.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.jFlKHh/_old 2015-09-19 06:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.jFlKHh/_new 2015-09-19 06:52:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ncurses # -# Copyright (c) 2015 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 @@ -43,33 +43,32 @@ Obsoletes: ncurses-64bit %endif # -Version: 5.9 +Version: 6.0 Release: 0 Summary: New curses Libraries License: MIT Group: System/Base #Git: http://ncurses.scripts.mit.edu Url: http://invisible-island.net/ncurses/ncurses.html -Source0: ncurses-%{version}.tar.bz2 -Source1: ncurses-%{version}-patches.tar.bz2 +Source0: ftp://invisible-island.net/ncurses/ncurses-6.0.tar.gz +Source1: ncurses-6.0-patches.tar.bz2 Source2: handle.linux Source3: README.devel Source4: ncurses-rpmlintrc -Source5: tack-1.07-20130713.tar.bz2 +Source5: tack-1.07-20150606.tar.bz2 Source6: edit.sed Source7: baselibs.conf -Patch0: ncurses-%{version}.dif +Patch0: ncurses-6.0.dif Patch1: ncurses-5.9-ibm327x.dif Patch3: ncurses-5.9-overwrite.dif Patch4: ncurses-5.7-tack.dif Patch5: ncurses-5.9-environment.dif -Patch6: ncurses-5.9-avoid-line-markers.dif +Patch6: ncurses-6.0-avoid-line-markers.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc %global _incdir %{_includedir} %global root %{_tmppath}/%{name}-%{version}-store -%global abi %(ver=%{version}; echo ${ver%.*}) %description As soon as a text application needs to directly control its output to @@ -138,16 +137,13 @@ Thomas E. Dickey <dic...@invisible-island.net> Eric S. Raymond <e...@thyrsus.com> -%if %abi == 5 - %package -n libncurses5 Summary: The New curses Libraries License: MIT Group: System/Libraries Requires: terminfo-base -Provides: ncurses = %{version} -Obsoletes: ncurses < %{version} -Recommends: ncurses-utils = %{version} +Provides: ncurses = 5.9 +Obsoletes: ncurses < 5.9 # bug437293 %ifarch ppc64 Obsoletes: ncurses-64bit @@ -168,18 +164,13 @@ Juergen Pfeifer <juergen.pfei...@t-online.de> Pavel Curtis -%endif - %package -n libncurses6 Summary: The New curses Libraries License: MIT Group: System/Libraries Requires: terminfo-base -%if %abi == 5 -Provides: ncurses = 6.0 -%else Provides: ncurses = %{version} -%endif +Recommends: ncurses-utils = %{version} %description -n libncurses6 The ncurses library is used by the most curses based terminal @@ -222,13 +213,8 @@ Group: Development/Libraries/C and C++ Provides: ncurses:%{_incdir}/ncurses.h Requires: %{_bindir}/tack -Requires: ncurses = %{version}-%{release} -%if %abi >= 6 -Requires: libncurses6 = %{version}-%{release} -%else -Requires: libncurses5 = %{version}-%{release} Requires: libncurses6 = %{version}-%{release} -%endif +Requires: ncurses = %{version}-%{release} # bug437293 %ifarch ppc64 Obsoletes: ncurses-devel-64bit @@ -271,7 +257,7 @@ Eric S. Raymond <e...@thyrsus.com> %prep -%setup -q -n ncurses-%{version} +%setup -q rm -fr tack rm -f Ada95/src/terminal_interface-curses.adb rm -f Ada95/src/library.gpr @@ -448,19 +434,11 @@ --enable-colorfgbg \ --enable-sp-funcs \ --enable-interop \ -%if %abi >= 6 --with-pthread \ --enable-reentrant \ --enable-ext-mouse \ --disable-widec \ --enable-ext-colors \ -%else - --without-pthread \ - --disable-reentrant \ - --disable-ext-mouse \ - --disable-widec \ - --disable-ext-colors \ -%endif --enable-weak-symbols \ --enable-wgetch-events \ --enable-pthreads-eintr \ @@ -478,11 +456,7 @@ --with-pc-suffix \ --enable-pc-files \ %if %{with symversion} -%if %abi >= 6 --with-versioned-syms=${PWD}/package/ncursest.map \ -%else - --with-versioned-syms=${PWD}/package/ncurses.map \ -%endif %endif %if %{with hasheddb} --with-hashed-db \ @@ -545,11 +519,7 @@ # must not use %jobs here (would lead to: ln: ncurses.h already exists) make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir} ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir} -%if %abi >= 6 - sh %{S:6} --cflags "-I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config -%else - sh %{S:6} --cflags "-I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses5-config -%endif + sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config mkdir pc mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ # @@ -566,21 +536,22 @@ popd unset LD_LIBRARY_PATH test ! -L tack || rm -f tack -%if %abi < 6 make clean - # - # Now use --with-pthread for reentrant pthread support (abi > 5). - # > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! - eval screen -L -D -m ./${c#*./} --with-pthread \ - --enable-reentrant \ - --enable-ext-mouse \ + + # + # Now use --with-pthread for reentrant pthread support (abi == 5). + # + eval screen -L -D -m ./${c#*./} --with-abi-version=5 \ + --without-pthread \ + --disable-reentrant \ + --disable-ext-mouse \ --disable-widec \ --disable-ext-colors \ --disable-overwrite \ %if %{with symversion} - --with-versioned-syms=${PWD}/package/ncursest.map \ + --with-versioned-syms=${PWD}/package/ncurses.map \ %endif --without-progs sleep 1 @@ -589,31 +560,36 @@ cp fallback.c.build ncurses/fallback.c make -C c++ etip.h make %{?_smp_mflags} - sed -ri "s@^(libdir=).show_libdir@\1%{_libdir}/ncurses6@;s@^(includedir=).show_includedir@\1%{_incdir}/ncurses6/ncurses@" misc/gen-pkgconfig + sed -ri 's@^(LDFLAGS=)$@\1-L\\${libdir}@ + s@^(libdir=).show_libdir@\1%{_libdir}/ncurses5@ + s@^(includedir=).show_includedir@\1%{_incdir}/ncurses5@' misc/gen-pkgconfig # must not use %jobs here (would lead to: ln: ncurses.h already exists) - make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses6 includesubdir=/ncurses libdir=%{_libdir}/ncurses6 - ln -sf %{_incdir}/ncurses6/ncurses/{curses,ncurses,term}.h %{root}%{_incdir}/ncurses6/ - sh %{S:6} --cflags "-I%{_incdir}/ncurses6/ncurses -I%{_incdir}/ncurses6" --libs "-L%{_libdir}/ncurses6 -lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config + make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses5 includesubdir=/ncurses libdir=%{_libdir}/ncurses5 + ln -sf %{_incdir}/ncurses5/ncurses/{curses,ncurses,term}.h %{root}%{_incdir}/ncurses5/ + sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses5/ncurses -I%{_incdir}/ncurses5" --libs "-L%{_libdir}/ncurses5 -lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses5-config pushd man - sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1 + sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses5-config.1 popd for pc in %{root}%{_libdir}/pkgconfig/*.pc do test -e "$pc" || break base=${pc%%.pc} base=${base##*/} - mv -f $pc pc/${base}6.pc + case "$base" in + tic) sed -ri 's@^(Requires.private: ).*@\1tinfo5@' "$pc" ;; + *) sed -ri 's@^(Requires.private: ).*@\1ncurses5@' "$pc" + esac + mv -f $pc pc/${base}5.pc done -%endif - make clean + # # Now use --enable-widec for UTF8/wide character support. # The libs with 16 bit wide characters are binary incompatible # to the normal 8bit wide character libs. # + make clean > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! -%if %abi >= 6 eval screen -L -D -m ./${c#*./} --with-pthread \ --enable-reentrant \ --enable-ext-mouse \ @@ -624,15 +600,6 @@ --with-versioned-syms=${PWD}/package/ncursestw.map \ %endif --without-progs -%else - eval screen -L -D -m ./${c#*./} --disable-ext-mouse \ - --enable-widec \ - --disable-ext-colors \ -%if %{with symversion} - --with-versioned-syms=${PWD}/package/ncursesw.map \ -%endif - --without-progs -%endif sleep 1 kill $pid find -name fallback.o | xargs -r rm -vf @@ -641,34 +608,28 @@ make %{?_smp_mflags} # must not use %jobs here (would lead to: ln: ncurses.h already exists) make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncursesw libdir=%{_libdir} -%if %abi >= 6 - sh %{S:6} --cflags "-I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw6-config + sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw6-config pushd man sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw6-config.1 popd -%else - sh %{S:6} --cflags "-I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw5-config - pushd man - sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1 - popd -%endif rm -f %{root}%{_libdir}/pkgconfig/ti*.pc mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ -%if %abi < 6 - make clean + # - # Do both --enable-widec and --with-pthread (abi > 5). + # ABI == 5 # + make clean > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! - eval screen -L -D -m ./${c#*./} --with-pthread \ - --enable-reentrant \ - --enable-ext-mouse \ + eval screen -L -D -m ./${c#*./} --with-abi-version=5 \ + --without-pthread \ + --disable-reentrant \ + --disable-ext-mouse \ --enable-widec \ - --enable-ext-colors \ + --disable-ext-colors \ --disable-overwrite \ %if %{with symversion} - --with-versioned-syms=${PWD}/package/ncursestw.map \ + --with-versioned-syms=${PWD}/package/ncursesw.map \ %endif --without-progs sleep 1 @@ -677,22 +638,30 @@ cp fallback.c.build ncurses/fallback.c make -C c++ etip.h make %{?_smp_mflags} - sed -ri "s@^(libdir=).show_libdir@\1%{_libdir}/ncurses6@;s@^(includedir=).show_includedir@\1%{_incdir}/ncurses6/ncursesw@" misc/gen-pkgconfig + sed -ri 's@^(LDFLAGS=)$@\1-L\\${libdir}@ + s@^(libdir=).show_libdir@\1%{_libdir}/ncurses5@ + s@^(includedir=).show_includedir@\1%{_incdir}/ncurses5/ncursesw@' misc/gen-pkgconfig # must not use %jobs here (would lead to: ln: ncurses.h already exists) - make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses6 includesubdir=/ncursesw libdir=%{_libdir}/ncurses6 - sh %{S:6} --cflags "-I%{_incdir}/ncurses6/ncursesw -I%{_incdir}/ncurses6" --libs "-L%{_libdir}/ncurses6 -lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw6-config + make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses5 includesubdir=/ncursesw libdir=%{_libdir}/ncurses5 + sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses5/ncursesw -I%{_incdir}/ncurses5" --libs "-L%{_libdir}/ncurses5 -lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw5-config pushd man - sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw6-config.1 + sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1 popd - rm -f %{root}%{_libdir}/pkgconfig/ti*.pc for pc in %{root}%{_libdir}/pkgconfig/*.pc do test -e "$pc" || break base=${pc%%.pc} base=${base##*/} - mv -f $pc pc/${base}6.pc + case "$base" in + tinfo) sed -ri 's@(includedir=/usr/include/ncurses5/ncurses)w.*@\1@' "$pc" ;; + tic) sed -ri 's@(includedir=/usr/include/ncurses5/ncurses)w.*@\1@' "$pc" ;; + esac + case "$base" in + tic) sed -ri 's@^(Requires.private: ).*@\1tinfo5@' "$pc" ;; + *) sed -ri 's@^(Requires.private: ).*@\1ncurses5@' "$pc" + esac + mv -f $pc pc/${base}5.pc done -%endif %install GZIP="-9" @@ -706,7 +675,7 @@ test -e "${lib}" || continue mv "${lib}" %{buildroot}/%{_lib}/ || continue done - for lib in %{buildroot}/%{_lib}/${model}.so.%{abi} ; do + for lib in %{buildroot}/%{_lib}/${model}.so.6 ; do test -e "${lib}" || continue test -L "${lib}" || continue lib=${lib#%{buildroot}} @@ -715,7 +684,7 @@ libncurses*) rm -f ${lnk} echo '/* GNU ld script */' > ${lnk} - echo "INPUT(${lib} AS_NEEDED(-ltinfo))" >> ${lnk} + echo "INPUT(${lib} AS_NEEDED(-ltinfo -ldl))" >> ${lnk} ;; *) ln -sf ${lib} %{buildroot}%{_libdir}/${model}.so esac @@ -729,13 +698,12 @@ chmod 0755 %{buildroot}/%{_lib}/lib*.so.* chmod 0755 %{buildroot}/%{_libdir}/lib*.so.* chmod a-x %{buildroot}/%{_libdir}/lib*.a -%if %abi < 6 - if test -d %{buildroot}%{_libdir}/ncurses6 ; then - mv %{buildroot}%{_libdir}/ncurses6/*.so.6* %{buildroot}%{_libdir}/ - for lib in %{buildroot}%{_libdir}/ncurses6/*.so + if test -d %{buildroot}%{_libdir}/ncurses5 ; then + mv %{buildroot}%{_libdir}/ncurses5/*.so.5* %{buildroot}%{_libdir}/ + for lib in %{buildroot}%{_libdir}/ncurses5/*.so do lnk=$lib - lib=/%{_lib}/${lib##*/}.6 + lib=/%{_lib}/${lib##*/}.5 case "${lib##*/}" in libncurses*) rm -f "${lnk}" @@ -757,27 +725,26 @@ test -e "${lib}" || continue mv "${lib}" %{buildroot}/%{_lib}/ || continue done - for lib in %{buildroot}/%{_lib}/${model}.so.6 ; do + for lib in %{buildroot}/%{_lib}/${model}.so.5 ; do test -e "${lib}" || continue test -L "${lib}" || continue lib=${lib#%{buildroot}} - lnk=%{buildroot}%{_libdir}/ncurses6/${model}.so + lnk=%{buildroot}%{_libdir}/ncurses5/${model}.so case "${lib##*/}" in libncurses*) rm -f ${lnk} echo '/* GNU ld script */' > ${lnk} - echo 'SEARCH_DIR(%{_libdir}/ncurses6)' >> ${lnk} + echo 'SEARCH_DIR(%{_libdir}/ncurses5)' >> ${lnk} echo "INPUT(${lib} AS_NEEDED(-ltinfo))" >> ${lnk} ;; - *) ln -sf ${lib} %{buildroot}%{_libdir}/ncurses6/${model}.so + *) ln -sf ${lib} %{buildroot}%{_libdir}/ncurses5/${model}.so esac done done - chmod 0755 %{buildroot}/%{_lib}/lib*.so.6* - chmod 0755 %{buildroot}/%{_libdir}/lib*.so.6* - chmod a-x %{buildroot}/%{_libdir}/ncurses6/lib*.a + chmod 0755 %{buildroot}/%{_lib}/lib*.so.5* + chmod 0755 %{buildroot}/%{_libdir}/lib*.so.5* + chmod a-x %{buildroot}/%{_libdir}/ncurses5/lib*.a fi -%endif test -n "%{buildroot}" || ldconfig -N mkdir -p %{buildroot}%{_defaultdocdir}/ncurses bzip2 -c misc/terminfo.src > misc/terminfo.src.bz2 @@ -872,12 +839,10 @@ > extension.list rm -f %{buildroot}%{_prefix}/lib/terminfo mv pc/*.pc %{buildroot}%{_libdir}/pkgconfig/ -%if %abi < 6 %post -n libncurses5 -p /sbin/ldconfig %postun -n libncurses5 -p /sbin/ldconfig -%endif %post -n libncurses6 -p /sbin/ldconfig @@ -894,6 +859,7 @@ %files -n ncurses-utils %defattr(-,root,root) %{_bindir}/clear +%{_bindir}/infocmp %{_bindir}/reset %{_bindir}/tabs %{_bindir}/toe @@ -906,13 +872,11 @@ %doc %{_mandir}/man1/tput.1.gz %doc %{_mandir}/man1/tset.1.gz %doc %{_mandir}/man5/*.gz -%if %abi == 5 %files -n libncurses5 %defattr(-,root,root) /%{_lib}/lib*.so.5* %{_libdir}/lib*.so.5* -%endif %files -n libncurses6 %defattr(-,root,root) @@ -925,22 +889,21 @@ %doc %{_defaultdocdir}/ncurses/* %{_bindir}/ncurses*-config %{_bindir}/captoinfo -%{_bindir}/infocmp %{_bindir}/infotocap %{_bindir}/tic %dir %{_incdir}/ncurses/ %dir %{_incdir}/ncursesw/ -%dir %{_incdir}/ncurses6/ -%dir %{_incdir}/ncurses6/ncurses/ -%dir %{_incdir}/ncurses6/ncursesw/ +%dir %{_incdir}/ncurses5/ +%dir %{_incdir}/ncurses5/ncurses/ +%dir %{_incdir}/ncurses5/ncursesw/ %{_incdir}/*.h %{_incdir}/ncurses*/*.h %{_incdir}/ncurses*/*/*.h -%dir %{_libdir}/ncurses6/ %{_libdir}/lib*.a %{_libdir}/lib*.so -%{_libdir}/ncurses6/lib*.a -%{_libdir}/ncurses6/lib*.so +%dir %{_libdir}/ncurses5/ +%{_libdir}/ncurses5/lib*.a +%{_libdir}/ncurses5/lib*.so %{_libdir}/pkgconfig/*.pc %doc %{_mandir}/man1/*-config.1.gz %doc %{_mandir}/man1/captoinfo.1.gz ++++++ ncurses-5.9-overwrite.dif ++++++ --- /var/tmp/diff_new_pack.jFlKHh/_old 2015-09-19 06:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.jFlKHh/_new 2015-09-19 06:52:11.000000000 +0200 @@ -17,9 +17,9 @@ +++ configure 2013-09-30 09:17:52.000000000 +0000 @@ -6956,6 +6956,7 @@ else fi; - echo "$as_me:6957: result: $with_overwrite" >&5 + echo "$as_me:6984: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 +WITH_OVERWRITE="$with_overwrite" - echo "$as_me:6960: checking if external terminfo-database is used" >&5 + echo "$as_me:6987: checking if external terminfo-database is used" >&5 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 ++++++ ncurses-5.9-avoid-line-markers.dif -> ncurses-6.0-avoid-line-markers.dif ++++++ --- /work/SRC/openSUSE:Factory/ncurses/ncurses-5.9-avoid-line-markers.dif 2015-02-20 12:00:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ncurses.new/ncurses-6.0-avoid-line-markers.dif 2015-09-19 06:52:10.000000000 +0200 @@ -1,11 +1,15 @@ ---- ncurses/Makefile.in.orig 2015-01-21 13:27:02.427199242 +0100 -+++ ncurses/Makefile.in 2015-01-21 13:27:11.946311063 +0100 -@@ -219,7 +219,7 @@ - sh -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@ +--- + ncurses/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- ncurses/Makefile.in ++++ ncurses/Makefile.in 2015-08-13 15:08:16.989519655 +0000 +@@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) : + $(SHELL) -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@ ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h -- sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ -+ sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS) -P" "$(AWK)" generated <../include/curses.h >$@ +- $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ ++ $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS) -P" "$(AWK)" generated <../include/curses.h >$@ init_keytry.h: make_keys$(BUILD_EXEEXT) keys.list ./make_keys$(BUILD_EXEEXT) keys.list > $@ ++++++ ncurses-5.9-patches.tar.bz2 -> ncurses-6.0-patches.tar.bz2 ++++++ ++++ 1296913 lines of diff (skipped) ++++++ ncurses-5.9-avoid-line-markers.dif -> ncurses-6.0.dif ++++++ ++++ 993 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ncurses/ncurses-5.9-avoid-line-markers.dif ++++ and /work/SRC/openSUSE:Factory/.ncurses.new/ncurses-6.0.dif ++++++ tack-1.07-20130713.tar.bz2 -> tack-1.07-20150606.tar.bz2 ++++++ ++++ 14222 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/CHANGES new/tack-1.07-20150606/CHANGES --- old/tack-1.07-20130713/CHANGES 2013-07-13 21:07:40.000000000 +0200 +++ new/tack-1.07-20150606/CHANGES 2015-06-03 12:32:53.000000000 +0200 @@ -1,8 +1,54 @@ +2015-06-03 Thomas E. Dickey <t...@invisible-island.net> + + * configure: regen + + * configure.in: + tic functions may/may not be bundled with ncurses. Add a configure check + which works with pkg-config, also handling renaming of library used in + the test-packages for ncurses6 + + * package/debian/rules: use ncurses6 package + + * configure: regen + + * configure.in: fix order of evaluation for CF_PKG_CONFIG + +2015-06-02 Thomas E. Dickey <t...@invisible-island.net> + + * configure.in: + use CF_WITH_NCURSES_ETC, but disable the pdcurses flavor + + * configure: regen + + * aclocal.m4: use CF_WITH_NCURSES_ETC + + * control.c: workaround for glibc header defect + + * configure: regen + + * aclocal.m4: resync with my-autoconf + + * tack.h, package/debian/changelog, package/tack.spec: bump + +2015-05-02 Thomas E. Dickey <t...@invisible-island.net> + + * config.guess: update to 2015-03-04 + + * config.sub: update to 2015-03-08 + 2013-07-13 Thomas E. Dickey <t...@invisible-island.net> + * init.c: copyright-date + * init.c: typo - * fun.c, scan.c: fix warnings from clang 3.3 --analyze + * fun.c: copyright-date + + * fun.c: fix warnings from clang 3.3 --analyze + + * scan.c: copyright-date + + * scan.c: fix warnings from clang 3.3 --analyze * init.c: add error check to setupterm call; ncurses does in fact allow hardcopy and @@ -87,6 +133,8 @@ * configure.in: use CF_MAKE_DOCS rule in makefile for generating html/pdf/txt versions of manpages. + * color.c: copyright-date + * color.c: corrected check for ncv (no_color_video), which did not handle the case when all video attributes should work. @@ -101,6 +149,8 @@ * charset.c: add a test for "eslok" capability + * charset.c: copyright-date + * configure: regen * configure.in: @@ -253,7 +303,11 @@ * output.c: fix clang warnings ensure that EOF is tested properly on return from getchp() - * fun.c, crum.c: fix clang warning + * fun.c: fix clang warning + + * crum.c: copyright-date + + * crum.c: fix clang warning * fun.c: ensure that EOF is checked for return-value from getchp() (report by Joachim Schmitz) @@ -291,7 +345,19 @@ * Makefile.in: add dummy for "make check". - * tack.h, tack.c, sysdep.c, sync.c, scan.c, pad.c, output.c, modes.c, menu.c, init.c, fun.c, edit.c, crum.c, control.c, color.c, charset.c, ansi.c: + * tack.h, tack.c, sysdep.c, sync.c, scan.c: indent + + * pad.c: copyright-date + + * pad.c, output.c: indent + + * modes.c: copyright-date + + * modes.c: indent + + * menu.c: copyright-date + + * menu.c, init.c, fun.c, edit.c, crum.c, control.c, color.c, charset.c, ansi.c: indent 2010-04-20 Thomas E. Dickey <t...@invisible-island.net> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/charset.c new/tack-1.07-20150606/charset.c --- old/tack-1.07-20130713/charset.c 2012-04-29 02:14:39.000000000 +0200 +++ new/tack-1.07-20150606/charset.c 2012-04-29 02:14:39.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997-2000 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2000,2012 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: charset.c,v 1.14 2012/04/29 00:14:39 tom Exp $") +MODULE_ID("$Id: charset.c,v 1.15 2012/04/29 00:14:39 tom Exp $") /* Menu definitions for alternate character set and SGR tests. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/color.c new/tack-1.07-20150606/color.c --- old/tack-1.07-20130713/color.c 2012-04-29 16:09:45.000000000 +0200 +++ new/tack-1.07-20150606/color.c 2012-04-29 16:09:45.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997,2012 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: color.c,v 1.11 2012/04/29 14:09:45 tom Exp $") +MODULE_ID("$Id: color.c,v 1.12 2012/04/29 14:09:45 tom Exp $") /* * Color terminal tests. Has only one entry point: test_color(). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/configure.in new/tack-1.07-20150606/configure.in --- old/tack-1.07-20130713/configure.in 2013-07-13 19:23:39.000000000 +0200 +++ new/tack-1.07-20150606/configure.in 2015-06-03 12:30:39.000000000 +0200 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright (c) 2007-2011,2012 Free Software Foundation, Inc. * +dnl Copyright (c) 2007-2013,2015 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * dnl copy of this software and associated documentation files (the * @@ -28,7 +28,7 @@ dnl dnl Author: Thomas E. Dickey 2007-on dnl -dnl $Id: configure.in,v 1.25 2013/07/13 17:23:39 tom Exp $ +dnl $Id: configure.in,v 1.28 2015/06/03 10:30:39 tom Exp $ dnl This is a simple configuration-script for tack which makes it simpler to dnl build outside the ncurses tree (provided that ncurses was configured using dnl the --with-ticlib option). @@ -39,6 +39,10 @@ AC_INIT(tack.c) AC_CONFIG_HEADER(ncurses_cfg.h:ncurses_tst.hin) +AC_DEFUN([CF_PDCURSES_X11],[ +AC_MSG_ERROR(tack cannot be built with PDCurses) +])dnl + CF_INHERIT_SCRIPT(config.guess) CF_INHERIT_SCRIPT(config.sub) CF_CHECK_CACHE @@ -107,33 +111,33 @@ CF_LINK_DATAONLY dnl --------------------------------------------------------------------------- -dnl NcursesW, installed in conventional location -AC_MSG_CHECKING(for ncurses/ncursesw flavor) -AC_ARG_WITH(ncursesw, - [ --with-ncursesw use wide ncurses-libraries (installed)], - [cf_cv_screen=ncursesw],[ - -dnl Ncurses, installed in conventional location -AC_ARG_WITH(ncurses, - [ --with-ncurses use ncurses-libraries (installed)], - [cf_cv_screen=ncurses])]) -AC_MSG_RESULT($cf_cv_screen) - -case $cf_cv_screen in -ncurses) - CF_NCURSES_CONFIG - ;; -ncursesw) - cf_cv_libtype=w - CF_NCURSES_CONFIG(ncursesw) - ;; -*) - CF_CURSES_CONFIG - ;; -esac +CF_PKG_CONFIG +CF_WITH_NCURSES_ETC AC_CHECK_FUNC(_nc_tic_expand,,[ - AC_CHECK_LIB(tic,_nc_tic_expand,[LIBS="-ltic $LIBS"])]) + cf_ticroot=`echo "$cf_ncuconfig_root" | sed -e 's/^n//' -e 's/curses/tic/'` + cf_have_ticconfig=unknown + if test "x$PKG_CONFIG" != xnone; then + AC_MSG_CHECKING(pkg-config for $cf_ticroot) + if "$PKG_CONFIG" --exists $cf_ticroot ; then + cf_have_ticconfig=yes + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ticroot`" + CF_ADD_LIBS(`$PKG_CONFIG --libs $cf_ticroot`) + else + cf_have_ticconfig=no + fi + AC_MSG_RESULT($cf_have_ticconfig) + fi + if test "$cf_have_ticconfig" != yes; then + AC_CHECK_LIB($cf_ticroot,_nc_tic_expand,[LIBS="-l$cf_ticroot $LIBS"],[ + if test "$cf_ticroot" = tic; then + AC_MSG_ERROR(cannot find tic library) + else + AC_CHECK_LIB(tic,_nc_tic_expand,[LIBS="-ltic $LIBS"]) + fi + ]) + fi + ]) # The CF_*CURSES_CONFIG stuff provides curses/ncurses, which may include tinfo. # Check if (a) we have tinfo library and (b) if we need ncurses library too. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/control.c new/tack-1.07-20150606/control.c --- old/tack-1.07-20130713/control.c 2012-03-03 17:03:17.000000000 +0100 +++ new/tack-1.07-20150606/control.c 2015-06-02 12:23:59.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997-2010,2012 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2012,2015 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -25,7 +25,7 @@ #include <sys/time.h> #endif -MODULE_ID("$Id: control.c,v 1.14 2012/03/03 16:03:17 tom Exp $") +MODULE_ID("$Id: control.c,v 1.15 2015/06/02 10:23:59 tom Exp $") /* terminfo test program control subroutines */ @@ -347,7 +347,7 @@ *ch = 0; return; } - if (strchr(pad_repeat_test, *ch)) { + if ((strchr)(pad_repeat_test, *ch)) { /* default action is now repeat */ default_action = 'r'; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/crum.c new/tack-1.07-20150606/crum.c --- old/tack-1.07-20130713/crum.c 2011-05-01 21:08:32.000000000 +0200 +++ new/tack-1.07-20150606/crum.c 2011-05-01 21:08:32.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997,2011 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: crum.c,v 1.8 2011/05/01 19:08:32 tom Exp $") +MODULE_ID("$Id: crum.c,v 1.9 2011/05/01 19:08:32 tom Exp $") /* * Test cursor movement. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/fun.c new/tack-1.07-20150606/fun.c --- old/tack-1.07-20130713/fun.c 2013-07-13 20:48:55.000000000 +0200 +++ new/tack-1.07-20150606/fun.c 2013-07-13 20:48:55.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997-2011,2012 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2012,2013 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: fun.c,v 1.20 2013/07/13 18:48:55 tom Exp $") +MODULE_ID("$Id: fun.c,v 1.21 2013/07/13 18:48:55 tom Exp $") /* * Test the function keys on the terminal. The code for echo tests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/init.c new/tack-1.07-20150606/init.c --- old/tack-1.07-20130713/init.c 2013-07-13 20:59:47.000000000 +0200 +++ new/tack-1.07-20150606/init.c 2013-07-13 20:59:47.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997-2010,2012 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2012,2013 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -23,7 +23,7 @@ #include <tack.h> #include <tic.h> -MODULE_ID("$Id: init.c,v 1.16 2013/07/13 18:59:47 tom Exp $") +MODULE_ID("$Id: init.c,v 1.17 2013/07/13 18:59:47 tom Exp $") #if NCURSES_VERSION_MAJOR >= 5 || NCURSES_VERSION_PATCH >= 981219 #define _nc_get_curterm(p) _nc_get_tty_mode(p) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/menu.c new/tack-1.07-20150606/menu.c --- old/tack-1.07-20130713/menu.c 2010-09-04 00:21:57.000000000 +0200 +++ new/tack-1.07-20150606/menu.c 2010-09-04 00:21:57.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997,2010 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: menu.c,v 1.8 2010/09/03 22:21:57 tom Exp $") +MODULE_ID("$Id: menu.c,v 1.9 2010/09/03 22:21:57 tom Exp $") /* Menu control diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/modes.c new/tack-1.07-20150606/modes.c --- old/tack-1.07-20130713/modes.c 2010-09-04 00:22:49.000000000 +0200 +++ new/tack-1.07-20150606/modes.c 2010-09-04 00:22:49.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997,2010 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: modes.c,v 1.7 2010/09/03 22:22:49 tom Exp $") +MODULE_ID("$Id: modes.c,v 1.8 2010/09/03 22:22:49 tom Exp $") /* * Tests boolean flags and terminal modes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/package/debian/changelog new/tack-1.07-20150606/package/debian/changelog --- old/tack-1.07-20130713/package/debian/changelog 2013-07-13 17:45:17.000000000 +0200 +++ new/tack-1.07-20150606/package/debian/changelog 2015-06-02 10:45:21.000000000 +0200 @@ -1,3 +1,9 @@ +tack (1.07+20150606) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dic...@invisible-island.net> Tue, 02 Jun 2015 04:45:21 -0400 + tack (1.07-20130713) unstable; urgency=low * improvements for configure script diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/package/debian/rules new/tack-1.07-20150606/package/debian/rules --- old/tack-1.07-20130713/package/debian/rules 2010-09-04 17:21:44.000000000 +0200 +++ new/tack-1.07-20150606/package/debian/rules 2015-06-03 11:25:28.000000000 +0200 @@ -33,7 +33,7 @@ --prefix=/usr \ --mandir=\$${prefix}/share/man \ --sysconfdir=/etc \ - --with-ncurses + --with-screen=ncursesw6 touch configure-stamp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/package/tack.spec new/tack-1.07-20150606/package/tack.spec --- old/tack-1.07-20130713/package/tack.spec 2013-07-13 17:45:05.000000000 +0200 +++ new/tack-1.07-20150606/package/tack.spec 2015-06-02 10:45:21.000000000 +0200 @@ -1,8 +1,8 @@ Summary: tack - terminfo action checker %define AppProgram tack %define AppVersion 1.07 -%define AppRelease 20130713 -# $XTermId: tack.spec,v 1.8 2013/07/13 15:45:05 tom Exp $ +%define AppRelease 20150606 +# $XTermId: tack.spec,v 1.9 2015/06/02 08:45:21 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/pad.c new/tack-1.07-20150606/pad.c --- old/tack-1.07-20130713/pad.c 2010-09-04 00:24:25.000000000 +0200 +++ new/tack-1.07-20150606/pad.c 2010-09-04 00:24:25.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997,2010 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: pad.c,v 1.8 2010/09/03 22:24:25 tom Exp $") +MODULE_ID("$Id: pad.c,v 1.9 2010/09/03 22:24:25 tom Exp $") /* test the pad counts on the terminal */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/scan.c new/tack-1.07-20150606/scan.c --- old/tack-1.07-20130713/scan.c 2013-07-13 20:43:00.000000000 +0200 +++ new/tack-1.07-20150606/scan.c 2013-07-13 20:43:00.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997-2010,2012 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2012,2013 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -22,7 +22,7 @@ #include <tack.h> -MODULE_ID("$Id: scan.c,v 1.12 2013/07/13 18:43:00 tom Exp $") +MODULE_ID("$Id: scan.c,v 1.13 2013/07/13 18:43:00 tom Exp $") size_t scan_max; /* length of longest scan code */ char **scan_up, **scan_down, **scan_name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20130713/tack.h new/tack-1.07-20150606/tack.h --- old/tack-1.07-20130713/tack.h 2013-07-13 17:45:17.000000000 +0200 +++ new/tack-1.07-20150606/tack.h 2015-06-02 11:05:07.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997-2011,2012 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2013,2015 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -19,7 +19,7 @@ ** Boston, MA 02110-1301, USA */ -/* $Id: tack.h,v 1.36 2013/07/13 15:45:17 tom Exp $ */ +/* $Id: tack.h,v 1.37 2015/06/02 09:05:07 tom Exp $ */ #ifndef NCURSES_TACK_H_incl #define NCURSES_TACK_H_incl 1 @@ -28,7 +28,7 @@ #define MAJOR_VERSION 1 #define MINOR_VERSION 7 -#define PATCH_VERSION 20130713 +#define PATCH_VERSION 20150606 #ifdef HAVE_CONFIG_H #include <ncurses_cfg.h>
