Bug#601957: pending NMU

[Serafeim Zanikolas]

On Wed, Nov 10, 2010 at 10:58:25PM +0800, Desmond O. Chang wrote [edited]:
> > Why would you update cl-asdf? (it has no rc bugs)
> 
> Because c-l-c repo code depends on cl-asdf 2:2.010-1, it's on mentors.

clc depends on 2:2.004-1 which is already in the archive

> If you don't upload cl-asdf, please do a NMU.  I'll merge your patch.

NMU done, patch attatched, cheers

-S
-------------- next part --------------
diff -rup common-lisp-controller-7.4.orig/debian/changelog common-lisp-controller-7.4/debian/changelog
--- common-lisp-controller-7.4.orig/debian/changelog	2010-08-19 17:38:50.000000000 +0200
+++ common-lisp-controller-7.4/debian/changelog	2010-11-10 20:07:45.000000000 +0100
@@ -1,3 +1,13 @@
+common-lisp-controller (7.4+nmu1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * lisp-config.lisp is shipped as a conffile from 7.0 onwards, so when
+    upgrading from earlier versions we have to remove the old auto-generated
+    file, to avoid config file conflict (Closes: #601957). Setting urgency to
+    high for RC bug.
+
+ -- Serafeim Zanikolas <sez at debian.org>  Mon, 08 Nov 2010 20:13:35 +0100
+
 common-lisp-controller (7.4) unstable; urgency=low
 
   * clc-lisp should run 'clbuild lisp'. (Closes: #593157)
diff -rup common-lisp-controller-7.4.orig/debian/common-lisp-controller.preinst common-lisp-controller-7.4/debian/common-lisp-controller.preinst
--- common-lisp-controller-7.4.orig/debian/common-lisp-controller.preinst	2010-07-31 02:29:24.000000000 +0200
+++ common-lisp-controller-7.4/debian/common-lisp-controller.preinst	2010-11-10 20:08:10.000000000 +0100
@@ -23,6 +23,12 @@ case "$1" in
                 --disabled-password --disabled-login --group cl-builder 
     ;;
     upgrade)
+        # lisp-config.lisp is shipped as a conffile from 7.0 onwards, so when
+        # upgrading from earlier versions we have to remove the old
+        # auto-generated file, to avoid config file conflict (#601957)
+        if dpkg --compare-versions "$2" lt 7.0; then
+            rm -f /etc/lisp-config.lisp
+        fi
         # cleanup fasl files:
         find  /usr/share/common-lisp/source/defsystem \
 	      /usr/share/common-lisp/source/asdf \