From 00e19688b4b8120e93bb61b2fbd65f51e52cd1b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= Date: Wed, 9 Dec 2009 23:42:23 -0200 Subject: [PATCH] Don't patch the documentation directly. Don't patch the documentation directly, to avoid one extra patch in divergence from upstream. Use the BUILDROOT variable instead of setting BINDIR etc during installation. --- debian/patches/series | 2 +- debian/rules | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index 6d76c6c..9480dbc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -01-docdir.patch +#01-docdir.patch 02-encryption.patch 03-dvdrom.patch 04-manpage.patch diff --git a/debian/rules b/debian/rules index a887c59..fb6eda2 100755 --- a/debian/rules +++ b/debian/rules @@ -39,11 +39,7 @@ install: build dh_prep $(MAKE) \ - BINDIR=$(CURDIR)/debian/tmp/usr/bin \ - DOCDIR=$(CURDIR)/debian/tmp/usr/share/doc \ - DOCSUBDIR=$(CURDIR)/debian/tmp/usr/share/doc/dvdisaster-doc/html \ - LOCALEDIR=$(CURDIR)/debian/tmp/usr/share/locale \ - MANDIR=$(CURDIR)/debian/tmp/usr/share/man \ + BUILDROOT=$(CURDIR)/debian/tmp \ install # Installing desktop file