Hello community, here is the log from the commit of package groff for openSUSE:Factory checked in at 2013-06-11 06:33:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/groff (Old) and /work/SRC/openSUSE:Factory/.groff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "groff" Changes: -------- New Changes file: --- /dev/null 2013-06-08 20:45:13.000037006 +0200 +++ /work/SRC/openSUSE:Factory/.groff.new/groff-full.changes 2013-06-11 09:27:45.000000000 +0200 @@ -0,0 +1,748 @@ +------------------------------------------------------------------- +Thu May 9 09:16:49 UTC 2013 - [email protected] + +- update to groff 1.22.2 + * gropdf: A new driver for generating PDF output directly, + contributed by Deri James and written in Perl + * The -mom macro package has reached version 2.0, focusing on + PDF output with gropdf (using the new `pdfmom' wrapper script). + See the file`version-2.html' of the -mom documentation for a list + of the many changes. + * pdfmom: A new wrapper around groff that facilitates the production of PDF + documents from files formatted with the -mom macros. + * and a lot more, see NEWS for details +- obsoletes: + groff-1.21-groffer-libexecdir.patch, already fixed upstream + config-guess-sub-update.patch, dtto + groff_1.21-6.debian.diff, replaced by +- added groff_1.22.2-2.debian.diff +- create a stripped-down version of groff usable for viewing of manual pages +- new groff-full package contains the rest of groff tools capable to work with + images, html or pdf. It contains the devx fonts, thus obsoletes groff-devx + it aims to fix bnc#755533 - grohtml built without pnm* tools in PATH +- gxdview.spec is removed as gxdview is built from groff-full.spec +- verify the tarball using gpg-offline - this is done in groff-full only + to retain a limited list of dependencies for base groff + +------------------------------------------------------------------- +Tue May 7 14:40:06 UTC 2013 - [email protected] + +- config-guess-sub-update.patch: Update config.guess/sub for aarch64 + +------------------------------------------------------------------- +Mon Feb 4 14:33:41 UTC 2013 - [email protected] + +- update license to new format + +------------------------------------------------------------------- +Fri Sep 7 13:02:36 UTC 2012 - [email protected] + +- add explicit buildrequire makeinfo + +------------------------------------------------------------------- +Sun Mar 18 00:14:49 UTC 2012 - [email protected] + +- Remove redundant tags/sections from specfile +- Enable parallel build with %_smp_mflags + +------------------------------------------------------------------- +Thu Sep 29 12:49:28 UTC 2011 - [email protected] + +- use RPM_OPT_FLAGS for compile + +------------------------------------------------------------------- +Thu Sep 29 08:09:33 UTC 2011 - [email protected] + +- implemented FATE#312586 - Add locales support for groff papersize + * the default papersize is now determined from system locale (LC_PAPER) + * /etc/papersize is no longer owned by the groff package + +------------------------------------------------------------------- +Thu Sep 22 12:50:27 UTC 2011 - [email protected] + +- fix bnc#703665 - VUL-1: groff: missing checks for mktemp failures + (CVE-2009-5080) +- fix bnc#703666 - VUL-1: groff: insufficient number of X for mktemp + (CVE-2009-5081) + +------------------------------------------------------------------- +Mon Jun 27 11:14:25 UTC 2011 - [email protected] + +- update to 1.21 a bugfix release + * use new groff_1.21-6.debian.diff + * refresh libexecdir and pdfroff patch +- fix FATE#311297: Get rid of SuSEconfig.groff + * removed + +------------------------------------------------------------------- +Wed Jun 8 09:06:44 UTC 2011 - [email protected] + +- fix bnc#698290: insecure temporary file handling in pdfroff + * groff-1.20.1-CVE-2009-5044.patch +- fix bnc#683857: Unicode characters in use properly + * change the soft hyphenation char to - in tty.tmac + +------------------------------------------------------------------- +Mon Jun 6 10:10:08 UTC 2011 - [email protected] + +- +- fix bnc#682913: device X100 is missing + * create new groff-devx package containing all devX devices, as they + need X for build +- fix bnc#683857: Unicode characters in use + * groff-1.20.1-deunicode.patch adds deunicode.tmac to tty.tmac removes + all unecessary unicode characters in tty output + +------------------------------------------------------------------- +Tue Mar 15 08:34:56 UTC 2011 - [email protected] + +- fix bnc#679585 - groff.info is not installed + * install info files as %{name}.info.gz + +------------------------------------------------------------------- +Thu Oct 7 09:33:18 UTC 2010 - [email protected] + +- fix bnc#644467: SuSEconfig.groff overwrites /etc/papersize + use the check_md5_and_move to prevent it +- deprecation warning for GROFF* variables in /etc/sysconfig/suseconfig + +------------------------------------------------------------------- +Tue Oct 5 12:25:28 UTC 2010 - [email protected] + +- fix bnc#633128: Update groff to 1.20.1 + this update obsoletes a big number of SUSE patches + * groff_1.18.1.1-1-debian.diff.bz2 - adds Japanese support, which is now + upstreamed. However new groff_1.20.1-10.debian.diff has been added + * suse.patch - not needed + * pic-html.patch - probably not needed + * gcc4.patch - already fixed by upstream + * groff-1.17.2-gcc3.patch - seems not needed + * utf8.patch - http://www.mail-archive.com/[email protected]/msg05273.html says + iconv hack is no longer needed, new version uses preconv + * debian-fix.patch - already fixed by upstream + * double-free.patch - already fixed by upstream + * groffer-security.patch - in debian diff + * groff-1.18.1.1-gcc41.patch - already fixed by upstream + * bugzilla-217106-too-few-arguments-in-function-call.patch - makes sense + only with ENABLE_MULTIBYTE, which was added by old debian diff + * bugzilla-292412-special-encoding-handling-also-for-chinese.patch - seems not necessary + * gcc43.patch - already fixed by upstream + * fgets-overflow.patch - already fixed by upstream + * bnc446710.patch - seems not needed anymore + * groff-1.18.1.1-debian-538330.patch - part of debian diff +- fix bnc#643083 - groff: default /etc/papersize should be "a4" + no "papersize a4" without SuSEconfig anymore +- move docs and examples to groff-docs subpackage + +------------------------------------------------------------------- +Wed Oct 14 13:48:20 UTC 2009 - [email protected] + +- fixed bnc#529557 - groff: insecure file handling + +------------------------------------------------------------------- +Mon Sep 21 11:11:05 CEST 2009 - [email protected] + +- fix broken output of man page when $LANGUAGE is set empty + (bnc#540600) + +------------------------------------------------------------------- +Mon Feb 02 18:47:32 CET 2009 - [email protected] + +- bnc#470921: add more workarounds for Korean to fix the truncation + of some non-Korean man-pages in ko_KR.UTF-8 locale. + +------------------------------------------------------------------- +Mon Dec 22 15:18:31 CET 2008 - [email protected] + +- keep zzz-groff.csh from aborting if LANG is unset + +------------------------------------------------------------------- +Tue Nov 25 15:15:44 CET 2008 - [email protected] + +- bnc#448185: improve workaround for bnc#446710. After the + tmandocdb workaround was removed from "man", the new + workaround in groff failed in some locales. + +------------------------------------------------------------------- +Fri Nov 21 15:54:34 CET 2008 - [email protected] + +- bnc#401952: Add a workaround to /usr/bin/nroff to make Korean + man-pages display correctly again. +- /etc/profile.d/groff.{sh,csh} moved to + /etc/profile.d/zzz-groff.{sh,csh} to be able to check for LANG. + Changes in these scripts: + • Don’t set GROFF_NO_SGR by default anymore, it causes problems + with Korean man pages. + • For CJK languages, set MAN_KEEP_FORMATTING by default. + Without MAN_KEEP_FORMATTING man will use GROFF_NO_SGR when + writing to a pipe or file and will also pipe the result + through "col -b -p -x". This doesn’t work well for CJK, at + least not with the current version of groff. + +------------------------------------------------------------------- +Thu Nov 20 17:48:24 CET 2008 - [email protected] + +- bnc#446710: add the workarounds from + /usr/share/groff/site-tmac/tmac.andocdb (man package) directly + to groff. These workarounds are to avoid rendering - as + U+2010 (HYPHEN), \- as U+2212 (MINUS SIGN), ` as U+2018 + (LEFT SINGLE QUOTATION MARK), and ' as U+2019 (RIGHT SINGLE + QUOTATION MARK). Using these non-ASCII characters for rendering + man-pages with programm examples and command line options is + confusing and prevents cut and paste of code examples + impossible. + +------------------------------------------------------------------- +Wed Oct 8 02:10:33 CEST 2008 - [email protected] + ++++ 551 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.groff.new/groff-full.changes --- /work/SRC/openSUSE:Factory/groff/groff.changes 2013-02-04 21:10:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.groff.new/groff.changes 2013-06-11 09:27:45.000000000 +0200 @@ -1,0 +2,36 @@ +Wed Jun 5 09:00:09 UTC 2013 - [email protected] + +- modify groff_1.22.2-2.debian.diff - remove the part related to + src/preproc/html/pre-html.cpp, fixes bnc#755533 + +------------------------------------------------------------------- +Thu May 9 09:16:49 UTC 2013 - [email protected] + +- update to groff 1.22.2 + * gropdf: A new driver for generating PDF output directly, + contributed by Deri James and written in Perl + * The -mom macro package has reached version 2.0, focusing on + PDF output with gropdf (using the new `pdfmom' wrapper script). + See the file`version-2.html' of the -mom documentation for a list + of the many changes. + * pdfmom: A new wrapper around groff that facilitates the production of PDF + documents from files formatted with the -mom macros. + * and a lot more, see NEWS for details +- obsoletes: + config-guess-sub-update.patch, dtto + groff_1.21-6.debian.diff, replaced by +- added groff_1.22.2-2.debian.diff +- create a stripped-down version of groff usable for viewing of manual pages +- new groff-full package contains the rest of groff tools capable to work with + images, html or pdf. It contains the devx fonts, thus obsoletes groff-devx + it aims to fix bnc#755533 - grohtml built without pnm* tools in PATH +- gxdview.spec is removed as gxdview is built from groff-full.spec +- verify the tarball using gpg-offline - this is done in groff-full only + to retain a limited list of dependencies for base groff + +------------------------------------------------------------------- +Tue May 7 14:40:06 UTC 2013 - [email protected] + +- config-guess-sub-update.patch: Update config.guess/sub for aarch64 + +------------------------------------------------------------------- @@ -251 +287 @@ - With -Tascii8, "\(:u" for �t work. + With -Tascii8, "\(:u" for ü won't work. Old: ---- groff-1.21.tar.gz groff_1.21-6.debian.diff gxditview.changes gxditview.spec New: ---- groff-1.22.2.tar.gz groff-1.22.2.tar.gz.sig groff-full.changes groff-full.keyring groff-full.spec groff_1.22.2-2.debian.diff pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ groff-full.spec ++++++ # # spec file for package groff-full # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # ##### WARNING: please do not edit this auto generated spec file. Use the groff.spec! ##### %global groff_base_only 0 Name: groff-full Version: 1.22.2 Release: 0 Summary: GNU troff Document Formatting System License: BSD-3-Clause and GPL-2.0+ Group: Productivity/Publishing/Troff Url: http://www.gnu.org/software/groff/groff.html Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz.sig Source2: groff-full.keyring Source3: zzz-groff.sh Source4: zzz-groff.csh # for file in `cat series | grep -v '^#' | grep '^[a-z]' `; do # cat $file >> groff_1.21-6.debian.diff # done Patch0: groff_1.22.2-2.debian.diff Patch1: groff-1.20.1-destbufferoverflow.patch Patch2: groff-1.20.1-nroff-empty-LANGUAGE.patch Patch3: groff-1.21-groffer-libexecdir.patch Patch4: groff-1.20.1-deunicode.patch Patch5: groff-1.21-CVE-2009-5044.patch #PATCH-FIX-OPENSUSE: splitted patch6 and patch7 from #http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/groff/groff-1.20.1-owl-tmp.diff?rev=1.2;content-type=text%2Fplain Patch6: groff-1.21-CVE-2009-5080.patch Patch7: groff-1.21-CVE-2009-5081.patch #PATCH-FIX-OPENSUSE: FATE#312586 #sent upstream http://lists.gnu.org/archive/html/bug-groff/2011-09/msg00002.html #so they would be available on next release of groff Patch8: 0001-locale-support-in-papersize-definition.patch Patch9: 0002-documentation-for-the-locale-keyword.patch # change the papersize definition to force the locale usage # it can be supressed by /etc/papersize if needed Patch10: groff-force-locale-usage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: fdupes BuildRequires: gcc-c++ %if 0%{suse_version} > 1220 BuildRequires: makeinfo %endif %if %{groff_base_only} Recommends: groff-full %else BuildRequires: ghostscript-library %if 0%{suse_version} > 1220 BuildRequires: gpg-offline %endif BuildRequires: groff BuildRequires: netpbm BuildRequires: psutils # for gxditview and X fontx BuildRequires: xorg-x11-devel Provides: jgroff = %{version}-%{release} Provides: normal-groff = %{version}-%{release} Obsoletes: jgroff < %{version} # X fonts were moved back Provides: groff-devx = %{version}-%{release} Obsoletes: groff-devx <= 1.21 # requires the -base package Requires: groff = %{version} Requires(pre): %install_info_prereq # for pre-grohtml and pdfroff Requires: ghostscript-library Requires: netpbm Requires: psutils %endif %if %{groff_base_only} %description The groff package is a stripped-down package containing the necessary components to read manual pages in ASCII, Latin-1, and UTF-8, plus the PostScript device (groff's default). Users who want a full groff installation, with the standard set of devices, fonts, macros, and documentation, should install the groff-full package. %else #groff_base_only %description The groff-full package provides aditional tools excluded from base groff package, like grohtml, X fonts et. all. Groff is used to "compile" man pages stored in groff or nroff format for different output devices, for example, displaying to a screen or in PostScript(tm) format for printing on a PostScript(tm) printer. Most programs store their man pages in either /usr/share/man/ or /usr/X11R6/man/. %package -n groff-doc Summary: HTML documentation and examples for groff Group: Productivity/Publishing/Troff %description -n groff-doc The groff package provides compatible versions of troff, nroff, eqn, tbl, and other Unix text formatting utilities. Groff is used to "compile" man pages stored in groff or nroff format for different output devices, for example, displaying to a screen or in PostScript(tm) format for printing on a PostScript(tm) printer. Most programs store their man pages in either /usr/share/man/ or /usr/X11R6/man/. %package -n gxditview Summary: Ditroff Output Displayer for Groff Group: Productivity/Publishing/Troff Requires: groff-full = %{version} # bnc#668254 Supplements: packageand(groff:xorg-x11-libX11) Conflicts: jgxdview Provides: gxdview = %{version}-%{release} Obsoletes: gxdview < %{version} %description -n gxditview This version of xditview is called gxditview and has some extensions used by the groff command. gxditview is used by groff if called with the -X option. %endif #groff_base_only %prep %if ! %{groff_base_only} %if 0%{suse_version} > 1220 # we do a verification on non-base package in order to not add more dependencies to Base:build ... %gpg_verify %{SOURCE1} %endif %endif %setup -q -n groff-%{version} %patch0 -p1 -b .debian %patch1 %patch2 -p1 -b .bnc540600 %patch3 -p1 -b .groffer-libexecdir %patch4 -p1 -b .deunicode %patch5 -p1 -b .CVE-2009-5044 %patch6 -p1 -b .CVE-2009-5080 %patch7 -p1 %patch8 -p1 -b .locale %patch9 -p1 -b .locale %patch10 -p1 -b .force-locale #from patch7 rm doc/groff.info-2.orig %build PATH=$PWD/src/roff/troff:$PWD/src/preproc/pic:$PWD/src/preproc/eqn:$PWD/src/preproc/tbl:$PWDsrc/preproc/refer:$PWD/src/preproc/soelim:$PATH PATH=$PWD/src/roff/grog:$PWD/src/roff/groff:$PWD/src/devices/grops:$PWD/src/devices/grotty:$PWD/src/devices/grodvi:$PWD/src/devices/grohtml:$PATH GROFF_COMMAND_PREFIX= GROFF_FONT_PATH=$PWD GROFF_TMAC_PATH=$PWD/tmac:$PWD/src/roff/troff export PATH GROFF_COMMAND_PREFIX GROFF_FONT_PATH GROFF_TMAC_PATH # #libtoolize --force #autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{configure} \ --with-appresdir=%{_datadir}/X11/app-defaults \ --with-grofferdir=%{_libexecdir}/groff/groffer #ulimit -c unlimited make %{?_smp_mflags} %if ! %{groff_base_only} #pushd doc # make %{?_smp_mflags} # makeinfo groff.texinfo #popd %endif %install %if %{groff_base_only} install -d -m 0755 %{buildroot}%{_bindir} install -d -m 0755 %{buildroot}%{_mandir}/man1 install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/ install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/font/ install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/ install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/ %else %{makeinstall} docdir=%{_defaultdocdir}/groff %endif ### see Debian's groff-base.install.in ### for BIN in eqn groff grog grops grotty neqn nroff pic preconv soelim tbl troff; do %if %{groff_base_only} # install binary install -m 0755 $(find . -type f -name ${BIN}) %{buildroot}/%{_bindir}/ # install man MAN_SOURCE=$(find src -name "${BIN}.n") MAN_DEST="${MAN_SOURCE%.n}.1" # replace suffix .n by .1 MAN_DEST="${MAN_DEST##*/}" # remove the path/before/ install -m 0644 "${MAN_SOURCE}" "%{buildroot}%{_mandir}/man1/${MAN_DEST}" %else # remove binary already in groff.rpm rm %{buildroot}/%{_bindir}/${BIN} # remove manual already in groff.rpm rm %{buildroot}/%{_mandir}/man1/${BIN}.* %endif done %if %{groff_base_only} # datadir install -m 0644 src/utils/indxbib/eign %{buildroot}%{_datadir}/%{name}/%{version}/ %else rm %{buildroot}%{_datadir}/groff/%{version}/eign %endif for FONT in devascii devlatin1 devps devutf8; do %if %{groff_base_only} cp -pr "font/${FONT}" %{buildroot}%{_datadir}/%{name}/%{version}/font/ %else rm -r %{buildroot}%{_datadir}/groff/%{version}/font/${FONT} %endif done for TMAC in an-ext.tmac an-old.tmac an.tmac andoc.tmac composite.tmac cp1047.tmac cs.tmac de.tmac den.tmac \ devtag.tmac doc.tmac doc-old.tmac eqnrc europs.tmac fr.tmac hyphen.cs hyphen.den hyphen.det \ hyphen.fr hyphen.sv hyphen.us hyphenex.cs hyphenex.det hyphenex.us ja.tmac latin1.tmac latin2.tmac \ latin5.tmac latin9.tmac man.tmac mandoc.tmac mdoc.tmac papersize.tmac pic.tmac ps.tmac psatk.tmac \ psold.tmac pspic.tmac safer.tmac sv.tmac trans.tmac troffrc troffrc-end tty-char.tmac tty.tmac \ unicode.tmac www.tmac; do %if %{groff_base_only} cp tmac/${TMAC} %{buildroot}%{_datadir}/%{name}/%{version}/tmac/ %else rm %{buildroot}%{_datadir}/groff/%{version}/tmac/${TMAC} %endif done %if %{groff_base_only} install -m 0644 tmac/doc-common tmac/doc-ditroff tmac/doc-nroff tmac/doc-syms \ %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/ %else rm -rf %{buildroot}%{_datadir}/groff/%{version}/tmac/mdoc %endif %if %{groff_base_only} %{__ln_s} -f current %{buildroot}%{_datadir}/%{name}/%{version} # compat symlinks %{__ln_s} -f eqn %{buildroot}%{_bindir}/geqn %{__ln_s} -f tbl %{buildroot}%{_bindir}/gtbl # install profiles to disable the use of ANSI colour sequences by default: %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/profile.d %{__install} -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/ %endif #groff_base_only %fdupes -s %{buildroot} %if ! %{groff_base_only} %post %install_info --info-dir=%{_infodir} %{_infodir}/groff.info.gz %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/groff.info.gz %endif %if %{groff_base_only} %files %defattr(-,root,root) %doc BUG-REPORT ChangeLog* COPYING FDL LICENSES MANIFEST MORE.STUFF NEWS PROBLEMS PROJECTS README REVISION VERSION %doc %{_mandir}/man1/* %{_bindir}/* %config %{_sysconfdir}/profile.d/zzz-%{name}.*sh %{_datadir}/%{name} %else #groff_base_only %files %defattr(-,root,root) %dir %{_datadir}/groff/%{version} %dir %{_libexecdir}/groff %doc %{_docdir}/groff %exclude %{_docdir}/groff/html %exclude %{_docdir}/groff/examples %doc %{_infodir}/groff* %doc %{_mandir}/man*/* %exclude %{_mandir}/man1/gxditview.1* %{_bindir}/* %exclude %{_bindir}/gxditview %{_datadir}/groff/%{version}/font %{_datadir}/groff/%{version}/oldfont %{_datadir}/groff/%{version}/pic %{_datadir}/groff/%{version}/tmac %{_datadir}/groff/current %{_datadir}/groff/site-tmac %{_libexecdir}/groff/groffer %files -n groff-doc %defattr(-, root, root) %dir %{_docdir}/groff %doc %{_docdir}/groff/html %doc %{_docdir}/groff/examples %files -n gxditview %defattr(-,root,root) %dir %{_datadir}/X11/app-defaults %doc src/devices/xditview/ChangeLog %doc src/devices/xditview/README %doc src/devices/xditview/TODO %{_bindir}/gxditview %doc %{_mandir}/man1/gxditview.1* %{_datadir}/X11/app-defaults/GXditview %{_datadir}/X11/app-defaults/GXditview-color %endif #groff_base_only %changelog ++++++ groff.spec ++++++ --- /var/tmp/diff_new_pack.FiC4uE/_old 2013-06-11 09:27:46.000000000 +0200 +++ /var/tmp/diff_new_pack.FiC4uE/_new 2013-06-11 09:27:46.000000000 +0200 @@ -16,20 +16,27 @@ # +%global groff_base_only 1 + Name: groff -Version: 1.21 +Version: 1.22.2 Release: 0 Summary: GNU troff Document Formatting System License: BSD-3-Clause and GPL-2.0+ Group: Productivity/Publishing/Troff Url: http://www.gnu.org/software/groff/groff.html Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz +Source1: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz.sig +Source2: groff-full.keyring Source3: zzz-groff.sh Source4: zzz-groff.csh +# rm -f foo # for file in `cat series | grep -v '^#' | grep '^[a-z]' `; do -# cat $file >> groff_1.21-6.debian.diff +# cat $file >> foo # done -Patch0: groff_1.21-6.debian.diff +##remove a part related to src/preproc/html/pre-html.cpp - see bnc#755533 +# filterdiff -x 'src/preproc/html/pre-html.cpp' foo > groff_1.22.2-2.debian.diff +Patch0: groff_1.22.2-2.debian.diff Patch1: groff-1.20.1-destbufferoverflow.patch Patch2: groff-1.20.1-nroff-empty-LANGUAGE.patch Patch3: groff-1.21-groffer-libexecdir.patch @@ -55,19 +62,48 @@ %if 0%{suse_version} > 1220 BuildRequires: makeinfo %endif + +%if %{groff_base_only} +Recommends: groff-full +%else +BuildRequires: ghostscript-library +%if 0%{suse_version} > 1220 +BuildRequires: gpg-offline +%endif +BuildRequires: groff +BuildRequires: netpbm +BuildRequires: psutils +# for gxditview and X fontx +BuildRequires: xorg-x11-devel + Provides: jgroff = %{version}-%{release} Provides: normal-groff = %{version}-%{release} Obsoletes: jgroff < %{version} -Requires(pre): %fillup_prereq +# X fonts were moved back +Provides: groff-devx = %{version}-%{release} +Obsoletes: groff-devx <= 1.21 +# requires the -base package +Requires: groff = %{version} Requires(pre): %install_info_prereq # for pre-grohtml and pdfroff -Recommends: netpbm -Recommends: ghostscript-library -Recommends: pssutils +Requires: ghostscript-library +Requires: netpbm +Requires: psutils +%endif +%if %{groff_base_only} %description -The groff package provides compatible versions of troff, nroff, eqn, -tbl, and other Unix text formatting utilities. +The groff package is a stripped-down package containing the necessary +components to read manual pages in ASCII, Latin-1, and UTF-8, plus the +PostScript device (groff's default). Users who want a full groff installation, +with the standard set of devices, fonts, macros, and documentation, should +install the groff-full package. + +%else #groff_base_only + +%description +The groff-full package provides aditional tools excluded from base groff +package, like grohtml, X fonts et. all. Groff is used to "compile" man pages stored in groff or nroff format for different output devices, for example, displaying to a screen or in @@ -75,11 +111,11 @@ programs store their man pages in either /usr/share/man/ or /usr/X11R6/man/. -%package doc +%package -n groff-doc Summary: HTML documentation and examples for groff Group: Productivity/Publishing/Troff -%description doc +%description -n groff-doc The groff package provides compatible versions of troff, nroff, eqn, tbl, and other Unix text formatting utilities. @@ -89,8 +125,32 @@ programs store their man pages in either /usr/share/man/ or /usr/X11R6/man/. +%package -n gxditview +Summary: Ditroff Output Displayer for Groff +Group: Productivity/Publishing/Troff +Requires: groff-full = %{version} +# bnc#668254 +Supplements: packageand(groff:xorg-x11-libX11) +Conflicts: jgxdview +Provides: gxdview = %{version}-%{release} +Obsoletes: gxdview < %{version} + +%description -n gxditview +This version of xditview is called gxditview and has some extensions +used by the groff command. gxditview is used by groff if called with +the -X option. + +%endif #groff_base_only + %prep -%setup -q +%if ! %{groff_base_only} +%if 0%{suse_version} > 1220 +# we do a verification on non-base package in order to not add more dependencies to Base:build ... +%gpg_verify %{SOURCE1} +%endif +%endif + +%setup -q -n groff-%{version} %patch0 -p1 -b .debian %patch1 %patch2 -p1 -b .bnc540600 @@ -103,6 +163,9 @@ %patch9 -p1 -b .locale %patch10 -p1 -b .force-locale +#from patch7 +rm doc/groff.info-2.orig + %build PATH=$PWD/src/roff/troff:$PWD/src/preproc/pic:$PWD/src/preproc/eqn:$PWD/src/preproc/tbl:$PWDsrc/preproc/refer:$PWD/src/preproc/soelim:$PATH PATH=$PWD/src/roff/grog:$PWD/src/roff/groff:$PWD/src/devices/grops:$PWD/src/devices/grotty:$PWD/src/devices/grodvi:$PWD/src/devices/grohtml:$PATH @@ -115,22 +178,92 @@ #autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%{configure} -ulimit -c unlimited +%{configure} \ + --with-appresdir=%{_datadir}/X11/app-defaults \ + --with-grofferdir=%{_libexecdir}/groff/groffer + +#ulimit -c unlimited make %{?_smp_mflags} -pushd doc - make %{?_smp_mflags} - makeinfo groff.texinfo -popd + +%if ! %{groff_base_only} +#pushd doc +# make %{?_smp_mflags} +# makeinfo groff.texinfo +#popd +%endif %install -%{makeinstall} docdir=%{_defaultdocdir}/%{name} +%if %{groff_base_only} +install -d -m 0755 %{buildroot}%{_bindir} +install -d -m 0755 %{buildroot}%{_mandir}/man1 +install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/ +install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/font/ +install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/ +install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/ +%else + %{makeinstall} docdir=%{_defaultdocdir}/groff +%endif + +### see Debian's groff-base.install.in ### +for BIN in eqn groff grog grops grotty neqn nroff pic preconv soelim tbl troff; do + +%if %{groff_base_only} + # install binary + install -m 0755 $(find . -type f -name ${BIN}) %{buildroot}/%{_bindir}/ + + # install man + MAN_SOURCE=$(find src -name "${BIN}.n") + MAN_DEST="${MAN_SOURCE%.n}.1" # replace suffix .n by .1 + MAN_DEST="${MAN_DEST##*/}" # remove the path/before/ + install -m 0644 "${MAN_SOURCE}" "%{buildroot}%{_mandir}/man1/${MAN_DEST}" +%else + # remove binary already in groff.rpm + rm %{buildroot}/%{_bindir}/${BIN} + # remove manual already in groff.rpm + rm %{buildroot}/%{_mandir}/man1/${BIN}.* +%endif + +done + +%if %{groff_base_only} +# datadir +install -m 0644 src/utils/indxbib/eign %{buildroot}%{_datadir}/%{name}/%{version}/ +%else +rm %{buildroot}%{_datadir}/groff/%{version}/eign +%endif + +for FONT in devascii devlatin1 devps devutf8; do +%if %{groff_base_only} + cp -pr "font/${FONT}" %{buildroot}%{_datadir}/%{name}/%{version}/font/ +%else + rm -r %{buildroot}%{_datadir}/groff/%{version}/font/${FONT} +%endif +done + +for TMAC in an-ext.tmac an-old.tmac an.tmac andoc.tmac composite.tmac cp1047.tmac cs.tmac de.tmac den.tmac \ + devtag.tmac doc.tmac doc-old.tmac eqnrc europs.tmac fr.tmac hyphen.cs hyphen.den hyphen.det \ + hyphen.fr hyphen.sv hyphen.us hyphenex.cs hyphenex.det hyphenex.us ja.tmac latin1.tmac latin2.tmac \ + latin5.tmac latin9.tmac man.tmac mandoc.tmac mdoc.tmac papersize.tmac pic.tmac ps.tmac psatk.tmac \ + psold.tmac pspic.tmac safer.tmac sv.tmac trans.tmac troffrc troffrc-end tty-char.tmac tty.tmac \ + unicode.tmac www.tmac; do + +%if %{groff_base_only} + cp tmac/${TMAC} %{buildroot}%{_datadir}/%{name}/%{version}/tmac/ +%else + rm %{buildroot}%{_datadir}/groff/%{version}/tmac/${TMAC} +%endif +done -%{__rm} -f %{buildroot}%{_infodir}/dir +%if %{groff_base_only} +install -m 0644 tmac/doc-common tmac/doc-ditroff tmac/doc-nroff tmac/doc-syms \ + %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/ +%else +rm -rf %{buildroot}%{_datadir}/groff/%{version}/tmac/mdoc +%endif + +%if %{groff_base_only} -# documentation -%{__cp} -pr BUG-REPORT ChangeLog* COPYING FDL LICENSES MANIFEST MORE.STUFF NEWS PROBLEMS PROJECTS README README.MinGW REVISION VERSION doc/*ps \ - %{buildroot}/%{_defaultdocdir}/%{name}/ +%{__ln_s} -f current %{buildroot}%{_datadir}/%{name}/%{version} # compat symlinks %{__ln_s} -f eqn %{buildroot}%{_bindir}/geqn @@ -140,31 +273,65 @@ %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/profile.d %{__install} -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/ +%endif #groff_base_only + %fdupes -s %{buildroot} +%if ! %{groff_base_only} %post -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/groff.info.gz %postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/groff.info.gz +%endif +%if %{groff_base_only} %files -%defattr(-, root, root) -%dir %{_defaultdocdir}/groff -%doc %{_defaultdocdir}/groff/ -%exclude %{_defaultdocdir}/groff/html -%exclude %{_defaultdocdir}/groff/examples -%doc %{_infodir}/groff* -%doc %{_mandir}/man?/* +%defattr(-,root,root) +%doc BUG-REPORT ChangeLog* COPYING FDL LICENSES MANIFEST MORE.STUFF NEWS PROBLEMS PROJECTS README REVISION VERSION +%doc %{_mandir}/man1/* %{_bindir}/* %config %{_sysconfdir}/profile.d/zzz-%{name}.*sh %{_datadir}/%{name} -%{_libexecdir}/%{name} -%files doc +%else #groff_base_only +%files +%defattr(-,root,root) +%dir %{_datadir}/groff/%{version} +%dir %{_libexecdir}/groff +%doc %{_docdir}/groff +%exclude %{_docdir}/groff/html +%exclude %{_docdir}/groff/examples +%doc %{_infodir}/groff* +%doc %{_mandir}/man*/* +%exclude %{_mandir}/man1/gxditview.1* +%{_bindir}/* +%exclude %{_bindir}/gxditview +%{_datadir}/groff/%{version}/font +%{_datadir}/groff/%{version}/oldfont +%{_datadir}/groff/%{version}/pic +%{_datadir}/groff/%{version}/tmac +%{_datadir}/groff/current +%{_datadir}/groff/site-tmac +%{_libexecdir}/groff/groffer + +%files -n groff-doc %defattr(-, root, root) -%dir %{_defaultdocdir}/groff -%doc %{_defaultdocdir}/groff/html -%doc %{_defaultdocdir}/groff/examples +%dir %{_docdir}/groff +%doc %{_docdir}/groff/html +%doc %{_docdir}/groff/examples + +%files -n gxditview +%defattr(-,root,root) +%dir %{_datadir}/X11/app-defaults +%doc src/devices/xditview/ChangeLog +%doc src/devices/xditview/README +%doc src/devices/xditview/TODO +%{_bindir}/gxditview +%doc %{_mandir}/man1/gxditview.1* +%{_datadir}/X11/app-defaults/GXditview +%{_datadir}/X11/app-defaults/GXditview-color + +%endif #groff_base_only %changelog ++++++ groff-1.21-groffer-libexecdir.patch ++++++ --- /var/tmp/diff_new_pack.FiC4uE/_old 2013-06-11 09:27:46.000000000 +0200 +++ /var/tmp/diff_new_pack.FiC4uE/_new 2013-06-11 09:27:46.000000000 +0200 @@ -1,35 +1,17 @@ -Index: groff-1.21/contrib/groffer/Makefile.sub +Index: groff-1.22.2/contrib/groffer/Makefile.sub =================================================================== ---- groff-1.21.orig/contrib/groffer/Makefile.sub 2010-12-31 08:33:09.000000000 +0100 -+++ groff-1.21/contrib/groffer/Makefile.sub 2011-06-27 13:10:49.646150367 +0200 -@@ -63,7 +63,7 @@ - GROFFER_PERL_=`echo $(GROFFER_PERL) | sed 's|$(srcdir)/perl/||g'` - GROFFER_SHELL_=`echo $(GROFFER_SHELL) | sed 's|$(srcdir)/shell||g'` - --groffer_dir=$(libdir)/groff/groffer -+groffer_dir=$(libexecdir)/groff/groffer - - # TODO: Add perl check to configure script. - groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \ -@@ -74,7 +74,7 @@ - sed -f "$(SH_DEPS_SED_SCRIPT)" \ - -e "s|@g@|$(g)|g" \ - -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ -- -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ -+ -e "s|@libdir@|$(DESTDIR)$(libexecdir)|g" \ - -e "s|@VERSION@|$(version)$(revision)|g" \ - -e "$(SH_SCRIPT_SED_CMD)" \ - $(srcdir)/perl/groffer.pl >$@; \ -@@ -88,7 +88,7 @@ +--- groff-1.22.2.orig/contrib/groffer/Makefile.sub ++++ groff-1.22.2/contrib/groffer/Makefile.sub +@@ -73,7 +73,7 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL sed -f "$(SH_DEPS_SED_SCRIPT)" \ -e "s|@g@|$(g)|g" \ -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ - -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ -+ -e "s|@libdir@|$(DESTDIR)$(libexecdir)|g" \ ++ -e "s|@libexecdir@|$(DESTDIR)$(libexecdir)|g" \ + -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \ -e "s|@VERSION@|$(version)$(revision)|g" \ -e "$(SH_SCRIPT_SED_CMD)" \ - $(srcdir)/shell/groffer.sh >$@; \ -@@ -137,7 +137,7 @@ +@@ -138,7 +138,7 @@ uninstall_sub: for f in $(GROFFER_PERL_) $(GROFFER_SHELL_) version.sh; do \ $(RM) $(DESTDIR)$(groffer_dir)/$$f; \ done @@ -38,11 +20,11 @@ ######################################################################## # Emacs settings -Index: groff-1.21/Makefile.in +Index: groff-1.22.2/Makefile.in =================================================================== ---- groff-1.21.orig/Makefile.in 2011-06-27 13:10:49.595148562 +0200 -+++ groff-1.21/Makefile.in 2011-06-27 13:10:49.647150402 +0200 -@@ -139,6 +139,9 @@ +--- groff-1.22.2.orig/Makefile.in ++++ groff-1.22.2/Makefile.in +@@ -139,6 +139,9 @@ bindir=@bindir@ libdir=@libdir@ libprogramdir=$(libdir)/groff @@ -52,7 +34,7 @@ # `datasubdir' says where to install platform-independent data files. datadir=@datadir@ datarootdir=@datarootdir@ -@@ -786,7 +789,7 @@ +@@ -811,7 +814,7 @@ $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): fi; \ test -d $@ || $(mkinstalldirs) $@; \ cd $@; \ ++++++ groff-1.21.tar.gz -> groff-1.22.2.tar.gz ++++++ ++++ 109237 lines of diff (skipped) ++++++ groff-full.keyring ++++++ pub 1024D/E707FDA5 2003-10-25 uid Werner Lemberg <[email protected]> sub 1024g/A5638324 2003-10-25 -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.19 (GNU/Linux) mQGiBD+Z+pwRBACnK1FszJzA033xBE6MVbjhP1DLFNBLwhw+2hcTLOWvcsdbQh74 BTSjR61QnFj0JcfmGXa2Qk6wsLL8r3mY2CrAtYf3MnXDU7ZImmVO4VJ4YvVO7FMz 7Xl7TyEfz32aWT/FUMRbFsT8HTIv0gVimpvnOC5z0U53LbgI7TK2gp+UXwCgiNJC +/0b9pskbjH8V5lyNPTR6pMD/0pjqPrWynPfuG015Bpc4GtfduB7RR7wWJwQq1s7 5E/peGYqPk/yyGWfnSlhyW9+OuPxnCIxtoosqD5/gcaEK64qTzSmvdhP7csU6zk6 Emb2RLfMX17fOWKTF5cfjpvGvhr0P4jukJ3q3q4JL+ZQLNuxW0ZrItujorG44jlc dSIZA/9VEegNNz5OnvrvWfU/jK/inXoSisdNunkxDpIshxCpph0xdMJqKcIsAfG0 CsuNkDlDQSW1bGIS9zrK41PcYWs/2P/6lgEStiEPVXziqMZsXnDKuMRN32edLM9Z oGCoUFxWkGl8gtZqJUtOS86IABPG/5unldCfAulL1qDU267QcLQbV2VybmVyIExl bWJlcmcgPHdsQGdudS5vcmc+iF8EExECABcFAj+Z+pwFCwcKAwQDFQMCAxYCAQIX gAASCRDBpg6s5wf9pQdlR1BHAAEBTb0An2+FGaqF6B+L98SwovRKTj6RNHRDAKCH 8XAgZBXmnJkuFZdehXUeaELcMLkBDQQ/mfqiEAQA/GIc47GVhBUfmH1QzUhm4Y6W YY+i2Rc6+ZpY94VUgZfF4Uc6T7bcNI/lsKfp7JlU3NOMnCbSpPDbWnlJk3O/w79y Eq5uxSGxIkXQSNd6X7K31DpgdhO05GDXGlmy9uQIknqxyT5J2LVp3T8UXFMDdPkh MfDLwo5Ku9PxTmMajUsAAwUEAKIZgRV4Hn4sbgFz0oYVuwa/RywQ25t5j4fCh2D9 F2dN+RvacgqZS4JJVKJgXT9dVkXMo/3CBPx5gXTyJv/Xfk5GZxX3i1Cf6xn7Bz4z sy5P1dapDdI+wpnqn/S7Zm6oqJQJkrKl3F0JiReo7xZZuuoEyOxPI/6MLSKpBnjL Vx6giE4EGBECAAYFAj+Z+qIAEgkQwaYOrOcH/aUHZUdQRwABAVwZAKCBYF9/CYty NErAzbX8HQVZqExjKwCfctp0iVHu49WYBxGYpTb6kiuRL7c= =wMZR -----END PGP PUBLIC KEY BLOCK----- ++++++ groff_1.21-6.debian.diff -> groff_1.22.2-2.debian.diff ++++++ --- /work/SRC/openSUSE:Factory/groff/groff_1.21-6.debian.diff 2011-09-23 02:02:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.groff.new/groff_1.22.2-2.debian.diff 2013-06-11 09:27:45.000000000 +0200 @@ -198,105 +198,19 @@ review. Author: Colin Watson <[email protected]> Forwarded: no -Last-Update: 2010-03-01 +Last-Update: 2013-01-07 -Index: b/src/preproc/html/pre-html.cpp -=================================================================== ---- a/src/preproc/html/pre-html.cpp -+++ b/src/preproc/html/pre-html.cpp -@@ -152,6 +152,10 @@ - #define DEFAULT_IMAGE_RES 100 // number of pixels per inch resolution - #define IMAGE_BOARDER_PIXELS 0 - #define INLINE_LEADER_CHAR '\\' -+#define A4_LENGTH 841890 // taken from devps/Makefile.sub -+#define LETTER_LENGTH 792000 // taken from devps/Makefile.sub -+#define A4_OFFSET 0 -+#define LETTER_OFFSET 50 // 50/72 of an inch - - // Don't use colour names here! Otherwise there is a dependency on - // a file called `rgb.txt' which maps names to colours. -@@ -199,6 +203,7 @@ - // by -D - static int troff_arg = 0; // troff arg index - static char *image_dir = NULL; // user specified image directory -+static char *gsPaper = NULL; // the paper size that gs must use - static int textAlphaBits = MAX_ALPHA_BITS; - static int graphicAlphaBits = MAX_ALPHA_BITS; - static char *antiAlias = NULL; // antialias arguments we pass to gs -@@ -312,6 +317,54 @@ - } - - /* -+ * get_papersize - returns an integer determining the paper length from -+ * devps/DESC -+ */ -+ -+static int get_papersize (void) -+{ -+ char *pathp; -+ FILE *f; -+ int res; -+ f = font_path.open_file("devps/DESC", &pathp); -+ if (f == 0) -+ fatal("can't open devps/DESC"); -+ while (get_line(f)) { -+ int n = sscanf(linebuf, "paperlength %d", &res); -+ if (n >= 1) { -+ fclose(f); -+ return res; -+ } -+ if (!strncmp(linebuf, "papersize", 9)) { -+ double length; -+ char *p = linebuf + 9; -+ while (*p == ' ' || *p == '\t') -+ p++; -+ for (p = strtok(p, " \t"); p; p = strtok(0, " \t")) { -+ if (font::scan_papersize(p, 0, &length, 0)) { -+ fclose(f); -+ return int(length * postscriptRes + 0.5); -+ } -+ } -+ fatal("bad argument to `papersize' keyword in devps/DESC"); -+ } -+ } -+ fatal("can't find `papersize' or `paperlength' keyword in devps/DESC"); -+ return 0; -+} -+ -+/* -+ * determine_vertical_offset - works out the default vertical offset from -+ * the page length -+ */ -+ -+static void determine_vertical_offset (void) -+{ -+ vertical_offset = ((A4_LENGTH-get_papersize())*72)/postscriptRes; -+ gsPaper = "-sPAPERSIZE=a4"; -+} -+ -+/* - * html_system - A wrapper for system(). - */ - -@@ -1781,6 +1834,7 @@ - if (image_gen == NULL || (strcmp(image_gen, "") == 0)) - fatal("devhtml/DESC must set the image_generator field, exiting"); - postscriptRes = get_resolution(); -+ determine_vertical_offset(); - i = scanArguments(argc, argv); - setupAntiAlias(); - checkImageDir(); Description: Add GFDL references to manual pages licensed under GFDL Author: Colin Watson <[email protected]> Bug-Debian: http://bugs.debian.org/292229 Forwarded: not-needed -Last-Update: 2010-03-01 +Last-Update: 2013-01-07 Index: b/contrib/mom/groff_mom.man =================================================================== --- a/contrib/mom/groff_mom.man +++ b/contrib/mom/groff_mom.man -@@ -14,6 +14,10 @@ +@@ -15,6 +15,10 @@ A copy of the Free Documentation License is included as a file called FDL in the main directory of the groff source package. .. @@ -326,7 +240,7 @@ =================================================================== --- a/man/groff.man +++ b/man/groff.man -@@ -19,6 +19,10 @@ +@@ -18,6 +18,10 @@ A copy of the Free Documentation License is included as a file called FDL in the main directory of the groff source package. .. @@ -337,26 +251,11 @@ . .\" -------------------------------------------------------------------- .\" Setup -Index: b/man/groff_char.man -=================================================================== ---- a/man/groff_char.man -+++ b/man/groff_char.man -@@ -32,6 +32,10 @@ - A copy of the Free Documentation License is included as a file called - FDL in the main directory of the groff source package. - .. -+.ig -+A copy of the GNU Free Documentation License is also available in this -+Debian package as /usr/share/doc/groff/copyright. -+.. - . - .\" -------------------------------------------------------------------- - .\" Setup Part 1 Index: b/man/groff_diff.man =================================================================== --- a/man/groff_diff.man +++ b/man/groff_diff.man -@@ -23,6 +23,10 @@ +@@ -22,6 +22,10 @@ A copy of the Free Documentation License is included as a file called FDL in the main directory of the groff source package. .. @@ -494,17 +393,17 @@ for it is unclear. Needs investigation. Author: unknown Forwarded: no -Last-Update: 2010-03-01 +Last-Update: 2013-01-07 Index: b/Makefile.in =================================================================== --- a/Makefile.in +++ b/Makefile.in -@@ -680,7 +680,7 @@ +@@ -702,7 +702,7 @@ fi do=all --dodirs=$(ALLDIRS) dot +-dodirs=$(ALLDIRS) $(OTHERDIRS) dot +dodirs=$(DISTDIRS) # Default target for subdir_Makefile subdir=src/roff/troff @@ -515,7 +414,7 @@ Author: Colin Watson <[email protected]> Bug-Debian: http://bugs.debian.org/495713 Forwarded: no -Last-Update: 2010-03-01 +Last-Update: 2013-01-07 Index: b/src/preproc/eqn/main.cpp =================================================================== @@ -534,7 +433,7 @@ =================================================================== --- a/src/preproc/pic/main.cpp +++ b/src/preproc/pic/main.cpp -@@ -612,7 +612,11 @@ +@@ -616,7 +616,11 @@ out = make_fig_output(); else #endif @@ -546,75 +445,18 @@ #ifdef FIG_SUPPORT if (whole_file_flag) { if (optind >= argc) -Description: Add mdoc support for various BSD versions -Author: Guillem Jover <[email protected]> -Bug-Debian: http://bugs.debian.org/629159 -Forwarded: yes -Last-Update: 2011-06-06 - -Index: b/tmac/doc-common -=================================================================== ---- a/tmac/doc-common -+++ b/tmac/doc-common -@@ -451,12 +451,16 @@ - .ds doc-operating-system-NetBSD-3.0 3.0 - .ds doc-operating-system-NetBSD-3.0.1 3.0.1 - .ds doc-operating-system-NetBSD-3.0.2 3.0.2 -+.ds doc-operating-system-NetBSD-3.0.3 3.0.3 - .ds doc-operating-system-NetBSD-3.1 3.1 -+.ds doc-operating-system-NetBSD-3.1.1 3.1.1 - .ds doc-operating-system-NetBSD-4.0 4.0 - .ds doc-operating-system-NetBSD-4.0.1 4.0.1 - .ds doc-operating-system-NetBSD-5.0 5.0 - .ds doc-operating-system-NetBSD-5.0.1 5.0.1 - .ds doc-operating-system-NetBSD-5.0.2 5.0.2 -+.ds doc-operating-system-NetBSD-5.1 5.1 -+.ds doc-operating-system-NetBSD-6.0 6.0 - . - .ds doc-operating-system-OpenBSD-2.0 2.0 - .ds doc-operating-system-OpenBSD-2.1 2.1 -@@ -487,6 +491,8 @@ - .ds doc-operating-system-OpenBSD-4.6 4.6 - .ds doc-operating-system-OpenBSD-4.7 4.7 - .ds doc-operating-system-OpenBSD-4.8 4.8 -+.ds doc-operating-system-OpenBSD-4.9 4.9 -+.ds doc-operating-system-OpenBSD-5.0 5.0 - . - .ds doc-operating-system-FreeBSD-1.0 1.0 - .ds doc-operating-system-FreeBSD-1.1 1.1 -@@ -543,6 +549,8 @@ - .ds doc-operating-system-FreeBSD-7.3 7.3 - .ds doc-operating-system-FreeBSD-8.0 8.0 - .ds doc-operating-system-FreeBSD-8.1 8.1 -+.ds doc-operating-system-FreeBSD-8.2 8.2 -+.ds doc-operating-system-FreeBSD-9.0 9.0 - . - .ds doc-operating-system-Darwin-8.0.0 8.0.0 - .ds doc-operating-system-Darwin-8.1.0 8.1.0 -@@ -581,6 +589,11 @@ - .ds doc-operating-system-DragonFly-2.4 2.4 - .ds doc-operating-system-DragonFly-2.6 2.6 - .ds doc-operating-system-DragonFly-2.8 2.8 -+.ds doc-operating-system-DragonFly-2.9 2.9 -+.ds doc-operating-system-DragonFly-2.9.1 2.9.1 -+.ds doc-operating-system-DragonFly-2.10 2.10 -+.ds doc-operating-system-DragonFly-2.10.1 2.10.1 -+.ds doc-operating-system-DragonFly-2.11 2.11 - . - .de Os - . ds doc-command-name Description: Allow adding a version-independent directory to the macro path This allows us to put /usr/share/groff/tmac at the end of groff's macro path in Debian. Author: Colin Watson <[email protected]> Forwarded: no -Last-Update: 2010-03-01 +Last-Update: 2013-01-07 Index: b/Makefile.in =================================================================== --- a/Makefile.in +++ b/Makefile.in -@@ -193,7 +193,11 @@ +@@ -195,7 +195,11 @@ # directory will be always added. # `troffrc' and `troffrc-end' (and `eqnrc') are searched neither in the # current nor in the home directory. @@ -699,13 +541,13 @@ rather than groff-base, refer the user to that. Author: Colin Watson <[email protected]> Forwarded: not-needed -Last-Update: 2010-03-01 +Last-Update: 2013-01-07 Index: b/src/roff/groff/groff.cpp =================================================================== --- a/src/roff/groff/groff.cpp +++ b/src/roff/groff/groff.cpp -@@ -323,8 +323,16 @@ +@@ -333,8 +333,16 @@ commands[PIC_INDEX].append_arg("-U"); } font::set_unknown_desc_command_handler(handle_unknown_desc_command); @@ -724,59 +566,3 @@ if (!postdriver) fatal("no `postpro' command in DESC file for device `%1'", device); if (predriver && !zflag) { -Description: Only emit a single backspace for bold/underline in no-SGR mode - less (at least) backspaces over a character at a time. -Author: Colin Watson <[email protected]> -Forwarded: http://lists.gnu.org/archive/html/bug-groff/2011-01/msg00003.html -Last-Update: 2011-01-10 - -Index: b/src/devices/grotty/tty.cpp -=================================================================== ---- a/src/devices/grotty/tty.cpp -+++ b/src/devices/grotty/tty.cpp -@@ -311,11 +311,8 @@ - if (!w) - warning("can't underline zero-width character"); - else { -- int n = w / font::hor; -- for (int i = 0; i < n; i++) -- putchar('_'); -- for (int j = 0; j < n; j++) -- putchar('\b'); -+ putchar('_'); -+ putchar('\b'); - } - } - else { -@@ -337,10 +334,8 @@ - if (!w) - warning("can't print zero-width character in bold"); - else { -- int n = w / font::hor; - put_char(c); -- for (int i = 0; i < n; i++) -- putchar('\b'); -+ putchar('\b'); - } - } - else { -Description: Fix -mm .RD macro to use .if rather than .ie -Author: James Avera -Bug-Ubuntu: https://bugs.launchpad.net/bugs/738169 -Forwarded: yes -Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/groff/main/revision/1992 -Last-Update: 2011-03-19 - -Index: b/contrib/mm/m.tmac -=================================================================== ---- a/contrib/mm/m.tmac -+++ b/contrib/mm/m.tmac -@@ -689,7 +689,7 @@ - .rd \\$1\t - .br - .di --.ie !''\\$3' \{\ -+.if !''\\$3' \{\ - . di misc*rd2 - . ds \\$3 "\\*[misc*rd] - . br ++++++ pre_checkin.sh ++++++ #!/bin/sh EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the groff.spec! #####\n" sed "s/^%global groff_base_only.*$/${EDIT_WARNING}%global groff_base_only 0/; s/^Name.*groff/Name: groff-full/; " < groff.spec > groff-full.spec cp groff.changes groff-full.changes -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
