runit

commit 64de48caf6d6813a127daa6074029b76651c3595
parent 6d5f1ad182cea29995028268c527424dddb595c1
Author: Gerrit Pape <pape@smarden.org>
Date:   Sun, 24 Jul 2005 16:29:34 +0000

  * debian/diff/runsv.8.diff: remove; obsolete.
  * debian/rules: adjust CFLAGS, LDFLAGS; install new sv program.

Diffstat:
M
debian/changelog
 | 
8
++++++++
D
debian/diff/runsv.8.diff
 | 
16
----------------
M
debian/rules
 | 
17
++++++++---------

3 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+runit (1.3.0-0) unstable; urgency=low
+
+  * new upstream version.
+  * debian/diff/runsv.8.diff: remove; obsolete.
+  * debian/rules: adjust CFLAGS, LDFLAGS; install new sv program.
+
+ -- Gerrit Pape <pape@smarden.org>  Sun, 24 Jul 2005 16:28:50 +0000
+
 runit (1.2.3-1) unstable; urgency=low
 
   * new upstream version.
diff --git a/debian/diff/runsv.8.diff b/debian/diff/runsv.8.diff
@@ -1,16 +0,0 @@
-Index: man/runsv.8
-===================================================================
-RCS file: /cvs/runit/man/runsv.8,v
-retrieving revision 1.14
-retrieving revision 1.15
-diff -u -r1.14 -r1.15
---- man/runsv.8	12 Dec 2004 20:14:26 -0000	1.14
-+++ man/runsv.8	29 Apr 2005 08:52:49 -0000	1.15
-@@ -111,6 +111,7 @@
- .B q
- Quit.
- If the service is running, send it a QUIT signal.
-+.TP
- .B 1
- User-defined 1.
- If the service is running, send it a USR1 signal.
diff --git a/debian/rules b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
-CFLAGS =-O2 -Wall
-LDFLAGS =-Os -pipe
+CFLAGS =-Wall
+LDFLAGS =-pipe
 CC =diet -v -Os gcc
 STRIP =strip
 
@@ -9,7 +9,7 @@ DIET_ARCHS =alpha amd64 arm hppa i386 ia64 mips mipsel powerpc ppc64 s390 sparc
 ARCH ?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 ifeq (,$(findstring $(ARCH),$(DIET_ARCHS)))
   CC =gcc
-  CFLAGS =-Wall
+  CFLAGS =-O2 -Wall
 endif
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@ -23,9 +23,8 @@ DIR =$(shell pwd)/debian/runit
 
 unpack: deb-checkdir unpack-stamp
 unpack-stamp:
-	tar xzf runit-1.2.3.tar.gz
-	ln -s runit-1.2.3 admin/runit
-	(cd admin/runit/ && patch -p0) <debian/diff/runsv.8.diff
+	tar xzf runit-1.3.0.tar.gz
+	ln -s runit-1.3.0 admin/runit
 	echo '$(CC) $(CFLAGS)' >admin/runit/src/conf-cc
 	echo '$(CC) $(LDFLAGS)' >admin/runit/src/conf-ld
 	touch unpack-stamp
@@ -51,14 +50,13 @@ install: deb-checkdir deb-checkuid build-stamp
 	for i in runit runit-init; do \
 	  install -m0755 admin/runit/src/$$i '$(DIR)'/sbin/ || exit 1; \
 	done
-	for i in runsvdir runsv svlogd svwaitdown svwaitup runsvstat \
+	for i in runsvdir runsv sv svlogd svwaitdown svwaitup runsvstat \
 	  runsvctrl chpst; do \
 	  install -m0755 admin/runit/src/$$i '$(DIR)'/usr/bin/ || exit 1; \
 	done
 	for i in runsvchdir utmpset; do \
 	  install -m0755 admin/runit/src/$$i '$(DIR)'/usr/sbin/ || exit 1; \
 	done
-	install -m0755 admin/runit/src/utmpset '$(DIR)'/usr/sbin/
 	$(STRIP) -R .comment -R .note '$(DIR)'/sbin/* '$(DIR)'/usr/sbin/* \
 	  '$(DIR)'/usr/bin/*
 	# runsvdir-start to be used from /etc/inittab
@@ -66,7 +64,8 @@ install: deb-checkdir deb-checkuid build-stamp
 	# getty-5 service
 	install -d -m0755 '$(DIR)'/etc/runit/getty-5
 	install -m0755 debian/getty-tty5.run '$(DIR)'/etc/runit/getty-5/run
-	install -m0755 debian/getty-tty5.finish '$(DIR)'/etc/runit/getty-5/finish
+	install -m0755 debian/getty-tty5.finish \
+	  '$(DIR)'/etc/runit/getty-5/finish
 	# lintian overrides
 	install -m0755 -d '$(DIR)'/usr/share/lintian/overrides
 	install -m0644 debian/runit.lintian \