updates, mostly for having giced bug, joeyh patch, and supporting emacs

5 files changed, 26 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index ab2a886..29a426f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
 2002-02-18  Junichi Uekawa  <dancer@debian.org>
 
+	* pbuilder-modules: adds /etc/mailname on extractbuildplace.
+	emacsen should install.
+
 	* pbuilder-buildpackage: Can now handle ([SPACE]<< version)
 	version relationship. Needed for arpack
 	trying to change the /etc/group string, to make things work.
+	Changed ordering of commands for SUTOUSER.
 
 2002-02-16  Junichi Uekawa  <dancer@debian.org>
 
diff --git a/debian/changelog b/debian/changelog
index 67fd650..c5caba2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,11 @@ pbuilder (0.23) unstable; urgency=low
   * Make adding fakeroot inside the chroot the default.
   * handle ( <<version) version dependency format. Space should be 
     allowed there. (please test)
+  * /etc/mailname inside chroot is generated. (closes: #133773)
+  * apply fixed description, which looks better, by joeyh, thanks.
+    (closes: #134457)
 
- -- Junichi Uekawa <dancer@debian.org>  Mon, 18 Feb 2002 06:37:27 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Mon, 18 Feb 2002 12:48:03 +0900
 
 pbuilder (0.22) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f4c5b19..6538c36 100644
--- a/debian/control
+++ b/debian/control
@@ -10,24 +10,20 @@ Architecture: all
 Depends: debootstrap (>= 0.1.16.2), wget, gcc
 Recommends: fakeroot, sudo
 Description: personal package builder for Debian packages
- Constructs a chroot system, and builds a package inside the 
- chroot.
- . 
- Ideal system to use to check that Build-dependency is correct, 
- and to be sure that unnecessary and wrong build dependency will not
- exist with the resulting binary package.
+ pbuilder constructs a chroot system, and builds a package inside the
+ chroot. It is an ideal system to use to check that a package's
+ build-dependencies are correct, and to be sure that unnecessary and
+ wrong build dependencies will not exist in the resulting package.
+ It uses apt extensively, and a local mirror, or a fast connection
+ to a Debian mirror is ideal, but not necessary.
  .
- pbuilder create uses debootstrap to create a chroot  image.
+ "pbuilder create" uses debootstrap to create a chroot image. 
  .
- pbuilder update updates the image to the current state of 
+ "pbuilder update" updates the image to the current state of
  testing/unstable/whatever
  .
- pbuilder build takes a *.dsc file to build a binary in the chroot 
+ "pbuilder build" takes a *.dsc file and builds a binary in the chroot
  image.
  .
- pdebuild is a wrapper for Debian Developers, to allow running 
- pbuilder just like "debuild", from a normal user privilege
- .
- Uses apt extensively, and a local mirror, or a fast connection
- to a Debian mirror is ideal, but not necessary.
-
+ pdebuild is a wrapper for Debian Developers, to allow running
+ pbuilder just like "debuild", as a normal user.
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 411a7f7..037f25d 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -205,6 +205,11 @@ function createbuilduser () {
 
 PACKAGENAME="$1"
 CHROOTEXEC="chroot $BUILDPLACE "
+if [ ! -f "$PACKAGENAME" ]; then
+    echo "Command line parameter [$PACKAGENAME] is not a valid .dsc file name" >&2
+    exit 1;
+fi;
+
 if [ -n "$BUILDUSERNAME" -a -n "$BUILDUSERID" ]; then
     SUTOUSER="HOME=/tmp/buildd su - $BUILDUSERNAME -- "
     DEBBUILDOPTS="$DEBBUILDOPTS -rfakeroot"
@@ -215,10 +220,6 @@ else
     BUILDUSERID=0
     BUILDUSERNAME=root
 fi
-if [ ! -f "$PACKAGENAME" ]; then
-    echo "Command line parameter [$PACKAGENAME] is not a valid .dsc file name" >&2
-    exit 1;
-fi;
 
 showbuildbanner
 echobacktime
diff --git a/pbuilder-modules b/pbuilder-modules
index 0f73378..3a5182f 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -158,10 +158,11 @@ function extractbuildplace () {
     fi
     mountproc
     mkdir -p "$BUILDPLACE/tmp/buildd"
-    echo " -> copying local configuration"
+    echo " -> copying/creating local configuration"
     for a in hosts hostname resolv.conf; do 
 	cp /etc/$a "$BUILDPLACE/etc/$a";
     done
+    hostname -f > "$BUILDPLACE/etc/mailname"
     
     if [ -n "$DISTRIBUTION" ]; then
 	installaptlines