[texinfo] 01/18: use bundled libintl-perl, as the Debian version breaks Texinfo
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texinfo.
commit 20412f6a545e32268d2dc6fd69d92a9361e672e6
Author: Norbert Preining <preining@debian.org>
Date: Fri Dec 25 08:42:50 2015 +0900
use bundled libintl-perl, as the Debian version breaks Texinfo
---
debian/changelog | 3 ++-
debian/control | 4 ++--
debian/patches/disable-failing-test | 30 ------------------------------
debian/patches/series | 1 -
debian/rules | 7 ++++++-
5 files changed, 10 insertions(+), 35 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f1b9f95..a8fedfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ texinfo (6.0.90.dfsg.1-1~1) UNRELEASED; urgency=medium
. support info files in sub directories (Closes: #792328)
* update make-orig-tar for new prerelease, fix tar name
* update and cleanup patches
+ * use bundled libintl-perl, as the Debian version breaks Texinfo
- -- Norbert Preining <preining@debian.org> Thu, 24 Dec 2015 08:40:10 +0900
+ -- Norbert Preining <preining@debian.org> Fri, 25 Dec 2015 08:41:40 +0900
texinfo (6.0.0.dfsg.1-4) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 282edb2..77f045c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: doc
Priority: standard
Maintainer: Debian TeX maintainers <debian-tex-maint@lists.debian.org>
Uploaders: Norbert Preining <preining@debian.org>, Frank Küster <frank@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev | libncurses-dev, gettext, libtext-unidecode-perl, libintl-perl, help2man, autotools-dev
+Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev | libncurses-dev, gettext, libtext-unidecode-perl, help2man, autotools-dev
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/debian-tex/texinfo.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-tex/texinfo.git
@@ -12,7 +12,7 @@ Package: texinfo
Section: text
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libtext-unidecode-perl, libintl-perl, libxml-libxml-perl, tex-common (>= 6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libtext-unidecode-perl, libxml-libxml-perl, tex-common (>= 6)
Suggests: texlive-base, texlive-latex-base, texlive-generic-recommended, texinfo-doc-nonfree
Breaks: tetex-bin (<< 3.0), tetex-base (<< 3.0), ja-trans (<= 0.7-3.1)
Replaces: tetex-base (<< 1.0.2+20000804-9), tetex-bin (<< 3.0)
diff --git a/debian/patches/disable-failing-test b/debian/patches/disable-failing-test
deleted file mode 100644
index 13e9c81..0000000
--- a/debian/patches/disable-failing-test
+++ /dev/null
@@ -1,30 +0,0 @@
----
- tp/tests/Makefile.onetst | 3 ---
- 1 file changed, 3 deletions(-)
-
---- texinfo-6.0.0.dfsg.1.orig/tp/tests/Makefile.onetst
-+++ texinfo-6.0.0.dfsg.1/tp/tests/Makefile.onetst
-@@ -44,7 +44,6 @@
- test_scripts/coverage_texi_formatting.sh \
- test_scripts/coverage_formatting.sh \
- test_scripts/coverage_formatting_utf8_enable_encoding.sh \
-- test_scripts/coverage_formatting_fr.sh \
- test_scripts/coverage_formatting_cr.sh \
- test_scripts/indices_double_index_entry.sh \
- test_scripts/indices_split_chapter_index.sh \
-@@ -149,7 +148,6 @@
- test_scripts/layout_formatting_html32.sh \
- test_scripts/layout_formatting_regions.sh \
- test_scripts/layout_formatting_exotic.sh \
-- test_scripts/layout_formatting_fr_icons.sh \
- test_scripts/layout_formatting_chm.sh \
- test_scripts/layout_formatting_nodes.sh \
- test_scripts/formatting_texi_glossary.sh \
-@@ -179,7 +177,6 @@
- test_scripts/formatting_simplest_test_prefix_info.sh \
- test_scripts/formatting_simplest_test_css.sh \
- test_scripts/formatting_simplest_test_date_in_header.sh \
-- test_scripts/formatting_documentlanguage_set_option.sh \
- test_scripts/formatting_documentlanguage_set_unknown.sh \
- test_scripts/formatting_documentlanguage_set_option_info.sh \
- test_scripts/formatting_float_copying.sh \
diff --git a/debian/patches/series b/debian/patches/series
index 7d2d873..1a8ea79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ numerical-signal-names
dont_build_info
info-manpage-mentiones-nonfree
do-not-require-automake-1.15
-disable-failing-test
diff --git a/debian/rules b/debian/rules
index f08f8c3..cb6f395 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,12 +17,17 @@ build: build-arch build-indep
build-arch: build-stamp
build-indep: build-stamp
+# The Debian provided libintl-perl breaks several tests and probably
+# also some of the behaviour. Disable it until these problems are fixed
+# on either side.
+# --with-external-libintl-perl=yes \
+
+
build-stamp:
dh_testdir
dh_autotools-dev_updateconfig
AWK=awk ./configure $(shell dpkg-buildflags --export=configure) \
--with-external-Text-Unidecode=yes \
- --with-external-libintl-perl=yes \
--prefix=/usr \
--libexecdir='$${prefix}/lib' \
--infodir='$${prefix}/share/info' --mandir='$${prefix}/share/man' \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texinfo.git
Reply to: