From 0828b09a0ffdfb58deb04e940f2631e624a7b46b Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Tue, 29 Sep 2015 09:14:37 +0000 Subject: debian: move to use dh_install. The way we previously used dh_movefiles is not safe to use with `dpkg-buildpackage -A`, end with a real source-only upload ended up in files belonging to pbuilder-uml in the pbuilder binary. This is suboptimal, given that we duplicate the list of what we install Closes: #800416 --- debian/pbuilder-uml.files | 6 ------ debian/pbuilder-uml.install | 6 ++++++ debian/pbuilder.dirs | 4 ---- debian/pbuilder.install | 22 ++++++++++++++++++++++ debian/rules | 7 ------- 5 files changed, 28 insertions(+), 17 deletions(-) delete mode 100644 debian/pbuilder-uml.files create mode 100644 debian/pbuilder-uml.install create mode 100644 debian/pbuilder.install diff --git a/debian/pbuilder-uml.files b/debian/pbuilder-uml.files deleted file mode 100644 index 8aadb89..0000000 --- a/debian/pbuilder-uml.files +++ /dev/null @@ -1,6 +0,0 @@ -etc/pbuilder/pbuilder-uml.conf -usr/share/pbuilder/pbuilder-uml.conf -usr/bin/pbuilder-user-mode-linux -usr/bin/pdebuild-user-mode-linux -usr/lib/pbuilder/pbuilder-uml-checkparams -usr/lib/pbuilder/pdebuild-uml-checkparams \ No newline at end of file diff --git a/debian/pbuilder-uml.install b/debian/pbuilder-uml.install new file mode 100644 index 0000000..8aadb89 --- /dev/null +++ b/debian/pbuilder-uml.install @@ -0,0 +1,6 @@ +etc/pbuilder/pbuilder-uml.conf +usr/share/pbuilder/pbuilder-uml.conf +usr/bin/pbuilder-user-mode-linux +usr/bin/pdebuild-user-mode-linux +usr/lib/pbuilder/pbuilder-uml-checkparams +usr/lib/pbuilder/pdebuild-uml-checkparams \ No newline at end of file diff --git a/debian/pbuilder.dirs b/debian/pbuilder.dirs index 34e7e70..d014913 100644 --- a/debian/pbuilder.dirs +++ b/debian/pbuilder.dirs @@ -1,7 +1,3 @@ -usr/bin -usr/lib/pbuilder -usr/sbin -var/cache/pbuilder var/cache/pbuilder/aptcache var/cache/pbuilder/build var/cache/pbuilder/ccache diff --git a/debian/pbuilder.install b/debian/pbuilder.install new file mode 100644 index 0000000..759770e --- /dev/null +++ b/debian/pbuilder.install @@ -0,0 +1,22 @@ +usr/sbin/pbuilder +usr/share/pbuilder/pbuilderrc +usr/lib/pbuilder/pbuilder-apt-config +usr/lib/pbuilder/pbuilder-buildpackage* +usr/lib/pbuilder/pbuilder-checkparams +usr/lib/pbuilder/pbuilder-createbuildenv +usr/lib/pbuilder/pbuilder-loadconfig +usr/lib/pbuilder/pbuilder-modules +usr/lib/pbuilder/pbuilder-runhooks +usr/lib/pbuilder/pbuilder-satisfydepends* +usr/lib/pbuilder/pbuilder-unshare-wrapper +usr/lib/pbuilder/pbuilder-updatebuildenv + +usr/bin/pdebuild +usr/lib/pbuilder/pdebuild-checkparams +usr/lib/pbuilder/pdebuild-internal + +/usr/bin/debuild-pbuilder +/etc/pbuilder/buildd-config.sh +/usr/share/bash-completion/completions/pbuilder + +usr/share/doc diff --git a/debian/rules b/debian/rules index 1647df8..7ca6938 100755 --- a/debian/rules +++ b/debian/rules @@ -4,13 +4,6 @@ export DH_VERBOSE=1 %: dh $@ -override_dh_auto_install: - dh_auto_install --destdir=$(CURDIR)/debian/pbuilder - -override_dh_install: - dh_movefiles --sourcedir=debian/pbuilder - dh_install - override_dh_compress: dh_compress -X.pdf -- cgit v1.2.3