Package: dpatch
Version: 2.0.27
Severity: wishlist
Tags: patch
Hi!
I just observed with lintian -I that many man pages in dpatch have the
hyphen-used-as-minus-sign warning. I went about fixing them, and also
updated the FSF address in the copyright file, which fixes another
lintian warning.
This patch applies to the latest dpatch git contents.
HTH.
Kumar
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (990, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: i386 (i686)
Kernel: Linux 2.6.22.1 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1) (ignored: LC_ALL set to
en_US)
Shell: /bin/sh linked to /bin/bash
dpatch depends on no packages.
Versions of packages dpatch recommends:
ii dpkg-dev 1.14.6 package building tools for Debian
ii fakeroot 1.7.1 Gives a fake root environment
ii patchutils 0.2.31-4 Utilities to work with patches
-- no debconf information
diff --git a/compat/dpatch.make.7 b/compat/dpatch.make.7
index 7549c21..8324c14 100644
--- a/compat/dpatch.make.7
+++ b/compat/dpatch.make.7
@@ -102,7 +102,7 @@ build-stamp: patch-stamp
clean: clean1 unpatch
clean1:
${MAKE} clean
- rm -rf debian/files debian/substvars debian/imaginary\-package
+ rm \-rf debian/files debian/substvars debian/imaginary\-package
.PHONY: patch unpatch ...
.
diff --git a/debian/copyright b/debian/copyright
index 64bf8dc..d4899b6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,7 +23,9 @@ more. :)
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License with
- the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
- if not, write to the Free Software Foundation, Inc., 59 Temple Place,
- Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/dpatch/dpatch.1 b/dpatch/dpatch.1
index 873399d..9238351 100644
--- a/dpatch/dpatch.1
+++ b/dpatch/dpatch.1
@@ -353,7 +353,7 @@ clean:
$(testdir)
$(testroot)
${MAKE} distclean
- rm -rf debian/imaginary\-package debian/files debian/substvars
+ rm \-rf debian/imaginary\-package debian/files debian/substvars
.fi
.sp
.RE
@@ -372,7 +372,7 @@ clean\-patched:
$(testdir)
$(testroot)
${MAKE} distclean
- rm -rf debian/imaginary\-package debian/files debian/substvars
+ rm \-rf debian/imaginary\-package debian/files debian/substvars
patch: patch\-stamp
patch\-stamp:
@@ -381,7 +381,7 @@ patch\-stamp:
unpatch:
dpatch deapply\-all
- rm -rf patch\-stamp debian/patched
+ rm \-rf patch\-stamp debian/patched
.fi
.sp
.RE
@@ -442,7 +442,7 @@ patch, there is an even easier way:
.RS
.sp
.nf
-dpatch patch-template -p "01_some_patch" "A random patch" \\
+dpatch patch\-template \-p "01_some_patch" "A random patch" \\
<random.diff >debian/patches/01_some_patch.dpatch
.fi
.sp
diff --git a/dpep/dpatch-edit-patch.1 b/dpep/dpatch-edit-patch.1
index b003fe7..0bc71b3 100644
--- a/dpep/dpatch-edit-patch.1
+++ b/dpep/dpatch-edit-patch.1
@@ -332,7 +332,7 @@ the following algorithm:
3) Should neither of the first two attempts succeed, the email will be
constructed using the login name of the user running
.B dpatch\-edit\-patch
-combined with the output of \fBhostname -f\fR.
+combined with the output of \fBhostname \-f\fR.
.PP
When
.B dpatch\-edit\-patch
