--- cpipe-3.0.1.orig/cmdline.c
+++ cpipe-3.0.1/cmdline.c
@@ -3,7 +3,7 @@
   (http://wsd.iitb.fhg.de/~kir/clighome/)
 
   The command line parser `clig':
-  (C) 1995---2001 Harald Kirsch (kirschh@lionbioscience.com)
+  (C) 1995-2004 Harald Kirsch (clig@geggus.net)
 *****/
 
 #include <stdio.h>
@@ -253,7 +253,7 @@
     for a bit more values than cmax.
   *****/
   alloced = cmin + 4;
-  *values = calloc((size_t)alloced, sizeof(long));
+  *values = (long int *)calloc((size_t)alloced, sizeof(long));
   if( ! *values ) {
 outMem:
     fprintf(stderr, 
@@ -265,7 +265,7 @@
   for(used=0; (cmax==-1 || used<cmax) && used+i+1<argc; used++) {
     if( used==alloced ) {
       alloced += 8;
-      *values = realloc(*values, alloced*sizeof(long));
+      *values = (long int*) realloc(*values, alloced*sizeof(long));
       if( !*values ) goto outMem;
     }
 
@@ -712,21 +712,20 @@
 void
 usage(void)
 {
-  fprintf(stderr, "usage: %s%s", Program, "\
- [-b bsize] [-vt] [-vr] [-vw] [-ngr] [-s speed]\n\
-    copy stdin to stdout while counting bytes and reporting progress\n\
-    -b: buffer size in kB\n\
-        1 int value between 1 and oo\n\
-        default: `128'\n\
-   -vt: show throughput\n\
-   -vr: show read-times\n\
-   -vw: show write-times\n\
-  -ngr: non-greedy read. Don't enforce a full buffer\n\
-        on read before starting to write\n\
-    -s: throughput speed limit in kB/s\n\
-        1 double value between 1 and oo\n\
-version: 3.0.0\n\
-");
+  fprintf(stderr,"%s","   [-b bsize] [-vt] [-vr] [-vw] [-ngr] [-s speed]\n");
+  fprintf(stderr,"%s","      copy stdin to stdout while counting bytes and reporting progress\n");
+  fprintf(stderr,"%s","      -b: buffer size in kB\n");
+  fprintf(stderr,"%s","          1 int value between 1 and oo\n");
+  fprintf(stderr,"%s","          default: `128'\n");
+  fprintf(stderr,"%s","     -vt: show throughput\n");
+  fprintf(stderr,"%s","     -vr: show read-times\n");
+  fprintf(stderr,"%s","     -vw: show write-times\n");
+  fprintf(stderr,"%s","    -ngr: non-greedy read. Don't enforce a full buffer\n");
+  fprintf(stderr,"%s","          on read before starting to write\n");
+  fprintf(stderr,"%s","      -s: throughput speed limit in kB/s\n");
+  fprintf(stderr,"%s","          1 double value between 1 and oo\n");
+  fprintf(stderr,"%s","  version: 3.0.1\n");
+  fprintf(stderr,"%s","  ");
   exit(EXIT_FAILURE);
 }
 /**********************************************************************/
--- cpipe-3.0.1.orig/makefile
+++ cpipe-3.0.1/makefile
@@ -19,25 +19,14 @@
 
 ########################################################################
 cpipe: cpipe.o cmdline.o
-	$(CC) -lm -o $@ cpipe.o cmdline.o
+	$(CC) -o $@ cpipe.o cmdline.o -lm
 
 cpipe.o: cpipe.c cmdline.h
 
 cmdline.o: cmdline.c cmdline.h
 
-
-cmdline.c cmdline.h cpipe.1: cmdline.cli
-	@ (echo "clig cmdline.cli"; clig cmdline.cli) || {\
-	echo "*****"; \
-	echo "Get clig at http://wsd.iitb.fhg.de/~kir/clighome"; \
-	echo "or use cmdline.c, cmdline.h and cpipe.1 as they come"; \
-	echo "in the distribution by touching them."; \
-	echo "*****"; \
-	exit 1; \
-        }
-
 clean:
-	rm cmdline.o cpipe.o cpipe
+	-rm cmdline.o cpipe.o cpipe
 
 
 install: cpipe cpipe.1
--- cpipe-3.0.1.orig/cpipe.c
+++ cpipe-3.0.1/cpipe.c
@@ -137,7 +137,7 @@
 	    scale(TotalBytes/totalTin, txt2),
 	    scale(TotalBytes, txt3));
     if( totalBytes<length ) {
-      fprintf(stderr, "   (bsize=%u)\n", totalBytes);
+      fprintf(stderr, "   (bsize=%lu)\n", (unsigned long) totalBytes);
     } else {
       fprintf(stderr, "\n");
     }
--- cpipe-3.0.1.orig/debian/copyright
+++ cpipe-3.0.1/debian/copyright
@@ -0,0 +1,11 @@
+This package was debianized by Eduard Bloch <blade@debian.org> on
+Sun,  7 Jul 2002 22:19:22 +0200.
+
+It was downloaded from http://cpipe.berlios.de
+
+Upstream Author: Harald Kirsch (kirschh@lionbioscience.com)
+
+Copyright:
+
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .
--- cpipe-3.0.1.orig/debian/docs
+++ cpipe-3.0.1/debian/docs
@@ -0,0 +1 @@
+README
--- cpipe-3.0.1.orig/debian/changelog
+++ cpipe-3.0.1/debian/changelog
@@ -0,0 +1,41 @@
+cpipe (3.0.1-1ubuntu1) natty; urgency=low
+
+  * Correct linking order to prevent FTBFS with newest toolchain.
+
+ -- Angel Abad <angelabad@ubuntu.com>  Fri, 28 Jan 2011 08:49:28 +0100
+
+cpipe (3.0.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Overall package update (policy, makefile fixes)
+  * Dropped the clig Build-Dependency, stopped updating the parser source 
+  * simple format string warning fix for amd64
+
+ -- Eduard Bloch <blade@debian.org>  Sun, 05 Aug 2007 18:59:40 +0200
+
+cpipe (3.0.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix build failure with make 3.81+.  Thanks to Matt Kraai for the patch.
+    Closes: #355075.
+
+ -- Matej Vela <vela@debian.org>  Fri, 10 Mar 2006 14:32:38 +0100
+
+cpipe (3.0.0-2) unstable; urgency=low
+
+  * Added missing -lm to the linker call, closes: #172038
+
+ -- Eduard Bloch <blade@debian.org>  Sat,  7 Dec 2002 01:51:58 +0100
+
+cpipe (3.0.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Eduard Bloch <blade@debian.org>  Tue,  3 Dec 2002 22:22:01 +0100
+
+cpipe (2.0.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Eduard Bloch <blade@debian.org>  Sun,  7 Jul 2002 22:19:22 +0200
+
--- cpipe-3.0.1.orig/debian/dirs
+++ cpipe-3.0.1/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- cpipe-3.0.1.orig/debian/control
+++ cpipe-3.0.1/debian/control
@@ -0,0 +1,16 @@
+Source: cpipe
+Section: utils
+Priority: optional
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Eduard Bloch <blade@debian.org>
+Build-Depends: debhelper (>> 5.0.0)
+Standards-Version: 3.7.2
+
+Package: cpipe
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: counting pipe
+ Cpipe copies its standard input to its standard output while measuring the
+ time it takes to read an input buffer and write an output buffer. Statistics
+ of average throughput and the total amount of bytes copied are printed to the
+ standard error output.
--- cpipe-3.0.1.orig/debian/rules
+++ cpipe-3.0.1/debian/rules
@@ -0,0 +1,87 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+configure: configure-stamp
+configure-stamp:
+#	dh_testdir
+#
+	touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp 
+	dh_testdir
+
+	$(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	$(MAKE) clean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/cpipe.
+#	$(MAKE) install prefix=$(CURDIR)/debian/cpipe/usr
+	cp cpipe $(CURDIR)/debian/cpipe/usr/bin
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+#	dh_installdebconf	
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+	dh_installcron
+	dh_installman cpipe.1
+	dh_installinfo
+#	dh_undocumented
+	dh_installchangelogs CHANGES
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_makeshlibs
+	dh_installdeb
+#	dh_perl
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--- cpipe-3.0.1.orig/debian/compat
+++ cpipe-3.0.1/debian/compat
@@ -0,0 +1 @@
+5