Your message dated Fri, 13 Apr 2012 21:35:33 +0000
with message-id <[email protected]>
and subject line Bug#668360: fixed in xdu 3.0-18
has caused the Debian Bug report #668360,
regarding [PATCH] xdu: Helping to update to packaging format 3.0
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
668360: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=668360
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: xdu
Severity: wishlist
Tags: patch

Hi,

The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:

    http://wiki.debian.org/Projects/DebSrc3.0

I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.

Notes:

    File Imakefile was restored from original sources and in-line
    changes were moved to patch 00.

Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.

Thanks,
Jari

>From 1e0df04d4e3208b9e6c8dcab53efa9c664c9d300 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 11 Apr 2012 13:06:10 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Signed-off-by: Jari Aalto <[email protected]>
---
 Imakefile                                          |    2 -
 debian/changelog                                   |   11 ++++
 debian/compat                                      |    2 +-
 debian/control                                     |    6 +-
 debian/patches/00_imakefile.patch                  |   18 ++++++
 debian/patches/00list                              |    8 ---
 .../{01_resource.dpatch => 01_resource.patch}      |   22 +-------
 debian/patches/02_strdup.dpatch                    |   58 --------------------
 debian/patches/02_strdup.patch                     |   40 ++++++++++++++
 debian/patches/03_newread.dpatch                   |   50 -----------------
 debian/patches/03_newread.patch                    |   36 ++++++++++++
 debian/patches/04_title.dpatch                     |   34 ------------
 debian/patches/04_title.patch                      |   15 +++++
 debian/patches/05_help_quit.dpatch                 |   32 -----------
 debian/patches/05_help_quit.patch                  |   14 +++++
 debian/patches/06_malloc.dpatch                    |   37 -------------
 debian/patches/06_malloc.patch                     |   15 +++++
 .../{07_man_typo.dpatch => 07_man_typo.patch}      |   22 +-------
 ...{08_man_section.dpatch => 08_man_section.patch} |    8 +--
 debian/patches/series                              |    9 +++
 debian/rules                                       |   11 ++--
 debian/source/format                               |    1 +
 22 files changed, 176 insertions(+), 275 deletions(-)
 create mode 100644 debian/patches/00_imakefile.patch
 delete mode 100644 debian/patches/00list
 rename debian/patches/{01_resource.dpatch => 01_resource.patch} (51%)
 delete mode 100644 debian/patches/02_strdup.dpatch
 create mode 100644 debian/patches/02_strdup.patch
 delete mode 100644 debian/patches/03_newread.dpatch
 create mode 100644 debian/patches/03_newread.patch
 delete mode 100644 debian/patches/04_title.dpatch
 create mode 100644 debian/patches/04_title.patch
 delete mode 100644 debian/patches/05_help_quit.dpatch
 create mode 100644 debian/patches/05_help_quit.patch
 delete mode 100644 debian/patches/06_malloc.dpatch
 create mode 100644 debian/patches/06_malloc.patch
 rename debian/patches/{07_man_typo.dpatch => 07_man_typo.patch} (63%)
 rename debian/patches/{08_man_section.dpatch => 08_man_section.patch} (58%)
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format

diff --git a/Imakefile b/Imakefile
index 00af91a..a40e57b 100644
--- a/Imakefile
+++ b/Imakefile
@@ -7,8 +7,6 @@ XCOMM
 LOCAL_LIBRARIES = XawClientLibs
            SRCS = xdu.c xwin.c 
            OBJS = xdu.o xwin.o
-EXTRA_LDOPTIONS = -Xlinker --as-needed
-#warning ExtraXawClientLibs /**/
 
 ComplexProgramTarget(xdu)
 InstallAppDefaults(XDu)
diff --git a/debian/changelog b/debian/changelog
index da8c659..67bccdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xdu (3.0-17.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+    - Patch 00 is new. Contains in-line changes to original files.
+    - Patch 03 was updated with "quilt refresh" to make it apply cleanly.
+    * Update to Standards-Version to 3.9.3.1 and debhelper to 9.
+  * Add build-arch and build-indep targets; use dh_prep in rules file.
+
+ -- Jari Aalto <[email protected]>  Wed, 11 Apr 2012 13:00:57 +0300
+
 xdu (3.0-17) unstable; urgency=low
 
   * Bug fix: "xdu: ships files in /usr/man", thanks to Colin Watson
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 953a545..8932f58 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: xdu
 Section: utils
 Priority: optional
 Maintainer: Remi Vanicat <[email protected]>
-Standards-Version: 3.7.2.2
-Build-Depends: debhelper (>= 5), libxt-dev, xutils-dev (>= 1:1.0.2-2), libxaw7-dev, dpatch (>= 1.11)
+Standards-Version: 3.9.3.1
+Build-Depends: debhelper (>= 9), libxt-dev, xutils-dev (>= 1:1.0.2-2), libxaw7-dev
 
 Package: xdu
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: display the output of "du" in an X window
  XDU is a program for displaying a graphical tree of disk space
  utilization as reported by the UNIX utility "du".  You can
diff --git a/debian/patches/00_imakefile.patch b/debian/patches/00_imakefile.patch
new file mode 100644
index 0000000..b568ab9
--- /dev/null
+++ b/debian/patches/00_imakefile.patch
@@ -0,0 +1,18 @@
+From: Unknown
+Subject: Local Debian changes. Define EXTRA_LDOPTIONS
+
+ Imakefile |	2 ++
+ Imakefile |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/Imakefile
++++ b/Imakefile
+@@ -7,6 +7,8 @@
+ LOCAL_LIBRARIES = XawClientLibs
+            SRCS = xdu.c xwin.c 
+            OBJS = xdu.o xwin.o
++EXTRA_LDOPTIONS = -Xlinker --as-needed
++#warning ExtraXawClientLibs /**/
+ 
+ ComplexProgramTarget(xdu)
+ InstallAppDefaults(XDu)
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 151572c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,8 +0,0 @@
-01_resource
-02_strdup
-03_newread
-04_title
-05_help_quit
-06_malloc
-07_man_typo
-08_man_section
diff --git a/debian/patches/01_resource.dpatch b/debian/patches/01_resource.patch
similarity index 51%
rename from debian/patches/01_resource.dpatch
rename to debian/patches/01_resource.patch
index 128dbc2..fdec56d 100644
--- a/debian/patches/01_resource.dpatch
+++ b/debian/patches/01_resource.patch
@@ -1,23 +1,5 @@
-#! /bin/sh -e
-## 01_resource.dpatch by  <[email protected]>
-## From the modification probably made by Fredrik Hallenberg (3.0-4)
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification of the resource files
-
-if [ $# -ne 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
+From: Remi Vanicat <[email protected]>
+Subject: modifications to the resource files
 
 --- xdu-3.0.orig/XDu.ad
 +++ xdu-3.0/XDu.ad
diff --git a/debian/patches/02_strdup.dpatch b/debian/patches/02_strdup.dpatch
deleted file mode 100644
index e5b890e..0000000
--- a/debian/patches/02_strdup.dpatch
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh -e
-## 02_strdup.dpatch by  <[email protected]>
-## from the modification made by Paul Slootman with version 3.0-1.1
-## 
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use string.h, don't use strdup when not needed
-## DP: One should had the autoconf stuff to see if strdup is available
-
-if [ $# -ne 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
---- xdu-3.0.orig/xdu.c
-+++ xdu-3.0/xdu.c
-@@ -20,6 +20,7 @@
-  * the party supplying this software to the X Consortium.
-  */
- #include <stdio.h>
-+#include <string.h>
- #include "version.h"
- 
- extern char *malloc(), *calloc();
-@@ -38,7 +39,9 @@
- int ncols = NCOLS;
- 
- /* internal routines */
-+#ifdef NEED_STRDUP
- char *strdup();
-+#endif
- void addtree();
- void parse_file();
- void parse_entry();
-@@ -622,6 +625,7 @@
- 		100.0*topp->size/rootp->size);
- }
- 
-+#ifdef NEED_STRDUP
- char *
- strdup(s)
- char *s;
-@@ -635,6 +639,7 @@
- 
- 	return	cp;
- }
-+#endif
- 
- /**************** External Entry Points ****************/
- 
diff --git a/debian/patches/02_strdup.patch b/debian/patches/02_strdup.patch
new file mode 100644
index 0000000..c747e17
--- /dev/null
+++ b/debian/patches/02_strdup.patch
@@ -0,0 +1,40 @@
+From: Remi Vanicat <[email protected]>
+Subject: Use string.h, don't use strdup when not needed
+ One should had the autoconf stuff to see if strdup is available
+
+--- xdu-3.0.orig/xdu.c
++++ xdu-3.0/xdu.c
+@@ -20,6 +20,7 @@
+  * the party supplying this software to the X Consortium.
+  */
+ #include <stdio.h>
++#include <string.h>
+ #include "version.h"
+ 
+ extern char *malloc(), *calloc();
+@@ -38,7 +39,9 @@
+ int ncols = NCOLS;
+ 
+ /* internal routines */
++#ifdef NEED_STRDUP
+ char *strdup();
++#endif
+ void addtree();
+ void parse_file();
+ void parse_entry();
+@@ -622,6 +625,7 @@
+ 		100.0*topp->size/rootp->size);
+ }
+ 
++#ifdef NEED_STRDUP
+ char *
+ strdup(s)
+ char *s;
+@@ -635,6 +639,7 @@
+ 
+ 	return	cp;
+ }
++#endif
+ 
+ /**************** External Entry Points ****************/
+ 
diff --git a/debian/patches/03_newread.dpatch b/debian/patches/03_newread.dpatch
deleted file mode 100644
index 0d1c8d9..0000000
--- a/debian/patches/03_newread.dpatch
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh -e
-## 03_newread.dpatch by  <[email protected]>
-## from the patch from steve <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: closes #52595
-
-if [ $# -ne 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
---- xdu-3.0.orig/xdu.c
-+++ xdu-3.0/xdu.c
-@@ -232,7 +232,7 @@
- char *filename;
- {
- 	char	buf[4096];
--	char	name[4096];
-+	char	*name;
- 	int	size;
- 	FILE	*fp;
- 
-@@ -245,7 +245,16 @@
- 		}
- 	}
- 	while (fgets(buf,sizeof(buf),fp) != NULL) {
--		sscanf(buf, "%d %s\n", &size, name);
-+ 		int pos;
-+ 		strtok(buf, "\n\r");
-+ 		pos = strcspn(buf, " \t");
-+ 		if (buf[pos] == '\0')
-+ 			continue;
-+ 		buf[pos++] = '\0';
-+ 		while (buf[pos] == '\t' || buf[pos] == ' ')
-+ 			pos++;
-+ 		size = atoi(buf);
-+ 		name = buf + pos;
- 		/*printf("%d %s\n", size, name);*/
- 		parse_entry(name,size);
- 	}
diff --git a/debian/patches/03_newread.patch b/debian/patches/03_newread.patch
new file mode 100644
index 0000000..e525e5d
--- /dev/null
+++ b/debian/patches/03_newread.patch
@@ -0,0 +1,36 @@
+From: Remi Vanicat <[email protected]>
+Subject: Closes #52595
+
+---
+ xdu.c |   13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+--- a/xdu.c
++++ b/xdu.c
+@@ -235,7 +235,7 @@
+ char *filename;
+ {
+ 	char	buf[4096];
+-	char	name[4096];
++	char	*name;
+ 	int	size;
+ 	FILE	*fp;
+ 
+@@ -248,7 +248,16 @@
+ 		}
+ 	}
+ 	while (fgets(buf,sizeof(buf),fp) != NULL) {
+-		sscanf(buf, "%d %s\n", &size, name);
++ 		int pos;
++ 		strtok(buf, "\n\r");
++ 		pos = strcspn(buf, " \t");
++ 		if (buf[pos] == '\0')
++ 			continue;
++ 		buf[pos++] = '\0';
++ 		while (buf[pos] == '\t' || buf[pos] == ' ')
++ 			pos++;
++ 		size = atoi(buf);
++ 		name = buf + pos;
+ 		/*printf("%d %s\n", size, name);*/
+ 		parse_entry(name,size);
+ 	}
diff --git a/debian/patches/04_title.dpatch b/debian/patches/04_title.dpatch
deleted file mode 100644
index 76d32b2..0000000
--- a/debian/patches/04_title.dpatch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh -e
-## 04_debian-patch.dpatch by  <[email protected]>
-## from the Flavio Stanchina patch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: remove a trailing new line that make the title text appears 
-## DP: incorrectly with some windows manager.
-## DP: closes #125867
-
-if [ $# -ne 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
---- xdu-3.0.orig/xwin.c
-+++ xdu-3.0/xwin.c
-@@ -308,7 +308,7 @@
- 
- 	/* Create the top level Widget */
- 	n = 0;
--	XtSetArg(args[n], XtNtitle, "XDU Disk Usage Display ('h' for help)\n"); n++;
-+	XtSetArg(args[n], XtNtitle, "XDU Disk Usage Display ('h' for help)"); n++;
- 	toplevel = XtAppInitialize(&app_con, "XDu",
- 			options, XtNumber(options),
- 			argcp, argv,
diff --git a/debian/patches/04_title.patch b/debian/patches/04_title.patch
new file mode 100644
index 0000000..0e6f6f0
--- /dev/null
+++ b/debian/patches/04_title.patch
@@ -0,0 +1,15 @@
+From: Remi Vanicat <[email protected]>
+Subject: remove a trailing new line that make the title text appears
+ incorrectly with some windows manager. Closes #125867
+
+--- xdu-3.0.orig/xwin.c
++++ xdu-3.0/xwin.c
+@@ -308,7 +308,7 @@
+ 
+ 	/* Create the top level Widget */
+ 	n = 0;
+-	XtSetArg(args[n], XtNtitle, "XDU Disk Usage Display ('h' for help)\n"); n++;
++	XtSetArg(args[n], XtNtitle, "XDU Disk Usage Display ('h' for help)"); n++;
+ 	toplevel = XtAppInitialize(&app_con, "XDu",
+ 			options, XtNumber(options),
+ 			argcp, argv,
diff --git a/debian/patches/05_help_quit.dpatch b/debian/patches/05_help_quit.dpatch
deleted file mode 100644
index 9eae9a2..0000000
--- a/debian/patches/05_help_quit.dpatch
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh -e
-## 05_help_quit.dpatch by  <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Override the text translations table so that q will quit the 
-## DP: help window
-## DP: closes #206606
-
-if [ $# -ne 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
---- xdu-3.0.orig/xwin.c
-+++ xdu-3.0/xwin.c
-@@ -482,6 +482,7 @@
- 
- 	trans_table = XtParseTranslationTable("<Key>Q: RemoveHelp()");
- 	XtAugmentTranslations(form, trans_table);
-+	XtOverrideTranslations(text, trans_table);
- 
- 	/* Set up ICCCM delete window */
- 	wm_delete_window = XInternAtom(XtDisplay(popup), "WM_DELETE_WINDOW", False);
diff --git a/debian/patches/05_help_quit.patch b/debian/patches/05_help_quit.patch
new file mode 100644
index 0000000..45369d7
--- /dev/null
+++ b/debian/patches/05_help_quit.patch
@@ -0,0 +1,14 @@
+From: Remi Vanicat <[email protected]>
+Subject: Override the text translations table so that q will quit the
+ help window. Closes #206606
+
+--- xdu-3.0.orig/xwin.c
++++ xdu-3.0/xwin.c
+@@ -482,6 +482,7 @@
+ 
+ 	trans_table = XtParseTranslationTable("<Key>Q: RemoveHelp()");
+ 	XtAugmentTranslations(form, trans_table);
++	XtOverrideTranslations(text, trans_table);
+ 
+ 	/* Set up ICCCM delete window */
+ 	wm_delete_window = XInternAtom(XtDisplay(popup), "WM_DELETE_WINDOW", False);
diff --git a/debian/patches/06_malloc.dpatch b/debian/patches/06_malloc.dpatch
deleted file mode 100644
index cf4e527..0000000
--- a/debian/patches/06_malloc.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh -e
-## 06_malloc.dpatch by  <moi@debian>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/moi/src-system/xdu/xdu-3.0/xdu.c xdu-3.0/xdu.c
---- /home/moi/src-system/xdu/xdu-3.0/xdu.c	2004-09-06 08:45:22.000000000 +0200
-+++ xdu-3.0/xdu.c	2004-09-06 08:45:37.000000000 +0200
-@@ -23,7 +23,7 @@
- #include <string.h>
- #include "version.h"
- 
--extern char *malloc(), *calloc();
-+// extern char *malloc(), *calloc();
- 
- #define	MAXDEPTH	80	/* max elements in a path */
- #define	MAXNAME		1024	/* max pathname element length */
diff --git a/debian/patches/06_malloc.patch b/debian/patches/06_malloc.patch
new file mode 100644
index 0000000..e4f18e5
--- /dev/null
+++ b/debian/patches/06_malloc.patch
@@ -0,0 +1,15 @@
+From: Andrew Moise <moi@debian>
+Description: Do not forward declare malloc() etc.
+
+diff -urNad /home/moi/src-system/xdu/xdu-3.0/xdu.c xdu-3.0/xdu.c
+--- /home/moi/src-system/xdu/xdu-3.0/xdu.c	2004-09-06 08:45:22.000000000 +0200
++++ xdu-3.0/xdu.c	2004-09-06 08:45:37.000000000 +0200
+@@ -23,7 +23,7 @@
+ #include <string.h>
+ #include "version.h"
+ 
+-extern char *malloc(), *calloc();
++// extern char *malloc(), *calloc();
+ 
+ #define	MAXDEPTH	80	/* max elements in a path */
+ #define	MAXNAME		1024	/* max pathname element length */
diff --git a/debian/patches/07_man_typo.dpatch b/debian/patches/07_man_typo.patch
similarity index 63%
rename from debian/patches/07_man_typo.dpatch
rename to debian/patches/07_man_typo.patch
index 95b1956..c4c25b5 100644
--- a/debian/patches/07_man_typo.dpatch
+++ b/debian/patches/07_man_typo.patch
@@ -1,23 +1,5 @@
-#! /bin/sh -e
-## 07_man_typo.dpatch by  <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: typo in the man page
-## DP: closes #306704
-
-if [ $# -ne 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
+From: Remi Vanicat <[email protected]>
+Subject: typo in the man page. Closes #306704
 
 --- xdu-3.0.orig/xdu.man
 +++ xdu-3.0/xdu.man
diff --git a/debian/patches/08_man_section.dpatch b/debian/patches/08_man_section.patch
similarity index 58%
rename from debian/patches/08_man_section.dpatch
rename to debian/patches/08_man_section.patch
index f781260..21471de 100644
--- a/debian/patches/08_man_section.dpatch
+++ b/debian/patches/08_man_section.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_man_section.dpatch by  <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Andrew Moise <[email protected]>
+Subject: Correct whatis(1) .TH entry in manual page
 
-@DPATCH@
 diff -urNad xdu-3.0~/xdu.man xdu-3.0/xdu.man
 --- xdu-3.0~/xdu.man	2006-10-08 12:09:44.000000000 +0200
 +++ xdu-3.0/xdu.man	2006-10-08 12:10:56.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e4c15c0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,9 @@
+00_imakefile.patch
+01_resource.patch
+02_strdup.patch
+03_newread.patch
+04_title.patch
+05_help_quit.patch
+06_malloc.patch
+07_man_typo.patch
+08_man_section.patch
diff --git a/debian/rules b/debian/rules
index 68f3f1f..df2bcf4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
 PACKAGE = xdu
 
+
+build-arch: build
+build-indep: build
+
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
 	dh_testdir
 
 	xmkmf
@@ -15,7 +18,7 @@ build-stamp: patch-stamp
 
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -32,7 +35,7 @@ binary-indep: build
 binary-arch: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	install -m755 xdu debian/xdu/usr/bin
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
-- 
1.7.9.5


--- End Message ---
--- Begin Message ---
Source: xdu
Source-Version: 3.0-18

We believe that the bug you reported is fixed in the latest version of
xdu, which is due to be installed in the Debian FTP archive:

xdu_3.0-18.debian.tar.gz
  to main/x/xdu/xdu_3.0-18.debian.tar.gz
xdu_3.0-18.dsc
  to main/x/xdu/xdu_3.0-18.dsc
xdu_3.0-18_amd64.deb
  to main/x/xdu/xdu_3.0-18_amd64.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Rémi Vanicat <[email protected]> (supplier of updated xdu package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Fri, 13 Apr 2012 22:55:29 +0200
Source: xdu
Binary: xdu
Architecture: source amd64
Version: 3.0-18
Distribution: unstable
Urgency: low
Maintainer: Rémi Vanicat <[email protected]>
Changed-By: Rémi Vanicat <[email protected]>
Description: 
 xdu        - display the output of "du" in an X window
Closes: 668360
Changes: 
 xdu (3.0-18) unstable; urgency=low
 .
   [ Jari Aalto ]
   * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
     - Patch 00 is new. Contains in-line changes to original files.
     - Patch 03 was updated with "quilt refresh" to make it apply cleanly.
     * Update to Standards-Version to 3.9.3.1 and debhelper to 9.
   * Add build-arch and build-indep targets; use dh_prep in rules file.
 .
   [ Rémi Vanicat ]
   * Integrate change by Jari Aalto using gitpkg (Closes: #668360).
   * Add Vcs-git for public git repository
   * Use section 1 for the man page
Checksums-Sha1: 
 a4dc2382187be4ee3ed3fba5a1ea9fe2eaf69e20 1133 xdu_3.0-18.dsc
 4294aafb1284b2883dfa77a9b849da42c82594d7 6109 xdu_3.0-18.debian.tar.gz
 844f8629d3217a9ef44a0fb9ba7750f27e409c93 17380 xdu_3.0-18_amd64.deb
Checksums-Sha256: 
 529370ff0a2130ff4b67b07e379e07ab78a76ec9ac4edf52287a929251fd6208 1133 
xdu_3.0-18.dsc
 d8ecfbd82ceeaad3dc8bc26448fd4dc327d93a34cb74337f8315fd9a84ff4558 6109 
xdu_3.0-18.debian.tar.gz
 58c9cfb44571240c6809d0ce3c77c2cf133ceaa4b2bffe1ef93cdd44ff686eca 17380 
xdu_3.0-18_amd64.deb
Files: 
 2ca9e0c3f503c6815ee33387805c8b18 1133 utils optional xdu_3.0-18.dsc
 2f6e8e4cd3203bb9ca486791e31ae910 6109 utils optional xdu_3.0-18.debian.tar.gz
 2601d1f46a21267881ffa1f8d43129e1 17380 utils optional xdu_3.0-18_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iD8DBQFPiJgDsOGY15BXtdMRAr9iAJ4yG6RKGDuUnM91phUJlvg8XnmzlQCfW9xd
aSnSIsHmuTQD3j8NbNVXFaY=
=2HXY
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to