[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 b98d1fc1ebd14c206fc9a8ee2eedcfa9ac9d06a3
Author: Norbert Preining <preining@logic.at>
Date: Mon Nov 19 09:57:44 2012 +0900
more work on new version
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index f6c0554..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,8 +0,0 @@
-
-README.Debian-source
-
-The source package uses quilt for the modifications of the upstream source.
-If you want to change something it is best to use the quilt approach as
-documented in
- /usr/share/doc/quilt/README.source
-
diff --git a/debian/control b/debian/control
index 274466b..6090d31 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Package: texinfo
Section: text
Priority: standard
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libtext-unidecode-perl, libintl-perl
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/rules b/debian/rules
index a6502cd..8bda3a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,18 +25,11 @@ build-arch: build-stamp
build-indep: build-stamp
build-stamp:
- # some man scripts have been touch by the patches, so the builder
- # will try to rebuild the man page from texi2dvi but that
- # spits out only a warning that no tex system is installed
- touch doc/texi2dvi.1
- touch doc/texi2pdf.1
- touch doc/pdftexi2dvi.1
dh_testdir
# hardening call, but makes info unusable
# ./configure --prefix=/usr $(shell dpkg-buildflags --export=configure) \
CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
--infodir='$${prefix}/share/info' --mandir='$${prefix}/share/man'
- touch po/texinfo.pot
$(MAKE)
touch $@
@@ -44,8 +37,6 @@ clean:
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) distclean
- # remove binary gmo files
- rm -f po/*.gmo
dh_clean install-stamp build-stamp intl/libintl.h config.log
install: install-stamp
@@ -59,17 +50,13 @@ install-stamp: build-stamp
$(MAKE) install install-tex prefix=$(tmpdir)/usr \
TEXMF=$(tmpdir)/usr/share/texmf
find $(tmpdir) -type f -name dir | xargs rm -f
- # pdfcolor and epsf.tex are in tetex and texlive
- rm -rf $(tmpdir)/usr/share/texmf/tex/plain
+ # epsf.tex is in texlive
rm -rf $(tmpdir)/usr/share/texmf/tex/generic
- rm -rf $(tmpdir)/usr/share/texmf/pdftex/plain/misc/pdfcolor.tex
- #mkdir -p $(tmpdir)/usr/share/texmf/tex/texinfo/base
- #mv $(tmpdir)/usr/share/texmf/tex/texinfo/*.tex $(tmpdir)/usr/share/texmf/tex/texinfo/base
+ # 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
dh_install --list-missing --sourcedir=debian/tmp -X share/info
#
- # install updated texinfo.tex
- #cp debian/texinfo.tex $(texinfo)/usr/share/texmf/tex/texinfo/texinfo.tex
- cp debian/texi2pdf.man $(texinfo)/usr/share/man/man1/texi2pdf.1
dh_link
mv $(ii)/usr/bin/install-info $(ii)/usr/bin/ginstall-info
sed -e "s/install-info/g&/g" \
@@ -92,8 +79,7 @@ binary-arch: DH_OPTIONS=-a
binary-arch: install
dh_testdir
dh_testroot
- dh_installdocs -A AUTHORS INTRODUCTION README NEWS TODO \
- debian/README.source
+ dh_installdocs -A AUTHORS README NEWS TODO
dh_installdocs -p texinfo debian/README.cyrtexinfo \
doc/refcard/txirefcard*.pdf
diff --git a/debian/texinfo.install b/debian/texinfo.install
index 6aa2947..102fb35 100644
--- a/debian/texinfo.install
+++ b/debian/texinfo.install
@@ -2,50 +2,17 @@ usr/bin/makeinfo
usr/bin/texindex
usr/bin/texi2dvi
usr/bin/pdftexi2dvi
+usr/bin/pod2texi
+usr/bin/texi2any
usr/bin/texi2pdf
-usr/share/locale/cs/LC_MESSAGES/texinfo.mo
-usr/share/locale/da/LC_MESSAGES/texinfo.mo
-usr/share/locale/de/LC_MESSAGES/texinfo.mo
-usr/share/locale/de_AT/LC_MESSAGES/texinfo.mo
-usr/share/locale/eo/LC_MESSAGES/texinfo.mo
-usr/share/locale/es/LC_MESSAGES/texinfo.mo
-usr/share/locale/fr/LC_MESSAGES/texinfo.mo
-usr/share/locale/he/LC_MESSAGES/texinfo.mo
-usr/share/locale/hr/LC_MESSAGES/texinfo.mo
-usr/share/locale/hu/LC_MESSAGES/texinfo.mo
-usr/share/locale/ja/LC_MESSAGES/texinfo.mo
-usr/share/locale/nb/LC_MESSAGES/texinfo.mo
-usr/share/locale/nl/LC_MESSAGES/texinfo.mo
-usr/share/locale/pl/LC_MESSAGES/texinfo.mo
-usr/share/locale/ro/LC_MESSAGES/texinfo.mo
-usr/share/locale/ru/LC_MESSAGES/texinfo.mo
-usr/share/locale/rw/LC_MESSAGES/texinfo.mo
-usr/share/locale/sv/LC_MESSAGES/texinfo.mo
-usr/share/locale/tr/LC_MESSAGES/texinfo.mo
-usr/share/locale/vi/LC_MESSAGES/texinfo.mo
-usr/share/locale/zh_CN/LC_MESSAGES/texinfo.mo
-usr/share/locale/zh_TW/LC_MESSAGES/texinfo.mo
-usr/share/texinfo/texinfo.dtd
-usr/share/texinfo/texinfo.xsl
-usr/share/texinfo/texinfo.cat
+usr/share/locale/*/LC_MESSAGES/texinfo*.mo
usr/share/man/man1/makeinfo.1
usr/share/man/man1/texindex.1
usr/share/man/man1/texi2dvi.1
usr/share/man/man1/texi2pdf.1
+usr/share/man/man1/texi2any.1
usr/share/man/man1/pdftexi2dvi.1
usr/share/man/man5/texinfo.5
+usr/share/texinfo
usr/share/texmf/tex/texinfo/texinfo.tex
-usr/share/texmf/tex/texinfo/txi-cs.tex
-usr/share/texmf/tex/texinfo/txi-de.tex
-usr/share/texmf/tex/texinfo/txi-en.tex
-usr/share/texmf/tex/texinfo/txi-es.tex
-usr/share/texmf/tex/texinfo/txi-fr.tex
-usr/share/texmf/tex/texinfo/txi-it.tex
-usr/share/texmf/tex/texinfo/txi-nb.tex
-usr/share/texmf/tex/texinfo/txi-nl.tex
-usr/share/texmf/tex/texinfo/txi-pl.tex
-usr/share/texmf/tex/texinfo/txi-pt.tex
-usr/share/texmf/tex/texinfo/txi-ru.tex
-usr/share/texmf/tex/texinfo/txi-sr.tex
-usr/share/texmf/tex/texinfo/txi-tr.tex
-usr/share/texmf/tex/texinfo/txi-uk.tex
+usr/share/texmf/tex/texinfo/txi-??.tex
--
Debian packaging of texinfo)
Reply to: