Package: source-highlight Version: 3.1.6-2 Severity: wishlist Tags: patch User: debian-de...@lists.debian.org Usertags: origin-ubuntu trusty ubuntu-patch autoreconf
Dear Maintainer, In Ubuntu 14.04, the attached patch was applied to achieve the following: * Use dh-autoreconf for newer arches. * Backport upstream git changeset a9beab95 for AM_CPPFLAGS warning using newer auto*. This debdiff may contain extraneous metadata. If so, kindly please ignore them. Thanks for considering the patch! -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise-proposed'), (500, 'precise'), (100, 'precise-backports') Architecture: amd64 (x86_64) Kernel: Linux 3.11.0-15-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru source-highlight-3.1.6/debian/changelog source-highlight-3.1.6/debian/changelog diff -Nru source-highlight-3.1.6/debian/control source-highlight-3.1.6/debian/control --- source-highlight-3.1.6/debian/control 2013-11-05 06:23:19.000000000 -0500 +++ source-highlight-3.1.6/debian/control 2014-01-30 12:50:57.000000000 -0500 @@ -1,8 +1,9 @@ Source: source-highlight Section: devel Priority: optional -Maintainer: Peter Eisentraut <pet...@debian.org> -Build-Depends: automake1.11, autotools-dev, debhelper (>= 7.0.50~), exuberant-ctags, help2man, texi2html, texinfo, gawk, libboost-regex-dev +Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> +XSBC-Original-Maintainer: Peter Eisentraut <pet...@debian.org> +Build-Depends: dh-autoreconf, debhelper (>= 7.0.50~), exuberant-ctags, help2man, texi2html, texinfo, gawk, libboost-regex-dev Standards-Version: 3.9.4 Homepage: http://www.gnu.org/software/src-highlite/ diff -Nru source-highlight-3.1.6/debian/patches/automake_cppflags.patch source-highlight-3.1.6/debian/patches/automake_cppflags.patch --- source-highlight-3.1.6/debian/patches/automake_cppflags.patch 1969-12-31 19:00:00.000000000 -0500 +++ source-highlight-3.1.6/debian/patches/automake_cppflags.patch 2014-01-30 13:11:03.000000000 -0500 @@ -0,0 +1,96 @@ +From a9beab9522b7f542f2a1fd624c3acfa244520ce1 Mon Sep 17 00:00:00 2001 +From: Lorenzo Bettini <bett...@dsi.unifi.it> +Date: Sat, 14 Apr 2012 13:44:10 +0000 +Subject: Use AM_CPPFLAGS instead the obsolete INCLUDES + +--- +Index: source-highlight-3.1.6/lib/examples/Makefile.am +=================================================================== +--- source-highlight-3.1.6.orig/lib/examples/Makefile.am 2011-12-16 12:10:10.000000000 -0500 ++++ source-highlight-3.1.6/lib/examples/Makefile.am 2014-01-30 13:10:37.746798419 -0500 +@@ -8,7 +8,12 @@ + # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS) \ ++AM_CPPFLAGS = \ ++ -I$(top_srcdir)/gl \ ++ -I$(top_builddir)/gl \ ++ -I$(top_srcdir)/src \ ++ -I$(srcdir)/.. \ ++ $(BOOST_CPPFLAGS) \ + -D DATADIR="\"$(top_srcdir)/src/\"" + AM_LDFLAGS = $(BOOST_LDFLAGS) -no-install + +@@ -17,8 +22,6 @@ + #LIBDIR = $(top_builddir)/lib/srchilite/ + LIBDIR = ../srchilite/ + +-INCLUDES = -I@top_srcdir@/src -I@srcdir@/.. +- + check_PROGRAMS = source-highlight-console infoformatter styleformatter + + source_highlight_console_SOURCES = source-highlight-console-main.cpp +Index: source-highlight-3.1.6/lib/srchilite/Makefile.am +=================================================================== +--- source-highlight-3.1.6.orig/lib/srchilite/Makefile.am 2011-12-16 12:10:10.000000000 -0500 ++++ source-highlight-3.1.6/lib/srchilite/Makefile.am 2014-01-30 13:10:37.746798419 -0500 +@@ -51,7 +51,7 @@ + rm -f $(builddir)/html/* + endif + +-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS) ++AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl -I$(top_srcdir)/src $(BOOST_CPPFLAGS) + AM_LDFLAGS = $(BOOST_LDFLAGS) + + LDADD = $(top_builddir)/gl/libgnu.la +@@ -140,8 +140,6 @@ + sourcehighlightutils.h utils.h \ + instances.h + +-INCLUDES = -I@top_srcdir@/src +- + EXTRA_DIST = $(h_sources) \ + langelemsprinter_dbtab.cc \ + highlightstatebuilder_dbtab.cc \ +Index: source-highlight-3.1.6/lib/tests/Makefile.am +=================================================================== +--- source-highlight-3.1.6.orig/lib/tests/Makefile.am 2011-12-16 12:10:12.000000000 -0500 ++++ source-highlight-3.1.6/lib/tests/Makefile.am 2014-01-30 13:10:37.746798419 -0500 +@@ -8,7 +8,11 @@ + # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS) ++AM_CPPFLAGS = \ ++ -I$(top_srcdir)/gl \ ++ -I$(top_builddir)/gl \ ++ -I$(top_srcdir)/src -I$(srcdir)/.. ++ $(BOOST_CPPFLAGS) + AM_LDFLAGS = $(BOOST_LDFLAGS) -no-install + + LDADD = $(top_builddir)/gl/libgnu.la $(LIBDIR)/libsource-highlight.la $(BOOST_REGEX_LIB) +@@ -16,8 +20,6 @@ + #LIBDIR = $(top_builddir)/lib/srchilite/ + LIBDIR = ../srchilite/ + +-INCLUDES = -I@top_srcdir@/src -I@srcdir@/.. +- + VALGRIND_TESTS = test_regexrules test_formatter_manager test_highlighter \ + test_exception test_highlightbuilder test_buffered_output \ + test_textstyle test_textgenerator test_textstyleformatter test_wordtokenizer test_linenum \ +Index: source-highlight-3.1.6/src/Makefile.am +=================================================================== +--- source-highlight-3.1.6.orig/src/Makefile.am 2011-12-26 05:41:56.000000000 -0500 ++++ source-highlight-3.1.6/src/Makefile.am 2014-01-30 13:10:37.746798419 -0500 +@@ -34,9 +34,7 @@ + + SRCHILITE = $(top_builddir)/src/source-highlight$(EXEEXT) + +-INCLUDES = -I@top_srcdir@/lib +- +-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS) ++AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl -I$(top_srcdir)/lib $(BOOST_CPPFLAGS) + AM_LDFLAGS = $(BOOST_LDFLAGS) + + LDADD = $(top_builddir)/gl/libgnu.la diff -Nru source-highlight-3.1.6/debian/patches/series source-highlight-3.1.6/debian/patches/series --- source-highlight-3.1.6/debian/patches/series 2013-10-22 09:02:18.000000000 -0400 +++ source-highlight-3.1.6/debian/patches/series 2014-01-30 13:11:01.000000000 -0500 @@ -1,3 +1,4 @@ 695793_GFDL_doc.patch 0001-New-texinfo-doesn-t-seem-to-allow-nested-examples-sm.patch fix-testcase-boost1.54.patch +automake_cppflags.patch diff -Nru source-highlight-3.1.6/debian/rules source-highlight-3.1.6/debian/rules --- source-highlight-3.1.6/debian/rules 2013-11-04 06:43:44.000000000 -0500 +++ source-highlight-3.1.6/debian/rules 2014-01-30 12:52:58.000000000 -0500 @@ -3,11 +3,9 @@ DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk -config.status: configure +config.status: configure.ac dh_testdir - aclocal-1.11 -I m4 -I gl/m4 - automake-1.11 - dh_autotools-dev_updateconfig + dh_autoreconf &&\ dh_auto_configure -- \ --enable-warnings \ --with-boost-regex=boost_regex @@ -25,9 +23,9 @@ dh_testdir dh_testroot dh_auto_clean - dh_autotools-dev_restoreconfig rm -f `find -name Makefile.in` rm -f aclocal.m4 + dh_autoreconf_clean dh_clean DESTDIR=$(CURDIR)/debian/tmp