On 01/11/2009 11:04 AM, Adeodato Simó wrote: > I don't think it's necessary this late in the release cycle, but if > you'd really like, please send a diff, and I will not block your work. :-) The diff between 0.22-1 and 0.22-1.lenny1 (fixing bashisms and bringing maintainer addresses up-to-date in the debian/ directory) is attached. I'm prepared to upload to testing-proposed-updates if you think this is reasonable. Thanks for your help and patience. Regards, --dkg
Index: debian/cereal.prerm
===================================================================
--- debian/cereal.prerm (.../tags/cereal/0.22-1) (revision 1206)
+++ debian/cereal.prerm (.../branches/cereal/0.22) (revision 1206)
@@ -2,8 +2,8 @@
# prerm script for cereal
-# Author: Jamie Rollins <jrollins@fifthhorseman.net> and
-# Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>
+# Author: Jameson Rollins <jrollins@finestructure.net> and
+# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
# (c) 2007
# dh_installdeb will replace this with shell code automatically
Index: debian/control
===================================================================
--- debian/control (.../tags/cereal/0.22-1) (revision 1206)
+++ debian/control (.../branches/cereal/0.22) (revision 1206)
@@ -1,8 +1,8 @@
Source: cereal
Section: utils
Priority: extra
-Maintainer: Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>
-Uploaders: Jameson Rollins <jrollins@fifthhorseman.net>
+Maintainer: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Uploaders: Jameson Rollins <jrollins@finestructure.net>
Build-Depends: debhelper (>= 5.0)
Standards-Version: 3.7.3
Homepage: http://cmrg.fifthhorseman.net/wiki/cereal
Index: debian/changelog
===================================================================
--- debian/changelog (.../tags/cereal/0.22-1) (revision 1206)
+++ debian/changelog (.../branches/cereal/0.22) (revision 1206)
@@ -1,3 +1,11 @@
+cereal (0.22-1.lenny1) unstable; urgency=low
+
+ * fixed bashisms that were causing failures with dash as /bin/sh
+ (Closes: #511045).
+ * updated maintainer addresses.
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Fri, 09 Jan 2009 18:21:58 -0500
+
cereal (0.22-1) unstable; urgency=low
* New upstream release.
Index: debian/copyright
===================================================================
--- debian/copyright (.../tags/cereal/0.22-1) (revision 1206)
+++ debian/copyright (.../branches/cereal/0.22) (revision 1206)
@@ -1,10 +1,10 @@
This package was debianized by Daniel Kahn Gillmor
-<dkg-debian.org@fifthhorseman.net> on Thu, 15 Mar 2007 01:12:29 -0400.
+<dkg@fifthhorseman.net> on Thu, 15 Mar 2007 01:12:29 -0400.
It was downloaded from http://cmrg.fifthhorseman.net/wiki/cereal
-Upstream Authors: Jameson Rollins <jrollins@fifthhorseman.net> and
- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>
+Upstream Authors: Jameson Rollins <jrollins@finestructure.net> and
+ Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Copyright: 2007 Daniel Kahn Gillmor and Jameson Rollins
Index: debian/rules
===================================================================
--- debian/rules (.../tags/cereal/0.22-1) (revision 1206)
+++ debian/rules (.../branches/cereal/0.22) (revision 1206)
@@ -2,7 +2,7 @@
# -*- makefile -*-
# cereal makefile for debian packaging
#
-# (C) 2007 by Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>
+# (C) 2007 by Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
# This file is released under the GPL, v3 or later
# (see /usr/share/common-licenses/GPL)
Index: debian/cereal.postinst
===================================================================
--- debian/cereal.postinst (.../tags/cereal/0.22-1) (revision 1206)
+++ debian/cereal.postinst (.../branches/cereal/0.22) (revision 1206)
@@ -2,8 +2,8 @@
# postinst script for cereal
-# Author: Jamie Rollins <jrollins@fifthhorseman.net> and
-# Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>
+# Author: Jameson Rollins <jrollins@finestructure.net> and
+# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
# (c) 2007
if ! getent passwd cereal >/dev/null ; then
Index: debian/cereal.postrm
===================================================================
--- debian/cereal.postrm (.../tags/cereal/0.22-1) (revision 1206)
+++ debian/cereal.postrm (.../branches/cereal/0.22) (revision 1206)
@@ -2,8 +2,8 @@
# postrm script for cereal
-# Author: Jamie Rollins <jrollins@fifthhorseman.net> and
-# Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>
+# Author: Jameson Rollins <jrollins@finestructure.net> and
+# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
# (c) 2007
case $1 in
Index: debian/cereal.preinst
===================================================================
--- debian/cereal.preinst (.../tags/cereal/0.22-1) (revision 1206)
+++ debian/cereal.preinst (.../branches/cereal/0.22) (revision 1206)
@@ -2,8 +2,8 @@
# preinst script for cereal
-# Author: Jamie Rollins <jrollins@fifthhorseman.net> and
-# Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>
+# Author: Jameson Rollins <jrollins@finestructure.net> and
+# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
# (c) 2007
# make new sessions dir and move all old sessions into it
Index: fs/usr/share/cereal/common
===================================================================
--- fs/usr/share/cereal/common (.../tags/cereal/0.22-1) (revision 1206)
+++ fs/usr/share/cereal/common (.../branches/cereal/0.22) (revision 1206)
@@ -144,7 +144,7 @@
# write to the log of a session
#log_write SESSION STATEMENT
log_write() {
- echo -e "\ncereal: $2" >> "$SESSIONDIR/$1/socket"
+ printf "\ncereal: %s\n" "$2" >> "$SESSIONDIR/$1/socket"
}
# display_session SESSION [USER]
Index: fs/usr/bin/cereal
===================================================================
--- fs/usr/bin/cereal (.../tags/cereal/0.22-1) (revision 1206)
+++ fs/usr/bin/cereal (.../branches/cereal/0.22) (revision 1206)
@@ -13,7 +13,7 @@
##################################################
SHAREDIR=${SHAREDIR:-"/usr/share/cereal"}
export SHAREDIR
-source "$SHAREDIR/common"
+. "$SHAREDIR/common"
##################################################
usage() {
Index: fs/usr/sbin/cereal-admin
===================================================================
--- fs/usr/sbin/cereal-admin (.../tags/cereal/0.22-1) (revision 1206)
+++ fs/usr/sbin/cereal-admin (.../branches/cereal/0.22) (revision 1206)
@@ -43,7 +43,7 @@
# create session
create() {
- if (( $# < 5 )) ; then
+ if [ $# -lt 5 ] ; then
failure "Not enough input arguments.
Type 'cereal-admin help' for more info."
fi
Attachment:
signature.asc
Description: OpenPGP digital signature