diff -Nru nttcp-1.47/Makefile nttcp-1.47/Makefile
--- nttcp-1.47/Makefile	2012-11-24 11:36:12.000000000 +0000
+++ nttcp-1.47/Makefile	2000-12-18 10:17:20.000000000 +0000
@@ -173,9 +173,9 @@
 
 install:	nttcp
 		-mkdir -p $(prefix)/bin
-		-mkdir -p $(prefix)/share/man/man1
+		-mkdir -p $(prefix)/man/man1
 		cp nttcp $(prefix)/bin
-		cp nttcp.1 $(prefix)/share/man/man1
+		cp nttcp.1 $(prefix)/man/man1
 
 clean:
 		rm -f *.o
diff -Nru nttcp-1.47/debian/changelog nttcp-1.47/debian/changelog
--- nttcp-1.47/debian/changelog	2012-11-24 11:36:12.000000000 +0000
+++ nttcp-1.47/debian/changelog	2012-03-31 18:13:02.000000000 +0000
@@ -1,3 +1,14 @@
+nttcp (1.47-13) unstable; urgency=low
+
+  * Change source package format to 3.0 (quilt)
+  * Bump Standards-Version to 3.9.3
+  * Revert Makefile change and add debian/patches/010_change_manpath
+  * Use quilt instead of simple-patchsys
+  * Move repository to svn.debian.org
+    - svn://svn.debian.org/svn/collab-maint/deb-maint/nttcp
+
+ -- Taku YASUI <tach@debian.org>  Sun, 01 Apr 2012 03:12:19 +0900
+
 nttcp (1.47-12ubuntu1) precise; urgency=low
 
   * Add format-security.diff to resolve FTBFS.
diff -Nru nttcp-1.47/debian/control nttcp-1.47/debian/control
--- nttcp-1.47/debian/control	2012-11-24 11:36:12.000000000 +0000
+++ nttcp-1.47/debian/control	2012-03-31 18:11:53.000000000 +0000
@@ -1,10 +1,11 @@
 Source: nttcp
 Section: non-free/net
 Priority: extra
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Taku YASUI <tach@debian.org>
-Build-Depends: debhelper (>= 5.0.0), cdbs
-Standards-Version: 3.8.1
+Maintainer: Taku YASUI <tach@debian.org>
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt
+Standards-Version: 3.9.3
+Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/nttcp
+Vcs-Browser: http://anonscm.debian.org/viewvc/collab-maint/deb-maint/nttcp
 
 Package: nttcp
 Architecture: any
diff -Nru nttcp-1.47/debian/patches/010_change_manpath nttcp-1.47/debian/patches/010_change_manpath
--- nttcp-1.47/debian/patches/010_change_manpath	1970-01-01 00:00:00.000000000 +0000
+++ nttcp-1.47/debian/patches/010_change_manpath	2012-03-31 17:53:21.000000000 +0000
@@ -0,0 +1,15 @@
+diff -ruN -xdebian -x.svn nttcp-1.47/Makefile trunk/Makefile
+--- nttcp-1.47/Makefile	2000-12-18 19:17:20.000000000 +0900
++++ trunk/Makefile	2012-04-01 02:44:41.028451955 +0900
+@@ -173,9 +173,9 @@
+ 
+ install:	nttcp
+ 		-mkdir -p $(prefix)/bin
+-		-mkdir -p $(prefix)/man/man1
++		-mkdir -p $(prefix)/share/man/man1
+ 		cp nttcp $(prefix)/bin
+-		cp nttcp.1 $(prefix)/man/man1
++		cp nttcp.1 $(prefix)/share/man/man1
+ 
+ clean:
+ 		rm -f *.o
diff -Nru nttcp-1.47/debian/patches/020_format-security nttcp-1.47/debian/patches/020_format-security
--- nttcp-1.47/debian/patches/020_format-security	1970-01-01 00:00:00.000000000 +0000
+++ nttcp-1.47/debian/patches/020_format-security	2012-03-31 17:56:31.000000000 +0000
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' nttcp-1.47/nttcp.c nttcp-1.47.new/nttcp.c
+--- nttcp-1.47/nttcp.c	2000-12-18 05:16:54.000000000 -0500
++++ nttcp-1.47.new/nttcp.c	2012-01-30 23:44:02.260501225 -0500
+@@ -372,7 +372,7 @@
+ #define Message(x)	fMessage(stdout, x)
+ 
+ void Exit(char *s, int ret) {
+-    syslog(LOG_DEBUG, s);
++    syslog(LOG_DEBUG, "%s", s);
+     fMessage(stderr,s);
+     exit(ret);
+ }
diff -Nru nttcp-1.47/debian/patches/format-security.diff nttcp-1.47/debian/patches/format-security.diff
--- nttcp-1.47/debian/patches/format-security.diff	2012-11-24 11:36:12.000000000 +0000
+++ nttcp-1.47/debian/patches/format-security.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' nttcp-1.47/nttcp.c nttcp-1.47.new/nttcp.c
---- nttcp-1.47/nttcp.c	2000-12-18 05:16:54.000000000 -0500
-+++ nttcp-1.47.new/nttcp.c	2012-01-30 23:44:02.260501225 -0500
-@@ -372,7 +372,7 @@
- #define Message(x)	fMessage(stdout, x)
- 
- void Exit(char *s, int ret) {
--    syslog(LOG_DEBUG, s);
-+    syslog(LOG_DEBUG, "%s", s);
-     fMessage(stderr,s);
-     exit(ret);
- }
diff -Nru nttcp-1.47/debian/patches/series nttcp-1.47/debian/patches/series
--- nttcp-1.47/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ nttcp-1.47/debian/patches/series	2012-03-31 17:56:45.000000000 +0000
@@ -0,0 +1,2 @@
+010_change_manpath
+020_format-security
diff -Nru nttcp-1.47/debian/rules nttcp-1.47/debian/rules
--- nttcp-1.47/debian/rules	2012-11-24 11:36:12.000000000 +0000
+++ nttcp-1.47/debian/rules	2012-03-31 17:55:08.000000000 +0000
@@ -1,10 +1,8 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses cdbs.  Originaly written by Robert Millan.
-# This file is public domain.
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 ARCH = ""
 CFLAGS += -DVERSION="\\\"1.47\\\""
diff -Nru nttcp-1.47/debian/source/format nttcp-1.47/debian/source/format
--- nttcp-1.47/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ nttcp-1.47/debian/source/format	2012-11-24 11:36:12.799778914 +0000
@@ -0,0 +1 @@
+3.0 (quilt)