tags 655844 + patch
tags 655844 + pending
thanks

Dear maintainer,

I've prepared an NMU for quassel (versioned as 0.7.3-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Janis Joplin: Piece Of My Heart (live at Woodstock)
diff -Nru quassel-0.7.3/debian/changelog quassel-0.7.3/debian/changelog
--- quassel-0.7.3/debian/changelog	2012-03-05 09:30:13.000000000 +0100
+++ quassel-0.7.3/debian/changelog	2012-04-10 19:03:11.000000000 +0200
@@ -1,3 +1,13 @@
+quassel (0.7.3-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "fails to upgrade from squeeze": test for existence of to-be-moved
+    file in quassel-core.preinst; and use -p for mkdir to avoid errors when
+    the directory exists, like after failed upgrades.
+    (Closes: #655844)
+
+ -- gregor herrmann <gre...@debian.org>  Tue, 10 Apr 2012 19:02:42 +0200
+
 quassel (0.7.3-2) unstable; urgency=medium
 
   * Change Build-Depends of the package from libpng12-dev to libpng-dev.
diff -Nru quassel-0.7.3/debian/quassel-core.preinst quassel-0.7.3/debian/quassel-core.preinst
--- quassel-0.7.3/debian/quassel-core.preinst	2011-06-06 22:37:45.000000000 +0200
+++ quassel-0.7.3/debian/quassel-core.preinst	2012-04-10 19:02:21.000000000 +0200
@@ -5,12 +5,10 @@
 # Move data dir from /var/cache to /var/lib
 prep_mv_dir() {
     DIR="$1"
-    if [ -e "$DIR" ]; then
-            if [ -n "/var/lib/quassel/" ]; then
-                mkdir "/var/lib/quassel/"
-            fi
+    if [ -d "$DIR" ]; then
+            mkdir -p "/var/lib/quassel/"
             mv /var/cache/quassel/* /var/lib/quassel/
-            mv /var/cache/quassel/.config  /var/lib/quassel/
+            test ! -e /var/cache/quassel/.config || mv /var/cache/quassel/.config  /var/lib/quassel/
             test -d /var/cache/quassel/ && rmdir /var/cache/quassel/
     fi
 }

Attachment: signature.asc
Description: Digital signature

Reply via email to