From c18e74318d675fab42f68a7b3d84b4e8c5cb9a07 Mon Sep 17 00:00:00 2001
From: Guido Guenther <agx@sigxcpu.org>
Date: Fri, 29 Dec 2006 18:19:56 +0100
Subject: depend on gtk-doc-tools, sgml2x and jade (Closes: #404673) use
 docbook-utils insted of docbook-to-man

---
 debian/changelog | 8 ++++++++
 debian/control   | 6 ++++--
 debian/rules     | 7 ++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b1479969..6e721b3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+git-buildpackage (0.2.23) unstable; urgency=low
+
+  * depend on gtk-doc-tools, sgml2x and jade (Closes: #404673)
+  * use docbook-utils insted of docbook-to-man
+  * docbook updates
+
+ -- Guido Guenther <agx@sigxcpu.org>  Fri, 29 Dec 2006 18:18:50 +0100
+
 git-buildpackage (0.2.22) unstable; urgency=low
 
   * git-buildpackage: check if upstream branch exists
diff --git a/debian/control b/debian/control
index b699bd6e..2d5f30d9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,14 @@ Source: git-buildpackage
 Section: devel
 Priority: optional
 Maintainer: Guido Guenther <agx@sigxcpu.org>
-Build-Depends: cdbs, debhelper (>= 5), python-dev, python-support (>= 0.3), docbook-to-man, pychecker
+Build-Depends: cdbs, debhelper (>= 5), python-dev, python-support (>= 0.3),
+ pychecker, gtk-doc-tools, sgml2x, docbook-utils, jade
 Standards-Version: 3.7.2
 
 Package: git-buildpackage
 Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, devscripts, git-load-dirs (>= 1.0.35), git-core (>= 1:1.4.4)
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, devscripts,
+ git-load-dirs (>= 1.0.35), git-core (>= 1:1.4.4)
 Description: Suite to help with Debian packages in Git repositories
  This package contains the following tools:
   * git-import-dsc: import an existing Debian source package into a git
diff --git a/debian/rules b/debian/rules
index 4cea6597..eff6c1fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ PYCHECKS=$(patsubst %,%.py,$(COMMANDS))
 PYCHECK_LEVEL=Error
 
 docs/%.1: docs/man.%.sgml
-	docbook-to-man $< > $@
+	docbook2man -o docs/ $<
 
 $(MANUAL): docs/manual.sgml docs/chapters/*.sgml docs/manpages/*.sgml
 	docbook-2-html -s gtk $<
@@ -26,6 +26,7 @@ $(MANUAL): docs/manual.sgml docs/chapters/*.sgml docs/manpages/*.sgml
 build/git-buildpackage:: $(MANPAGES) $(MANUAL) $(PYCHECKS)
 
 clean::
-	-rm docs/*.1  git-*.py
-	-rm -rf docs/manual-html/
+	-rm git-*.py
+	-rm docs/*.1 docs/manpage.*
+	-rm -r docs/manual-html/
 
-- 
cgit v1.2.3