[buildd-tools-devel] [PATCH 15/17] [debian] Install to debian/tmp

[Jan-Marek Glogowski]

dh_prep just cleans debian/tmp so change files to install
to debian/tmp instead of debian/install.
---
 debian/.gitignore             |    8 ++++----
 debian/dchroot-dsa.install    |    4 ++--
 debian/dchroot.install        |    4 ++--
 debian/libsbuild-dev.install  |    6 +++---
 debian/libsbuild1.install     |    2 +-
 debian/rules                  |    4 ++--
 debian/schroot-common.install |    2 +-
 debian/schroot.install        |   16 ++++++++--------
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/debian/.gitignore b/debian/.gitignore
index 358803a..0f09c64 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,13 +1,13 @@
-dchroot-dsa
+build
 dchroot
+dchroot-dsa
 files
-install
 libsbuild-dev
 libsbuild-doc
-schroot-common
 schroot
+schroot-common
 schroot-dbg
-build
+tmp
 *.debhelper
 *.log
 *.substvars
diff --git a/debian/dchroot-dsa.install b/debian/dchroot-dsa.install
index 68d062c..4a4c754 100644
--- a/debian/dchroot-dsa.install
+++ b/debian/dchroot-dsa.install
@@ -1,2 +1,2 @@
-debian/install/usr/bin/dchroot-dsa               usr/bin
-debian/install/usr/share/man/man1/dchroot-dsa.1  usr/share/man/man1
+debian/tmp/usr/bin/dchroot-dsa               usr/bin
+debian/tmp/usr/share/man/man1/dchroot-dsa.1  usr/share/man/man1
diff --git a/debian/dchroot.install b/debian/dchroot.install
index 77ef722..451a256 100644
--- a/debian/dchroot.install
+++ b/debian/dchroot.install
@@ -1,2 +1,2 @@
-debian/install/usr/bin/dchroot               usr/bin
-debian/install/usr/share/man/man1/dchroot.1  usr/share/man/man1
+debian/tmp/usr/bin/dchroot               usr/bin
+debian/tmp/usr/share/man/man1/dchroot.1  usr/share/man/man1
diff --git a/debian/libsbuild-dev.install b/debian/libsbuild-dev.install
index cf81fbf..194ffb2 100644
--- a/debian/libsbuild-dev.install
+++ b/debian/libsbuild-dev.install
@@ -1,3 +1,3 @@
-debian/install/usr/include          usr
-debian/install/usr/lib/libsbuild.a  usr/lib
-debian/install/usr/lib/pkgconfig    usr/lib
+debian/tmp/usr/include          usr
+debian/tmp/usr/lib/libsbuild.a  usr/lib
+debian/tmp/usr/lib/pkgconfig    usr/lib
diff --git a/debian/libsbuild1.install b/debian/libsbuild1.install
index 7891e5f..134b3a5 100644
--- a/debian/libsbuild1.install
+++ b/debian/libsbuild1.install
@@ -1 +1 @@
-debian/install/usr/lib/libsbuild.so.*        usr/lib
+debian/tmp/usr/lib/libsbuild.so.*        usr/lib
diff --git a/debian/rules b/debian/rules
index f69858f..f76d98c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -rf debian/build
-	rm -rf debian/install
+	rm -rf debian/tmp
 	rm -f build-stamp
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -72,7 +72,7 @@ install: check
 	dh_prep
 	dh_installdirs
 
-	$(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/install
+	$(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/tmp
 	dh_install
 
 	mkdir -p $(CURDIR)/debian/dchroot/usr/share/lintian/overrides
diff --git a/debian/schroot-common.install b/debian/schroot-common.install
index d8782e8..b99bc65 100644
--- a/debian/schroot-common.install
+++ b/debian/schroot-common.install
@@ -1 +1 @@
-debian/install/usr/share/locale              usr/share
+debian/tmp/usr/share/locale              usr/share
diff --git a/debian/schroot.install b/debian/schroot.install
index 21bc91b..c67f71d 100644
--- a/debian/schroot.install
+++ b/debian/schroot.install
@@ -1,8 +1,8 @@
-debian/install/etc/bash_completion.d/schroot  etc/bash_completion.d
-debian/install/etc/pam.d                      etc
-debian/install/etc/schroot                    etc
-debian/install/usr/bin/schroot                usr/bin
-debian/install/usr/lib/schroot                usr/lib
-debian/install/usr/share/man/man1/schroot.1   usr/share/man/man1
-debian/install/usr/share/man/man5             usr/share/man
-debian/install/var/lib                        var
+debian/tmp/etc/bash_completion.d/schroot  etc/bash_completion.d
+debian/tmp/etc/pam.d                      etc
+debian/tmp/etc/schroot                    etc
+debian/tmp/usr/bin/schroot                usr/bin
+debian/tmp/usr/lib/schroot                usr/lib
+debian/tmp/usr/share/man/man1/schroot.1   usr/share/man/man1
+debian/tmp/usr/share/man/man5             usr/share/man
+debian/tmp/var/lib                        var
-- 
1.6.3.2