Bug#639676: pu: package pbuilder/0.199+nmu1

[Julien Cristau]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: pu

(x-debbugs-cc pbuilder at pdo)

Trying to use pdebuild against sid in squeeze fails with:
/usr/sbin/pbuilder: line 120: /var/cache/pbuilder/build//32247/run: Is a directory
(bug#627086).

Would the following change be ok for a stable update?

diff --git a/Documentation/pbuilder-doc.ja.po b/Documentation/pbuilder-doc.ja.po
index 36be286..3c71eac 100644
--- a/Documentation/pbuilder-doc.ja.po
+++ b/Documentation/pbuilder-doc.ja.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xxx\n"
-"POT-Creation-Date: 2010-01-02 16:15+0000\n"
+"POT-Creation-Date: 2011-08-29 10:02+0000\n"
 "PO-Revision-Date: 2008-06-27 15:35+0900\n"
 "Last-Translator: Junichi Uekawa <dancer at debian.org>\n"
 "Language-Team: Junichi Uekawa <dancer at debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: utf-8\n"
@@ -2912,8 +2913,8 @@ msgstr ""
 # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
 #. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
 #: pbuilder-doc.xml:1612
-msgid "<filename>/run</filename>"
-msgstr "<filename>/run</filename>"
+msgid "<filename>/runscript</filename>"
+msgstr "<filename>/runscript</filename>"
 
 # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
 #. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
diff --git a/Documentation/pbuilder-doc.xml b/Documentation/pbuilder-doc.xml
index 419ee23..d8b9b6f 100644
--- a/Documentation/pbuilder-doc.xml
+++ b/Documentation/pbuilder-doc.xml
@@ -1609,7 +1609,7 @@ cache location</entry>
 	      </entry>
 	    </row>
 	    <row>
-	      <entry><filename>/run</filename></entry> 
+	      <entry><filename>/runscript</filename></entry> 
 	      <entry>The
 	      script passed as an argument to
 	      <command>pbuilder</command> execute is passed on.
diff --git a/debian/changelog b/debian/changelog
index ff042d9..89cda37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pbuilder (0.199+nmu1squeeze1) squeeze; urgency=low
+
+  * Non-maintainer upload.
+  * Cherry-pick from 0.199+nmu4: Rename the /run script from --execute to
+    /runscript, for compatibility with wheezy and later which have /run as a
+    directory replacing /var/run (bug#627086)
+
+ -- Julien Cristau <jcristau at debian.org>  Mon, 29 Aug 2011 11:53:06 +0200
+
 pbuilder (0.199+nmu1) unstable; urgency=low
 
   * Non-Maintainer Upload.
diff --git a/pbuilder b/pbuilder
index 8a092f8..d816183 100755
--- a/pbuilder
+++ b/pbuilder
@@ -116,11 +116,11 @@ File extracted to: $BUILDPLACE
 	recover_aptcache
 	trap saveaptcache_umountproc_cleanbuildplace_trap exit sighup
 
-	RUNNAME="$BUILDPLACE/run"
+	RUNNAME="$BUILDPLACE/runscript"
 	cat "$EXECPROGRAM" > "$RUNNAME"
 	chmod a+x "$RUNNAME"
 	executehooks "F"
-	( ${CHROOTEXEC} /run "$@" )
+	( ${CHROOTEXEC} /runscript "$@" )
 	RET=$?
 	rm -f "$RUNNAME"
 

Cheers,
Julien