summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Karl Ramm <kcr@mit.edu>2007-07-21 00:36:34 +0000
committerGravatar Karl Ramm <kcr@mit.edu>2007-07-21 00:36:34 +0000
commit99680e288d579c1ab3c98e96ce4d42cc17d598ce (patch)
treed2e43c06f11d407be585058166068e59908e462d /debian
parent15cf157d47aafe49fd59b7acc23fe172f8a23566 (diff)
zephyr (2.1.20070719.SNAPSHOT-1) unstable; urgency=low
* new upstream, Closes: #433603 * byteswap port number for display in zwgc, Closes: #243101 * stick newline after errant error message, Closes: #242839 * wait for zhm to die when restarting. Closes: #41419 -- Karl Ramm <kcr@debian.org> Fri, 20 Jul 2007 13:23:48 -0400
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rwxr-xr-x[-rw-r--r--]debian/rules8
-rw-r--r--debian/zephyr-clients.init3
3 files changed, 8 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index 70c5731..b158fb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
zephyr (2.1.20070719.SNAPSHOT-1) unstable; urgency=low
- *
+ * new upstream, Closes: #433603
+ * byteswap port number for display in zwgc, Closes: #243101
+ * stick newline after errant error message, Closes: #242839
+ * wait for zhm to die when restarting. Closes: #41419
- --
+ -- Karl Ramm <kcr@debian.org> Fri, 20 Jul 2007 13:23:48 -0400
zephyr (2.1.20010518.SNAPSHOT-18) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index b9e67b4..ffab880 100644..100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,8 +32,8 @@ endif
autotools:
chmod u+x config.sub
chmod u+x config.guess
- OLDDATESUB=`config.sub -t | tr -d -` ;\
- OLDDATEGUESS=`config.guess -t | tr -d -` ;\
+ OLDDATESUB=`./config.sub -t | tr -d -` ;\
+ OLDDATEGUESS=`./config.guess -t | tr -d -` ;\
NEWDATESUB=`/usr/share/misc/config.sub -t | tr -d -` ;\
NEWDATEGUESS=`/usr/share/misc/config.guess -t | tr -d -` ;\
if [ $$OLDDATESUB -lt $$NEWDATESUB -o \
@@ -102,10 +102,6 @@ install: build
# Add here commands to install the package into debian/tmp.
cd no-krb&&$(MAKE) install DESTDIR=`pwd`/../debian/tmp
cd krb&&$(MAKE) DESTDIR=`pwd`/../debian/tmp-krb install
- mv debian/tmp/usr/lib/libzephyr.so debian/tmp/usr/lib/libzephyr.so.$(SONAME)
- ln -s libzephyr.so.$(SONAME) debian/tmp/usr/lib/libzephyr.so
- mv debian/tmp-krb/usr/lib/libzephyr.so debian/tmp-krb/usr/lib/libzephyr.so.$(SONAME)
- ln -s libzephyr.so.$(SONAME) debian/tmp-krb/usr/lib/libzephyr.so
mkdir -p debian/tmp/etc/zephyr/acl
set -x; for i in debian/acl/*; do install -c -m 644 -o root $$i debian/tmp/etc/zephyr/acl; done; set +x
install -c -m 644 debian/zephyr.vars debian/tmp/etc/zephyr
diff --git a/debian/zephyr-clients.init b/debian/zephyr-clients.init
index d329ae7..fe4e532 100644
--- a/debian/zephyr-clients.init
+++ b/debian/zephyr-clients.init
@@ -45,9 +45,8 @@ case "$1" in
# just the same as "restart".
#
echo -n "Restarting $DESC: "
- start-stop-daemon --oknodo --stop --quiet --pidfile \
+ start-stop-daemon --oknodo --stop --retry 5 --quiet --pidfile \
/var/run/$NAME.pid --exec $DAEMON
- sleep 1
start-stop-daemon --start --quiet --pidfile \
/var/run/$NAME.pid --exec $DAEMON -- -N $zhm_args
echo "$NAME."