[SCM] Debian packaging of texinfo) branch, master, updated. debian/4.13.92.dfsg.1-1-7-gab80d94
The following commit has been merged in the master branch:
commit 119df51a39f2bc412b6f23670ebe3dd0aa8066a5
Author: Norbert Preining <preining@debian.org>
Date: Sat Jan 5 11:59:23 2013 +0900
update/unfuzzify patches
diff --git a/debian/patches/dont_build_info b/debian/patches/dont_build_info
index 6c76c3c..01cc763 100644
--- a/debian/patches/dont_build_info
+++ b/debian/patches/dont_build_info
@@ -5,13 +5,13 @@ dont build the info documentation, it has been removed
--- texinfo.orig/doc/Makefile.in
+++ texinfo/doc/Makefile.in
-@@ -169,14 +169,16 @@
- CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
+@@ -209,14 +209,16 @@
+ am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
+ am__v_texidevnull_0 = > /dev/null
+ am__v_texidevnull_1 =
-INFO_DEPS = texinfo info-stnd.info info.info
+#INFO_DEPS = texinfo info-stnd.info info.info
-+INFO_DEPS =
++INFO_DEPS =
TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
DVIS = texinfo.dvi info-stnd.dvi info.dvi
@@ -24,7 +24,7 @@ dont build the info documentation, it has been removed
TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
-@@ -941,8 +943,10 @@
+@@ -1000,8 +1002,10 @@
SUBDIRS = tp_api
# Put texinfo.txi first because that's the most important.
diff --git a/debian/patches/info_universal_argument b/debian/patches/info_universal_argument
index d5e8776..9a54efa 100644
--- a/debian/patches/info_universal_argument
+++ b/debian/patches/info_universal_argument
@@ -1,8 +1,7 @@
fix some .po files that have wrong references
---
po/ro.po | 2 +-
- po/tr.po | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
--- texinfo.orig/po/ro.po
+++ texinfo/po/ro.po
@@ -15,14 +14,3 @@ fix some .po files that have wrong references
#: info/tilde.c:361
#, c-format
---- texinfo.orig/po/tr.po
-+++ texinfo/po/tr.po
-@@ -1825,7 +1825,7 @@
-
- #: info/session.c:5216
- msgid "Internally used by \\[universal-argument]"
--msgstr "Dahili olarak \\[universal argument] taraf�kullan�"
-+msgstr "Dahili olarak \\[universal-argument] taraf�kullan�"
-
- #: info/tilde.c:361
- #, c-format
diff --git a/debian/patches/numerical-signal-names b/debian/patches/numerical-signal-names
index 8893dc3..76440a2 100644
--- a/debian/patches/numerical-signal-names
+++ b/debian/patches/numerical-signal-names
@@ -1,33 +1,10 @@
replace numerical signal names with symbolical
---
- util/fix-info-dir | 6 +++---
- util/fixfonts | 2 +-
- util/install-info-html | 2 +-
- util/texi2dvi | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
+ contrib/fix-info-dir | 6 +++---
+ contrib/fixfonts | 2 +-
+ util/texi2dvi | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
---- texinfo.orig/util/fixfonts
-+++ texinfo/util/fixfonts
-@@ -33,7 +33,7 @@
- tempfile2="${TMPDIR}/circ2$$"
-
- # EXIT SIGHUP SIGINT SIGQUIT SIGTERM
--#trap 'rm -f "${tempfile}" "${tempfile2}"' 0 1 2 3 15
-+#trap 'rm -f "${tempfile}" "${tempfile2}"' 0 HUP INT QUIT TERM
-
- # Find all the fonts with names that include `circle'.
- (cd "${texfontdir}"; find . -name '*circle*' -print > "${tempfile}")
---- texinfo.orig/util/install-info-html
-+++ texinfo/util/install-info-html
-@@ -39,7 +39,7 @@
- $debug_echo "cleaning ($?)..."
- }
-
--trap cleanup 0 9 15
-+trap cleanup 0 KILL TERM
-
- #
- # Find command line options and switches
--- texinfo.orig/util/texi2dvi
+++ texinfo/util/texi2dvi
@@ -1949,7 +1949,7 @@
@@ -39,8 +16,8 @@ replace numerical signal names with symbolical
ensure_dir "$build_dir" "$t2ddir"
---- texinfo.orig/util/fix-info-dir
-+++ texinfo/util/fix-info-dir
+--- texinfo.orig/contrib/fix-info-dir
++++ texinfo/contrib/fix-info-dir
@@ -255,13 +255,13 @@
trap ' eval "$DEBUG"; rm -f $TMP_FILE_LIST; exit ' 0
@@ -58,3 +35,14 @@ replace numerical signal names with symbolical
sed -e "1,/$MENU_BEGIN/d" -e "$MENU_FILTER1" -e "$MENU_FILTER2"<$DIR_FILE\
|sed -n -e '/\* /{
+--- texinfo.orig/contrib/fixfonts
++++ texinfo/contrib/fixfonts
+@@ -33,7 +33,7 @@
+ tempfile2="${TMPDIR}/circ2$$"
+
+ # EXIT SIGHUP SIGINT SIGQUIT SIGTERM
+-#trap 'rm -f "${tempfile}" "${tempfile2}"' 0 1 2 3 15
++#trap 'rm -f "${tempfile}" "${tempfile2}"' 0 HUP INT QUIT TERM
+
+ # Find all the fonts with names that include `circle'.
+ (cd "${texfontdir}"; find . -name '*circle*' -print > "${tempfile}")
diff --git a/debian/patches/warn_missing_tex b/debian/patches/warn_missing_tex
index f3f037b..1ac1439 100644
--- a/debian/patches/warn_missing_tex
+++ b/debian/patches/warn_missing_tex
@@ -24,5 +24,5 @@
+
+
# This string is expanded automatically when this file is checked out.
- rcs_revision='$Revision: 1.173 $'
+ rcs_revision='$Revision: 1.174 $'
rcs_version=`set - $rcs_revision; echo $2`
--
Debian packaging of texinfo)
Reply to: