[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 cbacc82d36bdbe92baf6a614bd9e04f1c2d7ef78
Author: Norbert Preining <preining@logic.at>
Date: Mon Nov 19 10:19:54 2012 +0900
fix building, release to experimental
diff --git a/debian/changelog b/debian/changelog
index 755fed8..b322f47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-texinfo (4.13.90.dfsg.1-1~1) UNRELEASED; urgency=low
+texinfo (4.13.90.dfsg.1-1) experimental; urgency=low
* new upstream release
- fixes truncation at TAB chars (LP #394808)
@@ -6,7 +6,7 @@ texinfo (4.13.90.dfsg.1-1~1) UNRELEASED; urgency=low
* convert to 3.0/quilt format
* bump compat level to 7
- -- Norbert Preining <preining@debian.org> Mon, 19 Nov 2012 09:31:16 +0900
+ -- Norbert Preining <preining@debian.org> Mon, 19 Nov 2012 10:19:43 +0900
texinfo (4.13a.dfsg.1-10) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6090d31..6ff0c5d 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
+Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev | libncurses-dev, gettext, libtext-unidecode-perl, libintl-perl
Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/debian-tex/texinfo/trunk
Vcs-Browser: http://svn.debian.org/wsvn/debian-tex/texinfo/trunk/
diff --git a/debian/rules b/debian/rules
index 8bda3a2..444d057 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,10 @@ build-stamp:
dh_testdir
# hardening call, but makes info unusable
# ./configure --prefix=/usr $(shell dpkg-buildflags --export=configure) \
- CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
+ CFLAGS="$(CFLAGS)" ./configure \
+ --with-external-Text-Unidecode=yes \
+ --with-external-libintl-perl=yes \
+ --prefix=/usr \
--infodir='$${prefix}/share/info' --mandir='$${prefix}/share/man'
$(MAKE)
touch $@
@@ -45,7 +48,7 @@ install-stamp: DH_OPTIONS=
install-stamp: build-stamp
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install install-tex prefix=$(tmpdir)/usr \
TEXMF=$(tmpdir)/usr/share/texmf
@@ -53,11 +56,16 @@ install-stamp: build-stamp
# epsf.tex is in texlive
rm -rf $(tmpdir)/usr/share/texmf/tex/generic
# remove perl libraries that we depend on in debian/control
- rm -rf $(tmpdir)/usr/share/texinfo/lib/Text-Unidecode
- rm -rf $(tmpdir)/usr/share/texinfo/lib/libintl-perl
+ # they should not be installed due to above --with-external-*
+ # but they still are, already send report to bug-texinfo
+ # remove without -f to make sure we fix the rules file
+ # when it is fixed upstream
+ rm -r $(tmpdir)/usr/share/texinfo/lib/Text-Unidecode
+ rm -r $(tmpdir)/usr/share/texinfo/lib/libintl-perl
+ # install all the files
dh_install --list-missing --sourcedir=debian/tmp -X share/info
- #
dh_link
+ # work on debian install-info
mv $(ii)/usr/bin/install-info $(ii)/usr/bin/ginstall-info
sed -e "s/install-info/g&/g" \
< $(ii)/usr/share/man/man1/install-info.1 \
--
Debian packaging of texinfo)
Reply to: