Merge branch 'schroot-1.4-merge2'

Conflicts:
	debian/changelog
	debian/control
	debian/schroot.postrm
	etc/setup.d/05file
	man/schroot.conf.5.in
	po/cs.po
	po/da.po
	po/de.po
	po/en.po
	po/eu.po
	po/fr.po
	po/it.po
	po/pt.po
	po/schroot.pot
	po/sv.po
	po/vi.po
	po/zh_CN.po
	sbuild/sbuild-chroot-config.cc
	sbuild/sbuild-chroot.cc
	sbuild/sbuild-session.cc

5 files changed, 24 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index 57d97954..0f4aa1dd 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,10 @@ configuration.
      to archive named pipes and device nodes, and so was not usable
      for chroot archival.
 
+* Major changes in 1.4.12:
+
+  None.
+
 * Major changes in 1.4.11:
 
   None.
diff --git a/debian/changelog b/debian/changelog
index 7a422775..7d69825c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,16 @@ schroot (1.5.0-1) unstable; urgency=low
 
  -- Roger Leigh <rleigh@debian.org>  Sun, 29 Aug 2010 11:59:46 +0100
 
+schroot (1.4.12-1) unstable; urgency=low
+
+  * New upstream stable release.
+  * Allow creation of sessions with the same name as chroots
+    (Closes: #595647).
+  * Issue correct error message when invalid chroot names are
+    used (Closes: #594720).
+
+ -- Roger Leigh <rleigh@debian.org>  Sun, 05 Sep 2010 17:57:53 +0100
+
 schroot (1.4.11-1) unstable; urgency=low
 
   * New upstream stable release.
diff --git a/po/da.po b/po/da.po
index 49d6b027..6d0ee3c3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1381,8 +1381,5 @@ msgstr "Kunne ikke stat fil"
 msgid "Failed to stat file descriptor"
 msgstr "Kunne ikke stat fildeskriptor"
 
-#~ msgid "Priority"
-#~ msgstr "Prioritet"
-
 #~ msgid "--chroot may not be used with --list"
 #~ msgstr "--chroot kan ikke bruges med --list"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index aa66d8e4..a81d6ceb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: schroot VERSION\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2010-09-02 21:40+0100\n"
+"POT-Creation-Date: 2010-08-15 10:19+0100\n"
 "PO-Revision-Date: 2010-08-18 11:30+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -890,6 +890,9 @@ msgstr "描述"
 msgid "Type"
 msgstr "类型"
 
+msgid "Priority"
+msgstr "优先权"
+
 msgid "Message Verbosity"
 msgstr "详细信息"
 
diff --git a/sbuild/sbuild-chroot-config.cc b/sbuild/sbuild-chroot-config.cc
index 16ef3d88..029efad7 100644
--- a/sbuild/sbuild-chroot-config.cc
+++ b/sbuild/sbuild-chroot-config.cc
@@ -353,6 +353,8 @@ chroot_config::find_chroot (std::string const& namespace_hint,
   get_namespace(name, chroot_namespace, chroot_name);
 
   if (chroot_namespace.empty())
+    chroot_namespace = namespace_hint;
+  if (chroot_namespace.empty())
     chroot_namespace = "chroot";
 
   return find_chroot_in_namespace(chroot_namespace, chroot_name);
@@ -387,6 +389,8 @@ chroot_config::find_alias (std::string const& namespace_hint,
   get_namespace(name, chroot_namespace, alias_name);
 
   if (chroot_namespace.empty())
+    chroot_namespace = namespace_hint;
+  if (chroot_namespace.empty())
     chroot_namespace = "chroot";
 
   string_map::const_iterator found = this->aliases.find(chroot_namespace + namespace_separator + alias_name);
@@ -411,6 +415,8 @@ chroot_config::lookup_alias (std::string const& namespace_hint,
   get_namespace(name, chroot_namespace, alias_name);
 
   if (chroot_namespace.empty())
+    chroot_namespace = namespace_hint;
+  if (chroot_namespace.empty())
     chroot_namespace = "chroot";
 
   string_map::const_iterator found = this->aliases.find(chroot_namespace + namespace_separator + alias_name);