[26612] in Source-Commits
/svn/athena r25653 - trunk/debathena/debathena/dotfiles/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Jul 24 16:14:21 2012
Date: Tue, 24 Jul 2012 16:14:19 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201207242014.q6OKEJpj002766@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-07-24 16:14:19 -0400 (Tue, 24 Jul 2012)
New Revision: 25653
Modified:
trunk/debathena/debathena/dotfiles/debian/changelog
trunk/debathena/debathena/dotfiles/debian/debathena-dotfiles.postinst
trunk/debathena/debathena/dotfiles/debian/debathena-dotfiles.prerm
trunk/debathena/debathena/dotfiles/debian/rules
Log:
In dotfiles:
* Pass --no-start to dh_installinit (Trac: #1084)
Modified: trunk/debathena/debathena/dotfiles/debian/changelog
===================================================================
--- trunk/debathena/debathena/dotfiles/debian/changelog 2012-07-24 13:52:59 UTC (rev 25652)
+++ trunk/debathena/debathena/dotfiles/debian/changelog 2012-07-24 20:14:19 UTC (rev 25653)
@@ -5,8 +5,9 @@
depend on xsession.
* Use a test for LD_ASSUME_KERNEL that doesn't trigger unbound variable
warnings
+ * Pass --no-start to dh_installinit (Trac: #1084)
- -- Jonathan Reed <jdreed@mit.edu> Fri, 20 Jul 2012 17:04:08 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 24 Jul 2012 16:13:41 -0400
debathena-dotfiles (10.0.30-0debathena5) unstable; urgency=low
Modified: trunk/debathena/debathena/dotfiles/debian/debathena-dotfiles.postinst
===================================================================
--- trunk/debathena/debathena/dotfiles/debian/debathena-dotfiles.postinst 2012-07-24 13:52:59 UTC (rev 25652)
+++ trunk/debathena/debathena/dotfiles/debian/debathena-dotfiles.postinst 2012-07-24 20:14:19 UTC (rev 25653)
@@ -23,6 +23,10 @@
if dpkg --compare-versions "$2" lt 10.0.9-0debathena2~; then
add-shell /bin/athena/bash /bin/athena/tcsh
fi
+ if [ -z "$2" ] && [ -x "/etc/init.d/debathena-dotfiles" ]; then
+ invoke-rc.d debathena-dotfiles start || exit $?
+ fi
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/debathena/debathena/dotfiles/debian/debathena-dotfiles.prerm
===================================================================
--- trunk/debathena/debathena/dotfiles/debian/debathena-dotfiles.prerm 2012-07-24 13:52:59 UTC (rev 25652)
+++ trunk/debathena/debathena/dotfiles/debian/debathena-dotfiles.prerm 2012-07-24 20:14:19 UTC (rev 25653)
@@ -20,6 +20,9 @@
case "$1" in
remove)
remove-shell /bin/athena/bash /bin/athena/tcsh
+ if [ -x "/etc/init.d/debathena-dotfiles" ]; then
+ invoke-rc.d debathena-dotfiles stop || exit $?
+ fi
;;
upgrade|deconfigure)
Modified: trunk/debathena/debathena/dotfiles/debian/rules
===================================================================
--- trunk/debathena/debathena/dotfiles/debian/rules 2012-07-24 13:52:59 UTC (rev 25652)
+++ trunk/debathena/debathena/dotfiles/debian/rules 2012-07-24 20:14:19 UTC (rev 25653)
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+DEB_DH_INSTALLINIT_ARGS += --no-start
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
