diff -u shapetools-1.4pl6/src/atfs/Makefile shapetools-1.4pl6/src/atfs/Makefile
--- shapetools-1.4pl6/src/atfs/Makefile
+++ shapetools-1.4pl6/src/atfs/Makefile
@@ -28,7 +28,7 @@
 
 # The base directory of the project's repository area.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # Path to this node system relative to the root of the
 # repository area defined above (e.g. src/vc/save).
diff -u shapetools-1.4pl6/src/sttk/Makefile shapetools-1.4pl6/src/sttk/Makefile
--- shapetools-1.4pl6/src/sttk/Makefile
+++ shapetools-1.4pl6/src/sttk/Makefile
@@ -28,7 +28,7 @@
 
 # The base directory of the project's repository area.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # Path to this node system relative to the root of the
 # repository area defined above (e.g. src/vc/save).
diff -u shapetools-1.4pl6/src/atfstk/Makefile shapetools-1.4pl6/src/atfstk/Makefile
--- shapetools-1.4pl6/src/atfstk/Makefile
+++ shapetools-1.4pl6/src/atfstk/Makefile
@@ -28,7 +28,7 @@
 
 # The base directory of the project's repository area.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # Path to this node system relative to the root of the
 # repository area defined above (e.g. src/vc/save).
diff -u shapetools-1.4pl6/src/shape/Makefile shapetools-1.4pl6/src/shape/Makefile
--- shapetools-1.4pl6/src/shape/Makefile
+++ shapetools-1.4pl6/src/shape/Makefile
@@ -27,7 +27,7 @@
 
 # The base directory of the project's repository area.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # Path to this node system relative to the root of the
 # repository area defined above (e.g. src/vc/save).
diff -u shapetools-1.4pl6/src/vc/atfsit/Makefile shapetools-1.4pl6/src/vc/atfsit/Makefile
--- shapetools-1.4pl6/src/vc/atfsit/Makefile
+++ shapetools-1.4pl6/src/vc/atfsit/Makefile
@@ -28,7 +28,7 @@
 
 # The base directory of the project's repository area.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # Path to this node system relative to the root of the
 # repository area defined above (e.g. src/vc/save).
diff -u shapetools-1.4pl6/src/vc/rcs2atfs/utils.c shapetools-1.4pl6/src/vc/rcs2atfs/utils.c
--- shapetools-1.4pl6/src/vc/rcs2atfs/utils.c
+++ shapetools-1.4pl6/src/vc/rcs2atfs/utils.c
@@ -201,6 +201,7 @@
     return new ;
 }
 
+#if 0
 /* like strdup, but only n characters
  * the resulting string is null padded, freeable
  */
@@ -213,6 +214,7 @@
     strncpy0(tmp, s, n) ;
     return tmp ;
 }
+#endif
 
 /* return a string concatenated from s1, s2, and s3.
  * The returned string is freeable.
diff -u shapetools-1.4pl6/src/vc/rcs2atfs/functions.h shapetools-1.4pl6/src/vc/rcs2atfs/functions.h
--- shapetools-1.4pl6/src/vc/rcs2atfs/functions.h
+++ shapetools-1.4pl6/src/vc/rcs2atfs/functions.h
@@ -100,10 +100,12 @@
 /* duplicate string with check */
 char *check_strdup ( char *s );
 
+#if 0
 /* like strdup, but only n characters
  * the resulting string is null padded, freeable
  */
 char *strndup ( char *s, int n );
+#endif
 
 /* return a string concatenated from s1, s2, and s3.
  * The returned string is freeable.
diff -u shapetools-1.4pl6/src/vc/rcs2atfs/Makefile shapetools-1.4pl6/src/vc/rcs2atfs/Makefile
--- shapetools-1.4pl6/src/vc/rcs2atfs/Makefile
+++ shapetools-1.4pl6/src/vc/rcs2atfs/Makefile
@@ -28,7 +28,7 @@
 
 # The base directory of the project's repository area.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # Path to this node system relative to the root of the
 # repository area defined above (e.g. src/vc/save).
diff -u shapetools-1.4pl6/src/vc/retrv/Makefile shapetools-1.4pl6/src/vc/retrv/Makefile
--- shapetools-1.4pl6/src/vc/retrv/Makefile
+++ shapetools-1.4pl6/src/vc/retrv/Makefile
@@ -28,7 +28,7 @@
 
 # The base directory of the project's repository area.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # Path to this node system relative to the root of the
 # repository area defined above (e.g. src/vc/save).
diff -u shapetools-1.4pl6/src/vc/save/Makefile shapetools-1.4pl6/src/vc/save/Makefile
--- shapetools-1.4pl6/src/vc/save/Makefile
+++ shapetools-1.4pl6/src/vc/save/Makefile
@@ -28,7 +28,7 @@
 
 # The base directory of the project's repository area.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # Path to this node system relative to the root of the
 # repository area defined above (e.g. src/vc/save).
diff -u shapetools-1.4pl6/src/vc/scripts/Makefile shapetools-1.4pl6/src/vc/scripts/Makefile
--- shapetools-1.4pl6/src/vc/scripts/Makefile
+++ shapetools-1.4pl6/src/vc/scripts/Makefile
@@ -28,7 +28,7 @@
 
 # The base directory of the project's repository area.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # Path to this node system relative to the root of the
 # repository area defined above (e.g. src/vc/save).
diff -u shapetools-1.4pl6/src/vc/vadm/Makefile shapetools-1.4pl6/src/vc/vadm/Makefile
--- shapetools-1.4pl6/src/vc/vadm/Makefile
+++ shapetools-1.4pl6/src/vc/vadm/Makefile
@@ -28,7 +28,7 @@
 
 # The base directory of the project's repository area.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # Path to this node system relative to the root of the
 # repository area defined above (e.g. src/vc/save).
diff -u shapetools-1.4pl6/src/vc/vfind/Makefile shapetools-1.4pl6/src/vc/vfind/Makefile
--- shapetools-1.4pl6/src/vc/vfind/Makefile
+++ shapetools-1.4pl6/src/vc/vfind/Makefile
@@ -28,7 +28,7 @@
 
 # The base directory of the project's repository area.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # Path to this node system relative to the root of the
 # repository area defined above (e.g. src/vc/save).
diff -u shapetools-1.4pl6/src/vc/vl/Makefile shapetools-1.4pl6/src/vc/vl/Makefile
--- shapetools-1.4pl6/src/vc/vl/Makefile
+++ shapetools-1.4pl6/src/vc/vl/Makefile
@@ -28,7 +28,7 @@
 
 # The base directory of the project's repository area.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # Path to this node system relative to the root of the
 # repository area defined above (e.g. src/vc/save).
diff -u shapetools-1.4pl6/src/vc/Makefile shapetools-1.4pl6/src/vc/Makefile
--- shapetools-1.4pl6/src/vc/Makefile
+++ shapetools-1.4pl6/src/vc/Makefile
@@ -28,7 +28,7 @@
 
 # The base directory of the project's repository area.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # Path to this node system relative to the root of the
 # repository area defined above (e.g. src/vc/save).
diff -u shapetools-1.4pl6/src/rms/Makefile shapetools-1.4pl6/src/rms/Makefile
--- shapetools-1.4pl6/src/rms/Makefile
+++ shapetools-1.4pl6/src/rms/Makefile
@@ -28,7 +28,7 @@
 
 # The base directory of the project's development area.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # Path of a subsystem relative to the root of the system hierarchy
 # (e.g. vc/save)
diff -u shapetools-1.4pl6/vgrep-2.0/grep.man shapetools-1.4pl6/vgrep-2.0/grep.man
--- shapetools-1.4pl6/vgrep-2.0/grep.man
+++ shapetools-1.4pl6/vgrep-2.0/grep.man
@@ -65,7 +65,7 @@
 .B vfgrep
 are available.
 .B Vegrep
-is similiar (but not identical) to
+is similar (but not identical) to
 .BR "vgrep\ \-E" ,
 and is compatible with the historical Unix
 .BR egrep .
diff -u shapetools-1.4pl6/debian/changelog shapetools-1.4pl6/debian/changelog
--- shapetools-1.4pl6/debian/changelog
+++ shapetools-1.4pl6/debian/changelog
@@ -1,3 +1,9 @@
+shapetools (1.4pl6-11) unstable; urgency=low
+
+  * Fix build failure with eglibc-2.10. Closes: #552823.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 31 Dec 2009 16:59:46 +0100
+
 shapetools (1.4pl6-10) unstable; urgency=low
 
   * Fix build error with glibc-2.7 on amd64. Closes: #454875.
diff -u shapetools-1.4pl6/debian/rules shapetools-1.4pl6/debian/rules
--- shapetools-1.4pl6/debian/rules
+++ shapetools-1.4pl6/debian/rules
@@ -73,7 +73,6 @@
 v_sttk	= 1.7
 
 #CC := gcc
-PWD := $(shell pwd)
 
 build: build-stamp build-grep-stamp
 build-stamp:
@@ -82,9 +81,9 @@
 	-chmod a+x configure
 	CC=$(CC) ./configure --prefix=/usr --enable-shared
 	if [ -z "$$LD_LIBRARY_PATH" ]; then \
-	  LD_LIBRARY_PATH="$(PWD)/lib" $(MAKE); \
+	  LD_LIBRARY_PATH="$(CURDIR)/lib" $(MAKE); \
 	else \
-	  LD_LIBRARY_PATH="$(PWD)/lib:$$LD_LIBRARY_PATH" $(MAKE); \
+	  LD_LIBRARY_PATH="$(CURDIR)/lib:$$LD_LIBRARY_PATH" $(MAKE); \
 	fi
 	touch build-stamp
 
@@ -93,9 +92,9 @@
 	rm -f build-grep-stamp
 	cd vgrep-2.0 && CC=$(CC) ./configure --prefix/usr
 	if [ -z "$$LD_LIBRARY_PATH" ]; then \
-	  LD_LIBRARY_PATH=$(PWD)/lib $(MAKE) -C vgrep-2.0 SHAPETOOLS=$(PWD); \
+	  LD_LIBRARY_PATH=$(CURDIR)/lib $(MAKE) -C vgrep-2.0 SHAPETOOLS=$(CURDIR); \
 	else \
-	  LD_LIBRARY_PATH="$(PWD)/lib:$$LD_LIBRARY_PATH" $(MAKE) -C vgrep-2.0 SHAPETOOLS=$(PWD); \
+	  LD_LIBRARY_PATH="$(CURDIR)/lib:$$LD_LIBRARY_PATH" $(MAKE) -C vgrep-2.0 SHAPETOOLS=$(CURDIR); \
 	fi
 	touch build-grep-stamp
 
@@ -103,9 +102,9 @@
 	dh_testdir
 	dh_testroot
 	rm -f *-stamp
-	-$(MAKE) clean
-	-$(MAKE) doclean
-	-$(MAKE) -C vgrep-2.0 -f Makefile.in distclean
+	$(MAKE) clean
+	$(MAKE) doclean
+	$(MAKE) -C vgrep-2.0 -f Makefile.in distclean
 	rm -f config.{cache,log,status}
 	-find src -name '*.so*' | xargs rm -f
 	dh_clean
@@ -121,13 +120,13 @@
 	dh_installdirs -p$(p_atfslib) $(dirs_atfslib)
 	dh_installdirs -p$(p_atfsdev) $(dirs_atfsdev)
 	if [ -z "$$LD_LIBRARY_PATH" ]; then \
-	  LD_LIBRARY_PATH=$(PWD)/lib \
-	    $(MAKE) install INSTALLBASE=$(PWD)/$(d)/usr \
-		INSTALLMANPATH=$(PWD)/$(d)/usr/share/man; \
+	  LD_LIBRARY_PATH=$(CURDIR)/lib \
+	    $(MAKE) install INSTALLBASE=$(CURDIR)/$(d)/usr \
+		INSTALLMANPATH=$(CURDIR)/$(d)/usr/share/man; \
 	else \
-	  LD_LIBRARY_PATH=$(PWD)/lib:$$LD_LIBRARY_PATH \
-	    $(MAKE) install INSTALLBASE=$(PWD)/$(d)/usr \
-		INSTALLMANPATH=$(PWD)/$(d)/usr/share/man; \
+	  LD_LIBRARY_PATH=$(CURDIR)/lib:$$LD_LIBRARY_PATH \
+	    $(MAKE) install INSTALLBASE=$(CURDIR)/$(d)/usr \
+		INSTALLMANPATH=$(CURDIR)/$(d)/usr/share/man; \
 	fi
 	( \
 	  set -e; \
@@ -311,13 +310,13 @@
 	cp -p debian/lastrelease.1 $(d)/usr/share/man/man1/
 	chmod a-x $(d)/usr/lib/lib*.a
 	if [ -z "$$LD_LIBRARY_PATH" ]; then \
-	  LD_LIBRARY_PATH=$(PWD)/lib \
-	    $(MAKE) -C vgrep-2.0 install prefix=$(PWD)/$(d)/usr \
-		mandir=$(PWD)/$(d)/usr/share/man/man1; \
+	  LD_LIBRARY_PATH=$(CURDIR)/lib \
+	    $(MAKE) -C vgrep-2.0 install prefix=$(CURDIR)/$(d)/usr \
+		mandir=$(CURDIR)/$(d)/usr/share/man/man1; \
 	else \
-	  LD_LIBRARY_PATH=$(PWD)/lib:$$LD_LIBRARY_PATH \
-	    $(MAKE) -C vgrep-2.0 install prefix=$(PWD)/$(d)/usr \
-		mandir=$(PWD)/$(d)/usr/share/man/man1; \
+	  LD_LIBRARY_PATH=$(CURDIR)/lib:$$LD_LIBRARY_PATH \
+	    $(MAKE) -C vgrep-2.0 install prefix=$(CURDIR)/$(d)/usr \
+		mandir=$(CURDIR)/$(d)/usr/share/man/man1; \
 	fi
 	mv $(d)/usr/share/man/man1/grep.1 $(d)/usr/share/man/man1/vgrep.1
 	ln -sf vgrep.1 $(d)/usr/share/man/man1/vegrep.1
diff -u shapetools-1.4pl6/debian/control shapetools-1.4pl6/debian/control
--- shapetools-1.4pl6/debian/control
+++ shapetools-1.4pl6/debian/control
@@ -2,13 +2,13 @@
 Section: devel
 Priority: optional
 Maintainer: Matthias Klose <doko@debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.8.1
 Build-Depends: debhelper (>= 5)
 
 Package: shapetools
 Section: devel
 Architecture: any
-Depends: atfs (= ${Source-Version}), ${shlibs:Depends}
+Depends: atfs (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Configuration and Release management using AtFS
  ShapeTools is a collection of programs to support software
  configuration management in an UNIX environment. It consists of a set
@@ -26,7 +26,7 @@
 Package: atfs
 Section: devel
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: The Attributed File System (AtFS)
  AtFS is a storage system supporting multiple versions of files and
  associating an arbitrary number of application defined attributes
@@ -40,7 +40,7 @@
 Package: libatfs1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: The Attributed File System (AtFS runtime libraries)
  AtFS is a storage system supporting multiple versions of files and
  associating an arbitrary number of application defined attributes
@@ -53,7 +53,7 @@
 Package: atfs-dev
 Section: libdevel
 Architecture: any
-Depends: atfs (= ${Source-Version})
+Depends: atfs (= ${binary:Version}), ${misc:Depends}
 Description: The Attributed File System (AtFS development libraries)
  AtFS is a storage system supporting multiple versions of files and
  associating an arbitrary number of application defined attributes
diff -u shapetools-1.4pl6/Makefile shapetools-1.4pl6/Makefile
--- shapetools-1.4pl6/Makefile
+++ shapetools-1.4pl6/Makefile
@@ -21,7 +21,7 @@
 
 # The base directory of the shape source tree.
 
-BASE = /home/packages/shapetools/shapetools-1.4pl6
+BASE = /scratch/packages/shapetools/shapetools-1.4pl6
 
 # The operating system. Supported platforms are:
 #	s_aix      -- AIX (tested on IBM RS6000 with AIX 3.2.0)
only in patch2:
unchanged:
--- shapetools-1.4pl6.orig/man/man3/atprint.3
+++ shapetools-1.4pl6/man/man3/atprint.3
@@ -65,6 +65,6 @@
 \fIatScanStatus\fP converts an status string to an internal numeric
 status value. It understands various abbreviations, including the
 one character status strings generated by atWriteStatus.
-.BUGS
+.SH .BUGS
 The format switch in afWriteDate (for dates older than six months)
 does not happen at exactly the right time. It may be a few days later.
only in patch2:
unchanged:
--- shapetools-1.4pl6.orig/man/man3/stuserio.3
+++ shapetools-1.4pl6/man/man3/stuserio.3
@@ -56,11 +56,11 @@
 Message to be sent to standard error.
 .TP
 ST_LOG_WARNING
-Warning message, preceeded by the string `programName - warning:',
+Warning message, preceded by the string `programName - warning:',
 going to standard error.
 .TP
 ST_LOG_ERROR
-Error message, preceeded by the string `programName - error:',
+Error message, preceded by the string `programName - error:',
 going to standard error.
 .LP
 Additionally, when the flag
@@ -86,7 +86,7 @@
 and an additional short message. It's size is MAXPATHLEN+128.
 .LP
 \fIstGetFromStdin\fP reads from stdin a text terminated by ^D or by the
-specified single charcter \fItermChar\fP at the beginning of a new
+specified single character \fItermChar\fP at the beginning of a new
 line. If termChar is -1 text is terminated by ^D.
 .LP
 \fIstAskConfirm\fP returns true if the answer is equivalent to
only in patch2:
unchanged:
--- shapetools-1.4pl6.orig/man/man3/stcall.3
+++ shapetools-1.4pl6/man/man3/stcall.3
@@ -110,7 +110,7 @@
 In the case of CHILD_KILLED, stCallCmdErrno contains the statßus of
 the child process as reported by wait(2).
 .SH BUGS
-On systems where no useable vfork(2) is available, the value of
+On systems where no usable vfork(2) is available, the value of
 stCallCmdErrno does not make sense in case of EXEC_FAILED.
 .LP
 Under IRIX stCallCmd sometimes (or always?) returns WAIT_ERROR where
only in patch2:
unchanged:
--- shapetools-1.4pl6.orig/man/man3/stparseargs.3
+++ shapetools-1.4pl6/man/man3/stparseargs.3
@@ -41,7 +41,7 @@
 filters out all known (from the option list) options and their
 arguments and returns the remaining tokens from the command line in
 \fInewArgVector\fP with \fInewArgCount\fP. Options on the command
-line must be preceeded by a minus sign, otherwise they will not be
+line must be preceded by a minus sign, otherwise they will not be
 recognized. The first entry in the
 argument vector, the program name, passes the function without any
 damage. stParseArgs may be invoked multiple times with different
only in patch2:
unchanged:
--- shapetools-1.4pl6.orig/man/man7/bindrules.7
+++ shapetools-1.4pl6/man/man7/bindrules.7
@@ -116,7 +116,6 @@
 	\fCfrom_release (release_name):\fP
 .sp
 	\fClast_released (library_path, include_path):\fP
-.fo
 .LP
 .SH EVALUATION ALGORITHM
 The basic idea of the rule evaluation algorithm is, that in every
only in patch2:
unchanged:
--- shapetools-1.4pl6.orig/man/man1/vl.1
+++ shapetools-1.4pl6/man/man1/vl.1
@@ -96,8 +96,8 @@
 .IP "\fB\-1\fP (ls)"
 Force single column output.
 .IP "\fB\-a\fP (ls)"
-List all entries, even those with a name beginning with a '.' and the
-'AtFS' entry. This option is default when vl is called by the super
+List all entries, even those with a name beginning with a '.' and
+the 'AtFS' entry. This option is default when vl is called by the super
 user.
 .IP "\fB\-all\fP"
 List all available information.
only in patch2:
unchanged:
--- shapetools-1.4pl6.orig/man/man1/atfsit.1
+++ shapetools-1.4pl6/man/man1/atfsit.1
@@ -104,7 +104,7 @@
 	[1-9]	Manual (digits 1 - 9)
 .fi
 .PP
-If the environement variable ``ATFSDIR'' is present, then 
+If the environment variable ``ATFSDIR'' is present, then 
 .I atfsit
 will attempt to make a link from it to ``AtFS'' in
 the current directory if the \-\fII\fP option is used and