--- xindy-2.4.orig/debian/control +++ xindy-2.4/debian/control @@ -0,0 +1,38 @@ +Source: xindy +Section: text +Priority: optional +Maintainer: Jörg Sommer +Build-Depends-Indep: texlive-latex-base, texlive-lang-cyrillic, + texlive-latex-recommended, cm-super +Build-Depends: debhelper (>= 5), dpatch, autotools-dev, flex, clisp (>> 0.49) +Standards-Version: 3.9.1 +Homepage: http://www.xindy.org/ +Vcs-Browser: http://git.debian.org/?p=users/jo-guest/xindy.git +Vcs-Git: git://git.debian.org/~jo-guest/xindy.git +DM-Upload-Allowed: yes + +Package: xindy +Architecture: any +Depends: xindy-rules, ${clisp:Depends}, ${shlibs:Depends}, ${perl:Depends}, + ${misc:Depends}, clisp (>> 0.49) +Description: index generator for structured documents like LaTeX or SGML + xindy is an index processor that can be used to generate book-like + indexes for arbitrary document-preparation systems. This includes + systems such as TeX and LaTeX, the roff-family, SGML/XML-based systems + (e.g. HTML) that process some kind of text and generate indexing + information. The kernel system is not fixed to any specific system, but + can be configured to work together with such systems. + . + In comparison to other index processors xindy has several powerful + features that make it an ideal framework for describing and generating + complex indices, addressing especially international indexing. + +Package: xindy-rules +Architecture: all +Depends: ${misc:Depends} +Recommends: xindy +Description: rule files for xindy + xindy is an index processor that can be used to generate book-like + indexes for arbitrary document-preparation systems. + . + This package contains the rule files (the knowledge base) of xindy. --- xindy-2.4.orig/debian/changelog +++ xindy-2.4/debian/changelog @@ -0,0 +1,194 @@ +xindy (2.4-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Make xindy work around clisp 2.49 not bumping LISPOBJ(version..) + thus giving wrong clisp-fasl-loader version (Closes: #617378). + This change is a dirty hack for xindy that should be reverted + when built against newer clisp upstream release. + + -- Agustin Martin Domingo Fri, 02 Sep 2011 17:19:04 +0200 + +xindy (2.4-1) unstable; urgency=low + + * New upstream release (closes: #555947) + + * Removed patches from the Debian package: + + fix-manpages: the manpage in question was removed + + + rebuild-manpages: upstream updated the manpages, hence the + problem with hyphen vs. dash is gone. + + * Set dependency on clisp-fasl-loader to ensure the correct clisp + version is installed, because clisp's memory dumps depend on the + version used for the dump. (closes: #580762) + + * Bumped Standards-Version; no changes needed. + + * Added debian/source/format to the source package. We still use + format version 1.0, because we use dpatch with the script patch + config.guess+sub. + + * Provided watch file. + + * Dropped useless dependency on texlive-xetex. It was added erroneously. + + -- Jörg Sommer Sun, 01 Aug 2010 04:31:43 +0200 + +xindy (2.4~pre1-3) unstable; urgency=low + + * Added clisp to the list of dependencies of xindy. (closes: #558167) + + -- Jörg Sommer Sat, 28 Nov 2009 01:46:29 +0100 + +xindy (2.4~pre1-2) unstable; urgency=low + + * Added a workaround for the broken check around + --disable-(make-rules|docs) in configure. (closes: #548451) + + -- Jörg Sommer Tue, 10 Nov 2009 19:27:53 +0100 + +xindy (2.4~pre1-1) unstable; urgency=low + + * New upstream release; downloaded from + http://www.xindy.org/xindy-2.4-SNAPSHOT.tar.gz on 2009-09-20. + + * Remove dpatches: + + latex-call and fix-stdout are applied upstream + + + fix-clisp-problems is obsolate due to new upstream source structure + + * New version requires build dependency on texlive-xetex. + + * Remove libffcall1-dev for build dependencies and replace clisp-dev by + clisp, because the new version doesn't use an external clisp module, + anymore. + + * Mark the xindy package buildable on any architecture, because we + aren't limited to the architectures with external linking support + anymore. We can build everywhere where CLISP is. + + * Added DM-Upload-Allowed to allow direct uploads by me. + + * Added fix-alphabets-doc-geometry.dpatch to correct the geometry of + the document /u/s/d/x/alphabets-doc.pdf. + Thanks to Simon Spiegel for reporting this issue. + + * Added the file README.source to describe how to use dpatch (or better + said link to the defaul description in /usr/share/doc/dpatch). This + satisfies the requirement of the Debian policy 3.8.0. + + * Bump policy version to 3.8.3 + + * Upload is sponsored by Norbert Preining. + + -- Jörg Sommer Tue, 22 Sep 2009 12:50:30 +0200 + +xindy (2.3-2) unstable; urgency=low + + * I found a better way to work around for the broken ordrulei.c + generated by clisp. Added the dpatch fix-clisp-problems.dpatch for it + and extended it to fix the new problems. (closes: #467585) + + * Added libffcall1-dev to the Build-Depends field, because it's + necessary on linking with clisp-link, but clisp-dev doesn't have it + as dependency. Otherwise the build of Xindy would fail. + + * Forgot to move the files in /u/l/xindy/modules/styles to + /u/s/xindy/styles. Extended fix-FHS.dpatch. + + * Upload is sponsored by Norbert Preining. + + -- Jörg Sommer Sun, 02 Mar 2008 02:51:18 +0100 + +xindy (2.3-1) unstable; urgency=low + + * New upstream release + + * Removed external-clisp.dpatch, fix-cleanup.dpatch, fix-serbian.dpatch + and fix-errors.dpatch. All are applied to the upstream source. + + * Rebuilt the manual pages tex2xindy.1, texindy.1 and xindy.1 at + buildtime to fix the hyphen vs. minus sign problems. Removed the + patch fix-manpage.dpatch. + + * Added a new patch fix-manpages.dpatch to correct the section of + xindy.v2.1; 1 instead of 1L. + + * Adapted fix-FHS.dpatch to the new sources. + + * Made the path to clisp more generic. (closes: #458883) + + * Added workaround for broken clisp. + + Clisp generates a broken rte/ordrules/ordrulei.c which includes + undefined data types. Fixed by removing this lines from the + generated file. + + + clisp-link calls the linker with -ldb, but a libdb.so doesn't + exist. Clisp itself is linked against libdb-4.6. Due to this I + replace the -ldb by -ldb-4.6 in the file makevars. + + + clisp-link links the binary with libSM and libICE while + dpkg-shlibdeps complains no symbols are used from these libraries. + Removed them from the linker call. + + * Used the (new) real header instead of the Homepage pseudo header. + + * Added Vcs-Browser and Vcs-Git header. + + * Bumped Standards-Version; no changes needed. + + * Updated get-orig-source target in rules. + + * Added a simple function test simple_index in debian/tests. + + * Upload is sponsored by Norbert Preining. + + -- Jörg Sommer Wed, 23 Jan 2008 02:46:46 +0100 + +xindy (2.2~beta2-3) unstable; urgency=low + + * Acknowledge NMU. (closes: #424976) + + * Excluded arm, hppa, ia64, m68k, mipsel and s390 from the list of + supported architectures. For every other architecture the clisp + maintainer had enabled FFI support, at least in version 1:2.41-1. + (closes: #425143) + + * Upload is sponsored by Norbert Preining. + + -- Jörg Sommer Sun, 20 May 2007 21:45:21 +0200 + +xindy (2.2~beta2-2.1) unstable; urgency=low + + * NMU of the sponsor to really fix the build issue + * make the build target in debian/rules emtpy, binary-arch and + binary-indep does everything (Closes: #424976) + + -- Norbert Preining Sat, 19 May 2007 11:15:12 +0200 + +xindy (2.2~beta2-2) unstable; urgency=low + + * Changed the build rules (in debian/rules) to use different configure + calls for the different targets build-indep and build-arch. For + build-arch, configure is instructed to build no documentation and + make-rules, because latex is not available. (closes: #424976) + + * Removed tetex-extra as a possible build dependency, because it's + removed from Debian. + + * Upload is sponsored by Norbert Preining. + + -- Jörg Sommer Fri, 18 May 2007 16:02:43 +0200 + +xindy (2.2~beta2-1) unstable; urgency=low + + * Initial release; closes: #362584 + + * Moved the files in the directory /usr/lib/xindy/modules/ to the more + FHS-compatible directory /usr/share/xindy/, because they are + architecture-independent. + + * Upload is sponsored by Norbert Preining + + -- Jörg Sommer Tue, 27 Feb 2007 15:06:56 +0100 + --- xindy-2.4.orig/debian/copyright +++ xindy-2.4/debian/copyright @@ -0,0 +1,32 @@ +This package was debianized by Jörg Sommer on +Mon, 16 Jan 2006 19:20:31 +0100. + +It was downloaded from http://www.xindy.org/ + +Upstream Authors: Joachim Schrod + +Copyright ©: + 1996, 1997 Roger Kehr + 2004 - 2010 Joachim Schrod + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + The Debian packaging is © 2006 – 2010, Jörg Sommer + and is licensed under the GPL, see above. --- xindy-2.4.orig/debian/compat +++ xindy-2.4/debian/compat @@ -0,0 +1 @@ +5 --- xindy-2.4.orig/debian/xindy-rules.docs +++ xindy-2.4/debian/xindy-rules.docs @@ -0,0 +1,2 @@ +NEWS +README --- xindy-2.4.orig/debian/watch +++ xindy-2.4/debian/watch @@ -0,0 +1,3 @@ +version=3 + +ftp://ctan.org/tex-archive/indexing/xindy/xindy-([\d.]*)\.tar\.gz --- xindy-2.4.orig/debian/rules +++ xindy-2.4/debian/rules @@ -0,0 +1,126 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +include /usr/share/dpatch/dpatch.make + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS += -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure_flags = LDFLAGS="$(LDFLAGS) -Wl,-z,defs" CFLAGS="$(CFLAGS)" \ + --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \ + --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + --docdir=\$${prefix}/share/doc/xindy-rules + +arch_subdirs=src tex2xindy user-commands +indep_subdirs=modules make-rules doc + +xindy_dir=debian/xindy + +config.status: configure patch-stamp + dh_testdir + ./configure $(configure_flags) --disable-make-rules --disable-docs + +config.status-with-latex: configure patch-stamp + dh_testdir + if [ -e config.status ]; then \ + rm -f build-arch-stamp build-indep-stamp; \ + $(MAKE) distclean || true; \ + fi + ./configure $(configure_flags) + + ln config.status config.status-with-latex + +#build: build-indep build-arch +build: + +build-indep: build-indep-stamp +build-indep-stamp: config.status-with-latex + dh_testdir + + for i in $(indep_subdirs); do $(MAKE) -C $$i all || exit 1; done + + touch $@ + +build-arch: build-arch-stamp +build-arch-stamp: config.status + dh_testdir + + for i in $(arch_subdirs); do $(MAKE) -C $$i all || exit 1; done + + touch $@ + +clean: + dh_testdir + rm -f build-arch-stamp build-indep-stamp config.status-with-latex + + if [ -f Makefile ]; then $(MAKE) distclean; fi + + $(MAKE) -f debian/rules unpatch + + dh_clean + +binary-indep: build-indep + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + + for i in $(indep_subdirs); do \ + $(MAKE) -C $$i install DESTDIR=$(CURDIR)/debian/xindy-rules \ + || exit 1; \ + done + + dh_installchangelogs -i NEWS + dh_installdocs -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build-arch + dh_testdir + dh_testroot + dh_clean -k -a + dh_installdirs -a + + for i in $(arch_subdirs); do \ + $(MAKE) -C $$i install DESTDIR=$(CURDIR)/debian/xindy || exit 1; \ + done + + dh_link -a usr/share/doc/xindy-rules usr/share/doc/xindy + dh_strip -a + dh_compress -a + chmod -x $(xindy_dir)/usr/lib/xindy/xindy.mem + dh_fixperms -a + dh_perl -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a \ + -- -Vclisp:Depends="clisp-fasl-loader-$(shell clisp -x --quiet "(car (system::version))")" + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch + +test: + dh_testdir + set -e; for i in debian/tests/*; do test -x "$$i" || continue; \ + echo "$$i"; "$$i"; done + +.PHONY: build build-arch build-indep clean binary-indep binary-arch binary \ + get-orig-source test --- xindy-2.4.orig/debian/README.source +++ xindy-2.4/debian/README.source @@ -0,0 +1,8 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package in debian/patches and +applied during the build. Please see: + + /usr/share/doc/dpatch/README.source + +for more information on how to apply the patches, modify patches, or +remove a patch. --- xindy-2.4.orig/debian/source/format +++ xindy-2.4/debian/source/format @@ -0,0 +1 @@ +1.0 --- xindy-2.4.orig/debian/patches/config.guess+sub.dpatch +++ xindy-2.4/debian/patches/config.guess+sub.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh -e +## config.guess+sub.dpatch © Ralf Treinen +## +## DP: replace all config.{guess,sub} by the vesion installed in +## DP: /usr/share/misc + +dpatch_patch () +{ + find . -name config.guess -o -name config.sub \ + | tar vcf debian/patched/config.guess+sub.tar -T - + find . -name config.guess \ + -exec ln -sfv /usr/share/misc/config.guess '{}' \; + find . -name config.sub \ + -exec ln -sfv /usr/share/misc/config.sub '{}' \; +} + +dpatch_unpatch () +{ + tar xf debian/patched/config.guess+sub.tar +} + +DPATCH_LIB_NO_DEFAULT=1 + +. /usr/share/dpatch/dpatch.lib.sh --- xindy-2.4.orig/debian/patches/00list +++ xindy-2.4/debian/patches/00list @@ -0,0 +1,7 @@ +fix-echo-expansion +fix-FHS +help-option +config.guess+sub +fix-alphabets-doc-geometry +fix-configure +fix-entry-with-command.dpatch --- xindy-2.4.orig/debian/patches/fix-FHS.dpatch +++ xindy-2.4/debian/patches/fix-FHS.dpatch @@ -0,0 +1,151 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix-FHS.dpatch by Jörg Sommer +## +## DP: All files below /usr/lib/xindy/modules/ are architecture independent +## DP: and therefor need to be below /usr/share/ as forced by the FHS. + +@DPATCH@ +diff -urNad xindy-2.2-beta2~/make-rules/alphabets/Makefile.in xindy-2.2-beta2/make-rules/alphabets/Makefile.in +--- xindy-2.2-beta2~/make-rules/alphabets/Makefile.in 2006-04-18 01:29:21.443791000 +0200 ++++ xindy-2.2-beta2/make-rules/alphabets/Makefile.in 2006-04-18 01:30:02.199791000 +0200 +@@ -251,7 +251,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-langdir = $(pkglibdir)/modules/lang ++langdir = $(pkgdatadir)/lang + DISTCLEANFILES = albanian/utf8.pl belarusian/utf8.pl bulgarian/utf8.pl \ + croatian/utf8.pl czech/utf8.pl danish/utf8.pl \ + dutch/ij-as-ij-utf8.pl dutch/ij-as-y-utf8.pl english/utf8.pl \ +diff -urNad xindy-2.2-beta2~/make-rules/inputenc/Makefile.in xindy-2.2-beta2/make-rules/inputenc/Makefile.in +--- xindy-2.2-beta2~/make-rules/inputenc/Makefile.in 2006-04-18 01:29:21.447791000 +0200 ++++ xindy-2.2-beta2/make-rules/inputenc/Makefile.in 2006-04-18 01:30:02.187791000 +0200 +@@ -155,7 +155,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-modulesdir = $(pkglibdir)/modules ++modulesdir = $(pkgdatadir) + inputencdir = $(modulesdir)/tex/inputenc + INPUTENCS = \ + cp1250.xdy \ +diff -urNad xindy-2.2-beta2~/make-rules/styles/Makefile.in xindy-2.2-beta2/make-rules/styles/Makefile.in +--- xindy-2.2-beta2~/make-rules/styles/Makefile.in 2005-09-29 17:30:44.000000000 +0200 ++++ xindy-2.2-beta2/make-rules/styles/Makefile.in 2006-04-18 01:30:02.191791000 +0200 +@@ -155,7 +155,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-modulesdir = $(pkglibdir)/modules ++modulesdir = $(pkgdatadir) + stylesdir = $(modulesdir)/styles + STYLES = \ + example.xdy \ +diff -urNad xindy-2.2-beta2~/modules/base/Makefile.in xindy-2.2-beta2/modules/base/Makefile.in +--- xindy-2.2-beta2~/modules/base/Makefile.in 2005-09-29 17:30:44.000000000 +0200 ++++ xindy-2.2-beta2/modules/base/Makefile.in 2006-04-18 01:30:02.183791000 +0200 +@@ -155,7 +155,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-modulesdir = $(pkglibdir)/modules ++modulesdir = $(pkgdatadir) + basedir = $(modulesdir)/base + RULES = \ + book-order.xdy \ +diff -urNad xindy-2.2-beta2~/modules/class/Makefile.in xindy-2.2-beta2/modules/class/Makefile.in +--- xindy-2.2-beta2~/modules/class/Makefile.in 2005-09-29 17:30:44.000000000 +0200 ++++ xindy-2.2-beta2/modules/class/Makefile.in 2006-04-18 01:30:02.179791000 +0200 +@@ -155,7 +155,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-modulesdir = $(pkglibdir)/modules ++modulesdir = $(pkgdatadir) + classdir = $(modulesdir)/class + RULES = \ + pagenums.xdy +diff -urNad xindy-2.2-beta2~/modules/lang/german/Makefile.in xindy-2.2-beta2/modules/lang/german/Makefile.in +--- xindy-2.2-beta2~/modules/lang/german/Makefile.in 2005-09-29 17:30:44.000000000 +0200 ++++ xindy-2.2-beta2/modules/lang/german/Makefile.in 2006-04-18 01:30:02.179791000 +0200 +@@ -155,7 +155,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-langdir = $(pkglibdir)/modules/lang ++langdir = $(pkgdatadir)/lang + germandir = $(langdir)/german + RULES = \ + din5007.xdy \ +diff -urNad xindy-2.2-beta2~/modules/lang/latin/Makefile.in xindy-2.2-beta2/modules/lang/latin/Makefile.in +--- xindy-2.2-beta2~/modules/lang/latin/Makefile.in 2005-09-29 17:30:44.000000000 +0200 ++++ xindy-2.2-beta2/modules/lang/latin/Makefile.in 2006-04-18 01:30:02.183791000 +0200 +@@ -155,7 +155,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-langdir = $(pkglibdir)/modules/lang ++langdir = $(pkgdatadir)/lang + latindir = $(langdir)/latin + RULES = \ + caseisrt.xdy \ +diff -urNad xindy-2.2-beta2~/modules/ord/Makefile.in xindy-2.2-beta2/modules/ord/Makefile.in +--- xindy-2.2-beta2~/modules/ord/Makefile.in 2005-09-29 17:30:44.000000000 +0200 ++++ xindy-2.2-beta2/modules/ord/Makefile.in 2006-04-18 01:30:02.187791000 +0200 +@@ -155,7 +155,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-modulesdir = $(pkglibdir)/modules ++modulesdir = $(pkgdatadir) + orddir = $(modulesdir)/ord + RULES = \ + letorder.xdy +diff -urNad xindy-2.2-beta2~/modules/rules/Makefile.in xindy-2.2-beta2/modules/rules/Makefile.in +--- xindy-2.2-beta2~/modules/rules/Makefile.in 2005-09-29 17:30:44.000000000 +0200 ++++ xindy-2.2-beta2/modules/rules/Makefile.in 2006-04-18 01:30:02.175791000 +0200 +@@ -155,7 +155,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-modulesdir = $(pkglibdir)/modules ++modulesdir = $(pkgdatadir) + rulesdir = $(modulesdir)/rules + RULES = \ + isolatin1-exchange.xdy \ +diff --git a/modules/styles/Makefile.in b/modules/styles/Makefile.in +index 8942131..7de4a85 100644 +--- a/modules/styles/Makefile.in ++++ b/modules/styles/Makefile.in +@@ -156,7 +156,7 @@ sbindir = @sbindir@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-modulesdir = $(pkglibdir)/modules ++modulesdir = $(pkgdatadir) + texdir = $(modulesdir)/styles + RULES = basic.xdy makeidx.xdy + EXTRA_DIST = $(RULES) +diff --git a/user-commands/xindy.in b/user-commands/xindy.in +index ce77027..bf5956c 100644 +--- a/user-commands/xindy.in ++++ b/user-commands/xindy.in +@@ -309,11 +309,13 @@ BEGIN { + } + + # modules directory +- if ( -d "$cmd_dir/../modules" ) { # /opt style +- $modules_dir = "$cmd_dir/../modules"; +- } elsif ( -d "$lib_dir/modules" ) { # /usr style +- $modules_dir = "$lib_dir/modules"; +- } else { ++ $modules_dir = "/usr/share/xindy"; ++ unless ( -d $modules_dir ) { ++ #if ( -d "$cmd_dir/../modules" ) { # /opt style ++ # $modules_dir = "$cmd_dir/../modules"; ++ #} elsif ( -d "$lib_dir/modules" ) { # /usr style ++ # $modules_dir = "$lib_dir/modules"; ++ #} else { + die "$cmd: Cannot locate xindy modules directory"; + } + } --- xindy-2.4.orig/debian/patches/help-option.dpatch +++ xindy-2.4/debian/patches/help-option.dpatch @@ -0,0 +1,59 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## help-option.dpatch by Jörg Sommer +## +## DP: The commandline option --help of xindy and texindy prints the help +## DP: message to stderr. + +@DPATCH@ +diff --git a/user-commands/texindy b/user-commands/texindy +index e29e4e1..06dff2b 100755 +--- a/user-commands/texindy.in ++++ b/user-commands/texindy.in +@@ -322,9 +322,9 @@ use Getopt::Long qw(:config bundling); + + sub usage ( ;$ ) + { +- my $exit_code = shift; +- $exit_code += 0; # turn undef into 0 +- print STDERR <<_EOT_ ++ my $signal_error = int shift; ++ my $output_handle = $signal_error ? *STDERR{IO} : *STDOUT{IO}; ++ print $output_handle <<_EOT_ + + usage: $cmd [-V?h] [-qv] [-iglr] [-d magic] [-o outfile.ind] [-t log] \\ + [-L lang] [-C codepage] [-M module] [-I input] [idx0 idx1 ...] +@@ -350,7 +350,7 @@ GNU-STYLE LONG OPTIONS FOR SHORT OPTIONS: + + _EOT_ + ; +- exit ($exit_code); ++ exit ($signal_error ? 1 : 0); + } + + our ($output_version, $quiet, $verbose, $stdin, @debug, +diff --git a/user-commands/xindy.in b/user-commands/xindy.in +index cfd399b..11c0009 100644 +--- a/user-commands/xindy.in ++++ b/user-commands/xindy.in +@@ -335,9 +335,9 @@ use File::Spec; + + sub usage ( ;$ ) + { +- my $exit_code = shift; +- $exit_code += 0; # turn undef into 0 +- print STDERR <<_EOT_ ++ my $signal_error = int shift; ++ my $output_handle = $signal_error ? *STDERR{IO} : *STDOUT{IO}; ++ print $output_handle <<_EOT_ + + usage: $cmd [-V?h] [-qv] [-d magic] [-o outfile.ind] [-t log] \\ + [-L lang] [-C codepage] [-M module] [-I input] \\ +@@ -361,7 +361,7 @@ GNU-STYLE LONG OPTIONS FOR SHORT OPTIONS: + + _EOT_ + ; +- exit ($exit_code); ++ exit ($signal_error ? 1 : 0); + } + + our ($quiet, $verbose, %debug, --- xindy-2.4.orig/debian/patches/fix-entry-with-command.dpatch +++ xindy-2.4/debian/patches/fix-entry-with-command.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## echo-expansion-fix.dpatch by Joachim Schrod +## +## DP: This is a fix of a bug posted on the Xindy mailinglist. +## DP: http://sourceforge.net/mailarchive/message.php?msg_name=AANLkTimSCmPG47e6oProahOmz3Q5HYuCQ2BqxmruJ51k@mail.gmail.com + +@DPATCH@ +diff --git a/modules/base/tex.xdy b/modules/base/tex.xdy +index d3c23cb..af006ba 100644 +--- a/modules/base/tex.xdy ++++ b/modules/base/tex.xdy +@@ -16,15 +16,10 @@ + ;; keep-blanks is not loaded. Module keep-blanks would set a flag, and + ;; this code would check for it. We will need a hook in the kernel, to + ;; achieve that goal. +-;; +-;; FIXME: Regexps with start-anchored matches do not work. They match +-;; everywhere. We think it's better to not handle leading blanks than +-;; to make all blanks disappear, therefore the first rule is not +-;; activated. + +-;(merge-rule "^ +" "" :eregexp) ++(merge-rule "^ +" "" :eregexp) + (merge-rule " +$" "" :eregexp) +-(merge-rule " +" " " :eregexp) ++(merge-rule " +" " " :eregexp) + + + ;; +@@ -55,7 +50,7 @@ + + (merge-rule "\\[a-zA-Z@]+ *" "" :eregexp) + (merge-rule "\\[^a-zA-Z@]" "" :eregexp) +-(merge-rule "^[{}$]" "" :eregexp) ++(merge-rule "[{}$]" "" :eregexp) + + + --- xindy-2.4.orig/debian/patches/fix-configure.dpatch +++ xindy-2.4/debian/patches/fix-configure.dpatch @@ -0,0 +1,50 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix-configure.dpatch by Jörg Sommer +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: The grouping of the check for latex and pdflatex is not correct, +## DP: which causes configure failes with --disable-make-rules and +## DP: --disable-docs. This patch is only a ugly workaround. A better +## DP: patch was send upstream. + +@DPATCH@ + +diff --git a/configure b/configure +--- a/configure ++++ b/configure +@@ -2286,7 +2286,7 @@ else + BUILDRULES=yes + fi + +-test "$BUILDRULES" = "yes" && ++test "$BUILDRULES" = "yes" && { + for ac_prog in latex elatex lambda + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -2337,7 +2337,7 @@ then + $as_echo "$as_me: error: Unable to find a LaTeX application" >&2;} + { (exit 1); exit 1; }; }; + fi +- ++} + + if test "$BUILDRULES" = "yes"; then + BUILDRULES_TRUE= +@@ -2356,7 +2356,7 @@ else + BUILDDOCS=yes + fi + +-test "$BUILDDOCS" = "yes" && ++test "$BUILDDOCS" = "yes" && { + for ac_prog in pdflatex + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -2407,7 +2407,7 @@ then + $as_echo "$as_me: error: Unable to find a PDFLaTeX application" >&2;} + { (exit 1); exit 1; }; }; + fi +- ++} + + if test "$BUILDDOCS" = "yes"; then + BUILDDOCS_TRUE= --- xindy-2.4.orig/debian/patches/fix-alphabets-doc-geometry.dpatch +++ xindy-2.4/debian/patches/fix-alphabets-doc-geometry.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix-alphabets-doc-geometry.dpatch © by Jörg Sommer +## +## DP: This document uses zero borders to put as much as possible on a page. +## DP: But the border adjustment is not correct and the first page is greater +## DP: than the page size. + +@DPATCH@ + +diff --git a/make-rules/alphabets/alphabets-doc.tex b/make-rules/alphabets/alphabets-doc.tex +index ce55690..b9bacfd 100644 +--- a/make-rules/alphabets/alphabets-doc.tex ++++ b/make-rules/alphabets/alphabets-doc.tex +@@ -1,5 +1,5 @@ + \documentclass{report} +-\usepackage{a4wide} ++\usepackage[noheadfoot,margin=.5cm]{geometry} + \usepackage[TS1,LGR,T2A,T1]{fontenc} + \usepackage[colorlinks]{hyperref} + \usepackage[cp1252,latin1,cp850,latin2,cp1250,latin3,latin4,latin5,latin9,cp1251]{inputenc} +@@ -15,9 +15,6 @@ + \small (\^{}) & \small (\~{}) & \small (\r{}) & \small (\"{}) & + \small (,) & \small (\c{}) & \small (k{}) & \small (\.{}) & + \small (-) & \small (\={}) & \small (?)\\}{\end{tabular}} +-\setlength{\topskip}{0mm} +-\setlength{\topmargin}{-15mm} +-\setlength{\textheight}{260mm} + \setcounter{tocdepth}{2} + + \renewcommand*{\contentsname}{\begin{center} --- xindy-2.4.orig/debian/patches/fix-echo-expansion.dpatch +++ xindy-2.4/debian/patches/fix-echo-expansion.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## echo-expansion-fix.dpatch by Jörg Sommer +## +## DP: The echo command shipped with the Debian system takes \ as an escape +## DP: sequence. This causes a formfeed is printed in the string "\fenc...". + +@DPATCH@ +diff -urNad xindy-2.2-beta2~/make-rules/alphabets/Makefile.in xindy-2.2-beta2/make-rules/alphabets/Makefile.in +--- xindy-2.2-beta2~/make-rules/alphabets/Makefile.in 2006-04-13 17:23:13.186672000 +0200 ++++ xindy-2.2-beta2/make-rules/alphabets/Makefile.in 2006-04-13 17:24:38.442672000 +0200 +@@ -2438,7 +2438,7 @@ + echo "\section{Codepage latin9}" >>$@ + for i in $(DOCS_LATIN9); do echo "\input{$$i}" >>$@; done + echo "\ienc{cp1251}" >>$@ +- echo "\fenc{T2A}" >>$@ ++ printf "%s\n" "\fenc{T2A}" >>$@ + echo "\chapter{Cyrillic scripts}" >>$@ + echo "\section{Codepage 1251}" >>$@ + for i in $(DOCS_CYR_1251); do echo "\input{$$i}" >>$@; done --- xindy-2.4.orig/debian/tests/entry-with-command +++ xindy-2.4/debian/tests/entry-with-command @@ -0,0 +1,33 @@ +#!/bin/sh + +# taken from +# http://sourceforge.net/mailarchive/message.php?msg_name=20100527125533.GD20656%40shuttle.babafou.eu.org + +set -e + +tmp=$(mktemp) +trap "rm $tmp" EXIT INT + +texindy --out-file $tmp --stdin <<\__EOF +\indexentry{\path{indexed}}{1} +\indexentry{\emph{Test}}{1} +__EOF + +diff -u - $tmp <<\__EOF +\begin{theindex} + \providecommand*\lettergroupDefault[1]{} + \providecommand*\lettergroup[1]{% + \par\textbf{#1}\par + \nopagebreak + } + + \lettergroup{I} + \item \path{indexed}, 1 + + \indexspace + + \lettergroup{T} + \item \emph{Test}, 1 + +\end{theindex} +__EOF --- xindy-2.4.orig/debian/tests/simple_index +++ xindy-2.4/debian/tests/simple_index @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +tmp=$(mktemp) +trap "rm $tmp" EXIT INT + +texindy --out-file $tmp --stdin <<__EOF__ +\indexentry{test}{1} +__EOF__ + +diff -u - $tmp <<__EOF__ +\begin{theindex} + \providecommand*\lettergroupDefault[1]{} + \providecommand*\lettergroup[1]{% + \par\textbf{#1}\par + \nopagebreak + } + + \lettergroup{T} + \item test, 1 + +\end{theindex} +__EOF__