On Wed, 01 Feb 2012 20:40:30 +0100, gregor herrmann wrote: > I've prepared an NMU for aiccu (versioned as 20070115-14.1) and > uploaded it to DELAYED/2. Please feel free to tell me if I > should delay it longer.
Gnarf. Found a typo after the fact. Find attached an improved version (again uploaded to DELAYED/2). Cheers, gregor -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Rolling Stones: Moonlight-mile-live
diff -Nru aiccu-20070115/debian/60aiccu aiccu-20070115/debian/60aiccu
--- aiccu-20070115/debian/60aiccu 2010-08-26 22:11:10.000000000 +0200
+++ aiccu-20070115/debian/60aiccu 2012-02-01 21:46:21.000000000 +0100
@@ -3,6 +3,7 @@
CONFIG=/etc/aiccu.conf
BINARY=/usr/sbin/aiccu
+DEFAULT=/etc/default/aiccu
P6=/bin/ping6
. "${PM_FUNCTIONS}"
@@ -10,6 +11,17 @@
[ -x $BINARY ] || exit $NA
[ -f $CONFIG ] || exit $NA
+# Is aiccu enabled?
+[ -r $DEFAULT ] && . $DEFAULT
+case "$AICCU_ENABLED" in
+ [Nn]*)
+ exit $NA
+ ;;
+esac
+
+# Is aiccu running?
+invoke-rc.d --quiet aiccu status > /dev/null || exit $NA
+
case "$1" in
hibernate|suspend)
# Do nothing
diff -Nru aiccu-20070115/debian/changelog aiccu-20070115/debian/changelog
--- aiccu-20070115/debian/changelog 2010-08-26 22:11:10.000000000 +0200
+++ aiccu-20070115/debian/changelog 2012-02-01 21:46:27.000000000 +0100
@@ -1,3 +1,18 @@
+aiccu (20070115-14.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "/etc/pm/sleep.d/60aiccu hook may cause unacceptable resume delays":
+ check if aiccu is enabled in /etc/default/aiccu and running before trying
+ to ping/restart.
+ (Closes: #610332)
+ * Fix "Does not compile with ld.gold": add patch from Ubuntu /
+ Tarun Kumar Mall:
+ - debian/patches/09_binutils_gold.patch:
+ + patch changes unix-console/Makefile to fix FTBFS. (LP: #726121)
+ (Closes: #615897)
+
+ -- gregor herrmann <[email protected]> Wed, 01 Feb 2012 21:46:24 +0100
+
aiccu (20070115-14) unstable; urgency=low
* Fix "preconfiguration fails" Add test to check if brokers-file exist.
diff -Nru aiccu-20070115/debian/patches/09_binutils_gold.patch
aiccu-20070115/debian/patches/09_binutils_gold.patch
--- aiccu-20070115/debian/patches/09_binutils_gold.patch 1970-01-01
01:00:00.000000000 +0100
+++ aiccu-20070115/debian/patches/09_binutils_gold.patch 2012-02-01
20:28:39.000000000 +0100
@@ -0,0 +1,13 @@
+Index: aiccu-20070115/unix-console/Makefile
+===================================================================
+--- aiccu-20070115.orig/unix-console/Makefile 2011-02-27 17:43:53.872782002
+0000
++++ aiccu-20070115/unix-console/Makefile 2011-02-27 17:44:23.372782001
+0000
+@@ -150,7 +150,7 @@
+ all: aiccu
+
+ aiccu: $(OBJS) ${SRCS} ${INCS}
+- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
++ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+
+ clean:
+ $(RM) -f $(OBJS) aiccu
diff -Nru aiccu-20070115/debian/patches/series
aiccu-20070115/debian/patches/series
--- aiccu-20070115/debian/patches/series 2010-08-26 22:11:10.000000000
+0200
+++ aiccu-20070115/debian/patches/series 2012-02-01 20:28:39.000000000
+0100
@@ -6,3 +6,4 @@
05_spelling-error.patch
06_syslog_openlog.patch
07_allow_tunnels.patch
+09_binutils_gold.patch
signature.asc
Description: Digital signature
