debian/changelog | 7 +++++++ debian/patches/01_netbsd_imake.c_fixes.diff | 6 +++--- debian/patches/02_mkdirhier_rewrite.diff | 12 ++++++------ debian/patches/series | 8 ++++---- debian/rules | 1 - 5 files changed, 20 insertions(+), 14 deletions(-)
New commits: commit 7c12e8bde01907c6c525b2d24d72f136d1af3add Author: Julien Cristau <jcris...@debian.org> Date: Fri Dec 19 13:43:18 2008 +0100 Fix patches 01 and 02 to apply with -p1, to silence lintian. diff --git a/debian/changelog b/debian/changelog index c78734b..ef2f31d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xutils-dev (1:7.4+5) UNRELEASED; urgency=low * Don't call dh_makeshlibs, silences lintian warning. + * Fix patches 01 and 02 to apply with -p1, to silence lintian. -- Julien Cristau <jcris...@debian.org> Fri, 19 Dec 2008 13:41:50 +0100 diff --git a/debian/patches/01_netbsd_imake.c_fixes.diff b/debian/patches/01_netbsd_imake.c_fixes.diff index 40e9be9..b95a3ea 100644 --- a/debian/patches/01_netbsd_imake.c_fixes.diff +++ b/debian/patches/01_netbsd_imake.c_fixes.diff @@ -3,10 +3,10 @@ $Id: 841_netbsd_imake.c_fixes.diff 689 2005-10-19 22:11:30Z dnusinow $ Patch to imake.c for Debian/NetBSD support by Joel Baker <luci...@lightbearer.com>. -Index: imake/imake.c +Index: a/imake/imake.c =================================================================== ---- imake/imake.c.orig 2006-05-29 22:37:55.000000000 -0400 -+++ imake/imake.c 2006-05-29 22:44:50.000000000 -0400 +--- a/imake/imake.c.orig 2006-05-29 22:37:55.000000000 -0400 ++++ b/imake/imake.c 2006-05-29 22:44:50.000000000 -0400 @@ -1087,6 +1087,10 @@ fprintf (inFile, "%s\n", "#define LinuxWare 11"); fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12"); diff --git a/debian/patches/02_mkdirhier_rewrite.diff b/debian/patches/02_mkdirhier_rewrite.diff index 71f5afd..d2f5d88 100644 --- a/debian/patches/02_mkdirhier_rewrite.diff +++ b/debian/patches/02_mkdirhier_rewrite.diff @@ -6,10 +6,10 @@ This shell script and manpage by Branden Robinson. Not submitted upstream to XFree86 or X.Org. -Index: imake/mkdirhier +Index: a/imake/mkdirhier =================================================================== ---- imake/mkdirhier (revision 309) -+++ imake/mkdirhier (working copy) +--- a/imake/mkdirhier (revision 309) ++++ b/imake/mkdirhier (working copy) @@ -1,67 +1,94 @@ #!/bin/sh -# $Xorg: mkdirhier.sh,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ @@ -161,10 +161,10 @@ Index: imake/mkdirhier +exit $STATUS + +# vim:set ai et sts=4 sw=4 tw=80: -Index: imake/mkdirhier.man +Index: a/imake/mkdirhier.man =================================================================== ---- imake/mkdirhier.man (revision 309) -+++ imake/mkdirhier.man (working copy) +--- a/imake/mkdirhier.man (revision 309) ++++ b/imake/mkdirhier.man (working copy) @@ -1,42 +1,111 @@ -.\" $Xorg: mkdirhier.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $ -.\" Copyright (c) 1993, 1994, 1998 The Open Group diff --git a/debian/patches/series b/debian/patches/series index f5871a1..56e830f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,7 @@ -01_netbsd_imake.c_fixes.diff -p0 -02_mkdirhier_rewrite.diff -p0 -03_xutils-dev-FHS.diff -p1 -04_xutils-dev-debian.diff +01_netbsd_imake.c_fixes.diff +02_mkdirhier_rewrite.diff +03_xutils-dev-FHS.diff +04_xutils-dev-debian.diff 05_xaw_without_xp.diff 06_font_path.diff 07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff commit 718337de85873172e578c8a561f018e0bf6337d9 Author: Julien Cristau <jcris...@debian.org> Date: Fri Dec 19 13:42:22 2008 +0100 Don't call dh_makeshlibs, silences lintian warning. diff --git a/debian/changelog b/debian/changelog index a63800e..c78734b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xutils-dev (1:7.4+5) UNRELEASED; urgency=low + + * Don't call dh_makeshlibs, silences lintian warning. + + -- Julien Cristau <jcris...@debian.org> Fri, 19 Dec 2008 13:41:50 +0100 + xutils-dev (1:7.4+4) unstable; urgency=low * util-macros 1.2.1. diff --git a/debian/rules b/debian/rules index 686af15..c0f2042 100755 --- a/debian/rules +++ b/debian/rules @@ -88,7 +88,6 @@ binary-arch: build install dh_fixperms dh_installdeb dh_shlibdeps - dh_makeshlibs dh_gencontrol dh_md5sums dh_builddeb -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org