[SCM] Debian packaging of texinfo) branch, master, updated. upstream/4.13a.dfsg.1-13-g25413a6
The following commit has been merged in the master branch:
commit 25413a61a5c6b2abe425e495adabd67a5f2e5cd7
Author: Norbert Preining <preining@logic.at>
Date: Tue Nov 27 13:09:39 2012 +0900
close loads of bugs, reenable hardening, ajust copuright, fix fix fix
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 83eee3d..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1,17 +0,0 @@
-TODO for texinfo Debian package
--------------------------------
-* make GNU install-info able to write entries with full path into the
- dir file. This way one could reference other info files
-
-* use libpaper/papersize to set /etc/texmf/tex/whatever/texinfo.cnf to
- include @afourpaper in case that papersize=a4. Needs some checking
- like a grep for % ___USE_PAPERSIZE___ in it...
-
-* fix the man page for makeinfo to include --document-language
-
-* fix the @documentlanguage callback function in makeinfo to change
- the interface_language variable.
-
-* go through the bugs on bugs.debian.org and check wether they are
- still present or fixed already (by upstream).
-
diff --git a/debian/bugs b/debian/bugs
deleted file mode 100644
index f3972c9..0000000
--- a/debian/bugs
+++ /dev/null
@@ -1,73 +0,0 @@
-List of open Bugs and comments:
-last changed: 2006-03-10
-
-DONE for 4.8-7
-113988: makeinfo: locale settings should not influence output files
- forwarded upstream, version 4.0, need check!
- long discussion on the bug, but no conclusion
-
-115503: texi2dvi: source file directory included in search path
- forwarded upstream, version 4.0, need check!
- upstream: wontfix. How to deal with bugs like this?
- there is already a wontfix and a upstream tag
- TODO: write email to submitter whether he considers this still
- a bug or whether I can close the bug?
-
-204117 texinfo: texinfo.dtd poorly installed
- asked on debian-devel
-
-212549 info should support the "coding" local variable and output correct characters
- no idea what it means
-
-214729: makeinfo --html should generate valid HTML
- wait response from Karl
-
-218557: dies with "Cannot find node `Top'"
- still present, quite interesting, zeros in dir file. Should be
- taken a look at
- [1] I think this could be in build_tags_and_nodes(), in info/nodes.c,
- where the file is already in memory and is parsed for expected
- structures. There we could stuff some error returning code, the
- function simply doesn't update any error flag.
- I have gdbed a run through the function, and while parsing
- /usr/share/info/dir, it simply did not find the end of the TAGS_TABLE
- (at line 402), and called get_nodes_of_info_file().
- This get_nodes_of_info_file() function has the same problem, it
- doesn't return an useful error but aborts at the first while loop since
- find_node_separator() fails (scans the whole file to find a "node
- start").
- End result: build_tags_and_nodes parses for tags, but does not report
- problems, and build_tags_and_nodes parses for nodes (by calling a
- helper), but doesn't report problems encountered there neither.
-
- [2] For example, with my corrupted file still in place:
- bee# install-info --quiet --section "Disk Management" "Disk Management" /usr/share/info/parted.info.gz && echo success success
- bee# info parted
- info: Cannot find node `Top'.
- -------------------------------------------------------------------
- Concerning [1]: This could also fix the problem of bug 234848 where
- the man page of top is shown instead of the TOP (dir)
- Concerning [2]: Bug should be cloned and reassigned to the program
- providing install-info, i.e. dpkg.
-
-244506 info: menu lacks icon
- umpf, maybe once
-
-245673 info: return the first non-exact match instead of the last
- email sent to submitter
- patch available, does it work?
-
-267357: make Info index: Name Index vs. Concept Index
- Still present, check?
-
-276547: texinfo: @samp{} text should change - to \- in man pages
- no idea what this should do
-
-308063 @xref in man pages can expand to nothing
- not checked
-
-335016 makeinfo --xml generates a document with an invalid DTD
- has to be checked, Karl installed a new DTD which hopefully fixes
- this problem
- Still work to do
-
diff --git a/debian/changelog b/debian/changelog
index dd2bc29..b3c1a2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,20 @@
texinfo (4.13.91.dfsg.1-1) experimental; urgency=low
- * new upstream release
+ * new upstream releases
- fixes truncation at TAB chars (LP #394808)
+ - regexp isearch works (Closes: #522093)
+ - fixing null strings in install-info --help (Closes: #595243)
+ - allow makeinfo splitting at chapters (Closes: #228606)
+ - regexp searching in info (Closes: #31464) (yeah! 5 digits!)
+ - html output contains doctypes (Closes: #214729)
+ - proper positioning of book marks in pdfs (Closes: #37515)
+ - normal scrolling modes (Closes: #78504)
+ * re-enable hardening (Closes: #656659)
* clean up patches
* convert to 3.0/quilt format
* bump compat level to 7
- -- Norbert Preining <preining@debian.org> Tue, 27 Nov 2012 10:48:33 +0900
+ -- Norbert Preining <preining@debian.org> Tue, 27 Nov 2012 13:07:56 +0900
texinfo (4.13a.dfsg.1-10) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 2bdd851..c2db7ba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,8 @@ The original source can be found at: http://ftp.gnu.org/gnu/texinfo/
Upstream maintainer: Karl Berry <karl@cs.umb.edu>.
All programs Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997,
- 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+ 2010, 2011, 2012
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
diff --git a/debian/rules b/debian/rules
index 0d97ed2..8aa1f82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,18 +3,9 @@
#export DH_VERBOSE=1
export DH_OPTIONS
-SAVEDGMO=po/nl.gmo po/ro.gmo po/tr.gmo po/de.gmo
-
-CFLAGS := -g -Wall
-ifneq "$(findstring noopt,$(DEB_BUILD_OPTIONS))" ""
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
-# hardening: but makes info unusable
-#DEB_CFLAGS_MAINT_APPEND=-Wall
+DEB_CFLAGS_MAINT_APPEND=-Wall
# needed for correct building of new texinfo
-#DEB_CFLAGS_MAINT_STRIP=-Werror=format-security
+DEB_CFLAGS_MAINT_STRIP=-Werror=format-security
texinfo := $(CURDIR)/debian/texinfo
ii := $(CURDIR)/debian/install-info
@@ -26,9 +17,7 @@ build-indep: build-stamp
build-stamp:
dh_testdir
- # hardening call, but makes info unusable
- # ./configure --prefix=/usr $(shell dpkg-buildflags --export=configure) \
- CFLAGS="$(CFLAGS)" ./configure \
+ ./configure $(shell dpkg-buildflags --export=configure) \
--with-external-Text-Unidecode=yes \
--with-external-libintl-perl=yes \
--prefix=/usr \
diff --git a/debian/texi2pdf.man b/debian/texi2pdf.man
deleted file mode 100644
index 03f6155..0000000
--- a/debian/texi2pdf.man
+++ /dev/null
@@ -1,49 +0,0 @@
-.TH "texi2pdf" "1" "September 2000" "teTeX" "teTeX"
-.PP
-.SH "NAME"
-texi2pdf \- create a PDF file from a Texinfo file
-.PP
-.SH "SYNOPSIS"
-.PP
-\fBtexi2pdf\fP [ \fIOPTION\fP\&.\&.\&. ] \fIFILE\fP\&.\&.\&.
-.PP
-.SH "DESCRIPTION"
-.PP
-\fBtexi2pdf\fP sets the \fBTEX\fP environment variable to
-\fBpdftex\fP(1) and runs \fBtexi2dvi\fP(1), passing all options to
-\fBtexi2dvi\fP(1)\&.
-.PP
-.SH "OPTIONS"
-.PP
-See \fBtexi2dvi\fP(1) for relevant options\&.
-.PP
-.SH "ENVIRONMENT"
-.PP
-.IP
-.IP "\fBTEX\fP"
-set to \fBpdftex\fP(1) by the script
-.IP
-.PP
-.SH "SEE ALSO"
-.PP
-\fBpdftex\fP(1), \fBtexi2dvi\fP(1), \fBtexinfo\fP(5)\&.
-.PP
-.SH "BUGS"
-.PP
-Problems with this script should be reported to the author or to the
-teTeX list, <tetex@dbs\&.uni-hannover\&.de> (mailing list)\&.
-.PP
-Problems with \fBtexi2dvi\fP(1) should be reported to Karl Berry,
-the texinfo maintainer, at <bug-texinfo@gnu\&.org> (mailing list)
-.PP
-.SH "AUTHOR"
-.PP
-Written by Thomas Esser
-<te@dbs\&.uni-hannover\&.de>\&.
-.PP
-This manual page was written by C\&.M\&. Connelly
-<c@eskimo\&.com>, for
-the Debian GNU/Linux system\&. It may be used by other distributions
-without contacting the author\&. Any mistakes or omissions in the
-manual page are my fault; inquiries about or corrections to this
-manual page should be directed to me (and not to the primary author)\&.
diff --git a/debian/update-info-dir b/debian/update-info-dir
index 389af81..d1a22f1 100755
--- a/debian/update-info-dir
+++ b/debian/update-info-dir
@@ -14,6 +14,7 @@ set -e
# the dir file. Unset LANGUAGE and reload /etc/environment to get
# the system wide settings. See bug #536476
unset LANGUAGE
+unset LANG
if [ -r /etc/environment ] ; then
. /etc/environment
fi
--
Debian packaging of texinfo)
Reply to: