Package: tablix2
Version: 0.3.5-2
Tags: patch
Dear maintainer,
As we're closing in on the la files removal target, tablix2 is the
package causing the most lintian errors for this. Please find attached 2
pacthes.
The first, la_cleanup.diff simply clears the dependecy_libs field from
the la distributed files.
As I was looking at the lintian warnings, I started hacking on the
packaging, and tried to do as much as I could to bring it up to date
with the current packaging practice, leading to packaging_update.diff.
It switches to format 3.0 (quilt), using dh with autoreconf (fixing
#756442), split the patches, and fixes a few more lintian warnings along
the way.
Please feel free to apply either the first, or second patch. If you have
any question, please don't hesitate to ask either.
Thanks for your help,
Regis
diff -Nru tablix2-0.3.5/configure tablix2-0.3.5/configure
--- tablix2-0.3.5/configure 2016-01-07 19:17:25.000000000 +0000
+++ tablix2-0.3.5/configure 2007-07-03 12:23:15.000000000 +0100
@@ -28180,7 +28180,7 @@
fi
-ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile utils/Makefile ttf/Makefile ttf/tests/Makefile examples/Makefile modules/Makefile intl/Makefile po/Makefile.in export/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile utils/Makefile ttf/Makefile ttf/tests/Makefile examples/Makefile modules/Makefile intl/Makefile po/Makefile.in debian/Makefile export/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -28792,6 +28792,7 @@
"modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
"intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+ "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
"export/Makefile") CONFIG_FILES="$CONFIG_FILES export/Makefile" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff -Nru tablix2-0.3.5/debian/compat tablix2-0.3.5/debian/compat
--- tablix2-0.3.5/debian/compat 2016-01-07 19:17:25.000000000 +0000
+++ tablix2-0.3.5/debian/compat 2016-01-06 23:57:14.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru tablix2-0.3.5/debian/compat.debdiff tablix2-0.3.5/debian/compat.debdiff
--- tablix2-0.3.5/debian/compat.debdiff 2016-01-07 19:17:25.000000000 +0000
+++ tablix2-0.3.5/debian/compat.debdiff 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-4
diff -Nru tablix2-0.3.5/debian/control tablix2-0.3.5/debian/control
--- tablix2-0.3.5/debian/control 2016-01-07 19:17:25.000000000 +0000
+++ tablix2-0.3.5/debian/control 2016-01-07 00:09:17.000000000 +0000
@@ -2,8 +2,9 @@
Section: misc
Priority: extra
Maintainer: Robert Lemmen <rober...@semistable.com>
-Build-Depends: debhelper (>= 7.0.0), pvm-dev, libxml2-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), pvm-dev, libxml2-dev, dh-autoreconf
+Standards-Version: 3.9.6
+Homepage: http://www.tablix.org/articles/about.html
Package: tablix2
Architecture: any
@@ -16,5 +17,3 @@
sensible timetables from XML formatted problem descriptions.
Tablix can run on a single host as well as on a heterogeneous
parallel virtual machine using PVM3.
- .
- http://www.tablix.org/articles/about.html
diff -Nru tablix2-0.3.5/debian/copyright tablix2-0.3.5/debian/copyright
--- tablix2-0.3.5/debian/copyright 2016-01-07 19:17:25.000000000 +0000
+++ tablix2-0.3.5/debian/copyright 2016-01-07 18:58:52.000000000 +0000
@@ -21,7 +21,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License with
- the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+ the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
if not, write to the Free Software Foundation, Inc., 51 Franklin St,
Fifth Floor, Boston, MA 02110-1301, USA.
diff -Nru tablix2-0.3.5/debian/Makefile.am tablix2-0.3.5/debian/Makefile.am
--- tablix2-0.3.5/debian/Makefile.am 2007-06-05 17:04:22.000000000 +0100
+++ tablix2-0.3.5/debian/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-EXTRA_DIST = \
- changelog \
- compat \
- control \
- copyright \
- dirs \
- rules \
- tablix2-dev.examples \
- tablix2-dev.install \
- tablix2-doc.docs \
- tablix2.docs \
- tablix2.examples \
- tablix2.manpages
diff -Nru tablix2-0.3.5/debian/Makefile.in tablix2-0.3.5/debian/Makefile.in
--- tablix2-0.3.5/debian/Makefile.in 2007-07-03 12:24:45.000000000 +0100
+++ tablix2-0.3.5/debian/Makefile.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,377 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = debian
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GENCAT = @GENCAT@
-GETARCH = @GETARCH@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_LIBPVM3_FALSE = @HAVE_LIBPVM3_FALSE@
-HAVE_LIBPVM3_TRUE = @HAVE_LIBPVM3_TRUE@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAKEINFO = @MAKEINFO@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PVM_CFLAGS = @PVM_CFLAGS@
-PVM_LIBS = @PVM_LIBS@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-EXTRA_DIST = \
- changelog \
- compat \
- control \
- copyright \
- dirs \
- rules \
- tablix2-dev.examples \
- tablix2-dev.install \
- tablix2-doc.docs \
- tablix2.docs \
- tablix2.examples \
- tablix2.manpages
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu debian/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu debian/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -Nru tablix2-0.3.5/debian/patches/decruft_localedir.patch tablix2-0.3.5/debian/patches/decruft_localedir.patch
--- tablix2-0.3.5/debian/patches/decruft_localedir.patch 1970-01-01 01:00:00.000000000 +0100
+++ tablix2-0.3.5/debian/patches/decruft_localedir.patch 2016-01-07 18:51:47.000000000 +0000
@@ -0,0 +1,18 @@
+Description: drop broken localedir modification
+ Remove changes to the way localredir is set, so it simply work.
+Author: Regis Boudin <re...@debian.org>
+Last-Update: 2016-01-07
+
+Index: tablix2-0.3.5/configure.in
+===================================================================
+--- tablix2-0.3.5.orig/configure.in
++++ tablix2-0.3.5/configure.in
+@@ -44,8 +44,6 @@ AC_CHECK_LIB(dl, dlopen)
+ #ALL_LINGUAS="sl"
+ AM_GNU_GETTEXT
+ AM_GNU_GETTEXT_VERSION([0.16.1])
+-localedir='${prefix}/${DATADIRNAME}/locale'
+-AC_SUBST(localedir)
+ AM_ICONV
+
+
diff -Nru tablix2-0.3.5/debian/patches/fix_manpages.patch tablix2-0.3.5/debian/patches/fix_manpages.patch
--- tablix2-0.3.5/debian/patches/fix_manpages.patch 1970-01-01 01:00:00.000000000 +0100
+++ tablix2-0.3.5/debian/patches/fix_manpages.patch 2016-01-07 18:42:53.000000000 +0000
@@ -0,0 +1,68 @@
+Description: Fix manpage warnings
+ Resove warnings pointed by lintian.
+
+Index: tablix2-0.3.5/doc/tablix2_benchmark.1
+===================================================================
+--- tablix2-0.3.5.orig/doc/tablix2_benchmark.1
++++ tablix2-0.3.5/doc/tablix2_benchmark.1
+@@ -1,6 +1,5 @@
+ .\" These macros were copied from MPlayer manpage, written by Gabucino,
+ .\" Diego Biurrun and Jonas Jermann.
+-..
+ .\" default indentation is 7, don't change!
+ .nr IN 7
+ .\" define indentation for suboptions
+Index: tablix2-0.3.5/doc/tablix2_output.1
+===================================================================
+--- tablix2-0.3.5.orig/doc/tablix2_output.1
++++ tablix2-0.3.5/doc/tablix2_output.1
+@@ -1,6 +1,5 @@
+ .\" These macros were copied from MPlayer manpage, written by Gabucino,
+ .\" Diego Biurrun and Jonas Jermann.
+-..
+ .\" default indentation is 7, don't change!
+ .nr IN 7
+ .\" define indentation for suboptions
+Index: tablix2-0.3.5/doc/tablix2_plot.1
+===================================================================
+--- tablix2-0.3.5.orig/doc/tablix2_plot.1
++++ tablix2-0.3.5/doc/tablix2_plot.1
+@@ -1,6 +1,5 @@
+ .\" These macros were copied from MPlayer manpage, written by Gabucino,
+ .\" Diego Biurrun and Jonas Jermann.
+-..
+ .\" default indentation is 7, don't change!
+ .nr IN 7
+ .\" define indentation for suboptions
+Index: tablix2-0.3.5/doc/tablix2_test.1
+===================================================================
+--- tablix2-0.3.5.orig/doc/tablix2_test.1
++++ tablix2-0.3.5/doc/tablix2_test.1
+@@ -1,6 +1,5 @@
+ .\" These macros were copied from MPlayer manpage, written by Gabucino,
+ .\" Diego Biurrun and Jonas Jermann.
+-..
+ .\" default indentation is 7, don't change!
+ .nr IN 7
+ .\" define indentation for suboptions
+Index: tablix2-0.3.5/doc/tablix2.1
+===================================================================
+--- tablix2-0.3.5.orig/doc/tablix2.1
++++ tablix2-0.3.5/doc/tablix2.1
+@@ -1,6 +1,5 @@
+ .\" These macros were copied from MPlayer manpage, written by Gabucino,
+ .\" Diego Biurrun and Jonas Jermann.
+-..
+ .\" default indentation is 7, don't change!
+ .nr IN 7
+ .\" define indentation for suboptions
+@@ -8,8 +7,8 @@
+ .\" add new suboption
+ .de IPs
+ .IP "\\$1" \n(SS
+-..
+ .\" begin of first level suboptions, end with .RE
++..
+ .de RSs
+ .RS \n(IN+3
+ ..
diff -Nru tablix2-0.3.5/debian/patches/ignore_debian_subdir.patch tablix2-0.3.5/debian/patches/ignore_debian_subdir.patch
--- tablix2-0.3.5/debian/patches/ignore_debian_subdir.patch 1970-01-01 01:00:00.000000000 +0100
+++ tablix2-0.3.5/debian/patches/ignore_debian_subdir.patch 2016-01-07 18:56:27.000000000 +0000
@@ -0,0 +1,31 @@
+Description: Ignore upstream-provided debian/ directory
+ Upstream provides a debian/ directory with Makefile.am and Makefile.in.
+ Format 3.0 (quilt) replaces the directory completely, so remove references to
+ it from upstream configure.in and Makefile.am. dh_autoreconf makes sure
+ Makefile.in and configure see these changes applied.
+Last-Update: 2016-01-07
+
+Index: tablix2-0.3.5/Makefile.am
+===================================================================
+--- tablix2-0.3.5.orig/Makefile.am
++++ tablix2-0.3.5/Makefile.am
+@@ -1,5 +1,5 @@
+ EXTRA_DIST = config.rpath BUGS
+
+-SUBDIRS = intl src doc export utils ttf examples modules po debian
++SUBDIRS = intl src doc export utils ttf examples modules po
+
+ ACLOCAL_AMFLAGS = -I m4
+Index: tablix2-0.3.5/configure.in
+===================================================================
+--- tablix2-0.3.5.orig/configure.in
++++ tablix2-0.3.5/configure.in
+@@ -51,7 +51,7 @@ AC_DISABLE_STATIC
+ AM_PROG_LIBTOOL
+ AC_SHLIB_EXT
+
+-AC_OUTPUT(Makefile src/Makefile doc/Makefile utils/Makefile ttf/Makefile ttf/tests/Makefile examples/Makefile modules/Makefile intl/Makefile po/Makefile.in debian/Makefile export/Makefile )
++AC_OUTPUT(Makefile src/Makefile doc/Makefile utils/Makefile ttf/Makefile ttf/tests/Makefile examples/Makefile modules/Makefile intl/Makefile po/Makefile.in export/Makefile )
+
+ if test "$no_pvm" = "yes" ; then
+ AC_MSG_RESULT([
diff -Nru tablix2-0.3.5/debian/patches/series tablix2-0.3.5/debian/patches/series
--- tablix2-0.3.5/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ tablix2-0.3.5/debian/patches/series 2016-01-07 18:45:53.000000000 +0000
@@ -0,0 +1,3 @@
+ignore_debian_subdir.patch
+decruft_localedir.patch
+fix_manpages.patch
diff -Nru tablix2-0.3.5/debian/rules tablix2-0.3.5/debian/rules
--- tablix2-0.3.5/debian/rules 2016-01-07 19:17:25.000000000 +0000
+++ tablix2-0.3.5/debian/rules 2016-01-07 01:37:18.000000000 +0000
@@ -1,66 +1,16 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+PVMARCH ?= $(shell pvmgetarch)
-CFLAGS = -g -Wall
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
+%:
+ dh $@ --with autoreconf
-config.status: configure
- dh_testdir
- CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir=/usr/share/man --with-pvm3 --enable-conv --enable-more-teachers --enable-tunable
+override_dh_auto_configure:
+ dh_auto_configure -- --with-pvm3 --enable-conv --enable-more-teachers --enable-tunable
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- rm -f examples/modules/*.so
- [ ! -f Makefile ] || $(MAKE) distclean
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tablix2/
+override_dh_auto_install:
+ dh_auto_install
mkdir -p $(CURDIR)/debian/tablix2/usr/lib/pvm3/bin/`pvmgetarch`
- ln -s /usr/bin/tablix2_kernel $(CURDIR)/debian/tablix2/usr/lib/pvm3/bin/`pvmgetarch`/tablix2_kernel
- # fix, --localedir isn't used
- mv $(CURDIR)/debian/tablix2/usr/locale $(CURDIR)/debian/tablix2/usr/share/locale
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installman
- dh_installexamples
- dh_installchangelogs ChangeLog
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+ ln -s /usr/bin/tablix2_kernel $(CURDIR)/debian/tablix2/usr/lib/pvm3/bin/$(PVMARCH)/tablix2_kernel
+ rm -f $(CURDIR)/debian/tablix2/usr/lib/$(DEB_HOST_MULTIARCH)/tablix2/*.la
diff -Nru tablix2-0.3.5/debian/source/format tablix2-0.3.5/debian/source/format
--- tablix2-0.3.5/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ tablix2-0.3.5/debian/source/format 2016-01-07 00:22:54.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru tablix2-0.3.5/debian/tablix2-dev.examples tablix2-0.3.5/debian/tablix2-dev.examples
--- tablix2-0.3.5/debian/tablix2-dev.examples 2007-06-05 16:16:28.000000000 +0100
+++ tablix2-0.3.5/debian/tablix2-dev.examples 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-examples/modules/*.c
-examples/modules/*.xml
-examples/modules/Makefile
diff -Nru tablix2-0.3.5/debian/tablix2-dev.install tablix2-0.3.5/debian/tablix2-dev.install
--- tablix2-0.3.5/debian/tablix2-dev.install 2007-06-05 16:34:57.000000000 +0100
+++ tablix2-0.3.5/debian/tablix2-dev.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-src/chromo.h usr/include/tablix2
-src/data.h usr/include/tablix2
-src/error.h usr/include/tablix2
-src/modsup.h usr/include/tablix2
-src/assert.h usr/include/tablix2
-src/depend.h usr/include/tablix2
-src/gettext.h usr/include/tablix2
-src/module.h usr/include/tablix2
-src/export.h usr/include/tablix2
diff -Nru tablix2-0.3.5/debian/tablix2-doc.docs tablix2-0.3.5/debian/tablix2-doc.docs
--- tablix2-0.3.5/debian/tablix2-doc.docs 2007-06-05 16:15:30.000000000 +0100
+++ tablix2-0.3.5/debian/tablix2-doc.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-doc/modules.pdf
-doc/modules2.pdf
-doc/morphix.pdf
-doc/manual.pdf
-doc/modules
-doc/doxygen
diff -Nru tablix2-0.3.5/debian/watch tablix2-0.3.5/debian/watch
--- tablix2-0.3.5/debian/watch 2016-01-07 19:17:25.000000000 +0000
+++ tablix2-0.3.5/debian/watch 2016-01-07 01:17:29.000000000 +0000
@@ -1,6 +1,3 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
version=3
# Site Directory Pattern Version Script
http://www.tablix.org/releases/stable/ tablix[0-9]?-(.*)\.tar\.gz
diff -Nru tablix2-0.3.5/doc/tablix2.1 tablix2-0.3.5/doc/tablix2.1
--- tablix2-0.3.5/doc/tablix2.1 2016-01-07 19:17:25.000000000 +0000
+++ tablix2-0.3.5/doc/tablix2.1 2006-08-29 15:28:31.000000000 +0100
@@ -1,5 +1,6 @@
.\" These macros were copied from MPlayer manpage, written by Gabucino,
.\" Diego Biurrun and Jonas Jermann.
+..
.\" default indentation is 7, don't change!
.nr IN 7
.\" define indentation for suboptions
@@ -7,8 +8,8 @@
.\" add new suboption
.de IPs
.IP "\\$1" \n(SS
-.\" begin of first level suboptions, end with .RE
..
+.\" begin of first level suboptions, end with .RE
.de RSs
.RS \n(IN+3
..
diff -Nru tablix2-0.3.5/Makefile.in tablix2-0.3.5/Makefile.in
--- tablix2-0.3.5/Makefile.in 2016-01-07 19:17:25.000000000 +0000
+++ tablix2-0.3.5/Makefile.in 2007-07-03 12:24:47.000000000 +0100
@@ -225,7 +225,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
EXTRA_DIST = config.rpath BUGS
-SUBDIRS = intl src doc export utils ttf examples modules po
+SUBDIRS = intl src doc export utils ttf examples modules po debian
ACLOCAL_AMFLAGS = -I m4
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff -u tablix2-0.3.5/debian/rules tablix2-0.3.5/debian/rules
--- tablix2-0.3.5/debian/rules
+++ tablix2-0.3.5/debian/rules
@@ -40,6 +40,7 @@
$(MAKE) install DESTDIR=$(CURDIR)/debian/tablix2/
mkdir -p $(CURDIR)/debian/tablix2/usr/lib/pvm3/bin/`pvmgetarch`
ln -s /usr/bin/tablix2_kernel $(CURDIR)/debian/tablix2/usr/lib/pvm3/bin/`pvmgetarch`/tablix2_kernel
+ sed -i "/dependency_libs/ s/'.*'/''/" `find $(CURDIR)/debian -name '*.la'`
# fix, --localedir isn't used
mv $(CURDIR)/debian/tablix2/usr/locale $(CURDIR)/debian/tablix2/usr/share/locale
