[Pkg-ganeti-devel] [ganeti] 08/29: Make dh_install work with 2.10
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Fri Mar 7 10:15:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
apoikos pushed a commit to branch master
in repository ganeti.
commit c34ba5ef11b598338b2e8b94d43c8446b616578c
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date: Thu Feb 27 16:07:18 2014 +0200
Make dh_install work with 2.10
• Add install file templates for the versioned packages
• Generate the actual install files from the templates and clean them
up later.
• Override dh_install-indep once again to sort a couple of files out.
---
debian/ganeti-VER.install | 4 ++++
debian/ganeti-haskell-VER.install | 4 ++++
debian/ganeti-htools-VER.install | 3 +++
debian/ganeti-htools.dirs | 1 -
debian/ganeti-htools.install | 2 +-
debian/ganeti.dirs | 2 --
debian/ganeti.docs | 1 +
debian/ganeti.install | 32 +++++---------------------------
debian/rules | 15 +++++++++++++--
9 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/debian/ganeti-VER.install b/debian/ganeti-VER.install
new file mode 100644
index 0000000..8604f59
--- /dev/null
+++ b/debian/ganeti-VER.install
@@ -0,0 +1,4 @@
+usr/share/ganeti/VER
+usr/lib/ganeti/VER/usr/lib/ganeti
+usr/lib/ganeti/VER/usr/sbin/ganeti-cleaner
+usr/lib/ganeti/VER/usr/sbin/ganeti-listrunner
diff --git a/debian/ganeti-haskell-VER.install b/debian/ganeti-haskell-VER.install
new file mode 100644
index 0000000..711d869
--- /dev/null
+++ b/debian/ganeti-haskell-VER.install
@@ -0,0 +1,4 @@
+usr/lib/ganeti/VER/usr/sbin/ganeti-confd
+usr/lib/ganeti/VER/usr/sbin/ganeti-mond
+usr/lib/ganeti/VER/usr/sbin/ganeti-luxid
+usr/lib/ganeti/VER/usr/lib/ganeti/mon-collector
diff --git a/debian/ganeti-htools-VER.install b/debian/ganeti-htools-VER.install
new file mode 100644
index 0000000..83501e7
--- /dev/null
+++ b/debian/ganeti-htools-VER.install
@@ -0,0 +1,3 @@
+usr/lib/ganeti/VER/usr/bin
+usr/share/ganeti/VER/root/usr/share/man/man1/h*
+usr/lib/ganeti/VER/usr/lib/ganeti/iallocators/hail
diff --git a/debian/ganeti-htools.dirs b/debian/ganeti-htools.dirs
index aafd29a..51017b7 100644
--- a/debian/ganeti-htools.dirs
+++ b/debian/ganeti-htools.dirs
@@ -1,3 +1,2 @@
usr/bin
usr/lib/ganeti/iallocators
-usr/share/man/man1
diff --git a/debian/ganeti-htools.install b/debian/ganeti-htools.install
index c7e0929..6ae9731 100644
--- a/debian/ganeti-htools.install
+++ b/debian/ganeti-htools.install
@@ -1,3 +1,3 @@
usr/bin/h*
-usr/share/man/man1/h*.1
+usr/share/man/man1/h*
usr/lib/ganeti/iallocators/hail
diff --git a/debian/ganeti.dirs b/debian/ganeti.dirs
index 15dc515..4a71bb4 100644
--- a/debian/ganeti.dirs
+++ b/debian/ganeti.dirs
@@ -1,7 +1,5 @@
etc/ganeti
-usr/lib/ganeti
usr/lib/ganeti/iallocators
usr/share/ganeti/extstorage
-usr/share/lintian/overrides
var/lib/ganeti
var/log/ganeti
diff --git a/debian/ganeti.docs b/debian/ganeti.docs
new file mode 100644
index 0000000..edc0071
--- /dev/null
+++ b/debian/ganeti.docs
@@ -0,0 +1 @@
+NEWS
diff --git a/debian/ganeti.install b/debian/ganeti.install
index 80772a7..a194e62 100644
--- a/debian/ganeti.install
+++ b/debian/ganeti.install
@@ -1,27 +1,5 @@
-usr/share/man/man7/ganeti*
-usr/share/man/man8/gnt-*
-usr/share/man/man8/ganeti-*
-
-usr/lib/ganeti/
-
-usr/lib/python*/dist-packages/ganeti /usr/share/ganeti
-usr/sbin/gnt-* /usr/share/ganeti
-usr/sbin/ganeti-* /usr/share/ganeti
-
-usr/lib/ganeti/check-cert-expired /usr/share/ganeti
-usr/lib/ganeti/ensure-dirs /usr/share/ganeti
-usr/lib/ganeti/import-export /usr/share/ganeti
-usr/lib/ganeti/node-daemon-setup /usr/share/ganeti
-usr/lib/ganeti/prepare-node-join /usr/share/ganeti
-
-usr/lib/ganeti/tools/burnin /usr/share/ganeti
-usr/lib/ganeti/tools/cfgshell /usr/share/ganeti
-usr/lib/ganeti/tools/cfgupgrade /usr/share/ganeti
-usr/lib/ganeti/tools/cfgupgrade12 /usr/share/ganeti
-usr/lib/ganeti/tools/cluster-merge /usr/share/ganeti
-usr/lib/ganeti/tools/confd-client /usr/share/ganeti
-usr/lib/ganeti/tools/lvmstrap /usr/share/ganeti
-usr/lib/ganeti/tools/move-instance /usr/share/ganeti
-usr/lib/ganeti/tools/node-cleanup /usr/share/ganeti
-usr/lib/ganeti/tools/ovfconverter /usr/share/ganeti
-usr/lib/ganeti/tools/sanitize-config /usr/share/ganeti
+usr/bin
+usr/sbin
+usr/lib/ganeti
+usr/share/man
+usr/share/ganeti/default
diff --git a/debian/rules b/debian/rules
index cea8476..6b4c74c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,12 @@ GNT_USERGROUP_PREFIX="gnt-"
debian/control: debian/control.in vcs-version
sed -s 's/#VER#/$(VER)/g' debian/control.in > debian/control
+genfiles:
+ for file in debian/*-VER*; do \
+ fname="$$(echo $$file | sed 's/VER/$(VER)/')"; \
+ sed -e 's/VER/$(VER)/g' $$file >"$$fname"; \
+ done
+
override_dh_auto_configure: genfiles
./configure \
--prefix=/usr \
@@ -38,6 +44,8 @@ override_dh_auto_clean:
rm -f debian/ganeti.default
rm -f debian/ganeti.postinst
rm -f debian/ganeti.postrm
+ rm -f debian/*-$(VER).install
+ rm -f debian/*-$(VER).lintian-overrides
if [ -d doc/html.orig ]; then \
rm -rf doc/html; \
mv doc/html.orig doc/html; \
@@ -55,7 +63,10 @@ override_dh_auto_build:
# Add missing bits to ganeti and python-ganeti-rapi. We do not use
# override_dh_install (plain) because it will fail in binary-arch builds.
override_dh_install-indep:
- dh_install -i -Xganeti-confd -Xmon-collector -Xhail -Xganeti-mond -Xganeti-luxid --fail-missing
+ dh_install --fail-missing -pganeti-$(VER) -Xsbin/ganeti-confd -Xganeti/mon-collector \
+ -Xganeti/default -Xbin/h -Xman1/h -Xsbin/ganeti-mond -Xsbin/ganeti-luxid -Xhail
+ dh_install --fail-missing -i -Nganeti-$(VER) -Xganeti/$(VER)
+
cp $(CURDIR)/doc/examples/ganeti.initd $(CURDIR)/debian/ganeti.init
cp $(CURDIR)/doc/examples/ganeti.cron $(CURDIR)/debian/ganeti.cron.d
cp $(CURDIR)/doc/examples/ganeti.default $(CURDIR)/debian/ganeti.default
@@ -77,4 +88,4 @@ override_dh_auto_test:
.PHONY: override_dh_auto_configure override_dh_auto_clean override_dh_auto_build \
override_dh_installinit override_dh_install-indep override_dh_sphinxdoc-arch \
- override_dh_auto_test
+ override_dh_auto_test genfiles
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git
More information about the Pkg-ganeti-devel
mailing list