[texinfo] 03/04: update patches, remove upstream applied ones
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texinfo.
commit 78c458c024bdc5ed4a3ee27621ba989db4596c3e
Author: Norbert Preining <preining@debian.org>
Date: Wed Sep 13 12:44:27 2017 +0900
update patches, remove upstream applied ones
---
debian/patches/dont_build_info | 4 ++--
debian/patches/reproducible-makeinfo | 17 -----------------
debian/patches/series | 2 --
debian/patches/upstream-fix-info-links | 14 --------------
4 files changed, 2 insertions(+), 35 deletions(-)
diff --git a/debian/patches/dont_build_info b/debian/patches/dont_build_info
index 1c121e8..3db3807 100644
--- a/debian/patches/dont_build_info
+++ b/debian/patches/dont_build_info
@@ -5,7 +5,7 @@ dont build the info documentation, it has been removed
--- texinfo.orig/doc/Makefile.in
+++ texinfo/doc/Makefile.in
-@@ -258,14 +258,16 @@
+@@ -259,14 +259,16 @@
am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
am__v_texidevnull_0 = > /dev/null
am__v_texidevnull_1 =
@@ -24,7 +24,7 @@ dont build the info documentation, it has been removed
TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
-@@ -1136,8 +1138,10 @@
+@@ -1138,8 +1140,10 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = tp_api
diff --git a/debian/patches/reproducible-makeinfo b/debian/patches/reproducible-makeinfo
deleted file mode 100644
index 04a087e..0000000
--- a/debian/patches/reproducible-makeinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-make makeinfo honor S_D_E
-patch by Alexis Bienvenüe (Closes: #826158)
----
- tp/Texinfo/Common.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- texinfo.orig/tp/Texinfo/Common.pm
-+++ texinfo/tp/Texinfo/Common.pm
-@@ -1209,7 +1209,7 @@
- return {'text' => 'a sunny day'};
- }
- my($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst)
-- = localtime(time);
-+ = ($ENV{SOURCE_DATE_EPOCH} ? gmtime($ENV{SOURCE_DATE_EPOCH}) : localtime(time));
- $year += ($year < 70) ? 2000 : 1900;
- return $self->gdt('{month} {day}, {year}',
- { 'month' => $self->gdt($MONTH_NAMES[$mon]),
diff --git a/debian/patches/series b/debian/patches/series
index f4e55db..3a26941 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,3 @@ warn_missing_tex
numerical-signal-names
dont_build_info
info-manpage-mentiones-nonfree
-reproducible-makeinfo
-upstream-fix-info-links
diff --git a/debian/patches/upstream-fix-info-links b/debian/patches/upstream-fix-info-links
deleted file mode 100644
index eb728ad..0000000
--- a/debian/patches/upstream-fix-info-links
+++ /dev/null
@@ -1,14 +0,0 @@
----
- info/info-utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- texinfo.orig/info/info-utils.c
-+++ texinfo/info/info-utils.c
-@@ -1281,6 +1281,7 @@
- canonicalize_whitespace (entry->nodename);
- if (!len)
- return 0; /* Input invalid. */
-+ canonicalize_whitespace (entry->nodename);
- label_len += len;
- }
- else
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texinfo.git
Reply to: