[Pkg-uml-commit] [SCM] Rootstrap sources and Debian package branch, debian-unstable, updated. 001034d275bfb53bf5f19c8d667834674c2eb659

[Mattia Dongili]

The following commit has been merged in the debian-unstable branch:
commit ecee39e1fbc34f794bc02fb421d45f5ee4661d60
Author: Jakub Wilk <jwilk at debian.org>
Date:   Mon May 7 06:22:23 2012 +0900

    Import NMU 0.3.24-6.1
    
    tags 514671 + patch
    tags 514671 + pending
    tags 585352 + patch
    tags 585352 + pending
    
    Signed-off-by: Mattia Dongili <malattia at linux.it>

diff --git a/builder b/builder
index c6c07d9..01721b3 100755
--- a/builder
+++ b/builder
@@ -67,11 +67,11 @@ def dispatch(module, vars):
 			elif debug_exit == 2:
 			    return
 
-		    raise "rootstrap: Module '%s' failed, status %d: %s" % \
-				(module,status,os.strerror(status))
+		    raise RuntimeError("rootstrap: Module '%s' failed, status %d: %s" % \
+				(module,status,os.strerror(status)))
 		return
 
-    raise "rootstrap: unknown module: %s\n" % module
+    raise RuntimeError("rootstrap: unknown module: %s\n" % module)
         
 config = ConfigParser.ConfigParser()
 config.optionxform = str # case sensitive
diff --git a/debian/changelog b/debian/changelog
index 9fe0a5c..49d0ce5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+rootstrap (0.3.24-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Don't use string exceptions (closes: #585352); they were removed in Python
+    2.6. Thanks to Sandro Tosi for the bug report and to Riccardo Murri for
+    the patch.
+  * Remove Stefano Melchior from Uploaders (closes: #514671). Thanks to Sandro
+    Tosi for the bug report.
+
+ -- Jakub Wilk <jwilk at debian.org>  Tue, 17 Jan 2012 18:29:05 +0100
+
 rootstrap (0.3.24-6) unstable; urgency=high
 
   * use the stable release in the default rootstrap.conf
diff --git a/debian/control b/debian/control
index 6c602ae..f4286b8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: rootstrap
 Section: utils
 Priority: optional
 Maintainer: User Mode Linux Maintainers <pkg-uml-pkgs at lists.alioth.debian.org>
-Uploaders: Mattia Dongili <malattia at debian.org>, Stefano Melchior <stefano.melchior at openlabs.it>
+Uploaders: Mattia Dongili <malattia at debian.org>
 Build-Depends: debhelper (>> 5.0.0), docbook-to-man
 Standards-Version: 3.7.3
 

-- 
Rootstrap sources and Debian package