[25474] in Source-Commits
/svn/athena r25005 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Mar 7 16:39:34 2011
Date: Mon, 7 Mar 2011 16:39:28 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103072139.p27LdS5l025528@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-03-07 16:39:28 -0500 (Mon, 07 Mar 2011)
New Revision: 25005
Modified:
trunk/debathena/config/auto-update/debian/changelog
trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst
trunk/debathena/config/auto-update/debian/debathena-auto-update.postrm
trunk/debathena/config/auto-update/debian/debathena-auto-update.preinst
Log:
In auto-update:
* Use the correct version notation when removing obsolete conffiles
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2011-03-07 20:43:28 UTC (rev 25004)
+++ trunk/debathena/config/auto-update/debian/changelog 2011-03-07 21:39:28 UTC (rev 25005)
@@ -1,3 +1,9 @@
+debathena-auto-update (1.22.2) unstable; urgency=low
+
+ * Use the correct version notation when removing obsolete conffiles
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 07 Mar 2011 16:39:23 -0500
+
debathena-auto-update (1.22.1) unstable; urgency=low
* Don't blindly copy maintainer script snippets from websites that are
@@ -3,5 +9,5 @@
full of lies
- -- Jonathan Reed <jdreed@mit.edu> Mon, 07 Mar 2011 15:43:03 -0500
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 07 Mar 2011 16:39:01 -0500
debathena-auto-update (1.22) unstable; urgency=low
Modified: trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst
===================================================================
--- trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst 2011-03-07 20:43:28 UTC (rev 25004)
+++ trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst 2011-03-07 21:39:28 UTC (rev 25005)
@@ -37,7 +37,7 @@
# dpkg-maintscript-helper exists in maverick+
if dpkg-maintscript-helper supports rm_conffile 2> /dev/null; then
dpkg-maintscript-helper rm_conffile \
- /etc/cron.d/debathena-auto-update 1.21~ -- "$@"
+ /etc/cron.d/debathena-auto-update 1.22.2 -- "$@"
else
# From http://wiki.debian.org/DpkgConffileHandling
# Which is full of lies, like the fact that postinsts get
@@ -51,7 +51,7 @@
}
case "$1" in
configure)
- if dpkg --compare-versions "$2" le-nl 1.21~; then
+ if dpkg --compare-versions "$2" le-nl 1.22.2; then
rm_conffile debathena-auto-update "/etc/cron.d/debathena-auto-update"
fi
esac
Modified: trunk/debathena/config/auto-update/debian/debathena-auto-update.postrm
===================================================================
--- trunk/debathena/config/auto-update/debian/debathena-auto-update.postrm 2011-03-07 20:43:28 UTC (rev 25004)
+++ trunk/debathena/config/auto-update/debian/debathena-auto-update.postrm 2011-03-07 21:39:28 UTC (rev 25005)
@@ -20,7 +20,7 @@
if dpkg-maintscript-helper supports rm_conffile 2> /dev/null; then
dpkg-maintscript-helper rm_conffile \
- /etc/cron.d/debathena-auto-update 1.21~ -- "$@"
+ /etc/cron.d/debathena-auto-update 1.22.2 -- "$@"
else
# From http://wiki.debian.org/DpkgConffileHandling
rm_conffile() {
@@ -34,7 +34,7 @@
# See policy 6.6, item 3 and 5
case "$1" in
abort-install|abort-upgrade)
- if dpkg --compare-versions "$2" le-nl 1.21~; then
+ if dpkg --compare-versions "$2" le-nl 1.22.2; then
rm_conffile debathena-auto-update "/etc/cron.d/debathena-auto-update"
fi
esac
Modified: trunk/debathena/config/auto-update/debian/debathena-auto-update.preinst
===================================================================
--- trunk/debathena/config/auto-update/debian/debathena-auto-update.preinst 2011-03-07 20:43:28 UTC (rev 25004)
+++ trunk/debathena/config/auto-update/debian/debathena-auto-update.preinst 2011-03-07 21:39:28 UTC (rev 25005)
@@ -16,7 +16,7 @@
if dpkg-maintscript-helper supports rm_conffile 2> /dev/null; then
dpkg-maintscript-helper rm_conffile \
- /etc/cron.d/debathena-auto-update 1.22~ -- "$@"
+ /etc/cron.d/debathena-auto-update 1.22.2 -- "$@"
else
# From http://wiki.debian.org/DpkgConffileHandling
rm_conffile() {
@@ -39,7 +39,7 @@
}
case "$1" in
install|upgrade)
- if dpkg --compare-versions "$2" le-nl 1.22~; then
+ if dpkg --compare-versions "$2" le-nl 1.22.2; then
rm_conffile debathena-auto-update "/etc/cron.d/debathena-auto-update"
fi
esac
