[SCM] Debian packaging of texinfo) branch, master, updated. upstream/4.13a.dfsg.1-11-g610c3c4
The following commit has been merged in the master branch:
commit 71dcde5b274babb7ddfde53b9184de686814525d
Author: Norbert Preining <preining@debian.org>
Date: Fri Aug 31 10:01:15 2012 +0900
unfuzzify patches to make quilt source format happy
diff --git a/debian/patches/texi2dvi-local-fallback-syntax.diff b/debian/patches/texi2dvi-local-fallback-syntax.diff
index e2be74b..a68bcdf 100644
--- a/debian/patches/texi2dvi-local-fallback-syntax.diff
+++ b/debian/patches/texi2dvi-local-fallback-syntax.diff
@@ -1,12 +1,13 @@
- ChangeLog | 7 +++++++
util/texi2dvi | 4 +++-
- 2 files changed, 10 insertions(+), 1 deletions(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
---- texinfo-4.12.dfsg.1.orig/util/texi2dvi
-+++ texinfo-4.12.dfsg.1/util/texi2dvi
-@@ -141,11 +141,13 @@ test -n "$TEX" && test -d "$TEX" && unset TEX
+Index: texinfo/util/texi2dvi
+===================================================================
+--- texinfo.orig/util/texi2dvi 2012-08-31 10:00:36.000000000 +0900
++++ texinfo/util/texi2dvi 2012-08-31 10:00:39.000000000 +0900
+@@ -141,11 +141,13 @@
}
- test_local >/dev/null 2>&1
+ test_local
test $foo = bar
-) || local () {
+) || eval '
diff --git a/debian/patches/texi2dvi_non-C_locale b/debian/patches/texi2dvi_non-C_locale
index 32ed3c7..2e4d119 100644
--- a/debian/patches/texi2dvi_non-C_locale
+++ b/debian/patches/texi2dvi_non-C_locale
@@ -1,13 +1,13 @@
"grep [A-z]" is not allowed in non-C locale.
---
util/texi2dvi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: texinfo-4.12.dfsg.1/util/texi2dvi
+Index: texinfo/util/texi2dvi
===================================================================
---- texinfo-4.13a.dfsg.1.orig/util/texi2dvi.orig 2010-11-04 15:28:50.000000000 +0100
-+++ texinfo-4.13a.dfsg.1/util/texi2dvi 2010-11-04 15:35:14.000000000 +0100
-@@ -1710,7 +1710,7 @@
+--- texinfo.orig/util/texi2dvi 2012-08-31 10:00:39.000000000 +0900
++++ texinfo/util/texi2dvi 2012-08-31 10:00:49.000000000 +0900
+@@ -1712,7 +1712,7 @@
# If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex),
# prepend `./' in order to avoid that the tools take it as an option.
--
Debian packaging of texinfo)
Reply to: