tag 437374 patch
thanks
diff -u liblockfile-1.07/debian/changelog liblockfile-1.07/debian/changelog
--- liblockfile-1.07/debian/changelog
+++ liblockfile-1.07/debian/changelog
@@ -1,3 +1,13 @@
+liblockfile (1.07-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Respect DEB_BUILD_OPTIONS=nostrip (Closes: #437374)
+ * Use finer-grained error handling in maintainer scripts.
+ * debian/rules: Don't ignore error status of rm -fr (which should not fail).
+ * debian/rules: Remove stampfiles first.
+
+ -- Justin Pryzby <[EMAIL PROTECTED]> Sat, 05 Apr 2008 10:18:29 -0400
+
liblockfile (1.07-1) unstable; urgency=low
* New maintainer. Closes: #465090
diff -u liblockfile-1.07/debian/prerm.nfs liblockfile-1.07/debian/prerm.nfs
--- liblockfile-1.07/debian/prerm.nfs
+++ liblockfile-1.07/debian/prerm.nfs
@@ -16,11 +16,7 @@
fi
cp -a /etc/ld.so.preload /etc/ld.so.preload.new
-(
- set +e
- grep -v "^/lib/nfslock\.so" /etc/ld.so.preload
- set -e
-) > /etc/ld.so.preload.new
+grep -v "^/lib/nfslock\.so" /etc/ld.so.preload > /etc/ld.so.preload.new || [
$? -eq 1 ]
mv /etc/ld.so.preload.new /etc/ld.so.preload
diff -u liblockfile-1.07/debian/postinst.nfs
liblockfile-1.07/debian/postinst.nfs
--- liblockfile-1.07/debian/postinst.nfs
+++ liblockfile-1.07/debian/postinst.nfs
@@ -20,9 +20,7 @@
fi
cd /etc
-set +e
grep -q '^/lib/nfslock\.so\.0$' ld.so.preload && exit 0
-set -e
if [ -f ld.so.preload ]
then
@@ -32,9 +30,7 @@
# Careful here - grep -v might exit with value 1
# which would cause the script to abort.
#
- set +e
- grep -v '^/lib/nfslock\.so' ld.so.preload
- set -e
+ grep -v '^/lib/nfslock\.so' ld.so.preload || [ $? -eq 1 ]
) > ld.so.preload.new
fi
echo "/lib/nfslock.so.0" >> ld.so.preload.new
diff -u liblockfile-1.07/debian/rules liblockfile-1.07/debian/rules
--- liblockfile-1.07/debian/rules
+++ liblockfile-1.07/debian/rules
@@ -11,6 +11,12 @@
tmp = debian/tmp
+INSTALL=install
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL+=-s
+endif
+
+
build: config.status
$(checkdir)
make
@@ -21,8 +27,8 @@
--with-mailgroup --mandir=/usr/share/man
clean:
+ rm -rf build $(tmp)* debian/files debian/substvars
[ ! -f Makefile ] || make distclean
- -rm -rf build $(tmp)* debian/files debian/substvars
binary-indep: checkroot
$(checkdir)
@@ -32,7 +38,7 @@
#
# First, liblockfile.so.1
#
- -rm -rf $(tmp)*
+ rm -rf $(tmp)*
install -d -o root -m 755 $(tmp)
install -d -o root -m 755 $(tmp)/DEBIAN
install -d -o root -m 755 $(tmp)/usr/lib
@@ -43,11 +49,11 @@
install -o root -m 755 debian/postinst $(tmp)/DEBIAN
install -o root -m 755 debian/postrm $(tmp)/DEBIAN
install -o root -m 644 debian/shlibs $(tmp)/DEBIAN
- install -o root -m 644 -s liblockfile.so \
+ $(INSTALL) -o root -m 644 liblockfile.so \
$(tmp)/usr/lib/liblockfile.so.$(SOVER)
install -o root -m 644 dotlockfile.1 $(tmp)/usr/share/man/man1
gzip -9f $(tmp)/usr/share/man/*/*
- install -g mail -m 2755 -s dotlockfile $(tmp)/usr/bin/dotlockfile
+ $(INSTALL) -g mail -m 2755 dotlockfile $(tmp)/usr/bin/dotlockfile
ln -s liblockfile.so.$(SOVER) $(tmp)/usr/lib/liblockfile.so.$(MVER)
install -o root -m 644 debian/changelog \
$(tmp)/usr/share/doc/liblockfile1/changelog.Debian
@@ -60,7 +66,7 @@
#
# Now build liblockfile-dev
#
- -rm -rf $(tmp)*
+ rm -rf $(tmp)*
install -d -o root -m 755 $(tmp)
install -d -o root -m 755 $(tmp)/DEBIAN
install -d -o root -m 755 $(tmp)/usr/lib
@@ -92,7 +98,7 @@
#
# build libnfslock (OBSOLETE)
#
- -rm -rf $(tmp)*
+ rm -rf $(tmp)*
install -d -o root -m 755 $(tmp)
install -d -o root -m 755 $(tmp)/DEBIAN
install -d -o root -m 755 $(tmp)/lib
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
