From 9015cf6c7b1720739b6c9e3477b6236eacc41a4d Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sat, 30 Apr 2005 20:53:36 +0000 Subject: [PATCH] * Update standards version to 3.6.1. - Install Debian::OpenAFS::ConfigUtils in /usr/share, not /usr/lib. - Always enable debugging symbols and disable optimization if noopt is set in DEB_BUILD_OPTIONS. - /etc/init.d/openafs-fileserver restart starts bosserver if it's not already running. --- debian/changelog | 6 ++++++ debian/control | 2 +- debian/openafs-fileserver.init | 7 ++++++- debian/rules | 25 +++++++++++++++++++------ 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index a1c604d0c..1aff286f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,12 @@ openafs (1.3.81-5) unstable; urgency=low or ext3 and that XFS and ReiserFS will not work. upserver and upclient are now provided. Provide some information about why kaserver is not provided. (Closes: #249315) + * Update standards version to 3.6.1. + - Install Debian::OpenAFS::ConfigUtils in /usr/share, not /usr/lib. + - Always enable debugging symbols and disable optimization if noopt is + set in DEB_BUILD_OPTIONS. + - /etc/init.d/openafs-fileserver restart starts bosserver if it's not + already running. -- diff --git a/debian/control b/debian/control index 6ab34753a..be2212e6d 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Sam Hartman Uploaders: Russ Allbery Build-Depends: debhelper (>= 4.1.16), libncurses5-dev, libpam0g-dev, bison, docbook-to-man, flex, autoconf, automake, perl, e2fslibs-dev -Standards-Version: 3.5.0 +Standards-Version: 3.6.1 Package: openafs-client Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 diff --git a/debian/openafs-fileserver.init b/debian/openafs-fileserver.init index 30ff3d8a5..d0172c385 100755 --- a/debian/openafs-fileserver.init +++ b/debian/openafs-fileserver.init @@ -56,7 +56,12 @@ case "$1" in # just the same as "restart". # echo -n "Restarting $DESC: " - bos restart localhost -localauth -bos + if pidof $DAEMON > /dev/null ; then + bos restart localhost -localauth -bos + else + start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON + fi sleep 1 echo "$NAME." ;; diff --git a/debian/rules b/debian/rules index 114fa6b18..4d85307ad 100755 --- a/debian/rules +++ b/debian/rules @@ -15,6 +15,14 @@ export DH_COMPAT=2 # This has to be exported to make some magic below work. export DH_OPTIONS +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + DEBIAN_OPT_FLAGS = --disable-optimize --disable-lwp-optimize + DEBIAN_KERN_FLAGS = --disable-kernel-optimize +else + DEBIAN_OPT_FLAGS = + DEBIAN_KERN_FLAGS = +endif + # The AFS sysname is determined by a script KVERS=`perl -e '$$_ = <>; $$_ =~ m/"(.+)"/; print "$$1\n";' < $(KSRC)/include/linux/version.h` SYS_NAME=$(shell KVERS=$(KVERS) sh debian/sysname) @@ -39,10 +47,12 @@ configure-stamp: -ln -s @sys/dest dest -ln -s $(SYS_NAME) @sys # sh regen.sh - afslogsdir=/var/log/openafs sh configure --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \ - --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var/lib afslocaldir=/etc/openafs/server-local \ - --enable-supergroups --enable-largefile-fileserver --enable-debug + afslogsdir=/var/log/openafs sh configure \ + --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \ + --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + --localstatedir=/var/lib afslocaldir=/etc/openafs/server-local \ + --enable-supergroups --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 @@ -96,7 +106,7 @@ install: build 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/lib/perl5/Debian/OpenAFS/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 (cd debian&&pod2man --section 8 --center "Debian GNU/Linux" \ @@ -229,7 +239,10 @@ build-modules: build-modules-stamp build-modules-stamp: -ln -s @sys/dest dest -ln -s $(SYS_NAME) @sys - sh configure --with-afs-sysname=$(SYS_NAME) --with-linux-kernel-headers=$(KSRC) --prefix=`pwd`/debian/tmp + sh configure --with-afs-sysname=$(SYS_NAME) \ + --with-linux-kernel-headers=$(KSRC) --prefix=`pwd`/debian/tmp \ + --enable-debug --enable-lwp-debug --enable-kernel-debug \ + $(DEBIAN_OPT_FLAGS) $(DEBIAN_KERN_FLAGS) make only_libafs cd src/libafs&&make install touch build-modules-stamp -- 2.39.5