From bda7ad8488bdac90c039ec5afd5526a33b5e57df Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 21 Dec 2005 20:00:05 +0000 Subject: [PATCH] * Include volinfo, not voldump in openafs-fileserver. * Use make install into debian/tmp rather than make dest. make dest is mostly for Transarc compatibility and make install looks more like a typical package and makes it easier to evaluate differences in FHS location between upstream and Debian. As a side effect, there's no need to mess with the @sys link. (Closes: #165909) * Install more files with dh_install rather than install commands in debian/rules so that *.install shows a more complete picture of what goes into each package. * Don't ignore make distclean errors. --- debian/changelog | 14 ++++++++-- debian/libopenafs-dev.install | 8 +++--- debian/openafs-client.install | 46 +++++++++++++++++-------------- debian/openafs-dbserver.install | 16 +++++++---- debian/openafs-fileserver.install | 12 ++++---- debian/openafs-kpasswd.install | 5 ++-- debian/rules | 33 ++++++++-------------- 7 files changed, 71 insertions(+), 63 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9afb9a84f..5f983d5e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,12 +5,22 @@ openafs (1.4.0-3) unstable; urgency=low * Stop unconditionally forcing the compiler to cc or gcc in configure, allowing, among other things, building the kernel module with a compiler other than the default system compiler. (Closes: #338306) + * Include volinfo, not voldump in openafs-fileserver. * Document FAM's lack of support for AFS's security model and recommend gamin instead. (Closes: #343246) * Add a hint to README.Debian on what to do about the cache partition if running ReiserFS or XFS without a spare partition. - - -- + * Use make install into debian/tmp rather than make dest. make dest is + mostly for Transarc compatibility and make install looks more like a + typical package and makes it easier to evaluate differences in FHS + location between upstream and Debian. As a side effect, there's no + need to mess with the @sys link. (Closes: #165909) + * Install more files with dh_install rather than install commands in + debian/rules so that *.install shows a more complete picture of what + goes into each package. + * Don't ignore make distclean errors. + + -- Russ Allbery Wed, 21 Dec 2005 11:55:59 -0800 openafs (1.4.0-2) unstable; urgency=low diff --git a/debian/libopenafs-dev.install b/debian/libopenafs-dev.install index 3790d8237..868ba9604 100644 --- a/debian/libopenafs-dev.install +++ b/debian/libopenafs-dev.install @@ -1,4 +1,4 @@ -dest/bin/rxgen usr/bin -dest/include usr -dest/lib/*.a usr/lib -dest/lib/afs usr/lib +debian/tmp/usr/bin/rxgen usr/bin +debian/tmp/usr/include usr +debian/tmp/usr/lib/*.a usr/lib +debian/tmp/usr/lib/afs usr/lib diff --git a/debian/openafs-client.install b/debian/openafs-client.install index 4b686a317..51b75a645 100644 --- a/debian/openafs-client.install +++ b/debian/openafs-client.install @@ -1,25 +1,29 @@ -dest/bin/bos usr/bin -dest/bin/cmdebug usr/bin -dest/bin/fs usr/bin -dest/bin/klog usr/bin -dest/bin/pagsh usr/bin -dest/bin/pts usr/bin -dest/bin/scout usr/bin -dest/bin/sys usr/bin -dest/bin/tokens usr/bin -dest/bin/translate_et usr/bin -dest/bin/udebug usr/bin -dest/bin/unlog usr/bin -dest/bin/up usr/bin +debian/afs.conf etc/openafs -dest/etc/rxdebug usr/bin -dest/etc/vos usr/bin +debian/tmp/usr/bin/bos usr/bin +debian/tmp/usr/bin/cmdebug usr/bin +debian/tmp/usr/bin/fs usr/bin +debian/tmp/usr/bin/klog usr/bin +debian/tmp/usr/bin/pagsh usr/bin +debian/tmp/usr/bin/pts usr/bin +debian/tmp/usr/bin/scout usr/bin +debian/tmp/usr/bin/sys usr/bin +debian/tmp/usr/bin/tokens usr/bin +debian/tmp/usr/bin/translate_et usr/bin +debian/tmp/usr/bin/udebug usr/bin +debian/tmp/usr/bin/unlog usr/bin +debian/tmp/usr/bin/up usr/bin -dest/etc/backup usr/sbin -dest/etc/butc usr/sbin -dest/etc/fms usr/sbin -dest/etc/fstrace usr/sbin +debian/tmp/usr/sbin/rxdebug usr/bin +debian/tmp/usr/sbin/vos usr/bin -dest/root.client/usr/vice/etc/afsd sbin +debian/tmp/usr/sbin/backup usr/sbin +debian/tmp/usr/sbin/butc usr/sbin +debian/tmp/usr/sbin/fms usr/sbin +debian/tmp/usr/sbin/fstrace usr/sbin -dest/root.client/usr/vice/etc/C/afszcm.cat usr/share/openafs +debian/tmp/usr/sbin/afsd sbin + +src/afs/afszcm.cat usr/share/openafs + +debian/CellServDB usr/share/openafs diff --git a/debian/openafs-dbserver.install b/debian/openafs-dbserver.install index c6e4e1a00..b9bd979a0 100644 --- a/debian/openafs-dbserver.install +++ b/debian/openafs-dbserver.install @@ -1,8 +1,12 @@ -dest/etc/prdb_check usr/sbin -dest/etc/vldb_check usr/sbin +debian/tmp/usr/sbin/prdb_check usr/sbin +debian/tmp/usr/sbin/pt_util usr/sbin +debian/tmp/usr/sbin/vldb_check usr/sbin -dest/root.server/usr/afs/bin/pt_util usr/sbin +debian/afs-rootvol usr/sbin +debian/afs-newcell usr/sbin -dest/root.server/usr/afs/bin/buserver usr/lib/openafs -dest/root.server/usr/afs/bin/ptserver usr/lib/openafs -dest/root.server/usr/afs/bin/vlserver usr/lib/openafs +debian/tmp/usr/lib/openafs/buserver usr/lib/openafs +debian/tmp/usr/lib/openafs/ptserver usr/lib/openafs +debian/tmp/usr/lib/openafs/vlserver usr/lib/openafs + +debian/ConfigUtils.pm usr/share/perl5/Debian/OpenAFS diff --git a/debian/openafs-fileserver.install b/debian/openafs-fileserver.install index fa6656e05..eda529214 100644 --- a/debian/openafs-fileserver.install +++ b/debian/openafs-fileserver.install @@ -1,8 +1,8 @@ -dest/etc/voldump usr/sbin +debian/tmp/usr/sbin/bosserver usr/sbin +debian/tmp/usr/sbin/volinfo usr/sbin -dest/root.server/usr/afs/bin/bosserver usr/sbin -dest/root.server/usr/afs/bin/up* usr/sbin +debian/tmp/usr/lib/openafs/up* usr/sbin -dest/root.server/usr/afs/bin/fileserver usr/lib/openafs -dest/root.server/usr/afs/bin/salvager usr/lib/openafs -dest/root.server/usr/afs/bin/volserver usr/lib/openafs +debian/tmp/usr/lib/openafs/fileserver usr/lib/openafs +debian/tmp/usr/lib/openafs/salvager usr/lib/openafs +debian/tmp/usr/lib/openafs/volserver usr/lib/openafs diff --git a/debian/openafs-kpasswd.install b/debian/openafs-kpasswd.install index 2f6f72a5c..b3078556b 100644 --- a/debian/openafs-kpasswd.install +++ b/debian/openafs-kpasswd.install @@ -1,2 +1,3 @@ -dest/bin/kpasswd usr/bin -dest/etc/kas usr/bin +debian/tmp/usr/bin/kpasswd usr/bin + +debian/tmp/usr/sbin/kas usr/bin diff --git a/debian/rules b/debian/rules index bba231f1d..b9e7d2010 100755 --- a/debian/rules +++ b/debian/rules @@ -70,8 +70,6 @@ configure: configure-stamp configure-stamp: @if test x"$(SYS_NAME)" = x"UNKNOWN" ; then exit 1 ; fi dh_testdir - -ln -s @sys/dest dest - -ln -s $(SYS_NAME) @sys afslogsdir=/var/log/openafs afslocaldir=/etc/openafs/server-local \ sh configure \ --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \ @@ -80,30 +78,30 @@ configure-stamp: --enable-largefile-fileserver --enable-debug --enable-lwp-debug \ $(DEBIAN_OPT_FLAGS) chmod a+x src/libafs/make_kbuild_makefile.pl - install -d $(SYS_NAME)/dest/root.client/usr/vice/etc - install -d dest/root.server/usr/afs/bin touch configure-stamp build: configure-stamp build-stamp build-stamp: dh_testdir - $(MAKE) dest_nolibafs + mkdir -p $(CURDIR)/debian/tmp + $(MAKE) install_nolibafs DESTDIR=$(CURDIR)/debian/tmp + chmod +x debian/afs-rootvol debian/afs-newcell touch build-stamp clean: dh_testdir dh_testroot - rm -f build-stamp configure-stamp configure-modules-stamp - rm -f build-modules-stamp - -$(MAKE) -ki distclean - -rm -rf dest $(SYS_NAME) @sys src/pic + rm -f build-stamp configure-stamp + rm -f build-modules-stamp configure-modules-stamp +ifeq (Makefile,$(wildcard Makefile)) + $(MAKE) distclean +endif dh_clean install: DH_OPTIONS= install: build dh_testdir dh_testroot - dh_clean -k dh_installdirs dh_install @@ -115,28 +113,19 @@ install: build set -e; for pkg in $(DOC_PACKAGES) ; do \ ln -s openafs-client debian/$$pkg/usr/share/doc/$$pkg; \ done + mv debian/openafs-client/usr/bin/pagsh \ debian/openafs-client/usr/bin/pagsh.openafs mv debian/openafs-client/usr/bin/up \ debian/openafs-client/usr/bin/afs-up - install -m 644 -c dest/lib/pam_afs.so.1 \ + install -m 644 -c debian/tmp/usr/lib/pam_afs.so.1 \ debian/libpam-openafs-kaserver/lib/security/pam_afs.so - install -m 644 -c dest/lib/pam_afs.krb.so.1 \ + install -m 644 -c debian/tmp/usr/lib/pam_afs.krb.so.1 \ debian/libpam-openafs-kaserver/lib/security/pam_afs.krb.so - install -m 644 -c debian/CellServDB \ - debian/openafs-client/usr/share/openafs - install -m 644 -c debian/afs.conf \ - debian/openafs-client/etc/openafs/afs.conf install -d debian/openafs-dbserver/usr/share/man/man8 /usr/bin/docbook-to-man debian/pt_util.sgml \ >debian/openafs-dbserver/usr/share/man/man8/pt_util.8 - install -m 755 -o root -g root debian/afs-rootvol \ - debian/openafs-dbserver/usr/sbin - install -g root -o root -m 755 debian/afs-newcell \ - debian/openafs-dbserver/usr/sbin - install -D -m 644 debian/ConfigUtils.pm \ - debian/openafs-dbserver/usr/share/perl5/Debian/OpenAFS/ConfigUtils.pm ( cd debian && pod2man --section 8 --center "Debian GNU/Linux" \ afs-rootvol ) \ >debian/openafs-dbserver/usr/share/man/man8/afs-rootvol.8 -- 2.39.5