From: Sebastian Harl <sh@tokkee.org>
Date: Sat, 21 Nov 2009 20:11:34 +0000 (+0100)
Subject: patches: Removed asciidoc-8.4.dpatch.
X-Git-Tag: tig-0.15-1~2
X-Git-Url: https://git.tokkee.org/?p=pkg-tig.git;a=commitdiff_plain;h=350920736d9d56aff5c02c93e02d7b2f0fae3a59

patches: Removed asciidoc-8.4.dpatch.

This patch has been included upstream.
---

diff --git a/debian/changelog b/debian/changelog
index bc7ef37..fe9a450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ tig (0.15-1) unstable; urgency=low
     - No longer build-depend on git-core - this is not required by the build
       system any more.
     - Updated Standards-Version to 3.8.3 - no changes.
+  * debian/patches:
+    - Removed asciidoc-8.4.dpatch - included upstream.
 
- -- Sebastian Harl <tokkee@debian.org>  Sat, 21 Nov 2009 21:07:57 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Sat, 21 Nov 2009 21:10:57 +0100
 
 tig (0.14.1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 33d45e0..59223eb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tig
 Section: vcs
 Priority: optional
 Maintainer: Sebastian Harl <tokkee@debian.org>
-Build-Depends: debhelper (>= 5), dpatch, dpkg-dev (>= 1.14.6), libncursesw5-dev, asciidoc (>= 7), xmlto, docbook-utils
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), libncursesw5-dev, asciidoc (>= 7), xmlto, docbook-utils
 Standards-Version: 3.8.3
 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
deleted file mode 100644
index d47c18b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-asciidoc-8.4.dpatch
-
diff --git a/debian/patches/asciidoc-8.4.dpatch b/debian/patches/asciidoc-8.4.dpatch
deleted file mode 100755
index cdd9a4e..0000000
--- a/debian/patches/asciidoc-8.4.dpatch
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## asciidoc-8.4.dpatch by Jonas Fonseca <fonseca@diku.dk>
-##
-## 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 f13c4e8..9666fa1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,6 @@ 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) \
@@ -29,14 +27,14 @@ config.status: configure
 
 build: build-stamp
 
-build-stamp: config.status $(DPATCH_STAMPFN)
+build-stamp: config.status
 	dh_testdir
 	
 	$(MAKE) all doc
 	
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp