Bug#681016: [release.debian.org] unblock: dotlrn/2.5.0+dfsg-8

[Hector Romojaro <hromojaro@dia.uned.es>]

Control: reopen -1

Hi!

Andreas Beackmann reported an issue with the old config management fix
when the package is in "config files remaining" state (please see
#688435 for details), and provided a small fix for it.

I have applied the fix (please find debdiff between wheezy3 and wheezy4
attached) and would like to ask for it to be uploaded to wheezy.

@Frankie: new version is already in svn, could you please upload to
t-p-u if the changes are accepted?

Thanks in advance!

Kind regards,
Héctor

diff -u dotlrn-2.5.0+dfsg/debian/changelog dotlrn-2.5.0+dfsg/debian/changelog
--- dotlrn-2.5.0+dfsg/debian/changelog
+++ dotlrn-2.5.0+dfsg/debian/changelog
@@ -1,3 +1,11 @@
+dotlrn (2.5.0+dfsg-6+wheezy4) testing-proposed-updates; urgency=low
+
+  * Fixed old config management in preinst when the package is in 
+    "config files remaining" state (thanks to Andreas Beckmann for 
+    reporting this and providing the fix). Closes: #688435
+
+ -- Hector Romojaro <hromojaro@dia.uned.es>  Fri, 04 Jan 2013 14:31:49 +0100
+
 dotlrn (2.5.0+dfsg-6+wheezy3) testing-proposed-updates; urgency=low
 
   * Fixed aolserver restart call in postrm.
diff -u dotlrn-2.5.0+dfsg/debian/dotlrn.preinst dotlrn-2.5.0+dfsg/debian/dotlrn.preinst
--- dotlrn-2.5.0+dfsg/debian/dotlrn.preinst
+++ dotlrn-2.5.0+dfsg/debian/dotlrn.preinst
@@ -4,10 +4,7 @@
 
 case "$1" in
 
-install)
-    ;;
-
-upgrade)
+install|upgrade)
     # If we're upgrading from 2.5.0+dfsg-6+wheezy1 or earlier, we have to
     # deal with config.tcl which was marked as a conffile and 
     # modified by postinst script.
@@ -18,7 +15,7 @@
     #
     # See Bug #688435
     #  
-    if dpkg --compare-versions "$2" le "2.5.0+dfsg-6+wheezy1"
+    if dpkg --compare-versions "$2" le-nl "2.5.0+dfsg-6+wheezy1"
     then
         # First, make a copy so we can get the old config values
         cp /etc/dotlrn/config.tcl /etc/dotlrn/config.tcl.old_version