man things changed?

5 files changed, 31 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 51e1be6..d616f70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,15 @@
-pbuilder (0.7.0.20011012) unstable; urgency=low
+pbuilder (0.8.0.20011013) unstable; urgency=low
+
+  * allow use of hardlinks in apt cache handling, with new option
+    APTCACHEHARDLINK. This cannot be enabled if pbuilder
+    files are distributed among filesystems.
+    It should speed up processing.
+  * Depends on wget, since debootstrap only recommends, and I think this
+    program is not quite functional as it is without wget
+
+ -- Junichi Uekawa <dancer@debian.org>  Sat, 13 Oct 2001 16:45:47 +0900
+
+pbuilder (0.8) unstable; urgency=low
 
   * support custom debootstrap scripts, requested by amon@vnl.com
     (closes: #114691)
@@ -7,10 +18,10 @@ pbuilder (0.7.0.20011012) unstable; urgency=low
   * changed "hooks" variable in pbuilder-runhooks, to not to have
     a starting "/". It should be unnecessary
   * E: messages in pbuilder-runhooks are now "W:" messages, because
-    even when those errors are detected, they should not really 
+    even when those errors are detected, they should not really
     stop the execution of pbuilder halfway.
 
- -- Junichi Uekawa <dancer@debian.org>  Sat, 13 Oct 2001 01:53:28 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Sat, 13 Oct 2001 01:58:34 +0900
 
 pbuilder (0.7) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 34f541b..eeee45a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.5.6
 
 Package: pbuilder
 Architecture: all
-Depends: debootstrap (>= 0.1.15)
+Depends: debootstrap (>= 0.1.15), wget
 Description: personal package builder for Debian packages
  Constructs a chroot system, and builds a package inside the 
  chroot.
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 7be44b6..94aea5a 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -159,7 +159,11 @@ fi
 
 if [ -n "$APTCACHE" ]; then
     echo "Obtaining the cached apt archive contents"
-    cp "$APTCACHE"/*.deb "$BUILDPLACE/var/cache/apt/archives/"
+    if [ "$APTCACHEHARDLINK" = "yes" ]; then
+	ln "$APTCACHE"/*.deb "$BUILDPLACE/var/cache/apt/archives/" || true
+    else
+	cp "$APTCACHE"/*.deb "$BUILDPLACE/var/cache/apt/archives/" || true
+    fi
 fi
 echo Installing the build-deps
 checkbuilddep
@@ -170,7 +174,11 @@ if [ -n "$APTCACHE" ]; then
     for A in "$BUILDPLACE/var/cache/apt/archives/"*.deb; do
 	if [ ! -f "$APTCACHE/"$(basename "$A") ]; then
 	    echo " -> new cache content "$(basename "$A")" added"
-	    cp "$A" "$APTCACHE/"
+	    if [ "$APTCACHEHARDLINK" = "yes" ]; then
+		ln "$A" "$APTCACHE/"
+	    else
+		cp "$A" "$APTCACHE/"
+	    fi
 	fi
     done
 fi
diff --git a/pbuilderrc b/pbuilderrc
index 91023a8..e7b2212 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -14,7 +14,9 @@ BUILDRESULT=/var/cache/pbuilder/result/
 #DISTRIBUTION=woody
 #specify the cache for APT 
 APTCACHE=/var/cache/pbuilder/aptcache/
+APTCACHEHARDLINK=yes
 REMOVEPACKAGES=lilo
 #HOOKDIR=/usr/lib/pbuilder/hooks
 HOOKDIR=""
 
+
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 99fdd45..ea5e8e2 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -87,6 +87,10 @@ Specify the location that the packages downloaded by apt
 should be cached.
 
 .TP
+.BI "APTCACHEHARDLINK=" "yes"
+Specify using hard links in apt cache handling.
+
+.TP
 .BI "REMOVEPACKAGES=" "lilo"
 Specify the packages to be removed on creation of 
 .B base.tgz