From 88d285c7c029522172fda03bf090b83a73669c90 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 21 Jun 2009 18:26:43 +0200 Subject: [PATCH] patches: Added asciidoc-8.4.dpatch. This is an upstream patch fixing build issues with asciidoc 8.4, thanks to Lucas Nussbaum for reporting this. Closes: #534046 Also, updated changelog to 0.14.1-2. --- debian/changelog | 9 +++++ debian/control | 2 +- debian/patches/00list | 2 ++ debian/patches/asciidoc-8.4.dpatch | 55 ++++++++++++++++++++++++++++++ debian/rules | 6 ++-- 5 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 debian/patches/00list create mode 100755 debian/patches/asciidoc-8.4.dpatch diff --git a/debian/changelog b/debian/changelog index 9d80505..033d95e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +tig (0.14.1-2) unstable; urgency=low + + * debian/patches: + - Added asciidoc-8.4.dpatch - upstream patch fixing build issues with + asciidoc 8.4, thanks to Lucas Nussbaum for reporting this + (Closes: #534046). + + -- Sebastian Harl Sun, 21 Jun 2009 18:24:35 +0200 + tig (0.14.1-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index bb503e8..439e608 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: tig Section: vcs Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), git-core, libncursesw5-dev, asciidoc (>= 7), xmlto, docbook-utils +Build-Depends: debhelper (>= 5), dpatch, dpkg-dev (>= 1.14.6), git-core, libncursesw5-dev, asciidoc (>= 7), xmlto, docbook-utils Standards-Version: 3.8.1 Homepage: http://jonas.nitro.dk/tig/ Vcs-Git: git://git.tokkee.org/pkg-tig.git diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 0000000..d47c18b --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1,2 @@ +asciidoc-8.4.dpatch + diff --git a/debian/patches/asciidoc-8.4.dpatch b/debian/patches/asciidoc-8.4.dpatch new file mode 100755 index 0000000..cdd9a4e --- /dev/null +++ b/debian/patches/asciidoc-8.4.dpatch @@ -0,0 +1,55 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## asciidoc-8.4.dpatch by Jonas Fonseca +## +## DP: Fix build issues with asciidoc 8.4. +## DP: +## DP: This version seems to be stricter about presubs attributes. +## DP: Based on a patch by Ingmar Vanhassel. + +@DPATCH@ + +diff a/tigrc.5.txt b/tigrc.5.txt +--- a/tigrc.5.txt ++++ b/tigrc.5.txt +@@ -9,11 +9,9 @@ tigrc - tig configuration file + SYNOPSIS + -------- + [verse] +-............................................................................. + *set* 'variable' *=* 'value' + *bind* 'keymap' 'key' 'action' + *color* 'area' 'fgcolor' 'bgcolor' '[attributes]' +-............................................................................. + + + DESCRIPTION +@@ -38,9 +36,7 @@ A few selective variables can be configured via the set command. The syntax + is: + + [verse] +-.............................................................................. + *set* variables *=* value +-.............................................................................. + + Examples: + +@@ -146,9 +142,7 @@ Using bind commands keys can be mapped to an action when pressed in a given + key map. The syntax is: + + [verse] +-.............................................................................. + *bind* 'keymap' 'key' 'action' +-.............................................................................. + + Examples: + +@@ -363,9 +357,7 @@ background combinations to certain areas. Optionally, an attribute can be + given as the last parameter. The syntax is: + + [verse] +-.............................................................................. + *color* 'area' 'fgcolor' 'bgcolor' '[attributes]' +-.............................................................................. + + Examples: + diff --git a/debian/rules b/debian/rules index 54cb1cf..0cd4b57 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,8 @@ else CFLAGS += -O2 endif +include /usr/share/dpatch/dpatch.make + config.status: configure dh_testdir ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ @@ -27,14 +29,14 @@ config.status: configure build: build-stamp -build-stamp: config.status +build-stamp: config.status $(DPATCH_STAMPFN) dh_testdir $(MAKE) all doc touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp -- 2.30.2